]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
mnl: restore --debug=netlink output with chains
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 7 Nov 2024 08:00:55 +0000 (09:00 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 11 Nov 2024 10:40:08 +0000 (11:40 +0100)
table and chain name are not displayed with --debug=netlink:

 # nft --debug=netlink -f /tmp/x
 inet (null) (null) use 0
 ...

Similar to 79acbfdbe536 ("mnl: restore --debug=netlink output with sets").

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/mnl.c

index 12a6345cbed8caef919c52470bdc337cf2c8120c..828006c4d6bfa3cd625eb629f229de0dd3d65c3e 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -835,8 +835,16 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,
                        nftnl_udata_buf_free(udbuf);
                }
        }
+
+       nftnl_chain_set_str(nlc, NFTNL_CHAIN_TABLE, cmd->handle.table.name);
+       if (cmd->handle.chain.name)
+               nftnl_chain_set_str(nlc, NFTNL_CHAIN_NAME, cmd->handle.chain.name);
+
        netlink_dump_chain(nlc, ctx);
 
+       nftnl_chain_unset(nlc, NFTNL_CHAIN_TABLE);
+       nftnl_chain_unset(nlc, NFTNL_CHAIN_NAME);
+
        nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(ctx->batch),
                                    NFT_MSG_NEWCHAIN,
                                    cmd->handle.family,