diff options
| author | Anatole Denis <anatole@rezel.net> | 2016-12-01 11:50:17 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-01 12:31:00 +0100 |
| commit | 530a82a72d157fbe297be62c9317649d63390c7b (patch) | |
| tree | 833d2f9731df5b4daa4d86cdff9b02ad4f32beb6 | |
| parent | 7988e426eb7b12d1f266ff47e6704541585f3b46 (diff) | |
evaluate: Update cache on flush ruleset
After a flush, the cache should be empty, otherwise the cache and the expected
state are desynced, causing unwarranted errors. See
tests/shell/testcases/cache/0002_interval_0.
`flush table` and `flush chain` don't empty sets or destroy chains, so the cache
does not need an update in those cases, since only chain names and set contents
are held in cache for commands other than "list"
Reported-by: Leon Merten Lohse <leon@green-side.de>
Signed-off-by: Anatole Denis <anatole@rezel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index c841aafd..c75c1407 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2854,6 +2854,29 @@ static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) } } +static int cmd_evaluate_flush(struct eval_ctx *ctx, struct cmd *cmd) +{ + int ret; + ret = cache_update(cmd->op, ctx->msgs); + if (ret < 0) + return ret; + switch (cmd->obj) { + case CMD_OBJ_RULESET: + cache_flush(); + break; + case CMD_OBJ_TABLE: + /* Flushing a table does not empty the sets in the table nor remove + * any chains. + */ + case CMD_OBJ_CHAIN: + /* Chains don't hold sets */ + break; + default: + BUG("invalid command object type %u\n", cmd->obj); + } + return 0; +} + static int cmd_evaluate_rename(struct eval_ctx *ctx, struct cmd *cmd) { struct table *table; @@ -3021,7 +3044,7 @@ int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd) case CMD_LIST: return cmd_evaluate_list(ctx, cmd); case CMD_FLUSH: - return 0; + return cmd_evaluate_flush(ctx, cmd); case CMD_RENAME: return cmd_evaluate_rename(ctx, cmd); case CMD_EXPORT: |