src: add expr meta_target
RFC PATCH 1/2 src: add expr meta_target
This patch adds userspace support for the meta_target expression.
This expression indicates that the packet has to be set with a property, currently one of mark, priority, nftrace or secmark.
Tests files will be provided in a separated patch.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
---
0 files changed
include/libnftables/expr.h +5 -0
@@ -53,6 +53,11 @@ enum { };enum { +NFT_EXPR_META_TARGET_KEY =NFT_RULE_EXPR_ATTR_BASE , +NFT_EXPR_META_TARGET_VALUE , +}; + +enum {NFT_EXPR_CMP_SREG =NFT_RULE_EXPR_ATTR_BASE ,NFT_EXPR_CMP_OP ,NFT_EXPR_CMP_DATA ,
include/linux/netfilter/nf_tables.h +28 -0
@@ -485,6 +485,34 @@ enum nft_meta_attributes {#define NFTA_META_MAX (__NFTA_META_MAX - 1)/** +* enum nft_meta_target_keys - nf_tables meta_target expression keys +* +* @NFT_META_TARGET_MARK: set packet mark (skb->mark) +* @NFT_META_TARGET_PRIORITY: set packet priority (skb->priority) +* @NFT_META_TARGET_NFTRACE: to set packet nftrace bit (skb->nf_trace) +* @NFT_META_TARGET_SECMARK: set packet secmark (skb->secmark) +*/ +enum nft_meta_target_keys { +NFT_META_TARGET_MARK , +NFT_META_TARGET_PRIORITY , +NFT_META_TARGET_NFTRACE , +NFT_META_TARGET_SECMARK , +}; + +/** +* enum nft_meta_target_attributes - nf_tables meta_target expression netlink attributes +* +* @NFTA_META_TARGET_KEY: meta_target item to be set (NLA_U32: nft_meta_target_keys) +* @NFTA_META_TARGET_VALUE: value of the item to be set with (NLA_U32) +*/ +enum nft_meta_target_attributes { +NFTA_META_TARGET_KEY , +NFTA_META_TARGET_VALUE , + __NFTA_META_TARGET_MAX +}; +#define NFTA_META_TARGET_MAX (__NFTA_META_TARGET_MAX - 1) + +/** * enum nft_ct_keys - nf_tables ct expression keys * * @NFT_CT_STATE: conntrack state (bitmask of enum ip_conntrack_info)
src/Makefile.am +1 -0
@@ -29,6 +29,7 @@ libnftables_la_SOURCES = utils.c \ expr/immediate.c \ expr/match.c \ expr/meta.c \ + expr/meta_target.c \ expr/nat.c \ expr/payload.c \ expr/reject.c \
src/expr/meta_target.c new file +266 -0
266 lines not on this page · raw message
RFC PATCH 2/2 tests: add tests for expr meta_target
Add unit and JSON/XML parsing tests for the expression meta_target.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- tests/Makefile.am | 4 + tests/jsonfiles/65-rule-meta-target.json | 1 tests/nft-expr_meta_target-test.c | 97 ++++++++++++++++++++++++++++++ tests/test-script.sh | 1 tests/xmlfiles/76-rule-meta_target.xml | 1 5 files changed, 104 insertions(+) create mode 100644 tests/jsonfiles/65-rule-meta-target.json create mode 100644 tests/nft-expr_meta_target-test.c create mode 100644 tests/xmlfiles/76-rule-meta_target.xml
tests/Makefile.am +4 -0
@@ -17,6 +17,7 @@ check_PROGRAMS = nft-parsing-test \ nft-expr_log-test \ nft-expr_match-test \ nft-expr_meta-test \ + nft-expr_meta_target-test \ nft-expr_nat-test \ nft-expr_payload-test \ nft-expr_reject-test \
@@ -73,6 +74,9 @@ nft_expr_match_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} nft_expr_meta_test_SOURCES = nft-expr_meta-test.c nft_expr_meta_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_meta_target_test_SOURCES = nft-expr_meta_target-test.c +nft_expr_meta_target_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} + nft_expr_nat_test_SOURCES = nft-expr_nat-test.c nft_expr_nat_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
tests/jsonfiles/65-rule-meta-target.json new file +1 -0
@@ -0,0 +1 @@ +{"rule":{"family":"ip","table":"filter","chain":"output","handle":1,"expr":[{"type":"meta_target","key":"secmark","value":"0xaabbccdd"},{"type":"cmp","sreg":1,"op":"eq","cmpdata":{"data_reg":{"type":"value","len":4,"data0":"0x000003e8"}}},{"type":"counter","pkts":0,"bytes":0}]}}
tests/nft-expr_meta_target-test.c new file +97 -0
97 lines not on this page · raw message
tests/test-script.sh +1 -0
@@ -11,6 +11,7 @@ ./nft-expr_lookup-test ./nft-expr_match-test ./nft-expr_meta-test +./nft-expr_meta_target-test ./nft-expr_nat-test ./nft-expr_payload-test ./nft-expr_reject-test
tests/xmlfiles/76-rule-meta_target.xml new file +1 -0
@@ -0,0 +1 @@ +<rule><family>ip6</family><table>filter</table><chain>test</chain><handle>129</handle><expr type="meta_target"><key>mark</key><value>0xaabbccdd</value></expr></rule>