diff options
| author | Florian Westphal <fw@strlen.de> | 2017-06-27 02:34:17 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2017-09-27 20:02:37 +0200 |
| commit | 50537e9e67622acff7d40e495f8d106162f3e38e (patch) | |
| tree | 843e155788ade9d56ca480c5376e1310040451db | |
| parent | db3ffc6eba301a93387d999d5c10e3b9e75d7660 (diff) | |
bison: permit keywords in list_stmt_expressions
'ct event set label' and 'ct event set new or label' work, but
'ct event set new, label' did not:
nft add rule filter input ct event set new,label
Error: syntax error, unexpected label
This changes the definition to also contain keyword symbol expressions.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/parser_bison.y | 11 | ||||
| -rw-r--r-- | tests/py/any/ct.t | 1 | ||||
| -rw-r--r-- | tests/py/any/ct.t.payload | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index ce6a77a8..11f4716a 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -609,8 +609,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <expr> rhs_expr concat_rhs_expr basic_rhs_expr %destructor { expr_free($$); } rhs_expr concat_rhs_expr basic_rhs_expr -%type <expr> primary_rhs_expr list_rhs_expr shift_rhs_expr -%destructor { expr_free($$); } primary_rhs_expr list_rhs_expr shift_rhs_expr +%type <expr> primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_stmt_expr +%destructor { expr_free($$); } primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_stmt_expr %type <expr> and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr %destructor { expr_free($$); } and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr @@ -3302,14 +3302,17 @@ ct_key_dir_optional : BYTES { $$ = NFT_CT_BYTES; } | ZONE { $$ = NFT_CT_ZONE; } ; +symbol_stmt_expr : symbol_expr + | keyword_expr + ; -list_stmt_expr : symbol_expr COMMA symbol_expr +list_stmt_expr : symbol_stmt_expr COMMA symbol_stmt_expr { $$ = list_expr_alloc(&@$); compound_expr_add($$, $1); compound_expr_add($$, $3); } - | list_stmt_expr COMMA symbol_expr + | list_stmt_expr COMMA symbol_stmt_expr { $1->location = @$; compound_expr_add($1, $3); diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t index f02bd042..fb3ae098 100644 --- a/tests/py/any/ct.t +++ b/tests/py/any/ct.t @@ -107,6 +107,7 @@ ct mark original;fail ct event set new;ok ct event set new or related or destroy or foobar;fail ct event set 'new | related | destroy | label';ok;ct event set new,related,destroy,label +ct event set new,related,destroy,label;ok ct event set new,destroy;ok ct event set 1;ok;ct event set new ct event set 0x0;ok diff --git a/tests/py/any/ct.t.payload b/tests/py/any/ct.t.payload index 20acbb9b..7ebf3f8d 100644 --- a/tests/py/any/ct.t.payload +++ b/tests/py/any/ct.t.payload @@ -401,6 +401,11 @@ ip test-ip4 output [ immediate reg 1 0x00000407 ] [ ct set event with reg 1 ] +# ct event set new,related,destroy,label +ip test-ip4 output + [ immediate reg 1 0x00000407 ] + [ ct set event with reg 1 ] + # ct event set new,destroy ip test-ip4 output [ immediate reg 1 0x00000005 ] |