r7571 - in trunk/ipset: . kernel kernel/include/linux/netfilter_ipv4 tests
kadlec at blackhole.kfki.hu
kadlec at blackhole.kfki.hu
Thu Oct 23 19:24:31 CEST 2008
Author: kadlec at blackhole.kfki.hu
Date: 2008-10-23 19:24:30 +0200 (Thu, 23 Oct 2008)
New Revision: 7571
Modified:
trunk/ipset/ChangeLog
trunk/ipset/Makefile
trunk/ipset/ipset_iphash.c
trunk/ipset/ipset_nethash.c
trunk/ipset/kernel/ChangeLog
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
trunk/ipset/kernel/ip_set_iphash.c
trunk/ipset/kernel/ip_set_ipmap.c
trunk/ipset/kernel/ip_set_ipporthash.c
trunk/ipset/kernel/ip_set_ipportiphash.c
trunk/ipset/kernel/ip_set_ipportnethash.c
trunk/ipset/kernel/ip_set_iptree.c
trunk/ipset/kernel/ip_set_iptreemap.c
trunk/ipset/kernel/ip_set_macipmap.c
trunk/ipset/kernel/ip_set_nethash.c
trunk/ipset/kernel/ip_set_portmap.c
trunk/ipset/kernel/ipt_SET.c
trunk/ipset/tests/iphash.t
trunk/ipset/tests/ipmap.t
trunk/ipset/tests/ipporthash.t
trunk/ipset/tests/ipportiphash.t
trunk/ipset/tests/ipportnethash.t
trunk/ipset/tests/iptree.t
trunk/ipset/tests/iptreemap.t
trunk/ipset/tests/macipmap.t
trunk/ipset/tests/nethash.t
trunk/ipset/tests/portmap.t
trunk/ipset/tests/setlist.t
Log:
ipset 2.4.2:
- When flushing a nethash/ipportnethash type of set, it can
lead to a kernel crash due to a wrong type declaration,
bug reported by Krzysztof Oledzki.
- iptree and iptreemap types require the header file linux/timer.h,
also reported by Krzysztof Oledzki.
Modified: trunk/ipset/ChangeLog
===================================================================
--- trunk/ipset/ChangeLog 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/ChangeLog 2008-10-23 17:24:30 UTC (rev 7571)
@@ -1,3 +1,6 @@
+2.4.2
+ - Only kernel part changes, see kernel/ChangeLoh
+
2.4.1
- macipmap type reported misleading deprecated separator
tokens and printed the old one at listing set elements
Modified: trunk/ipset/Makefile
===================================================================
--- trunk/ipset/Makefile 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/Makefile 2008-10-23 17:24:30 UTC (rev 7571)
@@ -20,7 +20,7 @@
V=0
endif
-IPSET_VERSION:=2.4.1
+IPSET_VERSION:=2.4.2
PREFIX:=/usr/local
LIBDIR:=$(PREFIX)/lib
@@ -72,7 +72,7 @@
install: binaries_install modules_install
clean: $(EXTRA_CLEANS)
- rm -rf $(PROGRAMS) $(SHARED_LIBS) *.o *~
+ rm -rf $(PROGRAMS) $(SHARED_LIBS) *.o *~ tests/*~
[ -f $(KERNEL_DIR)/net/ipv4/netfilter/Config.in ] || (cd kernel; make -C $(KERNEL_DIR) M=`pwd` clean)
#The ipset(8) self
Modified: trunk/ipset/ipset_iphash.c
===================================================================
--- trunk/ipset/ipset_iphash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/ipset_iphash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -21,6 +21,7 @@
#include <arpa/inet.h>
#include <linux/netfilter_ipv4/ip_set_iphash.h>
+
#include "ipset.h"
#define BUFLEN 30;
Modified: trunk/ipset/ipset_nethash.c
===================================================================
--- trunk/ipset/ipset_nethash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/ipset_nethash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -21,7 +21,6 @@
#include <arpa/inet.h>
#include <linux/netfilter_ipv4/ip_set_nethash.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include "ipset.h"
Modified: trunk/ipset/kernel/ChangeLog
===================================================================
--- trunk/ipset/kernel/ChangeLog 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ChangeLog 2008-10-23 17:24:30 UTC (rev 7571)
@@ -1,3 +1,10 @@
+2.4.2
+ - When flushing a nethash/ipportnethash type of set, it can
+ lead to a kernel crash due to a wrong type declaration,
+ bug reported by Krzysztof Oledzki.
+ - iptree and iptreemap types require the header file linux/timer.h,
+ also reported by Krzysztof Oledzki.
+
2.4.1
- Zero-valued element are not accepted by hash type of sets
because we cannot make a difference between a zero-valued
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -3,6 +3,7 @@
/* Macros to generate functions */
+#ifdef __KERNEL__
#define BITMAP_CREATE(type) \
static int \
type##_create(struct ip_set *set, const void *data, size_t size) \
@@ -115,5 +116,6 @@
.list_members = &type##_list_members, \
.me = THIS_MODULE, \
};
+#endif /* __KERNEL */
#endif /* __IP_SET_BITMAPS_H */
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -1,6 +1,8 @@
#ifndef __IP_SET_HASHES_H
#define __IP_SET_HASHES_H
+#define initval_t uint32_t
+
/* Macros to generate functions */
#ifdef __KERNEL__
@@ -30,11 +32,11 @@
set->name, map->hashsize, hashsize); \
\
tmp = kmalloc(sizeof(struct ip_set_##type) \
- + map->probes * sizeof(uint32_t), GFP_ATOMIC); \
+ + map->probes * sizeof(initval_t), GFP_ATOMIC); \
if (!tmp) { \
DP("out of memory for %d bytes", \
sizeof(struct ip_set_##type) \
- + map->probes * sizeof(uint32_t)); \
+ + map->probes * sizeof(initval_t)); \
return -ENOMEM; \
} \
tmp->members = harray_malloc(hashsize, sizeof(dtype), GFP_ATOMIC);\
@@ -47,7 +49,7 @@
tmp->elements = 0; \
tmp->probes = map->probes; \
tmp->resize = map->resize; \
- memcpy(tmp->initval, map->initval, map->probes * sizeof(uint32_t));\
+ memcpy(tmp->initval, map->initval, map->probes * sizeof(initval_t));\
__##type##_retry(tmp, map); \
\
write_lock_bh(&set->lock); \
@@ -103,15 +105,15 @@
} \
\
map = kmalloc(sizeof(struct ip_set_##type) \
- + req->probes * sizeof(uint32_t), GFP_KERNEL); \
+ + req->probes * sizeof(initval_t), GFP_KERNEL); \
if (!map) { \
DP("out of memory for %d bytes", \
sizeof(struct ip_set_##type) \
- + req->probes * sizeof(uint32_t)); \
+ + req->probes * sizeof(initval_t)); \
return -ENOMEM; \
} \
for (i = 0; i < req->probes; i++) \
- get_random_bytes(((uint32_t *) map->initval)+i, 4); \
+ get_random_bytes(((initval_t *) map->initval)+i, 4); \
map->elements = 0; \
map->hashsize = req->hashsize; \
map->probes = req->probes; \
@@ -158,8 +160,8 @@
{ \
struct ip_set_##type *map = set->data; \
harray_flush(map->members, map->hashsize, sizeof(dtype)); \
- memset(map->cidr, 0, 30 * sizeof(uint8_t)); \
- memset(map->nets, 0, 30 * sizeof(uint32_t)); \
+ memset(map->cidr, 0, sizeof(map->cidr)); \
+ memset(map->nets, 0, sizeof(map->nets)); \
map->elements = 0; \
}
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_IPHASH_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_hashes.h>
#define SETTYPE_NAME "iphash"
@@ -12,7 +13,7 @@
uint16_t probes; /* max number of probes */
uint16_t resize; /* resize factor in percent */
ip_set_ip_t netmask; /* netmask */
- uint32_t initval[0]; /* initvals for jhash_1word */
+ initval_t initval[0]; /* initvals for jhash_1word */
};
struct ip_set_req_iphash_create {
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_IPMAP_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#define SETTYPE_NAME "ipmap"
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_IPPORTHASH_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_hashes.h>
#define SETTYPE_NAME "ipporthash"
@@ -13,7 +14,7 @@
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 */
+ initval_t initval[0]; /* initvals for jhash_1word */
};
struct ip_set_req_ipporthash_create {
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_IPPORTIPHASH_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_hashes.h>
#define SETTYPE_NAME "ipportiphash"
@@ -18,7 +19,7 @@
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 */
+ initval_t initval[0]; /* initvals for jhash_1word */
};
struct ip_set_req_ipportiphash_create {
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_IPPORTNETHASH_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_hashes.h>
#define SETTYPE_NAME "ipportnethash"
@@ -20,7 +21,7 @@
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 */
- uint32_t initval[0]; /* initvals for jhash_1word */
+ initval_t initval[0]; /* initvals for jhash_1word */
};
struct ip_set_req_ipportnethash_create {
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_MACIPMAP_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#define SETTYPE_NAME "macipmap"
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_NETHASH_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_hashes.h>
#define SETTYPE_NAME "nethash"
@@ -13,7 +14,7 @@
uint16_t resize; /* resize factor in percent */
uint8_t cidr[30]; /* CIDR sizes */
uint16_t nets[30]; /* nr of nets by CIDR sizes */
- uint32_t initval[0]; /* initvals for jhash_1word */
+ initval_t initval[0]; /* initvals for jhash_1word */
};
struct ip_set_req_nethash_create {
Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h 2008-10-23 17:24:30 UTC (rev 7571)
@@ -2,6 +2,7 @@
#define __IP_SET_PORTMAP_H
#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#define SETTYPE_NAME "portmap"
Modified: trunk/ipset/kernel/ip_set_iphash.c
===================================================================
--- trunk/ipset/kernel/ip_set_iphash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_iphash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -20,8 +20,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include <linux/netfilter_ipv4/ip_set_iphash.h>
static int limit = MAX_RANGE;
Modified: trunk/ipset/kernel/ip_set_ipmap.c
===================================================================
--- trunk/ipset/kernel/ip_set_ipmap.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_ipmap.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -17,8 +17,6 @@
#include <asm/bitops.h>
#include <linux/spinlock.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#include <linux/netfilter_ipv4/ip_set_ipmap.h>
static inline ip_set_ip_t
Modified: trunk/ipset/kernel/ip_set_ipporthash.c
===================================================================
--- trunk/ipset/kernel/ip_set_ipporthash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_ipporthash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -22,8 +22,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include <linux/netfilter_ipv4/ip_set_ipporthash.h>
#include <linux/netfilter_ipv4/ip_set_getport.h>
Modified: trunk/ipset/kernel/ip_set_ipportiphash.c
===================================================================
--- trunk/ipset/kernel/ip_set_ipportiphash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_ipportiphash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -22,8 +22,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include <linux/netfilter_ipv4/ip_set_ipportiphash.h>
#include <linux/netfilter_ipv4/ip_set_getport.h>
Modified: trunk/ipset/kernel/ip_set_ipportnethash.c
===================================================================
--- trunk/ipset/kernel/ip_set_ipportnethash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_ipportnethash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -22,8 +22,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include <linux/netfilter_ipv4/ip_set_ipportnethash.h>
#include <linux/netfilter_ipv4/ip_set_getport.h>
@@ -223,8 +221,8 @@
{
tmp->first_ip = map->first_ip;
tmp->last_ip = map->last_ip;
- memcpy(tmp->cidr, map->cidr, 30 * sizeof(uint8_t));
- memcpy(tmp->nets, map->nets, 30 * sizeof(uint16_t));
+ memcpy(tmp->cidr, map->cidr, sizeof(tmp->cidr));
+ memcpy(tmp->nets, map->nets, sizeof(tmp->nets));
}
HASH_RETRY2(ipportnethash, struct ipportip)
@@ -273,8 +271,8 @@
}
map->first_ip = req->from;
map->last_ip = req->to;
- memset(map->cidr, 0, 30 * sizeof(uint8_t));
- memset(map->nets, 0, 30 * sizeof(uint16_t));
+ memset(map->cidr, 0, sizeof(map->cidr));
+ memset(map->nets, 0, sizeof(map->nets));
return 0;
}
Modified: trunk/ipset/kernel/ip_set_iptree.c
===================================================================
--- trunk/ipset/kernel/ip_set_iptree.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_iptree.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -17,6 +17,7 @@
#include <asm/uaccess.h>
#include <asm/bitops.h>
#include <linux/spinlock.h>
+#include <linux/timer.h>
#include <linux/netfilter_ipv4/ip_set.h>
#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
Modified: trunk/ipset/kernel/ip_set_iptreemap.c
===================================================================
--- trunk/ipset/kernel/ip_set_iptreemap.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_iptreemap.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -21,6 +21,7 @@
#include <asm/uaccess.h>
#include <asm/bitops.h>
#include <linux/spinlock.h>
+#include <linux/timer.h>
#include <linux/netfilter_ipv4/ip_set.h>
#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
Modified: trunk/ipset/kernel/ip_set_macipmap.c
===================================================================
--- trunk/ipset/kernel/ip_set_macipmap.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_macipmap.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -19,8 +19,6 @@
#include <linux/spinlock.h>
#include <linux/if_ether.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#include <linux/netfilter_ipv4/ip_set_macipmap.h>
static int
Modified: trunk/ipset/kernel/ip_set_nethash.c
===================================================================
--- trunk/ipset/kernel/ip_set_nethash.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_nethash.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -20,8 +20,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
#include <linux/netfilter_ipv4/ip_set_nethash.h>
static int limit = MAX_RANGE;
@@ -153,8 +151,8 @@
static inline void
__nethash_retry(struct ip_set_nethash *tmp, struct ip_set_nethash *map)
{
- memcpy(tmp->cidr, map->cidr, 30 * sizeof(uint8_t));
- memcpy(tmp->nets, map->nets, 30 * sizeof(uint16_t));
+ memcpy(tmp->cidr, map->cidr, sizeof(tmp->cidr));
+ memcpy(tmp->nets, map->nets, sizeof(tmp->nets));
}
HASH_RETRY(nethash, ip_set_ip_t)
@@ -190,8 +188,8 @@
__nethash_create(const struct ip_set_req_nethash_create *req,
struct ip_set_nethash *map)
{
- memset(map->cidr, 0, 30 * sizeof(uint8_t));
- memset(map->nets, 0, 30 * sizeof(uint16_t));
+ memset(map->cidr, 0, sizeof(map->cidr));
+ memset(map->nets, 0, sizeof(map->nets));
return 0;
}
Modified: trunk/ipset/kernel/ip_set_portmap.c
===================================================================
--- trunk/ipset/kernel/ip_set_portmap.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ip_set_portmap.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -19,8 +19,6 @@
#include <net/ip.h>
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#include <linux/netfilter_ipv4/ip_set_portmap.h>
#include <linux/netfilter_ipv4/ip_set_getport.h>
Modified: trunk/ipset/kernel/ipt_SET.c
===================================================================
--- trunk/ipset/kernel/ipt_SET.c 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/kernel/ipt_SET.c 2008-10-23 17:24:30 UTC (rev 7571)
@@ -10,17 +10,11 @@
/* ipt_SET.c - netfilter target to manipulate IP sets */
-#include <linux/types.h>
-#include <linux/ip.h>
-#include <linux/timer.h>
#include <linux/module.h>
-#include <linux/netfilter.h>
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/inetdevice.h>
+#include <linux/ip.h>
+#include <linux/skbuff.h>
#include <linux/version.h>
-#include <net/protocol.h>
-#include <net/checksum.h>
+
#include <linux/netfilter_ipv4.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
#include <linux/netfilter_ipv4/ip_tables.h>
Modified: trunk/ipset/tests/iphash.t
===================================================================
--- trunk/ipset/tests/iphash.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/iphash.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -14,12 +14,16 @@
0 ipset -T test 192.168.68.69
# IP: Test value not added to the set
1 ipset -T test 2.0.0.2
+# IP: Flush test set
+0 ipset -F test
# IP: Delete test set
0 ipset -X test
# IP: Restore values so that rehashing is triggered
0 ipset -R < iphash.t.restore
# IP: Check that all values are restored
0 (egrep -v '#|-N' iphash.t.restore | sort > .foo.1) && (ipset -S test | egrep -v '#|-N' | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
+# IP: Flush test set
+0 ipset -F test
# IP: Delete test set
0 ipset -X test
# Network: Create a set
@@ -34,6 +38,8 @@
0 ipset -T test 192.168.68.95
# Network: Test value not added to the set
1 ipset -T test 2.0.1.0
+# Network: Flush test set
+0 ipset -F test
# Network: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/ipmap.t
===================================================================
--- trunk/ipset/tests/ipmap.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/ipmap.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -20,7 +20,9 @@
1 ipset -A test 2.0.0.0
# Range: Try to add value after upper boundary
1 ipset -A test 2.1.0.1
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Network: Try to create a set from an invalid network
2 ipset -N test ipmap --network 2.0.0.0/15
@@ -44,7 +46,9 @@
1 ipset -A test 1.255.255.255
# Network: Try to add value after upper boundary
1 ipset -A test 2.1.0.0
-# Network: Delete test test
+# Network: Flush test set
+0 ipset -F test
+# Network: Delete test set
0 ipset -X test
# Subnets: Create a set to store networks
0 ipset -N test ipmap --network 10.0.0.0/8 --netmask 24
@@ -66,7 +70,9 @@
1 ipset -A test 9.255.255.255
# Subnets: Try to add value after upper boundary
1 ipset -A test 11.0.0.0
-# Subnets: Delete test test
+# Subnets: FLush test set
+0 ipset -F test
+# Subnets: Delete test set
0 ipset -X test
# Full: Create full IPv4 space with /16 networks
0 ipset -N test ipmap --network 0.0.0.0/0 --netmask 16
Modified: trunk/ipset/tests/ipporthash.t
===================================================================
--- trunk/ipset/tests/ipporthash.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/ipporthash.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -26,7 +26,9 @@
1 ipset -A test 2.0.0.0,5
# Range: Try to add value after upper boundary
1 ipset -A test 2.1.0.1,128
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Network: Try to create a set from an invalid network
2 ipset -N test ipporthash --network 2.0.0.0/15
@@ -52,6 +54,8 @@
1 ipset -A test 1.255.255.255,5
# Network: Try to add value after upper boundary
1 ipset -A test 2.1.0.0,128
+# Network: Flush test set
+0 ipset -F test
# Network: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/ipportiphash.t
===================================================================
--- trunk/ipset/tests/ipportiphash.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/ipportiphash.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -28,7 +28,9 @@
1 ipset -A test 2.0.0.0,5,1.1.1.1
# Range: Try to add value after upper boundary
1 ipset -A test 2.1.0.1,128,2.2.2.2
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Network: Try to create a set from an invalid network
2 ipset -N test ipportiphash --network 2.0.0.0/15
@@ -54,6 +56,8 @@
1 ipset -A test 1.255.255.255,5,1.1.1.1
# Network: Try to add value after upper boundary
1 ipset -A test 2.1.0.0,128,2.2.2.2
+# Network: Flush test set
+0 ipset -F test
# Network: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/ipportnethash.t
===================================================================
--- trunk/ipset/tests/ipportnethash.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/ipportnethash.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -28,7 +28,9 @@
1 ipset -A test 2.0.0.0,5,1.1.1.1/24
# Range: Try to add value after upper boundary
1 ipset -A test 2.1.0.1,128,2.2.2.2/12
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Network: Try to create a set from an invalid network
2 ipset -N test ipportnethash --network 2.0.0.0/15
@@ -54,6 +56,8 @@
1 ipset -A test 1.255.255.255,5,1.1.1.1/24
# Network: Try to add value after upper boundary
1 ipset -A test 2.1.0.0,128,2.2.2.2/12
+# Network: Flush test set
+0 ipset -F test
# Network: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/iptree.t
===================================================================
--- trunk/ipset/tests/iptree.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/iptree.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -12,7 +12,9 @@
1 ipset -T test 2.0.0.2
# Static: Test value not added to the set
1 ipset -T test 192.168.68.70
-# Static: Delete test test
+# Static: Flush test set
+0 ipset -F test
+# Static: Delete test set
0 ipset -X test
# Timeout: Create a set with a timeout parameter
0 ipset -N test iptree --timeout 5
@@ -46,6 +48,8 @@
0 sleep 4
# Timeout: Test entry added with 3s timeout
1 ipset -T test 2.0.0.2
+# Timeout: Flush test set
+0 ipset -F test
# Timeout: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/iptreemap.t
===================================================================
--- trunk/ipset/tests/iptreemap.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/iptreemap.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -46,6 +46,8 @@
0 ipset -T test 192.168.68.67
# Test element after upper bound of deleted network
0 ipset -T test 192.168.68.72
+# Flush test set
+0 ipset -F test
# Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/macipmap.t
===================================================================
--- trunk/ipset/tests/macipmap.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/macipmap.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -26,7 +26,9 @@
1 ipset -T test 2.0.0.2,00:11:22:33:44:56
# Range: Test value with valid MAC
0 ipset -T test 2.0.0.2,00:11:22:33:44:55
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Network: Try to create a set from an invalid network
2 ipset -N test macipmap --network 2.0.0.0/15
@@ -50,6 +52,8 @@
1 ipset -A test 1.255.255.255
# Network: Try to add value after upper boundary
1 ipset -A test 2.1.0.0
+# Network: Flush test set
+0 ipset -F test
# Network: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/nethash.t
===================================================================
--- trunk/ipset/tests/nethash.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/nethash.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -16,6 +16,8 @@
1 ipset -T test 2.0.1.0
# Try to add IP address
2 ipset -A test 2.0.0.1
+# Flush test set
+0 ipset -F test
# Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/portmap.t
===================================================================
--- trunk/ipset/tests/portmap.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/portmap.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -18,7 +18,9 @@
1 ipset -A test 0
# Range: Try to add value after upper boundary
1 ipset -A test 1025
-# Range: Delete test test
+# Range: Flush test set
+0 ipset -F test
+# Range: Delete test set
0 ipset -X test
# Full: Create a full set of ports
0 ipset -N test portmap --from 0 --to 65535
@@ -32,6 +34,8 @@
0 ipset -T test 65535
# Full: Test value not added to the set
1 ipset -T test 1
+# Full: Flush test set
+0 ipset -F test
# Full: Delete test set
0 ipset -X test
# eof
Modified: trunk/ipset/tests/setlist.t
===================================================================
--- trunk/ipset/tests/setlist.t 2008-10-21 22:04:47 UTC (rev 7570)
+++ trunk/ipset/tests/setlist.t 2008-10-23 17:24:30 UTC (rev 7571)
@@ -26,6 +26,8 @@
1 ipset -D test foo,after,bar
# Setlist: Delete bar,after,foo
0 ipset -D test bar,after,foo
-# Setlist: Delete test test
+# Setlist: Flush test set
+0 ipset -F test
+# Setlist: Delete test set
0 ipset -X test
# eof
More information about the netfilter-cvslog
mailing list