diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-11-30 13:56:54 -0500 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-12-03 06:43:36 -0500 |
| commit | 59de79cf5706b2ad19598fac6c071a5490cb49d8 (patch) | |
| tree | 7aa749d8e40eaba7351d14a1eb00aa8cc9006817 /net/netfilter | |
| parent | a51b9199b1e092da5ee4a89852e84b4c52ae6044 (diff) | |
netfilter: ipset: Indicate when /0 networks are supported
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_gen.h | 2 | ||||
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_netiface.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index a12ee045258b..9428fa5ae7c2 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h | |||
| @@ -156,7 +156,7 @@ hbucket_elem_add(struct hbucket *n, u8 ahash_max, size_t dsize) | |||
| 156 | 156 | ||
| 157 | #define SET_HOST_MASK(family) (family == AF_INET ? 32 : 128) | 157 | #define SET_HOST_MASK(family) (family == AF_INET ? 32 : 128) |
| 158 | 158 | ||
| 159 | #ifdef IP_SET_HASH_WITH_MULTI | 159 | #ifdef IP_SET_HASH_WITH_NET0 |
| 160 | #define NLEN(family) (SET_HOST_MASK(family) + 1) | 160 | #define NLEN(family) (SET_HOST_MASK(family) + 1) |
| 161 | #else | 161 | #else |
| 162 | #define NLEN(family) SET_HOST_MASK(family) | 162 | #define NLEN(family) SET_HOST_MASK(family) |
diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c index 35dd35873442..758b002130d9 100644 --- a/net/netfilter/ipset/ip_set_hash_netiface.c +++ b/net/netfilter/ipset/ip_set_hash_netiface.c | |||
| @@ -115,6 +115,7 @@ iface_add(struct rb_root *root, const char **iface) | |||
| 115 | #define IP_SET_HASH_WITH_NETS | 115 | #define IP_SET_HASH_WITH_NETS |
| 116 | #define IP_SET_HASH_WITH_RBTREE | 116 | #define IP_SET_HASH_WITH_RBTREE |
| 117 | #define IP_SET_HASH_WITH_MULTI | 117 | #define IP_SET_HASH_WITH_MULTI |
| 118 | #define IP_SET_HASH_WITH_NET0 | ||
| 118 | 119 | ||
| 119 | #define STREQ(a, b) (strcmp(a, b) == 0) | 120 | #define STREQ(a, b) (strcmp(a, b) == 0) |
| 120 | 121 | ||
