diff options
| author | Sorin Zamfir <zamfir.sorin@yahoo.com> | 2016-04-03 14:45:08 +0300 |
|---|---|---|
| committer | srz <srz@melcu.org> | 2016-04-03 14:45:39 +0300 |
| commit | 7b66fcff37608786fa4484f75717f7641d920c6b (patch) | |
| tree | 9d1fbc9148325397c289a85d50fa5d5099b57e10 /src/include/ndpi_protocol_ids.h | |
| parent | 40b219c397c31ae2a2081c670e7daa9894ea31d1 (diff) | |
| parent | aa86387ba949ba70c4791e9df68bcf47fdc4a286 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/include/ndpi_protocol_ids.h')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 59707896b..cfc0ad56d 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -83,7 +83,7 @@ #define NDPI_PROTOCOL_APPLEJUICE 24 #define NDPI_PROTOCOL_DIRECTCONNECT 25 #define NDPI_PROTOCOL_SOCRATES 26 -#define NDPI_PROTOCOL_WINMX 27 +#define NDPI_PROTOCOL_COAP 27 #define NDPI_PROTOCOL_VMWARE 28 #define NDPI_PROTOCOL_MAIL_SMTPS 29 #define NDPI_PROTOCOL_FILETOPIA 30 @@ -270,9 +270,7 @@ #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 - +#define NDPI_PROTOCOL_MQTT 222 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ #define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MQTT |