]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
JSON: Review payload expression
authorPhil Sutter <phil@nwl.cc>
Wed, 29 Aug 2018 14:23:24 +0000 (16:23 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Aug 2018 10:19:36 +0000 (12:19 +0200)
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>
89 files changed:
doc/libnftables-json.adoc
src/json.c
src/parser_json.c
tests/py/any/rawpayload.t.json
tests/py/any/rawpayload.t.json.output
tests/py/arp/arp.t.json
tests/py/arp/arp.t.json.output
tests/py/bridge/ether.t.json
tests/py/bridge/ether.t.json.output
tests/py/bridge/icmpX.t.json
tests/py/bridge/icmpX.t.json.output
tests/py/bridge/reject.t.json
tests/py/bridge/reject.t.json.output
tests/py/bridge/vlan.t.json
tests/py/inet/ah.t.json
tests/py/inet/comp.t.json
tests/py/inet/comp.t.json.output
tests/py/inet/dccp.t.json
tests/py/inet/dccp.t.json.output
tests/py/inet/esp.t.json
tests/py/inet/ether-ip.t.json
tests/py/inet/ether-ip.t.json.output
tests/py/inet/ether.t.json
tests/py/inet/ether.t.json.output
tests/py/inet/icmp.t.json
tests/py/inet/icmp.t.json.output
tests/py/inet/icmpX.t.json
tests/py/inet/icmpX.t.json.output
tests/py/inet/ip.t.json
tests/py/inet/ip_tcp.t.json
tests/py/inet/ip_tcp.t.json.output
tests/py/inet/map.t.json
tests/py/inet/map.t.json.output
tests/py/inet/meta.t.json
tests/py/inet/meta.t.json.output
tests/py/inet/sctp.t.json
tests/py/inet/sets.t.json
tests/py/inet/tcp.t.json
tests/py/inet/tcp.t.json.output
tests/py/inet/udp.t.json
tests/py/inet/udplite.t.json
tests/py/ip/dnat.t.json
tests/py/ip/dnat.t.json.output
tests/py/ip/dup.t.json
tests/py/ip/ether.t.json
tests/py/ip/ether.t.json.output
tests/py/ip/flowtable.t.json
tests/py/ip/hash.t.json
tests/py/ip/icmp.t.json
tests/py/ip/icmp.t.json.output
tests/py/ip/ip.t.json
tests/py/ip/ip.t.json.output
tests/py/ip/ip_tcp.t.json
tests/py/ip/ip_tcp.t.json.output
tests/py/ip/masquerade.t.json
tests/py/ip/masquerade.t.json.output
tests/py/ip/meta.t.json
tests/py/ip/meta.t.json.output
tests/py/ip/objects.t.json
tests/py/ip/objects.t.json.output
tests/py/ip/redirect.t.json
tests/py/ip/redirect.t.json.output
tests/py/ip/sets.t.json
tests/py/ip/snat.t.json
tests/py/ip/snat.t.json.output
tests/py/ip/tcp.t.json
tests/py/ip/tcp.t.json.output
tests/py/ip6/dnat.t.json
tests/py/ip6/dup.t.json
tests/py/ip6/ether.t.json
tests/py/ip6/ether.t.json.output
tests/py/ip6/flowtable.t.json
tests/py/ip6/flowtable.t.json.output
tests/py/ip6/icmpv6.t.json
tests/py/ip6/icmpv6.t.json.output
tests/py/ip6/ip6.t.json
tests/py/ip6/ip6.t.json.output
tests/py/ip6/map.t.json
tests/py/ip6/map.t.json.output
tests/py/ip6/masquerade.t.json
tests/py/ip6/masquerade.t.json.output
tests/py/ip6/meta.t.json
tests/py/ip6/meta.t.json.output
tests/py/ip6/redirect.t.json
tests/py/ip6/redirect.t.json.output
tests/py/ip6/sets.t.json
tests/py/ip6/snat.t.json
tests/py/ip6/vmap.t.json
tests/py/ip6/vmap.t.json.output

index 74e7d0271b8c84aba63647222f4972a13dd97dd9..6000e98d61ce920f22678d3aca3f18b0fcb06973 100644 (file)
@@ -79,7 +79,7 @@ translates into JSON as such:
                        "expr": [
                                { "match": {
                                        "left": { "payload": {
-                                                       "name": "tcp",
+                                                       "protocol": "tcp",
                                                        "field": "dport"
                                        }},
                                        "right": 22
@@ -1004,14 +1004,13 @@ the second one the upper boundary.
 [verse]
 ____
 *{ "payload": {
-       "name": "raw",
        "base":* 'BASE'*,
        "offset":* 'NUMBER'*,
        "len":* 'NUMBER'
 *}}*
 
 *{ "payload": {
-       "name":* 'STRING'*,
+       "protocol":* 'STRING'*,
        "field":* 'STRING'
 *}}*
 
@@ -1030,7 +1029,8 @@ point (*base*). Following *base* values are accepted:
 *"th"*::
        Offset is relative to Transport Layer header start offset.
 
-The second form allows to reference a field by name (*field*) in a named packet header (*name*).
+The second form allows to reference a field by name (*field*) in a named packet
+header (*protocol*).
 
 === EXTHDR
 [verse]
index 30ee81cf7cdff6e9e151f8504032ab465bb468b9..b153f138d04a94bc69fa682b92620c32e9ab7711 100644 (file)
@@ -415,19 +415,14 @@ json_t *meta_expr_json(const struct expr *expr, struct output_ctx *octx)
 
 json_t *payload_expr_json(const struct expr *expr, struct output_ctx *octx)
 {
-       const struct proto_hdr_template *tmpl;
-       const struct proto_desc *desc;
        json_t *root;
 
-       desc = expr->payload.desc;
-       tmpl = expr->payload.tmpl;
        if (payload_is_known(expr))
                root = json_pack("{s:s, s:s}",
-                                "name", desc->name,
-                                "field", tmpl->token);
+                                "protocol", expr->payload.desc->name,
+                                "field", expr->payload.tmpl->token);
        else
-               root = json_pack("{s:s, s:s, s:i, s:i}",
-                                "name", "raw",
+               root = json_pack("{s:s, s:i, s:i}",
                                 "base", proto_base_tokens[expr->payload.base],
                                 "offset", expr->payload.offset,
                                 "len", expr->len);
index dd21d428adad197b98a8d1c3093795c73d54c617..7dd621d8d9d4a24f6462f3dd65624eac2d04fe38 100644 (file)
@@ -467,56 +467,46 @@ static const struct proto_desc *proto_lookup_byname(const char *name)
 static struct expr *json_parse_payload_expr(struct json_ctx *ctx,
                                            const char *type, json_t *root)
 {
-       const char *name;
-       const char *field;
-       int val;
-       const struct proto_desc *proto;
-
-       if (json_unpack_err(ctx, root, "{s:s}", "name", &name))
-               return NULL;
-
-       /* special treatment for raw */
+       const char *protocol, *field, *base;
+       int offset, len, val;
 
-       if (!strcmp(name, "raw")) {
-               int offset, len, baseval;
+       if (!json_unpack(root, "{s:s, s:i, s:i}",
+                        "base", &base, "offset", &offset, "len", &len)) {
                struct expr *expr;
-               const char *base;
 
-               if (json_unpack_err(ctx, root, "{s:s, s:i, s:i}",
-                                   "base", &base,
-                                   "offset", &offset,
-                                   "len", &len))
-                       return NULL;
                if (!strcmp(base, "ll")) {
-                       baseval = PROTO_BASE_LL_HDR;
+                       val = PROTO_BASE_LL_HDR;
                } else if (!strcmp(base, "nh")) {
-                       baseval = PROTO_BASE_NETWORK_HDR;
+                       val = PROTO_BASE_NETWORK_HDR;
                } else if (!strcmp(base, "th")) {
-                       baseval = PROTO_BASE_TRANSPORT_HDR;
+                       val = PROTO_BASE_TRANSPORT_HDR;
                } else {
                        json_error(ctx, "Invalid payload base '%s'.", base);
                        return NULL;
                }
                expr = payload_expr_alloc(int_loc, NULL, 0);
-               payload_init_raw(expr, baseval, offset, len);
+               payload_init_raw(expr, val, offset, len);
                expr->byteorder         = BYTEORDER_BIG_ENDIAN;
                expr->payload.is_raw    = true;
-
                return expr;
-       }
+       } else if (!json_unpack(root, "{s:s, s:s}",
+                               "protocol", &protocol, "field", &field)) {
+               const struct proto_desc *proto = proto_lookup_byname(protocol);
 
-       proto = proto_lookup_byname(name);
-       if (!proto) {
-               json_error(ctx, "Unknown payload expr name '%s'.", name);
-               return NULL;
-       }
-       if (json_unpack_err(ctx, root, "{s:s}", "field", &field))
-               return NULL;
-       if (json_parse_payload_field(proto, field, &val)) {
-               json_error(ctx, "Unknown %s field '%s'.", name, field);
-               return NULL;
+               if (!proto) {
+                       json_error(ctx, "Unknown payload protocol '%s'.",
+                                  protocol);
+                       return NULL;
+               }
+               if (json_parse_payload_field(proto, field, &val)) {
+                       json_error(ctx, "Unknown %s field '%s'.",
+                                  protocol, field);
+                       return NULL;
+               }
+               return payload_expr_alloc(int_loc, proto, val);
        }
-       return payload_expr_alloc(int_loc, proto, val);
+       json_error(ctx, "Invalid payload expression properties.");
+       return NULL;
 }
 
 static struct expr *json_parse_tcp_option_expr(struct json_ctx *ctx,
index bfb7c9672b6a342667e71f921a447284aa6b25b2..9c513cba5719dfa984e87851ff6e0cef53ade620 100644 (file)
@@ -20,7 +20,6 @@
                 "payload": {
                     "base": "th",
                     "len": 16,
-                    "name": "raw",
                     "offset": 16
                 }
             },
@@ -49,8 +48,7 @@
                 "payload": {
                     "base": "th",
                    "len": 16,
-                   "offset": 16,
-                   "name": "raw"
+                   "offset": 16
                 }
             },
             "right": {
@@ -72,7 +70,6 @@
                 "payload": {
                     "base": "nh",
                     "len": 8,
-                    "name": "raw",
                     "offset": 8
                 }
             },
@@ -89,7 +86,6 @@
                 "payload": {
                     "base": "nh",
                     "len": 16,
-                    "name": "raw",
                     "offset": 8
                 }
             },
                 "payload": {
                     "base": "ll",
                     "len": 1,
-                    "name": "raw",
                     "offset": 0
                 }
             },
                         "payload": {
                             "base": "ll",
                             "len": 8,
-                            "name": "raw",
                             "offset": 0
                         }
                     },
                 "payload": {
                     "base": "ll",
                     "len": 128,
-                    "name": "raw",
                     "offset": 0
                 }
             },
index b423005f9a07cc43ea722b23ba31d38c009bab4f..699d9ecebed4f1fbc285754065752b7784c08585 100644 (file)
@@ -20,7 +20,6 @@
                 "payload": {
                     "base": "th",
                     "len": 16,
-                    "name": "raw",
                     "offset": 16
                 }
             },
