diff options
| author | Florian Westphal <fw@strlen.de> | 2018-07-03 16:16:51 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-07-21 11:30:56 +0200 |
| commit | 6dd848339444fecf95122579c1a1fe944a819b6d (patch) | |
| tree | 3e26cbf7eeb3e5023fb0f95f0721680df6aa772f /tests/py/inet | |
| parent | 0b97683b33be6f703fa93222d0b35a6abad0b514 (diff) | |
src: meta: always prefix 'meta' for almost all tokens
got following bug report:
nft add ... ct mark set mark and 0x10
... always sets 0.
What reporter meant to write instead was 'ct mark', not 'mark'.
We can't just remove support for 'mark' and force
'meta mark', but we can start to discourage it by printing meta prefix too.
Later on, we could start to print deprecation warning if needed.
Followup patch can also change
"iifname" etc. to "meta iifname".
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/inet')
| -rw-r--r-- | tests/py/inet/map.t | 4 | ||||
| -rw-r--r-- | tests/py/inet/reject.t | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/py/inet/map.t b/tests/py/inet/map.t index 5075540b..e83490a8 100644 --- a/tests/py/inet/map.t +++ b/tests/py/inet/map.t @@ -5,5 +5,5 @@ *inet;test-inet;input *netdev;test-netdev;ingress -mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017};ok;mark set ip saddr map { 10.2.3.1 : 0x00000017, 10.2.3.2 : 0x0000002a} -mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001};ok;mark set ip hdrlength map { 4 : 0x00000001, 5 : 0x00000017} +mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017};ok;meta mark set ip saddr map { 10.2.3.1 : 0x00000017, 10.2.3.2 : 0x0000002a} +mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001};ok;meta mark set ip hdrlength map { 4 : 0x00000001, 5 : 0x00000017} diff --git a/tests/py/inet/reject.t b/tests/py/inet/reject.t index 7679407e..cb3caa4a 100644 --- a/tests/py/inet/reject.t +++ b/tests/py/inet/reject.t @@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;meta nfproto ipv6 reject with icmpv6 reject with icmpv6 type addr-unreachable;ok;meta nfproto ipv6 reject with icmpv6 type addr-unreachable reject with icmpv6 type port-unreachable;ok;meta nfproto ipv6 reject -mark 12345 reject with tcp reset;ok;meta l4proto 6 mark 0x00003039 reject with tcp reset +mark 12345 reject with tcp reset;ok;meta l4proto 6 meta mark 0x00003039 reject with tcp reset reject;ok meta nfproto ipv4 reject;ok |