diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-07-21 15:00:24 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-07-22 11:47:08 +0200 |
commit | 49d4fe2170b866b3995e764f8b9c4d65ec2b7898 (patch) | |
tree | b23fe6e517efc73934ff538047c1e6e8a914e29a | |
parent | 5173151863d3f44fa77506b0af25560fe1918c0f (diff) |
src: allow for negative value in variable definitions
Extend test to cover for negative value in chain priority definition.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/parser_bison.y | 10 | ||||
-rwxr-xr-x | tests/shell/testcases/chains/0032priority_variable_0 | 10 | ||||
-rw-r--r-- | tests/shell/testcases/chains/dumps/0032priority_variable_0.nft | 13 |
3 files changed, 32 insertions, 1 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index d2d7694a..f0cca641 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -2157,7 +2157,6 @@ extended_prio_spec : int_num { struct prio_spec spec = {0}; - datatype_set($1->sym->expr, &priority_type); spec.expr = $1; $$ = spec; } @@ -3982,6 +3981,15 @@ set_rhs_expr : concat_rhs_expr initializer_expr : rhs_expr | list_rhs_expr | '{' '}' { $$ = compound_expr_alloc(&@$, EXPR_SET); } + | DASH NUM + { + int32_t num = -$2; + + $$ = constant_expr_alloc(&@$, &integer_type, + BYTEORDER_HOST_ENDIAN, + sizeof(num) * BITS_PER_BYTE, + &num); + } ; counter_config : PACKETS NUM BYTES NUM diff --git a/tests/shell/testcases/chains/0032priority_variable_0 b/tests/shell/testcases/chains/0032priority_variable_0 index 51bc5eb1..8f2e57b9 100755 --- a/tests/shell/testcases/chains/0032priority_variable_0 +++ b/tests/shell/testcases/chains/0032priority_variable_0 @@ -6,12 +6,22 @@ set -e RULESET=" define pri = 10 +define post = -10 +define for = \"filter - 100\" table inet global { chain prerouting { type filter hook prerouting priority \$pri policy accept } + chain forward { + type filter hook prerouting priority \$for + policy accept + } + chain postrouting { + type filter hook postrouting priority \$post + policy accept + } }" $NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/dumps/0032priority_variable_0.nft b/tests/shell/testcases/chains/dumps/0032priority_variable_0.nft new file mode 100644 index 00000000..1a1b0794 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0032priority_variable_0.nft @@ -0,0 +1,13 @@ +table inet global { + chain prerouting { + type filter hook prerouting priority filter + 10; policy accept; + } + + chain forward { + type filter hook prerouting priority dstnat; policy accept; + } + + chain postrouting { + type filter hook postrouting priority filter - 10; policy accept; + } +} |