From 4e5231ca0d0684f5326909882400a5a584bca018 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Fri, 26 Sep 2014 18:30:08 +0200 Subject: src: add list ruleset command This patch adds a new command to nft: % nft list ruleset [family] Which list the entire ruleset. If no family is specified, all tables of all families are listed. Users can now make several operations at ruleset level: % nft list ruleset > ruleset.nft % nft -f ruleset.nft % nft flush ruleset Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/parser.y | 4 ++++ src/rule.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) (limited to 'src') diff --git a/src/parser.y b/src/parser.y index db120a06..4a8df7b7 100644 --- a/src/parser.y +++ b/src/parser.y @@ -754,6 +754,10 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SET, &$2, &@$, NULL); } + | RULESET ruleset_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_RULESET, &$2, &@$, NULL); + } ; flush_cmd : TABLE table_spec diff --git a/src/rule.c b/src/rule.c index 336c1595..43355eeb 100644 --- a/src/rule.c +++ b/src/rule.c @@ -782,6 +782,32 @@ err: return -1; } +static int do_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd) +{ + struct table *table, *next; + LIST_HEAD(tables); + + if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0) + return -1; + + list_splice_tail_init(&ctx->list, &tables); + + list_for_each_entry_safe(table, next, &tables, list) { + table_add_hash(table); + + cmd->handle.family = table->handle.family; + cmd->handle.table = xstrdup(table->handle.table); + + if (do_list_table(ctx, cmd, table) < 0) + return -1; + + list_del(&table->list); + table_free(table); + } + + return 0; +} + static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) { struct table *table = NULL; @@ -837,6 +863,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) set_print(set); } return 0; + case CMD_OBJ_RULESET: + return do_list_ruleset(ctx, cmd); default: BUG("invalid command object type %u\n", cmd->obj); } -- cgit v1.2.3