Skip to contentSkip to conversation

ipp2p/ipv4options patches

PATCH In review Sven Anders 3 participants 3 messages Jul 6, 2006 – Jul 7, 2006 netfilter

lore
Share & tools
lore

Sven Anders

author
#0 lore raw

PATCH 1/1 ipp2p/ipv4options patches

Hello!

Here are some patches for the latest Patch-O-Matic, which I needed for using them with the latest stable kernel.

These are only corrections for the new function parameters and the missing matchsize.

Regards
Sven Anders

Signature · 5 lines
 Sven Anders <[email protected]>                 () Ascii Ribbon Campaign
                                                 /\ Support plain text e-mail
 ANDURAS service solutions AG
 Innstraße 71 - 94036 Passau - Germany
 Web: www.anduras.de - Tel: +49 (0)851-4 90 50-0 - Fax: +49 (0)851-4 90 50-55
patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c +4 -1
diff -u -r -N patch-o-matic-ng-20060704.vanilla/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c patch-o-matic-ng-20060704/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c
@@ -728,6 +728,7 @@
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
+      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,

@@ -811,7 +812,8 @@
 
 static int
 checkentry(const char *tablename,
-            const void *ip,
+	    const void *ip,
+	    const struct xt_match *match,
 	    void *matchinfo,
 	    unsigned int matchsize,
 	    unsigned int hook_mask)

@@ -840,6 +842,7 @@
 	.name		= "ipp2p",
 	.match		= &match,
 	.checkentry	= &checkentry,
+	.matchsize	= sizeof(struct ipt_p2p_info),
 	.me		= THIS_MODULE,
 #endif
 };
patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c +5 -2
diff -u -r -N patch-o-matic-ng-20060704.vanilla/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c patch-o-matic-ng-20060704/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c
@@ -25,6 +25,7 @@
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
+      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,

@@ -107,6 +108,7 @@
 static int
 checkentry(const char *tablename,
 	   const void *ip,
+	   const struct xt_match *match,
 	   void *matchinfo,
 	   unsigned int matchsize,
 	   unsigned int hook_mask)

@@ -154,8 +156,9 @@
 
 static struct ipt_match ipv4options_match = { 
 	.name = "ipv4options",
-	.match = match,
-	.checkentry = checkentry,
+	.match = &match,
+	.matchsize = sizeof(struct ipt_ipv4options_info),
+	.checkentry = &checkentry,
 	.me = THIS_MODULE
 };
#1 lore raw
Quoted 1 line · Sven Anders

Hello!

Hello,

Quoted 5 lines

Here are some patches for the latest Patch-O-Matic, which I needed for using them with the latest stable kernel.

These are only corrections for the new function parameters and the missing matchsize.

Thanks. External repository for TARPIT, ipp2p, connlimit and time with extensions ready for both 2.6.16 and 2.6.17 will be ready quite soon.

Best regards,

Krzysztof Olędzki

#2 lore raw
In reply to Sven Anders
Quoted 7 lines · Sven Anders

Hello!

Here are some patches for the latest Patch-O-Matic, which I needed for using them with the latest stable kernel.

These are only corrections for the new function parameters and the missing matchsize.

Thanks. The ipp2p match is not part of official pomng anymore, but I've applied the ipv4options patch with one small change. Krzysztof Olędzki just sent me the new URL for the ipp2p match, I'll add it now.

patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c line 163

Quoted 10 lines

static struct ipt_match ipv4options_match = {

patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c +3 -2
 	.name = "ipv4options",
-	.match = match,
-	.checkentry = checkentry,
+	.match = &match,
+	.matchsize = sizeof(struct ipt_ipv4options_info),
+	.checkentry = &checkentry,
 	.me = THIS_MODULE
 };

I removed the & for the function pointers, they're not needed.