diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-04 21:31:03 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-16 01:33:02 +0200 |
| commit | 26822d8fe1376b2ffd902a3b5caa47f81a88e74e (patch) | |
| tree | 6ca5eb0756861b729cb62440a49123a58453a393 /nest/config.Y | |
| parent | b7f3df79054aca327654c1fb4739c4ff02e59e6e (diff) | |
Finalize RA_ACCEPTED handling.
Diffstat (limited to 'nest/config.Y')
| -rw-r--r-- | nest/config.Y | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nest/config.Y b/nest/config.Y index f889828a..2bc5a4ab 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -46,7 +46,7 @@ CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OF 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, ROA, MAX, FLUSH) -CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION) +CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION, SORTED) CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC) CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, @@ -64,7 +64,7 @@ CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID) %type <ro> roa_args %type <rot> roa_table_arg %type <sd> sym_args -%type <i> proto_start echo_mask echo_size debug_mask debug_list debug_flag mrtdump_mask mrtdump_list mrtdump_flag export_or_preexport roa_mode +%type <i> proto_start echo_mask echo_size debug_mask debug_list debug_flag mrtdump_mask mrtdump_list mrtdump_flag export_or_preexport roa_mode tab_sorted %type <ps> proto_patt proto_patt2 CF_GRAMMAR @@ -110,10 +110,17 @@ listen_opt: /* Creation of routing tables */ +tab_sorted: + { $$ = 0; } + | SORTED { $$ = 1; } + ; + CF_ADDTO(conf, newtab) -newtab: TABLE SYM { - rt_new_table($2); +newtab: TABLE SYM tab_sorted { + struct rtable_config *cf; + cf = rt_new_table($2); + cf->sorted = $3; } ; |