From 31317ed1f9103434adda716abbe65e9fc7bdd418 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 5 Sep 2007 14:02:28 +0000 Subject: Build IPv6 hbh/dst matches unconditionally --- extensions/.opts-test6 | 2 -- extensions/Makefile | 2 +- include/linux/netfilter_ipv6/ip6t_opts.h | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) delete mode 100755 extensions/.opts-test6 create mode 100644 include/linux/netfilter_ipv6/ip6t_opts.h diff --git a/extensions/.opts-test6 b/extensions/.opts-test6 deleted file mode 100755 index 1ed20135..00000000 --- a/extensions/.opts-test6 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_hbh.c -a -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_dst.c -a -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_opts.h ] && echo hbh dst diff --git a/extensions/Makefile b/extensions/Makefile index 55d618c2..cf40a07b 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -6,7 +6,7 @@ # package (HW) # PF_EXT_SLIB:=ah addrtype conntrack ecn icmp iprange owner policy realm recent tos ttl unclean CLUSTERIP DNAT ECN LOG MASQUERADE MIRROR NETMAP REDIRECT REJECT SAME SNAT TOS TTL ULOG -PF6_EXT_SLIB:=ah eui64 frag hl icmp6 ipv6header mh owner policy rt HL LOG REJECT +PF6_EXT_SLIB:=ah dst eui64 frag hbh hl icmp6 ipv6header mh owner policy rt HL LOG REJECT PFX_EXT_SLIB:=connbytes connmark connlimit comment dccp dscp esp hashlimit helper length limit mac mark multiport physdev pkttype quota sctp state statistic standard string tcp tcpmss udp CLASSIFY CONNMARK DSCP MARK NFLOG NFQUEUE NOTRACK TCPMSS TRACE ifeq ($(DO_SELINUX), 1) diff --git a/include/linux/netfilter_ipv6/ip6t_opts.h b/include/linux/netfilter_ipv6/ip6t_opts.h new file mode 100644 index 00000000..a07e3638 --- /dev/null +++ b/include/linux/netfilter_ipv6/ip6t_opts.h @@ -0,0 +1,23 @@ +#ifndef _IP6T_OPTS_H +#define _IP6T_OPTS_H + +#define IP6T_OPTS_OPTSNR 16 + +struct ip6t_opts +{ + u_int32_t hdrlen; /* Header Length */ + u_int8_t flags; /* */ + u_int8_t invflags; /* Inverse flags */ + u_int16_t opts[IP6T_OPTS_OPTSNR]; /* opts */ + u_int8_t optsnr; /* Nr of OPts */ +}; + +#define IP6T_OPTS_LEN 0x01 +#define IP6T_OPTS_OPTS 0x02 +#define IP6T_OPTS_NSTRICT 0x04 + +/* Values for "invflags" field in struct ip6t_rt. */ +#define IP6T_OPTS_INV_LEN 0x01 /* Invert the sense of length. */ +#define IP6T_OPTS_INV_MASK 0x01 /* All possible flags. */ + +#endif /*_IP6T_OPTS_H*/ -- cgit v1.2.3