diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-08-16 18:14:36 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-16 19:43:47 +0200 |
| commit | 294f9ef5ee354ff902dfdc091a604f93083c248d (patch) | |
| tree | 8bf3106f6f2e57625141c25bdc9ea16e27ecfee9 /iptables/nft-shared.h | |
| parent | 6f29aa8e3486e2c12ab48425a7e9b01dd6417665 (diff) | |
ebtables: Fix entries count in chain listing
The previous fix for reference counts in iptables-nft output wasn't
complete: While iptables lists the number of references for each custom
chain (i.e., the number of jumps to it), ebtables lists number of
entries (i.e., the number of rules contained) for each chain. Both used
the same value for it, although they are different metrics.
Fix this by passing both numbers separately to the 'print_header'
callback so that each tool may print the desired value.
Fixes: a0698de9866d2 ("xtables: Do not count rules as chain references")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/nft-shared.h')
| -rw-r--r-- | iptables/nft-shared.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 49e2fa10..80750784 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -88,7 +88,7 @@ struct nft_family_ops { void (*print_header)(unsigned int format, const char *chain, const char *pol, const struct xt_counters *counters, bool basechain, - uint32_t refs); + uint32_t refs, uint32_t entries); void (*print_rule)(struct nftnl_rule *r, unsigned int num, unsigned int format); void (*save_rule)(const void *data, unsigned int format); @@ -149,7 +149,7 @@ void nft_rule_to_iptables_command_state(const struct nftnl_rule *r, void nft_clear_iptables_command_state(struct iptables_command_state *cs); void print_header(unsigned int format, const char *chain, const char *pol, const struct xt_counters *counters, bool basechain, - uint32_t refs); + uint32_t refs, uint32_t entries); void print_rule_details(const struct iptables_command_state *cs, const char *targname, uint8_t flags, uint8_t invflags, uint8_t proto, |