Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pipe: fixed template bug

Browse source 
When pipe inherited from template, every channel config was lost.
This commit is contained in:
Jan Maria Matejka 2018-01-16 14:46:06 +01:00
parent c2febfa332
commit c591810d46
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
proto/pipe/config.Y
View file

@ -25,13 +25,19 @@ CF_ADDTO(proto, pipe_proto '}' { this_channel = NULL; } )
pipe_proto_start: proto_start PIPE pipe_proto_start: proto_start PIPE
{ {
this_proto = proto_config_new(&proto_pipe, $1); 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 = channel_config_new(NULL, NULL, 0, this_proto);
this_channel->in_filter = FILTER_ACCEPT; this_channel->in_filter = FILTER_ACCEPT;
this_channel->out_filter = FILTER_ACCEPT; this_channel->out_filter = FILTER_ACCEPT;
}
}; };
pipe_proto: pipe_proto:
pipe_proto_start proto_name '{' pipe_proto_start '{'
| pipe_proto proto_item ';' | pipe_proto proto_item ';'
| pipe_proto channel_item ';' | pipe_proto channel_item ';'
| pipe_proto PEER TABLE rtable ';' { PIPE_CFG->peer = $4; } | pipe_proto PEER TABLE rtable ';' { PIPE_CFG->peer = $4; }