diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-03-05 13:13:52 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-03-06 11:12:38 +0100 |
commit | 2277a8cf318359885be67aad566c70f497551cca (patch) | |
tree | 9ba8f09cebeda374314bcf27d8c5a781fb1d0dbc /src/rule.c | |
parent | afd1ad6f68680c0f0a4afad7c67ddc8652948732 (diff) |
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>
Diffstat (limited to 'src/rule.c')
-rw-r--r-- | src/rule.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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) |