parser: allow ct timeouts to use time_spec values
Florian Westphal
maintainerPATCH 1/1 parser: allow ct timeouts to use time_spec values
For some reason the parser only allows raw numbers (seconds) for ct timeouts, e.g.
ct timeout ttcp {
protocol tcp;
policy = { syn_sent : 3, ...Also permit time_spec, e.g. "established : 5d". Print the nicer time formats on output, but retain raw numbers support on input for compatibility.
Signed-off-by Florian Westphal <[email protected]>
--- doc/stateful-objects.txt | 2 +- src/parser_bison.y | 10 +++++++--- src/rule.c | 9 ++++++--- tests/shell/testcases/listing/0013objects_0 | 2 +- .../testcases/nft-f/dumps/0017ct_timeout_obj_0.nft | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-)
doc/stateful-objects.txt +1 -1
@@ -94,7 +94,7 @@ table ip filter { ct timeout customtimeout { protocol tcp; l3proto ip - policy = { established: 120, close: 20 } + policy = { established: 2m, close: 20s } } chain output {
src/parser_bison.y +7 -3
@@ -673,7 +673,7 @@ int nft_lex(void *, void *, void *); %type <string> identifier type_identifier string comment_spec %destructor { xfree($$); } identifier type_identifier string comment_spec -%type <val> time_spec quota_used +%type <val> time_spec time_spec_or_num_s quota_used %type <expr> data_type_expr data_type_atom_expr %destructor { expr_free($$); } data_type_expr data_type_atom_expr
@@ -2790,6 +2790,11 @@ time_spec : STRING } ; +/* compatibility kludge to allow either 60, 60s, 1m, ... */ +time_spec_or_num_s : NUM + | time_spec { $$ = $1 / 1000u; } + ; + family_spec : /* empty */ { $$ = NFPROTO_IPV4; } | family_spec_explicit ;
@@ -4812,8 +4817,7 @@ timeout_states : timeout_state } ; -timeout_state : STRING COLON NUM - +timeout_state : STRING COLON time_spec_or_num_s { struct timeout_state *ts;
src/rule.c +6 -3
@@ -1684,11 +1684,14 @@ static void print_proto_timeout_policy(uint8_t l4, const uint32_t *timeout,nft_print (octx,"%s%spolicy = { " , opts->tab, opts->tab);for (i =0 ; i < timeout_protocol[l4].array_size; i++) {if (timeout[i] != timeout_protocol[l4].dflt_timeout[i]) { +uint64_t timeout_ms; +if (comma)nft_print (octx,", " ); -nft_print (octx,"%s : %u" , - timeout_protocol[l4].state_to_name[i], - timeout[i]); + timeout_ms = timeout[i] *1000u ; +nft_print (octx,"%s : " , + timeout_protocol[l4].state_to_name[i]); +time_print (timeout_ms, octx); comma = true; } }
tests/shell/testcases/listing/0013objects_0 +1 -1
@@ -15,7 +15,7 @@ EXPECTED="table ip test { ct timeout cttime { protocol udp l3proto ip - policy = { unreplied : 15, replied : 12 } + policy = { unreplied : 15s, replied : 12s } } ct expectation ctexpect {
tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft +1 -1
@@ -2,7 +2,7 @@ table ip filter { ct timeout cttime { protocol tcp l3proto ip - policy = { established : 123, close : 12 } + policy = { established : 2m3s, close : 12s } } chain c {
Signature · 1 line
2.41.0