sets: Fix for missing space after last element

Not having a space between the last element in a set and the closing
curly brace looks ugly, so add it here.

This also adjusts all shell testcases as they match whitespace in nft
output and therefore fail otherwise.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expression.c b/src/expression.c
index a6065524f8be8afd9f4ee7ff10b13e454ff35164..45f3ed8da33c00656340d57467cb787c0383431f 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -746,7 +746,7 @@ static void set_expr_print(const struct expr *expr)
 {
        printf("{ ");
        compound_expr_print(expr, ", ");
-       printf("}");
+       printf(" }");
 }
 
 static void set_expr_set_type(const struct expr *expr,

diff --git a/tests/shell/testcases/maps/0003map_add_many_elements_0 b/tests/shell/testcases/maps/0003map_add_many_elements_0
index a2233e3909ecd6b23c66c0812b47f77fbe510e8a..36b1be25eb6649439836529f6be3661e5f1abae0 100755 (executable)
--- a/tests/shell/testcases/maps/0003map_add_many_elements_0
+++ b/tests/shell/testcases/maps/0003map_add_many_elements_0
@@ -49,7 +49,7 @@ $NFT -f $tmpfile
 EXPECTED="table ip x {
        map y {
                type ipv4_addr : ipv4_addr
-               elements = { $(generate_test)}
+               elements = { $(generate_test) }
        }
 }"
 GET=$($NFT list ruleset)

diff --git a/tests/shell/testcases/maps/0004interval_map_create_once_0 b/tests/shell/testcases/maps/0004interval_map_create_once_0
index 7d4877eb6e964cffcb8858733f02f9aa59944a6c..1f043875729ee4cd7c6a68ca9012e7ba4443a952 100755 (executable)
--- a/tests/shell/testcases/maps/0004interval_map_create_once_0
+++ b/tests/shell/testcases/maps/0004interval_map_create_once_0
@@ -48,7 +48,7 @@ EXPECTED="table ip x {
        map y {
                type ipv4_addr : ipv4_addr
                flags interval
-               elements = { $(generate_test)}
+               elements = { $(generate_test) }
        }
 }"
 GET=$($NFT list ruleset)

diff --git a/tests/shell/testcases/maps/0005interval_map_add_many_elements_0 b/tests/shell/testcases/maps/0005interval_map_add_many_elements_0
index 824f2c85fb708a67ddad706b02473b3431462a08..4d4f708e3876053dbc92c59d43564606874ee14a 100755 (executable)
--- a/tests/shell/testcases/maps/0005interval_map_add_many_elements_0
+++ b/tests/shell/testcases/maps/0005interval_map_add_many_elements_0
@@ -54,7 +54,7 @@ EXPECTED="table ip x {
        map y {
                type ipv4_addr : ipv4_addr
                flags interval
-               elements = { $(generate_test)}
+               elements = { $(generate_test) }
        }
 }"
 GET=$($NFT list ruleset)

diff --git a/tests/shell/testcases/maps/0006interval_map_overlap_0 b/tests/shell/testcases/maps/0006interval_map_overlap_0
index c1bf3de111ac9c2cf2e73855353773e29e3d157b..8597639ea2aaac0e5aa2f378d123a828121d00f5 100755 (executable)
--- a/tests/shell/testcases/maps/0006interval_map_overlap_0
+++ b/tests/shell/testcases/maps/0006interval_map_overlap_0
@@ -29,7 +29,7 @@ EXPECTED="table ip x {
        map y {
                type ipv4_addr : ipv4_addr
                flags interval
-               elements = { 10.0.1.0/24 : 10.0.0.1, 10.0.2.0/24 : 10.0.0.2}
+               elements = { 10.0.1.0/24 : 10.0.0.1, 10.0.2.0/24 : 10.0.0.2 }
        }
 }"
 GET=$($NFT list ruleset)

diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0
index 663167d741c57c821f4a31e6a9c637a968d3ec6e..435275233f75dcfb99b105d15ee59773755f8ad1 100755 (executable)
--- a/tests/shell/testcases/netns/0001nft-f_0
+++ b/tests/shell/testcases/netns/0001nft-f_0
@@ -19,12 +19,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 RULESET="table ip t {
        set s {
                type ipv4_addr
-               elements = { 1.1.0.0}
+               elements = { 1.1.0.0 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip saddr @s drop
                jump other
        }
@@ -35,12 +35,12 @@ RULESET="table ip t {
 table ip6 t {
        set s {
                type ipv6_addr
-               elements = { fe00::1}
+               elements = { fe00::1 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip6 saddr @s drop
                jump other
        }
@@ -51,12 +51,12 @@ table ip6 t {
 table inet t {
        set s {
                type ipv6_addr
-               elements = { fe00::1}
+               elements = { fe00::1 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip6 saddr @s drop
                jump other
        }

diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0
index fbaa38658de6abbced2ce473319c4f8c045980ad..3910446a5565f929e32e8eff4faaf1e111e4db01 100755 (executable)
--- a/tests/shell/testcases/netns/0002loosecommands_0
+++ b/tests/shell/testcases/netns/0002loosecommands_0
@@ -39,12 +39,12 @@ netns_exec $NETNS_NAME "$NFT add rule ip t c jump other"
 RULESET="table ip t {
        set s {
                type ipv4_addr
-               elements = { 1.1.0.0}
+               elements = { 1.1.0.0 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip saddr @s drop
                jump other
        }

diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0
index 17d7b93588f34804e2406d1499d8abac4115a9a2..03da6eec859733f89b138fa62f67116eef57e539 100755 (executable)
--- a/tests/shell/testcases/netns/0003many_0
+++ b/tests/shell/testcases/netns/0003many_0
@@ -22,12 +22,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 RULESET="table ip t {
        set s {
                type ipv4_addr
-               elements = { 1.1.0.0}
+               elements = { 1.1.0.0 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip saddr @s drop
                jump other
        }
@@ -38,12 +38,12 @@ RULESET="table ip t {
 table ip6 t {
        set s {
                type ipv6_addr
-               elements = { fe00::1}
+               elements = { fe00::1 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip6 saddr @s drop
                jump other
        }
@@ -54,12 +54,12 @@ table ip6 t {
 table inet t {
        set s {
                type ipv6_addr
-               elements = { fe00::1}
+               elements = { fe00::1 }
        }
 
        chain c {
                ct state new
-               udp dport { 12345}
+               udp dport { 12345 }
                ip6 saddr @s drop
                jump other
        }

diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0
index 5518c0b2de46b4bbde6b941a6c14a453f22fc3ec..ddeb5423cc4c31f57d5041077e89af66bc39a9a9 100755 (executable)
--- a/tests/shell/testcases/nft-f/0002rollback_rule_0
+++ b/tests/shell/testcases/nft-f/0002rollback_rule_0
@@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 GOOD_RULESET="table ip t {
        set t {
                type ipv4_addr
-               elements = { 1.1.1.1}
+               elements = { 1.1.1.1 }
        }
 
        chain c {
                ct state new
-               tcp dport { 22222}
+               tcp dport { 22222 }
                ip saddr @t drop
                jump other
        }

diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0
index 5c8c6852bc98c4eaba595251b94fbbce96fff9f0..6c43df9db5f82fb68f64d7699783950e30c37c66 100755 (executable)
--- a/tests/shell/testcases/nft-f/0003rollback_jump_0
+++ b/tests/shell/testcases/nft-f/0003rollback_jump_0
@@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 GOOD_RULESET="table ip t {
        set t {
                type ipv4_addr
-               elements = { 1.1.1.1}
+               elements = { 1.1.1.1 }
        }
 
        chain c {
                ct state new
-               tcp dport { 22222}
+               tcp dport { 22222 }
                ip saddr @t drop
                jump other
        }

diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0
index db1c84cb1b349645b8d4a292fd9d3728e718873a..1dea85ec401adb6901a605d57791f709bb0cde77 100755 (executable)
--- a/tests/shell/testcases/nft-f/0004rollback_set_0
+++ b/tests/shell/testcases/nft-f/0004rollback_set_0
@@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 GOOD_RULESET="table ip t {
        set t {
                type ipv4_addr
-               elements = { 1.1.1.1}
+               elements = { 1.1.1.1 }
        }
 
        chain c {
                ct state new
-               tcp dport { 22222}
+               tcp dport { 22222 }
                ip saddr @t drop
                jump other
        }

diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0
index 13bb90752ffc1dadec1ec87d07973f6e529ecc67..777cc7175ef1064a0e2f29f1cfc8999ced239a94 100755 (executable)
--- a/tests/shell/testcases/nft-f/0005rollback_map_0
+++ b/tests/shell/testcases/nft-f/0005rollback_map_0
@@ -14,12 +14,12 @@ trap "rm -rf $tmpfile" EXIT # cleanup if aborted
 GOOD_RULESET="table ip t {
        set t {
                type ipv4_addr
-               elements = { 1.1.1.1}
+               elements = { 1.1.1.1 }
        }
 
        chain c {
                ct state new
-               tcp dport { 22222}
+               tcp dport { 22222 }
                ip saddr @t drop
                jump other
        }
@@ -31,7 +31,7 @@ GOOD_RULESET="table ip t {
 BAD_RULESET="flush ruleset
 table ip t2 {
        chain c2 {
-               tcp dport map {22222: jump other, 11111: jump invalid}
+               tcp dport map { 22222: jump other, 11111: jump invalid }
        }
 
        chain other {

diff --git a/tests/shell/testcases/sets/0021nesting_0 b/tests/shell/testcases/sets/0021nesting_0
index 3bcb61473198c03abc7a654e2a07dc51ab869cdb..763d9ae1797e6e42e7b83b08c81900fda548eee7 100755 (executable)
--- a/tests/shell/testcases/sets/0021nesting_0
+++ b/tests/shell/testcases/sets/0021nesting_0
@@ -33,7 +33,7 @@ fi
 
 EXPECTED="table ip x {
        chain y {
-               ip saddr { 1.1.1.0/24, 2.2.2.0/24, 3.3.3.0/24}
+               ip saddr { 1.1.1.0/24, 2.2.2.0/24, 3.3.3.0/24 }
        }
 }"
 

diff --git a/tests/shell/testcases/transactions/0035set_0 b/tests/shell/testcases/transactions/0035set_0
index a014a69ecd41aec4b2c19a8e3e09ccfdd3176338..0788e2fe9489ba5427f7ddea686208f6ae9d3439 100755 (executable)
--- a/tests/shell/testcases/transactions/0035set_0
+++ b/tests/shell/testcases/transactions/0035set_0
@@ -27,7 +27,7 @@ fi
 EXPECTED="table ip x {
        set y {
                type ipv4_addr
-               elements = { 3.3.3.3}
+               elements = { 3.3.3.3 }
        }
 }"
 

diff --git a/tests/shell/testcases/transactions/0038set_0 b/tests/shell/testcases/transactions/0038set_0
index 2e36fa31d3f60439490fe49846ea755737583094..765507555814d42d24a2630c971953d3def27d20 100755 (executable)
--- a/tests/shell/testcases/transactions/0038set_0
+++ b/tests/shell/testcases/transactions/0038set_0
@@ -28,7 +28,7 @@ EXPECTED="table ip x {
        set y {
                type ipv4_addr
                flags interval
-               elements = { 192.168.4.0/24}
+               elements = { 192.168.4.0/24 }
        }
 }"
 

diff --git a/tests/shell/testcases/transactions/0039set_0 b/tests/shell/testcases/transactions/0039set_0
index 2e36fa31d3f60439490fe49846ea755737583094..765507555814d42d24a2630c971953d3def27d20 100755 (executable)
--- a/tests/shell/testcases/transactions/0039set_0
+++ b/tests/shell/testcases/transactions/0039set_0
@@ -28,7 +28,7 @@ EXPECTED="table ip x {
        set y {
                type ipv4_addr
                flags interval
-               elements = { 192.168.4.0/24}
+               elements = { 192.168.4.0/24 }
        }
 }"