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/ip/ip.t.payload.inet | 90 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'tests/py/ip/ip.t.payload.inet') diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet index 72b5e074..ef4692e3 100644 --- a/tests/py/ip/ip.t.payload.inet +++ b/tests/py/ip/ip.t.payload.inet @@ -31,15 +31,15 @@ inet test-inet input [ cmp neq reg 1 0x00000080 ] # ip dscp {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, ef} -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000060 : 0 [end] element 00000080 : 0 [end] element 000000a0 : 0 [end] element 000000c0 : 0 [end] element 000000e0 : 0 [end] element 00000000 : 0 [end] element 00000028 : 0 [end] element 00000030 : 0 [end] element 00000038 : 0 [end] element 00000048 : 0 [end] element 00000050 : 0 [end] element 00000058 : 0 [end] element 00000068 : 0 [end] element 00000070 : 0 [end] element 00000078 : 0 [end] element 00000088 : 0 [end] element 00000090 : 0 [end] element 00000098 : 0 [end] element 000000b8 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 1 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x000000fc ) ^ 0x00000000 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip length 232 inet test-inet input @@ -72,24 +72,24 @@ inet test-inet input [ cmp gt reg 1 0x0000c501 ] # ip length { 333, 553, 673, 838} -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00004d01 : 0 [end] element 00002902 : 0 [end] element 0000a102 : 0 [end] element 00004603 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip length { 333-535} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 00004d01 : 0 [end] element 00001802 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip id 22 inet test-inet input @@ -122,24 +122,24 @@ inet test-inet input [ cmp gt reg 1 0x00002d00 ] # ip id { 33, 55, 67, 88} -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip id { 33-55} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip frag-off 222 accept inet test-inet input @@ -173,24 +173,24 @@ inet test-inet input [ cmp gt reg 1 0x00002d00 ] # ip frag-off { 33, 55, 67, 88} -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip frag-off { 33-55} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip ttl 0 drop inet test-inet input @@ -224,24 +224,24 @@ inet test-inet input [ cmp gt reg 1 0x00000032 ] # ip ttl {43, 53, 45 } -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 0000002b : 0 [end] element 00000035 : 0 [end] element 0000002d : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 8 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip ttl { 33-55} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 8 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip protocol tcp inet test-inet input @@ -258,14 +258,14 @@ inet test-inet input [ cmp neq reg 1 0x00000006 ] # ip protocol { icmp, esp, ah, comp, udp, udplite, tcp, dccp, sctp} accept -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00000001 : 0 [end] 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] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # ip checksum 13172 drop @@ -307,24 +307,24 @@ inet test-inet input [ cmp gt reg 1 0x00002d00 ] # ip checksum { 33, 55, 67, 88} -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 10 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip checksum { 33-55} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 2b @ network header + 10 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip saddr 192.168.2.0/24 inet test-inet input @@ -404,24 +404,24 @@ inet test-inet input [ cmp gt reg 1 0xfa00a8c0 ] # ip daddr { 192.168.0.1-192.168.0.250} -set%d test-inet 7 -set%d test-inet 0 +__set%d test-inet 7 +__set%d test-inet 0 element 00000000 : 1 [end] element 0100a8c0 : 0 [end] element fb00a8c0 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip daddr { 192.168.5.1, 192.168.5.2, 192.168.5.3 } accept -set%d test-inet 3 -set%d test-inet 0 +__set%d test-inet 3 +__set%d test-inet 0 element 0105a8c0 : 0 [end] element 0205a8c0 : 0 [end] element 0305a8c0 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # ip daddr 192.168.1.2-192.168.1.55 @@ -503,8 +503,8 @@ inet test-inet input [ cmp eq reg 1 0x0000ffff ] # ip saddr . ip daddr . ip protocol { 1.1.1.1 . 2.2.2.2 . tcp, 1.1.1.1 . 3.3.3.3 . udp} -set%d test-ip 3 -set%d test-ip 0 +__set%d test-ip 3 +__set%d test-ip 0 element 01010101 02020202 00000006 : 0 [end] element 01010101 03030303 00000011 : 0 [end] inet test-ip input [ meta load nfproto => reg 1 ] @@ -512,7 +512,7 @@ inet test-ip input [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 1b @ network header + 9 => reg 10 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # ip version 4 ip hdrlength 5 inet test-inet input -- cgit v1.2.3