From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Sun, 16 Dec 2018 21:48:13 +0000 (+0100)
Subject: Nest: fix bug in previous patches related to channel reconfiguration
X-Git-Tag: v2.0.3~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfa6ff95695bcaff0c1046c63eb4a839c7a90cb7;p=thirdparty%2Fbird.git

Nest: fix bug in previous patches related to channel reconfiguration

The patch d506263d... blocked adding channel during reconfiguration,
that broke protocols which use the same functiona also during init.
This patch fixes that.
---

diff --git a/nest/proto.c b/nest/proto.c
index 7849b6042..de727dac0 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -663,9 +663,13 @@ proto_configure_channel(struct proto *p, struct channel **pc, struct channel_con
   {
     /* We could add the channel, but currently it would just stay in down state
        until protocol is restarted, so it is better to force restart anyways. */
-    log(L_INFO "Cannot add channel %s.%s", p->name, cf->name);
-    return 0;
-    // *pc = proto_add_channel(p, cf);
+    if (p->proto_state != PS_DOWN)
+    {
+      log(L_INFO "Cannot add channel %s.%s", p->name, cf->name);
+      return 0;
+    }
+
+    *pc = proto_add_channel(p, cf);
   }
   else if (c && !cf)
   {