[netfilter-cvslog] r3998 - trunk/patch-o-matic-ng/pptp-conntrack-nat

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-24 18:33:07 +0200 (Fri, 24 Jun 2005)
New Revision: 3998

Added:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11.patch
Log:
get rid of tuple enlargement


Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11.patch (from rev 3966, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch)
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch	2005-06-06 16:33:21 UTC (rev 3966)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11.patch	2005-06-24 16:33:07 UTC (rev 3998)
@@ -0,0 +1,44 @@
+diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.6.9-connmark-clusterip-hashlimit/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.6.9-connmark-clusterip-hashlimit-pptp/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- linux-2.6.9-connmark-clusterip-hashlimit/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2004-10-18 23:54:40.000000000 +0200
++++ linux-2.6.9-connmark-clusterip-hashlimit-pptp/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2004-10-22 17:35:11.135192085 +0200
+@@ -28,6 +28,9 @@
+ 	struct {
+ 		u_int16_t port;
+ 	} sctp;
++	struct {
++		u_int16_t key;	/* key is 32bit, pptp onky uses 16 */
++	} gre;
+ };
+ 
+ /* The manipulable part of the tuple. */
+@@ -61,6 +64,9 @@
+ 			struct {
+ 				u_int16_t port;
+ 			} sctp;
++			struct {
++				u_int16_t key;
++			} gre;
+ 		} u;
+ 
+ 		/* The protocol. */
+diff -Naur linux-2.6.8.1/net/ipv4/netfilter/ip_conntrack_core.c linux-2.6.8.1-1mdk/net/ipv4/netfilter/ip_conntrack_core.c
+--- linux-2.6.8.1/net/ipv4/netfilter/ip_conntrack_core.c	2004-08-14 12:54:46.000000000 +0200
++++ linux-2.6.8.1-1mdk/net/ipv4/netfilter/ip_conntrack_core.c	2004-08-16 13:54:12.000000000 +0200
+@@ -143,6 +143,7 @@
+ 	tuple->src.ip = iph->saddr;
+ 	tuple->dst.ip = iph->daddr;
+ 	tuple->dst.protonum = iph->protocol;
++	tuple->src.u.all = tuple->dst.u.all = 0;
+ 
+ 	return protocol->pkt_to_tuple(skb, dataoff, tuple);
+ }
+@@ -156,6 +157,8 @@
+ 	inverse->dst.ip = orig->src.ip;
+ 	inverse->dst.protonum = orig->dst.protonum;
+ 
++	inverse->src.u.all = inverse->dst.u.all = 0;
++
+ 	return protocol->invert_tuple(inverse, orig);
+ }
+ 
+