mnl: restore --debug=netlink output with sets

(null) (null) b size 1

The debugging output displays table and set names as (null). This patch
sets the table and name before displaying the netlink debugging, then
unset them to not break the extended error support.

Fixes: 086ec6f30c96 ("mnl: extended error support for create command")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/mnl.c b/src/mnl.c
index fb34ecb3decea680c3c0f8da2745c79ee33fc074..94e80261afb7847ef7f921ce4e8d3a88841b4517 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -960,6 +960,8 @@ int mnl_nft_set_add(struct netlink_ctx *ctx, struct cmd *cmd,
                memory_allocation_error();
 
        nftnl_set_set_u32(nls, NFTNL_SET_FAMILY, h->family);
+       nftnl_set_set_str(nls, NFTNL_SET_TABLE, h->table.name);
+       nftnl_set_set_str(nls, NFTNL_SET_NAME, h->set.name);
        nftnl_set_set_u32(nls, NFTNL_SET_ID, h->set_id);
 
        nftnl_set_set_u32(nls, NFTNL_SET_FLAGS, set->flags);
@@ -1036,6 +1038,9 @@ int mnl_nft_set_add(struct netlink_ctx *ctx, struct cmd *cmd,
 
        netlink_dump_set(nls, ctx);
 
+       nftnl_set_unset(nls, NFTNL_SET_TABLE);
+       nftnl_set_unset(nls, NFTNL_SET_NAME);
+
        nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(ctx->batch),
                                    NFT_MSG_NEWSET,
                                    h->family,