From 19cd540390e32f2e1f62e205ddb691d1e6e06152 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 12 Jul 2017 14:14:16 +0200 Subject: src: Allow passing the parent set to set_expr_alloc() Usually one wants to at least initialize set_flags from the parent, so make allocation of a set's set expression more convenient. The idea to do this came when fixing an issue with output formatting of larger anonymous sets in nft monitor: Since netlink_events_cache_addset() didn't initialize set_flags, calculate_delim() didn't detect it's an anonymous set and therefore added newlines to the output. Reported-by: Arturo Borrero Gonzalez Fixes: a9dc3ceabc10f ("expression: print sets and maps in pretty format") Signed-off-by: Phil Sutter Acked-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/expression.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/expression.c') diff --git a/src/expression.c b/src/expression.c index f90ca603..d41ada39 100644 --- a/src/expression.c +++ b/src/expression.c @@ -824,9 +824,17 @@ static const struct expr_ops set_expr_ops = { .destroy = compound_expr_destroy, }; -struct expr *set_expr_alloc(const struct location *loc) +struct expr *set_expr_alloc(const struct location *loc, const struct set *set) { - return compound_expr_alloc(loc, &set_expr_ops); + struct expr *set_expr = compound_expr_alloc(loc, &set_expr_ops); + + if (!set) + return set_expr; + + set_expr->set_flags = set->flags; + set_expr->dtype = set->keytype; + + return set_expr; } static void mapping_expr_print(const struct expr *expr, struct output_ctx *octx) -- cgit v1.2.3