Skip to content

revisit overlap/automerge codebase

Pablo Neira Ayuso netfilter-devel 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest8 patches 0 repliesNew
  2. v47 patches 8 repliesSuperseded
  3. v37 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v25 patches0 repliesSuperseded
v15 patches0 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8src: add EXPR_F_KERNEL to identify expression in the kernelinclude/expression.h src/netlink.c src/segtree.c+7 -10 replies
2/8src: replace interval segment tree overlap and automergeinclude/Makefile.am include/expression.h include/intervals.h +7 more+498 -6880 replies
3/8src: remove rbtree datastructureinclude/Makefile.am include/rbtree.h src/Makefile.am +1 more+0 -4880 replies
4/8mnl: update mnl_nft_setelem_del() to allow for more reuseinclude/mnl.h src/mnl.c src/rule.c+6 -50 replies
5/8intervals: add support to automerge with kernel elementsinclude/intervals.h src/cache.c src/evaluate.c +4 more+168 -400 replies
6/8evaluate: allow for zero length rangessrc/evaluate.c+1 -10 replies
7/8intervals: support to partial deletion with automergeinclude/expression.h include/intervals.h src/evaluate.c +2 more+257 -30 replies
8/8src: restore interval sets work with string datatypessrc/expression.c src/intervals.c+8 -60 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v6 yet.

Read the v6 thread

Cover letter [PATCH nft,v6 0/8] revisit overlap/automerge codebase

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