netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 1/2] Make 'nft export' respect output_fp
Date: Thu, 16 Nov 2017 09:06:28 +0100	[thread overview]
Message-ID: <20171116080629.30564-2-phil@nwl.cc> (raw)
In-Reply-To: <20171116080629.30564-1-phil@nwl.cc>

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/rule.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rule.c b/src/rule.c
index 6a322167b8265..5a6c602505455 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -1153,6 +1153,10 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd)
 static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd)
 {
 	struct nftnl_ruleset *rs;
+	FILE *fp = ctx->octx->output_fp;
+
+	if (!fp)
+		return 0;
 
 	do {
 		rs = netlink_dump_ruleset(ctx, &cmd->handle, &cmd->location);
@@ -1160,8 +1164,9 @@ static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd)
 			return -1;
 	} while (rs == NULL);
 
-	nftnl_ruleset_fprintf(stdout, rs, cmd->export->format, 0);
-	fprintf(stdout, "\n");
+	nftnl_ruleset_fprintf(fp, rs, cmd->export->format, 0);
+	fprintf(fp, "\n");
+	fflush(fp);
 
 	nftnl_ruleset_free(rs);
 	return 0;
-- 
2.13.1


  reply	other threads:[~2017-11-16  8:06 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 ` Phil Sutter [this message]
2017-11-16  8:06 ` [nft PATCH 2/2] monitor: Make JSON output respect output_fp 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               ` [nft PATCH RFC] libnftables: Make output_fp default to /dev/null Phil Sutter
2017-11-20 12:32                 ` 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=20171116080629.30564-2-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).