diff options
author | Jan Maria Matejka <mq@ucw.cz> | 2018-01-16 14:46:06 +0100 |
---|---|---|
committer | Jan Maria Matejka <mq@ucw.cz> | 2018-01-23 13:52:01 +0100 |
commit | c591810d46ae31c9e46768388878321e78e4ef94 (patch) | |
tree | 66ce54a9e1670e7d377eb46b17bfb04b53f9f394 | |
parent | c2febfa33294be0f457b49f5453d8066a7d88a5d (diff) |
Pipe: fixed template bug
When pipe inherited from template, every channel config was lost.
-rw-r--r-- | proto/pipe/config.Y | 14 |
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; } |