[PATCH] ipt_TARPIT for Linux 2.6.21

[PATCH] ipt_TARPIT for Linux 2.6.21

[Max Kellermann]

Adapt ipt_TARPIT for Linux 2.6.21.

Signed-off-by: Max Kellermann <max@duempel.org>

diff --git a/net/ipv4/netfilter/ipt_TARPIT.c b/net/ipv4/netfilter/ipt_TARPIT.c
index 3a2bd64..f0e252d 100644
--- a/net/ipv4/netfilter/ipt_TARPIT.c
+++ b/net/ipv4/netfilter/ipt_TARPIT.c
@@ -100,7 +100,7 @@ static void tarpit_tcp(struct sk_buff *oskb,struct rtable *ort,int local)
 		return;
 
 	/* Check checksum. */
-	if (tcp_v4_check(otcph, otcplen, oskb->nh.iph->saddr,
+	if (tcp_v4_check(otcplen, oskb->nh.iph->saddr,
 			 oskb->nh.iph->daddr,
 			 csum_partial((char *)otcph, otcplen, 0)) != 0)
 		return;
@@ -158,7 +158,7 @@ static void tarpit_tcp(struct sk_buff *oskb,struct rtable *ort,int local)
 
 	/* Adjust TCP checksum */
 	ntcph->check = 0;
-	ntcph->check = tcp_v4_check(ntcph, sizeof(struct tcphdr),
+	ntcph->check = tcp_v4_check(sizeof(struct tcphdr),
 				   nskb->nh.iph->saddr,
 				   nskb->nh.iph->daddr,
 				   csum_partial((char *)ntcph,
@@ -269,8 +269,9 @@ static int check(const char *tablename,
 	return 1;
 }
 
-static struct ipt_target ipt_tarpit_reg = {
+static struct xt_target ipt_tarpit_reg = {
 	.name = "TARPIT",
+	.family = AF_INET,
 	.target = tarpit,
 	.checkentry = check,
 	.me = THIS_MODULE
@@ -278,12 +279,12 @@ static struct ipt_target ipt_tarpit_reg = {
 
 static int __init init(void)
 {
-	return ipt_register_target(&ipt_tarpit_reg);
+	return xt_register_target(&ipt_tarpit_reg);
 }
 
 static void __exit fini(void)
 {
-	ipt_unregister_target(&ipt_tarpit_reg);
+	xt_unregister_target(&ipt_tarpit_reg);
 }
 
 module_init(init);

Re: [PATCH] ipt_TARPIT for Linux 2.6.21

[Jan Engelhardt]

On Apr 27 2007 10:23, Max Kellermann wrote:
>Date: Fri, 27 Apr 2007 10:23:43 +0200
>From: Max Kellermann <max@duempel.org>
>To: netfilter-devel@lists.netfilter.org
>Cc: Patrick McHardy <kaber@trash.net>
>Subject: [PATCH] ipt_TARPIT for Linux 2.6.21
>
>Adapt ipt_TARPIT for Linux 2.6.21.

Man... how many more people are gonna submit this...

http://lists.netfilter.org/pipermail/netfilter/2007-April/068385.html


Jan
-- 

Re: [PATCH] ipt_TARPIT for Linux 2.6.21

[Max Kellermann]

On 2007/04/27 10:31, Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
> Man... how many more people are gonna submit this...

Oops.  I must have been blind, though it isn't in SVN yet.

Max

Re: [PATCH] ipt_TARPIT for Linux 2.6.21

[Patrick McHardy]

Max Kellermann wrote:
> Adapt ipt_TARPIT for Linux 2.6.21.

Applied, thanks.

Re: [PATCH] ipt_TARPIT for Linux 2.6.21

[Patrick McHardy]

Jan Engelhardt wrote:
> Man... how many more people are gonna submit this...
> 
> http://lists.netfilter.org/pipermail/netfilter/2007-April/068385.html


Again, netfilter@ is not the proper list to submit patches, they
won't get applied.