netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftnl PATCH] utils: fix arp family number
Date: Mon, 20 Oct 2014 12:26:20 +0200	[thread overview]
Message-ID: <20141020102619.22301.43766.stgit@nfdev.cica.es> (raw)

NFPROTO_ARP = 3 in kernel space.

We need the same value here in userspace in order to correctly communicate
with the kernel.

The failure solved by this patch made that {XML|JSON}-parsed tables of ARP
family unable to be directly injected into kernel.

To prevent future errors, this patch changes raw and AF_* values by the mathing
NFPROTO_* couterpart as seen in linux/netfilter.h in both functions:
 * nft_family2str()
 * nft_str2family()

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 src/utils.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/utils.c b/src/utils.c
index d70fbf1..d70d073 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -23,15 +23,15 @@
 const char *nft_family2str(uint32_t family)
 {
 	switch (family) {
-	case AF_INET:
+	case NFPROTO_IPV4:
 		return "ip";
-	case AF_INET6:
+	case NFPROTO_IPV6:
 		return "ip6";
-	case 1:
+	case NFPROTO_INET:
 		return "inet";
-	case AF_BRIDGE:
+	case NFPROTO_BRIDGE:
 		return "bridge";
-	case 3: /* NFPROTO_ARP */
+	case NFPROTO_ARP:
 		return "arp";
 	default:
 		return "unknown";
@@ -41,15 +41,15 @@ const char *nft_family2str(uint32_t family)
 int nft_str2family(const char *family)
 {
 	if (strcmp(family, "ip") == 0)
-		return AF_INET;
+		return NFPROTO_IPV4;
 	else if (strcmp(family, "ip6") == 0)
-		return AF_INET6;
+		return NFPROTO_IPV6;
 	else if (strcmp(family, "inet") == 0)
-		return 1;
+		return NFPROTO_INET;
 	else if (strcmp(family, "bridge") == 0)
-		return AF_BRIDGE;
+		return NFPROTO_BRIDGE;
 	else if (strcmp(family, "arp") == 0)
-		return 0;
+		return NFPROTO_ARP;
 
 	errno = EAFNOSUPPORT;
 	return -1;


             reply	other threads:[~2014-10-20 10:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-20 10:26 Arturo Borrero Gonzalez [this message]
2014-10-20 10:38 ` [libnftnl PATCH] utils: fix arp family number 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=20141020102619.22301.43766.stgit@nfdev.cica.es \
    --to=arturo.borrero.glez@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).