From a96e4fca10506462df4ee4035f0f86f09bd9dc34 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Mon, 20 Oct 2008 10:00:26 +0000 Subject: ipset 2.4 release userspace changes: - Added KBUILD_OUTPUT support (Sven Wegener) - Fix memory leak in ipset_iptreemap (Sven Wegener) - Fix multiple compiler warnings (Sven Wegener) - ipportiphash, ipportnethash and setlist types added - binding marked as deprecated functionality - element separator token changed to ',' in anticipating IPv6 addresses, old separator tokens are still supported - unnecessary includes removed - ipset does not try to resolve IP addresses when listing the content of sets (default changed) - manpage updated - ChangeLog forked for kernel part kernel part changes: - ipportiphash, ipportnethash and setlist types added - set type modules reworked to avoid code duplication as much as possible, code unification macros - expand_macros Makefile target added to help debugging code unification macros - ip_set_addip_kernel and ip_set_delip_kernel changed from void to int, __ip_set_get_byname and __ip_set_put_byid added for the sake of setlist type - unnecessary includes removed - compatibility fix for kernels >= 2.6.27: semaphore.h was moved from asm/ to linux/ (James King) - ChangeLog forked for kernel part --- ipset_nethash.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) (limited to 'ipset_nethash.c') diff --git a/ipset_nethash.c b/ipset_nethash.c index 1e7aa41..d1f3344 100644 --- a/ipset_nethash.c +++ b/ipset_nethash.c @@ -15,21 +15,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include #include #include #include -#include -#include -#include -#include -#include #include -#include #include -#include +#include #include "ipset.h" @@ -43,8 +35,7 @@ static void create_init(void *data) { - struct ip_set_req_nethash_create *mydata = - (struct ip_set_req_nethash_create *) data; + struct ip_set_req_nethash_create *mydata = data; DP("create INIT"); @@ -58,8 +49,7 @@ create_init(void *data) static int create_parse(int c, char *argv[], void *data, unsigned *flags) { - struct ip_set_req_nethash_create *mydata = - (struct ip_set_req_nethash_create *) data; + struct ip_set_req_nethash_create *mydata = data; ip_set_ip_t value; DP("create_parse"); @@ -112,8 +102,7 @@ static void create_final(void *data, unsigned int flags) { #ifdef IPSET_DEBUG - struct ip_set_req_nethash_create *mydata = - (struct ip_set_req_nethash_create *) data; + struct ip_set_req_nethash_create *mydata = data; DP("hashsize %u probes %u resize %u", mydata->hashsize, mydata->probes, mydata->resize); @@ -132,8 +121,7 @@ static const struct option create_opts[] = { static ip_set_ip_t adt_parser(unsigned cmd, const char *optarg, void *data) { - struct ip_set_req_nethash *mydata = - (struct ip_set_req_nethash *) data; + struct ip_set_req_nethash *mydata = data; char *saved = ipset_strdup(optarg); char *ptr, *tmp = saved; ip_set_ip_t cidr; @@ -168,10 +156,8 @@ adt_parser(unsigned cmd, const char *optarg, void *data) static void initheader(struct set *set, const void *data) { - struct ip_set_req_nethash_create *header = - (struct ip_set_req_nethash_create *) data; - struct ip_set_nethash *map = - (struct ip_set_nethash *) set->settype->header; + const struct ip_set_req_nethash_create *header = data; + struct ip_set_nethash *map = set->settype->header; memset(map, 0, sizeof(struct ip_set_nethash)); map->hashsize = header->hashsize; @@ -182,8 +168,7 @@ initheader(struct set *set, const void *data) static void printheader(struct set *set, unsigned options) { - struct ip_set_nethash *mysetdata = - (struct ip_set_nethash *) set->settype->header; + struct ip_set_nethash *mysetdata = set->settype->header; printf(" hashsize: %u", mysetdata->hashsize); printf(" probes: %u", mysetdata->probes); @@ -261,8 +246,7 @@ printips(struct set *set, void *data, size_t len, unsigned options) static void saveheader(struct set *set, unsigned options) { - struct ip_set_nethash *mysetdata = - (struct ip_set_nethash *) set->settype->header; + struct ip_set_nethash *mysetdata = set->settype->header; printf("-N %s %s --hashsize %u --probes %u --resize %u\n", set->name, set->settype->typename, @@ -311,7 +295,7 @@ parse_net(const char *str, ip_set_ip_t *ip) parse_ip(ptr, ip); free(saved); - *ip = pack(*ip, cidr); + *ip = pack_ip_cidr(*ip, cidr); } static void usage(void) -- cgit v1.2.3