From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: fw@strlen.de
Subject: [PATCH nft 1/2,v2] segtree: remove dummy debug_octx
Date: Wed, 6 Mar 2019 11:05:27 +0100 [thread overview]
Message-ID: <20190306100527.26940-1-pablo@netfilter.org> (raw)
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>
---
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(-)
diff --git a/include/expression.h b/include/expression.h
index b681b67f96f4..6d72f64c4fea 100644
--- 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 a3b2dbdb98a3..dc75c7cd5fb0 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)
diff --git a/src/segtree.c b/src/segtree.c
index e3a2f48c2238..b23ccc501771 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -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");
}
--
2.11.0
reply other threads:[~2019-03-06 10:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190306100527.26940-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).