From dfd72398d44ebbe17929d6e8ca0c870087a0c644 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 29 Aug 2018 16:23:24 +0200 Subject: JSON: Review payload expression For raw payloads, property "name" is not needed, it's clearly identified by base/offset/len properties. In non-raw payload expressions, rename property "name" to "protocol" as suggested during NFWS. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/py/inet/ah.t.json | 60 ++++++------- tests/py/inet/comp.t.json | 34 +++---- tests/py/inet/comp.t.json.output | 18 ++-- tests/py/inet/dccp.t.json | 34 +++---- tests/py/inet/dccp.t.json.output | 2 +- tests/py/inet/esp.t.json | 28 +++--- tests/py/inet/ether-ip.t.json | 12 +-- tests/py/inet/ether-ip.t.json.output | 6 +- tests/py/inet/ether.t.json | 10 +-- tests/py/inet/ether.t.json.output | 4 +- tests/py/inet/icmp.t.json | 12 +-- tests/py/inet/icmp.t.json.output | 4 +- tests/py/inet/icmpX.t.json | 16 ++-- tests/py/inet/icmpX.t.json.output | 12 +-- tests/py/inet/ip.t.json | 6 +- tests/py/inet/ip_tcp.t.json | 24 ++--- tests/py/inet/ip_tcp.t.json.output | 18 ++-- tests/py/inet/map.t.json | 4 +- tests/py/inet/map.t.json.output | 4 +- tests/py/inet/meta.t.json | 8 +- tests/py/inet/meta.t.json.output | 2 +- tests/py/inet/sctp.t.json | 64 ++++++------- tests/py/inet/sets.t.json | 4 +- tests/py/inet/tcp.t.json | 168 +++++++++++++++++------------------ tests/py/inet/tcp.t.json.output | 16 ++-- tests/py/inet/udp.t.json | 72 +++++++-------- tests/py/inet/udplite.t.json | 52 +++++------ 27 files changed, 347 insertions(+), 347 deletions(-) (limited to 'tests/py/inet') diff --git a/tests/py/inet/ah.t.json b/tests/py/inet/ah.t.json index 4489f2d3..4f3fd743 100644 --- a/tests/py/inet/ah.t.json +++ b/tests/py/inet/ah.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -22,7 +22,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -40,7 +40,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -59,7 +59,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -79,7 +79,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -100,7 +100,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -122,7 +122,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": 22 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -153,7 +153,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -170,7 +170,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -188,7 +188,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -208,7 +208,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -229,7 +229,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -248,7 +248,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -268,7 +268,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": 111 @@ -283,7 +283,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -299,7 +299,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -334,7 +334,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -354,7 +354,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -375,7 +375,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -394,7 +394,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -414,7 +414,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": 123 @@ -429,7 +429,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -445,7 +445,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -466,7 +466,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -488,7 +488,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -507,7 +507,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -527,7 +527,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -544,7 +544,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", diff --git a/tests/py/inet/comp.t.json b/tests/py/inet/comp.t.json index d76d6ed8..56fccafb 100644 --- a/tests/py/inet/comp.t.json +++ b/tests/py/inet/comp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -21,7 +21,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": "0x0" @@ -36,7 +36,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -52,7 +52,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -69,7 +69,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -87,7 +87,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -109,7 +109,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -132,7 +132,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -151,7 +151,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -171,7 +171,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": 22 @@ -186,7 +186,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -202,7 +202,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -219,7 +219,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -237,7 +237,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -259,7 +259,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -282,7 +282,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -301,7 +301,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", diff --git a/tests/py/inet/comp.t.json.output b/tests/py/inet/comp.t.json.output index 79e286b7..21517998 100644 --- a/tests/py/inet/comp.t.json.output +++ b/tests/py/inet/comp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -21,7 +21,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": 0 @@ -36,7 +36,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -52,7 +52,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -69,7 +69,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -87,7 +87,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -109,7 +109,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -132,7 +132,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -151,7 +151,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", diff --git a/tests/py/inet/dccp.t.json b/tests/py/inet/dccp.t.json index 7f925047..7d87966f 100644 --- a/tests/py/inet/dccp.t.json +++ b/tests/py/inet/dccp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -22,7 +22,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -40,7 +40,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -61,7 +61,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -102,7 +102,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -119,7 +119,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -136,7 +136,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -155,7 +155,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -175,7 +175,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -196,7 +196,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -218,7 +218,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -237,7 +237,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -257,7 +257,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -285,7 +285,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -314,7 +314,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "right": "request" @@ -329,7 +329,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", diff --git a/tests/py/inet/dccp.t.json.output b/tests/py/inet/dccp.t.json.output index 9e3a57a7..889e4209 100644 --- a/tests/py/inet/dccp.t.json.output +++ b/tests/py/inet/dccp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { diff --git a/tests/py/inet/esp.t.json b/tests/py/inet/esp.t.json index 39c446c7..e6f59a65 100644 --- a/tests/py/inet/esp.t.json +++ b/tests/py/inet/esp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": 100 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -91,7 +91,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -112,7 +112,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -131,7 +131,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": 22 @@ -146,7 +146,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -163,7 +163,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -181,7 +181,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -201,7 +201,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -222,7 +222,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -241,7 +241,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", diff --git a/tests/py/inet/ether-ip.t.json b/tests/py/inet/ether-ip.t.json index accb9d69..b5356bb3 100644 --- a/tests/py/inet/ether-ip.t.json +++ b/tests/py/inet/ether-ip.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -64,7 +64,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -75,7 +75,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/ether-ip.t.json.output b/tests/py/inet/ether-ip.t.json.output index 80f8a4c3..2ae5655a 100644 --- a/tests/py/inet/ether-ip.t.json.output +++ b/tests/py/inet/ether-ip.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -27,7 +27,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/ether.t.json b/tests/py/inet/ether.t.json index b5042adb..69b75ac0 100644 --- a/tests/py/inet/ether.t.json +++ b/tests/py/inet/ether.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -53,7 +53,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -71,7 +71,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/ether.t.json.output b/tests/py/inet/ether.t.json.output index bd7bd67e..19e3865b 100644 --- a/tests/py/inet/ether.t.json.output +++ b/tests/py/inet/ether.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/icmp.t.json b/tests/py/inet/icmp.t.json index 55217cc9..efc40428 100644 --- a/tests/py/inet/icmp.t.json +++ b/tests/py/inet/icmp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -41,7 +41,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -62,7 +62,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -83,7 +83,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -104,7 +104,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/inet/icmp.t.json.output b/tests/py/inet/icmp.t.json.output index 2282900d..a5ee48be 100644 --- a/tests/py/inet/icmp.t.json.output +++ b/tests/py/inet/icmp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/inet/icmpX.t.json b/tests/py/inet/icmpX.t.json index 23ee7ed8..b9905e9d 100644 --- a/tests/py/inet/icmpX.t.json +++ b/tests/py/inet/icmpX.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "icmp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -46,7 +46,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": "icmpv6" @@ -57,7 +57,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -72,7 +72,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -87,7 +87,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "ipv6-icmp" @@ -106,7 +106,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 1 diff --git a/tests/py/inet/icmpX.t.json.output b/tests/py/inet/icmpX.t.json.output index 55158fee..15fdd15a 100644 --- a/tests/py/inet/icmpX.t.json.output +++ b/tests/py/inet/icmpX.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 1 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 58 @@ -42,7 +42,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -57,7 +57,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 58 @@ -76,7 +76,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "destination-unreachable" diff --git a/tests/py/inet/ip.t.json b/tests/py/inet/ip.t.json index b2327377..4b2efd54 100644 --- a/tests/py/inet/ip.t.json +++ b/tests/py/inet/ip.t.json @@ -7,19 +7,19 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } } ] diff --git a/tests/py/inet/ip_tcp.t.json b/tests/py/inet/ip_tcp.t.json index f9c8b5c6..e2f918aa 100644 --- a/tests/py/inet/ip_tcp.t.json +++ b/tests/py/inet/ip_tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -31,7 +31,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -68,7 +68,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -82,7 +82,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -93,7 +93,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -108,7 +108,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -122,7 +122,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -148,7 +148,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/inet/ip_tcp.t.json.output b/tests/py/inet/ip_tcp.t.json.output index 1581f30e..bd6a8620 100644 --- a/tests/py/inet/ip_tcp.t.json.output +++ b/tests/py/inet/ip_tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -31,7 +31,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -57,7 +57,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -71,7 +71,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -82,7 +82,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -97,7 +97,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -111,7 +111,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/inet/map.t.json b/tests/py/inet/map.t.json index bb7f2a05..7fc2ac33 100644 --- a/tests/py/inet/map.t.json +++ b/tests/py/inet/map.t.json @@ -10,7 +10,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/inet/map.t.json.output b/tests/py/inet/map.t.json.output index 74c9b4f6..6e5238e3 100644 --- a/tests/py/inet/map.t.json.output +++ b/tests/py/inet/map.t.json.output @@ -10,7 +10,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/inet/meta.t.json b/tests/py/inet/meta.t.json index 6c5f4567..5bf8a547 100644 --- a/tests/py/inet/meta.t.json +++ b/tests/py/inet/meta.t.json @@ -72,7 +72,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -95,7 +95,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -118,7 +118,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -164,7 +164,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/meta.t.json.output b/tests/py/inet/meta.t.json.output index 0dc3371f..565e2fa0 100644 --- a/tests/py/inet/meta.t.json.output +++ b/tests/py/inet/meta.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/sctp.t.json b/tests/py/inet/sctp.t.json index 86193080..f382c6d2 100644 --- a/tests/py/inet/sctp.t.json +++ b/tests/py/inet/sctp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": 23 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -92,7 +92,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -114,7 +114,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -133,7 +133,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -153,7 +153,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": 23 @@ -168,7 +168,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -184,7 +184,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -201,7 +201,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -219,7 +219,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -240,7 +240,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -262,7 +262,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -281,7 +281,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -301,7 +301,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": 1111 @@ -316,7 +316,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -332,7 +332,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -349,7 +349,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -367,7 +367,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -388,7 +388,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -410,7 +410,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -429,7 +429,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -449,7 +449,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": 22 @@ -464,7 +464,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -480,7 +480,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -497,7 +497,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -515,7 +515,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -537,7 +537,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -560,7 +560,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -579,7 +579,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", diff --git a/tests/py/inet/sets.t.json b/tests/py/inet/sets.t.json index 75881f71..34f37588 100644 --- a/tests/py/inet/sets.t.json +++ b/tests/py/inet/sets.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "@set1" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", diff --git a/tests/py/inet/tcp.t.json b/tests/py/inet/tcp.t.json index 2f83566d..00e8ae7e 100644 --- a/tests/py/inet/tcp.t.json +++ b/tests/py/inet/tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -93,7 +93,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -116,7 +116,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -135,7 +135,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -155,7 +155,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -179,7 +179,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -209,7 +209,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -239,7 +239,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -261,7 +261,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -284,7 +284,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -299,7 +299,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -315,7 +315,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -332,7 +332,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -350,7 +350,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -372,7 +372,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -395,7 +395,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -414,7 +414,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -434,7 +434,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -464,7 +464,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 8080 @@ -482,7 +482,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -493,7 +493,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -508,7 +508,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -519,7 +519,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -530,7 +530,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -545,7 +545,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -556,7 +556,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -567,7 +567,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -582,7 +582,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -593,7 +593,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -609,7 +609,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -624,7 +624,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -639,7 +639,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -655,7 +655,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -672,7 +672,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -690,7 +690,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -712,7 +712,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -735,7 +735,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -754,7 +754,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -774,7 +774,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": 42949672 @@ -792,7 +792,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -807,7 +807,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -823,7 +823,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -840,7 +840,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -858,7 +858,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -880,7 +880,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -903,7 +903,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -922,7 +922,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -942,7 +942,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -971,7 +971,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -997,7 +997,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "right": "cwr" @@ -1012,7 +1012,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1028,7 +1028,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "==", @@ -1046,7 +1046,7 @@ { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, { @@ -1075,7 +1075,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": 22222 @@ -1090,7 +1090,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1105,7 +1105,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1121,7 +1121,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1138,7 +1138,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1156,7 +1156,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1178,7 +1178,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1201,7 +1201,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1220,7 +1220,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1240,7 +1240,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1255,7 +1255,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1271,7 +1271,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1288,7 +1288,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1306,7 +1306,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1328,7 +1328,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1351,7 +1351,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1370,7 +1370,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1390,7 +1390,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": 1234 @@ -1408,7 +1408,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1423,7 +1423,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1439,7 +1439,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1456,7 +1456,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1474,7 +1474,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1496,7 +1496,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1519,7 +1519,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1538,7 +1538,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1558,7 +1558,7 @@ "left": { "payload": { "field": "doff", - "name": "tcp" + "protocol": "tcp" } }, "right": 8 diff --git a/tests/py/inet/tcp.t.json.output b/tests/py/inet/tcp.t.json.output index d099d6fe..e840169a 100644 --- a/tests/py/inet/tcp.t.json.output +++ b/tests/py/inet/tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -29,7 +29,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -40,7 +40,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -51,7 +51,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -66,7 +66,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -82,7 +82,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -93,7 +93,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -110,7 +110,7 @@ { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, { diff --git a/tests/py/inet/udp.t.json b/tests/py/inet/udp.t.json index 096fe559..896d20d8 100644 --- a/tests/py/inet/udp.t.json +++ b/tests/py/inet/udp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": 80 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -42,7 +42,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -62,7 +62,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -130,7 +130,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -169,7 +169,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 80 @@ -187,7 +187,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -206,7 +206,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -226,7 +226,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -247,7 +247,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -270,7 +270,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -294,7 +294,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -339,7 +339,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": 6666 @@ -354,7 +354,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -370,7 +370,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -390,7 +390,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -411,7 +411,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -434,7 +434,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -458,7 +458,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -477,7 +477,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -497,7 +497,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 6666 @@ -515,7 +515,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -539,7 +539,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 22 @@ -554,7 +554,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -570,7 +570,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -587,7 +587,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -605,7 +605,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -627,7 +627,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -650,7 +650,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -669,7 +669,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -697,7 +697,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 0 @@ -720,7 +720,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 65535 diff --git a/tests/py/inet/udplite.t.json b/tests/py/inet/udplite.t.json index 5173a68c..75e72579 100644 --- a/tests/py/inet/udplite.t.json +++ b/tests/py/inet/udplite.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": 80 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -42,7 +42,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -62,7 +62,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -130,7 +130,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -169,7 +169,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": 80 @@ -187,7 +187,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -206,7 +206,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -226,7 +226,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -247,7 +247,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -270,7 +270,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -294,7 +294,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -339,7 +339,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": 6666 @@ -357,7 +357,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -381,7 +381,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": 22 @@ -396,7 +396,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -412,7 +412,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -429,7 +429,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -447,7 +447,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -469,7 +469,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -492,7 +492,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -511,7 +511,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", -- cgit v1.2.3