[PATCH] TARPIT cleanups

[PATCH] TARPIT cleanups

[Phil Oester]

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

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



[-- Attachment #2: patch-tarpit --]
[-- Type: text/plain, Size: 845 bytes --]

diff -ru pom-orig/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c pom-new/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c
--- pom-orig/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2005-05-17 13:08:12.000000000 -0700
+++ pom-new/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2005-09-18 10:04:35.000000000 -0700
@@ -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);

Re: [PATCH] TARPIT cleanups

[Harald Welte]

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

On Sun, Sep 18, 2005 at 10:07:15AM -0700, Phil Oester wrote:
> 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.

thanks, applied.
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]