From b487f4d0e436522acbef938ff4751626406b24c8 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Thu, 7 Oct 2021 21:12:20 +0100 Subject: rule: remove fake stateless output of named counters When `-s` is passed, no state is output for named quotas and counter and quota rules, but fake zero state is output for named counters. Remove the output of named counters to match the remaining stateful objects. Signed-off-by: Jeremy Sowden Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 6091067f..50e16cf9 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1811,13 +1811,12 @@ static void obj_print_data(const struct obj *obj, nft_print(octx, " # handle %" PRIu64, obj->handle.handle.id); obj_print_comment(obj, opts, octx); - nft_print(octx, "%s%s%s", opts->nl, opts->tab, opts->tab); - if (nft_output_stateless(octx)) { - nft_print(octx, "packets 0 bytes 0"); - break; - } - nft_print(octx, "packets %" PRIu64 " bytes %" PRIu64 "%s", - obj->counter.packets, obj->counter.bytes, opts->nl); + if (nft_output_stateless(octx)) + nft_print(octx, "%s", opts->nl); + else + nft_print(octx, "%s%s%spackets %" PRIu64 " bytes %" PRIu64 "%s", + opts->nl, opts->tab, opts->tab, + obj->counter.packets, obj->counter.bytes, opts->nl); break; case NFT_OBJECT_QUOTA: { const char *data_unit; -- cgit v1.2.3