ipset: update to 4.4

diff --git a/doc/changelog.txt b/doc/changelog.txt
index cb4f82cace1282c48f3df7e57fce38ac5c3230b1..d76f4a6180bb1bb30ab0b3f624f79d7b6027f672 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,9 @@
 
 HEAD
 ====
+- update to ipset 4.4
+  * ipport{,ip,net}hash did not work with mixed "src" and "dst"
+    destination parameters
 
 
 v1.29 (September 29 2010)

diff --git a/extensions/ipset/ip_set_ipporthash.c b/extensions/ipset/ip_set_ipporthash.c
index 03433b61707df805960ae5f76b8f3cd677b8cc65..74c9e8a0e249d567340c80aa14e3efa919c78154 100644 (file)
--- a/extensions/ipset/ip_set_ipporthash.c
+++ b/extensions/ipset/ip_set_ipporthash.c
@@ -68,7 +68,7 @@ ipporthash_test(struct ip_set *set, ip_set_ip_t ip, ip_set_ip_t port)
        if (flags[1] == 0)                                      \
                return 0;                                       \
                                                                \
-       port = get_port(skb, flags++);                          \
+       port = get_port(skb, ++flags);                          \
                                                                \
        if (port == INVALID_PORT)                               \
                return 0;

diff --git a/extensions/ipset/ip_set_ipportiphash.c b/extensions/ipset/ip_set_ipportiphash.c
index 0f9ca2f87bee9d9c8d7942fa6b6811f1f473b63f..391afd498e07f747a1515d5af96f4506f4506268 100644 (file)
--- a/extensions/ipset/ip_set_ipportiphash.c
+++ b/extensions/ipset/ip_set_ipportiphash.c
@@ -72,8 +72,8 @@ ipportiphash_test(struct ip_set *set,
        if (flags[2] == 0)                                      \
                return 0;                                       \
                                                                \
-       port = get_port(skb, flags++);                          \
-       ip1 = ipaddr(skb, flags++);                             \
+       port = get_port(skb, ++flags);                          \
+       ip1 = ipaddr(skb, ++flags);                             \
                                                                \
        if (port == INVALID_PORT)                               \
                return 0;

diff --git a/extensions/ipset/ip_set_ipportnethash.c b/extensions/ipset/ip_set_ipportnethash.c
index e9900b128e6ca08a0729a2a34fb2e55f38001f4e..5d7e69f4b38b8093012ef290039bfd70e96ca4bd 100644 (file)
--- a/extensions/ipset/ip_set_ipportnethash.c
+++ b/extensions/ipset/ip_set_ipportnethash.c
@@ -116,8 +116,8 @@ ipportnethash_utest(struct ip_set *set, const void *data, u_int32_t size)
        if (flags[2] == 0)                                      \
                return 0;                                       \
                                                                \
-       port = get_port(skb, flags++);                          \
-       ip1 = ipaddr(skb, flags++);                             \
+       port = get_port(skb, ++flags);                          \
+       ip1 = ipaddr(skb, ++flags);                             \
                                                                \
        if (port == INVALID_PORT)                               \
                return 0;

diff --git a/extensions/ipset/ipset.c b/extensions/ipset/ipset.c
index 345ad95a87a311905a2724fd67b8a6368aa8764c..255b458b519500c464e1b619fefab25259ec47da 100644 (file)
--- a/extensions/ipset/ipset.c
+++ b/extensions/ipset/ipset.c
@@ -30,7 +30,7 @@
 #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
 #endif
 
-#define IPSET_VERSION "4.3"
+#define IPSET_VERSION "4.4"
 
 char program_name[] = "ipset";
 char program_version[] = IPSET_VERSION;