From aabb9c46ac4cfdff3aad136dd2ed7cb2bb0f9293 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 20 Feb 2017 18:03:18 +0100 Subject: src: allow listing all ct helpers this implements nft list ct helpers table filter table ip filter { ct helper ftp-standard { .. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/evaluate.c | 1 + src/parser_bison.y | 19 +++++++++++++++++++ src/rule.c | 2 ++ 3 files changed, 22 insertions(+) (limited to 'src') diff --git a/src/evaluate.c b/src/evaluate.c index ae30bc9b..20f67ee7 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -3023,6 +3023,7 @@ static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) return cmd_evaluate_list_obj(ctx, cmd, NFT_OBJECT_COUNTER); case CMD_OBJ_COUNTERS: case CMD_OBJ_QUOTAS: + case CMD_OBJ_CT_HELPERS: if (cmd->handle.table == NULL) return 0; if (table_lookup(&cmd->handle) == NULL) diff --git a/src/parser_bison.y b/src/parser_bison.y index 2cf732ce..1bcbff59 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1016,6 +1016,25 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_MAP, &$2, &@$, NULL); } + | CT STRING TABLE table_spec + { + int cmd; + + if (strcmp($2, "helpers") == 0) { + cmd = CMD_OBJ_CT_HELPERS; + } else { + struct error_record *erec; + + erec = error(&@$, "unknown ct class '%s', want 'helpers'", $2); + + if (erec != NULL) { + erec_queue(erec, state->msgs); + YYERROR; + } + } + + $$ = cmd_alloc(CMD_LIST, cmd, &$4, &@$, NULL); + } ; reset_cmd : COUNTERS ruleset_spec diff --git a/src/rule.c b/src/rule.c index 17c20f35..453aa2f2 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1455,6 +1455,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_OBJ_QUOTA: case CMD_OBJ_QUOTAS: return do_list_obj(ctx, cmd, NFT_OBJECT_QUOTA); + case CMD_OBJ_CT_HELPERS: + return do_list_obj(ctx, cmd, NFT_OBJECT_CT_HELPER); default: BUG("invalid command object type %u\n", cmd->obj); } -- cgit v1.2.3