[PATCH] set match

[PATCH] set match

[Torsten Luettgert]

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

Hello,

here's a simple patch for the set match in pom. It adds the
new protoff parameter in the match function of ipt_set.c and
changes struct ipt_ip * to void * in the checkentry function
of ipt_set.c and ipt_SET.c, so they compile without warnings.

Regards,
Torsten

[-- Attachment #2: set.patch --]
[-- Type: text/x-patch, Size: 1093 bytes --]

Index: set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- set/linux-2.6/net/ipv4/netfilter/ipt_SET.c	(revision 6622)
+++ set/linux-2.6/net/ipv4/netfilter/ipt_SET.c	(working copy)
@@ -48,7 +48,7 @@
 
 static int
 checkentry(const char *tablename,
-	   const struct ipt_entry *e,
+	   const void *e,
 	   void *targinfo,
 	   unsigned int targinfosize, unsigned int hook_mask)
 {
Index: set/linux-2.6/net/ipv4/netfilter/ipt_set.c
===================================================================
--- set/linux-2.6/net/ipv4/netfilter/ipt_set.c	(revision 6622)
+++ set/linux-2.6/net/ipv4/netfilter/ipt_set.c	(working copy)
@@ -34,6 +34,7 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
+      unsigned int protoff,
       int *hotdrop)
 {
 	const struct ipt_set_info_match *info = matchinfo;
@@ -45,7 +46,7 @@
 
 static int
 checkentry(const char *tablename,
-	   const struct ipt_ip *ip,
+	   const void *ip,
 	   void *matchinfo,
 	   unsigned int matchsize,
 	   unsigned int hook_mask)

Re: [PATCH] set match

[Krzysztof Oledzki]

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



On Sun, 28 May 2006, Torsten Luettgert wrote:

> Hello,
Hello,

> here's a simple patch for the set match in pom. It adds the
> new protoff parameter in the match function of ipt_set.c and
> changes struct ipt_ip * to void * in the checkentry function
> of ipt_set.c and ipt_SET.c, so they compile without warnings.

http://lists.netfilter.org/pipermail/netfilter-devel/2006-March/023808.html

http://svn.netfilter.org/cgi-bin/viewcvs.cgi?rev=6569&view=rev

Best regards,

 			Krzysztof Olędzki

Re: [PATCH] set match

[Torsten Luettgert]

On Mo, 2006-05-29 at 00:33 +0200, Krzysztof Oledzki wrote:
> 
> On Sun, 28 May 2006, Torsten Luettgert wrote:
> 

> > here's a simple patch for the set match in pom. It adds the
> > new protoff parameter in the match function of ipt_set.c and
> > changes struct ipt_ip * to void * in the checkentry function
> > of ipt_set.c and ipt_SET.c, so they compile without warnings.
> 
> http://lists.netfilter.org/pipermail/netfilter-devel/2006-March/023808.html
> 
> http://svn.netfilter.org/cgi-bin/viewcvs.cgi?rev=6569&view=rev

Looks like your change was reverted at revision 6592 with
ipset 2.2.9, probably by accident.

Rest assured I wouldn't post a patch which doesn't apply to
the current revision :-)

Regards,
Torsten

Re: [PATCH] set match

[Patrick McHardy]

Torsten Luettgert wrote:
> Hello,
> 
> here's a simple patch for the set match in pom. It adds the
> new protoff parameter in the match function of ipt_set.c and
> changes struct ipt_ip * to void * in the checkentry function
> of ipt_set.c and ipt_SET.c, so they compile without warnings.

I'm leaving this to Jozsef since I don't which kernel version
he uses for development and I don't want to break stuff under
him :)