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/ct.t.json | 13 ++++++++ tests/py/ip/ct.t.json.output | 2 ++ tests/py/ip/dnat.t.json | 9 ++++++ tests/py/ip/ether.t.json | 12 ++++++++ tests/py/ip/ether.t.json.output | 3 ++ tests/py/ip/icmp.t.json | 44 ++++++++++++++++++++++++++++ tests/py/ip/icmp.t.json.output | 2 ++ tests/py/ip/ip.t.json | 57 ++++++++++++++++++++++++++++++++++++ tests/py/ip/ip.t.json.output | 6 ++++ tests/py/ip/ip_tcp.t.json | 4 +++ tests/py/ip/ip_tcp.t.json.output | 3 ++ tests/py/ip/masquerade.t.json | 18 ++++++++++++ tests/py/ip/masquerade.t.json.output | 5 ++++ tests/py/ip/meta.t.json | 8 +++++ tests/py/ip/meta.t.json.output | 3 ++ tests/py/ip/objects.t.json | 3 ++ tests/py/ip/redirect.t.json | 27 +++++++++++++++++ tests/py/ip/redirect.t.json.output | 6 ++++ tests/py/ip/reject.t.json | 1 + tests/py/ip/reject.t.json.output | 1 + tests/py/ip/rt.t.json | 1 + tests/py/ip/sets.t.json | 5 ++++ tests/py/ip/snat.t.json | 7 +++++ tests/py/ip/snat.t.json.output | 3 ++ tests/py/ip/tcp.t.json | 3 ++ tests/py/ip/tcp.t.json.output | 2 ++ tests/py/ip/tcpopt.t.json | 26 ++++++++++++++++ tests/py/ip/tcpopt.t.json.output | 1 + 28 files changed, 275 insertions(+) (limited to 'tests/py/ip') diff --git a/tests/py/ip/ct.t.json b/tests/py/ip/ct.t.json index 6314d5b2..cc3ab692 100644 --- a/tests/py/ip/ct.t.json +++ b/tests/py/ip/ct.t.json @@ -9,6 +9,7 @@ "key": "saddr" } }, + "op": "==", "right": "192.168.0.1" } } @@ -25,6 +26,7 @@ "key": "saddr" } }, + "op": "==", "right": "192.168.0.1" } } @@ -41,6 +43,7 @@ "key": "daddr" } }, + "op": "==", "right": "192.168.0.1" } } @@ -57,6 +60,7 @@ "key": "daddr" } }, + "op": "==", "right": "192.168.0.1" } } @@ -73,6 +77,7 @@ "key": "saddr" } }, + "op": "==", "right": { "prefix": { "addr": "192.168.1.0", @@ -94,6 +99,7 @@ "key": "saddr" } }, + "op": "==", "right": { "prefix": { "addr": "192.168.1.0", @@ -115,6 +121,7 @@ "key": "daddr" } }, + "op": "==", "right": { "prefix": { "addr": "192.168.1.0", @@ -136,6 +143,7 @@ "key": "daddr" } }, + "op": "==", "right": { "prefix": { "addr": "192.168.1.0", @@ -155,6 +163,7 @@ "key": "l3proto" } }, + "op": "==", "right": "ipv4" } } @@ -169,6 +178,7 @@ "key": "protocol" } }, + "op": "==", "right": 6 } }, @@ -180,6 +190,7 @@ "key": "proto-dst" } }, + "op": "==", "right": 22 } } @@ -195,6 +206,7 @@ "key": "protocol" } }, + "op": "==", "right": 17 } }, @@ -206,6 +218,7 @@ "key": "proto-src" } }, + "op": "==", "right": 53 } } diff --git a/tests/py/ip/ct.t.json.output b/tests/py/ip/ct.t.json.output index 2429ec69..cf4abaec 100644 --- a/tests/py/ip/ct.t.json.output +++ b/tests/py/ip/ct.t.json.output @@ -7,6 +7,7 @@ "key": "protocol" } }, + "op": "==", "right": 17 } }, @@ -18,6 +19,7 @@ "key": "proto-src" } }, + "op": "==", "right": 53 } } diff --git a/tests/py/ip/dnat.t.json b/tests/py/ip/dnat.t.json index c4ae8302..0481a368 100644 --- a/tests/py/ip/dnat.t.json +++ b/tests/py/ip/dnat.t.json @@ -5,6 +5,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -16,6 +17,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "range": [ 80, 90 ] } @@ -35,6 +37,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -66,6 +69,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -77,6 +81,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "set": [ 23, @@ -100,6 +105,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -135,6 +141,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -166,6 +173,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -177,6 +185,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 81 } }, diff --git a/tests/py/ip/ether.t.json b/tests/py/ip/ether.t.json index 8890f153..355c7fc5 100644 --- a/tests/py/ip/ether.t.json +++ b/tests/py/ip/ether.t.json @@ -8,6 +8,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -16,6 +17,7 @@ "left": { "meta": { "key": "iiftype" } }, + "op": "==", "right": "ether" } }, @@ -27,6 +29,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.2.3.4" } }, @@ -38,6 +41,7 @@ "protocol": "ether" } }, + "op": "==", "right": "00:0f:54:0c:11:04" } }, @@ -56,6 +60,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -67,6 +72,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.2.3.4" } }, @@ -78,6 +84,7 @@ "protocol": "ether" } }, + "op": "==", "right": "00:0f:54:0c:11:04" } } @@ -93,6 +100,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -104,6 +112,7 @@ "protocol": "ether" } }, + "op": "==", "right": "00:0f:54:0c:11:04" } }, @@ -115,6 +124,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.2.3.4" } } @@ -130,6 +140,7 @@ "protocol": "ether" } }, + "op": "==", "right": "00:0f:54:0c:11:04" } }, @@ -141,6 +152,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.2.3.4" } }, diff --git a/tests/py/ip/ether.t.json.output b/tests/py/ip/ether.t.json.output index 811604e5..1e5dd50d 100644 --- a/tests/py/ip/ether.t.json.output +++ b/tests/py/ip/ether.t.json.output @@ -8,6 +8,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -19,6 +20,7 @@ "protocol": "ip" } }, + "op": "==", "right": "1.2.3.4" } }, @@ -30,6 +32,7 @@ "protocol": "ether" } }, + "op": "==", "right": "00:0f:54:0c:11:04" } }, diff --git a/tests/py/ip/icmp.t.json b/tests/py/ip/icmp.t.json index 89fe754c..918621cb 100644 --- a/tests/py/ip/icmp.t.json +++ b/tests/py/ip/icmp.t.json @@ -8,6 +8,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "echo-reply" } }, @@ -26,6 +27,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "destination-unreachable" } }, @@ -44,6 +46,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "source-quench" } }, @@ -62,6 +65,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "redirect" } }, @@ -80,6 +84,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "echo-request" } }, @@ -98,6 +103,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "time-exceeded" } }, @@ -116,6 +122,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "parameter-problem" } }, @@ -134,6 +141,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "timestamp-request" } }, @@ -152,6 +160,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "timestamp-reply" } }, @@ -170,6 +179,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "info-request" } }, @@ -188,6 +198,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "info-reply" } }, @@ -206,6 +217,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "address-mask-request" } }, @@ -224,6 +236,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "address-mask-reply" } }, @@ -242,6 +255,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "router-advertisement" } }, @@ -260,6 +274,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "router-solicitation" } }, @@ -278,6 +293,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ "echo-reply", @@ -336,6 +352,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 111 } }, @@ -373,6 +390,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 33, 55 ] } @@ -408,6 +426,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -447,6 +466,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 2, @@ -494,6 +514,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 12343 } }, @@ -531,6 +552,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 11, 343 ] } @@ -572,6 +594,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 11, 343 ] } @@ -617,6 +640,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 1111, @@ -666,6 +690,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 1245 } }, @@ -684,6 +709,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 22 } } @@ -715,6 +741,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -750,6 +777,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -789,6 +817,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 22, @@ -832,6 +861,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 22 } } @@ -863,6 +893,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -898,6 +929,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 33, @@ -943,6 +975,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -982,6 +1015,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 33 } } @@ -997,6 +1031,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 22, 33 ] } @@ -1014,6 +1049,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 22, 33 ] } @@ -1053,6 +1089,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 22 } } @@ -1084,6 +1121,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -1119,6 +1157,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 33, @@ -1164,6 +1203,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } @@ -1203,6 +1243,7 @@ "protocol": "icmp" } }, + "op": "==", "right": 22 } } @@ -1234,6 +1275,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "range": [ 33, 45 ] } @@ -1269,6 +1311,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 33, @@ -1314,6 +1357,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ { "range": [ 33, 55 ] } diff --git a/tests/py/ip/icmp.t.json.output b/tests/py/ip/icmp.t.json.output index 31857262..30637a13 100644 --- a/tests/py/ip/icmp.t.json.output +++ b/tests/py/ip/icmp.t.json.output @@ -8,6 +8,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ "echo-reply", @@ -44,6 +45,7 @@ "protocol": "icmp" } }, + "op": "==", "right": { "set": [ 222, 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" } }, diff --git a/tests/py/ip/ip.t.json.output b/tests/py/ip/ip.t.json.output index 0378c00f..b201cdaa 100644 --- a/tests/py/ip/ip.t.json.output +++ b/tests/py/ip/ip.t.json.output @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "cs7" } } @@ -39,6 +40,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ "cs0", @@ -78,6 +80,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } } @@ -109,6 +112,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ 1, @@ -191,6 +195,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "prefix": { "addr": "255.255.0.0", @@ -208,6 +213,7 @@ "left": { "meta": { "key": "iif" } }, + "op": "==", "right": "lo" } }, diff --git a/tests/py/ip/ip_tcp.t.json b/tests/py/ip/ip_tcp.t.json index 15b5f386..3757d6ee 100644 --- a/tests/py/ip/ip_tcp.t.json +++ b/tests/py/ip/ip_tcp.t.json @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "tcp" } }, @@ -19,6 +20,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } } @@ -34,6 +36,7 @@ "protocol": "ip" } }, + "op": "==", "right": "tcp" } }, @@ -53,6 +56,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } } diff --git a/tests/py/ip/ip_tcp.t.json.output b/tests/py/ip/ip_tcp.t.json.output index 63cdfe0b..2d671df5 100644 --- a/tests/py/ip/ip_tcp.t.json.output +++ b/tests/py/ip/ip_tcp.t.json.output @@ -8,6 +8,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } } @@ -23,6 +24,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } }, @@ -42,6 +44,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } } diff --git a/tests/py/ip/masquerade.t.json b/tests/py/ip/masquerade.t.json index 79c80804..4a90c706 100644 --- a/tests/py/ip/masquerade.t.json +++ b/tests/py/ip/masquerade.t.json @@ -8,6 +8,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -26,6 +27,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -46,6 +48,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -69,6 +72,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -93,6 +97,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -116,6 +121,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -140,6 +146,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -160,6 +167,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -183,6 +191,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -207,6 +216,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -230,6 +240,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -254,6 +265,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } }, @@ -274,6 +286,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } }, @@ -296,6 +309,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "set": [ 1, @@ -331,6 +345,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "10.0.0.0", "10.2.3.4" ] } @@ -344,6 +359,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -362,6 +378,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -372,6 +389,7 @@ "key": "state" } }, + "op": "in", "right": [ "established", "new" diff --git a/tests/py/ip/masquerade.t.json.output b/tests/py/ip/masquerade.t.json.output index 8feac1dd..58e7e290 100644 --- a/tests/py/ip/masquerade.t.json.output +++ b/tests/py/ip/masquerade.t.json.output @@ -8,6 +8,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -32,6 +33,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -55,6 +57,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -79,6 +82,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -102,6 +106,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, diff --git a/tests/py/ip/meta.t.json b/tests/py/ip/meta.t.json index 59d97187..f873aa88 100644 --- a/tests/py/ip/meta.t.json +++ b/tests/py/ip/meta.t.json @@ -8,6 +8,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "echo-request" } } @@ -20,6 +21,7 @@ "left": { "meta": { "key": "l4proto" } }, + "op": "==", "right": "icmp" } }, @@ -31,6 +33,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "echo-request" } } @@ -43,6 +46,7 @@ "left": { "meta": { "key": "l4proto" } }, + "op": "==", "right": "ipv6-icmp" } }, @@ -54,6 +58,7 @@ "protocol": "icmpv6" } }, + "op": "==", "right": "nd-router-advert" } } @@ -66,6 +71,7 @@ "left": { "meta": { "key": "l4proto" } }, + "op": "==", "right": 58 } }, @@ -77,6 +83,7 @@ "protocol": "icmpv6" } }, + "op": "==", "right": "nd-router-advert" } } @@ -92,6 +99,7 @@ "protocol": "icmpv6" } }, + "op": "==", "right": "nd-router-advert" } } diff --git a/tests/py/ip/meta.t.json.output b/tests/py/ip/meta.t.json.output index 93cede88..091282b3 100644 --- a/tests/py/ip/meta.t.json.output +++ b/tests/py/ip/meta.t.json.output @@ -8,6 +8,7 @@ "protocol": "icmp" } }, + "op": "==", "right": "echo-request" } } @@ -23,6 +24,7 @@ "protocol": "icmpv6" } }, + "op": "==", "right": "nd-router-advert" } } @@ -38,6 +40,7 @@ "protocol": "icmpv6" } }, + "op": "==", "right": "nd-router-advert" } } diff --git a/tests/py/ip/objects.t.json b/tests/py/ip/objects.t.json index 953e5570..8e838cf4 100644 --- a/tests/py/ip/objects.t.json +++ b/tests/py/ip/objects.t.json @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.1.3" } }, @@ -58,6 +59,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.1.3" } }, @@ -143,6 +145,7 @@ "protocol": "ip" } }, + "op": "==", "right": "192.168.1.3" } }, diff --git a/tests/py/ip/redirect.t.json b/tests/py/ip/redirect.t.json index 7ee3a516..3544e7f1 100644 --- a/tests/py/ip/redirect.t.json +++ b/tests/py/ip/redirect.t.json @@ -8,6 +8,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -26,6 +27,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -46,6 +48,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -69,6 +72,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -93,6 +97,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -116,6 +121,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -140,6 +146,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -160,6 +167,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -183,6 +191,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -207,6 +216,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -230,6 +240,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -254,6 +265,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -274,6 +286,7 @@ "protocol": "udp" } }, + "op": "==", "right": 1234 } }, @@ -294,6 +307,7 @@ "protocol": "ip" } }, + "op": "==", "right": "172.16.0.1" } }, @@ -305,6 +319,7 @@ "protocol": "udp" } }, + "op": "==", "right": 9998 } }, @@ -325,6 +340,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 39128 } }, @@ -345,6 +361,7 @@ "protocol": "ip" } }, + "op": "==", "right": "tcp" } }, @@ -367,6 +384,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 9128 } }, @@ -388,6 +406,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 9128 } }, @@ -409,6 +428,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 9128 } }, @@ -430,6 +450,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 9128 } }, @@ -454,6 +475,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "set": [ 1, @@ -489,6 +511,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "range": [ "10.0.0.0", "10.2.3.4" ] } @@ -502,6 +525,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -520,6 +544,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -530,6 +555,7 @@ "key": "state" } }, + "op": "in", "right": [ "established", "new" @@ -577,6 +603,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } }, diff --git a/tests/py/ip/redirect.t.json.output b/tests/py/ip/redirect.t.json.output index 2a3398b0..4646c60a 100644 --- a/tests/py/ip/redirect.t.json.output +++ b/tests/py/ip/redirect.t.json.output @@ -8,6 +8,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -32,6 +33,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -55,6 +57,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -79,6 +82,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -102,6 +106,7 @@ "protocol": "udp" } }, + "op": "==", "right": 53 } }, @@ -126,6 +131,7 @@ "protocol": "ip" } }, + "op": "==", "right": 6 } }, diff --git a/tests/py/ip/reject.t.json b/tests/py/ip/reject.t.json index e1886fa3..d120b9f1 100644 --- a/tests/py/ip/reject.t.json +++ b/tests/py/ip/reject.t.json @@ -82,6 +82,7 @@ "left": { "meta": { "key": "mark" } }, + "op": "==", "right": "0x80000000" } }, diff --git a/tests/py/ip/reject.t.json.output b/tests/py/ip/reject.t.json.output index 6829792c..b2529dd7 100644 --- a/tests/py/ip/reject.t.json.output +++ b/tests/py/ip/reject.t.json.output @@ -12,6 +12,7 @@ "left": { "meta": { "key": "mark" } }, + "op": "==", "right": 2147483648 } }, diff --git a/tests/py/ip/rt.t.json b/tests/py/ip/rt.t.json index 565427cf..41dbe341 100644 --- a/tests/py/ip/rt.t.json +++ b/tests/py/ip/rt.t.json @@ -8,6 +8,7 @@ "key": "nexthop" } }, + "op": "==", "right": "192.168.0.1" } } diff --git a/tests/py/ip/sets.t.json b/tests/py/ip/sets.t.json index 97ea1541..65d2df87 100644 --- a/tests/py/ip/sets.t.json +++ b/tests/py/ip/sets.t.json @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "@set1" } }, @@ -45,6 +46,7 @@ "protocol": "ip" } }, + "op": "==", "right": "@set2" } }, @@ -92,6 +94,7 @@ } ] }, + "op": "==", "right": "@set5" } }, @@ -136,6 +139,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ "1.1.1.0", @@ -157,6 +161,7 @@ "protocol": "ip" } }, + "op": "==", "right": { "set": [ { diff --git a/tests/py/ip/snat.t.json b/tests/py/ip/snat.t.json index 9cb85f85..e87b524e 100644 --- a/tests/py/ip/snat.t.json +++ b/tests/py/ip/snat.t.json @@ -5,6 +5,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -16,6 +17,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "range": [ 80, 90 ] } @@ -35,6 +37,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -66,6 +69,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -77,6 +81,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "set": [ 80, @@ -100,6 +105,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -135,6 +141,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, diff --git a/tests/py/ip/snat.t.json.output b/tests/py/ip/snat.t.json.output index 46901ba0..1365316c 100644 --- a/tests/py/ip/snat.t.json.output +++ b/tests/py/ip/snat.t.json.output @@ -5,6 +5,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, @@ -16,6 +17,7 @@ "protocol": "tcp" } }, + "op": "==", "right": { "set": [ 23, @@ -39,6 +41,7 @@ "left": { "meta": { "key": "iifname" } }, + "op": "==", "right": "eth0" } }, diff --git a/tests/py/ip/tcp.t.json b/tests/py/ip/tcp.t.json index 33172f60..d2c09150 100644 --- a/tests/py/ip/tcp.t.json +++ b/tests/py/ip/tcp.t.json @@ -8,6 +8,7 @@ "protocol": "ip" } }, + "op": "==", "right": "tcp" } }, @@ -19,6 +20,7 @@ "protocol": "tcp" } }, + "op": "==", "right": "ssh" } }, @@ -49,6 +51,7 @@ "protocol": "udp" } }, + "op": "==", "right": "ssh" } }, diff --git a/tests/py/ip/tcp.t.json.output b/tests/py/ip/tcp.t.json.output index 9dd51de6..7e898544 100644 --- a/tests/py/ip/tcp.t.json.output +++ b/tests/py/ip/tcp.t.json.output @@ -8,6 +8,7 @@ "protocol": "tcp" } }, + "op": "==", "right": 22 } }, @@ -38,6 +39,7 @@ "protocol": "udp" } }, + "op": "==", "right": 22 } }, diff --git a/tests/py/ip/tcpopt.t.json b/tests/py/ip/tcpopt.t.json index 8bb79917..d573dd1c 100644 --- a/tests/py/ip/tcpopt.t.json +++ b/tests/py/ip/tcpopt.t.json @@ -8,6 +8,7 @@ "name": "eol" } }, + "op": "==", "right": 1 } } @@ -23,6 +24,7 @@ "name": "noop" } }, + "op": "==", "right": 1 } } @@ -38,6 +40,7 @@ "name": "maxseg" } }, + "op": "==", "right": 1 } } @@ -53,6 +56,7 @@ "name": "maxseg" } }, + "op": "==", "right": 1 } } @@ -68,6 +72,7 @@ "name": "maxseg" } }, + "op": "==", "right": 1 } } @@ -83,6 +88,7 @@ "name": "window" } }, + "op": "==", "right": 1 } } @@ -98,6 +104,7 @@ "name": "window" } }, + "op": "==", "right": 1 } } @@ -113,6 +120,7 @@ "name": "window" } }, + "op": "==", "right": 1 } } @@ -128,6 +136,7 @@ "name": "sack-permitted" } }, + "op": "==", "right": 1 } } @@ -143,6 +152,7 @@ "name": "sack-permitted" } }, + "op": "==", "right": 1 } } @@ -158,6 +168,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } @@ -173,6 +184,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } @@ -188,6 +200,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } @@ -203,6 +216,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } @@ -218,6 +232,7 @@ "name": "sack1" } }, + "op": "==", "right": 1 } } @@ -233,6 +248,7 @@ "name": "sack2" } }, + "op": "==", "right": 1 } } @@ -248,6 +264,7 @@ "name": "sack3" } }, + "op": "==", "right": 1 } } @@ -263,6 +280,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } @@ -278,6 +296,7 @@ "name": "sack0" } }, + "op": "==", "right": 1 } } @@ -293,6 +312,7 @@ "name": "sack1" } }, + "op": "==", "right": 1 } } @@ -308,6 +328,7 @@ "name": "sack2" } }, + "op": "==", "right": 1 } } @@ -323,6 +344,7 @@ "name": "sack3" } }, + "op": "==", "right": 1 } } @@ -338,6 +360,7 @@ "name": "timestamp" } }, + "op": "==", "right": 1 } } @@ -353,6 +376,7 @@ "name": "timestamp" } }, + "op": "==", "right": 1 } } @@ -368,6 +392,7 @@ "name": "timestamp" } }, + "op": "==", "right": 1 } } @@ -383,6 +408,7 @@ "name": "timestamp" } }, + "op": "==", "right": 1 } } diff --git a/tests/py/ip/tcpopt.t.json.output b/tests/py/ip/tcpopt.t.json.output index ca6714b7..81dd8ad8 100644 --- a/tests/py/ip/tcpopt.t.json.output +++ b/tests/py/ip/tcpopt.t.json.output @@ -8,6 +8,7 @@ "name": "sack" } }, + "op": "==", "right": 1 } } -- cgit v1.2.3