From cfd1ae75a43ef1aa7734defa1754b1c94c0b3756 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 22 Apr 2010 17:04:04 +0200 Subject: Sixth stage to ipset-5 Remove unnecessary include files and rename some. --- kernel/include/linux/netfilter/ip_set_bitmap.h | 120 ++++++++ kernel/include/linux/netfilter/ip_set_bitmaps.h | 120 -------- kernel/include/linux/netfilter/ip_set_compat.h | 92 ------ kernel/include/linux/netfilter/ip_set_hash.h | 314 +++++++++++++++++++++ kernel/include/linux/netfilter/ip_set_hashes.h | 314 --------------------- kernel/include/linux/netfilter/ip_set_iphash.h | 30 -- kernel/include/linux/netfilter/ip_set_ipmap.h | 57 ---- kernel/include/linux/netfilter/ip_set_ipporthash.h | 33 --- .../include/linux/netfilter/ip_set_ipportiphash.h | 39 --- .../include/linux/netfilter/ip_set_ipportnethash.h | 42 --- kernel/include/linux/netfilter/ip_set_iptree.h | 39 --- kernel/include/linux/netfilter/ip_set_iptreemap.h | 40 --- kernel/include/linux/netfilter/ip_set_macipmap.h | 39 --- kernel/include/linux/netfilter/ip_set_malloc.h | 153 ---------- kernel/include/linux/netfilter/ip_set_nethash.h | 31 -- kernel/include/linux/netfilter/ip_set_portmap.h | 25 -- kernel/include/linux/netfilter/ip_set_setlist.h | 26 -- 17 files changed, 434 insertions(+), 1080 deletions(-) create mode 100644 kernel/include/linux/netfilter/ip_set_bitmap.h delete mode 100644 kernel/include/linux/netfilter/ip_set_bitmaps.h delete mode 100644 kernel/include/linux/netfilter/ip_set_compat.h create mode 100644 kernel/include/linux/netfilter/ip_set_hash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_hashes.h delete mode 100644 kernel/include/linux/netfilter/ip_set_iphash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_ipmap.h delete mode 100644 kernel/include/linux/netfilter/ip_set_ipporthash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_ipportiphash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_ipportnethash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_iptree.h delete mode 100644 kernel/include/linux/netfilter/ip_set_iptreemap.h delete mode 100644 kernel/include/linux/netfilter/ip_set_macipmap.h delete mode 100644 kernel/include/linux/netfilter/ip_set_malloc.h delete mode 100644 kernel/include/linux/netfilter/ip_set_nethash.h delete mode 100644 kernel/include/linux/netfilter/ip_set_portmap.h delete mode 100644 kernel/include/linux/netfilter/ip_set_setlist.h diff --git a/kernel/include/linux/netfilter/ip_set_bitmap.h b/kernel/include/linux/netfilter/ip_set_bitmap.h new file mode 100644 index 0000000..da3493f --- /dev/null +++ b/kernel/include/linux/netfilter/ip_set_bitmap.h @@ -0,0 +1,120 @@ +#ifndef __IP_SET_BITMAPS_H +#define __IP_SET_BITMAPS_H + +/* Macros to generate functions */ + +#ifdef __KERNEL__ +#define BITMAP_CREATE(type) \ +static int \ +type##_create(struct ip_set *set, const void *data, u_int32_t size) \ +{ \ + int newbytes; \ + const struct ip_set_req_##type##_create *req = data; \ + struct ip_set_##type *map; \ + \ + if (req->from > req->to) { \ + DP("bad range"); \ + return -ENOEXEC; \ + } \ + \ + map = kmalloc(sizeof(struct ip_set_##type), GFP_KERNEL); \ + if (!map) { \ + DP("out of memory for %zu bytes", \ + sizeof(struct ip_set_##type)); \ + return -ENOMEM; \ + } \ + map->first_ip = req->from; \ + map->last_ip = req->to; \ + \ + newbytes = __##type##_create(req, map); \ + if (newbytes < 0) { \ + kfree(map); \ + return newbytes; \ + } \ + \ + map->size = newbytes; \ + map->members = ip_set_malloc(newbytes); \ + if (!map->members) { \ + DP("out of memory for %i bytes", newbytes); \ + kfree(map); \ + return -ENOMEM; \ + } \ + memset(map->members, 0, newbytes); \ + \ + set->data = map; \ + return 0; \ +} + +#define BITMAP_DESTROY(type) \ +static void \ +type##_destroy(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data; \ + \ + ip_set_free(map->members, map->size); \ + kfree(map); \ + \ + set->data = NULL; \ +} + +#define BITMAP_FLUSH(type) \ +static void \ +type##_flush(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data; \ + memset(map->members, 0, map->size); \ +} + +#define BITMAP_LIST_HEADER(type) \ +static void \ +type##_list_header(const struct ip_set *set, void *data) \ +{ \ + const struct ip_set_##type *map = set->data; \ + struct ip_set_req_##type##_create *header = data; \ + \ + header->from = map->first_ip; \ + header->to = map->last_ip; \ + __##type##_list_header(map, header); \ +} + +#define BITMAP_LIST_MEMBERS_SIZE(type, dtype, sizeid, testfn) \ +static int \ +type##_list_members_size(const struct ip_set *set, char dont_align) \ +{ \ + const struct ip_set_##type *map = set->data; \ + ip_set_ip_t i, elements = 0; \ + \ + if (dont_align) \ + return map->size; \ + \ + for (i = 0; i < sizeid; i++) \ + if (testfn) \ + elements++; \ + \ + return elements * IPSET_ALIGN(sizeof(dtype)); \ +} + +#define IP_SET_TYPE(type, __features) \ +struct ip_set_type ip_set_##type = { \ + .typename = #type, \ + .features = __features, \ + .protocol_version = IP_SET_PROTOCOL_VERSION, \ + .create = &type##_create, \ + .destroy = &type##_destroy, \ + .flush = &type##_flush, \ + .reqsize = sizeof(struct ip_set_req_##type), \ + .addip = &type##_uadd, \ + .addip_kernel = &type##_kadd, \ + .delip = &type##_udel, \ + .delip_kernel = &type##_kdel, \ + .testip = &type##_utest, \ + .testip_kernel = &type##_ktest, \ + .header_size = sizeof(struct ip_set_req_##type##_create),\ + .list_header = &type##_list_header, \ + .list_members_size = &type##_list_members_size, \ + .list_members = &type##_list_members, \ + .me = THIS_MODULE, \ +}; +#endif /* __KERNEL */ + +#endif /* __IP_SET_BITMAPS_H */ diff --git a/kernel/include/linux/netfilter/ip_set_bitmaps.h b/kernel/include/linux/netfilter/ip_set_bitmaps.h deleted file mode 100644 index da3493f..0000000 --- a/kernel/include/linux/netfilter/ip_set_bitmaps.h +++ /dev/null @@ -1,120 +0,0 @@ -#ifndef __IP_SET_BITMAPS_H -#define __IP_SET_BITMAPS_H - -/* Macros to generate functions */ - -#ifdef __KERNEL__ -#define BITMAP_CREATE(type) \ -static int \ -type##_create(struct ip_set *set, const void *data, u_int32_t size) \ -{ \ - int newbytes; \ - const struct ip_set_req_##type##_create *req = data; \ - struct ip_set_##type *map; \ - \ - if (req->from > req->to) { \ - DP("bad range"); \ - return -ENOEXEC; \ - } \ - \ - map = kmalloc(sizeof(struct ip_set_##type), GFP_KERNEL); \ - if (!map) { \ - DP("out of memory for %zu bytes", \ - sizeof(struct ip_set_##type)); \ - return -ENOMEM; \ - } \ - map->first_ip = req->from; \ - map->last_ip = req->to; \ - \ - newbytes = __##type##_create(req, map); \ - if (newbytes < 0) { \ - kfree(map); \ - return newbytes; \ - } \ - \ - map->size = newbytes; \ - map->members = ip_set_malloc(newbytes); \ - if (!map->members) { \ - DP("out of memory for %i bytes", newbytes); \ - kfree(map); \ - return -ENOMEM; \ - } \ - memset(map->members, 0, newbytes); \ - \ - set->data = map; \ - return 0; \ -} - -#define BITMAP_DESTROY(type) \ -static void \ -type##_destroy(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data; \ - \ - ip_set_free(map->members, map->size); \ - kfree(map); \ - \ - set->data = NULL; \ -} - -#define BITMAP_FLUSH(type) \ -static void \ -type##_flush(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data; \ - memset(map->members, 0, map->size); \ -} - -#define BITMAP_LIST_HEADER(type) \ -static void \ -type##_list_header(const struct ip_set *set, void *data) \ -{ \ - const struct ip_set_##type *map = set->data; \ - struct ip_set_req_##type##_create *header = data; \ - \ - header->from = map->first_ip; \ - header->to = map->last_ip; \ - __##type##_list_header(map, header); \ -} - -#define BITMAP_LIST_MEMBERS_SIZE(type, dtype, sizeid, testfn) \ -static int \ -type##_list_members_size(const struct ip_set *set, char dont_align) \ -{ \ - const struct ip_set_##type *map = set->data; \ - ip_set_ip_t i, elements = 0; \ - \ - if (dont_align) \ - return map->size; \ - \ - for (i = 0; i < sizeid; i++) \ - if (testfn) \ - elements++; \ - \ - return elements * IPSET_ALIGN(sizeof(dtype)); \ -} - -#define IP_SET_TYPE(type, __features) \ -struct ip_set_type ip_set_##type = { \ - .typename = #type, \ - .features = __features, \ - .protocol_version = IP_SET_PROTOCOL_VERSION, \ - .create = &type##_create, \ - .destroy = &type##_destroy, \ - .flush = &type##_flush, \ - .reqsize = sizeof(struct ip_set_req_##type), \ - .addip = &type##_uadd, \ - .addip_kernel = &type##_kadd, \ - .delip = &type##_udel, \ - .delip_kernel = &type##_kdel, \ - .testip = &type##_utest, \ - .testip_kernel = &type##_ktest, \ - .header_size = sizeof(struct ip_set_req_##type##_create),\ - .list_header = &type##_list_header, \ - .list_members_size = &type##_list_members_size, \ - .list_members = &type##_list_members, \ - .me = THIS_MODULE, \ -}; -#endif /* __KERNEL */ - -#endif /* __IP_SET_BITMAPS_H */ diff --git a/kernel/include/linux/netfilter/ip_set_compat.h b/kernel/include/linux/netfilter/ip_set_compat.h deleted file mode 100644 index 9f17397..0000000 --- a/kernel/include/linux/netfilter/ip_set_compat.h +++ /dev/null @@ -1,92 +0,0 @@ -#ifndef _IP_SET_COMPAT_H -#define _IP_SET_COMPAT_H - -#ifdef __KERNEL__ -#include - -/* Arrgh */ -#ifdef MODULE -#define __MOD_INC(foo) __MOD_INC_USE_COUNT(foo) -#define __MOD_DEC(foo) __MOD_DEC_USE_COUNT(foo) -#else -#define __MOD_INC(foo) 1 -#define __MOD_DEC(foo) -#endif - -/* Backward compatibility */ -#ifndef __nocast -#define __nocast -#endif -#ifndef __bitwise__ -#define __bitwise__ -#endif - -/* Compatibility glue code */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -#include -#define DEFINE_RWLOCK(x) rwlock_t x = RW_LOCK_UNLOCKED -#define try_module_get(x) __MOD_INC(x) -#define module_put(x) __MOD_DEC(x) -#define __clear_bit(nr, addr) clear_bit(nr, addr) -#define __set_bit(nr, addr) set_bit(nr, addr) -#define __test_and_set_bit(nr, addr) test_and_set_bit(nr, addr) -#define __test_and_clear_bit(nr, addr) test_and_clear_bit(nr, addr) - -typedef unsigned __bitwise__ gfp_t; - -static inline void *kzalloc(size_t size, gfp_t flags) -{ - void *data = kmalloc(size, flags); - - if (data) - memset(data, 0, size); - - return data; -} -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) -#define __KMEM_CACHE_T__ kmem_cache_t -#else -#define __KMEM_CACHE_T__ struct kmem_cache -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) -#define ip_hdr(skb) ((skb)->nh.iph) -#define skb_mac_header(skb) ((skb)->mac.raw) -#define eth_hdr(skb) ((struct ethhdr *)skb_mac_header(skb)) -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) -#include -#define KMEM_CACHE_CREATE(name, size) \ - kmem_cache_create(name, size, 0, 0, NULL, NULL) -#else -#define KMEM_CACHE_CREATE(name, size) \ - kmem_cache_create(name, size, 0, 0, NULL) -#endif - -#ifndef NIPQUAD -#define NIPQUAD(addr) \ - ((unsigned char *)&addr)[0], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[3] -#endif - -#ifndef HIPQUAD -#if defined(__LITTLE_ENDIAN) -#define HIPQUAD(addr) \ - ((unsigned char *)&addr)[3], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[0] -#elif defined(__BIG_ENDIAN) -#define HIPQUAD NIPQUAD -#else -#error "Please fix asm/byteorder.h" -#endif /* __LITTLE_ENDIAN */ -#endif - -#endif /* __KERNEL__ */ -#endif /* _IP_SET_COMPAT_H */ diff --git a/kernel/include/linux/netfilter/ip_set_hash.h b/kernel/include/linux/netfilter/ip_set_hash.h new file mode 100644 index 0000000..8eeced3 --- /dev/null +++ b/kernel/include/linux/netfilter/ip_set_hash.h @@ -0,0 +1,314 @@ +#ifndef __IP_SET_HASHES_H +#define __IP_SET_HASHES_H + +#define initval_t uint32_t + +/* Macros to generate functions */ + +#ifdef __KERNEL__ +#define HASH_RETRY0(type, dtype, cond) \ +static int \ +type##_retry(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data, *tmp; \ + dtype *elem; \ + void *members; \ + u_int32_t i, hashsize = map->hashsize; \ + int res; \ + \ + if (map->resize == 0) \ + return -ERANGE; \ + \ + again: \ + res = 0; \ + \ + /* Calculate new hash size */ \ + hashsize += (hashsize * map->resize)/100; \ + if (hashsize == map->hashsize) \ + hashsize++; \ + \ + ip_set_printk("rehashing of set %s triggered: " \ + "hashsize grows from %lu to %lu", \ + set->name, \ + (long unsigned)map->hashsize, \ + (long unsigned)hashsize); \ + \ + tmp = kmalloc(sizeof(struct ip_set_##type) \ + + map->probes * sizeof(initval_t), GFP_ATOMIC); \ + if (!tmp) { \ + DP("out of memory for %zu bytes", \ + sizeof(struct ip_set_##type) \ + + map->probes * sizeof(initval_t)); \ + return -ENOMEM; \ + } \ + tmp->members = harray_malloc(hashsize, sizeof(dtype), GFP_ATOMIC);\ + if (!tmp->members) { \ + DP("out of memory for %zu bytes", hashsize * sizeof(dtype));\ + kfree(tmp); \ + return -ENOMEM; \ + } \ + tmp->hashsize = hashsize; \ + tmp->elements = 0; \ + tmp->probes = map->probes; \ + tmp->resize = map->resize; \ + memcpy(tmp->initval, map->initval, map->probes * sizeof(initval_t));\ + __##type##_retry(tmp, map); \ + \ + write_lock_bh(&set->lock); \ + map = set->data; /* Play safe */ \ + for (i = 0; i < map->hashsize && res == 0; i++) { \ + elem = HARRAY_ELEM(map->members, dtype *, i); \ + if (cond) \ + res = __##type##_add(tmp, elem); \ + } \ + if (res) { \ + /* Failure, try again */ \ + write_unlock_bh(&set->lock); \ + harray_free(tmp->members); \ + kfree(tmp); \ + goto again; \ + } \ + \ + /* Success at resizing! */ \ + members = map->members; \ + \ + map->hashsize = tmp->hashsize; \ + map->members = tmp->members; \ + write_unlock_bh(&set->lock); \ + \ + harray_free(members); \ + kfree(tmp); \ + \ + return 0; \ +} + +#define HASH_RETRY(type, dtype) \ + HASH_RETRY0(type, dtype, *elem) + +#define HASH_RETRY2(type, dtype) \ + HASH_RETRY0(type, dtype, elem->ip || elem->ip1) + +#define HASH_CREATE(type, dtype) \ +static int \ +type##_create(struct ip_set *set, const void *data, u_int32_t size) \ +{ \ + const struct ip_set_req_##type##_create *req = data; \ + struct ip_set_##type *map; \ + uint16_t i; \ + \ + if (req->hashsize < 1) { \ + ip_set_printk("hashsize too small"); \ + return -ENOEXEC; \ + } \ + \ + if (req->probes < 1) { \ + ip_set_printk("probes too small"); \ + return -ENOEXEC; \ + } \ + \ + map = kmalloc(sizeof(struct ip_set_##type) \ + + req->probes * sizeof(initval_t), GFP_KERNEL); \ + if (!map) { \ + DP("out of memory for %zu bytes", \ + sizeof(struct ip_set_##type) \ + + req->probes * sizeof(initval_t)); \ + return -ENOMEM; \ + } \ + for (i = 0; i < req->probes; i++) \ + get_random_bytes(((initval_t *) map->initval)+i, 4); \ + map->elements = 0; \ + map->hashsize = req->hashsize; \ + map->probes = req->probes; \ + map->resize = req->resize; \ + if (__##type##_create(req, map)) { \ + kfree(map); \ + return -ENOEXEC; \ + } \ + map->members = harray_malloc(map->hashsize, sizeof(dtype), GFP_KERNEL);\ + if (!map->members) { \ + DP("out of memory for %zu bytes", map->hashsize * sizeof(dtype));\ + kfree(map); \ + return -ENOMEM; \ + } \ + \ + set->data = map; \ + return 0; \ +} + +#define HASH_DESTROY(type) \ +static void \ +type##_destroy(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data; \ + \ + harray_free(map->members); \ + kfree(map); \ + \ + set->data = NULL; \ +} + +#define HASH_FLUSH(type, dtype) \ +static void \ +type##_flush(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data; \ + harray_flush(map->members, map->hashsize, sizeof(dtype)); \ + map->elements = 0; \ +} + +#define HASH_FLUSH_CIDR(type, dtype) \ +static void \ +type##_flush(struct ip_set *set) \ +{ \ + struct ip_set_##type *map = set->data; \ + harray_flush(map->members, map->hashsize, sizeof(dtype)); \ + memset(map->cidr, 0, sizeof(map->cidr)); \ + memset(map->nets, 0, sizeof(map->nets)); \ + map->elements = 0; \ +} + +#define HASH_LIST_HEADER(type) \ +static void \ +type##_list_header(const struct ip_set *set, void *data) \ +{ \ + const struct ip_set_##type *map = set->data; \ + struct ip_set_req_##type##_create *header = data; \ + \ + header->hashsize = map->hashsize; \ + header->probes = map->probes; \ + header->resize = map->resize; \ + __##type##_list_header(map, header); \ +} + +#define HASH_LIST_MEMBERS_SIZE(type, dtype) \ +static int \ +type##_list_members_size(const struct ip_set *set, char dont_align) \ +{ \ + const struct ip_set_##type *map = set->data; \ + \ + return (map->elements * IPSET_VALIGN(sizeof(dtype), dont_align));\ +} + +#define HASH_LIST_MEMBERS(type, dtype) \ +static void \ +type##_list_members(const struct ip_set *set, void *data, char dont_align)\ +{ \ + const struct ip_set_##type *map = set->data; \ + dtype *elem, *d; \ + uint32_t i, n = 0; \ + \ + for (i = 0; i < map->hashsize; i++) { \ + elem = HARRAY_ELEM(map->members, dtype *, i); \ + if (*elem) { \ + d = data + n * IPSET_VALIGN(sizeof(dtype), dont_align);\ + *d = *elem; \ + n++; \ + } \ + } \ +} + +#define HASH_LIST_MEMBERS_MEMCPY(type, dtype, nonzero) \ +static void \ +type##_list_members(const struct ip_set *set, void *data, char dont_align)\ +{ \ + const struct ip_set_##type *map = set->data; \ + dtype *elem; \ + uint32_t i, n = 0; \ + \ + for (i = 0; i < map->hashsize; i++) { \ + elem = HARRAY_ELEM(map->members, dtype *, i); \ + if (nonzero) { \ + memcpy(data + n * IPSET_VALIGN(sizeof(dtype), dont_align),\ + elem, sizeof(dtype)); \ + n++; \ + } \ + } \ +} + +#define IP_SET_RTYPE(type, __features) \ +struct ip_set_type ip_set_##type = { \ + .typename = #type, \ + .features = __features, \ + .protocol_version = IP_SET_PROTOCOL_VERSION, \ + .create = &type##_create, \ + .retry = &type##_retry, \ + .destroy = &type##_destroy, \ + .flush = &type##_flush, \ + .reqsize = sizeof(struct ip_set_req_##type), \ + .addip = &type##_uadd, \ + .addip_kernel = &type##_kadd, \ + .delip = &type##_udel, \ + .delip_kernel = &type##_kdel, \ + .testip = &type##_utest, \ + .testip_kernel = &type##_ktest, \ + .header_size = sizeof(struct ip_set_req_##type##_create),\ + .list_header = &type##_list_header, \ + .list_members_size = &type##_list_members_size, \ + .list_members = &type##_list_members, \ + .me = THIS_MODULE, \ +}; + +/* Helper functions */ +static inline void +add_cidr_size(uint8_t *cidr, uint8_t size) +{ + uint8_t next; + int i; + + for (i = 0; i < 30 && cidr[i]; i++) { + if (cidr[i] < size) { + next = cidr[i]; + cidr[i] = size; + size = next; + } + } + if (i < 30) + cidr[i] = size; +} + +static inline void +del_cidr_size(uint8_t *cidr, uint8_t size) +{ + int i; + + for (i = 0; i < 29 && cidr[i]; i++) { + if (cidr[i] == size) + cidr[i] = size = cidr[i+1]; + } + cidr[29] = 0; +} +#else +#include +#endif /* __KERNEL */ + +#ifndef UINT16_MAX +#define UINT16_MAX 65535 +#endif + +static unsigned char shifts[] = {255, 253, 249, 241, 225, 193, 129, 1}; + +static inline ip_set_ip_t +pack_ip_cidr(ip_set_ip_t ip, unsigned char cidr) +{ + ip_set_ip_t addr, *paddr = &addr; + unsigned char n, t, *a; + + addr = htonl(ip & (0xFFFFFFFF << (32 - (cidr)))); +#ifdef __KERNEL__ + DP("ip:%u.%u.%u.%u/%u", NIPQUAD(addr), cidr); +#endif + n = cidr / 8; + t = cidr % 8; + a = &((unsigned char *)paddr)[n]; + *a = *a /(1 << (8 - t)) + shifts[t]; +#ifdef __KERNEL__ + DP("n: %u, t: %u, a: %u", n, t, *a); + DP("ip:%u.%u.%u.%u/%u, %u.%u.%u.%u", + HIPQUAD(ip), cidr, NIPQUAD(addr)); +#endif + + return ntohl(addr); +} + + +#endif /* __IP_SET_HASHES_H */ diff --git a/kernel/include/linux/netfilter/ip_set_hashes.h b/kernel/include/linux/netfilter/ip_set_hashes.h deleted file mode 100644 index 8eeced3..0000000 --- a/kernel/include/linux/netfilter/ip_set_hashes.h +++ /dev/null @@ -1,314 +0,0 @@ -#ifndef __IP_SET_HASHES_H -#define __IP_SET_HASHES_H - -#define initval_t uint32_t - -/* Macros to generate functions */ - -#ifdef __KERNEL__ -#define HASH_RETRY0(type, dtype, cond) \ -static int \ -type##_retry(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data, *tmp; \ - dtype *elem; \ - void *members; \ - u_int32_t i, hashsize = map->hashsize; \ - int res; \ - \ - if (map->resize == 0) \ - return -ERANGE; \ - \ - again: \ - res = 0; \ - \ - /* Calculate new hash size */ \ - hashsize += (hashsize * map->resize)/100; \ - if (hashsize == map->hashsize) \ - hashsize++; \ - \ - ip_set_printk("rehashing of set %s triggered: " \ - "hashsize grows from %lu to %lu", \ - set->name, \ - (long unsigned)map->hashsize, \ - (long unsigned)hashsize); \ - \ - tmp = kmalloc(sizeof(struct ip_set_##type) \ - + map->probes * sizeof(initval_t), GFP_ATOMIC); \ - if (!tmp) { \ - DP("out of memory for %zu bytes", \ - sizeof(struct ip_set_##type) \ - + map->probes * sizeof(initval_t)); \ - return -ENOMEM; \ - } \ - tmp->members = harray_malloc(hashsize, sizeof(dtype), GFP_ATOMIC);\ - if (!tmp->members) { \ - DP("out of memory for %zu bytes", hashsize * sizeof(dtype));\ - kfree(tmp); \ - return -ENOMEM; \ - } \ - tmp->hashsize = hashsize; \ - tmp->elements = 0; \ - tmp->probes = map->probes; \ - tmp->resize = map->resize; \ - memcpy(tmp->initval, map->initval, map->probes * sizeof(initval_t));\ - __##type##_retry(tmp, map); \ - \ - write_lock_bh(&set->lock); \ - map = set->data; /* Play safe */ \ - for (i = 0; i < map->hashsize && res == 0; i++) { \ - elem = HARRAY_ELEM(map->members, dtype *, i); \ - if (cond) \ - res = __##type##_add(tmp, elem); \ - } \ - if (res) { \ - /* Failure, try again */ \ - write_unlock_bh(&set->lock); \ - harray_free(tmp->members); \ - kfree(tmp); \ - goto again; \ - } \ - \ - /* Success at resizing! */ \ - members = map->members; \ - \ - map->hashsize = tmp->hashsize; \ - map->members = tmp->members; \ - write_unlock_bh(&set->lock); \ - \ - harray_free(members); \ - kfree(tmp); \ - \ - return 0; \ -} - -#define HASH_RETRY(type, dtype) \ - HASH_RETRY0(type, dtype, *elem) - -#define HASH_RETRY2(type, dtype) \ - HASH_RETRY0(type, dtype, elem->ip || elem->ip1) - -#define HASH_CREATE(type, dtype) \ -static int \ -type##_create(struct ip_set *set, const void *data, u_int32_t size) \ -{ \ - const struct ip_set_req_##type##_create *req = data; \ - struct ip_set_##type *map; \ - uint16_t i; \ - \ - if (req->hashsize < 1) { \ - ip_set_printk("hashsize too small"); \ - return -ENOEXEC; \ - } \ - \ - if (req->probes < 1) { \ - ip_set_printk("probes too small"); \ - return -ENOEXEC; \ - } \ - \ - map = kmalloc(sizeof(struct ip_set_##type) \ - + req->probes * sizeof(initval_t), GFP_KERNEL); \ - if (!map) { \ - DP("out of memory for %zu bytes", \ - sizeof(struct ip_set_##type) \ - + req->probes * sizeof(initval_t)); \ - return -ENOMEM; \ - } \ - for (i = 0; i < req->probes; i++) \ - get_random_bytes(((initval_t *) map->initval)+i, 4); \ - map->elements = 0; \ - map->hashsize = req->hashsize; \ - map->probes = req->probes; \ - map->resize = req->resize; \ - if (__##type##_create(req, map)) { \ - kfree(map); \ - return -ENOEXEC; \ - } \ - map->members = harray_malloc(map->hashsize, sizeof(dtype), GFP_KERNEL);\ - if (!map->members) { \ - DP("out of memory for %zu bytes", map->hashsize * sizeof(dtype));\ - kfree(map); \ - return -ENOMEM; \ - } \ - \ - set->data = map; \ - return 0; \ -} - -#define HASH_DESTROY(type) \ -static void \ -type##_destroy(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data; \ - \ - harray_free(map->members); \ - kfree(map); \ - \ - set->data = NULL; \ -} - -#define HASH_FLUSH(type, dtype) \ -static void \ -type##_flush(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data; \ - harray_flush(map->members, map->hashsize, sizeof(dtype)); \ - map->elements = 0; \ -} - -#define HASH_FLUSH_CIDR(type, dtype) \ -static void \ -type##_flush(struct ip_set *set) \ -{ \ - struct ip_set_##type *map = set->data; \ - harray_flush(map->members, map->hashsize, sizeof(dtype)); \ - memset(map->cidr, 0, sizeof(map->cidr)); \ - memset(map->nets, 0, sizeof(map->nets)); \ - map->elements = 0; \ -} - -#define HASH_LIST_HEADER(type) \ -static void \ -type##_list_header(const struct ip_set *set, void *data) \ -{ \ - const struct ip_set_##type *map = set->data; \ - struct ip_set_req_##type##_create *header = data; \ - \ - header->hashsize = map->hashsize; \ - header->probes = map->probes; \ - header->resize = map->resize; \ - __##type##_list_header(map, header); \ -} - -#define HASH_LIST_MEMBERS_SIZE(type, dtype) \ -static int \ -type##_list_members_size(const struct ip_set *set, char dont_align) \ -{ \ - const struct ip_set_##type *map = set->data; \ - \ - return (map->elements * IPSET_VALIGN(sizeof(dtype), dont_align));\ -} - -#define HASH_LIST_MEMBERS(type, dtype) \ -static void \ -type##_list_members(const struct ip_set *set, void *data, char dont_align)\ -{ \ - const struct ip_set_##type *map = set->data; \ - dtype *elem, *d; \ - uint32_t i, n = 0; \ - \ - for (i = 0; i < map->hashsize; i++) { \ - elem = HARRAY_ELEM(map->members, dtype *, i); \ - if (*elem) { \ - d = data + n * IPSET_VALIGN(sizeof(dtype), dont_align);\ - *d = *elem; \ - n++; \ - } \ - } \ -} - -#define HASH_LIST_MEMBERS_MEMCPY(type, dtype, nonzero) \ -static void \ -type##_list_members(const struct ip_set *set, void *data, char dont_align)\ -{ \ - const struct ip_set_##type *map = set->data; \ - dtype *elem; \ - uint32_t i, n = 0; \ - \ - for (i = 0; i < map->hashsize; i++) { \ - elem = HARRAY_ELEM(map->members, dtype *, i); \ - if (nonzero) { \ - memcpy(data + n * IPSET_VALIGN(sizeof(dtype), dont_align),\ - elem, sizeof(dtype)); \ - n++; \ - } \ - } \ -} - -#define IP_SET_RTYPE(type, __features) \ -struct ip_set_type ip_set_##type = { \ - .typename = #type, \ - .features = __features, \ - .protocol_version = IP_SET_PROTOCOL_VERSION, \ - .create = &type##_create, \ - .retry = &type##_retry, \ - .destroy = &type##_destroy, \ - .flush = &type##_flush, \ - .reqsize = sizeof(struct ip_set_req_##type), \ - .addip = &type##_uadd, \ - .addip_kernel = &type##_kadd, \ - .delip = &type##_udel, \ - .delip_kernel = &type##_kdel, \ - .testip = &type##_utest, \ - .testip_kernel = &type##_ktest, \ - .header_size = sizeof(struct ip_set_req_##type##_create),\ - .list_header = &type##_list_header, \ - .list_members_size = &type##_list_members_size, \ - .list_members = &type##_list_members, \ - .me = THIS_MODULE, \ -}; - -/* Helper functions */ -static inline void -add_cidr_size(uint8_t *cidr, uint8_t size) -{ - uint8_t next; - int i; - - for (i = 0; i < 30 && cidr[i]; i++) { - if (cidr[i] < size) { - next = cidr[i]; - cidr[i] = size; - size = next; - } - } - if (i < 30) - cidr[i] = size; -} - -static inline void -del_cidr_size(uint8_t *cidr, uint8_t size) -{ - int i; - - for (i = 0; i < 29 && cidr[i]; i++) { - if (cidr[i] == size) - cidr[i] = size = cidr[i+1]; - } - cidr[29] = 0; -} -#else -#include -#endif /* __KERNEL */ - -#ifndef UINT16_MAX -#define UINT16_MAX 65535 -#endif - -static unsigned char shifts[] = {255, 253, 249, 241, 225, 193, 129, 1}; - -static inline ip_set_ip_t -pack_ip_cidr(ip_set_ip_t ip, unsigned char cidr) -{ - ip_set_ip_t addr, *paddr = &addr; - unsigned char n, t, *a; - - addr = htonl(ip & (0xFFFFFFFF << (32 - (cidr)))); -#ifdef __KERNEL__ - DP("ip:%u.%u.%u.%u/%u", NIPQUAD(addr), cidr); -#endif - n = cidr / 8; - t = cidr % 8; - a = &((unsigned char *)paddr)[n]; - *a = *a /(1 << (8 - t)) + shifts[t]; -#ifdef __KERNEL__ - DP("n: %u, t: %u, a: %u", n, t, *a); - DP("ip:%u.%u.%u.%u/%u, %u.%u.%u.%u", - HIPQUAD(ip), cidr, NIPQUAD(addr)); -#endif - - return ntohl(addr); -} - - -#endif /* __IP_SET_HASHES_H */ diff --git a/kernel/include/linux/netfilter/ip_set_iphash.h b/kernel/include/linux/netfilter/ip_set_iphash.h deleted file mode 100644 index 0a0c7e8..0000000 --- a/kernel/include/linux/netfilter/ip_set_iphash.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __IP_SET_IPHASH_H -#define __IP_SET_IPHASH_H - -#include -#include - -#define SETTYPE_NAME "iphash" - -struct ip_set_iphash { - ip_set_ip_t *members; /* the iphash proper */ - uint32_t elements; /* number of elements */ - uint32_t hashsize; /* hash size */ - uint16_t probes; /* max number of probes */ - uint16_t resize; /* resize factor in percent */ - ip_set_ip_t netmask; /* netmask */ - initval_t initval[0]; /* initvals for jhash_1word */ -}; - -struct ip_set_req_iphash_create { - uint32_t hashsize; - uint16_t probes; - uint16_t resize; - ip_set_ip_t netmask; -}; - -struct ip_set_req_iphash { - ip_set_ip_t ip; -}; - -#endif /* __IP_SET_IPHASH_H */ diff --git a/kernel/include/linux/netfilter/ip_set_ipmap.h b/kernel/include/linux/netfilter/ip_set_ipmap.h deleted file mode 100644 index d16c0ae..0000000 --- a/kernel/include/linux/netfilter/ip_set_ipmap.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef __IP_SET_IPMAP_H -#define __IP_SET_IPMAP_H - -#include -#include - -#define SETTYPE_NAME "ipmap" - -struct ip_set_ipmap { - void *members; /* the ipmap proper */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - ip_set_ip_t netmask; /* subnet netmask */ - ip_set_ip_t sizeid; /* size of set in IPs */ - ip_set_ip_t hosts; /* number of hosts in a subnet */ - u_int32_t size; /* size of the ipmap proper */ -}; - -struct ip_set_req_ipmap_create { - ip_set_ip_t from; - ip_set_ip_t to; - ip_set_ip_t netmask; -}; - -struct ip_set_req_ipmap { - ip_set_ip_t ip; -}; - -static inline unsigned int -mask_to_bits(ip_set_ip_t mask) -{ - unsigned int bits = 32; - ip_set_ip_t maskaddr; - - if (mask == 0xFFFFFFFF) - return bits; - - maskaddr = 0xFFFFFFFE; - while (--bits > 0 && maskaddr != mask) - maskaddr <<= 1; - - return bits; -} - -static inline ip_set_ip_t -range_to_mask(ip_set_ip_t from, ip_set_ip_t to, unsigned int *bits) -{ - ip_set_ip_t mask = 0xFFFFFFFE; - - *bits = 32; - while (--(*bits) > 0 && mask && (to & mask) != from) - mask <<= 1; - - return mask; -} - -#endif /* __IP_SET_IPMAP_H */ diff --git a/kernel/include/linux/netfilter/ip_set_ipporthash.h b/kernel/include/linux/netfilter/ip_set_ipporthash.h deleted file mode 100644 index a3b781a..0000000 --- a/kernel/include/linux/netfilter/ip_set_ipporthash.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __IP_SET_IPPORTHASH_H -#define __IP_SET_IPPORTHASH_H - -#include -#include - -#define SETTYPE_NAME "ipporthash" - -struct ip_set_ipporthash { - ip_set_ip_t *members; /* the ipporthash proper */ - uint32_t elements; /* number of elements */ - uint32_t hashsize; /* hash size */ - uint16_t probes; /* max number of probes */ - uint16_t resize; /* resize factor in percent */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - initval_t initval[0]; /* initvals for jhash_1word */ -}; - -struct ip_set_req_ipporthash_create { - uint32_t hashsize; - uint16_t probes; - uint16_t resize; - ip_set_ip_t from; - ip_set_ip_t to; -}; - -struct ip_set_req_ipporthash { - ip_set_ip_t ip; - ip_set_ip_t port; -}; - -#endif /* __IP_SET_IPPORTHASH_H */ diff --git a/kernel/include/linux/netfilter/ip_set_ipportiphash.h b/kernel/include/linux/netfilter/ip_set_ipportiphash.h deleted file mode 100644 index 2202c51..0000000 --- a/kernel/include/linux/netfilter/ip_set_ipportiphash.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __IP_SET_IPPORTIPHASH_H -#define __IP_SET_IPPORTIPHASH_H - -#include -#include - -#define SETTYPE_NAME "ipportiphash" - -struct ipportip { - ip_set_ip_t ip; - ip_set_ip_t ip1; -}; - -struct ip_set_ipportiphash { - struct ipportip *members; /* the ipportip proper */ - uint32_t elements; /* number of elements */ - uint32_t hashsize; /* hash size */ - uint16_t probes; /* max number of probes */ - uint16_t resize; /* resize factor in percent */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - initval_t initval[0]; /* initvals for jhash_1word */ -}; - -struct ip_set_req_ipportiphash_create { - uint32_t hashsize; - uint16_t probes; - uint16_t resize; - ip_set_ip_t from; - ip_set_ip_t to; -}; - -struct ip_set_req_ipportiphash { - ip_set_ip_t ip; - ip_set_ip_t port; - ip_set_ip_t ip1; -}; - -#endif /* __IP_SET_IPPORTIPHASH_H */ diff --git a/kernel/include/linux/netfilter/ip_set_ipportnethash.h b/kernel/include/linux/netfilter/ip_set_ipportnethash.h deleted file mode 100644 index 73b2430..0000000 --- a/kernel/include/linux/netfilter/ip_set_ipportnethash.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __IP_SET_IPPORTNETHASH_H -#define __IP_SET_IPPORTNETHASH_H - -#include -#include - -#define SETTYPE_NAME "ipportnethash" - -struct ipportip { - ip_set_ip_t ip; - ip_set_ip_t ip1; -}; - -struct ip_set_ipportnethash { - struct ipportip *members; /* the ipportip proper */ - uint32_t elements; /* number of elements */ - uint32_t hashsize; /* hash size */ - uint16_t probes; /* max number of probes */ - uint16_t resize; /* resize factor in percent */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - uint8_t cidr[30]; /* CIDR sizes */ - uint16_t nets[30]; /* nr of nets by CIDR sizes */ - initval_t initval[0]; /* initvals for jhash_1word */ -}; - -struct ip_set_req_ipportnethash_create { - uint32_t hashsize; - uint16_t probes; - uint16_t resize; - ip_set_ip_t from; - ip_set_ip_t to; -}; - -struct ip_set_req_ipportnethash { - ip_set_ip_t ip; - ip_set_ip_t port; - ip_set_ip_t ip1; - uint8_t cidr; -}; - -#endif /* __IP_SET_IPPORTNETHASH_H */ diff --git a/kernel/include/linux/netfilter/ip_set_iptree.h b/kernel/include/linux/netfilter/ip_set_iptree.h deleted file mode 100644 index 36bf5ac..0000000 --- a/kernel/include/linux/netfilter/ip_set_iptree.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __IP_SET_IPTREE_H -#define __IP_SET_IPTREE_H - -#include - -#define SETTYPE_NAME "iptree" - -struct ip_set_iptreed { - unsigned long expires[256]; /* x.x.x.ADDR */ -}; - -struct ip_set_iptreec { - struct ip_set_iptreed *tree[256]; /* x.x.ADDR.* */ -}; - -struct ip_set_iptreeb { - struct ip_set_iptreec *tree[256]; /* x.ADDR.*.* */ -}; - -struct ip_set_iptree { - unsigned int timeout; - unsigned int gc_interval; -#ifdef __KERNEL__ - uint32_t elements; /* number of elements */ - struct timer_list gc; - struct ip_set_iptreeb *tree[256]; /* ADDR.*.*.* */ -#endif -}; - -struct ip_set_req_iptree_create { - unsigned int timeout; -}; - -struct ip_set_req_iptree { - ip_set_ip_t ip; - unsigned int timeout; -}; - -#endif /* __IP_SET_IPTREE_H */ diff --git a/kernel/include/linux/netfilter/ip_set_iptreemap.h b/kernel/include/linux/netfilter/ip_set_iptreemap.h deleted file mode 100644 index 6ea771a..0000000 --- a/kernel/include/linux/netfilter/ip_set_iptreemap.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef __IP_SET_IPTREEMAP_H -#define __IP_SET_IPTREEMAP_H - -#include - -#define SETTYPE_NAME "iptreemap" - -#ifdef __KERNEL__ -struct ip_set_iptreemap_d { - unsigned char bitmap[32]; /* x.x.x.y */ -}; - -struct ip_set_iptreemap_c { - struct ip_set_iptreemap_d *tree[256]; /* x.x.y.x */ -}; - -struct ip_set_iptreemap_b { - struct ip_set_iptreemap_c *tree[256]; /* x.y.x.x */ - unsigned char dirty[32]; -}; -#endif - -struct ip_set_iptreemap { - unsigned int gc_interval; -#ifdef __KERNEL__ - struct timer_list gc; - struct ip_set_iptreemap_b *tree[256]; /* y.x.x.x */ -#endif -}; - -struct ip_set_req_iptreemap_create { - unsigned int gc_interval; -}; - -struct ip_set_req_iptreemap { - ip_set_ip_t ip; - ip_set_ip_t end; -}; - -#endif /* __IP_SET_IPTREEMAP_H */ diff --git a/kernel/include/linux/netfilter/ip_set_macipmap.h b/kernel/include/linux/netfilter/ip_set_macipmap.h deleted file mode 100644 index 0615e9f..0000000 --- a/kernel/include/linux/netfilter/ip_set_macipmap.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __IP_SET_MACIPMAP_H -#define __IP_SET_MACIPMAP_H - -#include -#include - -#define SETTYPE_NAME "macipmap" - -/* general flags */ -#define IPSET_MACIP_MATCHUNSET 1 - -/* per ip flags */ -#define IPSET_MACIP_ISSET 1 - -struct ip_set_macipmap { - void *members; /* the macipmap proper */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - u_int32_t flags; - u_int32_t size; /* size of the ipmap proper */ -}; - -struct ip_set_req_macipmap_create { - ip_set_ip_t from; - ip_set_ip_t to; - u_int32_t flags; -}; - -struct ip_set_req_macipmap { - ip_set_ip_t ip; - unsigned char ethernet[ETH_ALEN]; -}; - -struct ip_set_macip { - unsigned short match; - unsigned char ethernet[ETH_ALEN]; -}; - -#endif /* __IP_SET_MACIPMAP_H */ diff --git a/kernel/include/linux/netfilter/ip_set_malloc.h b/kernel/include/linux/netfilter/ip_set_malloc.h deleted file mode 100644 index 2a80443..0000000 --- a/kernel/include/linux/netfilter/ip_set_malloc.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef _IP_SET_MALLOC_H -#define _IP_SET_MALLOC_H - -#ifdef __KERNEL__ -#include - -static size_t max_malloc_size = 0, max_page_size = 0; -static size_t default_max_malloc_size = 131072; /* Guaranteed: slab.c */ - -static inline int init_max_page_size(void) -{ -/* Compatibility glues to support 2.4.36 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -#define __GFP_NOWARN 0 - - /* Guaranteed: slab.c */ - max_malloc_size = max_page_size = default_max_malloc_size; -#else - size_t page_size = 0; - -#define CACHE(x) if (max_page_size == 0 || x < max_page_size) \ - page_size = x; -#include -#undef CACHE - if (page_size) { - if (max_malloc_size == 0) - max_malloc_size = page_size; - - max_page_size = page_size; - - return 1; - } -#endif - return 0; -} - -struct harray { - size_t max_elements; - void *arrays[0]; -}; - -static inline void * -__harray_malloc(size_t hashsize, size_t typesize, gfp_t flags) -{ - struct harray *harray; - size_t max_elements, size, i, j; - - BUG_ON(max_page_size == 0); - - if (typesize > max_page_size) - return NULL; - - max_elements = max_page_size/typesize; - size = hashsize/max_elements; - if (hashsize % max_elements) - size++; - - /* Last pointer signals end of arrays */ - harray = kmalloc(sizeof(struct harray) + (size + 1) * sizeof(void *), - flags); - - if (!harray) - return NULL; - - for (i = 0; i < size - 1; i++) { - harray->arrays[i] = kmalloc(max_elements * typesize, flags); - if (!harray->arrays[i]) - goto undo; - memset(harray->arrays[i], 0, max_elements * typesize); - } - harray->arrays[i] = kmalloc((hashsize - i * max_elements) * typesize, - flags); - if (!harray->arrays[i]) - goto undo; - memset(harray->arrays[i], 0, (hashsize - i * max_elements) * typesize); - - harray->max_elements = max_elements; - harray->arrays[size] = NULL; - - return (void *)harray; - - undo: - for (j = 0; j < i; j++) { - kfree(harray->arrays[j]); - } - kfree(harray); - return NULL; -} - -static inline void * -harray_malloc(size_t hashsize, size_t typesize, gfp_t flags) -{ - void *harray; - - do { - harray = __harray_malloc(hashsize, typesize, flags|__GFP_NOWARN); - } while (harray == NULL && init_max_page_size()); - - return harray; -} - -static inline void harray_free(void *h) -{ - struct harray *harray = (struct harray *) h; - size_t i; - - for (i = 0; harray->arrays[i] != NULL; i++) - kfree(harray->arrays[i]); - kfree(harray); -} - -static inline void harray_flush(void *h, size_t hashsize, size_t typesize) -{ - struct harray *harray = (struct harray *) h; - size_t i; - - for (i = 0; harray->arrays[i+1] != NULL; i++) - memset(harray->arrays[i], 0, harray->max_elements * typesize); - memset(harray->arrays[i], 0, - (hashsize - i * harray->max_elements) * typesize); -} - -#define HARRAY_ELEM(h, type, which) \ -({ \ - struct harray *__h = (struct harray *)(h); \ - ((type)((__h)->arrays[(which)/(__h)->max_elements]) \ - + (which)%(__h)->max_elements); \ -}) - -/* General memory allocation and deallocation */ -static inline void * ip_set_malloc(size_t bytes) -{ - BUG_ON(max_malloc_size == 0); - - if (bytes > default_max_malloc_size) - return vmalloc(bytes); - else - return kmalloc(bytes, GFP_KERNEL | __GFP_NOWARN); -} - -static inline void ip_set_free(void * data, size_t bytes) -{ - BUG_ON(max_malloc_size == 0); - - if (bytes > default_max_malloc_size) - vfree(data); - else - kfree(data); -} - -#endif /* __KERNEL__ */ - -#endif /*_IP_SET_MALLOC_H*/ diff --git a/kernel/include/linux/netfilter/ip_set_nethash.h b/kernel/include/linux/netfilter/ip_set_nethash.h deleted file mode 100644 index cf0b794..0000000 --- a/kernel/include/linux/netfilter/ip_set_nethash.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __IP_SET_NETHASH_H -#define __IP_SET_NETHASH_H - -#include -#include - -#define SETTYPE_NAME "nethash" - -struct ip_set_nethash { - ip_set_ip_t *members; /* the nethash proper */ - uint32_t elements; /* number of elements */ - uint32_t hashsize; /* hash size */ - uint16_t probes; /* max number of probes */ - uint16_t resize; /* resize factor in percent */ - uint8_t cidr[30]; /* CIDR sizes */ - uint16_t nets[30]; /* nr of nets by CIDR sizes */ - initval_t initval[0]; /* initvals for jhash_1word */ -}; - -struct ip_set_req_nethash_create { - uint32_t hashsize; - uint16_t probes; - uint16_t resize; -}; - -struct ip_set_req_nethash { - ip_set_ip_t ip; - uint8_t cidr; -}; - -#endif /* __IP_SET_NETHASH_H */ diff --git a/kernel/include/linux/netfilter/ip_set_portmap.h b/kernel/include/linux/netfilter/ip_set_portmap.h deleted file mode 100644 index 37f411e..0000000 --- a/kernel/include/linux/netfilter/ip_set_portmap.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef __IP_SET_PORTMAP_H -#define __IP_SET_PORTMAP_H - -#include -#include - -#define SETTYPE_NAME "portmap" - -struct ip_set_portmap { - void *members; /* the portmap proper */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - u_int32_t size; /* size of the ipmap proper */ -}; - -struct ip_set_req_portmap_create { - ip_set_ip_t from; - ip_set_ip_t to; -}; - -struct ip_set_req_portmap { - ip_set_ip_t ip; -}; - -#endif /* __IP_SET_PORTMAP_H */ diff --git a/kernel/include/linux/netfilter/ip_set_setlist.h b/kernel/include/linux/netfilter/ip_set_setlist.h deleted file mode 100644 index 7cc6ed0..0000000 --- a/kernel/include/linux/netfilter/ip_set_setlist.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef __IP_SET_SETLIST_H -#define __IP_SET_SETLIST_H - -#include - -#define SETTYPE_NAME "setlist" - -#define IP_SET_SETLIST_ADD_AFTER 0 -#define IP_SET_SETLIST_ADD_BEFORE 1 - -struct ip_set_setlist { - uint8_t size; - ip_set_id_t index[0]; -}; - -struct ip_set_req_setlist_create { - uint8_t size; -}; - -struct ip_set_req_setlist { - char name[IP_SET_MAXNAMELEN]; - char ref[IP_SET_MAXNAMELEN]; - uint8_t before; -}; - -#endif /* __IP_SET_SETLIST_H */ -- cgit v1.2.3