Fix whatsapp signature detecting.

This commit is contained in:
Vitaly Lavrov
2019-01-31 11:27:40 +03:00
parent 2ec41c1732
commit 476fbbfe4e
+13 -21
View File
@@ -26,34 +26,26 @@
void ndpi_search_whatsapp(struct ndpi_detection_module_struct *ndpi_struct, void ndpi_search_whatsapp(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow) { struct ndpi_flow_struct *flow) {
struct ndpi_packet_struct *packet = &flow->packet; struct ndpi_packet_struct *packet = &flow->packet;
u_int8_t whatsapp_sequence[] = { static u_int8_t whatsapp_sequence[] = {
0x45, 0x44, 0x0, 0x01, 0x0, 0x0, 0x02, 0x08, 0x45, 0x44, 0x0, 0x01, 0x0, 0x0, 0x02, 0x08,
0x0, 0x57, 0x41, 0x02, 0x0, 0x0, 0x0 0x0, 0x57, 0x41, 0x02, 0x0, 0x0, 0x0
}; };
NDPI_LOG_DBG(ndpi_struct, "search WhatsApp\n"); NDPI_LOG_DBG(ndpi_struct, "search WhatsApp\n");
if(flow->l4.tcp.wa_matched_so_far == 0) { if(flow->l4.tcp.wa_matched_so_far < sizeof(whatsapp_sequence)) {
if(memcmp(packet->payload, whatsapp_sequence, packet->payload_packet_len)) { size_t match_len = sizeof(whatsapp_sequence) - flow->l4.tcp.wa_matched_so_far;
NDPI_EXCLUDE_PROTO(ndpi_struct, flow); if(packet->payload_packet_len < match_len)
} else match_len = packet->payload_packet_len;
flow->l4.tcp.wa_matched_so_far = packet->payload_packet_len;
return; if(!memcmp(packet->payload, &whatsapp_sequence[flow->l4.tcp.wa_matched_so_far], match_len)) {
} else { flow->l4.tcp.wa_matched_so_far += match_len;
if(memcmp(packet->payload, &whatsapp_sequence[flow->l4.tcp.wa_matched_so_far], if(flow->l4.tcp.wa_matched_so_far == sizeof(whatsapp_sequence)) {
sizeof(whatsapp_sequence)-flow->l4.tcp.wa_matched_so_far)) NDPI_LOG_INFO(ndpi_struct, "found WhatsApp\n");
NDPI_EXCLUDE_PROTO(ndpi_struct, flow); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_UNKNOWN);
else }
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_UNKNOWN); return;
}
return;
}
if((packet->payload_packet_len > 240)
&& (memcmp(packet->payload, whatsapp_sequence, sizeof(whatsapp_sequence)) == 0)) {
NDPI_LOG_INFO(ndpi_struct, "found WhatsApp\n");
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_UNKNOWN);
} }
NDPI_EXCLUDE_PROTO(ndpi_struct, flow); NDPI_EXCLUDE_PROTO(ndpi_struct, flow);