@@ -42,7 +41,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -66,7 +65,6 @@
                         "payload": {
                             "base": "ll",
                             "len": 8,
-                            "name": "raw",
                             "offset": 0
                         }
                     },
@@ -89,7 +87,6 @@
                         "payload": {
                             "base": "ll",
                             "len": 8,
-                            "name": "raw",
                             "offset": 0
                         }
                     },
index 4fd98d193a7db4a895adf13e8ab650e16e08095b..49f5c2ca22ef4353cd352781fc6ca7a3134f900b 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 1
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
@@ -36,7 +36,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 22
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
@@ -67,7 +67,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
@@ -84,7 +84,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ptype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "0x0800"
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "request"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "reply"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "rrequest"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "rreply"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "inrequest"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "inreply"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "nak"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "reply"
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ptype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "0x0800"
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 6
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 4
                 "payload": {
                     "base": "nh",
                     "len": 32,
-                    "name": "raw",
                     "offset": 192
                 }
             },
                 "payload": {
                     "base": "nh",
                     "len": 48,
-                    "name": "raw",
                     "offset": 144
                 }
             },
index 0b60c445ca350f57263320c2267a19f5b0eb40d7..295d05fa700fe23187a3dfd7aab168298dec3549 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "ptype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "ip"
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": {
@@ -45,7 +45,7 @@
             "left": {
                 "payload": {
                     "field": "operation",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "op": "!=",
@@ -79,7 +79,7 @@
             "left": {
                 "payload": {
                     "field": "htype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 1
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "ptype",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "hlen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 6
             "left": {
                 "payload": {
                     "field": "plen",
-                    "name": "arp"
+                    "protocol": "arp"
                 }
             },
             "right": 4
                 "payload": {
                     "base": "nh",
                     "len": 32,
-                    "name": "raw",
                     "offset": 192
                 }
             },
                 "payload": {
                     "base": "nh",
                     "len": 48,
-                    "name": "raw",
                     "offset": 144
                 }
             },
index 6efa7c66029edd89784db82fdd4241a45b73f763..136a22cac0787d062acd621f7351c0df546209d7 100644 (file)
@@ -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"
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:01:02:03:04:05"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ff:fe:dc:ba:98:76"
index f68748cbadb0d649d7992980cdcbc1ffc649db8a..1c3cb8dc3a9b1a2621c41e181993e2ea63d4a0b3 100644 (file)
@@ -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"
@@ -45,7 +45,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -56,7 +56,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
@@ -67,7 +67,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
index 77638825873151208b42b6c3aabf461ed7522047..830bb799a6eca72fd3430cf1573eb29dd3ba5917 100644 (file)
@@ -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"
index e2695750d078a6e10b62147211e12c09b8f22da9..ecfaa62f1c353af00453e7706b426a0e59baff84 100644 (file)
@@ -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"
index d4750f4d0a7b036be6b4970697bdc35bee3dcf82..0ced129cb3e4884db0b8b8638d46a240bcec7a3e 100644 (file)
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "tcp"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip6"
index 602af9c12a6ca8f3d41d7aab368a9e3d8fe22a72..a83feabcebdbb2cbeac7af3188fe799e409101db 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
@@ -26,7 +26,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
@@ -47,7 +47,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
@@ -68,7 +68,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
@@ -86,7 +86,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip6"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip6"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip6"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip6"
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
index b57deca7b10ac36519c5af05aec1ede74fb441e2..7facb61bd5899e75dc9740cc85a62138b8c4deb2 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 0
@@ -35,7 +35,7 @@
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
@@ -46,7 +46,7 @@
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 0
@@ -61,7 +61,7 @@
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
@@ -72,7 +72,7 @@
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "op": "!=",
@@ -88,7 +88,7 @@
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
@@ -99,7 +99,7 @@
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "pcp",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 7
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "pcp",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 3
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "cfi",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 4094
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "10.0.0.1"
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "pcp",
-                    "name": "vlan"
+                    "protocol": "vlan"
                 }
             },
             "right": {
index 4489f2d3e12c47498d790f028e66162077152220..4f3fd74345c7929d6043a44ea3c6d650432305df 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "hdrlength",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "reserved",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": 111
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": 123
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "ah"
+                    "protocol": "ah"
                 }
             },
             "op": "!=",
