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

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-04 20:52:57 +0200 (Mon, 04 Jul 2005)
New Revision: 4096

Modified:
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11.patch
Log:
update patch to reflect required changes for 2.6.11+


Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11.patch
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11.patch	2005-07-04 18:50:36 UTC (rev 4095)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11.patch	2005-07-04 18:52:57 UTC (rev 4096)
@@ -1,6 +1,7 @@
-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
+Index: linux-2.6.12.1-wrap/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+===================================================================
+--- linux-2.6.12.1-wrap.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.1-wrap/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2005-06-26 17:06:13.000000000 +0200
 @@ -28,6 +28,9 @@
  	struct {
  		u_int16_t port;
@@ -21,24 +22,68 @@
  		} 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;
+Index: linux-2.6.12.1-wrap/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.6.12.1-wrap.orig/net/ipv4/netfilter/ip_conntrack_core.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.1-wrap/net/ipv4/netfilter/ip_conntrack_core.c	2005-07-04 10:37:01.000000000 +0200
+@@ -165,8 +168,8 @@
  
- 	return protocol->pkt_to_tuple(skb, dataoff, tuple);
+ /* If an expectation for this connection is found, it gets delete from
+  * global list then returned. */
+-static struct ip_conntrack_expect *
+-find_expectation(const struct ip_conntrack_tuple *tuple)
++struct ip_conntrack_expect *
++__ip_conntrack_exp_find(const struct ip_conntrack_tuple *tuple)
+ {
+ 	struct ip_conntrack_expect *i;
+ 
+@@ -287,7 +289,7 @@
+ 		&& ip_ct_tuple_equal(tuple, &i->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;
+-static struct ip_conntrack_tuple_hash *
++struct ip_conntrack_tuple_hash *
+ __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
+ 		    const struct ip_conntrack *ignored_conntrack)
+ {
+@@ -509,7 +511,7 @@
+ 	conntrack->timeout.function = death_by_timeout;
+ 
+ 	WRITE_LOCK(&ip_conntrack_lock);
+-	exp = find_expectation(tuple);
++	exp = __ip_conntrack_exp_find(tuple);
+ 
+ 	if (exp) {
+ 		DEBUGP("conntrack: expectation arrives ct=%p exp=%p\n",
+Index: linux-2.6.12.1-wrap/include/linux/netfilter_ipv4/ip_conntrack_core.h
+===================================================================
+--- linux-2.6.12.1-wrap.orig/include/linux/netfilter_ipv4/ip_conntrack_core.h	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.1-wrap/include/linux/netfilter_ipv4/ip_conntrack_core.h	2005-07-03 21:06:08.000000000 +0200
+@@ -34,6 +34,13 @@
+ ip_conntrack_find_get(const struct ip_conntrack_tuple *tuple,
+ 		      const struct ip_conntrack *ignored_conntrack);
+ 
++struct ip_conntrack_tuple_hash *
++__ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
++		    const struct ip_conntrack *ignored_conntrack);
 +
- 	return protocol->invert_tuple(inverse, orig);
- }
++struct ip_conntrack_expect *
++__ip_conntrack_exp_find(const struct ip_conntrack_tuple *tuple);
++
+ extern int __ip_conntrack_confirm(struct sk_buff **pskb);
  
+ /* Confirm a connection: returns NF_DROP if packet must be dropped. */
+Index: linux-2.6.12.1-wrap/net/ipv4/netfilter/ip_conntrack_standalone.c
+===================================================================
+--- linux-2.6.12.1-wrap.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12.1-wrap/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-07-03 21:04:40.000000000 +0200
+@@ -988,6 +988,8 @@
+ EXPORT_SYMBOL(ip_conntrack_hash);
+ EXPORT_SYMBOL(ip_conntrack_untracked);
+ EXPORT_SYMBOL_GPL(ip_conntrack_find_get);
++EXPORT_SYMBOL_GPL(__ip_conntrack_find);
++EXPORT_SYMBOL_GPL(__ip_conntrack_exp_find);
+ EXPORT_SYMBOL_GPL(ip_conntrack_put);
+ #ifdef CONFIG_IP_NF_NAT_NEEDED
+ EXPORT_SYMBOL(ip_conntrack_tcp_update);