From a48c1c00b5419fb39af87a22469f77322dc71b31 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 26 Nov 2019 11:24:16 +0100 Subject: segtree: restore automerge Always close interval in non-anonymous sets unless the auto-merge feature is set on. Fixes: a4ec05381261 ("segtree: always close interval in non-anonymous sets") Signed-off-by: Pablo Neira Ayuso --- src/segtree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/segtree.c b/src/segtree.c index 9f1eecc0..7217dbca 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -516,7 +516,7 @@ static void segtree_linearize(struct list_head *list, const struct set *set, */ mpz_add_ui(p, prev->right, 1); if (mpz_cmp(p, ei->left) < 0 || - !(set->flags & NFT_SET_ANONYMOUS)) { + (!(set->flags & NFT_SET_ANONYMOUS) && !merge)) { mpz_sub_ui(q, ei->left, 1); nei = ei_alloc(p, q, NULL, EI_F_INTERVAL_END); list_add_tail(&nei->list, list); -- cgit v1.2.3