From 8f10f33a0998391acbb56bba65e1d350eebda105 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 17 Jun 2022 17:25:50 +0200 Subject: optimize: do not print stateful information Do not print stateful information such as counters which are likely set to zero. Before this patch: Merging: packets.conf:10:3-29: ip protocol 4 counter drop packets.conf:11:3-29: ip protocol 41 counter drop packets.conf:12:3-29: ip protocol 47 counter drop into: ip protocol { 4, 41, 47 } counter packets 0 bytes 0 drop ^^^^^^^^^^^^^^^^^ After: Merging: packets.conf:10:3-29: ip protocol 4 counter drop packets.conf:11:3-29: ip protocol 41 counter drop packets.conf:12:3-29: ip protocol 47 counter drop into: ip protocol { 4, 41, 47 } counter drop Signed-off-by: Pablo Neira Ayuso --- src/optimize.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/optimize.c b/src/optimize.c index 543d3ca5..b19a8b55 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -873,6 +873,8 @@ static void merge_rules(const struct optimize_ctx *ctx, assert(0); } + octx->flags |= NFT_CTX_OUTPUT_STATELESS; + fprintf(octx->error_fp, "Merging:\n"); rule_optimize_print(octx, ctx->rule[from]); @@ -885,6 +887,8 @@ static void merge_rules(const struct optimize_ctx *ctx, fprintf(octx->error_fp, "into:\n\t"); rule_print(ctx->rule[from], octx); fprintf(octx->error_fp, "\n"); + + octx->flags &= ~NFT_CTX_OUTPUT_STATELESS; } static bool stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b) -- cgit v1.2.3