diff --git a/doc/changelog.txt b/doc/changelog.txt index cb4f82c..d76f4a6 100644 --- 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 03433b6..74c9e8a 100644 --- 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 0f9ca2f..391afd4 100644 --- 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 e9900b1..5d7e69f 100644 --- 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 345ad95..255b458 100644 --- 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;