From 8ece44a8784e29a9b532a086ab535fce5eb91133 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org" Date: Tue, 31 Jan 2006 18:24:14 +0000 Subject: Prepare policy match for x_tables unification by making sure both ipt_policy and ip6t_policy use the same data structure. --- extensions/.policy-test | 3 --- extensions/.policy-test6 | 3 --- extensions/Makefile | 4 ++-- extensions/libip6t_policy.c | 8 ++++---- extensions/libipt_policy.c | 8 ++++---- 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100755 extensions/.policy-test delete mode 100755 extensions/.policy-test6 (limited to 'extensions') diff --git a/extensions/.policy-test b/extensions/.policy-test deleted file mode 100755 index c2bb7bd..0000000 --- a/extensions/.policy-test +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_policy.h ] && echo policy diff --git a/extensions/.policy-test6 b/extensions/.policy-test6 deleted file mode 100755 index 5e6f484..0000000 --- a/extensions/.policy-test6 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -[ -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_policy.h ] && echo policy diff --git a/extensions/Makefile b/extensions/Makefile index a751b29..7164e1d 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -5,8 +5,8 @@ # header files are present in the include/linux directory of this iptables # package (HW) # -PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG -PF6_EXT_SLIB:=connmark eui64 hl icmpv6 length limit mac mark multiport owner physdev standard state tcp udp CONNMARK HL LOG NFQUEUE MARK TRACE +PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype policy realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG +PF6_EXT_SLIB:=connmark eui64 hl icmpv6 length limit mac mark multiport owner physdev policy standard state tcp udp CONNMARK HL LOG NFQUEUE MARK TRACE # Optionals PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T))) diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index 54cd5f2..74912b4 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -237,8 +237,8 @@ static int parse(int c, char **argv, int invert, unsigned int *flags, e->match.saddr = 1; e->invert.saddr = invert; - in6addrcpy(&e->saddr, addr); - in6addrcpy(&e->smask, &mask); + in6addrcpy(&e->saddr.a6, addr); + in6addrcpy(&e->smask.a6, &mask); break; case '7': if (e->match.daddr) @@ -252,8 +252,8 @@ static int parse(int c, char **argv, int invert, unsigned int *flags, e->match.daddr = 1; e->invert.daddr = invert; - in6addrcpy(&e->daddr, addr); - in6addrcpy(&e->dmask, &mask); + in6addrcpy(&e->daddr.a6, addr); + in6addrcpy(&e->dmask.a6, &mask); break; case '8': if (e->match.proto) diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 55b969d..6c8828e 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -197,8 +197,8 @@ static int parse(int c, char **argv, int invert, unsigned int *flags, e->match.saddr = 1; e->invert.saddr = invert; - e->saddr = addr[0].s_addr; - e->smask = mask.s_addr; + e->saddr.a4 = addr[0]; + e->smask.a4 = mask; break; case '7': if (e->match.daddr) @@ -212,8 +212,8 @@ static int parse(int c, char **argv, int invert, unsigned int *flags, e->match.daddr = 1; e->invert.daddr = invert; - e->daddr = addr[0].s_addr; - e->dmask = mask.s_addr; + e->daddr.a4 = addr[0]; + e->dmask.a4 = mask; break; case '8': if (e->match.proto) -- cgit v1.2.3