diff options
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/nft-arp.c | 1 | ||||
| -rw-r--r-- | iptables/nft-bridge.c | 1 | ||||
| -rw-r--r-- | iptables/nft-ipv4.c | 1 | ||||
| -rw-r--r-- | iptables/nft-ipv6.c | 1 | ||||
| -rw-r--r-- | iptables/nft-shared.c | 8 | ||||
| -rw-r--r-- | iptables/nft-shared.h | 2 | ||||
| -rw-r--r-- | iptables/nft.c | 5 |
7 files changed, 3 insertions, 16 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 23ab73cb..67f4529d 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -652,7 +652,6 @@ struct nft_family_ops nft_family_ops_arp = { .print_header = nft_arp_print_header, .print_rule = nft_arp_print_rule, .save_rule = nft_arp_save_rule, - .save_counters = save_counters, .save_chain = nft_arp_save_chain, .post_parse = NULL, .rule_to_cs = nft_rule_to_iptables_command_state, diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 18f5e78f..dbf11eb5 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -932,7 +932,6 @@ struct nft_family_ops nft_family_ops_bridge = { .print_header = nft_bridge_print_header, .print_rule = nft_bridge_print_rule, .save_rule = nft_bridge_save_rule, - .save_counters = save_counters, .save_chain = nft_bridge_save_chain, .post_parse = NULL, .rule_to_cs = nft_rule_to_ebtables_command_state, diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c index ba789da0..afdecf97 100644 --- a/iptables/nft-ipv4.c +++ b/iptables/nft-ipv4.c @@ -450,7 +450,6 @@ struct nft_family_ops nft_family_ops_ipv4 = { .print_header = print_header, .print_rule = nft_ipv4_print_rule, .save_rule = nft_ipv4_save_rule, - .save_counters = save_counters, .save_chain = nft_ipv46_save_chain, .proto_parse = nft_ipv4_proto_parse, .post_parse = nft_ipv4_post_parse, diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index 84bcf1c5..4008b7ea 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -402,7 +402,6 @@ struct nft_family_ops nft_family_ops_ipv6 = { .print_header = print_header, .print_rule = nft_ipv6_print_rule, .save_rule = nft_ipv6_save_rule, - .save_counters = save_counters, .save_chain = nft_ipv46_save_chain, .proto_parse = nft_ipv6_proto_parse, .post_parse = nft_ipv6_post_parse, diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c index 53cd4cae..c5a8f3fc 100644 --- a/iptables/nft-shared.c +++ b/iptables/nft-shared.c @@ -831,14 +831,6 @@ void save_rule_details(const struct iptables_command_state *cs, } } -void save_counters(const void *data) -{ - const struct iptables_command_state *cs = data; - - printf("[%llu:%llu] ", (unsigned long long)cs->counters.pcnt, - (unsigned long long)cs->counters.bcnt); -} - void nft_ipv46_save_chain(const struct nftnl_chain *c, const char *policy) { const char *chain = nftnl_chain_get_str(c, NFTNL_CHAIN_NAME); diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index cb60e685..94437ffe 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -98,7 +98,6 @@ struct nft_family_ops { void (*print_rule)(struct nft_handle *h, struct nftnl_rule *r, unsigned int num, unsigned int format); void (*save_rule)(const void *data, unsigned int format); - void (*save_counters)(const void *data); void (*save_chain)(const struct nftnl_chain *c, const char *policy); void (*proto_parse)(struct iptables_command_state *cs, struct xtables_args *args); @@ -160,7 +159,6 @@ void save_rule_details(const struct iptables_command_state *cs, unsigned const char *iniface_mask, const char *outiface, unsigned const char *outiface_mask); -void save_counters(const void *data); void nft_ipv46_save_chain(const struct nftnl_chain *c, const char *policy); void save_matches_and_target(const struct iptables_command_state *cs, bool goto_flag, const void *fw, diff --git a/iptables/nft.c b/iptables/nft.c index e65eb91c..0c5a74fc 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -1453,8 +1453,9 @@ nft_rule_print_save(struct nft_handle *h, const struct nftnl_rule *r, ops->rule_to_cs(h, r, &cs); - if (!(format & (FMT_NOCOUNTS | FMT_C_COUNTS)) && ops->save_counters) - ops->save_counters(&cs); + if (!(format & (FMT_NOCOUNTS | FMT_C_COUNTS))) + printf("[%llu:%llu] ", (unsigned long long)cs.counters.pcnt, + (unsigned long long)cs.counters.bcnt); /* print chain name */ switch(type) { |