diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-06-17 17:26:38 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-06-23 19:00:02 +0200 |
| commit | f9939f8954f800b865a0463c65f8c3e9a86aa296 (patch) | |
| tree | 0602123ef5b78649758d9ec6cafb0877ae15d0da | |
| parent | 8f10f33a0998391acbb56bba65e1d350eebda105 (diff) | |
optimize: remove comment after merging
Remove rule comment after merging rules, let the user decide if they want
to reintroduce the comment in the ruleset file.
Update optimizations/merge_stmt test.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/optimize.c | 5 | ||||
| -rwxr-xr-x | tests/shell/testcases/optimizations/merge_stmts | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/optimize.c b/src/optimize.c index b19a8b55..94242ee5 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -873,6 +873,11 @@ static void merge_rules(const struct optimize_ctx *ctx, assert(0); } + if (ctx->rule[from]->comment) { + xfree(ctx->rule[from]->comment); + ctx->rule[from]->comment = NULL; + } + octx->flags |= NFT_CTX_OUTPUT_STATELESS; fprintf(octx->error_fp, "Merging:\n"); diff --git a/tests/shell/testcases/optimizations/merge_stmts b/tests/shell/testcases/optimizations/merge_stmts index 0c35636e..ec7a9dd6 100755 --- a/tests/shell/testcases/optimizations/merge_stmts +++ b/tests/shell/testcases/optimizations/merge_stmts @@ -4,9 +4,9 @@ set -e RULESET="table ip x { chain y { - ip daddr 192.168.0.1 counter accept - ip daddr 192.168.0.2 counter accept - ip daddr 192.168.0.3 counter accept + ip daddr 192.168.0.1 counter accept comment "test1" + ip daddr 192.168.0.2 counter accept comment "test2" + ip daddr 192.168.0.3 counter accept comment "test3" } }" |