diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-03-13 02:28:10 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-03-13 02:28:10 +0100 |
| commit | ed1647b9446f84d81d41e8e28ccf063eff97b2f7 (patch) | |
| tree | 7f22929aca611955ea129dc0afee839bb63872bf /schema | |
| parent | dd35d9da3fd43f1091b8ec496ec25d72e54d8e22 (diff) | |
Disconnect nDPIsrvd clients immediately instead waiting for a failed write().
* nDPIsrvd: Collector/Distributor logging improved
* nDPIsrvd: Command line option for max remote descriptors
* nDPId: Stop spamming nDPIsrvd Collector with the same events over and over again
* nDPId: Refactored some variable names and events
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/basic_event_schema.json | 25 | ||||
| -rw-r--r-- | schema/packet_event_schema.json | 6 |
2 files changed, 22 insertions, 9 deletions
diff --git a/schema/basic_event_schema.json b/schema/basic_event_schema.json index 2a40524d0..65be964f7 100644 --- a/schema/basic_event_schema.json +++ b/schema/basic_event_schema.json @@ -3,7 +3,6 @@ "required": [ "alias", "source", - "thread_id", "packet_id", "basic_event_id", "basic_event_name", @@ -15,14 +14,20 @@ "properties": { "basic_event_name": { "enum": [ "Unknown datalink layer packet", "Unknown packet type" ] } } }, "then": { - "required": [ "layer_type" ] + "anyOf": [ + { "required": [ "layer_type" ] }, + { "not": { "required": [ "thread_id" ] } } + ] }, "if": { "properties": { "basic_event_name": { "enum": [ "Unknown L3 protocol" ] } } }, "then": { - "required": [ "protocol" ] + "anyOf": [ + { "required": [ "protocol" ] }, + { "not": { "required": [ "thread_id" ] } } + ] }, "if": { @@ -32,28 +37,34 @@ "Captured packet size is smaller than expected packet size" ] } } }, "then": { - "required": [ "size", "expected" ] + "anyOf": [ + { "required": [ "size", "expected" ] }, + { "not": { "required": [ "thread_id" ] } } + ] }, "if": { "properties": { "basic_event_name": { "enum": [ "Packet header invalid" ] } } }, "then": { - "required": [ "raeson" ] + "anyOf": [ + { "required": [ "raeson" ] }, + { "not": { "required": [ "thread_id" ] } } + ] }, "if": { "properties": { "basic_event_name": { "enum": [ "Flow memory allocation failed" ] } } }, "then": { - "required": [ "size" ] + "required": [ "thread_id", "size" ] }, "if": { "properties": { "basic_event_name": { "enum": [ "Max flows to track reached" ] } } }, "then": { - "required": [ "current_active", "current_idle", "max_active", "max_idle" ] + "required": [ "thread_id", "current_active", "current_idle", "max_active", "max_idle" ] }, "properties": { diff --git a/schema/packet_event_schema.json b/schema/packet_event_schema.json index d5b85f9e4..3ad88f79f 100644 --- a/schema/packet_event_schema.json +++ b/schema/packet_event_schema.json @@ -3,7 +3,6 @@ "required": [ "alias", "source", - "thread_id", "packet_id", "packet_event_id", "packet_event_name", @@ -25,7 +24,10 @@ "properties": { "packet_event_name": { "enum": ["packet-flow"] } } }, "then": { - "required": [ "flow_id", "flow_packet_id", "flow_last_seen", "flow_idle_time" ] + "required": [ "thread_id", "flow_id", "flow_packet_id", "flow_last_seen", "flow_idle_time" ] + }, + "else": { + "not": { "required": [ "thread_id", "flow_id", "flow_packet_id", "flow_last_seen", "flow_idle_time" ] } }, "properties": { |