]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
monitor: do not print generation ID with --echo
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 20 Oct 2020 19:48:16 +0000 (21:48 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 22 Oct 2020 17:12:11 +0000 (19:12 +0200)
This fixes testcases/sets/0036add_set_element_expiration_0

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/monitor.c

index 3872ebcfbdaf649febc10cfba4f5b910e45d2425..9e508f8f757432a56107df29bc0d652523fd2cd6 100644 (file)
@@ -849,7 +849,7 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type,
                        break;
                }
        }
-       if (genid >= 0) {
+       if (!nft_output_echo(&monh->ctx->nft->output) && genid >= 0) {
                nft_mon_print(monh, "# new generation %d", genid);
                if (pid >= 0)
                        nft_mon_print(monh, " by process %d (%s)", pid, name);