commit 60f00639ca42a95fd5425d6bb6ac08e5b29c6b18
author Giuseppe Longo <giuseppelng@gmail.com> Mon Mar 24 11:59:46 2014 +0100
committer Pablo Neira Ayuso <pablo@netfilter.org> Mon Mar 24 12:08:14 2014 +0100
tree 251436af54d3693b423ee91a42d78c14b3eef429
parent d25f308e54730677698d93f29ca4630e25237935

nft: replace nft_rule_attr_get_u8

Since the family declaration has been modified in libnftnl,
from commit 3cd9cd06625f8181c713489cec2c1ce6722a7e16
the assertion is failed for {ip,ip6,arp}tables-compat
when printing rules.

iptables-compat -L
Chain INPUT (policy ACCEPT)
target     prot opt source               destination
libnftnl: attribute 0 assertion failed in rule.c:273

ip6tables-compat -L
Chain INPUT (policy ACCEPT)
target     prot opt source               destination
libnftnl: attribute 0 assertion failed in rule.c:273

arptables-compat -L
Chain INPUT (policy ACCEPT)
target     prot opt source               destination
libnftnl: attribute 0 assertion failed in rule.c:273

Signed-off-by: Giuseppe Longo <giuseppelng@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

iptables/nft-arp.c

diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
index 3af1b4b..562a1a2 100644
--- a/iptables/nft-arp.c
+++ b/iptables/nft-arp.c
@@ -369,7 +369,7 @@
 {
 	struct nft_rule_expr_iter *iter;
 	struct nft_rule_expr *expr;
-	int family = nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY);
+	int family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
 
 	iter = nft_rule_expr_iter_create(r);
 	if (iter == NULL)

iptables/nft-shared.c

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index ada71e6..3f018fb 100644
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -457,7 +457,7 @@
 {
 	struct nft_rule_expr_iter *iter;
 	struct nft_rule_expr *expr;
-	int family = nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY);
+	int family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
 
 	iter = nft_rule_expr_iter_create(r);
 	if (iter == NULL)

iptables/nft.c

diff --git a/iptables/nft.c b/iptables/nft.c
index 1237659..f3ec526 100644
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -1017,7 +1017,7 @@
 		    unsigned int format)
 {
 	const char *chain = nft_rule_attr_get_str(r, NFT_RULE_ATTR_CHAIN);
-	int family = nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY);
+	int family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
 	struct nft_family_ops *ops;
 
 	/* print chain name */

iptables/xtables-events.c

diff --git a/iptables/xtables-events.c b/iptables/xtables-events.c
index d8a732e..4746825 100644
--- a/iptables/xtables-events.c
+++ b/iptables/xtables-events.c
@@ -75,7 +75,7 @@
 		goto err_free;
 	}
 
-	family = nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY);
+	family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
 	switch (family) {
 	case AF_INET:
 	case AF_INET6: