@@ -49,7 +49,7 @@ ip saddr != @set33 drop;fail
!set5 type ipv4_addr . ipv4_addr;ok
ip saddr . ip daddr @set5 drop;ok
-set add ip saddr . ip daddr @set5;ok
+add @set5 { ip saddr . ip daddr };ok
# test nested anonymous sets
ip saddr { { 1.1.1.0, 3.3.3.0 }, 2.2.2.0 };ok;ip saddr { 1.1.1.0, 2.2.2.0, 3.3.3.0 }
@@ -39,7 +39,7 @@ inet test-inet input
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x00000002 ]
@@ -29,7 +29,7 @@ ip test-ip4 input
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
ip test-ip4 input
[ payload load 4b @ network header + 12 => reg 1 ]
[ payload load 4b @ network header + 16 => reg 9 ]
@@ -39,7 +39,7 @@ netdev test-netdev ingress
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip saddr . ip daddr @set5
+# add @set5 { ip saddr . ip daddr }
netdev test-netdev ingress
[ meta load protocol => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
@@ -39,4 +39,4 @@ ip6 saddr != @set33 drop;fail
!set5 type ipv6_addr . ipv6_addr;ok
ip6 saddr . ip6 daddr @set5 drop;ok
-set add ip6 saddr . ip6 daddr @set5;ok
+add @set5 { ip6 saddr . ip6 daddr };ok
@@ -23,7 +23,7 @@ inet test-inet input
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
@@ -17,7 +17,7 @@ ip6 test-ip6 input
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
ip6 test-ip6 input
[ payload load 16b @ network header + 8 => reg 1 ]
[ payload load 16b @ network header + 24 => reg 2 ]
@@ -23,7 +23,7 @@ netdev test-netdev ingress
[ lookup reg 1 set set5 ]
[ immediate reg 0 drop ]
-# set add ip6 saddr . ip6 daddr @set5
+# add @set5 { ip6 saddr . ip6 daddr }
netdev test-netdev ingress
[ meta load protocol => reg 1 ]
[ cmp eq reg 1 0x0000dd86 ]
@@ -12,6 +12,6 @@ $NFT add set t s2 { type ipv4_addr \; }
$NFT add set t s3 { type ipv4_addr \; size 1024\; }
$NFT add chain t c {type filter hook input priority 0 \; }
-$NFT add rule t c meta iifname foobar set add ip protocol @s1
-$NFT add rule t c meta iifname foobar set add ip daddr @s2
-$NFT add rule t c meta iifname foobar set add ip daddr @s3
+$NFT add rule t c meta iifname foobar add @s1 { ip protocol }
+$NFT add rule t c meta iifname foobar add @s2 { ip daddr }
+$NFT add rule t c meta iifname foobar add @s3 { ip daddr }
Reported-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- tests/py/ip/sets.t | 2 +- tests/py/ip/sets.t.payload.inet | 2 +- tests/py/ip/sets.t.payload.ip | 2 +- tests/py/ip/sets.t.payload.netdev | 2 +- tests/py/ip6/sets.t | 2 +- tests/py/ip6/sets.t.payload.inet | 2 +- tests/py/ip6/sets.t.payload.ip6 | 2 +- tests/py/ip6/sets.t.payload.netdev | 2 +- tests/shell/testcases/sets/0028autoselect_0 | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-)