From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: phil@nwl.cc
Subject: [PATCH nft 1/2] Revert "segtree: Check ranges when deleting elements"
Date: Tue, 26 Nov 2019 11:34:21 +0100 [thread overview]
Message-ID: <20191126103422.29501-1-pablo@netfilter.org> (raw)
This partially reverts commit decc12ec2dc3 ("segtree: Check ranges when
deleting elements").
The tests/shell/testcases/sets/0039delete_interval_0 file is left in
place.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/segtree.c | 41 +++++++-----------------
tests/shell/testcases/sets/0039delete_interval_0 | 0
2 files changed, 11 insertions(+), 30 deletions(-)
mode change 100755 => 100644 tests/shell/testcases/sets/0039delete_interval_0
diff --git a/src/segtree.c b/src/segtree.c
index 9f1eecc0ae7e..50e34050c167 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -334,13 +334,6 @@ static unsigned int expr_to_intervals(const struct expr *set,
return n;
}
-static bool intervals_match(const struct elementary_interval *e1,
- const struct elementary_interval *e2)
-{
- return mpz_cmp(e1->left, e2->left) == 0 &&
- mpz_cmp(e1->right, e2->right) == 0;
-}
-
/* This function checks for overlaps in two ways:
*
* 1) A new interval end intersects an existing interval.
@@ -350,7 +343,8 @@ static bool intervals_match(const struct elementary_interval *e1,
static bool interval_overlap(const struct elementary_interval *e1,
const struct elementary_interval *e2)
{
- if (intervals_match(e1, e2))
+ if (mpz_cmp(e1->left, e2->left) == 0 &&
+ mpz_cmp(e1->right, e2->right) == 0)
return false;
return (mpz_cmp(e1->left, e2->left) >= 0 &&
@@ -362,7 +356,7 @@ static bool interval_overlap(const struct elementary_interval *e1,
}
static int set_overlap(struct list_head *msgs, const struct set *set,
- struct expr *init, unsigned int keylen, bool add)
+ struct expr *init, unsigned int keylen)
{
struct elementary_interval *new_intervals[init->size];
struct elementary_interval *intervals[set->init->size];
@@ -373,28 +367,15 @@ static int set_overlap(struct list_head *msgs, const struct set *set,
m = expr_to_intervals(set->init, keylen, intervals);
for (i = 0; i < n; i++) {
- bool found = false;
-
for (j = 0; j < m; j++) {
- if (add && interval_overlap(new_intervals[i],
- intervals[j])) {
- expr_error(msgs, new_intervals[i]->expr,
- "interval overlaps with an existing one");
- errno = EEXIST;
- ret = -1;
- goto out;
- } else if (!add && intervals_match(new_intervals[i],
- intervals[j])) {
- found = true;
- break;
- }
- }
- if (!add && !found) {
+ if (!interval_overlap(new_intervals[i], intervals[j]))
+ continue;
+
expr_error(msgs, new_intervals[i]->expr,
- "interval not found in set");
- errno = ENOENT;
+ "interval overlaps with an existing one");
+ errno = EEXIST;
ret = -1;
- break;
+ goto out;
}
}
out:
@@ -418,8 +399,8 @@ static int set_to_segtree(struct list_head *msgs, struct set *set,
/* We are updating an existing set with new elements, check if the new
* interval overlaps with any of the existing ones.
*/
- if (set->init && set->init != init) {
- err = set_overlap(msgs, set, init, tree->keylen, add);
+ if (add && set->init && set->init != init) {
+ err = set_overlap(msgs, set, init, tree->keylen);
if (err < 0)
return err;
}
diff --git a/tests/shell/testcases/sets/0039delete_interval_0 b/tests/shell/testcases/sets/0039delete_interval_0
old mode 100755
new mode 100644
--
2.11.0
next reply other threads:[~2019-11-26 10:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 10:34 Pablo Neira Ayuso [this message]
2019-11-26 10:34 ` [PATCH nft 2/2] segtree: restore automerge Pablo Neira Ayuso
2019-11-26 12:09 ` Phil Sutter
2019-11-26 18:37 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191126103422.29501-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).