diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-09-27 16:59:49 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2021-10-20 11:32:54 +0200 |
| commit | 2e6014c739852daf8c0c42caeef01d3966622c4b (patch) | |
| tree | 72f6ba93582c41d49b3f76f90dae6aeefd37055b /iptables/xtables-save.c | |
| parent | db90ff64fb89144d1e2ba18bc0569486cd5af9a3 (diff) | |
nft: Introduce builtin_tables_lookup()
The set of builtin tables to use is fully determined by the given family
so just look it up instead of having callers pass it explicitly.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xtables-save.c')
| -rw-r--r-- | iptables/xtables-save.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c index f794e3ff..c6ebb0ec 100644 --- a/iptables/xtables-save.c +++ b/iptables/xtables-save.c @@ -131,7 +131,6 @@ static int xtables_save_main(int family, int argc, char *argv[], const char *optstring, const struct option *longopts) { - const struct builtin_table *tables; const char *tablename = NULL; struct do_output_data d = { .format = FMT_NOCOUNTS, @@ -208,11 +207,9 @@ xtables_save_main(int family, int argc, char *argv[], init_extensions4(); init_extensions6(); #endif - tables = xtables_ipv4; d.commit = true; break; case NFPROTO_ARP: - tables = xtables_arp; break; case NFPROTO_BRIDGE: { const char *ctr = getenv("EBTABLES_SAVE_COUNTER"); @@ -223,7 +220,6 @@ xtables_save_main(int family, int argc, char *argv[], d.format &= ~FMT_NOCOUNTS; d.format |= FMT_C_COUNTS | FMT_EBT_SAVE; } - tables = xtables_bridge; break; } default: @@ -231,7 +227,7 @@ xtables_save_main(int family, int argc, char *argv[], return 1; } - if (nft_init(&h, family, tables) < 0) { + if (nft_init(&h, family) < 0) { fprintf(stderr, "%s/%s Failed to initialize nft: %s\n", xtables_globals.program_name, xtables_globals.program_version, |