RE: [ANNOUNCEMENT] ipset-3.1

["Rob Sterenborg" <rob@sterenborg.info>]

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

> Hello,
> 
> I'm happy to announce ipset release 3.1. A few minor bugs were
> fixed and some cleanups added:

I'm a few errors when compiling this version on Centos 5.3, kernel
2.6.18-128.4.1.el5.centos.plus-i686.

/usr/local/src/ipset/ipset-3.1/kernel/ip_set_iptree.c: In function
'iptree_create':
/usr/local/src/ipset/ipset-3.1/kernel/ip_set_iptree.c:285: warning:
format '%lu' expects type 'long unsigned int', but argument 2 has type
'unsigned int'
/usr/local/src/ipset/ipset-3.1/kernel/ip_set_iptree.c:285: warning:
format '%zu' expects type 'size_t', but argument 3 has type 'long
unsigned int'

When I switched arguments 2 and 3 for function ip_set_printk(),these
errors are gone.

> - Fix the definition of 'bool' for kernels <= 2.6.18 (Jan
> Engelhardt)

This also generates an error for me.

/usr/local/src/ipset/ipset-3.1/kernel/ip_set_setlist.c:20: error:
redefinition of typedef 'bool'
include/linux/types.h:36: error: previous declaration of 'bool' was here
/usr/local/src/ipset/ipset-3.1/kernel/ip_set_setlist.c:21: error:
redeclaration of enumerator 'false'
include/linux/stddef.h:16: error: previous definition of 'false' was
here
/usr/local/src/ipset/ipset-3.1/kernel/ip_set_setlist.c:21: error:
redeclaration of enumerator 'true'
include/linux/stddef.h:18: error: previous definition of 'true' was here

When I changed <= into < it compiled fine.

I am by no means a C developer, so please correct me if I'm doing the
wrong thing. I just played around and with these small changes I have
ipset compiling cleanly. Don't know if the changes are correct and
didn't test yet if everything works though.

I attached one diff for both files.


Grts,
Rob


[-- Attachment #2: ipset-3.1-centos-53-2.6.18-128.4.1.el5.centos.plus-i686.diff --]
[-- Type: application/octet-stream, Size: 1268 bytes --]

diff -ru ipset-3.1/kernel/ip_set_iptree.c ipset-3.1-centos-53-2.6.18-128.4.1.el5.centos.plus-i686/kernel/ip_set_iptree.c
--- ipset-3.1/kernel/ip_set_iptree.c	2009-08-18 19:39:43.000000000 +0200
+++ ipset-3.1-centos-53-2.6.18-128.4.1.el5.centos.plus-i686/kernel/ip_set_iptree.c	2009-08-20 10:29:58.000000000 +0200
@@ -283,8 +283,8 @@
 
 	if (size != sizeof(struct ip_set_req_iptree_create)) {
 		ip_set_printk("data length wrong (want %lu, have %zu)",
-			      sizeof(struct ip_set_req_iptree_create),
-			      (unsigned long)size);
+			      (unsigned long)size,
+			      sizeof(struct ip_set_req_iptree_create));
 		return -EINVAL;
 	}

diff -ru ipset-3.1/kernel/ip_set_setlist.c ipset-3.1-centos-53-2.6.18-128.4.1.el5.centos.plus-i686/kernel/ip_set_setlist.c
--- ipset-3.1/kernel/ip_set_setlist.c	2009-08-18 19:49:35.000000000 +0200
+++ ipset-3.1-centos-53-2.6.18-128.4.1.el5.centos.plus-i686/kernel/ip_set_setlist.c	2009-08-20 10:33:42.000000000 +0200
@@ -16,7 +16,7 @@
 #include <linux/netfilter_ipv4/ip_set_bitmaps.h>
 #include <linux/netfilter_ipv4/ip_set_setlist.h>
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
 typedef _Bool bool;
 enum { false = 0, true = 1, };
 #endif