Skip to contentSkip to conversation

set match

PATCH In review Torsten Luettgert 3 participants 4 messages May 28, 2006 – May 29, 2006 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 set match

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

linux-2.6/net/ipv4/netfilter/ipt_SET.c +1 -1
Index: set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
===================================================================
@@ -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)
 {
linux-2.6/net/ipv4/netfilter/ipt_set.c +2 -1
Index: set/linux-2.6/net/ipv4/netfilter/ipt_set.c
===================================================================
@@ -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)
#1 lore raw
Quoted 1 line · Torsten Luettgert

Hello,

Hello,

Quoted 4 lines

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

#2 lore raw
Quoted 4 lines · Krzysztof Oledzki

On Sun, 28 May 2006, Torsten Luettgert wrote:

Quoted 8 lines
Quoted 4 lines

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

#3 lore raw
In reply to Torsten Luettgert
Quoted 6 lines · Torsten Luettgert

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 :)