SOURCES (LINUX_2_6): linux-2.6-nf-TARPIT.patch - snap 20051028 for...

[cieciwa]

Author: cieciwa                      Date: Sat Oct 29 20:20:45 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

---- Files affected:
SOURCES:
   linux-2.6-nf-TARPIT.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-TARPIT.patch
diff -u SOURCES/linux-2.6-nf-TARPIT.patch:1.1.2.1 SOURCES/linux-2.6-nf-TARPIT.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-TARPIT.patch:1.1.2.1	Thu Sep 15 10:37:53 2005
+++ SOURCES/linux-2.6-nf-TARPIT.patch	Sat Oct 29 22:20:40 2005
@@ -1,12 +1,12 @@
  Kconfig      |   17 +++
  Makefile     |    1 
- ipt_TARPIT.c |  295 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 313 insertions(+)
+ ipt_TARPIT.c |  298 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 316 insertions(+)
 
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig
---- linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 10:29:23.000000000 +0200
-@@ -692,5 +692,22 @@
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Kconfig linux-2.6.14/net/ipv4/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv4/netfilter/Kconfig	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Kconfig	2005-10-29 22:06:09.000000000 +0200
+@@ -821,5 +821,22 @@
  	  Allows altering the ARP packet payload: source and destination
  	  hardware and network addresses.
  
@@ -29,15 +29,15 @@
 +
  endmenu
  
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile
---- linux-2.6.13.1.org/net/ipv4/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 10:29:23.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Makefile linux-2.6.14/net/ipv4/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv4/netfilter/Makefile	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Makefile	2005-10-29 22:06:09.000000000 +0200
 @@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP_NF_TARGET_TARPIT) += ipt_TARPIT.o
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ipt_TARPIT.c linux-2.6.13.1/net/ipv4/netfilter/ipt_TARPIT.c
---- linux-2.6.13.1.org/net/ipv4/netfilter/ipt_TARPIT.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_TARPIT.c	2005-09-15 10:29:23.000000000 +0200
-@@ -0,0 +1,295 @@
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_TARPIT.c linux-2.6.14/net/ipv4/netfilter/ipt_TARPIT.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_TARPIT.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_TARPIT.c	2005-10-29 22:06:09.000000000 +0200
+@@ -0,0 +1,298 @@
 +/*
 + * Kernel module to capture and hold incoming TCP connections using
 + * no local per-connection resources.
@@ -161,7 +161,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
@@ -212,7 +211,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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-TARPIT.patch?r1=1.1.2.1&r2=1.1.2.2&f=u