This series started as a fix to program names mentioned in *-save
outputs and ended in merging ebtables-save and arptables-save code into
xtables_save_main used by ip{6,}tables-nft-save.
The first patch is actually unrelated but was discovered when testing
counter output - depending on environment, ebtables-nft might segfault.
The second patch fixes option '-c' of ebtables-nft-save which enables
counter prefixes in dumped rules but failed to disable the classical
ebtables-style counters.
Patch three unifies the header/footer comments in all the *-save tools
and also drops the extra newline printed in ebtables- and arptables-save
output, so test scripts need adjustments beyond dropping the new comment
lines from output.
Patch four fixes the table compatibility check in ip{6,}tables-nft-save.
Patches five and seven to nine prepare for integrating arptables- and
ebtables-save into the xtables-save code.
Patch six merely fixes a minor coding-style issue.
Patches ten and eleven finally perform the actual merge.
Changes since v1:
- Rebased onto current master branch.
- Improved commit message in patch eight.
Phil Sutter (11):
ebtables: Fix error message for invalid parameters
ebtables-save: Fix counter formatting
xtables-save: Unify *-save header/footer comments
xtables-save: Fix table compatibility check
nft: Make nft_for_each_table() more versatile
xtables-save: Avoid mixed code and declarations
xtables-save: Pass optstring/longopts to xtables_save_main()
xtables-save: Make COMMIT line optional
xtables-save: Pass format flags to do_output()
arptables-save: Merge into xtables_save_main()
ebtables-save: Merge into xtables_save_main()
iptables/nft-bridge.c | 39 +--
iptables/nft.c | 6 +-
iptables/nft.h | 2 +-
.../arptables/0001-arptables-save-restore_0 | 7 +-
.../0002-arptables-restore-defaults_0 | 6 +-
.../arptables/0003-arptables-verbose-output_0 | 5 +-
.../ebtables/0002-ebtables-save-restore_0 | 4 +-
.../ebtables/0003-ebtables-restore-defaults_0 | 6 +-
.../testcases/ebtables/0004-save-counters_0 | 64 +++++
iptables/xtables-eb.c | 4 +-
iptables/xtables-save.c | 237 ++++--------------
11 files changed, 143 insertions(+), 237 deletions(-)
create mode 100755 iptables/tests/shell/testcases/ebtables/0004-save-counters_0
--
2.22.0
