Swen's patches applied:

- Remove needless casts from and to void pointers
- testcase timeout race fix

diff --git a/ChangeLog b/ChangeLog
index bfe8a2327fefbf2582d7a0a0350c057cc5375249..d8f1ebb2628d6c2158b474a0dcb1fe8ce2d9dba9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 [2.3.2]
  - including limits.h for UINT_MAX is required with glibc-2.8 (pud)
+ - needless cast from and to void pointers cleanups in iptreemap (Sven Wegener)
 
 2.3.1
  - segfault on --unbind :all: :all: fixed (reported by bugzilla,

diff --git a/Makefile b/Makefile
index fe37596b843a052545602fc47f1c5e2a5a0ff950..a3da904a393edc46073414832a979262b9bb4dac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.3.1
+IPSET_VERSION:=2.3.2
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

diff --git a/ipset_iptreemap.c b/ipset_iptreemap.c
index 0a8dc21a1d3c97eea9c157a8a4969ff922854d56..4588db3d5c74e8329c76f2c2096693cc9e8f60ef 100644 (file)
--- a/ipset_iptreemap.c
+++ b/ipset_iptreemap.c
@@ -31,7 +31,7 @@
 void
 create_init(void *data)
 {
-       struct ip_set_req_iptreemap_create *mydata = (struct ip_set_req_iptreemap_create *) data;
+       struct ip_set_req_iptreemap_create *mydata = data;
 
        mydata->gc_interval = 0;
 }
@@ -39,7 +39,7 @@ create_init(void *data)
 int
 create_parse(int c, char *argv[], void *data, unsigned int *flags)
 {
-       struct ip_set_req_iptreemap_create *mydata = (struct ip_set_req_iptreemap_create *) data;
+       struct ip_set_req_iptreemap_create *mydata = data;
 
        switch (c) {
                case 'g':
@@ -68,7 +68,7 @@ static struct option create_opts[] = {
 ip_set_ip_t
 adt_parser(unsigned int cmd, const char *optarg, void *data)
 {
-       struct ip_set_req_iptreemap *mydata = (struct ip_set_req_iptreemap *) data;
+       struct ip_set_req_iptreemap *mydata = data;
        ip_set_ip_t mask;
 
        char *saved = ipset_strdup(optarg);
@@ -94,8 +94,8 @@ adt_parser(unsigned int cmd, const char *optarg, void *data)
 void
 initheader(struct set *set, const void *data)
 {
-       struct ip_set_req_iptreemap_create *header = (struct ip_set_req_iptreemap_create *) data;
-       struct ip_set_iptreemap *map = (struct ip_set_iptreemap *) set->settype->header;
+       const struct ip_set_req_iptreemap_create *header = data;
+       struct ip_set_iptreemap *map = set->settype->header;
 
        map->gc_interval = header->gc_interval;
 }
@@ -103,7 +103,7 @@ initheader(struct set *set, const void *data)
 void
 printheader(struct set *set, unsigned int options)
 {
-       struct ip_set_iptreemap *mysetdata = (struct ip_set_iptreemap *) set->settype->header;
+       struct ip_set_iptreemap *mysetdata = set->settype->header;
 
        if (mysetdata->gc_interval)
                printf(" gc: %u", mysetdata->gc_interval);
@@ -118,7 +118,7 @@ printips_sorted(struct set *set, void *data, size_t len, unsigned int options)
        size_t offset = 0;
 
        while (len >= offset + sizeof(struct ip_set_req_iptreemap)) {
-               req = (struct ip_set_req_iptreemap *) (data + offset);
+               req = data + offset;
 
                printf("%s", ip_tostring(req->start, options));
                if (req->start != req->end)
@@ -132,7 +132,7 @@ printips_sorted(struct set *set, void *data, size_t len, unsigned int options)
 void
 saveheader(struct set *set, unsigned int options)
 {
-       struct ip_set_iptreemap *mysetdata = (struct ip_set_iptreemap *) set->settype->header;
+       struct ip_set_iptreemap *mysetdata = set->settype->header;
 
        printf("-N %s %s", set->name, set->settype->typename);
 
@@ -149,7 +149,7 @@ saveips(struct set *set, void *data, size_t len, unsigned int options)
        size_t offset = 0;
 
        while (len >= offset + sizeof(struct ip_set_req_iptreemap)) {
-               req = (struct ip_set_req_iptreemap *) (data + offset);
+               req = data + offset;
 
                printf("-A %s %s", set->name, ip_tostring(req->start, options));
 

diff --git a/tests/iptree.t b/tests/iptree.t
index ccd5fc7f25decfb91c1b0d5304f856f3c612240f..33b021bc7a7ffb273a134f8535a90dd4805df509 100644 (file)
--- a/tests/iptree.t
+++ b/tests/iptree.t
@@ -28,8 +28,8 @@
 1 ipset -T test 2.0.0.2
 # Timeout: Test value not added to the set
 1 ipset -T test 192.168.68.70
-# Timeout: Sleep 5s so that entries can time out
-0 sleep 5
+# Timeout: Sleep 6s so that entries can time out
+0 sleep 6
 # Timeout: Test first random value
 1 ipset -T test 2.0.0.1
 # Timeout: Test second random value