diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-02-23 14:46:47 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-02-23 14:46:47 +0100 |
| commit | 0b5b177c14582dcaff854dda98db93c8d001682d (patch) | |
| tree | ab1a2dffe19f0f03e0ff70e9da9360edb7a0f016 /schema | |
| parent | 0a6d44dc60fb44c8aa59397d29b1f6cbb134d47d (diff) | |
Extended nDPIsrvd.h with address parsing.
* nDPId supports looading of custom nDPI protocol/category files
* extended JSON schemas according to nDPI / nDPId JSON serializing
* removed memory holes in nDPId
* extended examples/c-captured
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/basic_event_schema.json | 3 | ||||
| -rw-r--r-- | schema/daemon_event_schema.json | 2 | ||||
| -rw-r--r-- | schema/flow_event_schema.json | 43 | ||||
| -rw-r--r-- | schema/packet_event_schema.json | 3 |
4 files changed, 44 insertions, 7 deletions
diff --git a/schema/basic_event_schema.json b/schema/basic_event_schema.json index 626602ad2..958b4316c 100644 --- a/schema/basic_event_schema.json +++ b/schema/basic_event_schema.json @@ -19,7 +19,8 @@ "type": "number" }, "packet_id": { - "type": "number" + "type": "number", + "minimum": 0 }, "basic_event_id": { "type": "number", diff --git a/schema/daemon_event_schema.json b/schema/daemon_event_schema.json index 020b55161..7a40a6ca0 100644 --- a/schema/daemon_event_schema.json +++ b/schema/daemon_event_schema.json @@ -22,7 +22,7 @@ }, "packet_id": { "type": "number", - "minimum": 1 + "minimum": 0 }, "daemon_event_id": { "type": "number", diff --git a/schema/flow_event_schema.json b/schema/flow_event_schema.json index 6ed7c4615..60d36a4de 100644 --- a/schema/flow_event_schema.json +++ b/schema/flow_event_schema.json @@ -35,7 +35,7 @@ }, "packet_id": { "type": "number", - "minimum": 1 + "minimum": 0 }, "flow_event_id": { "type": "number", @@ -100,7 +100,7 @@ "type": "string", "oneOf": [ { - "pattern": "[0-9]+" + "pattern": "^[0-9]+$" }, { "enum": [ @@ -118,10 +118,18 @@ "maximum": 1 }, "src_ip": { - "type": "string" + "type": "string", + "anyOf" : [ + { "format": "ipv4" }, + { "format": "ipv6" } + ] }, "dst_ip": { - "type": "string" + "type": "string", + "anyOf" : [ + { "format": "ipv4" }, + { "format": "ipv6" } + ] }, "src_port": { "type": "number", @@ -136,21 +144,48 @@ "ndpi": { "type": "object" }, + "dhcp": { + "type": "object" + }, + "bittorrent": { + "type": "object" + }, + "mdns": { + "type": "object" + }, + "ubntac2": { + "type": "object" + }, + "kerberos": { + "type": "object" + }, + "telnet": { + "type": "object" + }, "tls": { "type": "object" }, "quic": { "type": "object" }, + "imap": { + "type": "object" + }, "http": { "type": "object" }, + "pop": { + "type": "object" + }, "smtp": { "type": "object" }, "dns": { "type": "object" }, + "ftp": { + "type": "object" + }, "ssh": { "type": "object" } diff --git a/schema/packet_event_schema.json b/schema/packet_event_schema.json index d3f5a77d9..6f722bf6f 100644 --- a/schema/packet_event_schema.json +++ b/schema/packet_event_schema.json @@ -19,7 +19,8 @@ "type": "number" }, "packet_id": { - "type": "number" + "type": "number", + "minimum": 0 }, "packet_event_id": { "type": "number", |