[netfilter-cvslog] r4208 - in trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat: . linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-31 22:26:37 +0200 (Sun, 31 Jul 2005)
New Revision: 4208

Modified:
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/help
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/info
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c
Log:
it actually supports >= 2.6.11


Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/help
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/help	2005-07-31 07:04:59 UTC (rev 4207)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/help	2005-07-31 20:26:37 UTC (rev 4208)
@@ -20,4 +20,3 @@
 - doesnt' support multiple calls within one session
 - you have to recompile your iptables userspace program since some 
   structure sizes change
-- does NOT work with kernels > 2.6.10

Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/info
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/info	2005-07-31 07:04:59 UTC (rev 4207)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/info	2005-07-31 20:26:37 UTC (rev 4208)
@@ -1,5 +1,5 @@
 Title: PPTP connection tracking and NAT helper
 Author:	Harald Welte <laforge at netfilter.org>
-Status: Testing, especially the 2.6.x port.  2.6.11+ has no NAT support
+Status: Testing, especially the 2.6.x port.
 Repository: extra
 Depends: !nat-reservations

Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-07-31 07:04:59 UTC (rev 4207)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-07-31 20:26:37 UTC (rev 4208)
@@ -156,7 +156,7 @@
 		ip_ct_refresh_acct(sibling, 0, NULL, 0);
 		return 1;
 	} else {
-		exp = __ip_conntrack_exp_find(t);
+		exp = __ip_conntrack_expect_find(t);
 		if (exp) {
 			DEBUGP("unexpect_related of expect %p\n", exp);
 			ip_conntrack_unexpect_related(exp);