[netfilter-cvslog] r7032 - in trunk/iptables: extensions include/linux/netfilter_ipv6

kaber at trash.net kaber at trash.net
Wed Sep 5 16:02:28 CEST 2007


Author: kaber at trash.net
Date: 2007-09-05 16:02:28 +0200 (Wed, 05 Sep 2007)
New Revision: 7032

Added:
   trunk/iptables/include/linux/netfilter_ipv6/ip6t_opts.h
Removed:
   trunk/iptables/extensions/.opts-test6
Modified:
   trunk/iptables/extensions/Makefile
Log:
Build IPv6 hbh/dst matches unconditionally


Deleted: trunk/iptables/extensions/.opts-test6
===================================================================
--- trunk/iptables/extensions/.opts-test6	2007-09-05 14:00:15 UTC (rev 7031)
+++ trunk/iptables/extensions/.opts-test6	2007-09-05 14:02:28 UTC (rev 7032)
@@ -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

Modified: trunk/iptables/extensions/Makefile
===================================================================
--- trunk/iptables/extensions/Makefile	2007-09-05 14:00:15 UTC (rev 7031)
+++ trunk/iptables/extensions/Makefile	2007-09-05 14:02:28 UTC (rev 7032)
@@ -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)

Added: trunk/iptables/include/linux/netfilter_ipv6/ip6t_opts.h
===================================================================
--- trunk/iptables/include/linux/netfilter_ipv6/ip6t_opts.h	                        (rev 0)
+++ trunk/iptables/include/linux/netfilter_ipv6/ip6t_opts.h	2007-09-05 14:02:28 UTC (rev 7032)
@@ -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*/




More information about the netfilter-cvslog mailing list