diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-10-17 15:24:30 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-10-18 10:41:59 +0200 |
| commit | 8ecb8855895915513e757ffc8d3b7342e63e9fe6 (patch) | |
| tree | 7878b39b08e0b9d46826b6ddd2926c032a05825f /src/monitor.c | |
| parent | 4c3f2f234441046ee11ad3d93bdbee08cf5d8abd (diff) | |
src: restore --echo with anonymous sets
If --echo is passed, then the cache already contains the commands that
have been sent to the kernel. However, anonymous sets are an exception
since the cache needs to be updated in this case.
Remove the old cache logic from the monitor code that has been replaced
by 01e5c6f0ed03 ("src: add cache level flags").
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src/monitor.c')
| -rw-r--r-- | src/monitor.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/monitor.c b/src/monitor.c index 20810a5d..ea0393cd 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -609,6 +609,12 @@ static void netlink_events_cache_addset(struct netlink_mon_handler *monh, goto out; } + if (nft_output_echo(&monh->ctx->nft->output) && + !set_is_anonymous(s->flags)) { + set_free(s); + goto out; + } + set_add_hash(s, t); out: nftnl_set_free(nls); @@ -636,6 +642,10 @@ static void netlink_events_cache_addsetelem(struct netlink_mon_handler *monh, goto out; } + if (nft_output_echo(&monh->ctx->nft->output) && + !set_is_anonymous(set->flags)) + goto out; + nlsei = nftnl_set_elems_iter_create(nls); if (nlsei == NULL) memory_allocation_error(); @@ -744,7 +754,8 @@ out: static void netlink_events_cache_update(struct netlink_mon_handler *monh, const struct nlmsghdr *nlh, int type) { - if (!monh->cache_needed) + if (nft_output_echo(&monh->ctx->nft->output) && + type != NFT_MSG_NEWSET && type != NFT_MSG_NEWSETELEM) return; switch (type) { |