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