Merge branch 'int-new' of ssh://gitlab.labs.nic.cz/labs/bird into int-new

1 files changed, 10 insertions, 4 deletions

diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y
index 4f96fdcb..b3c332be 100644
--- a/proto/pipe/config.Y
+++ b/proto/pipe/config.Y
@@ -25,13 +25,19 @@ CF_ADDTO(proto, pipe_proto '}' { this_channel = NULL; } )
 pipe_proto_start: proto_start PIPE
 {
   this_proto = proto_config_new(&proto_pipe, $1);
-  this_channel = channel_config_new(NULL, NULL, 0, this_proto);
-  this_channel->in_filter = FILTER_ACCEPT;
-  this_channel->out_filter = FILTER_ACCEPT;
+}
+proto_name
+{
+  this_channel = proto_cf_main_channel(this_proto);
+  if (!this_channel) {
+    this_channel = channel_config_new(NULL, NULL, 0, this_proto);
+    this_channel->in_filter = FILTER_ACCEPT;
+    this_channel->out_filter = FILTER_ACCEPT;
+  }
 };
 
 pipe_proto:
-   pipe_proto_start proto_name '{'
+   pipe_proto_start '{'
  | pipe_proto proto_item ';'
  | pipe_proto channel_item ';'
  | pipe_proto PEER TABLE rtable ';' { PIPE_CFG->peer = $4; }