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 <pablo@netfilter.org>

diff --git a/include/expression.h b/include/expression.h
index b681b67f96f44ea22fd99668590988f297386ef9..6d72f64c4fea68eb3e8290881520ad05b3a38661 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -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,

diff --git a/src/rule.c b/src/rule.c
index a3b2dbdb98a3b82c72f13955b45a3baa3542a6a2..dc75c7cd5fb0862d0a58f166a438309536229a24 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -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)

diff --git a/src/segtree.c b/src/segtree.c
index e3a2f48c22387c86f80b5a12606e9892c2bad712..939c30d2c83fbd9c18a005831b56b7f71b772f3c 100644 (file)
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -566,10 +566,9 @@ 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;
        struct seg_tree tree;
        LIST_HEAD(list);
 
@@ -590,10 +589,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");
        }