parser_bison: allow 0 burst in limit rate byte mode
Pablo Neira Ayuso
maintainerPATCH 1/1 parser_bison: allow 0 burst in limit rate byte mode
Unbreak restoring elements in set with rate limit that fail with:
Quoted 2 lines
/dev/stdin:3618:61-61: Error: limit burst must be > 0
elements = { 1.2.3.4 limit rate over 1000 kbytes/second timeout 1s,
no need for burst != 0 for limit rate byte mode.
Add tests/shell too.
Fixes 702eff5b5b74 ("src: allow burst 0 for byte ratelimit and use it as default")
Fixes 285baccfea46 ("src: disallow burst 0 in ratelimits")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/parser_bison.y | 5 ----- .../shell/testcases/sets/dumps/elem_limit_0.nft | 7 +++++++ tests/shell/testcases/sets/elem_limit_0 | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 tests/shell/testcases/sets/dumps/elem_limit_0.nft create mode 100755 tests/shell/testcases/sets/elem_limit_0
src/parser_bison.y +0 -5
@@ -4609,11 +4609,6 @@ set_elem_stmt : COUNTER close_scope_counter } | LIMIT RATE limit_mode limit_rate_bytes limit_burst_bytes close_scope_limit { - if ($5 == 0) { - erec_queue(error(&@6, "limit burst must be > 0"), - state->msgs); - YYERROR; - } $$ = limit_stmt_alloc(&@$); $$->limit.rate = $4.rate; $$->limit.unit = $4.unit;
tests/shell/testcases/sets/dumps/elem_limit_0.nft new file +7 -0
@@ -0,0 +1,7 @@ +table netdev filter { + set test123 { + typeof ip saddr + limit rate over 1 mbytes/second + elements = { 1.2.3.4 limit rate over 1 mbytes/second } + } +}
tests/shell/testcases/sets/elem_limit_0 new file +17 -0
@@ -0,0 +1,17 @@ +#!/bin/bash + +## requires EXPR + +set -e + +RULESET="table netdev filter { + set test123 { + typeof ip saddr + limit rate over 1024 kbytes/second + elements = { 1.2.3.4 limit rate over 1024 kbytes/second } + } +}" + +$NFT -f - <<< $RULESET + +(echo "flush ruleset netdev"; $NFT --stateless list ruleset netdev) | $NFT -f -
Signature · 1 line
2.30.2