evaluate: replace variable expression by the value expression
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: replace variable expression by the value expression
The variable expression provides the binding between the variable dereference and the value expression. Replace the variable expression by the real value expression after the evaluation.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
src/evaluate.c +4 -1
@@ -2013,10 +2013,13 @@ static int expr_evaluate_variable(struct eval_ctx *ctx, struct expr **exprp) {struct expr *new =expr_clone ((*exprp)->sym->expr); +if (expr_evaluate (ctx, &new) <0 ) +return -1 ; +expr_free (*exprp); *exprp = new; -return expr_evaluate (ctx, exprp); +return 0 ; }static int expr_evaluate_xfrm (struct eval_ctx *ctx,struct expr **exprp)
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 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 <[email protected]>
--- src/parser_bison.y | 10 +++++++++- .../shell/testcases/chains/0032priority_variable_0 | 10 ++++++++++ .../chains/dumps/0032priority_variable_0.nft | 13 +++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/shell/testcases/chains/dumps/0032priority_variable_0.nft
src/parser_bison.y +9 -1
@@ -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
tests/shell/testcases/chains/0032priority_variable_0 +10 -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"
tests/shell/testcases/chains/dumps/0032priority_variable_0.nft new file +13 -0
@@ -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; + } +}
Signature · 1 line
2.20.1