diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_define.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 3 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 3 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 16 |
4 files changed, 21 insertions, 2 deletions
diff --git a/src/include/ndpi_define.h b/src/include/ndpi_define.h index 3fa0b34e6..266c76968 100644 --- a/src/include/ndpi_define.h +++ b/src/include/ndpi_define.h @@ -156,6 +156,7 @@ /* misc definitions */ #define NDPI_DEFAULT_MAX_TCP_RETRANSMISSION_WINDOW_SIZE 0x10000 +#define NDPI_ENABLE_DEBUG_MESSAGES 1 /* TODO: rebuild all memory areas to have a more aligned memory block here */ diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 5132167f7..8084525f2 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -268,9 +268,10 @@ #define NDPI_SERVICE_HOTSPOT_SHIELD 215 #define NDPI_SERVICE_OCS 218 #define NDPI_SERVICE_OFFICE_365 219 +#define NDPI_PROTOCOL_COAP 221 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ -#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MS_LYNC +#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_COAP #define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1) #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL) diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 240f7b42e..56028c995 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -197,6 +197,7 @@ 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); /* --- INIT FUNCTIONS --- */ @@ -336,5 +337,5 @@ 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); #endif /* __NDPI_PROTOCOLS_H__ */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index c4f4fdf73..2ae137b74 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -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: @@ -625,6 +633,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__)) @@ -905,6 +916,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 */ |