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.

diff --git a/ChangeLog b/ChangeLog
index 26bad2589587320d172a11e5fba8c58b21660aa0..278a4a09cfcf275db8f9908c2dbacca3885deb83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile b/Makefile
index 6de0097e47396f1585f3ace167a162656ad32f26..37a241e1b7b6b54aedbfca48c00e4c5282a3d5b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ ifndef V
 V=0
 endif
 
-IPSET_VERSION:=2.4.1
+IPSET_VERSION:=2.4.2
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib
@@ -72,7 +72,7 @@ modules_install: modules
 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

diff --git a/ipset_iphash.c b/ipset_iphash.c
index 6dbb84b530fa8ee3d21c532e465d294136edffab..9f0208120388a7241dca4892d38985c463757789 100644 (file)
--- a/ipset_iphash.c
+++ b/ipset_iphash.c
@@ -21,6 +21,7 @@
 #include <arpa/inet.h>
 
 #include <linux/netfilter_ipv4/ip_set_iphash.h>
+
 #include "ipset.h"
 
 #define BUFLEN 30;

diff --git a/ipset_nethash.c b/ipset_nethash.c
index d1f3344e9e0a524f0a2c3ac966432da43b111883..3d2e6feb29825e952af1002425a5ba5d6c654fc5 100644 (file)
--- a/ipset_nethash.c
+++ b/ipset_nethash.c
@@ -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"
 

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index f73092779e19684d7a19fb2aa81ecd11e106587d..25006bed6d854d3b4dd39e262f53ba8a3e7eb051 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -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

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
index 916cb804c558318d38677c97e36c746435036ceb..2e9293f4295a5a00521e29e6d1f6ebeaa4232728 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h
@@ -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 @@ struct ip_set_type ip_set_##type = {                                        \
        .list_members           = &type##_list_members,                 \
        .me                     = THIS_MODULE,                          \
 };