index d76d6ed8a603487b295af58df9191fd9e61e7725..56fccafb6cb9be6ab9db486ca0c7d7bd6853e355 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "cpi",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
index 79e286b7e0f5b5958c3aee0eeec0fdc0ec23c887..215179984cf027d89b7e235aebe0c0973c869c81 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "comp"
+                    "protocol": "comp"
                 }
             },
             "op": "!=",
index 7f92504779c884b15c116bbadea0bc2d5060bdd0..7d87966f4e5edc67d2320a146180e94d24bf78b5 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": "request"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "op": "!=",
index 9e3a57a76091cfbf0b44423a2c2f8e92eff5220f..889e42091f91f9cafff04f58ce48ef9dcdd20983 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "dccp"
+                    "protocol": "dccp"
                 }
             },
             "right": {
index 39c446c7bb323b6d4ec86592122e7c2bee17260e..e6f59a65dee3702b6c34f2c3798c52167d8d6c23 100644 (file)
@@ -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": "!=",
             "left": {
                 "payload": {
                     "field": "spi",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "esp"
+                    "protocol": "esp"
                 }
             },
             "op": "!=",
index accb9d692c7b81ff39d28526846e33e300b44db4..b5356bb3667b6a6f3338a073b11fc78164770921 100644 (file)
@@ -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"
index 80f8a4c35378a9f5cf9ad7d9022597326c0385da..2ae5655a2afe4ed254b5a228447115e0d5f4c4ab 100644 (file)
@@ -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"
index b5042adbcb2e6da4a139c37deac3b03cfaa2918f..69b75ac0a8a57bf9beee91b37b8a51411fa0bf73 100644 (file)
@@ -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"
index bd7bd67e705e2613bcaf8d04b3e1145aba58cbd6..19e3865b07501f90a8fcbbe8a37affcae56dbe3f 100644 (file)
@@ -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"
index 55217cc9d1fd7d545bd8542f335b4078b5f592e1..efc4042859760050b88651fd116f3d0bbfffedfa 100644 (file)
@@ -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"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "echo-request"
index 2282900d58e983a1d4000133d2a4305900d95527..a5ee48bee6403db0a58b692de6b68a4b160b5327 100644 (file)
@@ -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"
index 23ee7ed800a03d0082f81d3375fafc6b7e4aea5c..b9905e9d00e9f12002deac389a00594ea9829e75 100644 (file)
@@ -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"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": 1
index 55158fee44c1eb5022d2ed7eaa15f457e2e32f71..15fdd15a2501a91ae53db33b59fbc4f7a5e7bdbe 100644 (file)
@@ -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"
index b23273774d3711bf5afa1a835afb21283477a2b8..4b2efd54ef6a261e085781739f5fa6fc401c8d5e 100644 (file)
@@ -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"
                         }
                     }
                 ]
