summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-11-30 04:40:08 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-11-30 04:40:08 +0100
commitf7e72b3584b54d43401fb02aa7ea677dc3bf0564 (patch)
treebf3bae4b8584b97b44d44f58c8b07f598b9fe4bb
parenta18b49e7c6271b0079fd673ceb3479399ed8099c (diff)
downloadfastd-f7e72b3584b54d43401fb02aa7ea677dc3bf0564.tar
fastd-f7e72b3584b54d43401fb02aa7ea677dc3bf0564.zip
config: update and sort keyword list
-rw-r--r--src/config.y104
-rw-r--r--src/lex.c2
2 files changed, 53 insertions, 53 deletions
diff --git a/src/config.y b/src/config.y
index dfa8a18..30701c0 100644
--- a/src/config.y
+++ b/src/config.y
@@ -58,70 +58,70 @@
%token <uint64> TOK_UINT
%token <str> TOK_STRING
-%token TOK_INTERFACE
+%token <addr4> TOK_ADDR4
+%token <addr6> TOK_ADDR6
+
+%token TOK_ADDRESSES
+%token TOK_ANY
+%token TOK_AS
+%token TOK_AUTO
%token TOK_BIND
+%token TOK_CAPABILITIES
+%token TOK_CIPHER
+%token TOK_DEBUG
+%token TOK_DEBUG2
+%token TOK_DEFAULT
+%token TOK_DISESTABLISH
+%token TOK_DOWN
+%token TOK_DROP
+%token TOK_EARLY
+%token TOK_ERROR
+%token TOK_ESTABLISH
+%token TOK_FATAL
+%token TOK_FLOAT
+%token TOK_FORWARD
+%token TOK_FROM
+%token TOK_GROUP
+%token TOK_HANDSHAKES
+%token TOK_HIDE
+%token TOK_INCLUDE
+%token TOK_INFO
+%token TOK_INTERFACE
+%token TOK_IP
+%token TOK_IPV4
+%token TOK_IPV6
+%token TOK_KEY
+%token TOK_LEVEL
+%token TOK_LIMIT
+%token TOK_LOG
+%token TOK_MAC
+%token TOK_METHOD
+%token TOK_MODE
%token TOK_MTU
+%token TOK_NO
+%token TOK_ON
+%token TOK_PEER
+%token TOK_PEERS
%token TOK_PMTU
-%token TOK_MODE
+%token TOK_PORT
+%token TOK_POST_DOWN
+%token TOK_PRE_UP
%token TOK_PROTOCOL
-%token TOK_METHOD
-%token TOK_PEER
%token TOK_REMOTE
-%token TOK_IPV4
-%token TOK_IPV6
%token TOK_SECRET
-%token TOK_KEY
-%token TOK_INCLUDE
-%token TOK_AS
-%token TOK_ANY
+%token TOK_SECURE
+%token TOK_STDERR
+%token TOK_SYSLOG
%token TOK_TAP
+%token TOK_TO
%token TOK_TUN
-%token TOK_ON
-%token TOK_PRE_UP
%token TOK_UP
-%token TOK_DOWN
-%token TOK_POST_DOWN
-%token TOK_ESTABLISH
-%token TOK_DISESTABLISH
+%token TOK_USE
+%token TOK_USER
+%token TOK_VERBOSE
%token TOK_VERIFY
-%token TOK_PEERS
-%token TOK_FROM
-%token TOK_LOG
-%token TOK_LEVEL
-%token TOK_SYSLOG
-%token TOK_STDERR
-%token TOK_TO
-%token TOK_FATAL
-%token TOK_ERROR
%token TOK_WARN
-%token TOK_INFO
-%token TOK_VERBOSE
-%token TOK_DEBUG
-%token TOK_DEBUG2
-%token TOK_FORWARD
%token TOK_YES
-%token TOK_NO
-%token TOK_PORT
-%token TOK_FLOAT
-%token TOK_CRYPTO
-%token TOK_USE
-%token TOK_DEFAULT
-%token TOK_USER
-%token TOK_GROUP
-%token TOK_DROP
-%token TOK_CAPABILITIES
-%token TOK_EARLY
-%token TOK_LIMIT
-%token TOK_HIDE
-%token TOK_IP
-%token TOK_MAC
-%token TOK_ADDRESSES
-%token TOK_AUTO
-%token TOK_SECURE
-%token TOK_HANDSHAKES
-
-%token <addr4> TOK_ADDR4
-%token <addr6> TOK_ADDR6
%code {
diff --git a/src/lex.c b/src/lex.c
index 8a2109d..4a719de 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -54,7 +54,7 @@ static const keyword_t keywords[] = {
{ "auto", TOK_AUTO },
{ "bind", TOK_BIND },
{ "capabilities", TOK_CAPABILITIES },
- { "crypto", TOK_CRYPTO },
+ { "cipher", TOK_CIPHER },
{ "debug", TOK_DEBUG },
{ "debug2", TOK_DEBUG2 },
{ "default", TOK_DEFAULT },