diff options
| author | Phil Sutter <phil@nwl.cc> | 2025-10-16 14:31:46 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2026-01-27 23:01:54 +0100 |
| commit | 0f566ac1c1dbd9f2e7d006ca01211aae791f09a8 (patch) | |
| tree | a672d67eefb7ca5b51550721c9d440bd1845a887 /tests/py/ip6 | |
| parent | db82466117b8bfc93923eec49114d47200f7f913 (diff) | |
tests: py: Update payload records
This is the bulk change of py test suite payload records with improved
data reg printing in libnftnl using data (component) size and byteorder
collected in nftables.
Aside from printing values in the right byte order and padded with
zeroes to match their actual size, this patch also exposes the improved
set element dump format:
* No '[end]' marker, 'element' clearly separates elements
* No semi-colon for non-map elements
* 'flags' value printed only if non-zero and prefixed by 'flags' to
distinguish from element data
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'tests/py/ip6')
34 files changed, 1317 insertions, 1339 deletions
diff --git a/tests/py/ip6/ct.t.payload b/tests/py/ip6/ct.t.payload index a7a56d4b..35f64e64 100644 --- a/tests/py/ip6/ct.t.payload +++ b/tests/py/ip6/ct.t.payload @@ -1,7 +1,7 @@ # ct mark set ip6 dscp << 2 | 0x10 ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 << 0x00000002 ) ] @@ -11,7 +11,7 @@ ip6 test-ip6 output # ct mark set ip6 dscp << 26 | 0x10 ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 << 0x0000001a ) ] @@ -21,7 +21,7 @@ ip6 test-ip6 output # ct mark set ip6 dscp | 0x04 ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 & 0xfffffffb ) ^ 0x00000004 ] @@ -30,7 +30,7 @@ ip6 test-ip6 output # ct mark set ip6 dscp | 0xff000000 ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 & 0x00ffffff ) ^ 0xff000000 ] @@ -39,7 +39,7 @@ ip6 test-ip6 output # ct mark set ip6 dscp & 0x0f << 2 ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 & 0x0000003c ) ^ 0x00000000 ] @@ -49,7 +49,7 @@ ip6 test-ip6 output ip6 test-ip6 output [ ct load mark => reg 1 ] [ payload load 2b @ network header + 0 => reg 2 ] - [ bitwise reg 2 = ( reg 2 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 2 = ( reg 2 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 2 = ntoh(reg 2, 2, 2) ] [ bitwise reg 2 = ( reg 2 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 | reg 2 ) ] diff --git a/tests/py/ip6/dnat.t.payload.ip6 b/tests/py/ip6/dnat.t.payload.ip6 index fe6e0422..26f0f603 100644 --- a/tests/py/ip6/dnat.t.payload.ip6 +++ b/tests/py/ip6/dnat.t.payload.ip6 @@ -1,44 +1,44 @@ # tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:80-100 ip6 test-ip6 prerouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00005000 0x00005a00 ] - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x02005f03 0x00000000 0x00000000 ] - [ immediate reg 3 0x00005000 ] - [ immediate reg 4 0x00006400 ] + [ range eq reg 1 0x0050 0x005a ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0002 0x00000000 0x00000000 ] + [ immediate reg 3 0x0050 ] + [ immediate reg 4 0x0064 ] [ nat dnat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 proto_max reg 4 flags 0x2 ] # tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:100 ip6 test-ip6 prerouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00005000 0x00005a00 ] - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x02005f03 0x00000000 0x00000000 ] - [ immediate reg 3 0x00006400 ] + [ range eq reg 1 0x0050 0x005a ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0002 0x00000000 0x00000000 ] + [ immediate reg 3 0x0064 ] [ nat dnat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 flags 0x2 ] # tcp dport 80-90 dnat to [2001:838:35f:1::]:80 ip6 test-ip6 prerouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00005000 0x00005a00 ] - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x00005000 ] + [ range eq reg 1 0x0050 0x005a ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x0050 ] [ nat dnat ip6 addr_min reg 1 proto_min reg 2 flags 0x2 ] # dnat to [2001:838:35f:1::]/64 ip6 test-ip6 prerouting - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x01005f03 0xffffffff 0xffffffff ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0001 0xffffffff 0xffffffff ] [ nat dnat ip6 addr_min reg 1 addr_max reg 2 ] # dnat to 2001:838:35f:1::-2001:838:35f:1:ffff:ffff:ffff:ffff ip6 test-ip6 prerouting - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x01005f03 0xffffffff 0xffffffff ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0001 0xffffffff 0xffffffff ] [ nat dnat ip6 addr_min reg 1 addr_max reg 2 ] diff --git a/tests/py/ip6/dst.t.payload.inet b/tests/py/ip6/dst.t.payload.inet index eb7a87d5..47eea7f8 100644 --- a/tests/py/ip6/dst.t.payload.inet +++ b/tests/py/ip6/dst.t.payload.inet @@ -1,119 +1,119 @@ # dst nexthdr 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # dst nexthdr != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # dst nexthdr 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # dst nexthdr != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # dst nexthdr { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dst nexthdr != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dst nexthdr != { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst nexthdr icmp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # dst nexthdr != icmp ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # dst hdrlength 22 ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # dst hdrlength != 233 ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # dst hdrlength 33-45 ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # dst hdrlength != 33-45 ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # dst hdrlength { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] diff --git a/tests/py/ip6/dst.t.payload.ip6 b/tests/py/ip6/dst.t.payload.ip6 index ac1fc8b3..f4fc9aed 100644 --- a/tests/py/ip6/dst.t.payload.ip6 +++ b/tests/py/ip6/dst.t.payload.ip6 @@ -1,27 +1,27 @@ # dst nexthdr 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # dst nexthdr != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # dst nexthdr 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # dst nexthdr != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # dst nexthdr { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -29,7 +29,7 @@ ip6 test-ip6 input # dst nexthdr != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -37,7 +37,7 @@ ip6 test-ip6 input # dst nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -45,7 +45,7 @@ ip6 test-ip6 input # dst nexthdr != { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -53,37 +53,37 @@ ip6 test-ip6 input # dst nexthdr icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # dst nexthdr != icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # dst hdrlength 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # dst hdrlength != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # dst hdrlength 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # dst hdrlength != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # dst hdrlength { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] diff --git a/tests/py/ip6/dup.t.payload b/tests/py/ip6/dup.t.payload index c441d4be..55bb3747 100644 --- a/tests/py/ip6/dup.t.payload +++ b/tests/py/ip6/dup.t.payload @@ -1,21 +1,20 @@ # dup to abcd::1 ip6 test test - [ immediate reg 1 0x0000cdab 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 1 0xabcd0000 0x00000000 0x00000000 0x00000001 ] [ dup sreg_addr 1 ] # dup to abcd::1 device "lo" ip6 test test - [ immediate reg 1 0x0000cdab 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 1 0xabcd0000 0x00000000 0x00000000 0x00000001 ] [ immediate reg 2 0x00000001 ] [ dup sreg_addr 1 sreg_dev 2 ] # dup to ip6 saddr map { abcd::1 : cafe::cafe } device "lo" __map%d test-ip6 b __map%d test-ip6 0 - element 0000cdab 00000000 00000000 01000000 : 0000feca 00000000 00000000 feca0000 0 [end] + element abcd0000 00000000 00000000 00000001 : cafe0000 00000000 00000000 0000cafe ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ immediate reg 2 0x00000001 ] [ dup sreg_addr 1 sreg_dev 2 ] - diff --git a/tests/py/ip6/ether.t.payload b/tests/py/ip6/ether.t.payload index 592b4ea0..b26ad647 100644 --- a/tests/py/ip6/ether.t.payload +++ b/tests/py/ip6/ether.t.payload @@ -1,49 +1,49 @@ # tcp dport 22 iiftype ether ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:4 accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000100 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00010000 0x00000000 0x00000000 0x00000002 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000100 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00010000 0x00000000 0x00000000 0x00000002 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] # tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip6 daddr 1::2 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000100 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00010000 0x00000000 0x00000000 0x00000002 ] # ether saddr 00:0f:54:0c:11:04 ip6 daddr 1::2 accept ip6 test-ip6 input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000100 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00010000 0x00000000 0x00000000 0x00000002 ] [ immediate reg 0 accept ] diff --git a/tests/py/ip6/exthdr.t.payload.ip6 b/tests/py/ip6/exthdr.t.payload.ip6 index be10d61e..230a5137 100644 --- a/tests/py/ip6/exthdr.t.payload.ip6 +++ b/tests/py/ip6/exthdr.t.payload.ip6 @@ -1,60 +1,59 @@ # exthdr hbh exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr rt exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr frag exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 44 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr dst exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 60 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr mh exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr hbh missing ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # exthdr hbh == exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr hbh == missing ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # exthdr hbh != exists ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # exthdr hbh != missing ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp neq reg 1 0x00000000 ] + [ cmp neq reg 1 0x00 ] # exthdr hbh 1 ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # exthdr hbh 0 ip6 test-ip6 input [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] - + [ cmp eq reg 1 0x00 ] diff --git a/tests/py/ip6/frag.t.payload.inet b/tests/py/ip6/frag.t.payload.inet index 1100896e..c2c8f2eb 100644 --- a/tests/py/ip6/frag.t.payload.inet +++ b/tests/py/ip6/frag.t.payload.inet @@ -1,229 +1,228 @@ # frag nexthdr tcp inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] # frag nexthdr != icmp inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # frag nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # frag nexthdr esp inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] # frag nexthdr ah inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] # frag reserved 22 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # frag reserved != 233 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # frag reserved 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # frag reserved != 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # frag reserved { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # frag reserved != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # frag frag-off 22 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000b000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp eq reg 1 0x00b0 ] # frag frag-off != 233 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00004807 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0748 ] # frag frag-off 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range eq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range eq reg 1 0x0108 0x0168 ] # frag frag-off != 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range neq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range neq reg 1 0x0108 0x0168 ] # frag frag-off { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d ] # frag frag-off != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d 0x1 ] # frag id 1 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] + [ cmp eq reg 1 0x00000001 ] # frag id 22 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # frag id != 33 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp neq reg 1 0x21000000 ] + [ cmp neq reg 1 0x00000021 ] # frag id 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # frag id != 33-45 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # frag id { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # frag id != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # frag reserved2 1 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000006 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x06 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # frag more-fragments 0 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # frag more-fragments 1 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000001 ] - + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x01 ] diff --git a/tests/py/ip6/frag.t.payload.ip6 b/tests/py/ip6/frag.t.payload.ip6 index 0556395a..f3d2dd14 100644 --- a/tests/py/ip6/frag.t.payload.ip6 +++ b/tests/py/ip6/frag.t.payload.ip6 @@ -1,17 +1,17 @@ # frag nexthdr tcp ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] # frag nexthdr != icmp ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -19,7 +19,7 @@ ip6 test-ip6 output # frag nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -27,37 +27,37 @@ ip6 test-ip6 output # frag nexthdr esp ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] # frag nexthdr ah ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] # frag reserved 22 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # frag reserved != 233 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # frag reserved 33-45 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # frag reserved != 33-45 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # frag reserved { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -65,7 +65,7 @@ ip6 test-ip6 output # frag reserved != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -73,74 +73,74 @@ ip6 test-ip6 output # frag frag-off 22 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000b000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp eq reg 1 0x00b0 ] # frag frag-off != 233 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00004807 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0748 ] # frag frag-off 33-45 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range eq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range eq reg 1 0x0108 0x0168 ] # frag frag-off != 33-45 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range neq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range neq reg 1 0x0108 0x0168 ] # frag frag-off { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d ] # frag frag-off != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 ip6 test-ip6 output [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d 0x1 ] # frag id 1 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] + [ cmp eq reg 1 0x00000001 ] # frag id 22 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # frag id != 33 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp neq reg 1 0x21000000 ] + [ cmp neq reg 1 0x00000021 ] # frag id 33-45 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # frag id != 33-45 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # frag id { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -148,7 +148,7 @@ ip6 test-ip6 output # frag id != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 ip6 test-ip6 output [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -156,18 +156,17 @@ ip6 test-ip6 output # frag reserved2 1 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000006 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x06 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # frag more-fragments 0 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # frag more-fragments 1 ip6 test-ip6 output [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000001 ] - + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x01 ] diff --git a/tests/py/ip6/frag.t.payload.netdev b/tests/py/ip6/frag.t.payload.netdev index 68257f5b..e78400f9 100644 --- a/tests/py/ip6/frag.t.payload.netdev +++ b/tests/py/ip6/frag.t.payload.netdev @@ -1,229 +1,228 @@ # frag nexthdr tcp netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] # frag nexthdr != icmp netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-netdev 3 size 8 __set%d test-netdev 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # frag nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp} __set%d test-netdev 3 size 8 __set%d test-netdev 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # frag nexthdr esp netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] # frag nexthdr ah netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] # frag reserved 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # frag reserved != 233 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # frag reserved 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # frag reserved != 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # frag reserved { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # frag reserved != { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # frag frag-off 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000b000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp eq reg 1 0x00b0 ] # frag frag-off != 233 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00004807 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0748 ] # frag frag-off 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range eq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range eq reg 1 0x0108 0x0168 ] # frag frag-off != 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ range neq reg 1 0x00000801 0x00006801 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] + [ range neq reg 1 0x0108 0x0168 ] # frag frag-off { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d ] # frag frag-off != { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 00000801 : 0 [end] element 0000b801 : 0 [end] element 00001802 : 0 [end] element 0000c002 : 0 [end] + element 0108 element 01b8 element 0218 element 02c0 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfff8 ) ^ 0x0000 ] [ lookup reg 1 set __set%d 0x1 ] # frag reserved2 1 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000006 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x06 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # frag more-fragments 0 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # frag more-fragments 1 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000001 ] + [ bitwise reg 1 = ( reg 1 & 0x01 ) ^ 0x00 ] + [ cmp eq reg 1 0x01 ] # frag id 1 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] + [ cmp eq reg 1 0x00000001 ] # frag id 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # frag id != 33 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp neq reg 1 0x21000000 ] + [ cmp neq reg 1 0x00000021 ] # frag id 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # frag id != 33-45 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # frag id { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # frag id != { 33, 55, 67, 88} __set%d test-netdev 3 size 4 __set%d test-netdev 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/ip6/hbh.t.payload.inet b/tests/py/ip6/hbh.t.payload.inet index 10f010aa..40d6e596 100644 --- a/tests/py/ip6/hbh.t.payload.inet +++ b/tests/py/ip6/hbh.t.payload.inet @@ -1,130 +1,129 @@ # hbh hdrlength 22 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # hbh hdrlength != 233 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # hbh hdrlength 33-45 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # hbh hdrlength != 33-45 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # hbh hdrlength {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # hbh hdrlength != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # hbh nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # hbh nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # hbh nexthdr 22 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # hbh nexthdr != 233 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # hbh nexthdr 33-45 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # hbh nexthdr != 33-45 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # hbh nexthdr {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # hbh nexthdr != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # hbh nexthdr ip inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # hbh nexthdr != ip inet test-inet filter-input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000000 ] - + [ cmp neq reg 1 0x00 ] diff --git a/tests/py/ip6/hbh.t.payload.ip6 b/tests/py/ip6/hbh.t.payload.ip6 index a6bc7ae6..96c3ee24 100644 --- a/tests/py/ip6/hbh.t.payload.ip6 +++ b/tests/py/ip6/hbh.t.payload.ip6 @@ -1,27 +1,27 @@ # hbh hdrlength 22 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # hbh hdrlength != 233 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # hbh hdrlength 33-45 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # hbh hdrlength != 33-45 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # hbh hdrlength {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -29,7 +29,7 @@ ip6 test-ip6 filter-input # hbh hdrlength != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -37,7 +37,7 @@ ip6 test-ip6 filter-input # hbh nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -45,7 +45,7 @@ ip6 test-ip6 filter-input # hbh nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -53,27 +53,27 @@ ip6 test-ip6 filter-input # hbh nexthdr 22 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # hbh nexthdr != 233 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # hbh nexthdr 33-45 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # hbh nexthdr != 33-45 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # hbh nexthdr {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -81,7 +81,7 @@ ip6 test-ip6 filter-input # hbh nexthdr != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -89,10 +89,9 @@ ip6 test-ip6 filter-input # hbh nexthdr ip ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # hbh nexthdr != ip ip6 test-ip6 filter-input [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000000 ] - + [ cmp neq reg 1 0x00 ] diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6 index 8a637afa..96cad4e4 100644 --- a/tests/py/ip6/icmpv6.t.payload.ip6 +++ b/tests/py/ip6/icmpv6.t.payload.ip6 @@ -1,162 +1,162 @@ # icmpv6 type destination-unreachable accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ immediate reg 0 accept ] # icmpv6 type packet-too-big accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ immediate reg 0 accept ] # icmpv6 type time-exceeded accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000003 ] + [ cmp eq reg 1 0x03 ] [ immediate reg 0 accept ] # icmpv6 type echo-request accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] + [ cmp eq reg 1 0x80 ] [ immediate reg 0 accept ] # icmpv6 type echo-reply accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x81 ] [ immediate reg 0 accept ] # icmpv6 type mld-listener-query accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ immediate reg 0 accept ] # icmpv6 type mld-listener-report accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000083 ] + [ cmp eq reg 1 0x83 ] [ immediate reg 0 accept ] # icmpv6 type mld-listener-done accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ immediate reg 0 accept ] # icmpv6 type mld-listener-reduction accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ immediate reg 0 accept ] # icmpv6 type nd-router-solicit accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000085 ] + [ cmp eq reg 1 0x85 ] [ immediate reg 0 accept ] # icmpv6 type nd-router-advert accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000086 ] + [ cmp eq reg 1 0x86 ] [ immediate reg 0 accept ] # icmpv6 type nd-neighbor-solicit accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000087 ] + [ cmp eq reg 1 0x87 ] [ immediate reg 0 accept ] # icmpv6 type nd-neighbor-advert accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ immediate reg 0 accept ] # icmpv6 type nd-redirect accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000089 ] + [ cmp eq reg 1 0x89 ] [ immediate reg 0 accept ] # icmpv6 type parameter-problem accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000004 ] + [ cmp eq reg 1 0x04 ] [ immediate reg 0 accept ] # icmpv6 type router-renumbering accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x0000008a ] + [ cmp eq reg 1 0x8a ] [ immediate reg 0 accept ] # icmpv6 type ind-neighbor-solicit accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x0000008d ] + [ cmp eq reg 1 0x8d ] [ immediate reg 0 accept ] # icmpv6 type ind-neighbor-advert accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x0000008e ] + [ cmp eq reg 1 0x8e ] [ immediate reg 0 accept ] # icmpv6 type mld2-listener-report accept ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x0000008f ] + [ cmp eq reg 1 0x8f ] [ immediate reg 0 accept ] # icmpv6 type {destination-unreachable, time-exceeded, nd-router-solicit} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000001 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end] + element 01 element 03 element 85 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -164,10 +164,10 @@ ip6 test-ip6 input # icmpv6 type {router-renumbering, mld-listener-done, time-exceeded, nd-router-solicit} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 0000008a : 0 [end] element 00000084 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end] + element 8a element 84 element 03 element 85 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -175,10 +175,10 @@ ip6 test-ip6 input # icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000082 : 0 [end] element 00000003 : 0 [end] element 00000086 : 0 [end] + element 82 element 03 element 86 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -186,10 +186,10 @@ ip6 test-ip6 input # icmpv6 type != {mld-listener-query, time-exceeded, nd-router-advert} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000082 : 0 [end] element 00000003 : 0 [end] element 00000086 : 0 [end] + element 82 element 03 element 86 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -197,24 +197,24 @@ ip6 test-ip6 input # icmpv6 code 4 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp eq reg 1 0x00000004 ] + [ cmp eq reg 1 0x04 ] # icmpv6 code 3-66 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ range eq reg 1 0x00000003 0x00000042 ] + [ range eq reg 1 0x03 0x42 ] # icmpv6 code {5, 6, 7} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end] + element 05 element 06 element 07 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -222,10 +222,10 @@ ip6 test-ip6 input # icmpv6 code != {policy-fail, reject-route, 7} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end] + element 05 element 06 element 07 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -233,156 +233,156 @@ ip6 test-ip6 input # icmpv6 checksum 2222 log ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000ae08 ] + [ cmp eq reg 1 0x08ae ] [ log ] # icmpv6 checksum != 2222 log ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x0000ae08 ] + [ cmp neq reg 1 0x08ae ] [ log ] # icmpv6 checksum 222-226 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x0000de00 0x0000e200 ] + [ range eq reg 1 0x00de 0x00e2 ] # icmpv6 checksum != 222-226 ip6 [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x0000de00 0x0000e200 ] + [ range neq reg 1 0x00de 0x00e2 ] # icmpv6 checksum { 222, 226} __set%d test-ip6 3 __set%d test-ip6 0 - element 0000de00 : 0 [end] element 0000e200 : 0 [end] + element 00de element 00e2 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # icmpv6 checksum != { 222, 226} __set%d test-ip6 3 __set%d test-ip6 0 - element 0000de00 : 0 [end] element 0000e200 : 0 [end] + element 00de element 00e2 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # icmpv6 mtu 22 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # icmpv6 mtu != 233 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp neq reg 1 0xe9000000 ] + [ cmp neq reg 1 0x000000e9 ] # icmpv6 mtu 33-45 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # icmpv6 mtu != 33-45 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # icmpv6 mtu {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # icmpv6 mtu != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # icmpv6 type packet-too-big icmpv6 mtu 1280 ip6 [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x00050000 ] + [ cmp eq reg 1 0x00000500 ] # icmpv6 id 33-45 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # icmpv6 id != 33-45 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # icmpv6 id {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 4 => reg 1 ] @@ -391,13 +391,13 @@ ip6 test-ip6 input # icmpv6 id != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 4 => reg 1 ] @@ -406,46 +406,46 @@ ip6 test-ip6 input # icmpv6 id 1 __set%d test-ip6 3 size 2 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x00000100 ] + [ cmp eq reg 1 0x0001 ] # icmpv6 type echo-reply icmpv6 id 65534 ip6 [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x81 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x0000feff ] + [ cmp eq reg 1 0xfffe ] # icmpv6 sequence 2 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000200 ] + [ cmp eq reg 1 0x0002 ] # icmpv6 sequence {3, 4, 5, 6, 7} accept __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] + element 0003 element 0004 element 0005 element 0006 element 0007 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] @@ -455,13 +455,13 @@ ip6 test-ip6 input # icmpv6 sequence {2, 4} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000200 : 0 [end] element 00000400 : 0 [end] + element 0002 element 0004 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] @@ -470,13 +470,13 @@ ip6 test-ip6 input # icmpv6 sequence != {2, 4} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000200 : 0 [end] element 00000400 : 0 [end] + element 0002 element 0004 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] @@ -485,153 +485,153 @@ ip6 test-ip6 input # icmpv6 sequence 2-4 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range eq reg 1 0x00000200 0x00000400 ] + [ range eq reg 1 0x0002 0x0004 ] # icmpv6 sequence != 2-4 __set%d test-ip6 3 __set%d test-ip6 0 - element 00000080 : 0 [end] element 00000081 : 0 [end] + element 80 element 81 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range neq reg 1 0x00000200 0x00000400 ] + [ range neq reg 1 0x0002 0x0004 ] # icmpv6 max-delay 33-45 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # icmpv6 max-delay != 33-45 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # icmpv6 max-delay {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # icmpv6 max-delay != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # icmpv6 type parameter-problem icmpv6 code 0 ip6 [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000004 ] + [ cmp eq reg 1 0x0400 ] # icmpv6 type mld-listener-query icmpv6 taddr 2001:db8::133 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000082 ] + [ cmp eq reg 1 0x82 ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 type nd-neighbor-solicit icmpv6 taddr 2001:db8::133 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000087 ] + [ cmp eq reg 1 0x87 ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 type nd-neighbor-advert icmpv6 taddr 2001:db8::133 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 taddr 2001:db8::133 __set%d test-ip6 3 size 6 __set%d test-ip6 0 - element 00000082 : 0 [end] element 00000083 : 0 [end] element 00000084 : 0 [end] element 00000087 : 0 [end] element 00000088 : 0 [end] element 00000089 : 0 [end] + element 82 element 83 element 84 element 87 element 88 element 89 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 type { mld-listener-query, mld-listener-report, mld-listener-done, nd-neighbor-solicit, nd-neighbor-advert, nd-redirect} icmpv6 taddr 2001:db8::133 __set%d test-ip6 3 size 6 __set%d test-ip6 0 - element 00000082 : 0 [end] element 00000083 : 0 [end] element 00000084 : 0 [end] element 00000087 : 0 [end] element 00000088 : 0 [end] element 00000089 : 0 [end] + element 82 element 83 element 84 element 87 element 88 element 89 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 type { nd-neighbor-solicit, nd-neighbor-advert } icmpv6 taddr 2001:db8::133 __set%d test-ip6 3 size 2 __set%d test-ip6 0 - element 00000087 : 0 [end] element 00000088 : 0 [end] + element 87 element 88 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 16b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 daddr 2001:db8::133 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000089 ] + [ cmp eq reg 1 0x89 ] [ payload load 16b @ transport header + 24 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] # icmpv6 type nd-redirect icmpv6 daddr 2001:db8::133 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000089 ] + [ cmp eq reg 1 0x89 ] [ payload load 16b @ transport header + 24 => reg 1 ] - [ cmp eq reg 1 0xb80d0120 0x00000000 0x00000000 0x33010000 ] + [ cmp eq reg 1 0x20010db8 0x00000000 0x00000000 0x00000133 ] diff --git a/tests/py/ip6/ip6.t.payload.inet b/tests/py/ip6/ip6.t.payload.inet index f0c1843d..99b4c3af 100644 --- a/tests/py/ip6/ip6.t.payload.inet +++ b/tests/py/ip6/ip6.t.payload.inet @@ -1,64 +1,64 @@ # ip6 dscp cs1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp eq reg 1 0x0200 ] # ip6 dscp != cs1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0200 ] # ip6 dscp 0x38 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000000e ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp eq reg 1 0x0e00 ] # ip6 dscp != 0x20 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0800 ] # ip6 dscp {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, ef} __set%d test-inet 3 __set%d test-inet 0 - element 00000000 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00008002 : 0 [end] element 00000003 : 0 [end] element 00008003 : 0 [end] element 00008004 : 0 [end] element 00000005 : 0 [end] element 00008005 : 0 [end] element 00008006 : 0 [end] element 00000007 : 0 [end] element 00008007 : 0 [end] element 00008008 : 0 [end] element 00000009 : 0 [end] element 00008009 : 0 [end] element 0000800b : 0 [end] + element 0000 element 0200 element 0400 element 0600 element 0800 element 0a00 element 0c00 element 0e00 element 0280 element 0300 element 0380 element 0480 element 0500 element 0580 element 0680 element 0700 element 0780 element 0880 element 0900 element 0980 element 0b80 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ lookup reg 1 set __set%d ] # ip6 dscp vmap { 0x04 : accept, 0x3f : continue } counter __map%d test-inet b size 2 __map%d test-inet 0 - element 00000001 : accept 0 [end] element 0000c00f : continue 0 [end] + element 0100 : accept element 0fc0 : continue ip6 test-ip6 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ lookup reg 1 set __map%d dreg 0 ] [ counter pkts 0 bytes 0 ] # meta mark set ip6 dscp map @map1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ lookup reg 1 set map1 dreg 1 ] @@ -67,9 +67,9 @@ inet test-inet input # meta mark set ip6 dscp . ip6 daddr map @map2 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ payload load 16b @ network header + 24 => reg 9 ] @@ -79,9 +79,9 @@ inet test-inet input # ip6 dscp @map3 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ lookup reg 1 set map3 ] @@ -89,9 +89,9 @@ inet test-inet input # ip6 dscp . ip6 daddr @map4 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ payload load 16b @ network header + 24 => reg 9 ] @@ -100,505 +100,505 @@ inet test-inet input # ip6 flowlabel 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00160000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] + [ cmp eq reg 1 0x000016 ] # ip6 flowlabel != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00e90000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] + [ cmp neq reg 1 0x0000e9 ] # ip6 flowlabel { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00210000 : 0 [end] element 00370000 : 0 [end] element 00430000 : 0 [end] element 00580000 : 0 [end] + element 000021 element 000037 element 000043 element 000058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __set%d ] # ip6 flowlabel != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00210000 : 0 [end] element 00370000 : 0 [end] element 00430000 : 0 [end] element 00580000 : 0 [end] + element 000021 element 000037 element 000043 element 000058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 flowlabel vmap { 0 : accept, 2 : continue } __map%d test-inet b size 2 __map%d test-inet 0 - element 00000000 : accept 0 [end] element 00020000 : continue 0 [end] + element 000000 : accept element 000002 : continue inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 length 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip6 length != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # ip6 length 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # ip6 length != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # ip6 length { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # ip6 length != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 nexthdr {udp, ah, comp, udplite, tcp, dccp, sctp} __set%d test-inet 3 __set%d test-inet 0 - element 00000011 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 11 element 33 element 6c element 88 element 06 element 21 element 84 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] # ip6 nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] # ip6 nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-inet 3 __set%d test-inet 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 nexthdr esp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] # ip6 nexthdr != esp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000032 ] + [ cmp neq reg 1 0x32 ] # ip6 nexthdr 33-44 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002c ] + [ range eq reg 1 0x21 0x2c ] # ip6 nexthdr != 33-44 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002c ] + [ range neq reg 1 0x21 0x2c ] # ip6 hoplimit 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # ip6 hoplimit != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # ip6 hoplimit 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # ip6 hoplimit != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # ip6 hoplimit {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] [ lookup reg 1 set __set%d ] # ip6 hoplimit != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 7 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x12341234 ] # ip6 saddr ::1234:1234:1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34120000 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00001234 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:0:1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:0:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:0:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x00003412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x12340000 ] # ip6 saddr ::1234:1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x00000000 ] # ip6 saddr ::1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x00000000 ] # ip6 saddr ::1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x00000000 ] # ip6 saddr ::1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x00000000 ] # ip6 saddr ::1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x00000000 ] # ip6 saddr ::1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:: inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x00000000 ] # ip6 saddr ::/64 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 8b @ network header + 8 => reg 1 ] [ cmp eq reg 1 0x00000000 0x00000000 ] # ip6 saddr ::1 ip6 daddr ::2 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00000001 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00000002 ] # ip6 daddr != {::1234:1234:1234:1234:1234:1234:1234, 1234:1234::1234:1234:1234:1234:1234 } __set%d test-inet 3 __set%d test-inet 0 - element 34120000 34123412 34123412 34123412 : 0 [end] element 34123412 34120000 34123412 34123412 : 0 [end] + element 00001234 12341234 12341234 12341234 element 12341234 00001234 12341234 12341234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 24 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 daddr != ::1234:1234:1234:1234:1234:1234:1234-1234:1234::1234:1234:1234:1234:1234 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 24 => reg 1 ] - [ range neq reg 1 0x34120000 0x34123412 0x34123412 0x34123412 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ range neq reg 1 0x00001234 0x12341234 0x12341234 0x12341234 0x12341234 0x00001234 0x12341234 0x12341234 ] # iif "lo" ip6 daddr set ::1 inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] - [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x0a ] + [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x00000001 ] [ payload write reg 1 => 16b @ network header + 24 csum_type 0 csum_off 0 csum_flags 0x1 ] # iif "lo" ip6 hoplimit set 1 @@ -606,8 +606,8 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] - [ immediate reg 1 0x00000001 ] + [ cmp eq reg 1 0x0a ] + [ immediate reg 1 0x01 ] [ payload write reg 1 => 1b @ network header + 7 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 dscp set af42 @@ -615,9 +615,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00003ff0 ) ^ 0x00000009 ] + [ bitwise reg 1 = ( reg 1 & 0xf03f ) ^ 0x0900 ] [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 dscp set 63 @@ -625,9 +625,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00003ff0 ) ^ 0x0000c00f ] + [ bitwise reg 1 = ( reg 1 & 0xf03f ) ^ 0x0fc0 ] [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 ecn set ect0 @@ -635,9 +635,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000cf ) ^ 0x00000020 ] + [ bitwise reg 1 = ( reg 1 & 0xcf ) ^ 0x20 ] [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 ecn set ce @@ -645,9 +645,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000cf ) ^ 0x00000030 ] + [ bitwise reg 1 = ( reg 1 & 0xcf ) ^ 0x30 ] [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 0 @@ -655,9 +655,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x000000 ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 12345 @@ -665,9 +665,9 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00393000 ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x003039 ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 0xfffff @@ -675,8 +675,7 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00ffff0f ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x0fffff ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] - diff --git a/tests/py/ip6/ip6.t.payload.ip6 b/tests/py/ip6/ip6.t.payload.ip6 index 5118d4f2..1fb8147f 100644 --- a/tests/py/ip6/ip6.t.payload.ip6 +++ b/tests/py/ip6/ip6.t.payload.ip6 @@ -1,50 +1,50 @@ # ip6 dscp cs1 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp eq reg 1 0x0200 ] # ip6 dscp != cs1 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0200 ] # ip6 dscp 0x38 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000000e ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp eq reg 1 0x0e00 ] # ip6 dscp != 0x20 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] + [ cmp neq reg 1 0x0800 ] # ip6 dscp {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, ef} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00000000 : 0 [end] element 00008002 : 0 [end] element 00000003 : 0 [end] element 00008003 : 0 [end] element 00008004 : 0 [end] element 00000005 : 0 [end] element 00008005 : 0 [end] element 00008006 : 0 [end] element 00000007 : 0 [end] element 00008007 : 0 [end] element 00008008 : 0 [end] element 00000009 : 0 [end] element 00008009 : 0 [end] element 0000800b : 0 [end] + element 0000 element 0200 element 0400 element 0600 element 0800 element 0a00 element 0c00 element 0e00 element 0280 element 0300 element 0380 element 0480 element 0500 element 0580 element 0680 element 0700 element 0780 element 0880 element 0900 element 0980 element 0b80 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ lookup reg 1 set __set%d ] # ip6 dscp vmap { 0x04 : accept, 0x3f : continue } counter __map%d test-ip6 b size 2 __map%d test-ip6 0 - element 00000001 : accept 0 [end] element 0000c00f : continue 0 [end] + element 0100 : accept element 0fc0 : continue ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ lookup reg 1 set __map%d dreg 0 ] [ counter pkts 0 bytes 0 ] # meta mark set ip6 dscp map @map1 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ lookup reg 1 set map1 dreg 1 ] @@ -53,7 +53,7 @@ ip6 test-ip6 input # meta mark set ip6 dscp . ip6 daddr map @map2 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ payload load 16b @ network header + 24 => reg 9 ] @@ -63,7 +63,7 @@ ip6 test-ip6 input # ip6 dscp @map3 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ lookup reg 1 set map3 ] @@ -71,7 +71,7 @@ ip6 test-ip6 input # ip6 dscp . ip6 daddr @map4 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ payload load 16b @ network header + 24 => reg 9 ] @@ -80,66 +80,66 @@ ip6 test-ip6 input # ip6 flowlabel 22 ip6 test-ip6 input [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00160000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] + [ cmp eq reg 1 0x000016 ] # ip6 flowlabel != 233 ip6 test-ip6 input [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00e90000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] + [ cmp neq reg 1 0x0000e9 ] # ip6 flowlabel { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00210000 : 0 [end] element 00370000 : 0 [end] element 00430000 : 0 [end] element 00580000 : 0 [end] + element 000021 element 000037 element 000043 element 000058 ip6 test-ip6 input [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __set%d ] # ip6 flowlabel != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00210000 : 0 [end] element 00370000 : 0 [end] element 00430000 : 0 [end] element 00580000 : 0 [end] + element 000021 element 000037 element 000043 element 000058 ip6 test-ip6 input [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __set%d 0x1 ] # ip6 flowlabel vmap { 0 : accept, 2 : continue } __map%d test-ip6 b size 2 __map%d test-ip6 0 - element 00000000 : accept 0 [end] element 00020000 : continue 0 [end] + element 000000 : accept element 000002 : continue ip6 test-ip6 input [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00ffff0f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fffff ) ^ 0x000000 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 length 22 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip6 length != 233 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # ip6 length 33-45 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # ip6 length != 33-45 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # ip6 length { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -147,7 +147,7 @@ ip6 test-ip6 input # ip6 length != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ payload load 2b @ network header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -155,7 +155,7 @@ ip6 test-ip6 input # ip6 nexthdr {udp, ah, comp, udplite, tcp, dccp, sctp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000011 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] + element 11 element 33 element 6c element 88 element 06 element 21 element 84 ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -163,7 +163,7 @@ ip6 test-ip6 input # ip6 nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -171,7 +171,7 @@ ip6 test-ip6 input # ip6 nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000032 : 0 [end] element 00000033 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000088 : 0 [end] element 00000006 : 0 [end] element 00000021 : 0 [end] element 00000084 : 0 [end] element 0000003a : 0 [end] + element 32 element 33 element 6c element 11 element 88 element 06 element 21 element 84 element 3a ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -179,47 +179,47 @@ ip6 test-ip6 input # ip6 nexthdr esp ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] # ip6 nexthdr != esp ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000032 ] + [ cmp neq reg 1 0x32 ] # ip6 nexthdr 33-44 ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002c ] + [ range eq reg 1 0x21 0x2c ] # ip6 nexthdr != 33-44 ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002c ] + [ range neq reg 1 0x21 0x2c ] # ip6 hoplimit 1 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # ip6 hoplimit != 233 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # ip6 hoplimit 33-45 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # ip6 hoplimit != 33-45 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # ip6 hoplimit {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -227,7 +227,7 @@ ip6 test-ip6 input # ip6 hoplimit != {33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ payload load 1b @ network header + 7 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -235,187 +235,187 @@ ip6 test-ip6 input # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x12341234 ] # ip6 saddr ::1234:1234:1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34120000 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00001234 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:0:1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:0:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:0:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x00003412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x12340000 ] # ip6 saddr ::1234:1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x34123412 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x12341234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234:1234::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234:1234::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x34123412 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12341234 0x00000000 ] # ip6 saddr ::1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x34120000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00001234 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234:1234::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234:1234::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00003412 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x12340000 0x00000000 ] # ip6 saddr ::1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x34123412 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x12341234 0x12341234 ] # ip6 saddr 1234::1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234:1234::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234:1234::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x34123412 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12341234 0x00000000 0x00000000 ] # ip6 saddr ::1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x34120000 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00001234 0x12341234 ] # ip6 saddr 1234::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234:1234::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00003412 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x12340000 0x00000000 0x00000000 ] # ip6 saddr ::1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x34123412 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x12341234 ] # ip6 saddr 1234::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x34123412 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12341234 0x00000000 0x00000000 0x00000000 ] # ip6 saddr ::1234 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x34120000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00001234 ] # ip6 saddr 1234:: ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00003412 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x12340000 0x00000000 0x00000000 0x00000000 ] # ip6 saddr ::/64 ip6 test-ip6 input @@ -425,14 +425,14 @@ ip6 test-ip6 input # ip6 saddr ::1 ip6 daddr ::2 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00000001 ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x02000000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00000002 ] # ip6 daddr != {::1234:1234:1234:1234:1234:1234:1234, 1234:1234::1234:1234:1234:1234:1234 } __set%d test-ip6 3 __set%d test-ip6 0 - element 34120000 34123412 34123412 34123412 : 0 [end] element 34123412 34120000 34123412 34123412 : 0 [end] + element 00001234 12341234 12341234 12341234 element 12341234 00001234 12341234 12341234 ip6 test-ip6 input [ payload load 16b @ network header + 24 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -440,20 +440,20 @@ ip6 test-ip6 input # ip6 daddr != ::1234:1234:1234:1234:1234:1234:1234-1234:1234::1234:1234:1234:1234:1234 ip6 test-ip6 input [ payload load 16b @ network header + 24 => reg 1 ] - [ range neq reg 1 0x34120000 0x34123412 0x34123412 0x34123412 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ range neq reg 1 0x00001234 0x12341234 0x12341234 0x12341234 0x12341234 0x00001234 0x12341234 0x12341234 ] # iif "lo" ip6 daddr set ::1 ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] - [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x00000001 ] [ payload write reg 1 => 16b @ network header + 24 csum_type 0 csum_off 0 csum_flags 0x1 ] # iif "lo" ip6 hoplimit set 1 ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] - [ immediate reg 1 0x00000001 ] + [ immediate reg 1 0x01 ] [ payload write reg 1 => 1b @ network header + 7 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 dscp set af42 @@ -461,7 +461,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00003ff0 ) ^ 0x00000009 ] + [ bitwise reg 1 = ( reg 1 & 0xf03f ) ^ 0x0900 ] [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 dscp set 63 @@ -469,7 +469,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00003ff0 ) ^ 0x0000c00f ] + [ bitwise reg 1 = ( reg 1 & 0xf03f ) ^ 0x0fc0 ] [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 ecn set ect0 @@ -477,7 +477,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000cf ) ^ 0x00000020 ] + [ bitwise reg 1 = ( reg 1 & 0xcf ) ^ 0x20 ] [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 ecn set ce @@ -485,7 +485,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000cf ) ^ 0x00000030 ] + [ bitwise reg 1 = ( reg 1 & 0xcf ) ^ 0x30 ] [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 0 @@ -493,7 +493,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x000000 ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 12345 @@ -501,7 +501,7 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00393000 ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x003039 ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] # iif "lo" ip6 flowlabel set 0xfffff @@ -509,6 +509,5 @@ ip6 test-ip6 input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ payload load 3b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00ffff0f ] + [ bitwise reg 1 = ( reg 1 & 0xf00000 ) ^ 0x0fffff ] [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 csum_flags 0x0 ] - diff --git a/tests/py/ip6/map.t.payload b/tests/py/ip6/map.t.payload index 8e900c18..ea39a81e 100644 --- a/tests/py/ip6/map.t.payload +++ b/tests/py/ip6/map.t.payload @@ -1,10 +1,9 @@ # mark set ip6 saddr and ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 00000000 00000000 02000000 : 0000002a 0 [end] element 00000000 00000000 00000000 ffff0000 : 00000017 0 [end] + element 00000000 00000000 00000000 00000002 : 0000002a element 00000000 00000000 00000000 0000ffff : 00000017 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000000 0x00000000 0x00000000 0xffff0000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x00000000 0x00000000 0x00000000 0x0000ffff ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] - diff --git a/tests/py/ip6/masquerade.t.payload.ip6 b/tests/py/ip6/masquerade.t.payload.ip6 index 086a6dda..89940900 100644 --- a/tests/py/ip6/masquerade.t.payload.ip6 +++ b/tests/py/ip6/masquerade.t.payload.ip6 @@ -1,98 +1,98 @@ # udp dport 53 masquerade ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq ] # udp dport 53 masquerade random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x4 ] # udp dport 53 masquerade random,persistent ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0xc ] # udp dport 53 masquerade random,persistent,fully-random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x1c ] # udp dport 53 masquerade random,fully-random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x14 ] # udp dport 53 masquerade random,fully-random,persistent ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x1c ] # udp dport 53 masquerade persistent ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x8 ] # udp dport 53 masquerade persistent,random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0xc ] # udp dport 53 masquerade persistent,random,fully-random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x1c ] # udp dport 53 masquerade persistent,fully-random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x18 ] # udp dport 53 masquerade persistent,fully-random,random ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ masq flags 0x1c ] # tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade __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] + element 0001 element 0002 element 0003 element 0004 element 0005 element 0006 element 0007 element 0008 element 0065 element 00ca element 012f element 03e9 element 07d2 element 0bbb ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] [ masq ] @@ -100,26 +100,26 @@ ip6 test-ip6 postrouting # ip6 daddr fe00::1-fe00::200 udp dport 53 counter masquerade ip6 test-ip6 postrouting [ payload load 16b @ network header + 24 => reg 1 ] - [ range eq reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 0x000000fe 0x00000000 0x00000000 0x00020000 ] + [ range eq reg 1 0xfe000000 0x00000000 0x00000000 0x00000001 0xfe000000 0x00000000 0x00000000 0x00000200 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ counter pkts 0 bytes 0 ] [ masq ] # iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } masquerade __map%d test-ip6 b __map%d test-ip6 0 - element 00001600 : drop 0 [end] element 0000de00 : drop 0 [end] + element 0016 : drop element 00de : drop ip6 test-ip6 postrouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ ct load state => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000000a ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] [ masq ] @@ -127,15 +127,14 @@ ip6 test-ip6 postrouting # meta l4proto 6 masquerade to :1024 ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x00000004 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x0400 ] [ masq proto_min reg 1 flags 0x2 ] # meta l4proto 6 masquerade to :1024-2048 ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x00000004 ] - [ immediate reg 2 0x00000008 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x0400 ] + [ immediate reg 2 0x0800 ] [ masq proto_min reg 1 proto_max reg 2 flags 0x2 ] - diff --git a/tests/py/ip6/meta.t.payload b/tests/py/ip6/meta.t.payload index 6a37f1de..c3670742 100644 --- a/tests/py/ip6/meta.t.payload +++ b/tests/py/ip6/meta.t.payload @@ -1,37 +1,37 @@ # icmpv6 type nd-router-advert ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000086 ] + [ cmp eq reg 1 0x86 ] # meta l4proto ipv6-icmp icmpv6 type nd-router-advert ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000086 ] + [ cmp eq reg 1 0x86 ] # meta l4proto icmp icmp type echo-request ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # meta l4proto 1 icmp type echo-request ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # icmp type echo-request ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # meta sdif "lo" accept ip6 test-ip6 input @@ -42,29 +42,29 @@ ip6 test-ip6 input # meta sdifname != "vrf1" accept ip6 test-ip6 input [ meta load sdifname => reg 1 ] - [ cmp neq reg 1 0x31667276 0x00000000 0x00000000 0x00000000 ] + [ cmp neq reg 1 0x76726631 0x00000000 0x00000000 0x00000000 ] [ immediate reg 0 accept ] # meta protocol ip udp dport 67 ip6 test-ip6 input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00004300 ] + [ cmp eq reg 1 0x0043 ] # meta protocol ip6 udp dport 67 ip6 test-ip6 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00004300 ] + [ cmp eq reg 1 0x0043 ] # meta mark set ip6 dscp << 2 | 0x10 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 << 0x00000002 ) ] @@ -74,7 +74,7 @@ ip6 test-ip6 input # meta mark set ip6 dscp << 26 | 0x10 ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 << 0x0000001a ) ] diff --git a/tests/py/ip6/mh.t.payload.inet b/tests/py/ip6/mh.t.payload.inet index 7ab9b75c..1164c770 100644 --- a/tests/py/ip6/mh.t.payload.inet +++ b/tests/py/ip6/mh.t.payload.inet @@ -1,263 +1,263 @@ # mh nexthdr 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # mh nexthdr != 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp } __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # mh nexthdr != { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp } __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # mh nexthdr icmp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # mh nexthdr != icmp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # mh nexthdr 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh nexthdr != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh nexthdr 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh nexthdr != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh nexthdr { 33, 55, 67, 88 } __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # mh nexthdr != { 33, 55, 67, 88 } __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # mh hdrlength 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh hdrlength != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh hdrlength 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh hdrlength != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh hdrlength { 33, 55, 67, 88 } __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # mh hdrlength != { 33, 55, 67, 88 } __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # mh type {binding-refresh-request, home-test-init, careof-test-init, home-test, careof-test, binding-update, binding-acknowledgement, binding-error, fast-binding-update, fast-binding-acknowledgement, fast-binding-advertisement, experimental-mobility-header, home-agent-switch-message} __set%d test-inet 3 __set%d test-inet 0 - element 00000000 : 0 [end] element 00000001 : 0 [end] element 00000002 : 0 [end] element 00000003 : 0 [end] element 00000004 : 0 [end] element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end] element 00000008 : 0 [end] element 00000009 : 0 [end] element 0000000a : 0 [end] element 0000000b : 0 [end] element 0000000c : 0 [end] + element 00 element 01 element 02 element 03 element 04 element 05 element 06 element 07 element 08 element 09 element 0a element 0b element 0c inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # mh type home-agent-switch-message inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] - [ cmp eq reg 1 0x0000000c ] + [ cmp eq reg 1 0x0c ] # mh type != home-agent-switch-message inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] - [ cmp neq reg 1 0x0000000c ] + [ cmp neq reg 1 0x0c ] # mh reserved 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh reserved != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh reserved 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh reserved != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh reserved { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] [ lookup reg 1 set __set%d ] # mh reserved != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # mh checksum 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # mh checksum != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # mh checksum 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # mh checksum != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # mh checksum { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # mh checksum != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] diff --git a/tests/py/ip6/mh.t.payload.ip6 b/tests/py/ip6/mh.t.payload.ip6 index 7edde6e8..a191fd00 100644 --- a/tests/py/ip6/mh.t.payload.ip6 +++ b/tests/py/ip6/mh.t.payload.ip6 @@ -1,17 +1,17 @@ # mh nexthdr 1 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # mh nexthdr != 1 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -19,7 +19,7 @@ ip6 test-ip6 input # mh nexthdr != { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -27,37 +27,37 @@ ip6 test-ip6 input # mh nexthdr icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # mh nexthdr != icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # mh nexthdr 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh nexthdr != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh nexthdr 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh nexthdr != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh nexthdr { 33, 55, 67, 88 } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -65,7 +65,7 @@ ip6 test-ip6 input # mh nexthdr != { 33, 55, 67, 88 } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -73,27 +73,27 @@ ip6 test-ip6 input # mh hdrlength 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh hdrlength != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh hdrlength 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh hdrlength != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh hdrlength { 33, 55, 67, 88 } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -101,7 +101,7 @@ ip6 test-ip6 input # mh hdrlength != { 33, 55, 67, 88 } __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -109,7 +109,7 @@ ip6 test-ip6 input # mh type {binding-refresh-request, home-test-init, careof-test-init, home-test, careof-test, binding-update, binding-acknowledgement, binding-error, fast-binding-update, fast-binding-acknowledgement, fast-binding-advertisement, experimental-mobility-header, home-agent-switch-message} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000000 : 0 [end] element 00000001 : 0 [end] element 00000002 : 0 [end] element 00000003 : 0 [end] element 00000004 : 0 [end] element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end] element 00000008 : 0 [end] element 00000009 : 0 [end] element 0000000a : 0 [end] element 0000000b : 0 [end] element 0000000c : 0 [end] + element 00 element 01 element 02 element 03 element 04 element 05 element 06 element 07 element 08 element 09 element 0a element 0b element 0c ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -117,37 +117,37 @@ ip6 test-ip6 input # mh type home-agent-switch-message ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] - [ cmp eq reg 1 0x0000000c ] + [ cmp eq reg 1 0x0c ] # mh type != home-agent-switch-message ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ] - [ cmp neq reg 1 0x0000000c ] + [ cmp neq reg 1 0x0c ] # mh reserved 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # mh reserved != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # mh reserved 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # mh reserved != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # mh reserved { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -155,7 +155,7 @@ ip6 test-ip6 input # mh reserved != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -163,27 +163,27 @@ ip6 test-ip6 input # mh checksum 22 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # mh checksum != 233 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # mh checksum 33-45 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # mh checksum != 33-45 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # mh checksum { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -191,7 +191,7 @@ ip6 test-ip6 input # mh checksum != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 ip6 test-ip6 input [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] diff --git a/tests/py/ip6/redirect.t.payload.ip6 b/tests/py/ip6/redirect.t.payload.ip6 index 832c51da..ac69fd5e 100644 --- a/tests/py/ip6/redirect.t.payload.ip6 +++ b/tests/py/ip6/redirect.t.payload.ip6 @@ -5,160 +5,160 @@ ip6 test-ip6 output # udp dport 954 redirect ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000ba03 ] + [ cmp eq reg 1 0x03ba ] [ redir ] # ip6 saddr fe00::cafe counter redirect ip6 test-ip6 output [ payload load 16b @ network header + 8 => reg 1 ] - [ cmp eq reg 1 0x000000fe 0x00000000 0x00000000 0xfeca0000 ] + [ cmp eq reg 1 0xfe000000 0x00000000 0x00000000 0x0000cafe ] [ counter pkts 0 bytes 0 ] [ redir ] # udp dport 53 redirect random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x4 ] # udp dport 53 redirect random,persistent ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0xc ] # udp dport 53 redirect random,persistent,fully-random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x1c ] # udp dport 53 redirect random,fully-random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x14 ] # udp dport 53 redirect random,fully-random,persistent ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x1c ] # udp dport 53 redirect persistent ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x8 ] # udp dport 53 redirect persistent,random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0xc ] # udp dport 53 redirect persistent,random,fully-random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x1c ] # udp dport 53 redirect persistent,fully-random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x18 ] # udp dport 53 redirect persistent,fully-random,random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ redir flags 0x1c ] # udp dport 1234 redirect to :1234 ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000d204 ] - [ immediate reg 1 0x0000d204 ] + [ cmp eq reg 1 0x04d2 ] + [ immediate reg 1 0x04d2 ] [ redir proto_min reg 1 flags 0x2 ] # ip6 daddr fe00::cafe udp dport 9998 redirect to :6515 ip6 test-ip6 output [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp eq reg 1 0x000000fe 0x00000000 0x00000000 0xfeca0000 ] + [ cmp eq reg 1 0xfe000000 0x00000000 0x00000000 0x0000cafe ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00000e27 ] - [ immediate reg 1 0x00007319 ] + [ cmp eq reg 1 0x270e ] + [ immediate reg 1 0x1973 ] [ redir proto_min reg 1 flags 0x2 ] # ip6 nexthdr tcp redirect to :100-200 ip6 test-ip6 output [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x00006400 ] - [ immediate reg 2 0x0000c800 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x0064 ] + [ immediate reg 2 0x00c8 ] [ redir proto_min reg 1 proto_max reg 2 flags 0x2 ] # tcp dport 39128 redirect to :993 ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000d898 ] - [ immediate reg 1 0x0000e103 ] + [ cmp eq reg 1 0x98d8 ] + [ immediate reg 1 0x03e1 ] [ redir proto_min reg 1 flags 0x2 ] # tcp dport 9128 redirect to :993 random ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000a823 ] - [ immediate reg 1 0x0000e103 ] + [ cmp eq reg 1 0x23a8 ] + [ immediate reg 1 0x03e1 ] [ redir proto_min reg 1 flags 0x6 ] # tcp dport 9128 redirect to :993 fully-random,persistent ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000a823 ] - [ immediate reg 1 0x0000e103 ] + [ cmp eq reg 1 0x23a8 ] + [ immediate reg 1 0x03e1 ] [ redir proto_min reg 1 flags 0x1a ] # tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect __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] + element 0001 element 0002 element 0003 element 0004 element 0005 element 0006 element 0007 element 0008 element 0065 element 00ca element 012f element 03e9 element 07d2 element 0bbb ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] [ redir ] @@ -166,26 +166,26 @@ ip6 test-ip6 output # ip6 daddr fe00::1-fe00::200 udp dport 53 counter redirect ip6 test-ip6 output [ payload load 16b @ network header + 24 => reg 1 ] - [ range eq reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 0x000000fe 0x00000000 0x00000000 0x00020000 ] + [ range eq reg 1 0xfe000000 0x00000000 0x00000000 0x00000001 0xfe000000 0x00000000 0x00000000 0x00000200 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] + [ cmp eq reg 1 0x0035 ] [ counter pkts 0 bytes 0 ] [ redir ] # iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } redirect __map%d test-ip6 b __map%d test-ip6 0 - element 00001600 : drop 0 [end] element 0000de00 : drop 0 [end] + element 0016 : drop element 00de : drop ip6 test-ip6 output [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ ct load state => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000000a ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] [ redir ] @@ -193,11 +193,10 @@ ip6 test-ip6 output # redirect to :tcp dport map { 22 : 8000, 80 : 8080} __map%d test-ip6 b __map%d test-ip6 0 - element 00001600 : 0000401f 0 [end] element 00005000 : 0000901f 0 [end] + element 0016 : 1f40 element 0050 : 1f90 ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ redir proto_min reg 1 flags 0x2 ] - diff --git a/tests/py/ip6/reject.t.payload.ip6 b/tests/py/ip6/reject.t.payload.ip6 index 3d4321b0..6b128269 100644 --- a/tests/py/ip6/reject.t.payload.ip6 +++ b/tests/py/ip6/reject.t.payload.ip6 @@ -33,8 +33,7 @@ ip6 test-ip6 output # mark 0x80000000 reject with tcp reset ip6 test-ip6 output [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ meta load mark => reg 1 ] [ cmp eq reg 1 0x80000000 ] [ reject type 1 code 0 ] - diff --git a/tests/py/ip6/rt.t.payload.inet b/tests/py/ip6/rt.t.payload.inet index 6549ab78..459e38b2 100644 --- a/tests/py/ip6/rt.t.payload.inet +++ b/tests/py/ip6/rt.t.payload.inet @@ -1,240 +1,239 @@ # rt nexthdr 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # rt nexthdr != 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # rt nexthdr != {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-inet 3 __set%d test-inet 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # rt nexthdr icmp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # rt nexthdr != icmp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # rt nexthdr 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt nexthdr != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt nexthdr 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt nexthdr != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt nexthdr { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # rt nexthdr != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # rt hdrlength 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt hdrlength != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt hdrlength 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt hdrlength != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt hdrlength { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # rt hdrlength != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # rt type 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt type != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt type 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt type != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt type { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # rt type != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # rt seg-left 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt seg-left != 233 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt seg-left 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt seg-left != 33-45 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt seg-left { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] [ lookup reg 1 set __set%d ] # rt seg-left != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/ip6/rt.t.payload.ip6 b/tests/py/ip6/rt.t.payload.ip6 index 2b40159b..8a592565 100644 --- a/tests/py/ip6/rt.t.payload.ip6 +++ b/tests/py/ip6/rt.t.payload.ip6 @@ -1,17 +1,17 @@ # rt nexthdr 1 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # rt nexthdr != 1 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -19,7 +19,7 @@ ip6 test-ip6 input # rt nexthdr != {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] + element 88 element 6c element 11 element 33 element 84 element 32 element 21 element 06 element 3a ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -27,37 +27,37 @@ ip6 test-ip6 input # rt nexthdr icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # rt nexthdr != icmp ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x00000001 ] + [ cmp neq reg 1 0x01 ] # rt nexthdr 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt nexthdr != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt nexthdr 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt nexthdr != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt nexthdr { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -65,7 +65,7 @@ ip6 test-ip6 input # rt nexthdr != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -73,27 +73,27 @@ ip6 test-ip6 input # rt hdrlength 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt hdrlength != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt hdrlength 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt hdrlength != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt hdrlength { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -101,7 +101,7 @@ ip6 test-ip6 input # rt hdrlength != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -109,27 +109,27 @@ ip6 test-ip6 input # rt type 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt type != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt type 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt type != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt type { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -137,7 +137,7 @@ ip6 test-ip6 input # rt type != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -145,27 +145,27 @@ ip6 test-ip6 input # rt seg-left 22 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] + [ cmp eq reg 1 0x16 ] # rt seg-left != 233 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] + [ cmp neq reg 1 0xe9 ] # rt seg-left 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ range eq reg 1 0x00000021 0x0000002d ] + [ range eq reg 1 0x21 0x2d ] # rt seg-left != 33-45 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] - [ range neq reg 1 0x00000021 0x0000002d ] + [ range neq reg 1 0x21 0x2d ] # rt seg-left { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -173,8 +173,7 @@ ip6 test-ip6 input # rt seg-left != { 33, 55, 67, 88} __set%d test-ip6 3 __set%d test-ip6 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] + element 21 element 37 element 43 element 58 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/ip6/rt0.t.payload b/tests/py/ip6/rt0.t.payload index 464b7f21..7b4d6d7b 100644 --- a/tests/py/ip6/rt0.t.payload +++ b/tests/py/ip6/rt0.t.payload @@ -1,5 +1,4 @@ # rt nexthop fd00::1 ip6 test-ip6 output [ rt load nexthop6 => reg 1 ] - [ cmp eq reg 1 0x000000fd 0x00000000 0x00000000 0x01000000 ] - + [ cmp eq reg 1 0xfd000000 0x00000000 0x00000000 0x00000001 ] diff --git a/tests/py/ip6/sets.t.payload.inet b/tests/py/ip6/sets.t.payload.inet index 2dbb818a..f694209f 100644 --- a/tests/py/ip6/sets.t.payload.inet +++ b/tests/py/ip6/sets.t.payload.inet @@ -1,7 +1,7 @@ # ip6 saddr @set2 drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set set2 ] [ immediate reg 0 drop ] @@ -9,7 +9,7 @@ inet test-inet input # ip6 saddr != @set2 drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set set2 0x1 ] [ immediate reg 0 drop ] @@ -17,7 +17,7 @@ inet test-inet input # ip6 saddr . ip6 daddr @set5 drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ lookup reg 1 set set5 ] @@ -26,7 +26,7 @@ inet test-inet input # add @set5 { ip6 saddr . ip6 daddr } inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset add reg_key 1 set set5 ] @@ -34,7 +34,7 @@ inet test-inet input # add @map1 { ip6 saddr . ip6 daddr : meta mark } inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ meta load mark => reg 3 ] @@ -43,7 +43,7 @@ inet test-inet input # delete @set5 { ip6 saddr . ip6 daddr } inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset delete reg_key 1 set set5 ] @@ -51,10 +51,10 @@ inet test-inet input # add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ payload load 2b @ transport header + 2 => reg 3 ] - [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 21 0x00005000 ] + [ immediate reg 17 0x12340000 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 21 0x0050 ] [ dynset add reg_key 1 set map2 sreg_data 17 ] diff --git a/tests/py/ip6/sets.t.payload.ip6 b/tests/py/ip6/sets.t.payload.ip6 index 7234b989..8b7379a2 100644 --- a/tests/py/ip6/sets.t.payload.ip6 +++ b/tests/py/ip6/sets.t.payload.ip6 @@ -41,6 +41,6 @@ ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ payload load 2b @ transport header + 2 => reg 3 ] - [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 21 0x00005000 ] + [ immediate reg 17 0x12340000 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 21 0x0050 ] [ dynset add reg_key 1 set map2 sreg_data 17 ] diff --git a/tests/py/ip6/sets.t.payload.netdev b/tests/py/ip6/sets.t.payload.netdev index 2ad0f434..2441a44c 100644 --- a/tests/py/ip6/sets.t.payload.netdev +++ b/tests/py/ip6/sets.t.payload.netdev @@ -1,7 +1,7 @@ # ip6 saddr @set2 drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set set2 ] [ immediate reg 0 drop ] @@ -9,7 +9,7 @@ netdev test-netdev ingress # ip6 saddr != @set2 drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set set2 0x1 ] [ immediate reg 0 drop ] @@ -17,7 +17,7 @@ netdev test-netdev ingress # ip6 saddr . ip6 daddr @set5 drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ lookup reg 1 set set5 ] @@ -26,7 +26,7 @@ netdev test-netdev ingress # add @set5 { ip6 saddr . ip6 daddr } netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset add reg_key 1 set set5 ] @@ -34,7 +34,7 @@ netdev test-netdev ingress # delete @set5 { ip6 saddr . ip6 daddr } netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset delete reg_key 1 set set5 ] @@ -42,7 +42,7 @@ netdev test-netdev ingress # add @map1 { ip6 saddr . ip6 daddr : meta mark } netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ meta load mark => reg 3 ] @@ -51,10 +51,10 @@ netdev test-netdev ingress # add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ payload load 2b @ transport header + 2 => reg 3 ] - [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 21 0x00005000 ] + [ immediate reg 17 0x12340000 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 21 0x0050 ] [ dynset add reg_key 1 set map2 sreg_data 17 ] diff --git a/tests/py/ip6/snat.t.payload.ip6 b/tests/py/ip6/snat.t.payload.ip6 index 96a9ba0a..01abb1ca 100644 --- a/tests/py/ip6/snat.t.payload.ip6 +++ b/tests/py/ip6/snat.t.payload.ip6 @@ -1,23 +1,22 @@ # tcp dport 80-90 snat to [2001:838:35f:1::]-[2001:838:35f:2::]:80-100 ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00005000 0x00005a00 ] - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x02005f03 0x00000000 0x00000000 ] - [ immediate reg 3 0x00005000 ] - [ immediate reg 4 0x00006400 ] + [ range eq reg 1 0x0050 0x005a ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0002 0x00000000 0x00000000 ] + [ immediate reg 3 0x0050 ] + [ immediate reg 4 0x0064 ] [ nat snat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 proto_max reg 4 flags 0x2 ] # tcp dport 80-90 snat to [2001:838:35f:1::]-[2001:838:35f:2::]:100 ip6 test-ip6 postrouting [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00005000 0x00005a00 ] - [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] - [ immediate reg 2 0x38080120 0x02005f03 0x00000000 0x00000000 ] - [ immediate reg 3 0x00006400 ] + [ range eq reg 1 0x0050 0x005a ] + [ immediate reg 1 0x20010838 0x035f0001 0x00000000 0x00000000 ] + [ immediate reg 2 0x20010838 0x035f0002 0x00000000 0x00000000 ] + [ immediate reg 3 0x0064 ] [ nat snat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 flags 0x2 ] - diff --git a/tests/py/ip6/srh.t.payload b/tests/py/ip6/srh.t.payload index 364940a9..5c3031f3 100644 --- a/tests/py/ip6/srh.t.payload +++ b/tests/py/ip6/srh.t.payload @@ -1,17 +1,17 @@ # srh last-entry 0 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # srh last-entry 127 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ] - [ cmp eq reg 1 0x0000007f ] + [ cmp eq reg 1 0x7f ] # srh last-entry { 0, 4-127, 255 } __set%d test-ip6 7 size 5 __set%d test-ip6 0 - element 00000000 : 0 [end] element 00000001 : 1 [end] element 00000004 : 0 [end] element 00000080 : 1 [end] element 000000ff : 0 [end] userdata = { \x01\x04\x01\x00\x00\x00 } + element 00 element 01 flags 1 element 04 element 80 flags 1 element ff userdata = { \x01\x04\x00\x00\x00\x01 } ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -19,17 +19,17 @@ ip6 test-ip6 input # srh flags 0 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # srh flags 127 ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ] - [ cmp eq reg 1 0x0000007f ] + [ cmp eq reg 1 0x7f ] # srh flags { 0, 4-127, 255 } __set%d test-ip6 7 size 5 __set%d test-ip6 0 - element 00000000 : 0 [end] element 00000001 : 1 [end] element 00000004 : 0 [end] element 00000080 : 1 [end] element 000000ff : 0 [end] userdata = { \x01\x04\x01\x00\x00\x00 } + element 00 element 01 flags 1 element 04 element 80 flags 1 element ff userdata = { \x01\x04\x00\x00\x00\x01 } ip6 test-ip6 input [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -37,17 +37,17 @@ ip6 test-ip6 input # srh tag 0 ip6 test-ip6 input [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x0000 ] # srh tag 127 ip6 test-ip6 input [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ] - [ cmp eq reg 1 0x00007f00 ] + [ cmp eq reg 1 0x007f ] # srh tag { 0, 4-127, 0xffff } __set%d test-ip6 7 size 5 __set%d test-ip6 0 - element 00000000 : 0 [end] element 00000100 : 1 [end] element 00000400 : 0 [end] element 00008000 : 1 [end] element 0000ffff : 0 [end] userdata = { \x01\x04\x01\x00\x00\x00 } + element 0000 element 0001 flags 1 element 0004 element 0080 flags 1 element ffff userdata = { \x01\x04\x00\x00\x00\x01 } ip6 test-ip6 input [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -55,10 +55,9 @@ ip6 test-ip6 input # srh sid[1] dead::beef ip6 test-ip6 input [ exthdr load ipv6 16b @ 43 + 8 => reg 1 ] - [ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ] + [ cmp eq reg 1 0xdead0000 0x00000000 0x00000000 0x0000beef ] # srh sid[2] dead::beef ip6 test-ip6 input [ exthdr load ipv6 16b @ 43 + 24 => reg 1 ] - [ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ] - + [ cmp eq reg 1 0xdead0000 0x00000000 0x00000000 0x0000beef ] diff --git a/tests/py/ip6/tproxy.t.payload b/tests/py/ip6/tproxy.t.payload index 9f28e80b..109b697f 100644 --- a/tests/py/ip6/tproxy.t.payload +++ b/tests/py/ip6/tproxy.t.payload @@ -1,44 +1,43 @@ # meta l4proto 6 tproxy to [2001:db8::1] ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] [ tproxy ip6 addr reg 1 ] # meta l4proto 17 tproxy to [2001:db8::1]:50080 ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 2 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 2 0xc3a0 ] [ tproxy ip6 addr reg 1 port reg 2 ] # meta l4proto 6 tproxy to :50080 ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x0000a0c3 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0xc3a0 ] [ tproxy ip6 port reg 1 ] # meta l4proto 6 tproxy ip6 to [2001:db8::1] ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] [ tproxy ip6 addr reg 1 ] # meta l4proto 17 tproxy ip6 to [2001:db8::1]:50080 ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 2 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 2 0xc3a0 ] [ tproxy ip6 addr reg 1 port reg 2 ] # meta l4proto 6 tproxy ip6 to :50080 ip6 x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x0000a0c3 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0xc3a0 ] [ tproxy ip6 port reg 1 ] - diff --git a/tests/py/ip6/vmap.t.payload.inet b/tests/py/ip6/vmap.t.payload.inet index 26bca5e2..4ac4797c 100644 --- a/tests/py/ip6/vmap.t.payload.inet +++ b/tests/py/ip6/vmap.t.payload.inet @@ -1,420 +1,419 @@ # ip6 saddr vmap { abcd::3 : accept } __map%d test-inet b __map%d test-inet 0 - element 0000cdab 00000000 00000000 03000000 : accept 0 [end] + element abcd0000 00000000 00000000 00000003 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 34123412 : accept 0 [end] + element 12341234 12341234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34120000 34123412 34123412 34123412 : accept 0 [end] + element 00001234 12341234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 34123412 34123412 34123412 : accept 0 [end] + element 12340000 12341234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34120000 34123412 34123412 : accept 0 [end] + element 12341234 00001234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00003412 34123412 34123412 : accept 0 [end] + element 12341234 12340000 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34120000 34123412 : accept 0 [end] + element 12341234 12341234 00001234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00003412 34123412 : accept 0 [end] + element 12341234 12341234 12340000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 34120000 : accept 0 [end] + element 12341234 12341234 12341234 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 00003412 : accept 0 [end] + element 12341234 12341234 12341234 12340000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 34123412 34123412 34123412 : accept 0 [end] + element 00000000 12341234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 34120000 34123412 34123412 : accept 0 [end] + element 12340000 00001234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00000000 34123412 34123412 : accept 0 [end] + element 12341234 00000000 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00003412 34120000 34123412 : accept 0 [end] + element 12341234 12340000 00001234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00000000 34123412 : accept 0 [end] + element 12341234 12341234 00000000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00003412 34120000 : accept 0 [end] + element 12341234 12341234 12340000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 00000000 : accept 0 [end] + element 12341234 12341234 12341234 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 34120000 34123412 34123412 : accept 0 [end] + element 00000000 00001234 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 00000000 34123412 34123412 : accept 0 [end] + element 12340000 00000000 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00000000 34120000 34123412 : accept 0 [end] + element 12341234 00000000 00001234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00003412 00000000 34123412 : accept 0 [end] + element 12341234 12340000 00000000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00000000 34120000 : accept 0 [end] + element 12341234 12341234 00000000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00003412 00000000 : accept 0 [end] + element 12341234 12341234 12340000 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 00000000 34123412 34123412 : accept 0 [end] + element 00000000 00000000 12341234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 00000000 34120000 34123412 : accept 0 [end] + element 12340000 00000000 00001234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00000000 00000000 34123412 : accept 0 [end] + element 12341234 00000000 00000000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00003412 00000000 34120000 : accept 0 [end] + element 12341234 12340000 00000000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 00000000 00000000 : accept 0 [end] + element 12341234 12341234 00000000 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 00000000 34120000 34123412 : accept 0 [end] + element 00000000 00000000 00001234 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 00000000 00000000 34123412 : accept 0 [end] + element 12340000 00000000 00000000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00000000 00000000 34120000 : accept 0 [end] + element 12341234 00000000 00000000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00003412 00000000 00000000 : accept 0 [end] + element 12341234 12340000 00000000 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 00000000 00000000 34123412 : accept 0 [end] + element 00000000 00000000 00000000 12341234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 00000000 00000000 34120000 : accept 0 [end] + element 12340000 00000000 00000000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 34123412 00000000 00000000 00000000 : accept 0 [end] + element 12341234 00000000 00000000 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234 : accept} __map%d test-inet b __map%d test-inet 0 - element 00000000 00000000 00000000 34120000 : accept 0 [end] + element 00000000 00000000 00000000 00001234 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:: : accept} __map%d test-inet b __map%d test-inet 0 - element 00003412 00000000 00000000 00000000 : accept 0 [end] + element 12340000 00000000 00000000 00000000 : accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::/64 : accept} __map%d test-inet f __map%d test-inet 0 - element 00000000 00000000 00000000 00000000 : accept 0 [end] element 00000000 01000000 00000000 00000000 : 1 [end] + element 00000000 00000000 00000000 00000000 : accept element 00000000 00000001 00000000 00000000 flags 1 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 aaaa0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000aaaa : drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 bbbb0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000bbbb : drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 cccc0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000cccc : drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} __map%d test-inet b __map%d test-inet 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 dddd0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000dddd : drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] - diff --git a/tests/py/ip6/vmap.t.payload.ip6 b/tests/py/ip6/vmap.t.payload.ip6 index 2aaa0e48..2f950e26 100644 --- a/tests/py/ip6/vmap.t.payload.ip6 +++ b/tests/py/ip6/vmap.t.payload.ip6 @@ -1,7 +1,7 @@ # ip6 saddr vmap { abcd::3 : accept } __map%d test-ip6 b __map%d test-ip6 0 - element 0000cdab 00000000 00000000 03000000 : accept 0 [end] + element abcd0000 00000000 00000000 00000003 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -9,7 +9,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 34123412 : accept 0 [end] + element 12341234 12341234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -17,7 +17,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34120000 34123412 34123412 34123412 : accept 0 [end] + element 00001234 12341234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -25,7 +25,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 34123412 34123412 34123412 : accept 0 [end] + element 12340000 12341234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -33,7 +33,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34120000 34123412 34123412 : accept 0 [end] + element 12341234 00001234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -41,7 +41,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00003412 34123412 34123412 : accept 0 [end] + element 12341234 12340000 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -49,7 +49,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34120000 34123412 : accept 0 [end] + element 12341234 12341234 00001234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -57,7 +57,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00003412 34123412 : accept 0 [end] + element 12341234 12341234 12340000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -65,7 +65,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 34120000 : accept 0 [end] + element 12341234 12341234 12341234 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -73,7 +73,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 00003412 : accept 0 [end] + element 12341234 12341234 12341234 12340000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -81,7 +81,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 34123412 34123412 34123412 : accept 0 [end] + element 00000000 12341234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -89,7 +89,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 34120000 34123412 34123412 : accept 0 [end] + element 12340000 00001234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -97,7 +97,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00000000 34123412 34123412 : accept 0 [end] + element 12341234 00000000 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -105,7 +105,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00003412 34120000 34123412 : accept 0 [end] + element 12341234 12340000 00001234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -113,7 +113,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00000000 34123412 : accept 0 [end] + element 12341234 12341234 00000000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -121,7 +121,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00003412 34120000 : accept 0 [end] + element 12341234 12341234 12340000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -129,7 +129,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 00000000 : accept 0 [end] + element 12341234 12341234 12341234 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -137,7 +137,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 34120000 34123412 34123412 : accept 0 [end] + element 00000000 00001234 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -145,7 +145,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 00000000 34123412 34123412 : accept 0 [end] + element 12340000 00000000 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -153,7 +153,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00000000 34120000 34123412 : accept 0 [end] + element 12341234 00000000 00001234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -161,7 +161,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00003412 00000000 34123412 : accept 0 [end] + element 12341234 12340000 00000000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -169,7 +169,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00000000 34120000 : accept 0 [end] + element 12341234 12341234 00000000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -177,7 +177,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00003412 00000000 : accept 0 [end] + element 12341234 12341234 12340000 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -185,7 +185,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 00000000 34123412 34123412 : accept 0 [end] + element 00000000 00000000 12341234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -193,7 +193,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 00000000 34120000 34123412 : accept 0 [end] + element 12340000 00000000 00001234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -201,7 +201,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00000000 00000000 34123412 : accept 0 [end] + element 12341234 00000000 00000000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -209,7 +209,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00003412 00000000 34120000 : accept 0 [end] + element 12341234 12340000 00000000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -217,7 +217,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 00000000 00000000 : accept 0 [end] + element 12341234 12341234 00000000 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -225,7 +225,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 00000000 34120000 34123412 : accept 0 [end] + element 00000000 00000000 00001234 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -233,7 +233,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 00000000 00000000 34123412 : accept 0 [end] + element 12340000 00000000 00000000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -241,7 +241,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00000000 00000000 34120000 : accept 0 [end] + element 12341234 00000000 00000000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -249,7 +249,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00003412 00000000 00000000 : accept 0 [end] + element 12341234 12340000 00000000 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -257,7 +257,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234:1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 00000000 00000000 34123412 : accept 0 [end] + element 00000000 00000000 00000000 12341234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -265,7 +265,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 00000000 00000000 34120000 : accept 0 [end] + element 12340000 00000000 00000000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -273,7 +273,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 00000000 00000000 00000000 : accept 0 [end] + element 12341234 00000000 00000000 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -281,7 +281,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::1234 : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00000000 00000000 00000000 34120000 : accept 0 [end] + element 00000000 00000000 00000000 00001234 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -289,7 +289,7 @@ ip6 test-ip6 input # ip6 saddr vmap { 1234:: : accept} __map%d test-ip6 b __map%d test-ip6 0 - element 00003412 00000000 00000000 00000000 : accept 0 [end] + element 12340000 00000000 00000000 00000000 : accept ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -297,7 +297,7 @@ ip6 test-ip6 input # ip6 saddr vmap { ::/64 : accept} __map%d test-ip6 f __map%d test-ip6 0 - element 00000000 00000000 00000000 00000000 : accept 0 [end] element 00000000 01000000 00000000 00000000 : 1 [end] + element 00000000 00000000 00000000 00000000 : accept element 00000000 00000001 00000000 00000000 flags 1 ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -305,7 +305,7 @@ ip6 test-ip6 input # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 aaaa0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000aaaa : drop ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -313,7 +313,7 @@ ip6 test-ip6 input # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 bbbb0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000bbbb : drop ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -321,7 +321,7 @@ ip6 test-ip6 input # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 cccc0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000cccc : drop ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -329,8 +329,7 @@ ip6 test-ip6 input # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} __map%d test-ip6 b __map%d test-ip6 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 dddd0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000dddd : drop ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] - diff --git a/tests/py/ip6/vmap.t.payload.netdev b/tests/py/ip6/vmap.t.payload.netdev index 4d81309b..ad3de534 100644 --- a/tests/py/ip6/vmap.t.payload.netdev +++ b/tests/py/ip6/vmap.t.payload.netdev @@ -1,420 +1,419 @@ # ip6 saddr vmap { abcd::3 : accept } __map%d test-netdev b __map%d test-netdev 0 - element 0000cdab 00000000 00000000 03000000 : accept 0 [end] + element abcd0000 00000000 00000000 00000003 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 34123412 : accept 0 [end] + element 12341234 12341234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34120000 34123412 34123412 34123412 : accept 0 [end] + element 00001234 12341234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 34123412 34123412 34123412 : accept 0 [end] + element 12340000 12341234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34120000 34123412 34123412 : accept 0 [end] + element 12341234 00001234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00003412 34123412 34123412 : accept 0 [end] + element 12341234 12340000 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34120000 34123412 : accept 0 [end] + element 12341234 12341234 00001234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00003412 34123412 : accept 0 [end] + element 12341234 12341234 12340000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 34120000 : accept 0 [end] + element 12341234 12341234 12341234 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 00003412 : accept 0 [end] + element 12341234 12341234 12341234 12340000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 34123412 34123412 34123412 : accept 0 [end] + element 00000000 12341234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 34120000 34123412 34123412 : accept 0 [end] + element 12340000 00001234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00000000 34123412 34123412 : accept 0 [end] + element 12341234 00000000 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00003412 34120000 34123412 : accept 0 [end] + element 12341234 12340000 00001234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00000000 34123412 : accept 0 [end] + element 12341234 12341234 00000000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00003412 34120000 : accept 0 [end] + element 12341234 12341234 12340000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 00000000 : accept 0 [end] + element 12341234 12341234 12341234 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 34120000 34123412 34123412 : accept 0 [end] + element 00000000 00001234 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 00000000 34123412 34123412 : accept 0 [end] + element 12340000 00000000 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00000000 34120000 34123412 : accept 0 [end] + element 12341234 00000000 00001234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00003412 00000000 34123412 : accept 0 [end] + element 12341234 12340000 00000000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00000000 34120000 : accept 0 [end] + element 12341234 12341234 00000000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00003412 00000000 : accept 0 [end] + element 12341234 12341234 12340000 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 00000000 34123412 34123412 : accept 0 [end] + element 00000000 00000000 12341234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 00000000 34120000 34123412 : accept 0 [end] + element 12340000 00000000 00001234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00000000 00000000 34123412 : accept 0 [end] + element 12341234 00000000 00000000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00003412 00000000 34120000 : accept 0 [end] + element 12341234 12340000 00000000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 00000000 00000000 : accept 0 [end] + element 12341234 12341234 00000000 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 00000000 34120000 34123412 : accept 0 [end] + element 00000000 00000000 00001234 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 00000000 00000000 34123412 : accept 0 [end] + element 12340000 00000000 00000000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00000000 00000000 34120000 : accept 0 [end] + element 12341234 00000000 00000000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00003412 00000000 00000000 : accept 0 [end] + element 12341234 12340000 00000000 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 00000000 00000000 34123412 : accept 0 [end] + element 00000000 00000000 00000000 12341234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 00000000 00000000 34120000 : accept 0 [end] + element 12340000 00000000 00000000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 00000000 00000000 00000000 : accept 0 [end] + element 12341234 00000000 00000000 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234 : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00000000 00000000 00000000 34120000 : accept 0 [end] + element 00000000 00000000 00000000 00001234 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:: : accept} __map%d test-netdev b __map%d test-netdev 0 - element 00003412 00000000 00000000 00000000 : accept 0 [end] + element 12340000 00000000 00000000 00000000 : accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::/64 : accept} __map%d test-netdev f __map%d test-netdev 0 - element 00000000 00000000 00000000 00000000 : accept 0 [end] element 00000000 01000000 00000000 00000000 : 1 [end] + element 00000000 00000000 00000000 00000000 : accept element 00000000 00000001 00000000 00000000 flags 1 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 aaaa0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000aaaa : drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 bbbb0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000bbbb : drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 cccc0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000cccc : drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} __map%d test-netdev b __map%d test-netdev 0 - element 34123412 34123412 34123412 0000aaaa : accept 0 [end] element 00000000 00000000 00000000 dddd0000 : drop 0 [end] + element 12341234 12341234 12341234 aaaa0000 : accept element 00000000 00000000 00000000 0000dddd : drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 8 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] - |