src: restore --echo with anonymous sets
Pablo Neira Ayuso
maintainerPATCH 1/1 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").
--- include/netlink.h | 1 - src/monitor.c | 13 ++++++++++++- src/rule.c | 19 ------------------- 3 files changed, 12 insertions(+), 21 deletions(-)
include/netlink.h +0 -1
@@ -171,7 +171,6 @@ struct netlink_mon_handler {struct netlink_ctx *ctx;const struct location *loc;unsigned int debug_mask; -bool cache_needed;struct nft_cache *cache; };
src/monitor.c +12 -1
@@ -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) && + !(s->flags &NFT_SET_ANONYMOUS )) { +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->flags &NFT_SET_ANONYMOUS )) + 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) {
src/rule.c +0 -19
@@ -2502,23 +2502,6 @@ static int do_command_rename(struct netlink_ctx *ctx, struct cmd *cmd)return 0 ; } -static bool need_cache (const struct cmd *cmd) -{ -/* -* - new rules in default format -* - new elements -*/ -if (((cmd->monitor->flags & (1 <<NFT_MSG_NEWRULE )) && - (cmd->monitor->format ==NFTNL_OUTPUT_DEFAULT )) || - (cmd->monitor->flags & (1 <<NFT_MSG_NEWSETELEM ))) -return true; - -if (cmd->monitor->flags & (1 <<NFT_MSG_TRACE )) -return true; - -return false; -} -static int do_command_monitor (struct netlink_ctx *ctx,struct cmd *cmd) {struct netlink_mon_handler monhandler = {
@@ -2533,8 +2516,6 @@ static int do_command_monitor(struct netlink_ctx *ctx, struct cmd *cmd)if (nft_output_json (&ctx->nft->output)) monhandler.format =NFTNL_OUTPUT_JSON ; - monhandler.cache_needed =need_cache (cmd); -return netlink_monitor (&monhandler, ctx->nft->nf_sock); }
Signature · 1 line
2.11.0
Phil Sutter
reviewerHi Pablo,
Quoted 8 lines · Pablo Neira Ayuso
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 <[email protected]>
This is a nice solution, thanks! A few nits below:
[...]
src/monitor.c static void netlink_events_cache_addset(struct netlink_mon_handler *monh, · line 613
Quoted 10 lines
src/monitor.c +2
-0@@ -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) && + !(s->flags &NFT_SET_ANONYMOUS )) {
There is set_is_anonymous(), set and element printing callbacks use it as well.
[...]
src/monitor.c static void netlink_events_cache_addsetelem(struct netlink_mon_handler *monh, · line 646
Quoted 6 lines
src/monitor.c +2
-0@@ -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->flags &NFT_SET_ANONYMOUS ))
Same here.
[...]
src/monitor.c out: · line 759
Quoted 8 lines
src/monitor.c +2
-1@@ -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 ;
I would use switch() here, like so:
| if (nft_output_echo(&monh->ctx->nft->output)) {
| switch (type) {
| case NFT_MSG_NEWSET:
| case NFT_MSG_NEWSETELEM:
| break;
| default:
| return;
| }
| }it emphasises that code is filtering for certain event types. Up to you, I'm fine with both.
Thanks, Phil