From da06a74244cbe4b02431ea2c34b8299f3562c9ff Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 14 Sep 2017 22:59:13 +0200 Subject: src: store expression as set key instead of data type Doing so retains legth information in case of unqualified data types, e.g. we now have 'meta iifname' expression instead of an (unqualified) string type. This allows to eventually use iifnames as set keys without adding yet another special data type for them. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/expression.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/expression.c') diff --git a/src/expression.c b/src/expression.c index d41ada39..ff3550c7 100644 --- a/src/expression.c +++ b/src/expression.c @@ -832,7 +832,7 @@ struct expr *set_expr_alloc(const struct location *loc, const struct set *set) return set_expr; set_expr->set_flags = set->flags; - set_expr->dtype = set->keytype; + set_expr->dtype = set->key->dtype; return set_expr; } @@ -960,7 +960,7 @@ struct expr *set_ref_expr_alloc(const struct location *loc, struct set *set) { struct expr *expr; - expr = expr_alloc(loc, &set_ref_expr_ops, set->keytype, 0, 0); + expr = expr_alloc(loc, &set_ref_expr_ops, set->key->dtype, 0, 0); expr->set = set_get(set); expr->flags |= EXPR_F_CONSTANT; return expr; -- cgit v1.2.3