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/ip/ip_tcp.t | 2 +- tests/py/ip/reject.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/py/ip') diff --git a/tests/py/ip/ip_tcp.t b/tests/py/ip/ip_tcp.t index 450df727..467da3ef 100644 --- a/tests/py/ip/ip_tcp.t +++ b/tests/py/ip/ip_tcp.t @@ -7,4 +7,4 @@ ip protocol tcp tcp dport 22;ok;tcp dport 22 # but not here -ip protocol tcp meta mark set 1 tcp dport 22;ok;ip protocol 6 mark set 0x00000001 tcp dport 22 +ip protocol tcp meta mark set 1 tcp dport 22;ok;ip protocol 6 meta mark set 0x00000001 tcp dport 22 diff --git a/tests/py/ip/reject.t b/tests/py/ip/reject.t index 7befe697..cc5561a0 100644 --- a/tests/py/ip/reject.t +++ b/tests/py/ip/reject.t @@ -10,7 +10,7 @@ reject with icmp type port-unreachable;ok;reject reject with icmp type net-prohibited;ok reject with icmp type host-prohibited;ok reject with icmp type admin-prohibited;ok -mark 0x80000000 reject with tcp reset;ok +mark 0x80000000 reject with tcp reset;ok;meta mark 0x80000000 reject with tcp reset reject with icmp type no-route;fail reject with icmpv6 type no-route;fail -- cgit v1.2.3