[netfilter-cvslog] r6407 - in trunk/nfsim: . core/ipv4 kernelenv kernelenv/include netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-01-12 19:09:34 +0100 (Thu, 12 Jan 2006)
New Revision: 6407

Modified:
   trunk/nfsim/.links
   trunk/nfsim/Makefile.in
   trunk/nfsim/UNSUPPORTED
   trunk/nfsim/core/ipv4/ipv4.c
   trunk/nfsim/core/ipv4/ipv4.h
   trunk/nfsim/kernelenv/include/kernelenv.h
   trunk/nfsim/kernelenv/kernelenv.c
   trunk/nfsim/netfilter/Makefile.kbuild.in
Log:
- add XFRM bits of upcoming 2.6.16 kernel
- install modules during 'make install'



Modified: trunk/nfsim/.links
===================================================================
--- trunk/nfsim/.links	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/.links	2006-01-12 18:09:34 UTC (rev 6407)
@@ -82,3 +82,4 @@
 ./net/ipv6.h
 ./net/if_inet6.h
 ./net/ip6_route.h
+./net/xfrm.h

Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/Makefile.in	2006-01-12 18:09:34 UTC (rev 6407)
@@ -147,6 +147,8 @@
 	cp simulator %BASEDIR%%BINDIR%nfsim
 	@[ -d %BASEDIR%%LIBDIR% ] || mkdir -p %BASEDIR%%LIBDIR%
 	cp fakesockopt.so.1.0 %BASEDIR%%LIBDIR%
+	@[ -d %BASEDIR%%LIBDIR%/nfsim ] || mkdir -p %BASEDIR%%LIBDIR%/nfsim
+	cp netfilter/{gen,ipv4}/*.so %BASEDIR%%LIBDIR%/nfsim/
 
 # 2.4 Makefiles want this
 TOPDIR=$(shell pwd)

Modified: trunk/nfsim/UNSUPPORTED
===================================================================
--- trunk/nfsim/UNSUPPORTED	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/UNSUPPORTED	2006-01-12 18:09:34 UTC (rev 6407)
@@ -30,3 +30,7 @@
 
 # no string matching api yet
 CONFIG_NETFILTER_XT_MATCH_STRING
+
+CONFIG_XFRM
+CONFIG_NETFILTER_XT_MATCH_POLICY
+CONFIG_IP_NF_MATCH_POLICY

Modified: trunk/nfsim/core/ipv4/ipv4.c
===================================================================
--- trunk/nfsim/core/ipv4/ipv4.c	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/core/ipv4/ipv4.c	2006-01-12 18:09:34 UTC (rev 6407)
@@ -1178,3 +1178,5 @@
 		 field_value(skb, "dump_flags"));
 	return ipv4_pbuf;
 }
+
+void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);

Modified: trunk/nfsim/core/ipv4/ipv4.h
===================================================================
--- trunk/nfsim/core/ipv4/ipv4.h	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/core/ipv4/ipv4.h	2006-01-12 18:09:34 UTC (rev 6407)
@@ -811,4 +811,8 @@
 #define IPT_DSCP_SHIFT  2
 #define IPT_DSCP_MAX    0x3f
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+extern void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);
+#endif
+
 #endif /* __HAVE_IPV4_H */

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-12 18:09:34 UTC (rev 6407)
@@ -704,6 +704,8 @@
 				*data,
 				*tail,
 				*end;
+
+	char			cb[48];
 };
 
 struct skb_shared_info {
@@ -1048,6 +1050,7 @@
 
 
 /* ip.h */
+struct sock;
 struct ip_options {
   __u32		faddr;				/* Saved first hop address */
   unsigned char	optlen;
@@ -1068,6 +1071,19 @@
   unsigned char __data[0];
 };
 
+struct inet_skb_param
+{
+	struct ip_options	opt;
+	unsigned char 		flags;
+
+#define IPSKB_FORWARDED		1
+#define IPSKB_XFRM_TUNNEL_SIZE	2
+#define IPSKB_XFRM_TRANSFORMED	4
+#define IPSKB_FRAG_COMPLETE	8
+};
+#define IPCB(skb) ((struct inet_skb_parm)((skb)->cb))
+
+
 struct inet_sock {
 	/* sk has to be the first two members of inet_sock */
 	struct sock		sk;
@@ -1524,4 +1540,7 @@
 
 #define simple_strtol(x, y, z)		strtol(x, y, z)
 
+/* xfrm.h */
+extern int xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family);
+
 #endif /* __HAVE_SIMULATOR_H */

Modified: trunk/nfsim/kernelenv/kernelenv.c
===================================================================
--- trunk/nfsim/kernelenv/kernelenv.c	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/kernelenv/kernelenv.c	2006-01-12 18:09:34 UTC (rev 6407)
@@ -1321,3 +1321,9 @@
 	linear_packets = true;
 }
 cmdline_opt("linear-packets", 0, 0, cmdline_linear_packets);
+
+int xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, 
+			unsigned short family)
+{
+	return 0;
+}

Modified: trunk/nfsim/netfilter/Makefile.kbuild.in
===================================================================
--- trunk/nfsim/netfilter/Makefile.kbuild.in	2006-01-12 16:14:41 UTC (rev 6406)
+++ trunk/nfsim/netfilter/Makefile.kbuild.in	2006-01-12 18:09:34 UTC (rev 6407)
@@ -14,17 +14,17 @@
 	$(LD) $(LDFLAGS) -r -o $(@) $^
 
 %.o:%.c
-	$(COMPILE.c) $(GCOVFLAGS) -DKBUILD_MODNAME="$(@:.o=)" $(OUTPUT_OPTION) $<
+	$(COMPILE.c) $(GCOVFLAGS) -DKBUILD_MODNAME=\"$(@:.o=)\" $(OUTPUT_OPTION) $<
 
 %.o:	
 	$(MAKE) CFLAGS="$(CFLAGS) $(GCOVFLAGS) -DKBUILD_MODNAME=\"$(@:.o=)\"" $($(@:.o=-objs))
 	$(LD) $(LDFLAGS) -g -r -o $(@) $($(@:.o=-objs))
 
 %.so:%.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME="$(@:.so=)" $(OUTPUT_OPTION) %LIBGCOV% $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME="\"$(@:.so=)\"" $(OUTPUT_OPTION) %LIBGCOV% $<
 
 %.so:
-	$(MAKE) CFLAGS="$(CFLAGS) -fPIC $(GCOVFLAGS) -DMODULE -DKBUILD_MODNAME=\"$(@:.so=)\"" $($(@:.so=-objs))
+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC $(GCOVFLAGS) -DMODULE -DKBUILD_MODNAME=\"\"$(@:.so=)\"\"" $($(@:.so=-objs))
 	$(CC) -shared -o $(@) $($(@:.so=-objs)) %LIBGCOV%