diff --git a/nest/config.Y b/nest/config.Y index e8437770..b89e458b 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -55,7 +55,7 @@ CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT) %type rtable %type optsym %type r_args -%type echo_mask echo_size debug_mask debug_list debug_flag import_or_proto +%type echo_mask echo_size debug_mask debug_list debug_flag import_or_preimport %type proto_patt CF_GRAMMAR @@ -278,7 +278,7 @@ CF_CLI(SHOW INTERFACES,,, [[Show network interfaces]]) CF_CLI(SHOW INTERFACES SUMMARY,,, [[Show summary of network interfaces]]) { if_show_summary(); } ; -CF_CLI(SHOW ROUTE, r_args, [[[|for |for ] [table ] [filter |where ] [all] [primary] [(import|protocol)

] [stats|count]]], [[Show routing table]]) +CF_CLI(SHOW ROUTE, r_args, [[[|for |for ] [table ] [filter |where ] [all] [primary] [(import|preimport)

] [stats|count]]], [[Show routing table]]) { rt_show($3); } ; r_args: @@ -324,7 +324,7 @@ r_args: $$ = $1; $$->primary_only = 1; } - | r_args import_or_proto SYM { + | r_args import_or_preimport SYM { struct proto_config *c = (struct proto_config *) $3->def; $$ = $1; if ($$->import_mode) cf_error("Protocol specified twice"); @@ -344,7 +344,7 @@ r_args: } ; -import_or_proto: +import_or_preimport: PREIMPORT { $$ = 1; } | IMPORT { $$ = 2; } ;