path: root/iptables/xtables-eb.c
diff options
authorPhil Sutter <>2019-07-22 12:16:19 +0200
committerPablo Neira Ayuso <>2019-07-23 21:14:40 +0200
commit43a87268372a2d2da1ec0d95cee60da0a6f83bff (patch)
treeb22a5a6bd0812f22f6643e773b9851346763530d /iptables/xtables-eb.c
parent1b8210f84863115690332135f9cb58f679d447de (diff)
ebtables-save: Fix counter formatting
The initial problem was 'ebtables-save -c' printing iptables-style counters but at the same time not disabling ebtables-style counter output (which was even printed in wrong format for ebtables-save). The code around counter output was complicated enough to motivate a larger rework: * Make FMT_C_COUNTS indicate the appended counter style for ebtables. * Use FMT_EBT_SAVE to distinguish between '-c' style counters and the legacy pcnt/bcnt ones. Consequently, ebtables-save sets format to: FMT_NOCOUNTS - for no counters FMT_EBT_SAVE - for iptables-style counters FMT_EBT_SAVE | FMT_C_COUNTS - for '-c' style counters For regular ebtables, list_rules() always sets FMT_C_COUNTS (iptables-style counters are never used there) and FMT_NOCOUNTS if no counters are requested. The big plus is if neither FMT_NOCOUNTS nor FMT_C_COUNTS is set, iptables-style counters are to be printed - both in iptables and ebtables. This allows to drop the ebtables-specific 'save_counters' callback. Signed-off-by: Phil Sutter <> Signed-off-by: Pablo Neira Ayuso <>
Diffstat (limited to 'iptables/xtables-eb.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index b8d89ad9..121ecbec 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -410,7 +410,7 @@ static int list_rules(struct nft_handle *h, const char *chain, const char *table
unsigned int format;
- format = FMT_OPTIONS;
if (verbose)
format |= FMT_VIA;