From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH RFC] libnftables: Make output_fp default to /dev/null
Date: Thu, 16 Nov 2017 20:14:15 +0100 [thread overview]
Message-ID: <20171116191415.19404-1-phil@nwl.cc> (raw)
In-Reply-To: <20171116143224.GA17329@salvia>
Ensure output_fp is never NULL which allows to drop all respective
checks.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
Hi Pablo,
This is how I understood your suggestion to use /dev/null. While
implementing it though, I had an idea for a much simpler solution,
namely just rejecting NULL in nft_set_output() and therefore forcing the
application to deal with opening /dev/null if no output is desired. What
do you think about that?
Cheers, Phil
---
src/libnftables.c | 38 ++++++++++++++++++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/libnftables.c b/src/libnftables.c
index 9df9658930c39..64b63da7631ff 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -103,6 +103,37 @@ err1:
return ret;
}
+static FILE *devnull_fp;
+
+static void devnull_fp_init(void)
+{
+ int fd;
+
+ devnull_fp = fopen("/dev/null", "w");
+ if (devnull_fp)
+ return;
+
+ fprintf(stderr, "Warning: Opening /dev/null failed");
+
+ fd = fileno(stdout);
+ if (fd >= 0)
+ devnull_fp = fdopen(fd, "w");
+
+ if (devnull_fp) {
+ fprintf(stderr, ", falling back to stdout.\n");
+ return;
+ }
+
+ fprintf(stderr, " as well as reopening stdout. Expect problems.\n");
+ devnull_fp = stdout;
+}
+
+static void devnull_fp_exit(void)
+{
+ if (devnull_fp != stdout)
+ fclose(devnull_fp);
+}
+
static int nft_refcnt;
static pthread_mutex_t nft_refcnt_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -122,6 +153,7 @@ static void nft_init(void)
#ifdef HAVE_LIBXTABLES
xt_init();
#endif
+ devnull_fp_init();
unlock:
pthread_mutex_unlock(&nft_refcnt_mutex);
@@ -134,6 +166,7 @@ static void nft_exit(void)
if (--nft_refcnt)
goto unlock;
+ devnull_fp_exit();
ct_label_table_exit();
realm_table_rt_exit();
devgroup_table_exit();
@@ -187,6 +220,7 @@ struct nft_ctx *nft_ctx_new(uint32_t flags)
ctx->parser_max_errors = 10;
init_list_head(&ctx->cache.list);
ctx->flags = flags;
+ ctx->octx.output_fp = devnull_fp;
if (flags == NFT_CTX_DEFAULT)
nft_ctx_netlink_init(ctx);
@@ -210,9 +244,9 @@ FILE *nft_ctx_set_output(struct nft_ctx *ctx, FILE *fp)
{
FILE *old = ctx->output.output_fp;
- ctx->output.output_fp = fp;
+ ctx->output.output_fp = fp ?: devnull_fp;
- return old;
+ return old == devnull_fp ? NULL : old;
}
bool nft_ctx_get_dry_run(struct nft_ctx *ctx)
--
2.13.1
next prev parent reply other threads:[~2017-11-16 19:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 8:06 [nft PATCH 0/2] Review code regarding output_fp Phil Sutter
2017-11-16 8:06 ` [nft PATCH 1/2] Make 'nft export' respect output_fp Phil Sutter
2017-11-16 8:06 ` [nft PATCH 2/2] monitor: Make JSON output " Phil Sutter
2017-11-16 13:38 ` Pablo Neira Ayuso
2017-11-16 13:54 ` Phil Sutter
2017-11-16 13:57 ` Pablo Neira Ayuso
2017-11-16 13:54 ` Pablo Neira Ayuso
2017-11-16 13:58 ` Phil Sutter
2017-11-16 14:12 ` Pablo Neira Ayuso
2017-11-16 14:19 ` Phil Sutter
2017-11-16 14:32 ` Pablo Neira Ayuso
2017-11-16 19:14 ` Phil Sutter [this message]
2017-11-20 12:32 ` [nft PATCH RFC] libnftables: Make output_fp default to /dev/null Pablo Neira Ayuso
2017-11-20 12:33 ` Pablo Neira Ayuso
2017-11-20 12:38 ` Phil Sutter
2017-11-20 12:47 ` Pablo Neira Ayuso
2017-11-20 15:54 ` [nft PATCH] libnftables: Ensure output_fp is never NULL Phil Sutter
2017-11-22 12:17 ` Pablo Neira Ayuso
2017-11-16 13:34 ` [nft PATCH 0/2] Review code regarding output_fp Pablo Neira Ayuso
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=20171116191415.19404-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).