From: Shivani Bhardwaj Date: Wed, 30 Dec 2015 05:38:08 +0000 (+0530) Subject: iptables: nft-ipv6: Replace ip with ip6 X-Git-Tag: v1.6.1~135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e1c582ff0b502c49a87c945da351fbd5c0c6fe9;p=thirdparty%2Fiptables.git iptables: nft-ipv6: Replace ip with ip6 Replace ip with ip6 to avoid conflict between the protocols in the results obtained from ip6tables-translate utility. Signed-off-by: Shivani Bhardwaj Signed-off-by: Pablo Neira Ayuso --- diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index 107a84e2..0b6ff97e 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -416,16 +416,16 @@ static int nft_ipv6_xlate(const void *data, struct xt_buf *buf) snprintf(protonum, sizeof(protonum), "%u", cs->fw6.ipv6.proto); protonum[sizeof(protonum) - 1] = '\0'; - xt_buf_add(buf, "ip protocol %s%s ", + xt_buf_add(buf, "ip6 nexthdr %s%s ", cs->fw6.ipv6.invflags & IP6T_INV_PROTO ? "!= " : "", pent ? pent->p_name : protonum); } } - xlate_ipv6_addr("ip saddr", &cs->fw6.ipv6.src, + xlate_ipv6_addr("ip6 saddr", &cs->fw6.ipv6.src, cs->fw6.ipv6.invflags & IP6T_INV_SRCIP, buf); - xlate_ipv6_addr("ip daddr", &cs->fw6.ipv6.dst, + xlate_ipv6_addr("ip6 daddr", &cs->fw6.ipv6.dst, cs->fw6.ipv6.invflags & IP6T_INV_DSTIP, buf); ret = xlate_matches(cs, buf);