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/ip6/masquerade.t.payload.ip6 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/py/ip6/masquerade.t.payload.ip6') diff --git a/tests/py/ip6/masquerade.t.payload.ip6 b/tests/py/ip6/masquerade.t.payload.ip6 index 31cedf1f..04f328b8 100644 --- a/tests/py/ip6/masquerade.t.payload.ip6 +++ b/tests/py/ip6/masquerade.t.payload.ip6 @@ -1,6 +1,6 @@ # udp dport 53 masquerade ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -8,7 +8,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -16,7 +16,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade random,persistent ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -24,7 +24,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade random,persistent,fully-random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -32,7 +32,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade random,fully-random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -40,7 +40,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade random,fully-random,persistent ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -48,7 +48,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade persistent ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -56,7 +56,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade persistent,random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -64,7 +64,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade persistent,random,fully-random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -72,7 +72,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade persistent,fully-random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -80,7 +80,7 @@ ip6 test-ip6 postrouting # udp dport 53 masquerade persistent,fully-random,random ip6 test-ip6 postrouting - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -91,7 +91,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] element 00000800 : 0 [end] element 00006500 : 0 [end] element 0000ca00 : 0 [end] element 00002f01 : 0 [end] element 0000e903 : 0 [end] element 0000d207 : 0 [end] element 0000bb0b : 0 [end] ip6 test-ip6 postrouting - [ 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 ] [ lookup reg 1 set __set%d ] @@ -102,7 +102,7 @@ ip6 test-ip6 postrouting [ payload load 16b @ network header + 24 => reg 1 ] [ cmp gte reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 ] [ cmp lte reg 1 0x000000fe 0x00000000 0x00000000 0x00020000 ] - [ payload load 1b @ network header + 6 => reg 1 ] + [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00003500 ] @@ -119,7 +119,7 @@ ip6 test-ip6 postrouting [ ct load state => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000000a ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000000 ] - [ 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 ] [ lookup reg 1 set __map%d dreg 0 ] -- cgit v1.2.3