Skip to contentSkip to conversation

rule: factorize chain and table listing code

PATCH Applied Arturo Borrero Gonzalez 2 participants 5 messages Sep 24, 2014 – Sep 29, 2014 netfilter

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 rule: factorize chain and table listing code

Let's factorize common code. This is also useful in follow-up patches.

---
 src/rule.c |   67 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)
src/rule.c +35 -32
index 2fe2520..ac72f12 100644
@@ -749,11 +749,42 @@ static void do_command_list_cleanup(struct table *table)
 	}
 }
 
+static int do_command_list_table_content(struct netlink_ctx *ctx,
+					 struct cmd *cmd, struct table *table)
+{
+	struct rule *rule, *nrule;
+	struct chain *chain;
+
+	if (do_list_sets(ctx, &cmd->location, table) < 0)
+		goto err;
+	if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
+		goto err;
+	list_splice_tail_init(&ctx->list, &table->chains);
+	if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
+		goto err;
+
+	list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
+		table = table_lookup(&rule->handle);
+		chain = chain_lookup(table, &rule->handle);
+		if (chain == NULL) {
+			chain = chain_alloc(rule->handle.chain);
+			chain_add_hash(chain, table);
+		}
+
+		list_move_tail(&rule->list, &chain->rules);
+	}
+
+	table_print(table);
+	do_command_list_cleanup(table);
+	return 0;
+err:
+	do_command_list_cleanup(table);
+	return -1;
+}
+
 static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 {
 	struct table *table = NULL;
-	struct chain *chain;
-	struct rule *rule, *nrule;
 	struct set *set;
 
 	/* No need to allocate the table object when listing all tables */
@@ -781,24 +812,9 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 			}
 			return 0;
 		}
-		/* List content of this table */
-		if (do_list_sets(ctx, &cmd->location, table) < 0)
-			goto err;
-		if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
-			goto err;
-		list_splice_tail_init(&ctx->list, &table->chains);
-		if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
-			goto err;
-		break;
+		return do_command_list_table_content(ctx, cmd, table);
 	case CMD_OBJ_CHAIN:
-		if (do_list_sets(ctx, &cmd->location, table) < 0)
-			goto err;
-		if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
-			goto err;
-		list_splice_tail_init(&ctx->list, &table->chains);
-		if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
-			goto err;
-		break;
+		return do_command_list_table_content(ctx, cmd, table);
 	case CMD_OBJ_SETS:
 		if (netlink_list_sets(ctx, &cmd->handle, &cmd->location) < 0)
 			goto err;
@@ -825,19 +841,6 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 		BUG("invalid command object type %u\n", cmd->obj);
 	}
 
-	list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
-		table = table_lookup(&rule->handle);
-		chain = chain_lookup(table, &rule->handle);
-		if (chain == NULL) {
-			chain = chain_alloc(rule->handle.chain);
-			chain_add_hash(chain, table);
-		}
-
-		list_move_tail(&rule->list, &chain->rules);
-	}
-
-	table_print(table);
-	do_command_list_cleanup(table);
 	return 0;
 err:
 	do_command_list_cleanup(table);
#1 lore raw

PATCH 2/2 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

---
 src/parser.y |    4 ++++
 src/rule.c   |   29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
src/parser.y +4 -0
index e35eede..8f58e3a 100644
@@ -753,6 +753,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
src/rule.c +29 -0
index ac72f12..9c13474 100644
@@ -782,6 +782,33 @@ err:
 	return -1;
 }
 
+static int do_command_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd)
+{
+	struct table *table, *nt;
+	struct netlink_ctx inner_ctx;
+	LIST_HEAD(msgs);
+
+	if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0)
+		return -1;
+
+	memset(&inner_ctx, 0, sizeof(inner_ctx));
+	init_list_head(&inner_ctx.list);
+	init_list_head(&msgs);
+	inner_ctx.msgs = &msgs;
+
+	list_for_each_entry_safe(table, nt, &ctx->list, list) {
+		table_add_hash(table);
+
+		cmd->handle.family = table->handle.family;
+		cmd->handle.table = table->handle.table;
+
+		if (do_command_list_table_content(&inner_ctx, cmd, table) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
 static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 {
 	struct table *table = NULL;
@@ -837,6 +864,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 			set_print(set);
 		}
 		return 0;
+	case CMD_OBJ_RULESET:
+		return do_command_list_ruleset(ctx, cmd);
 	default:
 		BUG("invalid command object type %u\n", cmd->obj);
 	}
#2 lore raw

Re: [nft PATCH 2/2] src: add list ruleset command

Quoted 38 lines · Arturo Borrero Gonzalez

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

---
 src/parser.y |    4 ++++
 src/rule.c   |   29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
src/parser.y +4 -0
index e35eede..8f58e3a 100644
@@ -753,6 +753,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
src/rule.c +0 -0
index ac72f12..9c13474 100644

src/rule.c err: · line 785

Quoted 4 lines
src/rule.c +1 -0
@@ -782,6 +782,33 @@ err:
 	return -1;
 }
 
+static int do_command_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd)

I'd suggest do_list_ruleset.

So we leave the do_command_ prefix for functions that are called from do_command().

src/rule.c err: · line 787

Quoted 2 lines
src/rule.c +2 -0
+{
+	struct table *table, *nt;
                              ^

please, use 'next' whenever possible.

src/rule.c err: · line 797

Quoted 10 lines
src/rule.c +10 -0
+	struct netlink_ctx inner_ctx;
+	LIST_HEAD(msgs);
+
+	if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0)
+		return -1;
+
+	memset(&inner_ctx, 0, sizeof(inner_ctx));
+	init_list_head(&inner_ctx.list);
+	init_list_head(&msgs);
+	inner_ctx.msgs = &msgs;

I think you can skip this inner_ctx if you declare:

        LIST_HEAD(table_list);

and then you use list_splice_tail_init() to migrate the temporary ctx->list to table_list.

src/rule.c err: · line 799

Quoted 2 lines
src/rule.c +2 -0
+
+	list_for_each_entry_safe(table, nt, &ctx->list, list) {
                                            ^^^^^^^^^^

Then, use table_list here to iterate over it.

Quoted 25 lines
src/rule.c +14 -0
+		table_add_hash(table);
+
+		cmd->handle.family = table->handle.family;
+		cmd->handle.table = table->handle.table;
+
+		if (do_command_list_table_content(&inner_ctx, cmd, table) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
 static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 {
 	struct table *table = NULL;
@@ -837,6 +864,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
 			set_print(set);
 		}
 		return 0;
+	case CMD_OBJ_RULESET:
+		return do_command_list_ruleset(ctx, cmd);
 	default:
 		BUG("invalid command object type %u\n", cmd->obj);
 	}
#3 lore raw
In reply to Arturo Borrero Gonzalez
Quoted 12 lines · Arturo Borrero Gonzalez

Let's factorize common code. This is also useful in follow-up patches.

---
 src/rule.c |   67 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)
src/rule.c +0 -0
index 2fe2520..ac72f12 100644

src/rule.c static void do_command_list_cleanup(struct table *table) · line 753

Quoted 5 lines
src/rule.c +2 -0
@@ -749,11 +749,42 @@ static void do_command_list_cleanup(struct table *table)
 	}
 }
 
+static int do_command_list_table_content(struct netlink_ctx *ctx,
+					 struct cmd *cmd, struct table *table)

I prefer a slightly shorter name: do_list_table.

do_command_list_cleanup can probably be renamed to table_cleanup since it has nothing to do with the commands.