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/inet/tcp.t.payload.ip | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) (limited to 'tests/py/inet/tcp.t.payload.ip') diff --git a/tests/py/inet/tcp.t.payload.ip b/tests/py/inet/tcp.t.payload.ip index fb5316fb..75cbe70c 100644 --- a/tests/py/inet/tcp.t.payload.ip +++ b/tests/py/inet/tcp.t.payload.ip @@ -29,65 +29,65 @@ ip test-ip4 input [ cmp gt reg 1 0x00002d00 ] # tcp dport { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp dport { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp dport {telnet, http, https} accept -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00001700 : 0 [end] element 00005000 : 0 [end] element 0000bb01 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] # tcp dport vmap { 22 : accept, 23 : drop } -map%d test-ip4 b -map%d test-ip4 0 +__map%d test-ip4 b +__map%d test-ip4 0 element 00001600 : 0 [end] element 00001700 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # tcp dport vmap { 25:accept, 28:drop } -map%d test-ip4 b -map%d test-ip4 0 +__map%d test-ip4 b +__map%d test-ip4 0 element 00001900 : 0 [end] element 00001c00 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # tcp dport { 22, 53, 80, 110 } -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00001600 : 0 [end] element 00003500 : 0 [end] element 00005000 : 0 [end] element 00006e00 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp sport 22 ip test-ip4 input @@ -120,34 +120,34 @@ ip test-ip4 input [ cmp gt reg 1 0x00002d00 ] # tcp sport { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp sport { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp sport vmap { 25:accept, 28:drop } -map%d test-ip4 b -map%d test-ip4 0 +__map%d test-ip4 b +__map%d test-ip4 0 element 00001900 : 0 [end] element 00001c00 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # tcp sport 8080 drop ip test-ip4 input @@ -179,14 +179,14 @@ ip test-ip4 input [ cmp eq reg 1 0x16000004 0x00000000 ] # tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22 -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00000004 : 0 [end] element 0000fe03 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ payload load 6b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00001600 0x00000000 ] @@ -221,24 +221,24 @@ ip test-ip4 input [ cmp gt reg 1 0x2d000000 ] # tcp sequence { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp sequence { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp ackseq 42949672 drop ip test-ip4 input @@ -279,34 +279,34 @@ ip test-ip4 input [ cmp gt reg 1 0x2d000000 ] # tcp ackseq { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp ackseq { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp flags { fin, syn, rst, psh, ack, urg, ecn, cwr} drop -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00000001 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000008 : 0 [end] element 00000010 : 0 [end] element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000080 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] # tcp flags cwr @@ -362,24 +362,24 @@ ip test-ip4 input [ cmp gt reg 1 0x00002d00 ] # tcp window { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp window { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp checksum 22 ip test-ip4 input @@ -412,24 +412,24 @@ ip test-ip4 input [ cmp gt reg 1 0x00002d00 ] # tcp checksum { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp checksum { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp urgptr 1234 accept ip test-ip4 input @@ -470,24 +470,24 @@ ip test-ip4 input [ cmp gt reg 1 0x00002d00 ] # tcp urgptr { 33, 55, 67, 88} -set%d test-ip4 3 -set%d test-ip4 0 +__set%d test-ip4 3 +__set%d test-ip4 0 element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp urgptr { 33-55} -set%d test-ip4 7 -set%d test-ip4 0 +__set%d test-ip4 7 +__set%d test-ip4 0 element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ lookup reg 1 set set%d ] + [ lookup reg 1 set __set%d ] # tcp doff 8 ip test-ip4 input -- cgit v1.2.3