From 6dd848339444fecf95122579c1a1fe944a819b6d Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 3 Jul 2018 16:16:51 +0200 Subject: 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 --- tests/py/ip6/map.t | 2 +- tests/py/ip6/reject.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/py/ip6') diff --git a/tests/py/ip6/map.t b/tests/py/ip6/map.t index 3377f8d3..4d06e87f 100644 --- a/tests/py/ip6/map.t +++ b/tests/py/ip6/map.t @@ -1,5 +1,5 @@ :input;type filter hook input priority 0 *ip6;test-ip6;input -mark set ip6 saddr and ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017};ok;mark set ip6 saddr & ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017} +mark set ip6 saddr and ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017};ok;meta mark set ip6 saddr & ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017} diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t index a95f2e3f..7fa04eec 100644 --- a/tests/py/ip6/reject.t +++ b/tests/py/ip6/reject.t @@ -9,7 +9,7 @@ reject with icmpv6 type addr-unreachable;ok reject with icmpv6 type port-unreachable;ok;reject reject with icmpv6 type policy-fail;ok reject with icmpv6 type reject-route;ok -mark 0x80000000 reject with tcp reset;ok +mark 0x80000000 reject with tcp reset;ok;meta mark 0x80000000 reject with tcp reset reject with icmpv6 type host-unreachable;fail reject with icmp type host-unreachable;fail -- cgit v1.2.3