diff options
| author | Sorin Zamfir <zamfir.sorin@yahoo.com> | 2016-03-20 11:52:57 +0200 |
|---|---|---|
| committer | Sorin Zamfir <sorin.zamfir@elektrobit.com> | 2016-03-20 11:53:27 +0200 |
| commit | 6f428c03e22d5e6667c857e06146f1e8b4ed8f53 (patch) | |
| tree | 5638502cbf1e59b260bcdc4a8da95cd15427dd74 /src/include/ndpi_protocols.h | |
| parent | 5349d33abf7bb9d23b6209c581773e0b967445a4 (diff) | |
| parent | 2d5d39db7bdaefc424caab7ec334371dd1f181bf (diff) | |
Merge remote-tracking branch 'remotes/iot/dev' into dev
Conflicts:
src/include/ndpi_protocol_ids.h
src/lib/ndpi_main.c
Diffstat (limited to 'src/include/ndpi_protocols.h')
| -rw-r--r-- | src/include/ndpi_protocols.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 7fc165281..b6ceed257 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -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__ */ |