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/sctp.t.payload.netdev | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tests/py/inet/sctp.t.payload.netdev') 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 -- cgit v1.2.3