From 403d49b87d0d7489d6cab53331b36f81120385fe Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 16 Mar 2018 09:55:57 +0100 Subject: Revert "src: update dynamic set updates from packet path syntax" This reverts commit 9047cc7ae746b1c9abd4e11ed476e37d8716d400, this is breaking tests. --- src/parser_bison.y | 7 ------- src/statement.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index e5573a20..6fba7e59 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -2713,13 +2713,6 @@ set_stmt : SET set_stmt_op set_elem_expr_stmt symbol_expr $$->set.key = $3; $$->set.set = $4; } - | set_stmt_op SET '{' set_elem_expr_stmt '}' symbol_expr - { - $$ = set_stmt_alloc(&@$); - $$->set.op = $1; - $$->set.key = $4; - $$->set.set = $6; - } ; set_stmt_op : ADD { $$ = NFT_DYNSET_OP_ADD; } diff --git a/src/statement.c b/src/statement.c index 41fa24f1..61ba643b 100644 --- a/src/statement.c +++ b/src/statement.c @@ -615,9 +615,9 @@ static const char * const set_stmt_op_names[] = { static void set_stmt_print(const struct stmt *stmt, struct output_ctx *octx) { - nft_print(octx, "%s set { ", set_stmt_op_names[stmt->set.op]); + nft_print(octx, "set %s ", set_stmt_op_names[stmt->set.op]); expr_print(stmt->set.key, octx); - nft_print(octx, "} "); + nft_print(octx, " "); expr_print(stmt->set.set, octx); } -- cgit v1.2.3