index f9c8b5c6a6626446093df427343009a04161f402..e2f918aaf60693601c11d27570e5b9bcdf242379 100644 (file)
@@ -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
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "tcp"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "ip"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
index 1581f30ea1c1885e576594db75ffd500f9e161ba..bd6a8620eacfd333868a157f7373abf4b139e824 100644 (file)
@@ -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
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
index bb7f2a05b0c014bfca708ccf82d61085acf1e9ba..7fc2ac33b52311d0e8eff68e13720e5a8e258ff9 100644 (file)
@@ -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": {
index 74c9b4f62c8a00ce862b04a4dca08b842b279f48..6e5238e38f05b34dd4a63be3557aaa23c7eeeaca 100644 (file)
@@ -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": {
index 6c5f4567a5f49258e9a02b3b1b315a1bae5757a3..5bf8a547772698a5e5fec0c68832bac0903233ba 100644 (file)
@@ -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
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
index 0dc3371f6809f207a5f7033287a2314652221b50..565e2fa06c67a6fa9f36988a0f0a714dda275362 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
index 861930800150b2d36a8641cfad2bb3597cbde322..f382c6d27f9de47e4c422590258ada98519b2b27 100644 (file)
@@ -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": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": 23
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": 1111
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "vtag",
-                    "name": "sctp"
+                    "protocol": "sctp"
                 }
             },
             "op": "!=",
