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 --- .../linux/netfilter_ipv4/ip_set_ipportiphash.h | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h (limited to 'kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h') diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h new file mode 100644 index 0000000..4d794bf --- /dev/null +++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h @@ -0,0 +1,38 @@ +#ifndef __IP_SET_IPPORTIPHASH_H +#define __IP_SET_IPPORTIPHASH_H + +#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 */ + uint32_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 */ -- cgit v1.2.3