diff options
| -rw-r--r-- | src/evaluate.c | 10 | ||||
| -rw-r--r-- | src/parser_bison.y | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index ed41bd8a..379f9d70 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2950,10 +2950,16 @@ static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) return cmd_error(ctx, "Could not process rule: Object '%s' does not exist", cmd->handle.obj); return 0; - case CMD_OBJ_CHAINS: - case CMD_OBJ_SETS: case CMD_OBJ_COUNTERS: case CMD_OBJ_QUOTAS: + if (cmd->handle.table == NULL) + return 0; + if (table_lookup(&cmd->handle) == NULL) + return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", + cmd->handle.table); + return 0; + case CMD_OBJ_CHAINS: + case CMD_OBJ_SETS: case CMD_OBJ_RULESET: case CMD_OBJ_FLOWTABLES: case CMD_OBJ_MAPS: diff --git a/src/parser_bison.y b/src/parser_bison.y index a1b8b088..d543e3ea 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -932,6 +932,10 @@ list_cmd : TABLE table_spec { $$ = 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 { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_COUNTER, &$2, &@$, NULL); @@ -940,6 +944,10 @@ list_cmd : TABLE table_spec { $$ = 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 { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_QUOTA, &$2, &@$, NULL); |