summaryrefslogtreecommitdiff
path: root/nest
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2016-12-23 23:03:26 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-01-03 16:30:27 +0100
commitf8aad5d5b7601d0500841e57bafa5796cc3156ab (patch)
tree703d8427637c7e7209978816b6f19e829f69adc0 /nest
parent256cc8ee0867d7f5314d3a3d7db5429d2bf16b4e (diff)
Minor cleanups
Diffstat (limited to 'nest')
-rw-r--r--nest/proto.c2
-rw-r--r--nest/route.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/nest/proto.c b/nest/proto.c
index 815d0652..0a7a32a6 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -490,7 +490,7 @@ int
channel_reconfigure(struct channel *c, struct channel_config *cf)
{
/* FIXME: better handle these changes, also handle in_keep_filtered */
- if ((c->table != cf->table->table) || (c->ra_mode != cf->ra_mode))
+ if ((c->table != cf->table->table) || (cf->ra_mode && (c->ra_mode != cf->ra_mode)))
return 0;
int import_changed = !filter_same(c->in_filter, cf->in_filter);
diff --git a/nest/route.h b/nest/route.h
index d652ca15..12e67d61 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -258,6 +258,7 @@ static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED);
/* Types of route announcement, also used as flags */
+#define RA_UNDEF 0 /* Undefined RA type */
#define RA_OPTIMAL 1 /* Announcement of optimal route change */
#define RA_ACCEPTED 2 /* Announcement of first accepted route */
#define RA_ANY 3 /* Announcement of any route change */