diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-09-20 19:25:25 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-10-17 17:55:56 +0200 |
commit | 3ed932917cc744b489bd2706a55a1778b0b50c0e (patch) | |
tree | 96f226969cab52a9c29510378612751713f78d98 /tests/py/ip6/ip6.t.payload.inet | |
parent | f55ccf9ea1061f8e50065c0cc6b3ed93523f0b97 (diff) |
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 <pablo@netfilter.org>
Diffstat (limited to 'tests/py/ip6/ip6.t.payload.inet')
-rw-r--r-- | tests/py/ip6/ip6.t.payload.inet | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/py/ip6/ip6.t.payload.inet b/tests/py/ip6/ip6.t.payload.inet index f9512154..1aa0f5b6 100644 --- a/tests/py/ip6/ip6.t.payload.inet +++ b/tests/py/ip6/ip6.t.payload.inet @@ -106,8 +106,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 2b @ network header + 4 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] + [ range neq reg 1 0x00002100 0x00002d00 ] # ip6 length { 33-55} __set%d test-inet 7 @@ -176,8 +175,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp lt reg 1 0x00000021 ] - [ cmp gt reg 1 0x0000002c ] + [ range neq reg 1 0x00000021 0x0000002c ] # ip6 hoplimit 1 inet test-inet input @@ -206,8 +204,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 1b @ network header + 7 => reg 1 ] - [ cmp lt reg 1 0x00000021 ] - [ cmp gt reg 1 0x0000002d ] + [ range neq reg 1 0x00000021 0x0000002d ] # ip6 hoplimit {33, 55, 67, 88} __set%d test-inet 3 @@ -510,8 +507,7 @@ inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 24 => reg 1 ] - [ cmp lt reg 1 0x34120000 0x34123412 0x34123412 0x34123412 ] - [ cmp gt reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ] + [ range neq reg 1 0x34120000 0x34123412 0x34123412 0x34123412 0x34123412 0x34120000 0x34123412 0x34123412 ] # iif "lo" ip6 daddr set ::1 inet test-inet input |