diff options
author | Florian Westphal <fw@strlen.de> | 2018-06-18 09:18:28 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2018-06-27 23:44:04 +0200 |
commit | be70918eab26e0c5fe219fefab325056144976d9 (patch) | |
tree | ab256347ade0a13ccc8f91da83282436a18c8957 /iptables/xtables-multi.c | |
parent | d49ba500efd4dc50eef10324f3c0b4f7ce5d6e3e (diff) |
xtables: rename xt-multi binaries to -nft, -legacy
This adds a clear distinction between old iptables (formerly
xtables-multi, now xtables-legacy-multi) and new iptables
(formerly xtables-compat-multi, now xtables-nft-multi).
Users will get the ip/ip6tables names via symbolic links, having
a distinct name postfix for the legacy/nft variants helps to
make a clear distinction, as iptables-nft will always use
nf_tables and iptables-legacy always uses get/setsockopt wheres
"iptables" could be symlinked to either -nft or -legacy.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/xtables-multi.c')
-rw-r--r-- | iptables/xtables-multi.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/iptables/xtables-multi.c b/iptables/xtables-multi.c deleted file mode 100644 index e90885dd..00000000 --- a/iptables/xtables-multi.c +++ /dev/null @@ -1,53 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "xshared.h" - -#include "xtables-multi.h" - -#ifdef ENABLE_IPV4 -#include "iptables-multi.h" -#endif - -#ifdef ENABLE_IPV6 -#include "ip6tables-multi.h" -#endif - -#ifdef ENABLE_NFTABLES -#include "xtables-multi.h" -#endif - -static const struct subcommand multi_subcommands[] = { -#ifdef ENABLE_IPV4 - {"iptables", iptables_main}, - {"main4", iptables_main}, - {"iptables-save", iptables_save_main}, - {"save4", iptables_save_main}, - {"iptables-restore", iptables_restore_main}, - {"restore4", iptables_restore_main}, -#endif - {"iptables-xml", iptables_xml_main}, - {"xml", iptables_xml_main}, -#ifdef ENABLE_IPV6 - {"ip6tables", ip6tables_main}, - {"main6", ip6tables_main}, - {"ip6tables-save", ip6tables_save_main}, - {"save6", ip6tables_save_main}, - {"ip6tables-restore", ip6tables_restore_main}, - {"restore6", ip6tables_restore_main}, -#endif -#ifdef ENABLE_NFTABLES - {"xtables", xtables_main}, - {"xtables-save", xtables_save_main}, - {"xtables-restore", xtables_restore_main}, - {"xtables-config", xtables_config_main}, - {"xtables-arp", xtables_arp_main}, - {"xtables-ebtables", xtables_eb_main}, -#endif - {NULL}, -}; - -int main(int argc, char **argv) -{ - return subcmd_main(argc, argv, multi_subcommands); -} |