From 14b68bb14eb7360219e65120e41b0ee496b6b3da Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 13 May 2016 19:13:12 +0200 Subject: tests/py: update for changed set name in payload Original patch posted in the mailing list from Patrick, I have refreshed this so it applies on top of current HEAD. Signed-off-by: Pablo Neira Ayuso --- tests/py/ip6/icmpv6.t.payload.ip6 | 96 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'tests/py/ip6/icmpv6.t.payload.ip6') diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6 index d13b7991..4b6f5412 100644 --- a/tests/py/ip6/icmpv6.t.payload.ip6 +++ b/tests/py/ip6/icmpv6.t.payload.ip6 @@ -119,36 +119,36 @@ ip6 test-ip6 input [ immediate reg 0 accept ] # icmpv6 type {destination-unreachable, time-exceeded, nd-router-solicit} accept -set%d test-ip6 3 -set%d test-ip6 0 +__set%d test-ip6 3 +__set%d test-ip6 0 element 00000001 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # icmpv6 type {router-renumbering, mld-listener-reduction, time-exceeded, nd-router-solicit} accept -set%d test-ip6 3 -set%d test-ip6 0 +__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] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept -set%d test-ip6 3 -set%d test-ip6 0 +__set%d test-ip6 3 +__set%d test-ip6 0 element 00000082 : 0 [end] element 00000003 : 0 [end] element 00000086 : 0 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # icmpv6 code 4 @@ -167,25 +167,25 @@ ip6 test-ip6 input [ cmp lte reg 1 0x00000042 ] # icmpv6 code {5, 6, 7} accept -set%d test-ip6 3 -set%d test-ip6 0 +__set%d test-ip6 3 +__set%d test-ip6 0 element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # icmpv6 code { 3-66} -set%d test-ip6 7 -set%d test-ip6 0 +__set%d test-ip6 7 +__set%d test-ip6 0 element 00000000 : 1 [end] element 00000003 : 0 [end] element 00000043 : 1 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 checksum 2222 log ip6 test-ip6 input @@ -220,24 +220,24 @@ ip6 test-ip6 input [ log prefix (null) ] # icmpv6 checksum { 222, 226} -set%d test-ip6 3 -set%d test-ip6 0 +__set%d test-ip6 3 +__set%d test-ip6 0 element 0000de00 : 0 [end] element 0000e200 : 0 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 checksum { 222-226} -set%d test-ip6 7 -set%d test-ip6 0 +__set%d test-ip6 7 +__set%d test-ip6 0 element 00000000 : 1 [end] element 0000de00 : 0 [end] element 0000e300 : 1 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 mtu 22 ip6 test-ip6 input @@ -270,24 +270,24 @@ ip6 test-ip6 input [ cmp gt reg 1 0x2d000000 ] # icmpv6 mtu {33, 55, 67, 88} -set%d test-ip6 3 -set%d test-ip6 0 +__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 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 mtu {33-55} -set%d test-ip6 7 -set%d test-ip6 0 +__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 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 id 33-45 ip6 test-ip6 input @@ -306,24 +306,24 @@ ip6 test-ip6 input [ cmp gt reg 1 0x00002d00 ] # icmpv6 id {33, 55, 67, 88} -set%d test-ip6 3 -set%d test-ip6 0 +__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 [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 id {33-55} -set%d test-ip6 7 -set%d test-ip6 0 +__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 [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 sequence 2 ip6 test-ip6 input @@ -333,25 +333,25 @@ ip6 test-ip6 input [ cmp eq reg 1 0x00000200 ] # icmpv6 sequence {3, 4, 5, 6, 7} accept -set%d test-ip6 3 -set%d test-ip6 0 +__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] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # icmpv6 sequence {2, 4} -set%d test-ip6 3 -set%d test-ip6 0 +__set%d test-ip6 3 +__set%d test-ip6 0 element 00000200 : 0 [end] element 00000400 : 0 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 sequence 2-4 ip6 test-ip6 input @@ -370,14 +370,14 @@ ip6 test-ip6 input [ cmp gt reg 1 0x00000400 ] # icmpv6 sequence { 2-4} -set%d test-ip6 7 -set%d test-ip6 0 +__set%d test-ip6 7 +__set%d test-ip6 0 element 00000000 : 1 [end] element 00000200 : 0 [end] element 00000500 : 1 [end] ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 max-delay 33-45 ip6 test-ip6 input @@ -396,22 +396,22 @@ ip6 test-ip6 input [ cmp gt reg 1 0x00002d00 ] # icmpv6 max-delay {33, 55, 67, 88} -set%d test-ip6 3 -set%d test-ip6 0 +__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 [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # icmpv6 max-delay {33-55} -set%d test-ip6 7 -set%d test-ip6 0 +__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 [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000003a ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] -- cgit v1.2.3