index 75881f7145ccd4420392231e8e481686096cb5a4..34f375880d60031672a68144872c715b76a3f931 100644 (file)
@@ -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": "!=",
index 2f83566d4fab6fd9cfe91cfbf8b25741f3d22eff..00e8ae7e87bc7b6f223e767621c46a7c15e9d3a7 100644 (file)
@@ -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": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 8080
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 1024
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 1024
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 1024
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 42949672
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ackseq",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": "cwr"
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flags",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "==",
                     {
                         "payload": {
                             "field": "flags",
-                            "name": "tcp"
+                            "protocol": "tcp"
                         }
                     },
                     {
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22222
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "window",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 1234
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "urgptr",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "doff",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 8
index d099d6febb12269ffccb1b37ffd1649b3a0b090f..e840169a965b5fbadb44108b024fe736ebf981d0 100644 (file)
@@ -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
                     {
                         "payload": {
                             "field": "flags",
-                            "name": "tcp"
+                            "protocol": "tcp"
                         }
                     },
                     {
index 096fe559c6645dbd84d407d835824ebd7fa8a852..896d20d8acd2e2e55558cf53bed0fc679d73709f 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 80
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 6666
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 6666
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 65535
index 5173a68c1dede022cb972f153382aeeb5f1c2a4c..75e72579035000249297e17b4d558eae594edf44 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": 80
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": 6666
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "udplite"
+                    "protocol": "udplite"
                 }
             },
             "op": "!=",
