]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
Revert "src: update dynamic set updates from packet path syntax"
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 16 Mar 2018 08:55:57 +0000 (09:55 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 16 Mar 2018 08:56:48 +0000 (09:56 +0100)
This reverts commit 9047cc7ae746b1c9abd4e11ed476e37d8716d400, this is breaking
tests.

src/parser_bison.y
src/statement.c

index e5573a208d45374fada6e9a13155fd9e7cfe9b3a..6fba7e59555ca07242b56405688dc1e157bd54be 100644 (file)
@@ -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; }
index 41fa24f1d4df0cf0b11b515784e5f30d03b8004a..61ba643becc3613dd5e89e7ac9af13f0ca4ffa0d 100644 (file)
@@ -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);
 }