Skype_Teams, Mining, SnapchatCall: fix flow category (#1624)

This commit is contained in:
Ivan Nardi
2022-07-03 18:51:16 +02:00
committed by GitHub
parent 77ac58e553
commit eed47acfc8
5 changed files with 17 additions and 2 deletions
+1
View File
@@ -5542,6 +5542,7 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
&cached_proto, 0 /* Don't remove it as it can be used for other connections */)) {
ndpi_set_detected_protocol(ndpi_str, flow, cached_proto, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI_CACHE);
ret.master_protocol = flow->detected_protocol_stack[1], ret.app_protocol = flow->detected_protocol_stack[0];
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
return(ret);
}
}
+7
View File
@@ -1598,8 +1598,15 @@ static int ndpi_search_quic_extra(struct ndpi_detection_module_struct *ndpi_stru
(packet->payload[1] == 201 || /* RTCP, Receiver Report */
packet->payload[1] == 200 || /* RTCP, Sender Report */
is_valid_rtp_payload_type(packet->payload[1] & 0x7F)) /* RTP */) {
ndpi_protocol proto;
NDPI_LOG_DBG(ndpi_struct, "Found RTP/RTCP over QUIC\n");
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SNAPCHAT_CALL, NDPI_PROTOCOL_QUIC, NDPI_CONFIDENCE_DPI);
/* In "extra_eval" data path, if we change the classification, we need to update the category, too */
proto.master_protocol = NDPI_PROTOCOL_QUIC;
proto.app_protocol = NDPI_PROTOCOL_SNAPCHAT_CALL;
proto.category = NDPI_PROTOCOL_CATEGORY_UNSPECIFIED;
ndpi_fill_protocol_category(ndpi_struct, flow, &proto);
} else {
/* Unexpected traffic pattern: we should investigate it... */
NDPI_LOG_INFO(ndpi_struct, "To investigate...\n");
+7
View File
@@ -54,7 +54,14 @@ static int ndpi_check_skype_udp_again(struct ndpi_detection_module_struct *ndpi_
}
if (detected) {
ndpi_protocol proto;
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_TEAMS, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
/* In "extra_eval" data path, if we change the classification, we need to update the category, too */
proto.master_protocol = NDPI_PROTOCOL_UNKNOWN;
proto.app_protocol = NDPI_PROTOCOL_SKYPE_TEAMS;
proto.category = NDPI_PROTOCOL_CATEGORY_UNSPECIFIED;
ndpi_fill_protocol_category(ndpi_struct, flow, &proto);
flow->extra_packets_func = NULL;
/* Stop checking extra packets */