From f7fa88020f3bc4ec646ce2a48731a1f5fa2aa0a9 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 31 Jan 2019 16:12:51 +0100 Subject: arptables-nft: Fix MARK target parsing and printing Legacy arptables parses mark values in hex no matter if prefixed with '0x' or not. Sadly, this is not easily achievable with guided option parser. Hence fall back to the old 'parse' callback. The introduced target definition is valid only for revision 2, but that's consistent with legacy arptables. When printing, use --set-mark option instead of --set-xmark. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'iptables') diff --git a/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 b/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 index 73b3b0cf..f8629551 100755 --- a/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 +++ b/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 @@ -47,7 +47,7 @@ DUMP='*filter -A OUTPUT -o eth432 --h-length 6 --opcode 1 --h-type 1 -j CLASSIFY --set-class feed:babe -A foo -i lo --h-length 6 --h-type 1 -j ACCEPT -A foo --h-length 6 --h-type 1 -j ACCEPT --A foo --h-length 6 --h-type 1 -j MARK --set-xmark 0x3039/0xffffffff +-A foo --h-length 6 --h-type 1 -j MARK --set-mark 12345 -A foo --h-length 6 --opcode 1 --h-type 1 -j ACCEPT -A foo --h-length 6 --h-type 1 --proto-type 0x800 -j ACCEPT -A foo -i lo --h-length 6 --opcode 1 --h-type 1 --proto-type 0x800 -j ACCEPT -- cgit v1.2.3