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 <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 89 insertions, 89 deletions

diff --git a/tests/py/ip6/ip6.t.json b/tests/py/ip6/ip6.t.json
index 925789cd..26f2e41f 100644
--- a/tests/py/ip6/ip6.t.json
+++ b/tests/py/ip6/ip6.t.json
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "cs1"
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -36,7 +36,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "0x38"
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -67,7 +67,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -106,7 +106,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -139,7 +139,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 22
@@ -154,7 +154,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -170,7 +170,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -192,7 +192,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -215,7 +215,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -234,7 +234,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -254,7 +254,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -284,7 +284,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 22
@@ -299,7 +299,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -315,7 +315,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -332,7 +332,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -350,7 +350,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -372,7 +372,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -395,7 +395,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -416,7 +416,7 @@
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -436,7 +436,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -461,7 +461,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -488,7 +488,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -516,7 +516,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "esp"
@@ -531,7 +531,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -547,7 +547,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -566,7 +566,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -586,7 +586,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -603,7 +603,7 @@
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -621,7 +621,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 1
@@ -636,7 +636,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -652,7 +652,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -669,7 +669,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -687,7 +687,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -709,7 +709,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -732,7 +732,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -751,7 +751,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -771,7 +771,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:1234:1234"
@@ -786,7 +786,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234:1234:1234"
@@ -801,7 +801,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234:1234:1234"
@@ -816,7 +816,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234:1234:1234"
@@ -831,7 +831,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:0:1234:1234:1234:1234:1234"
@@ -846,7 +846,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234:1234:1234"
@@ -861,7 +861,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:0:1234:1234:1234"
@@ -876,7 +876,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::1234:1234"
@@ -891,7 +891,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:0:1234"
@@ -906,7 +906,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:1234::"
@@ -921,7 +921,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234:1234"
@@ -936,7 +936,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234:1234"
@@ -951,7 +951,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234:1234"
@@ -966,7 +966,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234:1234"
@@ -981,7 +981,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::1234:1234"
@@ -996,7 +996,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::1234"
@@ -1011,7 +1011,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234::"
@@ -1026,7 +1026,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234"
@@ -1041,7 +1041,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234"
@@ -1056,7 +1056,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234"
@@ -1071,7 +1071,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234"
@@ -1086,7 +1086,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::1234"
@@ -1101,7 +1101,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::"
@@ -1116,7 +1116,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234"
@@ -1131,7 +1131,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234"
@@ -1146,7 +1146,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234"
@@ -1161,7 +1161,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234"
@@ -1176,7 +1176,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::"
@@ -1191,7 +1191,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234"
@@ -1206,7 +1206,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234"
@@ -1221,7 +1221,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234"
@@ -1236,7 +1236,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::"
@@ -1251,7 +1251,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234"
@@ -1266,7 +1266,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234"
@@ -1281,7 +1281,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::"
@@ -1296,7 +1296,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234"
@@ -1311,7 +1311,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::"
@@ -1326,7 +1326,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -1346,7 +1346,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1"
@@ -1357,7 +1357,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::2"
@@ -1372,7 +1372,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -1393,7 +1393,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
@@ -1419,7 +1419,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1"
@@ -1442,7 +1442,7 @@
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 1
@@ -1465,7 +1465,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "af42"
@@ -1488,7 +1488,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 63
@@ -1511,7 +1511,7 @@
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "ect0"
@@ -1534,7 +1534,7 @@
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "ce"
@@ -1557,7 +1557,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 0
@@ -1580,7 +1580,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 12345
@@ -1603,7 +1603,7 @@
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "0xfffff"