[PATCH] [POM] ipp2p/ipv4options patches

[PATCH] [POM] ipp2p/ipv4options patches

[Sven Anders]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

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

-- 
 Sven Anders <anders@anduras.de>                 () 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

[-- Attachment #2: patch-o-matic-ng-20060704.patches --]
[-- Type: text/plain, Size: 2290 bytes --]

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
--- patch-o-matic-ng-20060704.vanilla/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c	2006-03-29 14:42:09.000000000 +0200
+++ patch-o-matic-ng-20060704/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c	2006-07-06 11:03:30.000000000 +0200
@@ -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
 };
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
--- patch-o-matic-ng-20060704.vanilla/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2006-03-29 11:05:43.000000000 +0200
+++ patch-o-matic-ng-20060704/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2006-07-06 11:04:55.000000000 +0200
@@ -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
 };
 

Re: [PATCH] [POM] ipp2p/ipv4options patches

[Krzysztof Oledzki]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 467 bytes --]



On Thu, 6 Jul 2006, Sven Anders wrote:

> Hello!
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. 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

Re: [PATCH] [POM] ipp2p/ipv4options patches

[Patrick McHardy]

Sven Anders wrote:
> 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.

>  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
>  };
>  

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