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>
This commit is contained in:
Toni Uhlig 2021-02-23 14:46:47 +01:00
parent 0a6d44dc60
commit 0b5b177c14
No known key found for this signature in database
GPG key ID: 22C5333D922537D2
11 changed files with 269 additions and 239 deletions

View file

@ -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"
}