parser_bison: do not enforce semicolon from ct helper block
Pablo Neira Ayuso
maintainerPATCH 1/3 parser_bison: do not enforce semicolon from ct helper block
Use the statement separator rule, since newline is also valid.
Fixes c7c94802679c ("src: add ct timeout support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/parser_bison.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/parser_bison.y +1 -1
@@ -3516,7 +3516,7 @@ timeout_state : STRING COLON NUM } ; -ct_timeout_config : PROTOCOL ct_l4protoname SEMICOLON +ct_timeout_config : PROTOCOL ct_l4protoname stmt_separator { struct ct_timeout *ct; int l4proto = $2;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 rule: do not print semicolon in ct timeout
table ip filter {
ct timeout agressive-tcp {
protocol tcp;
^--- remove this semicolonNot needed, remove it.
Fixes c7c94802679c ("src: add ct timeout support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/rule.c +1 -1
@@ -1834,7 +1834,7 @@ static void obj_print_data(const struct obj *obj,nft_print (octx,"%s" , opts->nl);nft_print (octx,"%s%sprotocol " , opts->tab, opts->tab);print_proto_name_proto (obj->ct_timeout.l4proto, octx); -nft_print (octx,";%s" , opts->nl); +nft_print (octx,"%s" , opts->nl); nft_print(octx, "%s%sl3proto %s%s", opts->tab, opts->tab, family2str(obj->ct_timeout.l3proto),
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 rule: print space between policy and timeout
In reply to Pablo Neira Ayuso table ip filter {
ct timeout agressive-tcp {
...
policy = { established : 100, close_wait : 4, close : 4 }
}}
for consistency with map syntax.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/rule.c +1 -1
@@ -1760,7 +1760,7 @@ static void print_proto_timeout_policy(uint8_t l4, const uint32_t *timeout,if (timeout[i] != timeout_protocol[l4].dflt_timeout[i]) {if (comma)nft_print (octx,", " ); -nft_print (octx,"%s: %u" , +nft_print (octx,"%s : %u" , timeout_protocol[l4].state_to_name[i], timeout[i]); comma = true;
Signature · 1 line
2.11.0