From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 9 Jan 2018 13:36:11 +0000 (+0100)
Subject: Nest: Fix filter reconfiguration
X-Git-Tag: v2.0.1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f9be80c3686284942ba73670780d27730da997;p=thirdparty%2Fbird.git

Nest: Fix filter reconfiguration

Function filter_same() must be called with arguments in proper order,
otherwise it breaks the new filter, causing crash during route
processing.
---

diff --git a/nest/proto.c b/nest/proto.c
index d76505179..e103fec60 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -513,8 +513,9 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   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);
-  int export_changed = !filter_same(c->out_filter, cf->out_filter);
+  /* Note that filter_same() requires arguments in (new, old) order */
+  int import_changed = !filter_same(cf->in_filter, c->in_filter);
+  int export_changed = !filter_same(cf->out_filter, c->out_filter);
 
   if (c->preference != cf->preference)
     import_changed = 1;