From 2277a8cf318359885be67aad566c70f497551cca Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 5 Mar 2019 13:13:52 +0100 Subject: 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 --- src/rule.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index a3b2dbdb..dc75c7cd 100644 --- 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) -- cgit v1.2.3