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_iptreemap.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'ipset_iptreemap.c') diff --git a/ipset_iptreemap.c b/ipset_iptreemap.c index 9448339..141210f 100644 --- a/ipset_iptreemap.c +++ b/ipset_iptreemap.c @@ -15,11 +15,9 @@ * Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include +#include #include -#include -#include #include #include @@ -75,19 +73,25 @@ adt_parser(unsigned int cmd, const char *optarg, void *data) char *ptr, *tmp = saved; if (strchr(tmp, '/')) { - parse_ipandmask(tmp, &mydata->start, &mask); - mydata->end = mydata->start | ~mask; + parse_ipandmask(tmp, &mydata->ip, &mask); + mydata->end = mydata->ip | ~mask; } else { - ptr = strsep(&tmp, ":"); - parse_ip(ptr, &mydata->start); + if ((ptr = strchr(tmp, ':')) != NULL) + fprintf(stderr, "Warning: please replace old separator character '%s.1' with ','.\n" + "Next release won't support it.\n", + ptr); + ptr = strsep(&tmp, "-:"); + parse_ip(ptr, &mydata->ip); if (tmp) { parse_ip(tmp, &mydata->end); } else { - mydata->end = mydata->start; + mydata->end = mydata->ip; } } + free(saved); + return 1; } @@ -120,9 +124,9 @@ printips_sorted(struct set *set, void *data, size_t len, unsigned int options) while (len >= offset + sizeof(struct ip_set_req_iptreemap)) { req = data + offset; - printf("%s", ip_tostring(req->start, options)); - if (req->start != req->end) - printf(":%s", ip_tostring(req->end, options)); + printf("%s", ip_tostring(req->ip, options)); + if (req->ip != req->end) + printf("-%s", ip_tostring(req->end, options)); printf("\n"); offset += sizeof(struct ip_set_req_iptreemap); @@ -151,10 +155,10 @@ saveips(struct set *set, void *data, size_t len, unsigned int options) while (len >= offset + sizeof(struct ip_set_req_iptreemap)) { req = data + offset; - printf("-A %s %s", set->name, ip_tostring(req->start, options)); + printf("-A %s %s", set->name, ip_tostring(req->ip, options)); - if (req->start != req->end) - printf(":%s", ip_tostring(req->end, options)); + if (req->ip != req->end) + printf("-%s", ip_tostring(req->end, options)); printf("\n"); -- cgit v1.2.3