NetFilter
[Top] [All Lists]

[PATCH 3/7] ipt_TARPIT compile fix for 2.6.21

To: Netfilter Mailing List <netfilter@lists.netfilter.org>
Subject: [PATCH 3/7] ipt_TARPIT compile fix for 2.6.21
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Date: Sat, 7 Apr 2007 20:49:48 +0200 (MEST)
Delivered-to: sp-com-lists@consult.net
Delivered-to: netfilter-list1@securepoint.com
In-reply-to: <Pine.LNX.4.61.0704072045320.22181@yvahk01.tjqt.qr>
List-archive: </pipermail/netfilter>
List-help: <mailto:netfilter-request@lists.netfilter.org?subject=help>
List-id: General discussion and user questions <netfilter.lists.netfilter.org>
List-post: <mailto:netfilter@lists.netfilter.org>
List-subscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter>, <mailto:netfilter-request@lists.netfilter.org?subject=subscribe>
List-unsubscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter>, <mailto:netfilter-request@lists.netfilter.org?subject=unsubscribe>
References: <8d158e1f0704070955x2bb50060ueb8d2c0b91acba00@mail.gmail.com> <Pine.LNX.4.61.0704072045320.22181@yvahk01.tjqt.qr>
Sender: netfilter-bounces@lists.netfilter.org
Fixes compilation of ipt_TARPIT.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/ipv4/netfilter/ipt_TARPIT.c
===================================================================
--- linux-2.6.21-rc5.orig/net/ipv4/netfilter/ipt_TARPIT.c
+++ linux-2.6.21-rc5/net/ipv4/netfilter/ipt_TARPIT.c
@@ -100,7 +100,7 @@ static void tarpit_tcp(struct sk_buff *o
                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 *o
 
        /* 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);


<Prev in Thread] Current Thread [Next in Thread>