diff options
| -rw-r--r-- | nest/config.Y | 2 | ||||
| -rw-r--r-- | nest/proto.c | 2 | ||||
| -rw-r--r-- | proto/rip/config.Y | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/nest/config.Y b/nest/config.Y index ef2d0d5f..7b7f12cc 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -90,7 +90,7 @@ CF_DECLS CF_KEYWORDS(ROUTER, ID, HOSTNAME, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT) CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, VRF, DEFAULT, TABLE, STATES, ROUTES, FILTERS) CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, SADR, MPLS) -CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED) +CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED, RPKI) CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CHANNELS, INTERFACES) CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512) CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE) diff --git a/nest/proto.c b/nest/proto.c index f05fbe92..1c27e638 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -396,9 +396,11 @@ channel_roa_subscribe_filter(struct channel *c, int dir) if (dir && !channel_reloadable(c)) valid = 0; +#ifdef CONFIG_BGP /* No automatic reload for BGP channels without in_table / out_table */ if (c->channel == &channel_bgp) valid = dir ? !!c->in_table : !!c->out_table; +#endif struct filter_iterator fit; FILTER_ITERATE_INIT(&fit, f, c->proto->pool); diff --git a/proto/rip/config.Y b/proto/rip/config.Y index 55527feb..28ee9609 100644 --- a/proto/rip/config.Y +++ b/proto/rip/config.Y @@ -33,11 +33,11 @@ rip_check_auth(void) CF_DECLS CF_KEYWORDS(RIP, NG, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT, - GARBAGE, PORT, ADDRESS, MODE, BROADCAST, MULTICAST, PASSIVE, - VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, TIME, BFD, - AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, TTL, SECURITY, - RX, TX, BUFFER, LENGTH, PRIORITY, ONLY, LINK, DEMAND, CIRCUIT, - RIP_METRIC, RIP_TAG) + GARBAGE, RETRANSMIT, PORT, ADDRESS, MODE, BROADCAST, MULTICAST, + PASSIVE, VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, + TIME, BFD, AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, + TTL, SECURITY, RX, TX, BUFFER, LENGTH, PRIORITY, ONLY, LINK, + DEMAND, CIRCUIT, RIP_METRIC, RIP_TAG) %type <i> rip_variant rip_auth |