Commit c591810d authored by Jan Maria Matejka's avatar Jan Maria Matejka
Browse files

Pipe: fixed template bug

When pipe inherited from template, every channel config was lost.
parent c2febfa3
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -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);
}
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; }