From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 20 Mar 2025 09:43:42 +0000 (+0100)
Subject: parser_bison: consolidate counter grammar rule for set elements
X-Git-Tag: v1.1.2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe069b8c3be4ddfd361c2a40cd861b7a49e2ae12;p=thirdparty%2Fnftables.git

parser_bison: consolidate counter grammar rule for set elements

Use existing grammar rules to parse counters to simplify parser.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/parser_bison.y b/src/parser_bison.y
index cc3c9085..8b5a1c5c 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -4596,16 +4596,7 @@ set_elem_stmt_list	:	set_elem_stmt
 			}
 			;
 
-set_elem_stmt		:	COUNTER	close_scope_counter
-			{
-				$$ = counter_stmt_alloc(&@$);
-			}
-			|	COUNTER	PACKETS	NUM	BYTES	NUM	close_scope_counter
-			{
-				$$ = counter_stmt_alloc(&@$);
-				$$->counter.packets = $3;
-				$$->counter.bytes = $5;
-			}
+set_elem_stmt		:	counter_stmt	close_scope_counter
 			|	LIMIT   RATE    limit_mode      limit_rate_pkts       limit_burst_pkts	close_scope_limit
 			{
 				if ($5 == 0) {