diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-13 11:39:48 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-13 11:39:48 +0100 |
commit | 03091e55a0d949e35a723dadbd6fd0f78ddf3a8c (patch) | |
tree | 3ddb3b5d5813261bf8830a923a360ff50b3bb4b8 /iptables/xtables-multi.c | |
parent | 2e5babbfaddb267523c8450acf51c06f00f492c7 (diff) | |
parent | 1835790d7f7517f4c101e1c1f3df5519a6c228e7 (diff) |
Merge branch 'nft-compat'
This merges the branch that contains the iptables over nftables
compatibility layer into master.
Diffstat (limited to 'iptables/xtables-multi.c')
-rw-r--r-- | iptables/xtables-multi.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/iptables/xtables-multi.c b/iptables/xtables-multi.c index 8014d5fb..5f487355 100644 --- a/iptables/xtables-multi.c +++ b/iptables/xtables-multi.c @@ -13,6 +13,10 @@ #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}, @@ -32,6 +36,14 @@ static const struct subcommand multi_subcommands[] = { {"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-events", xtables_events_main}, + {"xtables-arp", xtables_arp_main}, +#endif {NULL}, }; |