From 4b3d579c281aa07282531369d43e799d6276dd22 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 25 Sep 2015 12:51:13 +0200 Subject: rule: display table when listing one set After: # nft list set ip6 test foo table ip6 test { set foo { type ipv4_addr } } Before: # nft list set ip6 test foo set foo { type ipv4_addr } Signed-off-by: Pablo Neira Ayuso Acked-by: Arturo Borrero Gonzalez --- src/rule.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/rule.c b/src/rule.c index 344e3967..502f9e5c 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1043,6 +1043,13 @@ static int do_list_tables(struct netlink_ctx *ctx, struct cmd *cmd) return 0; } +static void table_print_declaration(struct table *table) +{ + printf("table %s %s {\n", + family2str(table->handle.family), + table->handle.table); +} + static int do_list_chains(struct netlink_ctx *ctx, struct cmd *cmd) { struct table *table; @@ -1053,9 +1060,7 @@ static int do_list_chains(struct netlink_ctx *ctx, struct cmd *cmd) cmd->handle.family != table->handle.family) continue; - printf("table %s %s {\n", - family2str(table->handle.family), - table->handle.table); + table_print_declaration(table); list_for_each_entry(chain, &table->chains, list) { chain_print_declaration(chain); @@ -1076,7 +1081,10 @@ static int do_list_set(struct netlink_ctx *ctx, struct cmd *cmd, if (set == NULL) return -1; + table_print_declaration(table); set_print(set); + printf("}\n"); + return 0; } -- cgit v1.2.3