diff options
| -rw-r--r-- | include/rule.h | 2 | ||||
| -rw-r--r-- | src/cache.c | 6 | ||||
| -rw-r--r-- | src/json.c | 6 | ||||
| -rw-r--r-- | src/rule.c | 18 |
4 files changed, 19 insertions, 13 deletions
diff --git a/include/rule.h b/include/rule.h index f8e61512..6c6ada6b 100644 --- a/include/rule.h +++ b/include/rule.h @@ -156,6 +156,7 @@ struct table { struct location location; struct scope scope; struct list_head *cache_chain_ht; + struct list_head cache_chain; struct list_head chains; struct list_head sets; struct list_head objs; @@ -231,6 +232,7 @@ struct hook_spec { struct chain { struct list_head list; struct list_head cache_hlist; + struct list_head cache_list; struct handle handle; struct location location; unsigned int refcnt; diff --git a/src/cache.c b/src/cache.c index 40012890..c9e1f22a 100644 --- a/src/cache.c +++ b/src/cache.c @@ -193,10 +193,10 @@ static int chain_cache_cb(struct nftnl_chain *nlc, void *arg) chain = netlink_delinearize_chain(ctx->nlctx, nlc); if (chain->flags & CHAIN_F_BINDING) { - list_add_tail(&chain->list, &ctx->table->chain_bindings); + list_add_tail(&chain->cache_list, &ctx->table->chain_bindings); } else { list_add_tail(&chain->cache_hlist, &ctx->table->cache_chain_ht[hash]); - list_add_tail(&chain->list, &ctx->table->chains); + list_add_tail(&chain->cache_list, &ctx->table->cache_chain); } nftnl_chain_list_del(nlc); @@ -240,7 +240,7 @@ void chain_cache_add(struct chain *chain, struct table *table) hash = djb_hash(chain->handle.chain.name) % NFT_CACHE_HSIZE; list_add_tail(&chain->cache_hlist, &table->cache_chain_ht[hash]); - list_add_tail(&chain->list, &table->chains); + list_add_tail(&chain->cache_list, &table->cache_chain); } struct chain *chain_cache_find(const struct table *table, @@ -1584,7 +1584,7 @@ static json_t *table_print_json_full(struct netlink_ctx *ctx, tmp = flowtable_print_json(flowtable); json_array_append_new(root, tmp); } - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { tmp = chain_print_json(chain); json_array_append_new(root, tmp); @@ -1646,7 +1646,7 @@ static json_t *do_list_chain_json(struct netlink_ctx *ctx, struct chain *chain; struct rule *rule; - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { if (chain->handle.family != cmd->handle.family || strcmp(cmd->handle.chain.name, chain->handle.chain.name)) continue; @@ -1674,7 +1674,7 @@ static json_t *do_list_chains_json(struct netlink_ctx *ctx, struct cmd *cmd) cmd->handle.family != table->handle.family) continue; - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { json_t *tmp = chain_print_json(chain); json_array_append_new(root, tmp); @@ -765,7 +765,7 @@ struct chain *chain_lookup(const struct table *table, const struct handle *h) { struct chain *chain; - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { if (!strcmp(chain->handle.chain.name, h->chain.name)) return chain; } @@ -777,7 +777,7 @@ struct chain *chain_binding_lookup(const struct table *table, { struct chain *chain; - list_for_each_entry(chain, &table->chain_bindings, list) { + list_for_each_entry(chain, &table->chain_bindings, cache_list) { if (!strcmp(chain->handle.chain.name, chain_name)) return chain; } @@ -795,7 +795,7 @@ struct chain *chain_lookup_fuzzy(const struct handle *h, string_misspell_init(&st); list_for_each_entry(table, &cache->list, list) { - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { if (!strcmp(chain->handle.chain.name, h->chain.name)) { *t = table; return chain; @@ -1133,6 +1133,7 @@ struct table *table_alloc(void) table = xzalloc(sizeof(*table)); init_list_head(&table->chains); + init_list_head(&table->cache_chain); init_list_head(&table->sets); init_list_head(&table->objs); init_list_head(&table->flowtables); @@ -1161,7 +1162,10 @@ void table_free(struct table *table) xfree(table->comment); list_for_each_entry_safe(chain, next, &table->chains, list) chain_free(chain); - list_for_each_entry_safe(chain, next, &table->chain_bindings, list) + list_for_each_entry_safe(chain, next, &table->chain_bindings, cache_list) + chain_free(chain); + /* this is implicitly releasing chains in the hashtable cache */ + list_for_each_entry_safe(chain, next, &table->cache_chain, cache_list) chain_free(chain); list_for_each_entry_safe(set, nset, &table->sets, list) set_free(set); @@ -1294,7 +1298,7 @@ static void table_print(const struct table *table, struct output_ctx *octx) flowtable_print(flowtable, octx); delim = "\n"; } - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { nft_print(octx, "%s", delim); chain_print(chain, octx); delim = "\n"; @@ -2388,7 +2392,7 @@ static int do_list_chain(struct netlink_ctx *ctx, struct cmd *cmd, table_print_declaration(table, &ctx->nft->output); - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { if (chain->handle.family != cmd->handle.family || strcmp(cmd->handle.chain.name, chain->handle.chain.name) != 0) continue; @@ -2413,7 +2417,7 @@ static int do_list_chains(struct netlink_ctx *ctx, struct cmd *cmd) table_print_declaration(table, &ctx->nft->output); - list_for_each_entry(chain, &table->chains, list) { + list_for_each_entry(chain, &table->cache_chain, cache_list) { chain_print_declaration(chain, &ctx->nft->output); nft_print(&ctx->nft->output, "\t}\n"); } |