* [PATCH nft] parser_bison: simplify reset syntax
@ 2023-03-14 16:05 Pablo Neira Ayuso
2023-03-14 16:13 ` Phil Sutter
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2023-03-14 16:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: phil
Simplify:
*reset rules* *chain* ['family'] 'table' ['chain]'
to
*reset rules* ['family'] 'table' 'chain'
*reset rules* *table* ['family'] 'table'
to
*reset rules* ['family'] 'table'
*reset counters* ['family'] *table* 'table'
to
*reset counters* ['family'] 'table'
*reset quotas* ['family'] *table* 'table'
to
*reset quotas* ['family'] 'table'
Previous syntax remains in place for backward compatibility.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
doc/nft.txt | 8 ++++----
src/parser_bison.y | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/doc/nft.txt b/doc/nft.txt
index 0d60c7520d31..8624d5dd8f60 100644
--- a/doc/nft.txt
+++ b/doc/nft.txt
@@ -491,8 +491,8 @@ RULES
{*delete* | *reset*} *rule* ['family'] 'table' 'chain' *handle* 'handle'
*destroy rule* ['family'] 'table' 'chain' *handle* 'handle'
*reset rules* ['family']
-*reset rules* *table* ['family'] 'table'
-*reset rules* *chain* ['family'] 'table' ['chain']
+*reset rules* ['family'] 'table'
+*reset chain* ['family'] 'table' 'chain'
Rules are added to chains in the given table. If the family is not specified, the
ip family is used. Rules are constructed from two kinds of components according
@@ -762,8 +762,8 @@ STATEFUL OBJECTS
*list limits* ['family']
*reset counters* ['family']
*reset quotas* ['family']
-*reset counters* ['family'] *table* 'table'
-*reset quotas* ['family'] *table* 'table'
+*reset counters* ['family'] 'table'
+*reset quotas* ['family'] 'table'
Stateful objects are attached to tables and are identified by a unique name.
They group stateful information from rules, to reference them in rules the
diff --git a/src/parser_bison.y b/src/parser_bison.y
index ccedfafe1bfa..e4f21ca1a722 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -1650,11 +1650,16 @@ basehook_spec : ruleset_spec
;
reset_cmd : COUNTERS ruleset_spec
+ {
+ $$ = cmd_alloc(CMD_RESET, CMD_OBJ_COUNTERS, &$2, &@$, NULL);
+ }
+ | COUNTERS table_spec
{
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_COUNTERS, &$2, &@$, NULL);
}
| COUNTERS TABLE table_spec
{
+ /* alias of previous rule. */
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_COUNTERS, &$3, &@$, NULL);
}
| COUNTER obj_spec close_scope_counter
@@ -1669,6 +1674,11 @@ reset_cmd : COUNTERS ruleset_spec
{
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_QUOTAS, &$3, &@$, NULL);
}
+ | QUOTAS table_spec
+ {
+ /* alias of previous rule. */
+ $$ = cmd_alloc(CMD_RESET, CMD_OBJ_QUOTAS, &$2, &@$, NULL);
+ }
| QUOTA obj_spec close_scope_quota
{
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_QUOTA, &$2, &@$, NULL);
@@ -1677,12 +1687,22 @@ reset_cmd : COUNTERS ruleset_spec
{
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL);
}
+ | RULES table_spec
+ {
+ $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL);
+ }
| RULES TABLE table_spec
{
+ /* alias of previous rule. */
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$3, &@$, NULL);
}
+ | RULES chain_spec
+ {
+ $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL);
+ }
| RULES CHAIN chain_spec
{
+ /* alias of previous rule. */
$$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$3, &@$, NULL);
}
| RULE ruleid_spec
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nft] parser_bison: simplify reset syntax
2023-03-14 16:05 [PATCH nft] parser_bison: simplify reset syntax Pablo Neira Ayuso
@ 2023-03-14 16:13 ` Phil Sutter
0 siblings, 0 replies; 2+ messages in thread
From: Phil Sutter @ 2023-03-14 16:13 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
On Tue, Mar 14, 2023 at 05:05:37PM +0100, Pablo Neira Ayuso wrote:
> Simplify:
>
> *reset rules* *chain* ['family'] 'table' ['chain]'
> to
> *reset rules* ['family'] 'table' 'chain'
>
> *reset rules* *table* ['family'] 'table'
> to
> *reset rules* ['family'] 'table'
>
> *reset counters* ['family'] *table* 'table'
> to
> *reset counters* ['family'] 'table'
>
> *reset quotas* ['family'] *table* 'table'
> to
> *reset quotas* ['family'] 'table'
>
> Previous syntax remains in place for backward compatibility.
>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> doc/nft.txt | 8 ++++----
> src/parser_bison.y | 20 ++++++++++++++++++++
> 2 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/doc/nft.txt b/doc/nft.txt
> index 0d60c7520d31..8624d5dd8f60 100644
> --- a/doc/nft.txt
> +++ b/doc/nft.txt
> @@ -491,8 +491,8 @@ RULES
> {*delete* | *reset*} *rule* ['family'] 'table' 'chain' *handle* 'handle'
> *destroy rule* ['family'] 'table' 'chain' *handle* 'handle'
> *reset rules* ['family']
> -*reset rules* *table* ['family'] 'table'
> -*reset rules* *chain* ['family'] 'table' ['chain']
> +*reset rules* ['family'] 'table'
> +*reset chain* ['family'] 'table' 'chain'
~~~~~
This is a leftover. You may combine all three lines into a single:
| *reset rules* ['family'] ['table' ['chain']]
Cheers, Phil
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-14 16:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-14 16:05 [PATCH nft] parser_bison: simplify reset syntax Pablo Neira Ayuso
2023-03-14 16:13 ` Phil Sutter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).