src: allow to use typeof of raw expressions in set declaration
Pablo Neira Ayuso
maintainerPATCH 1/1 src: allow to use typeof of raw expressions in set declaration
Use the dynamic datatype to allocate an instance of TYPE_INTEGER and set length and byteorder. Add missing information to the set userdata area for raw payload expressions which allows to rebuild the set typeof from the listing path.
A few examples:
- With anonymous sets:
nft add rule x y ip saddr . @ih,32,32 { 1.1.1.1 . 20, 2.2.2.2 . 30 }
- With named sets:
table x {
set y {
typeof ip saddr . @ih,32,32
elements = { 1.1.1.1 . 20 }
}}
Incremental updates are also supported, eg.
nft add element x y { 3.3.3.3 . 40 }
expr_evaluate_concat() is used to evaluate both set key definitions and set key values, using two different function might help to simplify this code in the future.
--- include/datatype.h | 1 + include/expression.h | 2 ++ src/datatype.c | 2 +- src/evaluate.c | 56 +++++++++++++++++++++++++++++++++++++++----- src/expression.c | 6 +++-- src/mnl.c | 4 +--- src/netlink.c | 33 ++++++++++++++++++-------- src/payload.c | 55 +++++++++++++++++++++++++++++++++++++++---- 8 files changed, 132 insertions(+), 27 deletions(-)
include/datatype.h +1 -0
@@ -176,6 +176,7 @@ extern const struct datatype *datatype_lookup_byname(const char *name);extern struct datatype *datatype_get (const struct datatype *dtype);extern void datatype_set (struct expr *expr,const struct datatype *dtype);extern void datatype_free (const struct datatype *dtype); +struct datatype *dtype_clone (const struct datatype *orig_dtype);struct parse_ctx {struct symbol_tables *tbl;
include/expression.h +2 -0
@@ -120,6 +120,7 @@ struct expr_ctx {enum byteorder byteorder;unsigned int len;unsigned int maxval; +const struct expr *key; }; static inline void __expr_set_context(struct expr_ctx *ctx,
@@ -131,6 +132,7 @@ static inline void __expr_set_context(struct expr_ctx *ctx, ctx->byteorder = byteorder; ctx->len = len; ctx->maxval = maxval; + ctx->key =NULL ; } static inline void expr_set_context(struct expr_ctx *ctx,
src/datatype.c +1 -1
@@ -1136,7 +1136,7 @@ void datatype_set(struct expr *expr, const struct datatype *dtype) expr->dtype =datatype_get (dtype); } -static struct datatype *dtype_clone (const struct datatype *orig_dtype) +struct datatype *dtype_clone (const struct datatype *orig_dtype) {struct datatype *dtype;
src/evaluate.c +50 -6
123 lines not on this page · raw message
src/expression.c +4 -2
@@ -18,6 +18,7 @@#include <expression.h> #include <statement.h> #include <datatype.h> +#include <netlink.h> #include <rule.h> #include <gmputil.h> #include <utils.h>
@@ -949,7 +950,7 @@ static struct expr *concat_expr_parse_udata(const struct nftnl_udata *attr)const struct nftnl_udata *ud[NFTNL_UDATA_SET_KEY_CONCAT_NEST_MAX ] = {};const struct datatype *dtype;struct expr *concat_expr; -uint32_t dt =0 ; +uint32_t dt =0 , len =0 ;unsigned int i;int err;
@@ -990,6 +991,7 @@ static struct expr *concat_expr_parse_udata(const struct nftnl_udata *attr) dt =concat_subtype_add (dt, expr->dtype->type);compound_expr_add (concat_expr, expr); + len +=netlink_padded_len (expr->len); } dtype =concat_type_alloc (dt);
@@ -997,7 +999,7 @@ static struct expr *concat_expr_parse_udata(const struct nftnl_udata *attr) goto err_free; concat_expr->dtype =datatype_get (dtype); - concat_expr->len = dtype->size; + concat_expr->len = len;return concat_expr;
src/mnl.c +1 -3
@@ -1093,9 +1093,7 @@ static void set_key_expression(struct netlink_ctx *ctx, {struct nftnl_udata *nest1, *nest2; -if (expr->flags &EXPR_F_CONSTANT || -set_is_anonymous (set_flags) || - !expr_ops (expr)->build_udata) +if (!expr_ops (expr)->build_udata)return ; nest1 =nftnl_udata_nest_start (udbuf, type);
src/netlink.c +23 -10
@@ -1105,17 +1105,25 @@ static struct expr *netlink_parse_interval_elem(const struct set *set,return range_expr_to_prefix (range); } -static struct expr *concat_elem_expr (struct expr *expr, +static struct expr *concat_elem_expr (struct expr *key,const struct datatype *dtype,struct expr *data,int *off) {const struct datatype *subtype; +struct expr *expr; - subtype =concat_subtype_lookup (dtype->type, --(*off)); - - expr =constant_expr_splice (data, subtype->size); - expr->dtype = subtype; - expr->byteorder = subtype->byteorder; +if (key) { + (*off)--; + expr =constant_expr_splice (data, key->len); + expr->dtype =datatype_get (key->dtype); + expr->byteorder = key->byteorder; + expr->len = key->len; + }else { + subtype =concat_subtype_lookup (dtype->type, --(*off)); + expr =constant_expr_splice (data, subtype->size); + expr->dtype = subtype; + expr->byteorder = subtype->byteorder; + }if (expr->byteorder ==BYTEORDER_HOST_ENDIAN )mpz_switch_byteorder (expr->value, expr->len /BITS_PER_BYTE );
@@ -1133,13 +1141,18 @@ static struct expr *netlink_parse_concat_elem_key(const struct set *set, struct expr *data) {const struct datatype *dtype = set->key->dtype; -struct expr *concat, *expr; +struct expr *concat, *expr, *n =NULL ;int off = dtype->subtypes; +if (set->key->etype ==EXPR_CONCAT ) + n = list_first_entry(&set->key->expressions, struct expr, list); + concat =concat_expr_alloc (&data->location);while (off >0 ) { - expr =concat_elem_expr (expr, dtype, data, &off); + expr =concat_elem_expr (n, dtype, data, &off);compound_expr_add (concat, expr); +if (set->key->etype ==EXPR_CONCAT ) + n =list_next_entry (n, list); }expr_free (data);
@@ -1159,7 +1172,7 @@ static struct expr *netlink_parse_concat_elem(const struct set *set, concat =concat_expr_alloc (&data->location);while (off >0 ) { - expr =concat_elem_expr (expr, dtype, data, &off); + expr =concat_elem_expr (NULL , dtype, data, &off);list_add_tail (&expr->list, &expressions); }
@@ -1171,7 +1184,7 @@ static struct expr *netlink_parse_concat_elem(const struct set *set,while (off >0 ) { left = list_first_entry(&expressions, struct expr, list); - expr =concat_elem_expr (expr, dtype, data, &off); + expr =concat_elem_expr (NULL , dtype, data, &off);list_del (&left->list); range =range_expr_alloc (&data->location, left, expr);
src/payload.c +50 -5
93 lines not on this page · raw message
Signature · 1 line
2.30.2