Merge remote-tracking branch 'remotes/iot/dev' into dev
Conflicts: src/include/ndpi_protocol_ids.h src/lib/ndpi_main.c
This commit is contained in:
@@ -270,9 +270,11 @@
|
||||
#define NDPI_SERVICE_OFFICE_365 219
|
||||
#define NDPI_SERVICE_CLOUDFLARE 220
|
||||
#define NDPI_SERVICE_MS_ONE_DRIVE 221
|
||||
#define NDPI_PROTOCOL_COAP 222
|
||||
#define NDPI_PROTOCOL_MQTT 223
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_MS_ONE_DRIVE
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MQTT
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
Reference in New Issue
Block a user