summaryrefslogtreecommitdiffstats
path: root/tests/py
diff options
context:
space:
mode:
authorStephen Suryaputra <ssuryaextr@gmail.com>2019-07-03 20:30:52 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2019-07-04 14:29:08 +0200
commit226a0e072d5c1edeb53cb61b959b011168c5c29a (patch)
tree07e43268efe15dc8b64b8ca9baca71e02239213f /tests/py
parent1694c01c30fba06461ca82ede070bf6a9cd9a4db (diff)
exthdr: add support for matching IPv4 options
Add capability to have rules matching IPv4 options. This is developed mainly to support dropping of IP packets with loose and/or strict source route route options. Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py')
-rw-r--r--tests/py/ip6/dst.t.payload.inet40
-rw-r--r--tests/py/ip6/dst.t.payload.ip640
-rw-r--r--tests/py/ip6/exthdr.t.payload.ip624
-rw-r--r--tests/py/ip6/frag.t.payload.inet70
-rw-r--r--tests/py/ip6/frag.t.payload.ip670
-rw-r--r--tests/py/ip6/hbh.t.payload.inet40
-rw-r--r--tests/py/ip6/hbh.t.payload.ip640
-rw-r--r--tests/py/ip6/mh.t.payload.inet82
-rw-r--r--tests/py/ip6/mh.t.payload.ip682
-rw-r--r--tests/py/ip6/rt.t.payload.inet76
-rw-r--r--tests/py/ip6/rt.t.payload.ip676
-rw-r--r--tests/py/ip6/srh.t.payload22
12 files changed, 331 insertions, 331 deletions
diff --git a/tests/py/ip6/dst.t.payload.inet b/tests/py/ip6/dst.t.payload.inet
index 768b4f1d..ff22237e 100644
--- a/tests/py/ip6/dst.t.payload.inet
+++ b/tests/py/ip6/dst.t.payload.inet
@@ -2,21 +2,21 @@
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# dst nexthdr != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# dst nexthdr 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -24,7 +24,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# dst nexthdr { 33, 55, 67, 88}
@@ -34,7 +34,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst nexthdr != { 33, 55, 67, 88}
@@ -44,7 +44,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dst nexthdr { 33-55}
@@ -54,7 +54,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst nexthdr != { 33-55}
@@ -64,7 +64,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ 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}
@@ -74,7 +74,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ 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}
@@ -84,42 +84,42 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# dst nexthdr != icmp
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# dst hdrlength 22
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# dst hdrlength != 233
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# dst hdrlength 33-45
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -127,7 +127,7 @@ ip6 test-ip6 input
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# dst hdrlength { 33, 55, 67, 88}
@@ -137,7 +137,7 @@ __set%d test-ip6 0
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst hdrlength != { 33, 55, 67, 88}
@@ -147,7 +147,7 @@ __set%d test-ip6 0
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dst hdrlength { 33-55}
@@ -157,7 +157,7 @@ __set%d test-ip6 0
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst hdrlength != { 33-55}
@@ -167,6 +167,6 @@ __set%d test-ip6 0
ip6 test-ip6 input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/dst.t.payload.ip6 b/tests/py/ip6/dst.t.payload.ip6
index 56afc126..9bf564cb 100644
--- a/tests/py/ip6/dst.t.payload.ip6
+++ b/tests/py/ip6/dst.t.payload.ip6
@@ -1,22 +1,22 @@
# dst nexthdr 22
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# dst nexthdr != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# dst nexthdr 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# dst nexthdr != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# dst nexthdr { 33, 55, 67, 88}
@@ -24,7 +24,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst nexthdr != { 33, 55, 67, 88}
@@ -32,7 +32,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dst nexthdr { 33-55}
@@ -40,7 +40,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst nexthdr != { 33-55}
@@ -48,7 +48,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ 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}
@@ -56,7 +56,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ 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}
@@ -64,38 +64,38 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dst nexthdr icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# dst nexthdr != icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# dst hdrlength 22
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# dst hdrlength != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# dst hdrlength 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# dst hdrlength != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# dst hdrlength { 33, 55, 67, 88}
@@ -103,7 +103,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst hdrlength != { 33, 55, 67, 88}
@@ -111,7 +111,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dst hdrlength { 33-55}
@@ -119,7 +119,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# dst hdrlength != { 33-55}
@@ -127,7 +127,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/exthdr.t.payload.ip6 b/tests/py/ip6/exthdr.t.payload.ip6
index 3b6bb621..be10d61e 100644
--- a/tests/py/ip6/exthdr.t.payload.ip6
+++ b/tests/py/ip6/exthdr.t.payload.ip6
@@ -1,60 +1,60 @@
# exthdr hbh exists
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr rt exists
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr frag exists
ip6 test-ip6 input
- [ exthdr load 1b @ 44 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr dst exists
ip6 test-ip6 input
- [ exthdr load 1b @ 60 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 60 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr mh exists
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr hbh missing
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# exthdr hbh == exists
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr hbh == missing
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# exthdr hbh != exists
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# exthdr hbh != missing
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp neq reg 1 0x00000000 ]
# exthdr hbh 1
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# exthdr hbh 0
ip6 test-ip6 input
- [ exthdr load 1b @ 0 + 0 present => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 present => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
diff --git a/tests/py/ip6/frag.t.payload.inet b/tests/py/ip6/frag.t.payload.inet
index 06305330..ef44f1ae 100644
--- a/tests/py/ip6/frag.t.payload.inet
+++ b/tests/py/ip6/frag.t.payload.inet
@@ -2,14 +2,14 @@
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
# frag nexthdr != icmp
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
@@ -19,7 +19,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
@@ -29,42 +29,42 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
# frag nexthdr ah
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
# frag reserved 22
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# frag reserved != 233
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# frag reserved 33-45
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -72,7 +72,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# frag reserved { 33, 55, 67, 88}
@@ -82,7 +82,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag reserved != { 33, 55, 67, 88}
@@ -92,7 +92,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag reserved { 33-55}
@@ -102,7 +102,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag reserved != { 33-55}
@@ -112,14 +112,14 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ 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 ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000b000 ]
@@ -127,7 +127,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00004807 ]
@@ -135,7 +135,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp gte reg 1 0x00000801 ]
[ cmp lte reg 1 0x00006801 ]
@@ -144,7 +144,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ range neq reg 1 0x00000801 0x00006801 ]
@@ -155,7 +155,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d ]
@@ -166,7 +166,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -177,7 +177,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d ]
@@ -188,7 +188,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -196,7 +196,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000001 ]
@@ -204,28 +204,28 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# frag id 22
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# frag id != 33
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp neq reg 1 0x21000000 ]
# frag id 33-45
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
[ cmp lte reg 1 0x2d000000 ]
@@ -233,7 +233,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
# frag id { 33, 55, 67, 88}
@@ -243,7 +243,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag id != { 33, 55, 67, 88}
@@ -253,7 +253,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag id { 33-55}
@@ -263,7 +263,7 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag id != { 33-55}
@@ -273,14 +273,14 @@ __set%d test-inet 0
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000006 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000002 ]
@@ -288,7 +288,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000000 ]
@@ -296,7 +296,7 @@ inet test-inet output
inet test-inet output
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000001 ]
diff --git a/tests/py/ip6/frag.t.payload.ip6 b/tests/py/ip6/frag.t.payload.ip6
index 6e86b8a9..940fb9f0 100644
--- a/tests/py/ip6/frag.t.payload.ip6
+++ b/tests/py/ip6/frag.t.payload.ip6
@@ -1,11 +1,11 @@
# frag nexthdr tcp
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
# frag nexthdr != icmp
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
@@ -13,7 +13,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag nexthdr != {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
@@ -21,38 +21,38 @@ __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]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag nexthdr esp
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
# frag nexthdr ah
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
# frag reserved 22
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# frag reserved != 233
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# frag reserved 33-45
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# frag reserved != 33-45
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# frag reserved { 33, 55, 67, 88}
@@ -60,7 +60,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag reserved != { 33, 55, 67, 88}
@@ -68,7 +68,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag reserved { 33-55}
@@ -76,7 +76,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag reserved != { 33-55}
@@ -84,31 +84,31 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag frag-off 22
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000b000 ]
# frag frag-off != 233
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00004807 ]
# frag frag-off 33-45
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ cmp gte reg 1 0x00000801 ]
[ cmp lte reg 1 0x00006801 ]
# frag frag-off != 33-45
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ range neq reg 1 0x00000801 0x00006801 ]
@@ -117,7 +117,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d ]
@@ -126,7 +126,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -135,7 +135,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000801 : 0 [end] element 0000b901 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d ]
@@ -144,40 +144,40 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000801 : 0 [end] element 0000b901 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 2b @ 44 + 2 => reg 1 ]
+ [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag more-fragments 1
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000001 ]
# frag id 1
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# frag id 22
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# frag id != 33
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp neq reg 1 0x21000000 ]
# frag id 33-45
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
[ cmp lte reg 1 0x2d000000 ]
# frag id != 33-45
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
# frag id { 33, 55, 67, 88}
@@ -185,7 +185,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag id != { 33, 55, 67, 88}
@@ -193,7 +193,7 @@ __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]
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag id { 33-55}
@@ -201,7 +201,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# frag id != { 33-55}
@@ -209,24 +209,24 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 output
- [ exthdr load 4b @ 44 + 4 => reg 1 ]
+ [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# frag reserved2 1
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000006 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000002 ]
# frag more-fragments 0
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000000 ]
# frag more-fragments 1
ip6 test-ip6 output
- [ exthdr load 1b @ 44 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 44 + 3 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
[ cmp eq reg 1 0x00000001 ]
diff --git a/tests/py/ip6/hbh.t.payload.inet b/tests/py/ip6/hbh.t.payload.inet
index cf7e3535..e358351d 100644
--- a/tests/py/ip6/hbh.t.payload.inet
+++ b/tests/py/ip6/hbh.t.payload.inet
@@ -2,21 +2,21 @@
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# hbh hdrlength != 233
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# hbh hdrlength 33-45
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -24,7 +24,7 @@ inet test-inet filter-input
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# hbh hdrlength {33, 55, 67, 88}
@@ -34,7 +34,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh hdrlength != {33, 55, 67, 88}
@@ -44,7 +44,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh hdrlength { 33-55}
@@ -54,7 +54,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh hdrlength != { 33-55}
@@ -64,7 +64,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ 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}
@@ -74,7 +74,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ 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}
@@ -84,28 +84,28 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# hbh nexthdr != 233
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# hbh nexthdr 33-45
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -113,7 +113,7 @@ inet test-inet filter-input
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# hbh nexthdr {33, 55, 67, 88}
@@ -123,7 +123,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh nexthdr != {33, 55, 67, 88}
@@ -133,7 +133,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh nexthdr { 33-55}
@@ -143,7 +143,7 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh nexthdr != { 33-55}
@@ -153,20 +153,20 @@ __set%d test-inet 0
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# hbh nexthdr != ip
inet test-inet filter-input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000000 ]
diff --git a/tests/py/ip6/hbh.t.payload.ip6 b/tests/py/ip6/hbh.t.payload.ip6
index 93522c41..a4b131a5 100644
--- a/tests/py/ip6/hbh.t.payload.ip6
+++ b/tests/py/ip6/hbh.t.payload.ip6
@@ -1,22 +1,22 @@
# hbh hdrlength 22
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# hbh hdrlength != 233
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# hbh hdrlength 33-45
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# hbh hdrlength != 33-45
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# hbh hdrlength {33, 55, 67, 88}
@@ -24,7 +24,7 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh hdrlength != {33, 55, 67, 88}
@@ -32,7 +32,7 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh hdrlength { 33-55}
@@ -40,7 +40,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh hdrlength != { 33-55}
@@ -48,7 +48,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 1 => reg 1 ]
+ [ 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}
@@ -56,7 +56,7 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ 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}
@@ -64,28 +64,28 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh nexthdr 22
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# hbh nexthdr != 233
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# hbh nexthdr 33-45
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# hbh nexthdr != 33-45
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# hbh nexthdr {33, 55, 67, 88}
@@ -93,7 +93,7 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh nexthdr != {33, 55, 67, 88}
@@ -101,7 +101,7 @@ __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]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh nexthdr { 33-55}
@@ -109,7 +109,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# hbh nexthdr != { 33-55}
@@ -117,16 +117,16 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# hbh nexthdr ip
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# hbh nexthdr != ip
ip6 test-ip6 filter-input
- [ exthdr load 1b @ 0 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 0 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000000 ]
diff --git a/tests/py/ip6/mh.t.payload.inet b/tests/py/ip6/mh.t.payload.inet
index 24335b19..2c473fbd 100644
--- a/tests/py/ip6/mh.t.payload.inet
+++ b/tests/py/ip6/mh.t.payload.inet
@@ -2,14 +2,14 @@
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# mh nexthdr != 1
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp }
@@ -19,7 +19,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ 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 }
@@ -29,42 +29,42 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# mh nexthdr != icmp
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# mh nexthdr 22
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh nexthdr != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh nexthdr 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -72,7 +72,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh nexthdr { 33, 55, 67, 88 }
@@ -82,7 +82,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh nexthdr != { 33, 55, 67, 88 }
@@ -92,7 +92,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh nexthdr { 33-55 }
@@ -102,7 +102,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh nexthdr != { 33-55 }
@@ -112,28 +112,28 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh hdrlength != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh hdrlength 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -141,7 +141,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh hdrlength { 33, 55, 67, 88 }
@@ -151,7 +151,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh hdrlength != { 33, 55, 67, 88 }
@@ -161,7 +161,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh hdrlength { 33-55 }
@@ -171,7 +171,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh hdrlength != { 33-55 }
@@ -181,7 +181,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ 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}
@@ -191,42 +191,42 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ]
[ cmp eq reg 1 0x0000000c ]
# mh type != home-agent-switch-message
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ]
[ cmp neq reg 1 0x0000000c ]
# mh reserved 22
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh reserved != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh reserved 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -234,7 +234,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh reserved { 33, 55, 67, 88}
@@ -244,7 +244,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh reserved != { 33, 55, 67, 88}
@@ -254,7 +254,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh reserved { 33-55}
@@ -264,7 +264,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh reserved != { 33-55}
@@ -274,28 +274,28 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ 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 ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# mh checksum != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# mh checksum 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
[ cmp lte reg 1 0x00002d00 ]
@@ -303,7 +303,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
# mh checksum { 33, 55, 67, 88}
@@ -313,7 +313,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh checksum != { 33, 55, 67, 88}
@@ -323,7 +323,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh checksum { 33-55}
@@ -333,7 +333,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh checksum != { 33-55}
@@ -343,6 +343,6 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ 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 d19b6e69..93744dac 100644
--- a/tests/py/ip6/mh.t.payload.ip6
+++ b/tests/py/ip6/mh.t.payload.ip6
@@ -1,11 +1,11 @@
# mh nexthdr 1
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# mh nexthdr != 1
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp }
@@ -13,7 +13,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ 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 }
@@ -21,38 +21,38 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh nexthdr icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# mh nexthdr != icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# mh nexthdr 22
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh nexthdr != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh nexthdr 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# mh nexthdr != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh nexthdr { 33, 55, 67, 88 }
@@ -60,7 +60,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh nexthdr != { 33, 55, 67, 88 }
@@ -68,7 +68,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh nexthdr { 33-55 }
@@ -76,7 +76,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh nexthdr != { 33-55 }
@@ -84,28 +84,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh hdrlength 22
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh hdrlength != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh hdrlength 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# mh hdrlength != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh hdrlength { 33, 55, 67, 88 }
@@ -113,7 +113,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh hdrlength != { 33, 55, 67, 88 }
@@ -121,7 +121,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh hdrlength { 33-55 }
@@ -129,7 +129,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh hdrlength != { 33-55 }
@@ -137,7 +137,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 1 => reg 1 ]
+ [ 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}
@@ -145,38 +145,38 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh type home-agent-switch-message
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ]
[ cmp eq reg 1 0x0000000c ]
# mh type != home-agent-switch-message
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 2 => reg 1 ]
[ cmp neq reg 1 0x0000000c ]
# mh reserved 22
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# mh reserved != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# mh reserved 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# mh reserved != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# mh reserved { 33, 55, 67, 88}
@@ -184,7 +184,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh reserved != { 33, 55, 67, 88}
@@ -192,7 +192,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh reserved { 33-55}
@@ -200,7 +200,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh reserved != { 33-55}
@@ -208,28 +208,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 135 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 135 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh checksum 22
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# mh checksum != 233
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# mh checksum 33-45
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
[ cmp lte reg 1 0x00002d00 ]
# mh checksum != 33-45
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
# mh checksum { 33, 55, 67, 88}
@@ -237,7 +237,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh checksum != { 33, 55, 67, 88}
@@ -245,7 +245,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# mh checksum { 33-55}
@@ -253,7 +253,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# mh checksum != { 33-55}
@@ -261,6 +261,6 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 2b @ 135 + 4 => reg 1 ]
+ [ exthdr load ipv6 2b @ 135 + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/rt.t.payload.inet b/tests/py/ip6/rt.t.payload.inet
index 8fb717f0..eafb4a00 100644
--- a/tests/py/ip6/rt.t.payload.inet
+++ b/tests/py/ip6/rt.t.payload.inet
@@ -2,14 +2,14 @@
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# rt nexthdr != 1
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
@@ -19,7 +19,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ 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}
@@ -29,42 +29,42 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# rt nexthdr != icmp
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# rt nexthdr 22
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt nexthdr != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt nexthdr 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -72,7 +72,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt nexthdr { 33, 55, 67, 88}
@@ -82,7 +82,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt nexthdr != { 33, 55, 67, 88}
@@ -92,7 +92,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt nexthdr { 33-55}
@@ -102,7 +102,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt nexthdr != { 33-55}
@@ -112,28 +112,28 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt hdrlength != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt hdrlength 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -141,7 +141,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt hdrlength { 33, 55, 67, 88}
@@ -151,7 +151,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt hdrlength != { 33, 55, 67, 88}
@@ -161,7 +161,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt hdrlength { 33-55}
@@ -171,7 +171,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt hdrlength != { 33-55}
@@ -181,28 +181,28 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt type != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt type 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -210,7 +210,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt type { 33, 55, 67, 88}
@@ -220,7 +220,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt type != { 33, 55, 67, 88}
@@ -230,7 +230,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt type { 33-55}
@@ -240,7 +240,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt type != { 33-55}
@@ -250,28 +250,28 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ 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 ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt seg-left != 233
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt seg-left 33-45
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
@@ -279,7 +279,7 @@ inet test-inet input
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt seg-left { 33, 55, 67, 88}
@@ -289,7 +289,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt seg-left != { 33, 55, 67, 88}
@@ -299,7 +299,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt seg-left { 33-55}
@@ -309,7 +309,7 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt seg-left != { 33-55}
@@ -319,6 +319,6 @@ __set%d test-inet 0
inet test-inet input
[ meta load nfproto => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ 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 5a574630..929cf9e1 100644
--- a/tests/py/ip6/rt.t.payload.ip6
+++ b/tests/py/ip6/rt.t.payload.ip6
@@ -1,11 +1,11 @@
# rt nexthdr 1
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# rt nexthdr != 1
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
@@ -13,7 +13,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ 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}
@@ -21,38 +21,38 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt nexthdr icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# rt nexthdr != icmp
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x00000001 ]
# rt nexthdr 22
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt nexthdr != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt nexthdr 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# rt nexthdr != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt nexthdr { 33, 55, 67, 88}
@@ -60,7 +60,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt nexthdr != { 33, 55, 67, 88}
@@ -68,7 +68,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt nexthdr { 33-55}
@@ -76,7 +76,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt nexthdr != { 33-55}
@@ -84,28 +84,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 0 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt hdrlength 22
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt hdrlength != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt hdrlength 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# rt hdrlength != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt hdrlength { 33, 55, 67, 88}
@@ -113,7 +113,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt hdrlength != { 33, 55, 67, 88}
@@ -121,7 +121,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt hdrlength { 33-55}
@@ -129,7 +129,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt hdrlength != { 33-55}
@@ -137,28 +137,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 1 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt type 22
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt type != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt type 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# rt type != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt type { 33, 55, 67, 88}
@@ -166,7 +166,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt type != { 33, 55, 67, 88}
@@ -174,7 +174,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt type { 33-55}
@@ -182,7 +182,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt type != { 33-55}
@@ -190,28 +190,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 2 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt seg-left 22
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp eq reg 1 0x00000016 ]
# rt seg-left != 233
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp neq reg 1 0x000000e9 ]
# rt seg-left 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
[ cmp lte reg 1 0x0000002d ]
# rt seg-left != 33-45
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ range neq reg 1 0x00000021 0x0000002d ]
# rt seg-left { 33, 55, 67, 88}
@@ -219,7 +219,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt seg-left != { 33, 55, 67, 88}
@@ -227,7 +227,7 @@ __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]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# rt seg-left { 33-55}
@@ -235,7 +235,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d ]
# rt seg-left != { 33-55}
@@ -243,6 +243,6 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 3 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 3 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/srh.t.payload b/tests/py/ip6/srh.t.payload
index a2a46f13..b6247456 100644
--- a/tests/py/ip6/srh.t.payload
+++ b/tests/py/ip6/srh.t.payload
@@ -1,11 +1,11 @@
# srh last-entry 0
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 4 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# srh last-entry 127
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 4 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ]
[ cmp eq reg 1 0x0000007f ]
# srh last-entry { 0, 4-127, 255 }
@@ -13,17 +13,17 @@ __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 = {
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 4 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
# srh flags 0
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 5 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# srh flags 127
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 5 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ]
[ cmp eq reg 1 0x0000007f ]
# srh flags { 0, 4-127, 255 }
@@ -31,17 +31,17 @@ __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 = {
ip6 test-ip6 input
- [ exthdr load 1b @ 43 + 5 => reg 1 ]
+ [ exthdr load ipv6 1b @ 43 + 5 => reg 1 ]
[ lookup reg 1 set __set%d ]
# srh tag 0
ip6 test-ip6 input
- [ exthdr load 2b @ 43 + 6 => reg 1 ]
+ [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# srh tag 127
ip6 test-ip6 input
- [ exthdr load 2b @ 43 + 6 => reg 1 ]
+ [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ]
[ cmp eq reg 1 0x00007f00 ]
# srh tag { 0, 4-127, 0xffff }
@@ -49,16 +49,16 @@ __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 = {
ip6 test-ip6 input
- [ exthdr load 2b @ 43 + 6 => reg 1 ]
+ [ exthdr load ipv6 2b @ 43 + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
# srh sid[1] dead::beef
ip6 test-ip6 input
- [ exthdr load 16b @ 43 + 8 => reg 1 ]
+ [ exthdr load ipv6 16b @ 43 + 8 => reg 1 ]
[ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ]
# srh sid[2] dead::beef
ip6 test-ip6 input
- [ exthdr load 16b @ 43 + 24 => reg 1 ]
+ [ exthdr load ipv6 16b @ 43 + 24 => reg 1 ]
[ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ]