]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
cache: disable NFT_CACHE_SETELEM_BIT on --terse listing only
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 27 Oct 2021 23:14:30 +0000 (01:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 27 Oct 2021 23:28:23 +0000 (01:28 +0200)
Instead of NFT_CACHE_SETELEM which also disables set dump.

Fixes: 6bcd0d576a60 ("cache: unset NFT_CACHE_SETELEM with --terse listing")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/cache.c

index f66b415c038e5be0d81dbf0fa1883ce907f8e592..0cddd1e1cb4870f904a13f7f97f9ce0b61512b15 100644 (file)
@@ -145,7 +145,7 @@ static unsigned int evaluate_cache_list(struct nft_ctx *nft, struct cmd *cmd,
                        filter->set = cmd->handle.set.name;
                }
                if (nft_output_terse(&nft->output))
-                       flags |= (NFT_CACHE_FULL & ~NFT_CACHE_SETELEM);
+                       flags |= (NFT_CACHE_FULL & ~NFT_CACHE_SETELEM_BIT);
                else if (filter->table && filter->set)
                        flags |= NFT_CACHE_TABLE | NFT_CACHE_SET | NFT_CACHE_SETELEM;
                else
@@ -163,7 +163,7 @@ static unsigned int evaluate_cache_list(struct nft_ctx *nft, struct cmd *cmd,
                break;
        case CMD_OBJ_RULESET:
                if (nft_output_terse(&nft->output))
-                       flags |= (NFT_CACHE_FULL & ~NFT_CACHE_SETELEM);
+                       flags |= (NFT_CACHE_FULL & ~NFT_CACHE_SETELEM_BIT);
                else
                        flags |= NFT_CACHE_FULL;
                break;