summaryrefslogtreecommitdiff
path: root/nest
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2021-03-17 15:56:12 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2021-03-17 15:56:12 +0100
commit0a3db4c68040473ab45b974a7f9256c277c5d31c (patch)
tree6baf3e6dcd0998d723fc50a82fa2d45fb8ba00d5 /nest
parent2f981534902302cbd13cdb12d4f0c6e9a255687a (diff)
Minor fixes for restricted builds
Diffstat (limited to 'nest')
-rw-r--r--nest/config.Y2
-rw-r--r--nest/proto.c2
2 files changed, 3 insertions, 1 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);