From 81d78c6e73d49dabae9414a9fda4efcb5fa7e224 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 22 Mar 2017 16:38:30 +0100 Subject: tests: fix up meta l4proto change for ip6 family After previous commit nft generates meta l4proto for ipv6 dependencies instead of checking the (first) nexthdr value. This fixes up all tests cases accordingly except one which fails with ip6/reject.t: ... 12: 'ip6 nexthdr 6 reject with tcp reset' mismatches 'meta l4proto 6 reject with tcp reset' This will be fixed by removing the implicit dependency in a followup patch. Signed-off-by: Florian Westphal --- tests/py/inet/ether.t.payload.ip6 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/py/inet/ether.t.payload.ip6') diff --git a/tests/py/inet/ether.t.payload.ip6 b/tests/py/inet/ether.t.payload.ip6 index 9065952d..a3a8905e 100644 --- a/tests/py/inet/ether.t.payload.ip6 +++ b/tests/py/inet/ether.t.payload.ip6 @@ -1,6 +1,6 @@ # tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept ip6 test-ip6 input - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00001600 ] @@ -14,7 +14,7 @@ ip6 test-ip6 input # tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept ip6 test-ip6 input - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00001600 ] @@ -26,7 +26,7 @@ ip6 test-ip6 input # tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept ip6 test-ip6 input - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00001600 ] -- cgit v1.2.3 From 5f46b18745d18c486e959c93da649c18c8b10fe0 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sun, 7 May 2017 04:04:03 +0200 Subject: tests: fix up meta l4proto change for ip family We can delete some of the payload files now as ip/ip6/inet produce same implicit meta l4proto dep. Signed-off-by: Florian Westphal --- tests/py/inet/ether.t.payload.ip6 | 55 --------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 tests/py/inet/ether.t.payload.ip6 (limited to 'tests/py/inet/ether.t.payload.ip6') diff --git a/tests/py/inet/ether.t.payload.ip6 b/tests/py/inet/ether.t.payload.ip6 deleted file mode 100644 index a3a8905e..00000000 --- a/tests/py/inet/ether.t.payload.ip6 +++ /dev/null @@ -1,55 +0,0 @@ -# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept -ip6 test-ip6 input - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] - [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] - [ immediate reg 0 accept ] - -# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept -ip6 test-ip6 input - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] - [ immediate reg 0 accept ] - -# tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept -ip6 test-ip6 input - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] - [ immediate reg 0 accept ] - -# ether saddr 00:0f:54:0c:11:04 accept -ip6 test-ip6 input - [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] - [ immediate reg 0 accept ] - -# ether saddr 00:0f:54:0c:11:04 meta nfproto ipv4 -ip6 test-ip6 input - [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] - [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] - -- cgit v1.2.3