SOURCES (LINUX_2_6): kernel-pom-ng-TARPIT.patch - updated for 2.6.25

[zbyniu]

Author: zbyniu                       Date: Thu May  8 01:37:14 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for 2.6.25

---- Files affected:
SOURCES:
   kernel-pom-ng-TARPIT.patch (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-TARPIT.patch
diff -u SOURCES/kernel-pom-ng-TARPIT.patch:1.1.2.6 SOURCES/kernel-pom-ng-TARPIT.patch:1.1.2.7
--- SOURCES/kernel-pom-ng-TARPIT.patch:1.1.2.6	Thu May  8 01:45:05 2008
+++ SOURCES/kernel-pom-ng-TARPIT.patch	Thu May  8 03:37:09 2008
@@ -173,7 +173,7 @@
 +	fl.nl_u.ip4_u.tos = RT_TOS(ip_hdr(nskb)->tos) | RTO_CONN;
 +	fl.oif = 0;
 +
-+	if (ip_route_output_key(&nrt, &fl))
++	if (ip_route_output_key(&init_net, &nrt, &fl))
 +		goto free_nskb;
 +
 +	dst_release(nskb->dst);
@@ -239,7 +239,7 @@
 +	if (ip_hdr(skb)->frag_off & htons(IP_OFFSET))
 +		return NF_DROP;
 +
-+	tarpit_tcp(skb,rt,hooknum == NF_IP_LOCAL_IN);
++	tarpit_tcp(skb,rt,hooknum == NF_INET_LOCAL_IN);
 +
 +	return NF_DROP;
 +}
@@ -258,8 +258,8 @@
 +		DEBUGP("TARPIT: bad table %s'.\n", tablename);
 +		return 0;
 +	}
-+	if ((hook_mask & ~((1 << NF_IP_LOCAL_IN)
-+			   | (1 << NF_IP_FORWARD))) != 0) {
++	if ((hook_mask & ~((1 << NF_INET_LOCAL_IN)
++			   | (1 << NF_INET_FORWARD))) != 0) {
 +		DEBUGP("TARPIT: bad hook mask %X\n", hook_mask);
 +		return 0;
 +	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-TARPIT.patch?r1=1.1.2.6&r2=1.1.2.7&f=u