From 94a945ffa81b7f1db250e519f0b4b808428ab223 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 25 Oct 2017 13:40:29 +0200 Subject: libnftables: Get rid of explicit cache flushes In the past, CLI as a potentially long running process had to make sure it kept it's cache up to date with kernel's rule set. A simple test case is this: | shell a | shell b | | # nft -i | # nft add table ip t | | | nft> list ruleset | | table ip t { | | } | # nft flush ruleset | | | nft> list ruleset | | nft> In order to make sure interactive CLI wouldn't incorrectly list the table again in the second 'list' command, it immediately flushed it's cache after every command execution. This patch eliminates the need for that by making cache updates depend on kernel's generation ID: A cache update stores the current rule set's ID in struct nft_cache, consecutive calls to cache_update() compare that stored value to the current generation ID received from kernel - if the stored value is zero (i.e. no previous cache update did happen) or if it doesn't match the kernel's value (i.e. cache is outdated) the cache is flushed and fully initialized again. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/libnftables.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/libnftables.c') diff --git a/src/libnftables.c b/src/libnftables.c index 5ef5532c..0d04ec21 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -174,18 +174,13 @@ struct nft_ctx *nft_ctx_new(uint32_t flags) return ctx; } -void nft_ctx_flush_cache(struct nft_ctx *ctx) -{ - iface_cache_release(); - cache_release(&ctx->cache); -} - void nft_ctx_free(struct nft_ctx *ctx) { if (ctx->nf_sock) netlink_close_sock(ctx->nf_sock); - nft_ctx_flush_cache(ctx); + iface_cache_release(); + cache_release(&ctx->cache); nft_ctx_clear_include_paths(ctx); xfree(ctx); nft_exit(); -- cgit v1.2.3