+#endif /* __KERNEL */
 
 #endif /* __IP_SET_BITMAPS_H */

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h b/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
index 405784ab14bfdea52a20ba6382510bbd6fd807dd..46512b433e631d2d4ac63c55356d2970e7130209 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h
@@ -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 @@ type##_retry(struct ip_set *set)                                    \
                      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 @@ type##_retry(struct ip_set *set)                                      \
        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 @@ type##_create(struct ip_set *set, const void *data, size_t size)  \
        }                                                               \
                                                                        \
        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 @@ 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, 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;                                              \
 }
 

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h b/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
index 7551cb2eb3c525d45f8053e48cb44d91df695a73..277bc8c9269c9e764366337c42af2e26c5515ad4 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -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 @@ struct ip_set_iphash {
        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 {

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
index 2f409d970f4979e08ab4c23ea5f595f7ae33352a..3d800ef5460cbe2213e5de311be5a06672b4efdd 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -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"
 

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
index ccec14e82c7a46aeed5d968ae3271cca0412f158..b5db5f50c3e119e21e8338ff821d39875e10b67c 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -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 @@ struct ip_set_ipporthash {
        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 {

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
index 4d794bfff15c298533f1409d4357ed5c37f02938..eb6cf55808d25efb9fdd5e11e85d7d5cf84ee26b 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipportiphash.h
@@ -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 @@ struct ip_set_ipportiphash {
        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 {

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
index 9c78a68728ade8e625c18b3b5cd518c4e8af0757..951da92fab879ad1995e3d43241a19ac20ab93e1 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipportnethash.h
@@ -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 @@ struct ip_set_ipportnethash {
        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 {

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h b/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
index 82ea96d64156d39476b5d6e82ad42cebd37f6fec..c983214991d24cade4ba5ce98271da6a14af9aa3 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -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"
 

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h b/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
index eecd68b79b64541a29a0302c6cbb94786d91c000..b2d006f3285be3a6dfa71fc3b91274031db3b01d 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -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 @@ struct ip_set_nethash {
        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 {

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h b/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
index 1a1538055582bf31ea75f0f974b9f762bf08855b..e878327513848e12f2a69bef213d975f158da727 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -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"
 

diff --git a/kernel/ip_set_iphash.c b/kernel/ip_set_iphash.c
index 38b83ed5b80a5a75205f9ac6da346636992c9e15..976fcfc3e8f347acdcbc0a7b007474f7081979da 100644 (file)
--- a/kernel/ip_set_iphash.c
+++ b/kernel/ip_set_iphash.c
@@ -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;

diff --git a/kernel/ip_set_ipmap.c b/kernel/ip_set_ipmap.c
index e1a16637efa861ac89e5f67866b1eaf0ff34ab2e..442f0d3edabf8098cdc7b056eede2b20b5569dce 100644 (file)
--- a/kernel/ip_set_ipmap.c
+++ b/kernel/ip_set_ipmap.c
@@ -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

diff --git a/kernel/ip_set_ipporthash.c b/kernel/ip_set_ipporthash.c
index 97b23238b0ac97cd13103d482fe0a3c8be2f6f6a..2e2bfa58f21cd3166cfbbba5cdc926d9bc2310a2 100644 (file)
--- a/kernel/ip_set_ipporthash.c
+++ b/kernel/ip_set_ipporthash.c
@@ -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>
 

diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_ipportiphash.c
index 74e8f7ea8094e33b754abeb344121651928b85c4..21305089228256f55cfc6af025fc840b8db3d2dd 100644 (file)
--- a/kernel/ip_set_ipportiphash.c
+++ b/kernel/ip_set_ipportiphash.c
@@ -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>
 

diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_ipportnethash.c
index 0f08ba6525705bc6eb4e8f6a2367ea5bee3a2241..3c7f8594b092e703b782393ad25b4272a3e88155 100644 (file)
--- a/kernel/ip_set_ipportnethash.c
+++ b/kernel/ip_set_ipportnethash.c
@@ -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 @@ __ipportnethash_retry(struct ip_set_ipportnethash *tmp,
 {
        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 @@ __ipportnethash_create(const struct ip_set_req_ipportnethash_create *req,
        }
        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;
 }
 

diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c
index 22a94d127716f2286f3d90026c03659a66463684..f51dea18dc43df851f5f722065791a8541b81f74 100644 (file)
--- a/kernel/ip_set_iptree.c
+++ b/kernel/ip_set_iptree.c
@@ -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>

diff --git a/kernel/ip_set_iptreemap.c b/kernel/ip_set_iptreemap.c
index 4a13e4fc968cf6e2e30c6d76a8571b312340af9a..4bf70f7130b3d10a9673216552edb385b64791c4 100644 (file)
--- a/kernel/ip_set_iptreemap.c
+++ b/kernel/ip_set_iptreemap.c
@@ -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>

diff --git a/kernel/ip_set_macipmap.c b/kernel/ip_set_macipmap.c
index 4b2b1de33be14449ff77dbfeb863cae0809750f3..61ea6d5c4af89e06a147e73664bbee42b009e49a 100644 (file)
--- a/kernel/ip_set_macipmap.c
+++ b/kernel/ip_set_macipmap.c
@@ -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

diff --git a/kernel/ip_set_nethash.c b/kernel/ip_set_nethash.c
index a04857cd0db083dd4ef744107f2bddaec1d7c733..9b3d82627d2cd7fd2b9b7760c4181b982ced9143 100644 (file)
--- a/kernel/ip_set_nethash.c
+++ b/kernel/ip_set_nethash.c
@@ -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 @@ KADT(nethash, add, ipaddr, cidr)
 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 @@ static inline int
 __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;
 }

diff --git a/kernel/ip_set_portmap.c b/kernel/ip_set_portmap.c
index 79cc51144dfea3f8af299bfadd83ea7a9830d9a0..8b0ec0a748abc63ce239d1b1a7c7181d088dfd60 100644 (file)
--- a/kernel/ip_set_portmap.c
+++ b/kernel/ip_set_portmap.c
@@ -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>
 

diff --git a/kernel/ipt_SET.c b/kernel/ipt_SET.c
index f6afafdfe86e94a213fca3fbd066e7c2477c713d..960e5570a435f0a8d39d187a185e849e59245c3d 100644 (file)
--- a/kernel/ipt_SET.c
+++ b/kernel/ipt_SET.c
@@ -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>

diff --git a/tests/iphash.t b/tests/iphash.t
index 731457d916c7fb62d12d8a7eaef7da99b162ff91..46ce58b123abe1d0caf8eca0a170bf573fbc6937 100644 (file)
--- a/tests/iphash.t
+++ b/tests/iphash.t
@@ -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

diff --git a/tests/ipmap.t b/tests/ipmap.t
index fea8389699c28a054301c0ac8b4a4f9dc095a76d..58b913ad72878979b34bcd5abc92a6ba3e2377df 100644 (file)
--- a/tests/ipmap.t
+++ b/tests/ipmap.t
@@ -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

diff --git a/tests/ipporthash.t b/tests/ipporthash.t
index fe246a35bb2763325e49a6e95c69b77aade21075..4db4bf32b09fba0cce8801dcc49b4e83477c3413 100644 (file)
--- a/tests/ipporthash.t
+++ b/tests/ipporthash.t
@@ -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

diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t
index 058b70685a08a9db6c903a45944d15dee31cafb3..2b3866781ba8f281c017a17f40686458691e7fe9 100644 (file)
--- a/tests/ipportiphash.t
+++ b/tests/ipportiphash.t
@@ -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

diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t
index 18e89a1c89a6c1190ecbf844c6680c7bb4e3d965..35cb9fc676c46f26145244acda61198392582f9e 100644 (file)
--- a/tests/ipportnethash.t
+++ b/tests/ipportnethash.t
@@ -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

diff --git a/tests/iptree.t b/tests/iptree.t
index 0e661ce744af14076342dc0951bc90da6f2ea386..746baed2897159bec122e738ee1d863f8c61485c 100644 (file)
--- a/tests/iptree.t
+++ b/tests/iptree.t
@@ -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

diff --git a/tests/iptreemap.t b/tests/iptreemap.t
index 66ee3257cf2ae616ec0e6252b9f3fe7c5544ea3e..b563522f8079600b2064f0987dbc49bd8f3bda67 100644 (file)
--- a/tests/iptreemap.t
+++ b/tests/iptreemap.t
@@ -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

diff --git a/tests/macipmap.t b/tests/macipmap.t
index 049eaee71424eaf916bb7e40e9bfc3c9f904368f..a498a4f0ad1eafce8edc4f8c453eae3d5ea1b502 100644 (file)
--- a/tests/macipmap.t
+++ b/tests/macipmap.t
@@ -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

diff --git a/tests/nethash.t b/tests/nethash.t
index bcb873b1c2308e0b6358afbc74794a22298971f8..0011216bbe17756410d9c37569796a440ee2fcb7 100644 (file)
--- a/tests/nethash.t
+++ b/tests/nethash.t
@@ -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

diff --git a/tests/portmap.t b/tests/portmap.t
index e616f1592ab6e64c648539f25ddedada70300264..299877a62eeef34578c26feaed7e6fa3d223ac8d 100644 (file)
--- a/tests/portmap.t
+++ b/tests/portmap.t
@@ -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

diff --git a/tests/setlist.t b/tests/setlist.t
index 785dc13a0482338cdaed2bdde2f6153c41df8a09..183a7ab34d550a888137ceff0309b9768f2c9227 100644 (file)
--- a/tests/setlist.t
+++ b/tests/setlist.t
@@ -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