summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-07-06 02:02:00 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-08-18 01:36:12 +0200
commit16fac7d11bdf53307328187236a30b6c1a9bd718 (patch)
treed0ab477118530a7c76b9ec70729e9c02bd71a72a
parent1249016780ed5263398c913d06c13177f4893e89 (diff)
src: use cache infrastructure for rule objects
Populate the cache iff the user requests a ruleset listing. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/rule.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/rule.c b/src/rule.c
index a3d9d2cb..7cf21e89 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -70,6 +70,8 @@ static int cache_init_tables(struct netlink_ctx *ctx, struct handle *h)
static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
{
struct table *table;
+ struct chain *chain;
+ struct rule *rule, *nrule;
int ret;
list_for_each_entry(table, &table_list, list) {
@@ -91,6 +93,16 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
*/
if (cmd != CMD_LIST)
continue;
+
+ 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;
}
@@ -963,18 +975,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;
}