parser_bison: simplify syntax to list all sets in table
Pablo Neira Ayuso
maintainerPATCH 1/1 parser_bison: simplify syntax to list all sets in table
Revisit f99ccda252fa ("parser: allow listing sets in one table") to add an alias to list all sets in a given table, eg.
# nft list sets ip x
table ip x {
set s1 {
type ipv4_addr
}
set s2 {
type ipv4_addr
}
}This is similar to 275989737ec4 ("parser_bison: simplify reset syntax").
Update nft(8) manpage too.
--- doc/nft.txt | 2 ++ src/parser_bison.y | 5 +++++ 2 files changed, 7 insertions(+)
doc/nft.txt +2 -0
@@ -588,6 +588,8 @@ section describes nft set syntax in more detail. *add set* ['family'] 'table' 'set' *{ type* 'type' | *typeof* 'expression' *;* [*flags* 'flags' *;*] [*timeout* 'timeout' *;*] [*gc-interval* 'gc-interval' *;*] [*elements = {* 'element'[*,* ...] *} ;*] [*size* 'size' *;*] [*comment* 'comment' *;*'] [*policy* 'policy' *;*] [*auto-merge ;*] *}* {*delete* | *destroy* | *list* | *flush* | *reset* } *set* ['family'] 'table' 'set' *list sets* ['family'] +*list sets* ['family'] 'table' +*list set* ['family'] 'table' 'set' *delete set* ['family'] 'table' *handle* 'handle' {*add* | *delete* | *destroy* } *element* ['family'] 'table' 'set' *{* 'element'[*,* ...] *}*
src/parser_bison.y +5 -0
@@ -1590,8 +1590,13 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL); } + | SETS table_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL); + } | SETS TABLE table_spec { + /* alias of previous rule. */ $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$3, &@$, NULL); } | SET set_spec
Signature · 1 line
2.30.2
Florian Westphal
maintainerQuoted 2 lines · Pablo Neira Ayuso
Revisit
f99ccda252fa("parser: allow listing sets in one table") to add an alias to list all sets in a given table, eg.
[..]
Quoted 7 lines
src/parser_bison.y +0
-0@@ -1590,8 +1590,13 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL);
src/parser_bison.y list_cmd : TABLE table_spec · line 1601
Quoted 10 lines
src/parser_bison.y +5
-0} + | SETS table_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL); + } | SETS TABLE table_spec { + /* alias of previous rule. */ $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$3, &@$, NULL); }
I have concerns wrt. to ever expanding list of aliases, it causes divergence as to what is allowed:
<keyword>
<keyword> inet
<keyword> inet foo
<keyword> table inet foo
In some cases, all of these work (4 being aliased to 3). In others, e.g. "counters" or "quotas" "inet foo" won't work.
It would be good to at least be consistent. What about this?
It would be good to compact it further, this is all because of copypastry +slow divergence on later addendums to command subsets.
src/parser_bison.y | 63 +++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 46 deletions(-)
src/parser_bison.y +17 -46
@@ -723,6 +723,9 @@ int nft_lex(void *, void *, void *); %type <handle> basehook_spec %destructor { handle_free(&$$); } basehook_spec +%type <handle> list_cmd_spec_any list_cmd_spec_table +%destructor { handle_free(&$$); } list_cmd_spec_any list_cmd_spec_table + %type <val> family_spec family_spec_explicit %type <val32> int_num chain_policy %type <prio_spec> extended_prio_spec prio_spec
@@ -1570,6 +1573,13 @@ get_cmd : ELEMENT set_spec set_block_expr } ; +list_cmd_spec_table : TABLE table_spec { $$ = $2; } + | table_spec + ; +list_cmd_spec_any : list_cmd_spec_table + | ruleset_spec + ; + list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_TABLE, &$2, &@$, NULL);
@@ -1586,50 +1596,34 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_CHAINS, &$2, &@$, NULL); } - | SETS ruleset_spec + | SETS list_cmd_spec_any { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL); } - | SETS TABLE table_spec - { - $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$3, &@$, NULL); - } | SET set_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SET, &$2, &@$, NULL); } - | COUNTERS ruleset_spec + | COUNTERS list_cmd_spec_any { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_COUNTERS, &$2, &@$, NULL); } - | COUNTERS TABLE table_spec - { - $$ = cmd_alloc(CMD_LIST, CMD_OBJ_COUNTERS, &$3, &@$, NULL); - } | COUNTER obj_spec close_scope_counter { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_COUNTER, &$2, &@$, NULL); } - | QUOTAS ruleset_spec + | QUOTAS list_cmd_spec_any { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_QUOTAS, &$2, &@$, NULL); } - | QUOTAS TABLE table_spec - { - $$ = cmd_alloc(CMD_LIST, CMD_OBJ_QUOTAS, &$3, &@$, NULL); - } | QUOTA obj_spec close_scope_quota { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_QUOTA, &$2, &@$, NULL); } - | LIMITS ruleset_spec + | LIMITS list_cmd_spec_any { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_LIMITS, &$2, &@$, NULL); } - | LIMITS TABLE table_spec - { - $$ = cmd_alloc(CMD_LIST, CMD_OBJ_LIMITS, &$3, &@$, NULL); - } | LIMIT obj_spec close_scope_limit { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_LIMIT, &$2, &@$, NULL);
@@ -1728,36 +1722,18 @@ basehook_spec : ruleset_spec } ; -reset_cmd : COUNTERS ruleset_spec +reset_cmd : COUNTERS list_cmd_spec_any { $$ = 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 { $$ = cmd_alloc(CMD_RESET, CMD_OBJ_COUNTER, &$2,&@$, NULL); } - | QUOTAS ruleset_spec + | QUOTAS list_cmd_spec_any { $$ = cmd_alloc(CMD_RESET, CMD_OBJ_QUOTAS, &$2, &@$, NULL); } - | QUOTAS TABLE table_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);
@@ -1766,15 +1742,10 @@ reset_cmd : COUNTERS ruleset_spec { $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL); } - | RULES table_spec + | RULES list_cmd_spec_table { $$ = cmd_alloc(CMD_RESET, CMD_OBJ_TABLE, &$2, &@$, NULL); } - | RULES TABLE table_spec - { - /* alias of previous rule. */ - $$ = cmd_alloc(CMD_RESET, CMD_OBJ_TABLE, &$3, &@$, NULL); - } | RULES chain_spec { $$ = cmd_alloc(CMD_RESET, CMD_OBJ_CHAIN, &$2, &@$, NULL);
Pablo Neira Ayuso
maintainerQuoted 32 lines · Florian Westphal
Quoted 2 lines · Pablo Neira Ayuso
Revisit
f99ccda252fa("parser: allow listing sets in one table") to add an alias to list all sets in a given table, eg.[..]
Quoted 7 lines
src/parser_bison.y +0
-0@@ -1590,8 +1590,13 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL);src/parser_bison.y list_cmd : TABLE table_spec · line 1601
Quoted 10 lines
src/parser_bison.y +5
-0} + | SETS table_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$2, &@$, NULL); + } | SETS TABLE table_spec { + /* alias of previous rule. */ $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SETS, &$3, &@$, NULL); }I have concerns wrt. to ever expanding list of aliases, it causes divergence as to what is allowed:
<keyword>
<keyword> inet
<keyword> inet foo
<keyword> table inet foo
Quoted 7 lines
In some cases, all of these work (4 being aliased to 3). In others, e.g. "counters" or "quotas" "inet foo" won't work.
It would be good to at least be consistent. What about this?
It would be good to compact it further, this is all because of copypastry +slow divergence on later addendums to command subsets.
Consolidating aliases is indeed better approach, please go ahead submit this patch.
Thanks.