From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: fw@strlen.de
Subject: [PATCH nft 09/11] rt: add parse and build userdata interface
Date: Tue, 17 Dec 2019 18:17:00 +0100 [thread overview]
Message-ID: <20191217171702.31493-10-pablo@netfilter.org> (raw)
In-Reply-To: <20191217171702.31493-1-pablo@netfilter.org>
Add support for meta userdata area.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/expression.c | 1 +
src/rt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/src/expression.c b/src/expression.c
index 7cca342b2f1a..386309b5ca27 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -1234,6 +1234,7 @@ const struct expr_ops *expr_ops_by_type(enum expr_types etype)
case EXPR_CT: return &ct_expr_ops;
case EXPR_NUMGEN: return &numgen_expr_ops;
case EXPR_HASH: return &hash_expr_ops;
+ case EXPR_RT: return &rt_expr_ops;
default:
break;
}
diff --git a/src/rt.c b/src/rt.c
index b19c44d6eefe..d7aa5edd93a3 100644
--- a/src/rt.c
+++ b/src/rt.c
@@ -114,6 +114,55 @@ static void rt_expr_clone(struct expr *new, const struct expr *expr)
new->rt.key = expr->rt.key;
}
+#define NFTNL_UDATA_RT_KEY 0
+#define NFTNL_UDATA_RT_MAX 1
+
+static int rt_expr_build_udata(struct nftnl_udata_buf *udbuf,
+ const struct expr *expr)
+{
+ nftnl_udata_put_u32(udbuf, NFTNL_UDATA_RT_KEY, expr->rt.key);
+
+ return 0;
+}
+
+static int rt_parse_udata(const struct nftnl_udata *attr, void *data)
+{
+ const struct nftnl_udata **ud = data;
+ uint8_t type = nftnl_udata_type(attr);
+ uint8_t len = nftnl_udata_len(attr);
+
+ switch (type) {
+ case NFTNL_UDATA_RT_KEY:
+ if (len != sizeof(uint32_t))
+ return -1;
+ break;
+ default:
+ return 0;
+ }
+
+ ud[type] = attr;
+ return 0;
+}
+
+static struct expr *rt_expr_parse_udata(const struct nftnl_udata *attr)
+{
+ const struct nftnl_udata *ud[NFTNL_UDATA_RT_MAX + 1] = {};
+ uint32_t key;
+ int err;
+
+ err = nftnl_udata_parse(nftnl_udata_get(attr), nftnl_udata_len(attr),
+ rt_parse_udata, ud);
+ if (err < 0)
+ return NULL;
+
+ if (!ud[NFTNL_UDATA_RT_KEY])
+ return NULL;
+
+ key = nftnl_udata_get_u32(ud[NFTNL_UDATA_RT_KEY]);
+
+ return rt_expr_alloc(&internal_location, key, false);
+}
+
const struct expr_ops rt_expr_ops = {
.type = EXPR_RT,
.name = "rt",
@@ -121,6 +170,8 @@ const struct expr_ops rt_expr_ops = {
.json = rt_expr_json,
.cmp = rt_expr_cmp,
.clone = rt_expr_clone,
+ .parse_udata = rt_expr_parse_udata,
+ .build_udata = rt_expr_build_udata,
};
struct expr *rt_expr_alloc(const struct location *loc, enum nft_rt_keys key,
--
2.11.0
next prev parent reply other threads:[~2019-12-17 17:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 17:16 [PATCH nft 00/11] complete typeof support Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 01/11] meta: add parse and build userdata interface Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 02/11] exthdr: add exthdr_desc_id enum and use it Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 03/11] exthdr: add parse and build userdata interface Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 04/11] socket: " Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 05/11] osf: " Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 06/11] ct: " Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 07/11] numgen: " Pablo Neira Ayuso
2019-12-17 17:16 ` [PATCH nft 08/11] hash: " Pablo Neira Ayuso
2019-12-17 17:17 ` Pablo Neira Ayuso [this message]
2019-12-17 17:17 ` [PATCH nft 10/11] fib: " Pablo Neira Ayuso
2019-12-17 17:17 ` [PATCH nft 11/11] xfrm: " 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=20191217171702.31493-10-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