Skip to content

nftables: add support for wildcard string as set keys

Florian Westphal netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9evaluate: make byteorder conversion on string base type a no-opsrc/evaluate.c+11 -20 replies
2/9evaluate: keep prefix expression lengthsrc/evaluate.c src/expression.c+2 -00 replies
3/9segtree: split prefix and range creation to a helper functionsrc/segtree.c+52 -430 replies
4/9evaluate: string prefix expression must retain original lengthsrc/evaluate.c+3 -10 replies
5/9src: make interval sets work with string datatypessrc/expression.c src/segtree.c+32 -61 reply
6/9segtree: add string "range" reversal supportsrc/segtree.c+41 -60 replies
7/9tests: add testcases for interface names in setstests/shell/testcases/sets/dumps/sets_with_ifnames.nft tests/shell/testcases/sets/sets_with_ifnames+111 -00 replies
8/9segtree: use correct byte order for 'element get'src/segtree.c+2 -10 replies
9/9segtree: add support for get element with sets that contain ifnamessrc/segtree.c tests/shell/testcases/sets/sets_with_ifnames+65 -150 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH nftables 0/9] nftables: add support for wildcard string as set keys

Allow to match something like

meta iifname { eth0, ppp* }.

Set ranges or concatenations are not yet supported.
Test passes on x86_64 and s390 (bigendian), however, the test fails dump validation:

- iifname { "eth0", "abcdef0" } counter packets 0 bytes 0
+ iifname { "abcdef0", "eth0" } counter packets 0 bytes 0

This happens with other tests as well. Other tests fail on s390 too but there are no new failures.

I wil try to get string range support working and will then ook into concat set support.

Florian Westphal (9):
evaluate: make byteorder conversion on string base type a no-op
evaluate: keep prefix expression length
segtree: split prefix and range creation to a helper function
evaluate: string prefix expression must retain original length
src: make interval sets work with string datatypes
segtree: add string "range" reversal support
tests: add testcases for interface names in sets
segtree: use correct byte order for 'element get'
segtree: add support for get element with sets that contain ifnames

 src/evaluate.c                                |  18 +-
 src/expression.c                              |   9 +-
 src/segtree.c                                 | 228 +++++++++++++-----
 .../sets/dumps/sets_with_ifnames.nft          |  28 +++
 tests/shell/testcases/sets/sets_with_ifnames  | 102 ++++++++
 5 files changed, 315 insertions(+), 70 deletions(-)
 create mode 100644 tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
 create mode 100755 tests/shell/testcases/sets/sets_with_ifnames
Signature · 1 line
2.35.1