diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-22 17:12:15 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-22 17:12:15 +0200 |
| commit | ea2ae6dd0ae3f5dd8cd41c1e5a1170a163027725 (patch) | |
| tree | bfad8e3665598cedc1a099b9d37571a924e3564f /nest/config.Y | |
| parent | d72a0ac2396471ffb2b3a580ee986f950e4d23ae (diff) | |
Change import/preimport to export/preexport to be consistent with filters.
Diffstat (limited to 'nest/config.Y')
| -rw-r--r-- | nest/config.Y | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nest/config.Y b/nest/config.Y index efff1313..3c6eb7b5 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -43,7 +43,7 @@ CF_DECLS 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, PREIMPORT, GENERATE) +CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE) CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE) @@ -56,7 +56,7 @@ CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT) %type <r> rtable %type <s> optsym %type <ra> r_args -%type <i> echo_mask echo_size debug_mask debug_list debug_flag import_or_preimport +%type <i> echo_mask echo_size debug_mask debug_list debug_flag export_or_preexport %type <t> proto_patt CF_GRAMMAR @@ -298,7 +298,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, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [filter <f>|where <cond>] [all] [primary] [(import|preimport) <p>] [protocol <p>] [stats|count]]], [[Show routing table]]) +CF_CLI(SHOW ROUTE, r_args, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [filter <f>|where <cond>] [all] [primary] [(export|preexport) <p>] [protocol <p>] [stats|count]]], [[Show routing table]]) { rt_show($3); } ; r_args: @@ -344,14 +344,14 @@ r_args: $$ = $1; $$->primary_only = 1; } - | r_args import_or_preimport SYM { + | r_args export_or_preexport SYM { struct proto_config *c = (struct proto_config *) $3->def; $$ = $1; - if ($$->import_mode) cf_error("Protocol specified twice"); + if ($$->export_mode) cf_error("Protocol specified twice"); if ($3->class != SYM_PROTO || !c->proto) cf_error("%s is not a protocol", $3->name); - $$->import_mode = $2; + $$->export_mode = $2; $$->primary_only = 1; - $$->import_protocol = c->proto; + $$->export_protocol = c->proto; $$->running_on_config = c->proto->cf->global; } | r_args PROTOCOL SYM { @@ -372,9 +372,9 @@ r_args: } ; -import_or_preimport: - PREIMPORT { $$ = 1; } - | IMPORT { $$ = 2; } +export_or_preexport: + PREEXPORT { $$ = 1; } + | EXPORT { $$ = 2; } ; CF_CLI(SHOW SYMBOLS, optsym, [<symbol>], [[Show all known symbolic names]]) |