This series contains a minor crash fix in patch 1, a number of cleanups and (hopefully) simplifications in patches 2-12 and ultimately drop-in replacement implementations of ebtables-save and -restore in patch 17 along with a bunch of changes preparing it (patches 13-16). Phil Sutter (17): xtables: Fix crash if nft_rule_list_get() fails iptables: Replace memset by c99-style initializers xtables: Merge {ip,arp}tables_command_state structs xtables: Simplify struct nft_xt_ctx xtables: Introduce rule_to_cs/clear_cs callbacks xtables: Use new callbacks in nft_rule_print_save() xtables: arp: Make rule_to_cs callback private xtables: Get rid of nft_ipv{4,6}_print_header() xtables: Merge nft_ipv{4,6}_parse_target() xtables: Eliminate nft_ipv{4,6}_rule_find() xtables: Get rid of nft_ipv{4,6}_save_counters() xtables: Rename {print,save}_rule functions xtables: Introduce save_chain callback xtables: Pass format to nft_rule_save() xtables: Parameter to add_argv() may be const xtables: Introduce nft_init_eb() xtables: Implement ebtables-{save,restore} include/xtables.h | 1 + iptables/Makefile.am | 1 + iptables/ip6tables-restore.c | 5 +- iptables/ip6tables.c | 9 +-- iptables/iptables-restore.c | 5 +- iptables/iptables.c | 9 +-- iptables/nft-arp.c | 56 +++++++------- iptables/nft-arp.h | 9 --- iptables/nft-bridge.c | 96 ++++++++++++++--------- iptables/nft-ipv4.c | 62 +++++---------- iptables/nft-ipv6.c | 64 +++++----------- iptables/nft-shared.c | 90 ++++++++++++---------- iptables/nft-shared.h | 45 ++++++----- iptables/nft.c | 77 ++++++++----------- iptables/nft.h | 7 +- iptables/xshared.h | 2 + iptables/xtables-arp.c | 126 +++++++++++++++---------------- iptables/xtables-eb-standalone.c | 18 +---- iptables/xtables-eb-translate.c | 9 +-- iptables/xtables-eb.c | 45 +++++++++-- iptables/xtables-monitor.c | 13 +--- iptables/xtables-multi.h | 2 + iptables/xtables-nft-multi.c | 2 + iptables/xtables-restore.c | 116 +++++++++++++++++++++++++++- iptables/xtables-save.c | 69 ++++++++++++++++- 25 files changed, 546 insertions(+), 392 deletions(-) -- 2.18.0 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html