From d9c6a5d0977a6d8bbe772dbc31a2c4f58eec1708 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 19 Jul 2018 18:31:55 +0200 Subject: xtables: merge {ip,arp}tables_command_state structs Differences between both structs are marginal (apart from arptables_command_state being much smaller), so merge them into one. Struct iptables_command_state is already shared between iptables, ip6tables and ebtables. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/xtables-monitor.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'iptables/xtables-monitor.c') diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c index dd380300..e491b4db 100644 --- a/iptables/xtables-monitor.c +++ b/iptables/xtables-monitor.c @@ -73,12 +73,10 @@ static bool events; static int rule_cb(const struct nlmsghdr *nlh, void *data) { - struct arptables_command_state cs_arp = {}; struct iptables_command_state cs = {}; uint32_t type = nlh->nlmsg_type & 0xFF; const struct cb_arg *arg = data; struct nftnl_rule *r; - void *fw = NULL; uint8_t family; r = nftnl_rule_alloc(); @@ -99,19 +97,17 @@ static int rule_cb(const struct nlmsghdr *nlh, void *data) case AF_INET6: printf("-%c ", family == AF_INET ? '4' : '6'); nft_rule_to_iptables_command_state(r, &cs); - fw = &cs; break; case NFPROTO_ARP: printf("-0 "); - nft_rule_to_arptables_command_state(r, &cs_arp); - fw = &cs_arp; + nft_rule_to_arptables_command_state(r, &cs); break; default: goto err_free; } printf("-t %s ", nftnl_rule_get_str(r, NFTNL_RULE_TABLE)); - nft_rule_print_save(fw, r, + nft_rule_print_save(&cs, r, type == NFT_MSG_NEWRULE ? NFT_RULE_APPEND : NFT_RULE_DEL, counters ? 0 : FMT_NOCOUNTS); -- cgit v1.2.3