From 8d994bcf6be09cd0a13d6f22c6e01e98fb130415 Mon Sep 17 00:00:00 2001 From: Oliver Ford Date: Fri, 26 May 2017 12:25:16 +0000 Subject: iptables: Add file output option to iptables-save Adds an option to output the results of iptables-save, ip6tables-save, and xtables-save save to a file. Updates the man page with this new option. Uses the dup2 call to replace stdout with the specified file. Error output is unchanged. This is a feature requested by a Gentoo developer in Bugzilla #905. Signed-off-by: Oliver Ford Signed-off-by: Pablo Neira Ayuso --- iptables/xtables-save.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'iptables/xtables-save.c') diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c index abd840af..5b498b04 100644 --- a/iptables/xtables-save.c +++ b/iptables/xtables-save.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "libiptc/libiptc.h" #include "iptables.h" #include "xtables-multi.h" @@ -32,6 +33,7 @@ static const struct option options[] = { {.name = "dump", .has_arg = false, .val = 'd'}, {.name = "table", .has_arg = true, .val = 't'}, {.name = "modprobe", .has_arg = true, .val = 'M'}, + {.name = "file", .has_arg = true, .val = 'f'}, {.name = "ipv4", .has_arg = false, .val = '4'}, {.name = "ipv6", .has_arg = false, .val = '6'}, {NULL}, @@ -82,7 +84,8 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[]) struct nft_handle h = { .family = family, }; - int c; + FILE *file = NULL; + int ret, c; xtables_globals.program_name = progname; c = xtables_init_all(&xtables_globals, family); @@ -104,7 +107,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[]) exit(EXIT_FAILURE); } - while ((c = getopt_long(argc, argv, "bcdt:M:46", options, NULL)) != -1) { + while ((c = getopt_long(argc, argv, "bcdt:M:f:46", options, NULL)) != -1) { switch (c) { case 'b': fprintf(stderr, "-b/--binary option is not implemented\n"); @@ -120,6 +123,21 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[]) case 'M': xtables_modprobe_program = optarg; break; + case 'f': + file = fopen(optarg, "w"); + if (file == NULL) { + fprintf(stderr, "Failed to open file, error: %s\n", + strerror(errno)); + exit(1); + } + ret = dup2(fileno(file), STDOUT_FILENO); + if (ret == -1) { + fprintf(stderr, "Failed to redirect stdout, error: %s\n", + strerror(errno)); + exit(1); + } + fclose(file); + break; case 'd': dump = true; break; -- cgit v1.2.3