From 53ef42085f0206afca2f40f6d9d73bd663065aea Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 17 Dec 2019 18:17:01 +0100 Subject: fib: 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 | 1 + src/fib.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/expression.c b/src/expression.c index 386309b5..43d2c9f9 100644 --- a/src/expression.c +++ b/src/expression.c @@ -1235,6 +1235,7 @@ const struct expr_ops *expr_ops_by_type(enum expr_types etype) case EXPR_NUMGEN: return &numgen_expr_ops; case EXPR_HASH: return &hash_expr_ops; case EXPR_RT: return &rt_expr_ops; + case EXPR_FIB: return &fib_expr_ops; default: break; } diff --git a/src/fib.c b/src/fib.c index f2bfef1d..c6ad0f9c 100644 --- a/src/fib.c +++ b/src/fib.c @@ -1,7 +1,7 @@ /* * FIB expression. * - * Copyright (c) Red Hat GmbH. Author: Florian Westphal + * Copyright (c) Red Hat GmbH. Author: Florian Westphal * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -91,7 +91,7 @@ static void fib_expr_print(const struct expr *expr, struct output_ctx *octx) static bool fib_expr_cmp(const struct expr *e1, const struct expr *e2) { - return e1->fib.result == e2->fib.result && + return e1->fib.result == e2->fib.result && e1->fib.flags == e2->fib.flags; } @@ -101,6 +101,60 @@ static void fib_expr_clone(struct expr *new, const struct expr *expr) new->fib.flags= expr->fib.flags; } +#define NFTNL_UDATA_FIB_RESULT 0 +#define NFTNL_UDATA_FIB_FLAGS 1 +#define NFTNL_UDATA_FIB_MAX 2 + +static int fib_expr_build_udata(struct nftnl_udata_buf *udbuf, + const struct expr *expr) +{ + nftnl_udata_put_u32(udbuf, NFTNL_UDATA_FIB_RESULT, expr->fib.result); + nftnl_udata_put_u32(udbuf, NFTNL_UDATA_FIB_FLAGS, expr->fib.flags); + + return 0; +} + +static int fib_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_FIB_RESULT: + case NFTNL_UDATA_FIB_FLAGS: + if (len != sizeof(uint32_t)) + return -1; + break; + default: + return 0; + } + + ud[type] = attr; + return 0; +} + +static struct expr *fib_expr_parse_udata(const struct nftnl_udata *attr) +{ + const struct nftnl_udata *ud[NFTNL_UDATA_FIB_MAX + 1] = {}; + uint32_t flags, result; + int err; + + err = nftnl_udata_parse(nftnl_udata_get(attr), nftnl_udata_len(attr), + fib_parse_udata, ud); + if (err < 0) + return NULL; + + if (!ud[NFTNL_UDATA_FIB_RESULT] || + !ud[NFTNL_UDATA_FIB_FLAGS]) + return NULL; + + result = nftnl_udata_get_u32(ud[NFTNL_UDATA_FIB_RESULT]); + flags = nftnl_udata_get_u32(ud[NFTNL_UDATA_FIB_FLAGS]); + + return fib_expr_alloc(&internal_location, flags, result); +} + const struct expr_ops fib_expr_ops = { .type = EXPR_FIB, .name = "fib", @@ -108,6 +162,8 @@ const struct expr_ops fib_expr_ops = { .json = fib_expr_json, .cmp = fib_expr_cmp, .clone = fib_expr_clone, + .parse_udata = fib_expr_parse_udata, + .build_udata = fib_expr_build_udata, }; struct expr *fib_expr_alloc(const struct location *loc, -- cgit v1.2.3