diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-11-27 23:35:22 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-01-03 14:21:52 +0100 |
commit | da3f503dc3609a66d84782aa200c1aafaecdc1f7 (patch) | |
tree | 2e59d97f248f8c87d3c947976f822df0bd052c9a /src/segtree.c | |
parent | 23fcc0a2137046b2c01766f9aac6bdf7a64f99e4 (diff) |
src: remove SET_F_* flag definitions
They map exactly one to one to we have in the kernel headers, so use
kernel definitions instead.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/segtree.c')
-rw-r--r-- | src/segtree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/segtree.c b/src/segtree.c index 78657de1..8df82a80 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -403,7 +403,7 @@ static int set_to_segtree(struct list_head *msgs, struct set *set, * Insert elements into tree */ for (n = 0; n < init->size; n++) { - if (init->set_flags & SET_F_MAP && + if (init->set_flags & NFT_SET_MAP && n < init->size - 1 && interval_conflict(intervals[n], intervals[n+1])) return expr_binary_error(msgs, @@ -426,7 +426,7 @@ static bool segtree_needs_first_segment(const struct set *set, * 2) This set exists and it is empty. * 3) This set is created with a number of initial elements. */ - if ((set->flags & SET_F_ANONYMOUS) || + if ((set->flags & NFT_SET_ANONYMOUS) || (set->init && set->init->size == 0) || (set->init == init)) return true; |