Skip to contentSkip to conversation

rule: fix netlink debug flag when listing table/rules

PATCH In review Florian Westphal 2 participants 2 messages Oct 18, 2017 – Oct 19, 2017 netfilter

lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 rule: fix netlink debug flag when listing table/rules

nft --debug=netlink list table ...
has no effect anymore.

Callers pass in debug_mask & DEBUG_NETLINK, which gets converted to 0/1 because the arg is a boolean.

Later on this bool is converted back to an integer, but that won't have the desired result.

Fixes be441e1ffdc24 ("src: add debugging mask to context structure")
---
 src/rule.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/rule.c +2 -2
index d744cf611100..d83284e5414f 100644
@@ -123,7 +123,7 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
 
 static int cache_init(struct mnl_socket *nf_sock, struct nft_cache *cache,
 		      enum cmd_ops cmd, struct list_head *msgs,
-		      unsigned int debug_mask, struct output_ctx *octx)
+		      bool debug, struct output_ctx *octx)
 {
 	struct handle handle = {
 		.family = NFPROTO_UNSPEC,
@@ -134,7 +134,7 @@ static int cache_init(struct mnl_socket *nf_sock, struct nft_cache *cache,
 		.cache		= cache,
 		.msgs		= msgs,
 		.seqnum		= cache->seqnum++,
-		.debug_mask	= debug_mask,
+		.debug_mask	= debug ? DEBUG_NETLINK : 0,
 		.octx		= octx,
 	};
 	int ret;
Signature · 1 line
2.13.6
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Florian Westphal

nft --debug=netlink list table ...
has no effect anymore.

Callers pass in debug_mask & DEBUG_NETLINK, which gets converted to 0/1 because the arg is a boolean.

Later on this bool is converted back to an integer, but that won't have the desired result.

Fixes be441e1ffdc24 ("src: add debugging mask to context structure")