From 2aa3efa47a6c901eeb87a9208671965fde873291 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 17 Dec 2019 18:16:52 +0100 Subject: meta: add parse and build userdata interface Add support for meta userdata area. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Florian Westphal --- src/expression.c | 4 ++-- src/meta.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/expression.c b/src/expression.c index a7bbde7e..a79c6f55 100644 --- a/src/expression.c +++ b/src/expression.c @@ -1226,8 +1226,8 @@ const struct expr_ops *expr_ops(const struct expr *e) const struct expr_ops *expr_ops_by_type(enum expr_types etype) { switch (etype) { - case EXPR_PAYLOAD: - return &payload_expr_ops; + case EXPR_PAYLOAD: return &payload_expr_ops; + case EXPR_META: return &meta_expr_ops; default: break; } diff --git a/src/meta.c b/src/meta.c index 796d8e94..135f84b5 100644 --- a/src/meta.c +++ b/src/meta.c @@ -807,6 +807,55 @@ static void meta_expr_pctx_update(struct proto_ctx *ctx, } } +#define NFTNL_UDATA_META_KEY 0 +#define NFTNL_UDATA_META_MAX 1 + +static int meta_expr_build_udata(struct nftnl_udata_buf *udbuf, + const struct expr *expr) +{ + nftnl_udata_put_u32(udbuf, NFTNL_UDATA_META_KEY, expr->meta.key); + + return 0; +} + +static int meta_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_META_KEY: + if (len != sizeof(uint32_t)) + return -1; + break; + default: + return 0; + } + + ud[type] = attr; + return 0; +} + +static struct expr *meta_expr_parse_udata(const struct nftnl_udata *attr) +{ + const struct nftnl_udata *ud[NFTNL_UDATA_META_MAX + 1] = {}; + uint32_t key; + int err; + + err = nftnl_udata_parse(nftnl_udata_get(attr), nftnl_udata_len(attr), + meta_parse_udata, ud); + if (err < 0) + return NULL; + + if (!ud[NFTNL_UDATA_META_KEY]) + return NULL; + + key = nftnl_udata_get_u32(ud[NFTNL_UDATA_META_KEY]); + + return meta_expr_alloc(&internal_location, key); +} + const struct expr_ops meta_expr_ops = { .type = EXPR_META, .name = "meta", @@ -815,6 +864,8 @@ const struct expr_ops meta_expr_ops = { .cmp = meta_expr_cmp, .clone = meta_expr_clone, .pctx_update = meta_expr_pctx_update, + .build_udata = meta_expr_build_udata, + .parse_udata = meta_expr_parse_udata, }; struct expr *meta_expr_alloc(const struct location *loc, enum nft_meta_keys key) -- cgit v1.2.3