From cfa6ff95695bcaff0c1046c63eb4a839c7a90cb7 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Sun, 16 Dec 2018 22:48:13 +0100 Subject: [PATCH] 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. --- nest/proto.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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) { -- 2.39.2