diff mbox series

[nft] parser_bison: remove deprecated flow statement

Message ID 20240704220554.277702-1-pablo@netfilter.org
State Accepted
Headers show
Series [nft] parser_bison: remove deprecated flow statement | expand

Commit Message

Pablo Neira Ayuso July 4, 2024, 10:05 p.m. UTC 
Dynamic set/maps are used these days to represent what
3ed5e31f4a32 ("src: add flow statement") provides.

Unlikely meter statement, this statement was never documented
other than in the source code. Ditch it.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/parser_bison.y | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
diff mbox series

Patch

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 6b167080cd93..11ca957bbd29 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -809,8 +809,8 @@  int nft_lex(void *, void *, void *);
 %type <val>			set_stmt_op
 %type <stmt>			map_stmt
 %destructor { stmt_free($$); }	map_stmt
-%type <stmt>			meter_stmt meter_stmt_alloc flow_stmt_legacy_alloc
-%destructor { stmt_free($$); }	meter_stmt meter_stmt_alloc flow_stmt_legacy_alloc
+%type <stmt>			meter_stmt meter_stmt_alloc
+%destructor { stmt_free($$); }	meter_stmt meter_stmt_alloc
 
 %type <expr>			symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
 %destructor { expr_free($$); }	symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
@@ -4212,21 +4212,7 @@  map_stmt		:	set_stmt_op	set_ref_expr '{' set_elem_expr_stmt	COLON	set_elem_expr_
 			}
 			;
 
-meter_stmt		:	flow_stmt_legacy_alloc		TABLE identifier	'{' meter_key_expr stmt '}'
-			{
-				$1->meter.name = $3;
-				$1->meter.key  = $5;
-				$1->meter.stmt = $6;
-				$$->location  = @$;
-				$$ = $1;
-			}
-			|	meter_stmt_alloc		{ $$ = $1; }
-			;
-
-flow_stmt_legacy_alloc	:	FLOW
-			{
-				$$ = meter_stmt_alloc(&@$);
-			}
+meter_stmt		:	meter_stmt_alloc		{ $$ = $1; }
 			;
 
 meter_stmt_alloc	:	METER	identifier		'{' meter_key_expr stmt '}'