diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ipset_iptreemap.c | 18 | ||||
| -rw-r--r-- | tests/iptree.t | 4 |
4 files changed, 13 insertions, 12 deletions
@@ -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, @@ -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 0a8dc21..4588db3 100644 --- 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 ccd5fc7..33b021b 100644 --- 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 |