All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft,v3 7/9] mnl: restore --debug=netlink output with sets
Date: Tue, 28 Apr 2020 17:41:18 +0200	[thread overview]
Message-ID: <20200428154120.20061-8-pablo@netfilter.org> (raw)
In-Reply-To: <20200428154120.20061-1-pablo@netfilter.org>

(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>
---
 src/mnl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mnl.c b/src/mnl.c
index fb34ecb3dece..94e80261afb7 100644
--- 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,
-- 
2.20.1


  parent reply	other threads:[~2020-04-28 15:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28 15:41 [PATCH nft,v3 0/9] netmap support for nft Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 1/9] src: NAT support for intervals in maps Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 2/9] include: resync nf_nat.h kernel header Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 3/9] src: add netmap support Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 4/9] src: add STMT_NAT_F_CONCAT flag and use it Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 5/9] evaluate: fix crash when handling concatenation without map Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 6/9] tests: py: concatenation, netmap and nat mappings Pablo Neira Ayuso
2020-04-28 15:41 ` Pablo Neira Ayuso [this message]
2020-04-28 15:41 ` [PATCH nft,v3 8/9] tests: py: remove range test with service names Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 9/9] tests: shell: add NAT mappings tests Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200428154120.20061-8-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.