summaryrefslogtreecommitdiffstats
path: root/tests/py/any/meta.t.payload
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2016-09-20 19:25:25 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2016-10-17 17:55:56 +0200
commit3ed932917cc744b489bd2706a55a1778b0b50c0e (patch)
tree96f226969cab52a9c29510378612751713f78d98 /tests/py/any/meta.t.payload
parentf55ccf9ea1061f8e50065c0cc6b3ed93523f0b97 (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/any/meta.t.payload')
-rw-r--r--tests/py/any/meta.t.payload21
1 files changed, 7 insertions, 14 deletions
diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index 5fff76e2..65d1cd42 100644
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -24,8 +24,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load len => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0x21000000 ]
- [ cmp gt reg 1 0x2d000000 ]
+ [ range neq reg 1 0x21000000 0x2d000000 ]
# meta length { 33, 55, 67, 88}
__set%d test-ip4 3
@@ -119,8 +118,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load l4proto => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 2, 1) ]
- [ cmp lt reg 1 0x00000021 ]
- [ cmp gt reg 1 0x0000002d ]
+ [ range neq reg 1 0x00000021 0x0000002d ]
# meta l4proto { 33, 55, 67, 88}
__set%d test-ip4 3
@@ -379,8 +377,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load skuid => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0xd1070000 ]
- [ cmp gt reg 1 0xd5070000 ]
+ [ range neq reg 1 0xd1070000 0xd5070000 ]
[ immediate reg 0 accept ]
# meta skuid { 2001-2005} accept
@@ -444,8 +441,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load skgid => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0xd1070000 ]
- [ cmp gt reg 1 0xd5070000 ]
+ [ range neq reg 1 0xd1070000 0xd5070000 ]
[ immediate reg 0 accept ]
# meta skgid { 2001-2005} accept
@@ -589,8 +585,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load cpu => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0x01000000 ]
- [ cmp gt reg 1 0x02000000 ]
+ [ range neq reg 1 0x01000000 0x02000000 ]
# meta cpu { 2,3}
__set%d test-ip4 3
@@ -728,8 +723,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load cgroup => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0x01001000 ]
- [ cmp gt reg 1 0x02001000 ]
+ [ range neq reg 1 0x01001000 0x02001000 ]
# meta cgroup {1048577-1048578}
__set%d test-ip4 7
@@ -825,8 +819,7 @@ ip test-ip4 input
ip test-ip4 input
[ meta load priority => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]
- [ cmp lt reg 1 0xdadaadbc ]
- [ cmp gt reg 1 0xdcdaadbc ]
+ [ range neq reg 1 0xdadaadbc 0xdcdaadbc ]
# meta priority {bcad:dada, bcad:dadc, aaaa:bbbb}
__set%d test-ip4 3