[PATCH nft,v4 15/16] rule: consolidate rule cache

[Pablo Neira Ayuso <pablo@netfilter.org>]

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/rule.c |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/rule.c b/src/rule.c
index e005ce7..4a207e2 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -60,8 +60,10 @@ int cache_init(struct list_head *msgs)
 	struct handle handle = {
 		.family = NFPROTO_UNSPEC,
 	};
+	struct rule *rule, *nrule;
 	struct netlink_ctx ctx;
 	struct table *table;
+	struct chain *chain;
 	int ret;
 
 	memset(&ctx, 0, sizeof(ctx));
@@ -88,6 +90,16 @@ int cache_init(struct list_head *msgs)
 
 		if (ret < 0)
 			return -1;
+
+		ret = netlink_list_table(&ctx, &table->handle,
+					 &internal_location);
+		list_for_each_entry_safe(rule, nrule, &ctx.list, list) {
+			chain = chain_lookup(table, &rule->handle);
+			list_move_tail(&rule->list, &chain->rules);
+		}
+
+		if (ret < 0)
+			return -1;
 	}
 
 	return 0;
@@ -912,18 +924,8 @@ static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd)
 static int do_list_table(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)
 		return -1;
-	if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
-		return -1;
-
-	list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
-		chain = chain_lookup(table, &rule->handle);
-		list_move_tail(&rule->list, &chain->rules);
-	}
 	table_print(table);
 	return 0;
 }
-- 
1.7.10.4