Merge branch 'dev' into wireguard
Conflicts: src/include/ndpi_protocols.h src/lib/ndpi_main.c Get upstream developments.
This commit is contained in:
@@ -277,6 +277,7 @@ typedef enum {
|
||||
NDPI_PROTOCOL_AMAZON_VIDEO = 240,
|
||||
NDPI_PROTOCOL_GOOGLE_DOCS = 241,
|
||||
NDPI_PROTOCOL_WHATSAPP_FILES = 242, /* Videos, pictures, voice messages... */
|
||||
NDPI_PROTOCOL_TARGUS_GETDATA = 243,
|
||||
/*
|
||||
IMPORTANT
|
||||
before allocating a new identifier please fill up
|
||||
|
||||
Reference in New Issue
Block a user