From 3de1dbd2da8a76ddd2d1d9fcd7e469eb848f0d00 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 3 Mar 2022 13:06:59 +0100 Subject: optimize: more robust statement merge with vmap Check expressions that are expected on the rhs rather than using a catch-all default case. Actually, lists and sets need to be their own routine, because this needs the set element key expression to be merged. This is a follow up to 99eb46969f3d ("optimize: fix vmap with anonymous sets"). Fixes: 1542082e259b ("optimize: merge same selector with different verdict into verdict map") Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft | 2 +- tests/shell/testcases/optimizations/merge_stmts_vmap | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft b/tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft index 42757295..5a9b3006 100644 --- a/tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft +++ b/tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft @@ -4,6 +4,6 @@ table ip x { } chain z { - tcp dport vmap { 1 : accept, 2-3 : drop } + tcp dport vmap { 1 : accept, 2-3 : drop, 4 : accept } } } diff --git a/tests/shell/testcases/optimizations/merge_stmts_vmap b/tests/shell/testcases/optimizations/merge_stmts_vmap index 6511c7b2..79350076 100755 --- a/tests/shell/testcases/optimizations/merge_stmts_vmap +++ b/tests/shell/testcases/optimizations/merge_stmts_vmap @@ -10,6 +10,7 @@ RULESET="table ip x { chain z { tcp dport { 1 } accept tcp dport 2-3 drop + tcp dport 4 accept } }" -- cgit v1.2.3