diff options
| -rw-r--r-- | doc/nft.txt | 8 | ||||
| -rw-r--r-- | src/parser_bison.y | 20 |
2 files changed, 23 insertions, 5 deletions
diff --git a/doc/nft.txt b/doc/nft.txt index 0d60c752..83f0f8bb 100644 --- a/doc/nft.txt +++ b/doc/nft.txt @@ -490,9 +490,7 @@ RULES *replace rule* ['family'] 'table' 'chain' *handle* 'handle' 'statement' ... [*comment* 'comment'] {*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' ['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 +760,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 ccedfafe..e4f21ca1 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1653,8 +1653,13 @@ 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 |