Remove unnecessary include files and rename some.
+++ /dev/null
-#ifndef _IP_SET_COMPAT_H
-#define _IP_SET_COMPAT_H
-
-#ifdef __KERNEL__
-#include <linux/version.h>
-
-/* 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 <linux/interrupt.h>
-#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 <linux/netfilter.h>
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPHASH_H
-#define __IP_SET_IPHASH_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPMAP_H
-#define __IP_SET_IPMAP_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPPORTHASH_H
-#define __IP_SET_IPPORTHASH_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPPORTIPHASH_H
-#define __IP_SET_IPPORTIPHASH_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPPORTNETHASH_H
-#define __IP_SET_IPPORTNETHASH_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPTREE_H
-#define __IP_SET_IPTREE_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_IPTREEMAP_H
-#define __IP_SET_IPTREEMAP_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_MACIPMAP_H
-#define __IP_SET_MACIPMAP_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-
-#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 */
+++ /dev/null
-#ifndef _IP_SET_MALLOC_H
-#define _IP_SET_MALLOC_H
-
-#ifdef __KERNEL__
-#include <linux/vmalloc.h>
-
-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 <linux/kmalloc_sizes.h>
-#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*/
+++ /dev/null
-#ifndef __IP_SET_NETHASH_H
-#define __IP_SET_NETHASH_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_PORTMAP_H
-#define __IP_SET_PORTMAP_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-
-#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 */
+++ /dev/null
-#ifndef __IP_SET_SETLIST_H
-#define __IP_SET_SETLIST_H
-
-#include <linux/netfilter_ipv4/ip_set.h>
-
-#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 */
projects / ipset / commitdiff