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:
Sorin Zamfir
2016-03-20 11:53:27 +02:00
committed by Sorin Zamfir
8 changed files with 370 additions and 4 deletions
+3 -1
View File
@@ -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)
+4 -2
View File
@@ -197,7 +197,8 @@ void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struc
void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_starcraft(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_coap(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
/* --- INIT FUNCTIONS --- */
void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
@@ -337,5 +338,6 @@ void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_stracraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_coap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
#endif /* __NDPI_PROTOCOLS_H__ */
+19
View File
@@ -345,6 +345,14 @@ typedef enum {
HTTP_METHOD_CONNECT
} ndpi_http_method;
typedef enum {
COAP_METHOD_UNKNOWN = 0,
COAP_METHOD_GET,
COAP_METHOD_POST,
COAP_METHOD_PUT,
COAP_METHOD_DELETE
} ndpi_coap_method;
struct ndpi_id_struct {
/**
detected_protocol_bitmask:
@@ -576,6 +584,9 @@ struct ndpi_flow_tcp_struct {
u_int8_t prev_zmq_pkt_len;
u_char prev_zmq_pkt[10];
#endif
#ifdef NDPI_PROTOCOL_MQTT
u_int8_t mqtt_stage:2;
#endif
}
#ifndef WIN32
__attribute__ ((__packed__))
@@ -625,6 +636,9 @@ struct ndpi_flow_udp_struct {
u_int8_t eaq_pkt_id;
u_int32_t eaq_sequence;
#endif
#ifdef NDPI_PROTOCOL_COAP
u_int32_t coap_stage:2;
#endif
}
#ifndef WIN32
__attribute__ ((__packed__))
@@ -907,6 +921,11 @@ struct ndpi_flow_struct {
char *url, *content_type;
} http;
struct {
ndpi_coap_method method;
char *url, *content_type;
} coap;
union {
/* the only fields useful for nDPI and ntopng */