diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-04-29 18:07:34 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-05-02 23:30:35 +0200 |
| commit | e73ada02020c92212666cda9408655356454a3c3 (patch) | |
| tree | d73ad7f39bc92b7ad6874aa5d430a37e888558c1 /src | |
| parent | 745e51d0b8f0512156bccc345e69ccb48338faf6 (diff) | |
evaluate: remove flowtable from cache on delete flowtable command
Update the cache to remove this flowtable from the evaluation phase.
Add flowtable_cache_del() function for this purpose.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cache.c | 5 | ||||
| -rw-r--r-- | src/evaluate.c | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/cache.c b/src/cache.c index a98ee595..f59bba03 100644 --- a/src/cache.c +++ b/src/cache.c @@ -527,6 +527,11 @@ void ft_cache_add(struct flowtable *ft, struct table *table) cache_add(&ft->cache, &table->ft_cache, hash); } +void ft_cache_del(struct flowtable *ft) +{ + cache_del(&ft->cache); +} + struct flowtable *ft_cache_find(const struct table *table, const char *name) { struct flowtable *ft; diff --git a/src/evaluate.c b/src/evaluate.c index 19bf7387..97a77657 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4411,6 +4411,28 @@ static void set_del_cache(struct eval_ctx *ctx, struct cmd *cmd) set_free(set); } +static void ft_del_cache(struct eval_ctx *ctx, struct cmd *cmd) +{ + struct flowtable *ft; + struct table *table; + + if (!cmd->handle.flowtable.name) + return; + + table = table_cache_find(&ctx->nft->cache.table_cache, + cmd->handle.table.name, + cmd->handle.family); + if (!table) + return; + + ft = ft_cache_find(table, cmd->handle.flowtable.name); + if (!ft) + return; + + ft_cache_del(ft); + flowtable_free(ft); +} + static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) { switch (cmd->obj) { @@ -4428,6 +4450,8 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) table_del_cache(ctx, cmd); return 0; case CMD_OBJ_FLOWTABLE: + ft_del_cache(ctx, cmd); + return 0; case CMD_OBJ_COUNTER: case CMD_OBJ_QUOTA: case CMD_OBJ_CT_HELPER: |