index f014030575dfc3317a384f6fdce9193c388a167c..3efa220c6ae8dc0ed312358f43fc93a99ae0d715 100644 (file)
@@ -13,7 +13,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -43,7 +43,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
@@ -74,7 +74,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 81
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
index 73b6b2042341a59c1a9b7b524f9fa9e718994e19..e1727063dd95d527648c058acc3329cf0e5571f7 100644 (file)
@@ -39,7 +39,7 @@
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
index abc5be471faf1bf6889ac1623bf7d933ba4ef4fa..a555fc4f94ebeaee06e3e5e0019b5407dcb64aa0 100644 (file)
@@ -26,7 +26,7 @@
                     "left": {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     "right": {
index f176bf7e147b984baf279c4d9ba789e2f0b391d4..8890f1530779fe987eb57d296b94918accfcaab8 100644 (file)
@@ -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"
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
index d31271617711adb75c87ea268e987fbdf0834781..811604e5b0b2bf3bc5cf23730848f54567047c92 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -16,7 +16,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.2.3.4"
@@ -27,7 +27,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
index 1d2b0b7a1a967b6dcfaaede54b9ac4476c1fef74..a03cc9d79350610a8bf6c5ecaed113341cf4a983 100644 (file)
@@ -8,7 +8,7 @@
                     "val": {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     }
                 }
index a463f94d6f43a293158bde0001a252914bc0b56f..640d9aa5b5ae100a792eea989ddc25bc3f2a82ce 100644 (file)
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             {
                                 "payload": {
                                     "field": "daddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             }
                         ]
                             "expr": {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip"
+                                    "protocol": "ip"
                                 }
                             },
                             "mod": 2,
index 4d51ad2fa634db8a44679274e6b642cdb81b57cf..89fe754cea368ba8bc7f058bfdaf32bd01aefcab 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-reply"
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "destination-unreachable"
@@ -41,7 +41,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "source-quench"
@@ -59,7 +59,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "redirect"
@@ -77,7 +77,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -95,7 +95,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "time-exceeded"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "parameter-problem"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "timestamp-request"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "timestamp-reply"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "info-request"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "info-reply"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "address-mask-request"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "address-mask-reply"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "router-advertisement"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "router-solicitation"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 111
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 12343
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 1245
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 33
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "gateway",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
index 488048f731cca3300d2270a6c16f25cc8936d17f..31857262507515c1b86ecafae7a882244d87ffd4 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
@@ -41,7 +41,7 @@
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": {
@@ -65,7 +65,7 @@
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "op": "!=",
index a6b53571e7a47f50c7ed6c8a917958af024ca2d0..a8766cb203b19597646d86d51c12766848bbd762 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "cs1"
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -36,7 +36,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "0x38"
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -67,7 +67,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 232
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 222
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "frag-off",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 233
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "tcp"
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 255
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 13172
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.3.1"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.3.100"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "1.1.1.1"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.0.1"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.0.1"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.0.2"
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     "0xff"
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     "0.0.0.255"
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                    "0xffff0000"
             "left": {
                 "payload": {
                     "field": "version",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 4
             "left": {
                 "payload": {
                     "field": "hdrlength",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 5
             "left": {
                 "payload": {
                     "field": "hdrlength",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "hdrlength",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 15
             "left": {
                 "payload": {
                     "field": "hdrlength",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "127.0.0.1"
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "ce"
             "left": {
                 "payload": {
                     "field": "ttl",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 23
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "af23"
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "cs0"
index 967e2a59fabbe4ec5608c90697d857b6c2177297..22b4d8c95e515fa45bd0a8bf09b7ae9c2d76aa41 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "cs7"
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -36,7 +36,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
@@ -75,7 +75,7 @@
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     "0.0.0.255"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "ect1"
index 9fd3339cef488f68e3deb9302506bafdebbfa6ca..453c1e43120295cc75a2142df28489df3bd4be30 100644 (file)
@@ -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"
@@ -50,7 +50,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
index 908288148a938cc65129c8b3c172991534138743..15bd8e11a30453bf725a1bda4df198a5e5dbd9b1 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
@@ -39,7 +39,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
index f2f798fe6bca9eb5d25e53c4271103b3bf1cd876..641487677adc5fd803f42bae5c36d16b2d9854ae 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -43,7 +43,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -66,7 +66,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
index c6e6ef04f5bcd20c6c350030c4aaa72972bf5850..8feac1dd529677b66b8fabd75dc876a625dada0d 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -29,7 +29,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -52,7 +52,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -76,7 +76,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -99,7 +99,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
index c06e48ffb081817f56b4a34a79adda2cf56ad2ea..59d97187ef7faf1430464909836bb5ac015749db 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -28,7 +28,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
@@ -74,7 +74,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
@@ -89,7 +89,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
index 5908ca6b839ec65f7bb9f612f66c7136ef701db0..93cede88f7c6272c8c57bb7f4d2562817df093f9 100644 (file)
@@ -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": "nd-router-advert"
@@ -35,7 +35,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
index 77c6886842b272b9c9556af2ed06467d0d49d837..f3036b0407f2f140f852c50809efb059968cd727 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.1.3"
@@ -24,7 +24,7 @@
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
@@ -55,7 +55,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.1.3"
@@ -74,7 +74,7 @@
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "192.168.1.3"
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
index ea0e991e417c195fccc0c24f66d31c487a298856..e5cb8feb2325f5fc041279bbba2666f031d1228b 100644 (file)
@@ -6,7 +6,7 @@
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
@@ -38,7 +38,7 @@
                 "left": {
                     "payload": {
                         "field": "dport",
-                        "name": "tcp"
+                        "protocol": "tcp"
                     }
                 },
                 "right": {
index 4a41489b73bac7e1d390ef82d914c93a90c97ab6..c2f264c8df76ceeba9b8e21b0fba5b6e1c209b42 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -43,7 +43,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -66,7 +66,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 1234
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "172.16.0.1"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 9998
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 39128
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "tcp"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
                     "left": {
                         "payload": {
                             "field": "dport",
-                            "name": "tcp"
+                            "protocol": "tcp"
                         }
                     },
                     "right": {
index 3db03be2f3deef893c9eaf00b8e043937f2bf1e6..2a3398b0d9db555760d144535d55bca3329142a9 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -29,7 +29,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -52,7 +52,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -76,7 +76,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -99,7 +99,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": 6
index dd6abed8547eb4292b362d6fec4d8507c89d8595..97ea15413bbe15724bccae088d13fe2b7665306a 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "@set1"
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -42,7 +42,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": "@set2"
@@ -60,7 +60,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     {
                         "payload": {
                             "field": "daddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     }
                 ]
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     },
                     {
                         "payload": {
                             "field": "daddr",
-                            "name": "ip"
+                            "protocol": "ip"
                         }
                     }
                 ]
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "right": {
index 1bf54f40427c9dc174d6b3594ece0e725b6c3837..9cb85f855f0523396061c5461c0ded4bfebe1ece 100644 (file)
@@ -13,7 +13,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -43,7 +43,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
@@ -74,7 +74,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
index f27c25dc3b0f73c8634fec92b9e480c64e283b26..46901ba051fee2da5951cf809df2482138b98e37 100644 (file)
@@ -13,7 +13,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -47,7 +47,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "op": "!=",
index e04cc1e2817bea76d0bcfdbc57be5cc773cfd1ac..33172f608171c6ed44180538599f16aa3d1aba88 100644 (file)
@@ -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": "ssh"
@@ -34,7 +34,7 @@
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -46,7 +46,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": "ssh"
index eb5f53f76068309be1ddef90e379ffc97fdef30a..9dd51de65738f59ffa170e3c80382c8d5e1db7fe 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "protocol",
-                    "name": "ip"
+                    "protocol": "ip"
                 }
             },
             "op": "!=",
@@ -35,7 +35,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 22
index ba16aa241d5de94b5e7ad681e66fb82844833923..4139d6455b56a3c507dbbfea798e2692ba606cf8 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -32,7 +32,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -57,7 +57,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
index 48d6ea3de32ddd2050aeb1a21b4bf1ef9bf906eb..53ad8bed98ff3e18bc85818a2679ed49f2cbcb25 100644 (file)
@@ -26,7 +26,7 @@
                     "left": {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip6"
+                            "protocol": "ip6"
                         }
                     },
                     "right": {
index 7de304814e1640cc2699a203975d78142802a3fe..1a349215c1d1af15bce435df9f347fdb8799b39f 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -24,7 +24,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1::2"
@@ -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": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1::2"
@@ -75,7 +75,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1::2"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1::2"
index add1359e573530638c362945147d8334724bad96..556ce91952ac3b2571ebdd7a53868ce670340e54 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 22
@@ -16,7 +16,7 @@
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1::2"
@@ -27,7 +27,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ether"
+                    "protocol": "ether"
                 }
             },
             "right": "00:0f:54:0c:11:04"
index be4dca676172f441ff37c5e0aaa7f89b0607645b..d0b3a957f01b5909391fa62cdf21be3d41d7b68f 100644 (file)
@@ -13,7 +13,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             }
                         ]
@@ -41,7 +41,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             },
                             {
index be4dca676172f441ff37c5e0aaa7f89b0607645b..d0b3a957f01b5909391fa62cdf21be3d41d7b68f 100644 (file)
@@ -13,7 +13,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             }
                         ]
@@ -41,7 +41,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             },
                             {
index 47907c740518f654be1e88f1237db2efb49c8c57..c953ee258142e1a2f38587ea05ceab5b68f0fa3a 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "destination-unreachable"
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "packet-too-big"
@@ -41,7 +41,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "time-exceeded"
@@ -59,7 +59,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "echo-request"
@@ -77,7 +77,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "echo-reply"
@@ -95,7 +95,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld-listener-query"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld-listener-report"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld-listener-done"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld-listener-reduction"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-solicit"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-neighbor-solicit"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-neighbor-advert"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-redirect"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "parameter-problem"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "router-renumbering"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "ind-neighbor-solicit"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "ind-neighbor-advert"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld2-listener-report"
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": 4
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "code",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": 2222
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "checksum",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "mtu",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "id",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": 2
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "sequence",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
index 17d8d95bcab7aacbf91c8f44af4d9a2946ef5424..36f1b04a4d2017bc916d4cbb358025db552a6ebf 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "mld-listener-done"
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
@@ -48,7 +48,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": {
@@ -72,7 +72,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "op": "!=",
index 925789cdf7a54709ccfaa06b3fb86fd77aa1248a..26f2e41f0e1076b5f892fd7b8475247c94cc6ccd 100644 (file)
@@ -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": {
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 22
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "length",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "esp"
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:0:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:0:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:0:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234::"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::2"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::1"
             "left": {
                 "payload": {
                     "field": "hoplimit",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 1
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "af42"
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 63
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "ect0"
             "left": {
                 "payload": {
                     "field": "ecn",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "ce"
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 0
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 12345
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "0xfffff"
index d72f3d189a416c94d97957b3803ae1cff752baff..2e548ca317cdb62515cb66a40ec06f5159056eba 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "cs7"
@@ -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": {
@@ -75,7 +75,7 @@
             "left": {
                 "payload": {
                     "field": "dscp",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 50
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "0:1234:1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:0:1234:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:0:1234:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:0:1234:1234:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:0:1234:1234"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "1234:1234:1234:1234:1234:1234:1234:0"
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "::18.52.18.52"
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
             "left": {
                 "payload": {
                     "field": "flowlabel",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 1048575
index 3dff018a232f2d38ebad59b4aa6bc2983e99088d..1117117e1293dbfbe167889961f46411c1d56c3a 100644 (file)
@@ -12,7 +12,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             },
                             "::ffff"
index c1baf0ccefc01231d1ea70a88e7f8a28ca80211b..59922df7d49a3e89b5314716ee46e1dd52550a4b 100644 (file)
@@ -12,7 +12,7 @@
                             {
                                 "payload": {
                                     "field": "saddr",
-                                    "name": "ip6"
+                                    "protocol": "ip6"
                                 }
                             },
                             "::ffff"
index 8191ce51a5ee7d7ae5c848804b83e0a171aba247..5071e42c4086df7fac19e3db792ac728adf1f774 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -43,7 +43,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -66,7 +66,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -90,7 +90,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
index 68f5ae22cec6eac204a37b47ebb0ffa240edc593..78a75daccf40d201ef4f61a580034cde5009d4b8 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -28,7 +28,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -52,7 +52,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -75,7 +75,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
index 176ef0f505665a8c46ce10466b0ef578e1382c48..e3c223538f0e67efa633fd02d6c4ebdc8a3ec641 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
@@ -28,7 +28,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -74,7 +74,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -89,7 +89,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
index 142d056ad6ab7872e43a15e99099811b25d5bd03..3ecc4f2861bc36aead9388cbee71e72c58af5c88 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmpv6"
+                    "protocol": "icmpv6"
                 }
             },
             "right": "nd-router-advert"
@@ -20,7 +20,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
@@ -35,7 +35,7 @@
             "left": {
                 "payload": {
                     "field": "type",
-                    "name": "icmp"
+                    "protocol": "icmp"
                 }
             },
             "right": "echo-request"
index ed227e76d7799757a630e993003bae1aa57dcb0c..9715c733f45d3d3cb08a0aab75f15d9aaac44245 100644 (file)
@@ -12,7 +12,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 954
@@ -30,7 +30,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "fe00::cafe"
@@ -51,7 +51,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -71,7 +71,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -94,7 +94,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 1234
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "fe00::cafe"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 9998
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "tcp"
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 39128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": 9128
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "daddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 6
                     "left": {
                         "payload": {
                             "field": "dport",
-                            "name": "tcp"
+                            "protocol": "tcp"
                         }
                     },
                     "right": {
index ffc898ecb86d7ef35d4670a4f2ee2dc1384ab87f..6f919ac8d5eaed6e18e9ed5883604e21210c991b 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -29,7 +29,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -52,7 +52,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -76,7 +76,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
@@ -99,7 +99,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "udp"
+                    "protocol": "udp"
                 }
             },
             "right": 53
             "left": {
                 "payload": {
                     "field": "nexthdr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": 6
index 7b08316e6d3b606d18a025f19636363edb188d55..4f0d99bf0d5d60082882e943397754a5e361e5db 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": "@set2"
@@ -23,7 +23,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "op": "!=",
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip6"
+                            "protocol": "ip6"
                         }
                     },
                     {
                         "payload": {
                             "field": "daddr",
-                            "name": "ip6"
+                            "protocol": "ip6"
                         }
                     }
                 ]
                     {
                         "payload": {
                             "field": "saddr",
-                            "name": "ip6"
+                            "protocol": "ip6"
                         }
                     },
                     {
                         "payload": {
                             "field": "daddr",
-                            "name": "ip6"
+                            "protocol": "ip6"
                         }
                     }
                 ]
index 7f3cf9d7d2808ec1516096790afc34f3bbf93051..b8fed518b3e7246ff4016bb14d4668733d8bfbb2 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
@@ -32,7 +32,7 @@
             "left": {
                 "payload": {
                     "field": "dport",
-                    "name": "tcp"
+                    "protocol": "tcp"
                 }
             },
             "right": {
index 0dfa0e0d135ec985afa627e6a5badc0d8c7b4168..aa299864c1523274ee0eb2007c09d30b0f271b2b 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -29,7 +29,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -53,7 +53,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -77,7 +77,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
index 3b5bc78e05e18e755fbc8879aa4bf38326ad74b5..a0ec0c91ee7897067bbb8d4c76413a8b03e1f069 100644 (file)
@@ -5,7 +5,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -29,7 +29,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -53,7 +53,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
@@ -77,7 +77,7 @@
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {
             "left": {
                 "payload": {
                     "field": "saddr",
-                    "name": "ip6"
+                    "protocol": "ip6"
                 }
             },
             "right": {