From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [PATCH nft v3 0/2] Support for variables in map expressions
Date: Mon, 29 Apr 2024 20:27:51 +0100 [thread overview]
Message-ID: <20240429192756.1347369-1-jeremy@azazel.net> (raw)
The first patch replaces the current assertion failure for invalid
mapping expression in stateful-object statements with an error message.
This brings it in line with map statements.
It is possible to use a variable to initialize a map, which is then used
in a map statement, but if one tries to use the variable directly, nft
rejects it. The second patch adds support for doing this.
Changes since v2
* Patch 2: error-checking (and test-cases) added for variables that do
not contain maps
Changes since v1
* Patch 1 is new.
* Patch 2 updated to add support for map variables in stateful object
statements.
Jeremy Sowden (2):
evaluate: handle invalid mapping expressions in stateful object
statements gracefully.
evaluate: add support for variables in map expressions
src/evaluate.c | 17 +-
.../shell/testcases/maps/0024named_objects_1 | 31 ++++
.../shell/testcases/maps/0024named_objects_2 | 23 +++
.../shell/testcases/maps/anonymous_snat_map_1 | 16 ++
.../shell/testcases/maps/anonymous_snat_map_2 | 23 +++
.../maps/dumps/0024named_objects_1.json-nft | 147 ++++++++++++++++++
.../maps/dumps/0024named_objects_1.nft | 23 +++
.../maps/dumps/anonymous_snat_map_1.json-nft | 58 +++++++
.../maps/dumps/anonymous_snat_map_1.nft | 5 +
9 files changed, 341 insertions(+), 2 deletions(-)
create mode 100755 tests/shell/testcases/maps/0024named_objects_1
create mode 100755 tests/shell/testcases/maps/0024named_objects_2
create mode 100755 tests/shell/testcases/maps/anonymous_snat_map_1
create mode 100755 tests/shell/testcases/maps/anonymous_snat_map_2
create mode 100644 tests/shell/testcases/maps/dumps/0024named_objects_1.json-nft
create mode 100644 tests/shell/testcases/maps/dumps/0024named_objects_1.nft
create mode 100644 tests/shell/testcases/maps/dumps/anonymous_snat_map_1.json-nft
create mode 100644 tests/shell/testcases/maps/dumps/anonymous_snat_map_1.nft
--
2.43.0
next reply other threads:[~2024-04-29 20:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 19:27 Jeremy Sowden [this message]
2024-04-29 19:27 ` [PATCH nft v3 1/2] evaluate: handle invalid mapping expressions in stateful object statements gracefully Jeremy Sowden
2024-04-29 19:27 ` [PATCH nft v3 2/2] evaluate: add support for variables in map expressions Jeremy Sowden
2024-05-23 16:23 ` [PATCH nft v3 0/2] Support " 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=20240429192756.1347369-1-jeremy@azazel.net \
--to=jeremy@azazel.net \
--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).