This is basically fallout from an upcoming larger code merge around arptables: Patch 1 extends MAC address parsing capabilities of libxtables so the various implementations in extensions and xtables code may be dropped. Patch 2 is a requirement for patch 3 but rather large: It changes the code to not use arptables-specific inv-flags (ARPT_INV_*) anymore as they clash badly with iptables-ones (IPT_INV_*). Patch 3 merges the three copies of 'commands_v_options' table along with generic_opt_check() routine as well as 'optflags' array and opt2char() routine. Both are extended to work for arptables as well. Phil Sutter (3): libxtables: Extend MAC address printing/parsing support xtables-arp: Don't use ARPT_INV_* xshared: Merge some command option-related code extensions/libarpt_mangle.c | 13 +-- extensions/libebt_arp.c | 50 +--------- extensions/libebt_stp.c | 60 ++---------- extensions/libxt_mac.c | 15 +-- include/xtables.h | 3 + iptables/ip6tables.c | 79 ---------------- iptables/iptables.c | 80 ---------------- iptables/nft-arp.c | 92 +++++++------------ iptables/nft-arp.h | 7 ++ iptables/nft-bridge.c | 37 +------- .../ipt-save/dumps/ipt-save-filter.txt | 4 +- iptables/xshared.c | 74 +++++++++++++++ iptables/xshared.h | 20 ++-- iptables/xtables-arp.c | 86 +++-------------- iptables/xtables-eb-translate.c | 8 +- iptables/xtables-eb.c | 59 ++---------- iptables/xtables.c | 80 ---------------- libxtables/xtables.c | 73 +++++++++++++++ 18 files changed, 248 insertions(+), 592 deletions(-) -- 2.28.0
