[netfilter-cvslog] r4269 - trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-19 17:06:19 +0200 (Mon, 19 Sep 2005)
New Revision: 4269

Modified:
   trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c
Log:
TARPIT target doesn't compile with 2.6.14-rc due to nfcache references,
and also doesn't compile if CONFIG_SYSCTL is not set.  Below patch
fixes both, and closes bugzilla #387. (Phil Oester)


Modified: trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2005-09-19 15:00:33 UTC (rev 4268)
+++ trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2005-09-19 15:06:19 UTC (rev 4269)
@@ -121,7 +121,6 @@
 	/* This packet will not be the same as the other: clear nf fields */
 	nf_conntrack_put(nskb->nfct);
 	nskb->nfct = NULL;
-	nskb->nfcache = 0;
 #ifdef CONFIG_NETFILTER_DEBUG
 	nskb->nf_debug = 0;
 #endif
@@ -172,7 +171,11 @@
 						sizeof(struct tcphdr), 0));
 
 	/* Adjust IP TTL */
+#ifdef CONFIG_SYSCTL
 	nskb->nh.iph->ttl = sysctl_ip_default_ttl;
+#else
+	nskb->nh.iph->ttl = IPDEFTTL;
+#endif
 
 	/* Set DF, id = 0 */
 	nskb->nh.iph->frag_off = htons(IP_DF);