]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
rule: remove fake stateless output of named counters
authorJeremy Sowden <jeremy@azazel.net>
Thu, 7 Oct 2021 20:12:20 +0000 (21:12 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 11 Oct 2021 23:06:51 +0000 (01:06 +0200)
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 <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/rule.c

index 6091067f608b2c3bbc02229a4d5a29e48b289786..50e16cf9e028599061515941d654c15b8b7ede70 100644 (file)
@@ -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;