Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
@@ -963,8 +963,17 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
http_bitmask_exclude_other(flow);
|
||||
return;
|
||||
} else
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP, NDPI_PROTOCOL_CATEGORY_WEB);
|
||||
} else {
|
||||
/* This check is required as RTSP is pretty similiar to HTTP (prevent false-positives). */
|
||||
if (strncmp((const char *)packet->payload + filename_start,
|
||||
"rtsp://", ndpi_min(7, packet->payload_packet_len - filename_start)) == 0)
|
||||
{
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
return;
|
||||
} else {
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP, NDPI_PROTOCOL_CATEGORY_WEB);
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG_DBG2(ndpi_struct,
|
||||
"Filename HTTP found: %d, we look for line info..\n", filename_start);
|
||||
|
||||
@@ -51,8 +51,8 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct
|
||||
{
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
if (packet->parsed_lines > 0 &&
|
||||
LINE_STARTS(packet->line[0], "SETUP rtsp://") != 0 &&
|
||||
LINE_ENDS(packet->line[0], "RTSP/1.0") != 0)
|
||||
{
|
||||
ndpi_int_rtsp_add_connection(ndpi_struct, flow);
|
||||
@@ -102,6 +102,7 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->udp != NULL && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& ((NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RTP) == 0)
|
||||
|| (NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RTCP) == 0)
|
||||
|
||||
Reference in New Issue
Block a user