From 3ed932917cc744b489bd2706a55a1778b0b50c0e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Sep 2016 19:25:25 +0200 Subject: src: use new range expression for != [a,b] intervals Use new range expression in the kernel to fix wrong bytecode generation. This patch also adjust tests so we don't hit problems there. Signed-off-by: Pablo Neira Ayuso --- tests/py/inet/ah.t.payload.inet | 12 ++++-------- tests/py/inet/ah.t.payload.ip | 12 ++++-------- tests/py/inet/ah.t.payload.ip6 | 12 ++++-------- tests/py/inet/ah.t.payload.netdev | 12 ++++-------- tests/py/inet/comp.t.payload.inet | 6 ++---- tests/py/inet/comp.t.payload.ip | 6 ++---- tests/py/inet/comp.t.payload.ip6 | 6 ++---- tests/py/inet/comp.t.payload.netdev | 6 ++---- tests/py/inet/dccp.t.payload.inet | 3 +-- tests/py/inet/dccp.t.payload.ip | 3 +-- tests/py/inet/dccp.t.payload.ip6 | 3 +-- tests/py/inet/dccp.t.payload.netdev | 3 +-- tests/py/inet/esp.t.payload.inet | 6 ++---- tests/py/inet/esp.t.payload.ip | 6 ++---- tests/py/inet/esp.t.payload.ip6 | 6 ++---- tests/py/inet/esp.t.payload.netdev | 6 ++---- tests/py/inet/sctp.t.payload.inet | 12 ++++-------- tests/py/inet/sctp.t.payload.ip | 12 ++++-------- tests/py/inet/sctp.t.payload.ip6 | 12 ++++-------- tests/py/inet/sctp.t.payload.netdev | 12 ++++-------- tests/py/inet/tcp.t.payload.inet | 21 +++++++-------------- tests/py/inet/tcp.t.payload.ip | 21 +++++++-------------- tests/py/inet/tcp.t.payload.ip6 | 21 +++++++-------------- tests/py/inet/tcp.t.payload.netdev | 21 +++++++-------------- tests/py/inet/udp.t.payload.inet | 12 ++++-------- tests/py/inet/udp.t.payload.ip | 12 ++++-------- tests/py/inet/udp.t.payload.ip6 | 12 ++++-------- tests/py/inet/udp.t.payload.netdev | 12 ++++-------- tests/py/inet/udplite.t.payload.inet | 9 +++------ tests/py/inet/udplite.t.payload.ip | 9 +++------ tests/py/inet/udplite.t.payload.ip6 | 9 +++------ tests/py/inet/udplite.t.payload.netdev | 9 +++------ 32 files changed, 108 insertions(+), 216 deletions(-) (limited to 'tests/py/inet') diff --git a/tests/py/inet/ah.t.payload.inet b/tests/py/inet/ah.t.payload.inet index 739386a3..1e56797f 100644 --- a/tests/py/inet/ah.t.payload.inet +++ b/tests/py/inet/ah.t.payload.inet @@ -11,8 +11,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x0000000b ] - [ cmp gt reg 1 0x00000017 ] + [ range neq reg 1 0x0000000b 0x00000017 ] # ah hdrlength { 11-23} __set%d test-inet 7 @@ -61,8 +60,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # ah reserved {23, 100} __set%d test-inet 3 @@ -111,8 +109,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # ah spi {111, 122} __set%d test-inet 3 @@ -181,6 +178,5 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x17000000 ] - [ cmp gt reg 1 0x21000000 ] + [ range neq reg 1 0x17000000 0x21000000 ] diff --git a/tests/py/inet/ah.t.payload.ip b/tests/py/inet/ah.t.payload.ip index b9899488..5ad0041c 100644 --- a/tests/py/inet/ah.t.payload.ip +++ b/tests/py/inet/ah.t.payload.ip @@ -11,8 +11,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x0000000b ] - [ cmp gt reg 1 0x00000017 ] + [ range neq reg 1 0x0000000b 0x00000017 ] # ah hdrlength { 11-23} __set%d test-ip4 7 @@ -61,8 +60,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # ah reserved {23, 100} __set%d test-ip4 3 @@ -111,8 +109,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # ah spi {111, 122} __set%d test-ip4 3 @@ -181,6 +178,5 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x17000000 ] - [ cmp gt reg 1 0x21000000 ] + [ range neq reg 1 0x17000000 0x21000000 ] diff --git a/tests/py/inet/ah.t.payload.ip6 b/tests/py/inet/ah.t.payload.ip6 index 95eae665..c57a28a8 100644 --- a/tests/py/inet/ah.t.payload.ip6 +++ b/tests/py/inet/ah.t.payload.ip6 @@ -11,8 +11,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x0000000b ] - [ cmp gt reg 1 0x00000017 ] + [ range neq reg 1 0x0000000b 0x00000017 ] # ah hdrlength { 11-23} __set%d test-ip6 7 @@ -61,8 +60,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # ah reserved {23, 100} __set%d test-ip6 3 @@ -111,8 +109,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # ah spi {111, 122} __set%d test-ip6 3 @@ -181,6 +178,5 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x17000000 ] - [ cmp gt reg 1 0x21000000 ] + [ range neq reg 1 0x17000000 0x21000000 ] diff --git a/tests/py/inet/ah.t.payload.netdev b/tests/py/inet/ah.t.payload.netdev index 55eea136..e06811d2 100644 --- a/tests/py/inet/ah.t.payload.netdev +++ b/tests/py/inet/ah.t.payload.netdev @@ -11,8 +11,7 @@ netdev test-netdev ingress [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x0000000b ] - [ cmp gt reg 1 0x00000017 ] + [ range neq reg 1 0x0000000b 0x00000017 ] # ah hdrlength { 11-23} __set%d test-netdev 7 @@ -61,8 +60,7 @@ netdev test-netdev ingress [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # ah reserved {23, 100} __set%d test-netdev 3 @@ -111,8 +109,7 @@ netdev test-netdev ingress [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # ah spi {111, 122} __set%d test-netdev 3 @@ -181,6 +178,5 @@ netdev test-netdev ingress [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000033 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x17000000 ] - [ cmp gt reg 1 0x21000000 ] + [ range neq reg 1 0x17000000 0x21000000 ] diff --git a/tests/py/inet/comp.t.payload.inet b/tests/py/inet/comp.t.payload.inet index eff32b7e..cdeba2bd 100644 --- a/tests/py/inet/comp.t.payload.inet +++ b/tests/py/inet/comp.t.payload.inet @@ -32,8 +32,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x00000033 ] - [ cmp gt reg 1 0x00000045 ] + [ range neq reg 1 0x00000033 0x00000045 ] # comp flags {0x33, 0x55, 0x67, 0x88} __set%d test-inet 3 @@ -82,8 +81,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # comp cpi {33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/comp.t.payload.ip b/tests/py/inet/comp.t.payload.ip index b2a8ab40..9da8f94d 100644 --- a/tests/py/inet/comp.t.payload.ip +++ b/tests/py/inet/comp.t.payload.ip @@ -32,8 +32,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x00000033 ] - [ cmp gt reg 1 0x00000045 ] + [ range neq reg 1 0x00000033 0x00000045 ] # comp flags {0x33, 0x55, 0x67, 0x88} __set%d test-ip4 3 @@ -82,8 +81,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # comp cpi {33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/comp.t.payload.ip6 b/tests/py/inet/comp.t.payload.ip6 index f1799987..69a13ede 100644 --- a/tests/py/inet/comp.t.payload.ip6 +++ b/tests/py/inet/comp.t.payload.ip6 @@ -32,8 +32,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x00000033 ] - [ cmp gt reg 1 0x00000045 ] + [ range neq reg 1 0x00000033 0x00000045 ] # comp flags {0x33, 0x55, 0x67, 0x88} __set%d test-ip6 3 @@ -82,8 +81,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # comp cpi {33, 55, 67, 88} __set%d test-ip6 3 diff --git a/tests/py/inet/comp.t.payload.netdev b/tests/py/inet/comp.t.payload.netdev index eff32b7e..cdeba2bd 100644 --- a/tests/py/inet/comp.t.payload.netdev +++ b/tests/py/inet/comp.t.payload.netdev @@ -32,8 +32,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp lt reg 1 0x00000033 ] - [ cmp gt reg 1 0x00000045 ] + [ range neq reg 1 0x00000033 0x00000045 ] # comp flags {0x33, 0x55, 0x67, 0x88} __set%d test-inet 3 @@ -82,8 +81,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x0000006c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # comp cpi {33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/dccp.t.payload.inet b/tests/py/inet/dccp.t.payload.inet index f5aacf68..ccba6d0e 100644 --- a/tests/py/inet/dccp.t.payload.inet +++ b/tests/py/inet/dccp.t.payload.inet @@ -11,8 +11,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000021 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001500 ] - [ cmp gt reg 1 0x00002300 ] + [ range neq reg 1 0x00001500 0x00002300 ] # dccp sport {23, 24, 25} __set%d test-inet 3 diff --git a/tests/py/inet/dccp.t.payload.ip b/tests/py/inet/dccp.t.payload.ip index bda8dfd4..a02247fd 100644 --- a/tests/py/inet/dccp.t.payload.ip +++ b/tests/py/inet/dccp.t.payload.ip @@ -11,8 +11,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000021 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001500 ] - [ cmp gt reg 1 0x00002300 ] + [ range neq reg 1 0x00001500 0x00002300 ] # dccp sport {23, 24, 25} __set%d test-ip4 3 diff --git a/tests/py/inet/dccp.t.payload.ip6 b/tests/py/inet/dccp.t.payload.ip6 index f78f9830..c81a3a03 100644 --- a/tests/py/inet/dccp.t.payload.ip6 +++ b/tests/py/inet/dccp.t.payload.ip6 @@ -11,8 +11,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000021 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001500 ] - [ cmp gt reg 1 0x00002300 ] + [ range neq reg 1 0x00001500 0x00002300 ] # dccp sport {23, 24, 25} __set%d test-ip4 3 diff --git a/tests/py/inet/dccp.t.payload.netdev b/tests/py/inet/dccp.t.payload.netdev index abed6b25..abb1fb9d 100644 --- a/tests/py/inet/dccp.t.payload.netdev +++ b/tests/py/inet/dccp.t.payload.netdev @@ -11,8 +11,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000021 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001500 ] - [ cmp gt reg 1 0x00002300 ] + [ range neq reg 1 0x00001500 0x00002300 ] # dccp sport {23, 24, 25} __set%d test-inet 3 diff --git a/tests/py/inet/esp.t.payload.inet b/tests/py/inet/esp.t.payload.inet index 5f3a0da9..d41f7664 100644 --- a/tests/py/inet/esp.t.payload.inet +++ b/tests/py/inet/esp.t.payload.inet @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # esp spi { 100, 102} __set%d test-inet 3 @@ -68,8 +67,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x16000000 ] - [ cmp gt reg 1 0x18000000 ] + [ range neq reg 1 0x16000000 0x18000000 ] # esp sequence { 22, 24} __set%d test-inet 3 diff --git a/tests/py/inet/esp.t.payload.ip b/tests/py/inet/esp.t.payload.ip index cf526781..5de41aeb 100644 --- a/tests/py/inet/esp.t.payload.ip +++ b/tests/py/inet/esp.t.payload.ip @@ -25,8 +25,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # esp spi { 100, 102} __set%d test-ip4 3 @@ -68,8 +67,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x16000000 ] - [ cmp gt reg 1 0x18000000 ] + [ range neq reg 1 0x16000000 0x18000000 ] # esp sequence { 22, 24} __set%d test-ip4 3 diff --git a/tests/py/inet/esp.t.payload.ip6 b/tests/py/inet/esp.t.payload.ip6 index 982412d2..0bc2e70c 100644 --- a/tests/py/inet/esp.t.payload.ip6 +++ b/tests/py/inet/esp.t.payload.ip6 @@ -25,8 +25,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # esp spi { 100, 102} __set%d test-ip6 3 @@ -68,8 +67,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x16000000 ] - [ cmp gt reg 1 0x18000000 ] + [ range neq reg 1 0x16000000 0x18000000 ] # esp sequence { 22, 24} __set%d test-ip6 3 diff --git a/tests/py/inet/esp.t.payload.netdev b/tests/py/inet/esp.t.payload.netdev index 5f3a0da9..d41f7664 100644 --- a/tests/py/inet/esp.t.payload.netdev +++ b/tests/py/inet/esp.t.payload.netdev @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x6f000000 ] - [ cmp gt reg 1 0xde000000 ] + [ range neq reg 1 0x6f000000 0xde000000 ] # esp spi { 100, 102} __set%d test-inet 3 @@ -68,8 +67,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000032 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x16000000 ] - [ cmp gt reg 1 0x18000000 ] + [ range neq reg 1 0x16000000 0x18000000 ] # esp sequence { 22, 24} __set%d test-inet 3 diff --git a/tests/py/inet/sctp.t.payload.inet b/tests/py/inet/sctp.t.payload.inet index 9c68a8cc..bc7fe7ce 100644 --- a/tests/py/inet/sctp.t.payload.inet +++ b/tests/py/inet/sctp.t.payload.inet @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp sport { 23, 24, 25} __set%d test-inet 3 @@ -75,8 +74,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp dport { 23, 24, 25} __set%d test-inet 3 @@ -125,8 +123,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x20000000 ] - [ cmp gt reg 1 0x6f000000 ] + [ range neq reg 1 0x20000000 0x6f000000 ] # sctp checksum { 22, 33, 44} __set%d test-inet 3 @@ -175,8 +172,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # sctp vtag {33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/sctp.t.payload.ip b/tests/py/inet/sctp.t.payload.ip index 6e07a4c5..fa6ea435 100644 --- a/tests/py/inet/sctp.t.payload.ip +++ b/tests/py/inet/sctp.t.payload.ip @@ -25,8 +25,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp sport { 23, 24, 25} __set%d test-ip4 3 @@ -75,8 +74,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp dport { 23, 24, 25} __set%d test-ip4 3 @@ -125,8 +123,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x20000000 ] - [ cmp gt reg 1 0x6f000000 ] + [ range neq reg 1 0x20000000 0x6f000000 ] # sctp checksum { 22, 33, 44} __set%d test-ip4 3 @@ -175,8 +172,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # sctp vtag {33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/sctp.t.payload.ip6 b/tests/py/inet/sctp.t.payload.ip6 index 579609b7..5d113692 100644 --- a/tests/py/inet/sctp.t.payload.ip6 +++ b/tests/py/inet/sctp.t.payload.ip6 @@ -25,8 +25,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp sport { 23, 24, 25} __set%d test-ip6 3 @@ -75,8 +74,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp dport { 23, 24, 25} __set%d test-ip6 3 @@ -125,8 +123,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x20000000 ] - [ cmp gt reg 1 0x6f000000 ] + [ range neq reg 1 0x20000000 0x6f000000 ] # sctp checksum { 22, 33, 44} __set%d test-ip6 3 @@ -175,8 +172,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # sctp vtag {33, 55, 67, 88} __set%d test-ip6 3 diff --git a/tests/py/inet/sctp.t.payload.netdev b/tests/py/inet/sctp.t.payload.netdev index 9c68a8cc..bc7fe7ce 100644 --- a/tests/py/inet/sctp.t.payload.netdev +++ b/tests/py/inet/sctp.t.payload.netdev @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp sport { 23, 24, 25} __set%d test-inet 3 @@ -75,8 +74,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00001700 ] - [ cmp gt reg 1 0x00002c00 ] + [ range neq reg 1 0x00001700 0x00002c00 ] # sctp dport { 23, 24, 25} __set%d test-inet 3 @@ -125,8 +123,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x20000000 ] - [ cmp gt reg 1 0x6f000000 ] + [ range neq reg 1 0x20000000 0x6f000000 ] # sctp checksum { 22, 33, 44} __set%d test-inet 3 @@ -175,8 +172,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000084 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # sctp vtag {33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/tcp.t.payload.inet b/tests/py/inet/tcp.t.payload.inet index 9c3fbbf0..354d013d 100644 --- a/tests/py/inet/tcp.t.payload.inet +++ b/tests/py/inet/tcp.t.payload.inet @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp dport { 33, 55, 67, 88} __set%d test-inet 3 @@ -116,8 +115,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp sport { 33, 55, 67, 88} __set%d test-inet 3 @@ -217,8 +215,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp sequence { 33, 55, 67, 88} __set%d test-inet 3 @@ -275,8 +272,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp ackseq { 33, 55, 67, 88} __set%d test-inet 3 @@ -358,8 +354,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp window { 33, 55, 67, 88} __set%d test-inet 3 @@ -408,8 +403,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp checksum { 33, 55, 67, 88} __set%d test-inet 3 @@ -466,8 +460,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp urgptr { 33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/tcp.t.payload.ip b/tests/py/inet/tcp.t.payload.ip index 75cbe70c..d70a176a 100644 --- a/tests/py/inet/tcp.t.payload.ip +++ b/tests/py/inet/tcp.t.payload.ip @@ -25,8 +25,7 @@ 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 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp dport { 33, 55, 67, 88} __set%d test-ip4 3 @@ -116,8 +115,7 @@ 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 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp sport { 33, 55, 67, 88} __set%d test-ip4 3 @@ -217,8 +215,7 @@ 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 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp sequence { 33, 55, 67, 88} __set%d test-ip4 3 @@ -275,8 +272,7 @@ 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 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp ackseq { 33, 55, 67, 88} __set%d test-ip4 3 @@ -358,8 +354,7 @@ 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 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp window { 33, 55, 67, 88} __set%d test-ip4 3 @@ -408,8 +403,7 @@ 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 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp checksum { 33, 55, 67, 88} __set%d test-ip4 3 @@ -466,8 +460,7 @@ 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 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp urgptr { 33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/tcp.t.payload.ip6 b/tests/py/inet/tcp.t.payload.ip6 index f65f9b87..4e9c4135 100644 --- a/tests/py/inet/tcp.t.payload.ip6 +++ b/tests/py/inet/tcp.t.payload.ip6 @@ -25,8 +25,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp dport { 33, 55, 67, 88} __set%d test-ip6 3 @@ -116,8 +115,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp sport { 33, 55, 67, 88} __set%d test-ip6 3 @@ -217,8 +215,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp sequence { 33, 55, 67, 88} __set%d test-ip6 3 @@ -275,8 +272,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp ackseq { 33, 55, 67, 88} __set%d test-ip6 3 @@ -358,8 +354,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp window { 33, 55, 67, 88} __set%d test-ip6 3 @@ -408,8 +403,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp checksum { 33, 55, 67, 88} __set%d test-ip6 3 @@ -466,8 +460,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp urgptr { 33, 55, 67, 88} __set%d test-ip6 3 diff --git a/tests/py/inet/tcp.t.payload.netdev b/tests/py/inet/tcp.t.payload.netdev index a554d070..854f4bbe 100644 --- a/tests/py/inet/tcp.t.payload.netdev +++ b/tests/py/inet/tcp.t.payload.netdev @@ -25,8 +25,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp dport { 33, 55, 67, 88} __set%d test-inet 3 @@ -116,8 +115,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp sport { 33, 55, 67, 88} __set%d test-inet 3 @@ -217,8 +215,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp sequence { 33, 55, 67, 88} __set%d test-inet 3 @@ -275,8 +272,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # tcp ackseq { 33, 55, 67, 88} __set%d test-inet 3 @@ -358,8 +354,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp window { 33, 55, 67, 88} __set%d test-inet 3 @@ -416,8 +411,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp checksum { 33, 55, 67, 88} __set%d test-inet 3 @@ -474,8 +468,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # tcp urgptr { 33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/udp.t.payload.inet b/tests/py/inet/udp.t.payload.inet index a2717f39..8fdffbf2 100644 --- a/tests/py/inet/udp.t.payload.inet +++ b/tests/py/inet/udp.t.payload.inet @@ -28,8 +28,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp sport { 49, 50} drop @@ -83,8 +82,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp dport { 49, 50} drop @@ -137,8 +135,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00004100 ] + [ range neq reg 1 0x00003200 0x00004100 ] [ immediate reg 0 accept ] # udp length { 50, 65} accept @@ -197,8 +194,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udp checksum { 33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/udp.t.payload.ip b/tests/py/inet/udp.t.payload.ip index 5d36fe5f..1d41017b 100644 --- a/tests/py/inet/udp.t.payload.ip +++ b/tests/py/inet/udp.t.payload.ip @@ -28,8 +28,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp sport { 49, 50} drop @@ -83,8 +82,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp dport { 49, 50} drop @@ -137,8 +135,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00004100 ] + [ range neq reg 1 0x00003200 0x00004100 ] [ immediate reg 0 accept ] # udp length { 50, 65} accept @@ -197,8 +194,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udp checksum { 33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/udp.t.payload.ip6 b/tests/py/inet/udp.t.payload.ip6 index 22aa57ff..17b6679f 100644 --- a/tests/py/inet/udp.t.payload.ip6 +++ b/tests/py/inet/udp.t.payload.ip6 @@ -28,8 +28,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp sport { 49, 50} drop @@ -83,8 +82,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp dport { 49, 50} drop @@ -137,8 +135,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00004100 ] + [ range neq reg 1 0x00003200 0x00004100 ] [ immediate reg 0 accept ] # udp length { 50, 65} accept @@ -197,8 +194,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udp checksum { 33, 55, 67, 88} __set%d test-ip6 3 diff --git a/tests/py/inet/udp.t.payload.netdev b/tests/py/inet/udp.t.payload.netdev index 92858cf0..9e93ae4c 100644 --- a/tests/py/inet/udp.t.payload.netdev +++ b/tests/py/inet/udp.t.payload.netdev @@ -28,8 +28,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp sport { 49, 50} drop @@ -83,8 +82,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udp dport { 49, 50} drop @@ -137,8 +135,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00004100 ] + [ range neq reg 1 0x00003200 0x00004100 ] [ immediate reg 0 accept ] # udp length { 50, 65} accept @@ -197,8 +194,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udp checksum { 33, 55, 67, 88} __set%d test-inet 3 diff --git a/tests/py/inet/udplite.t.payload.inet b/tests/py/inet/udplite.t.payload.inet index 034c62de..ad2c9709 100644 --- a/tests/py/inet/udplite.t.payload.inet +++ b/tests/py/inet/udplite.t.payload.inet @@ -28,8 +28,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite sport { 49, 50} drop @@ -83,8 +82,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite dport { 49, 50} drop @@ -144,8 +142,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udplite checksum { 33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/udplite.t.payload.ip b/tests/py/inet/udplite.t.payload.ip index 3da9e538..8321c239 100644 --- a/tests/py/inet/udplite.t.payload.ip +++ b/tests/py/inet/udplite.t.payload.ip @@ -28,8 +28,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite sport { 49, 50} drop @@ -83,8 +82,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite dport { 49, 50} drop @@ -144,8 +142,7 @@ ip test-ip4 input [ payload load 1b @ network header + 9 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udplite checksum { 33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/udplite.t.payload.ip6 b/tests/py/inet/udplite.t.payload.ip6 index 205ea215..dce215dd 100644 --- a/tests/py/inet/udplite.t.payload.ip6 +++ b/tests/py/inet/udplite.t.payload.ip6 @@ -28,8 +28,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite sport { 49, 50} drop @@ -83,8 +82,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite dport { 49, 50} drop @@ -144,8 +142,7 @@ ip6 test-ip6 input [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udplite checksum { 33, 55, 67, 88} __set%d test-ip4 3 diff --git a/tests/py/inet/udplite.t.payload.netdev b/tests/py/inet/udplite.t.payload.netdev index 034c62de..ad2c9709 100644 --- a/tests/py/inet/udplite.t.payload.netdev +++ b/tests/py/inet/udplite.t.payload.netdev @@ -28,8 +28,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite sport { 49, 50} drop @@ -83,8 +82,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp lt reg 1 0x00003200 ] - [ cmp gt reg 1 0x00003c00 ] + [ range neq reg 1 0x00003200 0x00003c00 ] [ immediate reg 0 accept ] # udplite dport { 49, 50} drop @@ -144,8 +142,7 @@ inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000088 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # udplite checksum { 33, 55, 67, 88} __set%d test-ip4 3 -- cgit v1.2.3