diff options
| author | Phil Sutter <phil@nwl.cc> | 2017-07-12 14:14:16 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-07-17 17:29:32 +0200 |
| commit | 19cd540390e32f2e1f62e205ddb691d1e6e06152 (patch) | |
| tree | d720e0a38e7c9162b92a3d34e4133097c4f6f8cc /src/parser_bison.y | |
| parent | a177d08d82c4cf946324640a63581e837164dc0b (diff) | |
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 <arturo@netfilter.org>
Fixes: a9dc3ceabc10f ("expression: print sets and maps in pretty format")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/parser_bison.y')
| -rw-r--r-- | src/parser_bison.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 03b13720..45b1dc9f 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1796,7 +1796,7 @@ verdict_map_expr : '{' verdict_map_list_expr '}' verdict_map_list_expr : verdict_map_list_member_expr { - $$ = set_expr_alloc(&@$); + $$ = set_expr_alloc(&@$, NULL); compound_expr_add($$, $1); } | verdict_map_list_expr COMMA verdict_map_list_member_expr @@ -2581,7 +2581,7 @@ set_expr : '{' set_list_expr '}' set_list_expr : set_list_member_expr { - $$ = set_expr_alloc(&@$); + $$ = set_expr_alloc(&@$, NULL); compound_expr_add($$, $1); } | set_list_expr COMMA set_list_member_expr |