vrr/nDPI
2
0
Fork 0
mirror of https://github.com/vel21ripn/nDPI.git synced 2026-05-04 18:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

RTP: fix detection over TCP (#2462)

Browse source 
RFC4571 is not the only way to wrap RTP messages in TCP streams.
For example, when RTP is encapsulated over TURN flows (i.e. via DATA
attribute) there is no additional framing.
See also 6127e0490
This commit is contained in:
Ivan Nardi 2024-05-29 18:31:10 +02:00 • committed by GitHub
parent 6127e04900
commit 81e42b748e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/protocols/rtp.c
View file

@ -83,23 +83,16 @@ static int is_valid_rtcp_payload_type(uint8_t type) {
return (type >= 192 && type <= 213);
}
int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t *seq)
int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct,
const u_int8_t *payload, u_int16_t payload_len, u_int16_t *seq)
{
struct ndpi_packet_struct *packet = &ndpi_struct->packet;
u_int8_t csrc_count, ext_header;
u_int16_t ext_len;
u_int32_t min_len;
const u_int8_t *payload = packet->payload;
u_int16_t payload_len = packet->payload_packet_len;
if(payload_len < 2)
return NO_RTP_RTCP;
if(packet->tcp != NULL) {
payload_len -= 2;
payload += 2; /* Skip the length field */
}
if((payload[0] & 0xC0) != 0x80) { /* Version 2 */
NDPI_LOG_DBG(ndpi_struct, "Not version 2\n");
return NO_RTP_RTCP;
@ -149,10 +142,12 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct,
u_int8_t is_rtp;
struct ndpi_packet_struct *packet = &ndpi_struct->packet;
const u_int8_t *payload = packet->payload;
u_int16_t payload_len = packet->payload_packet_len;
u_int16_t seq;
if(packet->tcp != NULL) {
payload += 2; /* Skip the length field */
payload_len -= 2;
}
NDPI_LOG_DBG(ndpi_struct, "search RTP (stage %d/%d)\n", flow->rtp_stage, flow->rtcp_stage);
@ -169,7 +164,7 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct,
return;
}
is_rtp = is_rtp_or_rtcp(ndpi_struct, &seq);
is_rtp = is_rtp_or_rtcp(ndpi_struct, payload, payload_len, &seq);
if(is_rtp == IS_RTP) {
if(flow->rtp_stage == 2) {