diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
| commit | 0bf95f99e6126b481a4dcac574ada59f9ad3662b (patch) | |
| tree | 8b8d229fbd4dbd21a9aa14d762ed0b11753437a8 /nest | |
| parent | 23c212e7f1e80a3c6b88b49918972bc28375bd51 (diff) | |
Follow-up work on integration
Contains some patches from Jan Moskyto Matejka
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/config.Y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nest/config.Y b/nest/config.Y index de75509f..9d20dd48 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -55,7 +55,7 @@ CF_DECLS CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT) CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS) -CF_KEYWORDS(IPV4, IPVX, VPN4, VPN6) +CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6) CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED) CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES) CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, NOEXPORT, GENERATE) /* ,ROA */ @@ -134,7 +134,7 @@ CF_ADDTO(conf, table) table_type: /* empty */ { $$ = NET_IP4; } | IPV4 { $$ = NET_IP4; } - | IPVX { $$ = NET_IP6; } /* XXXX */ + | IPV6 { $$ = NET_IP6; } | VPN4 { $$ = NET_VPN4; } | VPN6 { $$ = NET_VPN6; } ; |