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/evaluate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/evaluate.c') diff --git a/src/evaluate.c b/src/evaluate.c index db18df05..27feef43 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1955,7 +1955,7 @@ static int stmt_evaluate_flow(struct eval_ctx *ctx, struct stmt *stmt) /* Declare an empty set */ key = stmt->flow.key; - set = set_expr_alloc(&key->location); + set = set_expr_alloc(&key->location, NULL); set->set_flags |= NFT_SET_EVAL; if (key->timeout) set->set_flags |= NFT_SET_TIMEOUT; -- cgit v1.2.3