diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-05-23 10:56:14 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-05-23 10:56:14 +0200 |
| commit | 9a84755e05850a1faab80b5c4b5e5449f9c3c88d (patch) | |
| tree | 4b851e7c816f61f324d9378fc4ac6203eb6cca51 /kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c | |
| parent | 6b71deec45bd5cd40df92a7ebca2a6666cda203b (diff) | |
Use unified from/to address masking and check the usage
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c index ef068b0..2ed5e75 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c @@ -254,8 +254,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], if (cidr > 32) return -IPSET_ERR_INVALID_CIDR; - ip &= ip_set_hostmask(cidr); - ip_to = ip | ~ip_set_hostmask(cidr); + ip_set_mask_from_to(ip, ip_to, cidr); } port_to = port = ntohs(data.port); @@ -273,8 +272,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], if (ip2_from + UINT_MAX == ip2_to) return -IPSET_ERR_HASH_RANGE; } else { - ip2_from &= ip_set_hostmask(data.cidr); - ip2_to = ip2_from | ~ip_set_hostmask(data.cidr); + ip_set_mask_from_to(ip2_from, ip2_to, data.cidr); } if (retried) |