From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: fw@strlen.de
Subject: [PATCH nft,v6 0/8] revisit overlap/automerge codebase
Date: Wed, 13 Apr 2022 03:49:22 +0200 [thread overview]
Message-ID: <20220413014930.410728-1-pablo@netfilter.org> (raw)
Hi,
This is a rebase on top of Florian's ifname support for sets.
This adds a new 8/8 patch to restore testcases/sets/sets_with_ifnames
after the rebase.
Pablo Neira Ayuso (8):
src: add EXPR_F_KERNEL to identify expression in the kernel
src: replace interval segment tree overlap and automerge
src: remove rbtree datastructure
mnl: update mnl_nft_setelem_del() to allow for more reuse
intervals: add support to automerge with kernel elements
evaluate: allow for zero length ranges
intervals: support to partial deletion with automerge
src: restore interval sets work with string datatypes
include/Makefile.am | 2 +-
include/expression.h | 7 +-
include/intervals.h | 12 +
include/mnl.h | 3 +-
include/rbtree.h | 98 ---
include/rule.h | 2 +
src/Makefile.am | 2 +-
src/cache.c | 6 +
src/evaluate.c | 75 +-
src/expression.c | 8 +-
src/intervals.c | 740 ++++++++++++++++++
src/libnftables.c | 4 +-
src/mergesort.c | 1 +
src/mnl.c | 6 +-
src/netlink.c | 1 +
src/rbtree.c | 388 ---------
src/rule.c | 25 +-
src/segtree.c | 698 +----------------
.../shell/testcases/sets/0069interval_merge_0 | 28 +
.../sets/dumps/0069interval_merge_0.nft | 9 +
20 files changed, 914 insertions(+), 1201 deletions(-)
create mode 100644 include/intervals.h
delete mode 100644 include/rbtree.h
create mode 100644 src/intervals.c
delete mode 100644 src/rbtree.c
create mode 100755 tests/shell/testcases/sets/0069interval_merge_0
create mode 100644 tests/shell/testcases/sets/dumps/0069interval_merge_0.nft
--
2.30.2
next reply other threads:[~2022-04-13 1:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 1:49 Pablo Neira Ayuso [this message]
2022-04-13 1:49 ` [PATCH nft,v6 1/8] src: add EXPR_F_KERNEL to identify expression in the kernel Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 2/8] src: replace interval segment tree overlap and automerge Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 3/8] src: remove rbtree datastructure Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 4/8] mnl: update mnl_nft_setelem_del() to allow for more reuse Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 5/8] intervals: add support to automerge with kernel elements Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 6/8] evaluate: allow for zero length ranges Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 7/8] intervals: support to partial deletion with automerge Pablo Neira Ayuso
2022-04-13 1:49 ` [PATCH nft,v6 8/8] src: restore interval sets work with string datatypes 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=20220413014930.410728-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/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).