rule: flush set cache before flush command
Pablo Neira Ayuso
maintainerPATCH v2 1/1 rule: flush set cache before flush command
Flush the set cache before adding the flush command to the netlink batch.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: add testcase.
src/rule.c | 16 ++++++++++++++++ tests/shell/testcases/sets/0052overlap_0 | 16 ++++++++++++++++ .../shell/testcases/sets/dumps/0052overlap_0.nft | 8 ++++++++ 3 files changed, 40 insertions(+) create mode 100755 tests/shell/testcases/sets/0052overlap_0 create mode 100644 tests/shell/testcases/sets/dumps/0052overlap_0.nft
src/rule.c +16 -0
@@ -2692,6 +2692,21 @@ static int do_command_reset(struct netlink_ctx *ctx, struct cmd *cmd)return do_list_obj (ctx, cmd, type); } +static void flush_set_cache (struct netlink_ctx *ctx,struct cmd *cmd) +{ +struct table *table; +struct set *set; + + table =table_lookup (&cmd->handle, &ctx->nft->cache); +assert (table); + set =set_lookup (table, cmd->handle.set.name); +assert (set); +if (set->init !=NULL ) { +expr_free (set->init); + set->init =NULL ; + } +} +static int do_command_flush (struct netlink_ctx *ctx,struct cmd *cmd) {switch (cmd->obj) {
@@ -2701,6 +2716,7 @@ static int do_command_flush(struct netlink_ctx *ctx, struct cmd *cmd)case CMD_OBJ_SET :case CMD_OBJ_MAP :case CMD_OBJ_METER : +flush_set_cache (ctx, cmd);return mnl_nft_setelem_flush (ctx, cmd);case CMD_OBJ_RULESET :return mnl_nft_table_del (ctx, cmd);
tests/shell/testcases/sets/0052overlap_0 new file +16 -0
@@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +EXPECTED="add table ip filter +add set ip filter w_all {type ipv4_addr; flags interval; auto-merge} +add element ip filter w_all {10.10.10.10, 10.10.10.11} +" + +$NFT -f - <<< "$EXPECTED" + +EXPECTED="flush set ip filter w_all +add element ip filter w_all {10.10.10.10, 10.10.10.253} +" + +$NFT -f - <<< "$EXPECTED"
tests/shell/testcases/sets/dumps/0052overlap_0.nft new file +8 -0
@@ -0,0 +1,8 @@ +table ip filter { + set w_all { + type ipv4_addr + flags interval + auto-merge + elements = { 10.10.10.10, 10.10.10.253 } + } +}
Signature · 1 line
2.20.1