diff options
author | Florian Westphal <fw@strlen.de> | 2018-06-18 13:27:59 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2018-06-18 14:52:07 +0200 |
commit | c9f5e18d72d3a010e9a53024290f9f4802ada9fd (patch) | |
tree | b4679a9e2e2ace115ba45dc0cc18efdd40a34b98 /iptables/ip6tables-save.c | |
parent | e5fed16ab0b0da71dc92b052b3858d20ad9d542b (diff) |
xtables: add nf_tables vs. legacy postfix to version strings
-V now yields:
arptables vlibxtables.so.12 (nf_tables)
ebtables 1.6.2 (nf_tables)
ip6tables v1.6.2 (legacy)
ip6tables v1.6.2 (nf_tables)
ip6tables-restore v1.6.2 (nf_tables)
ip6tables-save v1.6.2 (nf_tables)
ip6tables-restore v1.6.2 (legacy)
ip6tables-restore-translate v1.6.2
ip6tables-save v1.6.2 (legacy)
ip6tables-translate v1.6.2 (nf_tables)
iptables v1.6.2 (legacy)
iptables v1.6.2 (nf_tables)
iptables-restore v1.6.2 (nf_tables)
iptables-save v1.6.2 (nf_tables)
iptables-restore v1.6.2 (legacy)
iptables-restore-translate v1.6.2
iptables-save v1.6.2 (legacy)
iptables-translate v1.6.2 (nf_tables)
This allows to see wheter "iptables" is using
old set/getsockopt or new nf_tables infrastructure.
Suggested-by: Harald Welte <laforge@gnumonks.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/ip6tables-save.c')
-rw-r--r-- | iptables/ip6tables-save.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c index 8e3a6afd..5085982b 100644 --- a/iptables/ip6tables-save.c +++ b/iptables/ip6tables-save.c @@ -19,6 +19,9 @@ #include "ip6tables.h" #include "ip6tables-multi.h" +#define prog_name ip6tables_globals.program_name +#define prog_vers ip6tables_globals.program_version + static int show_counters; static const struct option options[] = { @@ -27,6 +30,7 @@ static const struct option options[] = { {.name = "table", .has_arg = true, .val = 't'}, {.name = "modprobe", .has_arg = true, .val = 'M'}, {.name = "file", .has_arg = true, .val = 'f'}, + {.name = "version", .has_arg = false, .val = 'V'}, {NULL}, }; @@ -146,7 +150,7 @@ int ip6tables_save_main(int argc, char *argv[]) init_extensions6(); #endif - while ((c = getopt_long(argc, argv, "bcdt:M:f:", options, NULL)) != -1) { + while ((c = getopt_long(argc, argv, "bcdt:M:f:V", options, NULL)) != -1) { switch (c) { case 'b': fprintf(stderr, "-b/--binary option is not implemented\n"); @@ -180,6 +184,9 @@ int ip6tables_save_main(int argc, char *argv[]) case 'd': do_output(tablename); exit(0); + case 'V': + printf("%s v%s (legacy)\n", prog_name, prog_vers); + exit(0); default: fprintf(stderr, "Look at manual page `ip6tables-save.8' for more information.\n"); |