[PATCH] remove ip_ct_refresh() abuse from the pptp conntrack helper (2/4)

[PATCH] remove ip_ct_refresh() abuse from the pptp conntrack helper (2/4)

[Martin Josefsson]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi again,

Here's the pptp helper patch, it's against the 020602 CVS, should apply
just fine as I havn't seen any updates to this module in the
netfilter-cvs list.

It replaces the ip_ct_refresh() abuse with the real deal.

-- 
/Martin

Never argue with an idiot. They drag you down to their level, then beat
you with experience.

[-- Attachment #2: pptp-conntrack-nat_death.diff --]
[-- Type: text/plain, Size: 1201 bytes --]

--- netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch.orig	Thu Jun  6 14:03:35 2002
+++ netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch	Thu Jun  6 14:05:17 2002
@@ -572,7 +572,7 @@
 diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*~' linux-2.4.18-newnat/net/ipv4/netfilter/ip_conntrack_pptp.c linux-2.4.18-pptp3.01//net/ipv4/netfilter/ip_conntrack_pptp.c
 --- linux-2.4.18-newnat/net/ipv4/netfilter/ip_conntrack_pptp.c	Thu Jan  1 01:00:00 1970
 +++ linux-2.4.18-pptp3.01//net/ipv4/netfilter/ip_conntrack_pptp.c	Mon Apr  8 16:40:37 2002
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,542 @@
 +/*
 + * ip_conntrack_pptp.c	- Version $Revision: 1.6 $
 + *
@@ -682,11 +682,13 @@
 +		if (!exp->sibling)
 +			continue;
 +
-+		DEBUGP("setting timeout of conntrack %p to 0\n",
++		DEBUGP("killing conntrack %p\n",
 +			exp->sibling);
 +		exp->sibling->proto.gre.timeout = 0;
 +		exp->sibling->proto.gre.stream_timeout = 0;
-+		ip_ct_refresh(exp->sibling, 0);
++
++		if (del_timer(&exp->sibling->timeout))
++			ip_ct_death_by_timeout((unsigned long)exp->sibling);
 +	}
 +
 +	return 0;