diff options
| author | lns <matzeton@googlemail.com> | 2022-05-19 16:45:57 +0200 |
|---|---|---|
| committer | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2022-05-19 19:58:11 +0200 |
| commit | 8b750686c93c14d839c1e988cbc298e9aade1c74 (patch) | |
| tree | 8dc47931ff27248850ff91fd8b189d1ba74406ff | |
| parent | dae7986a37459c2d2da65a72b0446f93756b191b (diff) | |
Moved RTSP http patterns to the protocol source file.
Signed-off-by: lns <matzeton@googlemail.com>
| -rw-r--r-- | src/lib/ndpi_main.c | 1 | ||||
| -rw-r--r-- | src/lib/protocols/http.c | 18 | ||||
| -rw-r--r-- | src/lib/protocols/rtsp.c | 4 |
3 files changed, 4 insertions, 19 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 5fdfc07ec..4a139c251 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -986,6 +986,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_WORLDOFWARCRAFT, NDPI_PROTOCOL_THUNDER, NDPI_PROTOCOL_IRC, NDPI_PROTOCOL_IPP, + NDPI_PROTOCOL_RTSP, NDPI_PROTOCOL_MATCHED_BY_CONTENT, NDPI_PROTOCOL_NO_MORE_SUBPROTOCOLS); /* NDPI_PROTOCOL_HTTP can have (content-matched) subprotocols */ ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MDNS, diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index 4b66a1da6..9b151c3b6 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -361,20 +361,6 @@ static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *nd /* ************************************************************* */ -static void rtsp_parse_packet_acceptline(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if((packet->accept_line.len >= 28) - && (memcmp(packet->accept_line.ptr, "application/x-rtsp-tunnelled", 28) == 0)) { - NDPI_LOG_INFO(ndpi_struct, "found RTSP accept line\n"); - ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_RTSP, NDPI_PROTOCOL_CATEGORY_MEDIA); - } -} - -/* ************************************************************* */ - static void setHttpUserAgent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, char *ua) { if( !strcmp(ua, "Windows NT 5.0")) ua = "Windows 2000"; @@ -764,10 +750,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_ if(packet->accept_line.ptr != NULL) { NDPI_LOG_DBG2(ndpi_struct, "Accept line found %.*s\n", packet->accept_line.len, packet->accept_line.ptr); - if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, - NDPI_PROTOCOL_RTSP) != 0) { - rtsp_parse_packet_acceptline(ndpi_struct, flow); - } } /* check for authorization line */ diff --git a/src/lib/protocols/rtsp.c b/src/lib/protocols/rtsp.c index 9592d1db5..0e08157ff 100644 --- a/src/lib/protocols/rtsp.c +++ b/src/lib/protocols/rtsp.c @@ -50,7 +50,9 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct } if (packet->parsed_lines > 0 && - LINE_ENDS(packet->line[0], "RTSP/1.0") != 0) + (LINE_ENDS(packet->line[0], "RTSP/1.0") != 0 || + LINE_ENDS(packet->accept_line, "application/x-rtsp-tunnelled") != 0 || + LINE_ENDS(packet->content_line, "application/x-rtsp-tunnelled") != 0)) { ndpi_int_rtsp_add_connection(ndpi_struct, flow); return; |