From 87d7fd9725ded186f6fa331d68a1e9df5d1982cf Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Sun, 16 Aug 2009 22:36:41 +0200 Subject: [PATCH 1/2] Bugfix - each protocol can be compiled separately. --- nest/config.Y | 3 ++- proto/ospf/config.Y | 3 ++- proto/rip/config.Y | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nest/config.Y b/nest/config.Y index dc31224a..ad45a0d5 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -44,7 +44,7 @@ CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT) CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS) CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES) CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE) -CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT) +CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT, PASSWORDS) CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE) @@ -293,6 +293,7 @@ password_item_params: ; + /* Core commands */ CF_CLI_HELP(SHOW, ..., [[Show status information]]) diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 5fe8257a..9529f89a 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -38,8 +38,9 @@ CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, BROADCAST) CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC) -CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK, PASSWORDS) +CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY) +CF_KEYWORDS(WAIT, DELAY) %type opttext diff --git a/proto/rip/config.Y b/proto/rip/config.Y index 9a11069e..2df0c5c8 100644 --- a/proto/rip/config.Y +++ b/proto/rip/config.Y @@ -24,7 +24,7 @@ CF_DEFINES CF_DECLS -CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGE, TIMEOUT, PASSWORDS, +CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGE, TIMEOUT, MODE, BROADCAST, MULTICAST, QUIET, NOLISTEN, VERSION1, AUTHENTICATION, NONE, PLAINTEXT, MD5, HONOR, NEVER, NEIGHBOR, ALWAYS, From 5516a66d492497ba8776212defb3117ed1dbfbf8 Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Sun, 16 Aug 2009 22:41:07 +0200 Subject: [PATCH 2/2] Ondrej Zajicek add to the team. --- doc/bird.sgml | 3 ++- doc/prog-head.sgml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/bird.sgml b/doc/bird.sgml index 267c768a..29fcd5a9 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -23,7 +23,8 @@ configuration primitives, is fragment of configuration within normal text, Ondrej Filip diff --git a/doc/prog-head.sgml b/doc/prog-head.sgml index 5e527e5f..0eec367e 100644 --- a/doc/prog-head.sgml +++ b/doc/prog-head.sgml @@ -13,7 +13,8 @@ Ondrej Filip