segtree: remove dummy debug_octx
Pablo Neira Ayuso
maintainerPATCH v2 1/2 segtree: remove dummy debug_octx
Breaks custom-defined configuration in library mode, ie. user may want to store output in a file, instead of stderr.
Fixes 35f6cd327c2e ("src: Pass stateless, numeric, ip2name and handle variables as structure members.")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: Rebase on top of git HEAD, rework on top of Florian's fix.
include/expression.h | 3 ++- src/rule.c | 9 ++++++--- src/segtree.c | 7 ++----- 3 files changed, 10 insertions(+), 9 deletions(-)
include/expression.h +2 -1
@@ -455,7 +455,8 @@ extern struct expr *set_expr_alloc(const struct location *loc, const struct set *set);extern int set_to_intervals (struct list_head *msgs,struct set *set,struct expr *init,bool add, -unsigned int debug_mask,bool merge); +unsigned int debug_mask,bool merge, +struct output_ctx *octx);extern void interval_map_decompose (struct expr *set); extern struct expr *get_set_intervals(const struct set *set,
src/rule.c +6 -3
@@ -1445,7 +1445,8 @@ static int do_add_setelems(struct netlink_ctx *ctx, struct cmd *cmd,if (set->flags &NFT_SET_INTERVAL &&set_to_intervals (ctx->msgs, set, init, true, - ctx->nft->debug_mask, set->automerge) <0 ) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) <0 )return -1 ;return __do_add_setelems (ctx, set, init, flags);
@@ -1459,7 +1460,8 @@ static int do_add_set(struct netlink_ctx *ctx, const struct cmd *cmd,if (set->init !=NULL ) {if (set->flags &NFT_SET_INTERVAL &&set_to_intervals (ctx->msgs, set, set->init, true, - ctx->nft->debug_mask, set->automerge) <0 ) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) <0 )return -1 ; }if (mnl_nft_set_add (ctx, cmd, flags) <0 )
@@ -1556,7 +1558,8 @@ static int do_delete_setelems(struct netlink_ctx *ctx, struct cmd *cmd)if (set->flags &NFT_SET_INTERVAL &&set_to_intervals (ctx->msgs, set, expr, false, - ctx->nft->debug_mask, set->automerge) <0 ) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) <0 )return -1 ;if (mnl_nft_setelem_del (ctx, cmd) <0 )
src/segtree.c +2 -5
@@ -566,7 +566,7 @@ static void set_insert_interval(struct expr *set, struct seg_tree *tree,int set_to_intervals (struct list_head *errs,struct set *set,struct expr *init,bool add,unsigned int debug_mask, -bool merge) +bool merge,struct output_ctx *octx) {struct elementary_interval *ei, *next;struct output_ctx debug_octx;
@@ -590,10 +590,7 @@ int set_to_intervals(struct list_head *errs, struct set *set, }if (segtree_debug (tree.debug_mask)) { -memset (&debug_octx,0 ,sizeof (debug_octx)); - debug_octx.output_fp = stderr; - debug_octx.error_fp = stderr; -expr_print (init, &debug_octx); +expr_print (init, octx);pr_gmp_debug ("\n" ); }
Signature · 1 line
2.11.0