From 90d4ee087171e75d5313359ad6b6f1341e51ddc5 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 29 Aug 2018 16:23:27 +0200 Subject: JSON: Make match op mandatory, introduce 'in' operator This special operator is required for cases where missing operator does not lead to same results as equal operator, i.e. with bitmasks on RHS. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/py/ip/ip.t.json | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'tests/py/ip/ip.t.json') diff --git a/tests/py/ip/ip.t.json b/tests/py/ip/ip.t.json index c8b2bf83..3131ab79 100644 --- a/tests/py/ip/ip.t.json +++ b/tests/py/ip/ip.t.json @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "cs1" } } @@ -39,6 +40,7 @@ "protocol": "ip" } }, + "op": "==", "right": "0x38" } } @@ -70,6 +72,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ "cs0", @@ -163,6 +166,7 @@ "protocol": "ip" } }, + "op": "==", "right": 232 } } @@ -194,6 +198,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ 333, 435 ] } @@ -229,6 +234,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 333, @@ -274,6 +280,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ 333, 535 ] } @@ -313,6 +320,7 @@ "protocol": "ip" } }, + "op": "==", "right": 22 } } @@ -344,6 +352,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -379,6 +388,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 33, @@ -424,6 +434,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -463,6 +474,7 @@ "protocol": "ip" } }, + "op": "==", "right": 222 } }, @@ -497,6 +509,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -532,6 +545,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 33, @@ -577,6 +591,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -616,6 +631,7 @@ "protocol": "ip" } }, + "op": "==", "right": 0 } }, @@ -634,6 +650,7 @@ "protocol": "ip" } }, + "op": "==", "right": 233 } } @@ -649,6 +666,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ 33, 55 ] } @@ -684,6 +702,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 43, @@ -727,6 +746,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -766,6 +786,7 @@ "protocol": "ip" } }, + "op": "==", "right": "tcp" } } @@ -797,6 +818,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ "icmp", @@ -858,6 +880,7 @@ "protocol": "ip" } }, + "op": "==", "right": 255 } } @@ -873,6 +896,7 @@ "protocol": "ip" } }, + "op": "==", "right": 13172 } }, @@ -891,6 +915,7 @@ "protocol": "ip" } }, + "op": "==", "right": 22 } } @@ -922,6 +947,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -957,6 +983,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 33, @@ -1002,6 +1029,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -1041,6 +1069,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "prefix": { "addr": "192.168.2.0", @@ -1082,6 +1111,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.3.1" } }, @@ -1093,6 +1123,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.3.100" } } @@ -1124,6 +1155,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.1.1.1" } } @@ -1139,6 +1171,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "192.168.0.1", "192.168.0.250" ] } @@ -1156,6 +1189,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "10.0.0.0", "10.255.255.255" ] } @@ -1173,6 +1207,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "172.16.0.0", "172.31.255.255" ] } @@ -1190,6 +1225,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "192.168.3.1", "192.168.4.250" ] } @@ -1225,6 +1261,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { "range": [ "192.168.0.1", "192.168.0.250" ] } @@ -1264,6 +1301,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ "192.168.5.1", @@ -1313,6 +1351,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "192.168.1.2", "192.168.1.55" ] } @@ -1348,6 +1387,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "192.168.1.3", "192.168.33.55" ] } @@ -1383,6 +1423,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.0.1" } } @@ -1398,6 +1439,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.0.1" } }, @@ -1416,6 +1458,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.0.2" } } @@ -1478,6 +1521,7 @@ "0xffff0000" ] }, + "op": "==", "right": "0xffff0000" } } @@ -1493,6 +1537,7 @@ "protocol": "ip" } }, + "op": "==", "right": 4 } }, @@ -1504,6 +1549,7 @@ "protocol": "ip" } }, + "op": "==", "right": 5 } } @@ -1519,6 +1565,7 @@ "protocol": "ip" } }, + "op": "==", "right": 0 } } @@ -1534,6 +1581,7 @@ "protocol": "ip" } }, + "op": "==", "right": 15 } } @@ -1579,6 +1627,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1602,6 +1651,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1625,6 +1675,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1648,6 +1699,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1671,6 +1723,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1694,6 +1747,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1717,6 +1771,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1740,6 +1795,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, @@ -1763,6 +1819,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, -- cgit v1.2.3