tests/py: add more interval tests for anonymous sets

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index 095e86c77b777fc9e90bcfd4894b60499b8895b1..4d13213d07fee6ea57925e23434d5b8a76324b61 100644 (file)
--- a/tests/py/any/ct.t
+++ b/tests/py/any/ct.t
@@ -44,6 +44,7 @@ ct mark != 0x00000032;ok
 ct mark 0x00000032-0x00000045;ok
 ct mark != 0x00000032-0x00000045;ok
 ct mark {0x32, 0x2222, 0x42de3};ok;ct mark { 0x00042de3, 0x00002222, 0x00000032}
+ct mark {0x32-0x2222, 0x4444-0x42de3};ok;ct mark { 0x00000032-0x00002222, 0x00004444-0x00042de3}
 - ct mark != {0x32, 0x2222, 0x42de3};ok
 
 # ct mark != {0x32, 0x2222, 0x42de3};ok

diff --git a/tests/py/any/ct.t.payload b/tests/py/any/ct.t.payload
index 62e9259276d13071de9af3534ac51e76a8de8c8a..a7f664b07f59fe3d0bfed8a7d80cd61827ceef91 100644 (file)
--- a/tests/py/any/ct.t.payload
+++ b/tests/py/any/ct.t.payload
@@ -166,6 +166,15 @@ ip test-ip4 output
   [ ct load mark => reg 1 ]
   [ lookup reg 1 set set%d ]
 
+# ct mark {0x32-0x2222, 0x4444-0x42de3}
+set%d test-ip4 7
+set%d test-ip4 0
+        element 00000000  : 1 [end]     element 32000000  : 0 [end]     element 23220000  : 1 [end]     element 44440000  : 0 [end]     element e42d0400  : 1 [end]
+ip test-ip4 output
+  [ ct load mark => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 4, 4) ]
+  [ lookup reg 1 set set%d ]
+
 # ct mark set 0x11 xor 0x1331
 ip test-ip4 output
   [ immediate reg 1 0x00001320 ]

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index c10297a4385359fa9bac917268af6e859e1e2bb2..424cb1889dbbc3c38491d41fabad4c0dcfbcb932 100644 (file)
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -14,6 +14,8 @@ meta length != 233;ok
 meta length 33-45;ok
 meta length != 33-45;ok
 meta length { 33, 55, 67, 88};ok
+meta length { 33-55, 67-88};ok
+meta length { 33-55, 55-88, 100-120};ok;meta length { 33-88, 100-120}
 - meta length != { 33, 55, 67, 88};ok
 meta length { 33-55};ok
 - meta length != { 33-55};ok
@@ -162,6 +164,7 @@ meta cpu != 1;ok;cpu != 1
 meta cpu 1-3;ok;cpu 1-3
 meta cpu != 1-2;ok;cpu != 1-2
 meta cpu { 2,3};ok;cpu { 2,3}
+meta cpu { 2-3, 5-7};ok
 -meta cpu != { 2,3};ok; cpu != { 2,3}
 
 meta iifgroup 0;ok;iifgroup default

diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index 9f7a6d99108ba6e4a8ad37db7cd4b6999a631547..14a8948f6549eb1e2f5cefa55a717ce45f548eef 100644 (file)
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -44,6 +44,24 @@ ip test-ip4 input
   [ byteorder reg 1 = hton(reg 1, 4, 4) ]
   [ lookup reg 1 set set%d ]
 
+# meta length { 33-55, 67-88}
+set%d test-ip4 7
+set%d test-ip4 0
+       element 00000000  : 1 [end]     element 21000000  : 0 [end]     element 38000000  : 1 [end]     element 43000000  : 0 [end]     element 59000000  : 1 [end]
+ip test-ip4 input
+  [ meta load len => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 4, 4) ]
+  [ lookup reg 1 set set%d ]
+
+# meta length { 33-55, 55-88, 100-120}
+set%d test-ip4 7
+set%d test-ip4 0
+       element 00000000  : 1 [end]     element 21000000  : 0 [end]     element 59000000  : 1 [end]     element 64000000  : 0 [end]     element 79000000  : 1 [end]
+ip test-ip4 input
+  [ meta load len => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 4, 4) ]
+  [ lookup reg 1 set set%d ]
+
 # meta protocol { ip, arp, ip6, vlan }
 set%d test-ip4 3
 set%d test-ip4 0
@@ -594,6 +612,15 @@ ip test-ip4 input
   [ meta load cpu => reg 1 ]
   [ lookup reg 1 set set%d ]
 
+# meta cpu { 2-3, 5-7}
+set%d test-ip4 7
+set%d test-ip4 0
+       element 00000000  : 1 [end]     element 02000000  : 0 [end]     element 04000000  : 1 [end]     element 05000000  : 0 [end]     element 08000000  : 1 [end]
+ip test-ip4 input
+  [ meta load cpu => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 4, 4) ]
+  [ lookup reg 1 set set%d ]
+
 # meta iifgroup 0
 ip test-ip4 input
   [ meta load iifgroup => reg 1 ]