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/ip6/frag.t.payload.inet | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/py/ip6/frag.t.payload.inet') diff --git a/tests/py/ip6/frag.t.payload.inet b/tests/py/ip6/frag.t.payload.inet index 387dbd66..bf57eca2 100644 --- a/tests/py/ip6/frag.t.payload.inet +++ b/tests/py/ip6/frag.t.payload.inet @@ -63,8 +63,7 @@ inet test-inet output [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ exthdr load 1b @ 44 + 1 => reg 1 ] - [ cmp lt reg 1 0x00000021 ] - [ cmp gt reg 1 0x0000002d ] + [ range neq reg 1 0x00000021 0x0000002d ] # frag reserved { 33, 55, 67, 88} __set%d test-inet 3 @@ -117,8 +116,7 @@ inet test-inet output [ cmp eq reg 1 0x0000000a ] [ exthdr load 2b @ 44 + 2 => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp lt reg 1 0x00000801 ] - [ cmp gt reg 1 0x00006801 ] + [ range neq reg 1 0x00000801 0x00006801 ] # frag frag-off { 33, 55, 67, 88} __set%d test-inet 3 @@ -184,8 +182,7 @@ inet test-inet output [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ exthdr load 4b @ 44 + 4 => reg 1 ] - [ cmp lt reg 1 0x21000000 ] - [ cmp gt reg 1 0x2d000000 ] + [ range neq reg 1 0x21000000 0x2d000000 ] # frag id { 33, 55, 67, 88} __set%d test-inet 3 -- cgit v1.2.3