Fixes, cleanups, commentsv5.0-pre8

- More comments added to the code
- ICMP and ICMPv6 support added to the hash:ip,port, hash:ip,port,ip
  and hash:ip,port,net types
- hash:net and hash:ip,port,net types are reworked
- hash:net,port type added
- Wrong direction parameters fixed in hash:ip,port
- Helps and manpage are updated
- More tests added
- Ugly macros are rewritten to functions in parse.c
  (Holger Eitzenberger)
- resize related bug in hash types fixed (Holger Eitzenberger)
- autoreconf patches by Jan Engelhardt applied
- netlink patch minimalized: dumping can be initialized by a second
  parsing of the message (thanks to David and Patrick for the suggestion)
- IPv4/IPv6 address attributes are introduced in order to fix the context
  (suggested by David)

1 files changed, 4 insertions, 9 deletions

diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c
index c385f99..27363f6 100644
--- a/kernel/ip_set_bitmap_port.c
+++ b/kernel/ip_set_bitmap_port.c
@@ -265,7 +265,7 @@ const struct ip_set_type_variant bitmap_port __read_mostly = {
 /* Timeout variant */
 
 struct bitmap_port_timeout {
-	void *members;		/* the set members */
+	unsigned long *members;	/* the set members */
 	u16 first_port;		/* host byte order, included in range */
 	u16 last_port;		/* host byte order, included in range */
 	size_t memsize;		/* members size */
@@ -277,21 +277,17 @@ struct bitmap_port_timeout {
 static inline bool
 bitmap_port_timeout_test(const struct bitmap_port_timeout *map, u16 id)
 {
-	unsigned long *timeout = map->members;
-
-	return ip_set_timeout_test(timeout[id]);
+	return ip_set_timeout_test(map->members[id]);
 }
 
 static int
 bitmap_port_timeout_add(const struct bitmap_port_timeout *map,
 			u16 id, u32 timeout)
 {
-	unsigned long *table = map->members;
-
 	if (bitmap_port_timeout_test(map, id))
 		return -IPSET_ERR_EXIST;
 
-	table[id] = ip_set_timeout_set(timeout);
+	map->members[id] = ip_set_timeout_set(timeout);
 
 	return 0;
 }
@@ -300,13 +296,12 @@ static int
 bitmap_port_timeout_del(const struct bitmap_port_timeout *map,
 			u16 id)
 {
-	unsigned long *table = map->members;
 	int ret = -IPSET_ERR_EXIST;
 
 	if (bitmap_port_timeout_test(map, id))
 		ret = 0;
 	
-	table[id] = IPSET_ELEM_UNSET;
+	map->members[id] = IPSET_ELEM_UNSET;
 	return ret;
 }