Skip to content

[core] Skip timer on invalid RTP and invalidate undecryptable RTCP. #2875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[core] Skip timer on invalid RTP and invalidate undecryptable RTCP. #2875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ae819c
[core] Skip the RTP session's timer when an invalid package is received.
morbit85 Jul 30, 2025
0705be4
[core] Invalidate received encrypted RTCP packet if we can't decrypt it.
morbit85 Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions src/switch_rtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5841,6 +5841,12 @@ static int get_recv_payload(switch_rtp_t *rtp_session)
return r;
}

static inline void invalidate_received_packet(switch_rtp_t *rtp_session, switch_size_t *bytes)
{
*bytes = 0;
rtp_session->skip_timer = 1;
}

#define return_cng_frame() do_cng = 1; goto timer_check

static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t *bytes, switch_frame_flag_t *flags,
Expand Down Expand Up @@ -6006,7 +6012,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1,
"Invalid Packet SEQ: %d TS: %d PT:%d ignored\n",
ntohs(rtp_session->recv_msg.header.seq), ntohl(rtp_session->last_rtp_hdr.ts), rtp_session->last_rtp_hdr.pt);
*bytes = 0;
invalidate_received_packet(rtp_session, bytes);
}
}

Expand Down Expand Up @@ -6098,11 +6104,16 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
if (stat) {
//++rtp_session->srtp_errs[rtp_session->srtp_idx_rtp]++;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "RTCP UNPROTECT ERR\n");
sbytes = 0;
} else {
//rtp_session->srtp_errs[rtp_session->srtp_idx_rtp] = 0;
}

*bytes = sbytes;
if (sbytes > 0) {
*bytes = sbytes;
} else {
invalidate_received_packet(rtp_session, bytes);
}
}
#endif
switch_mutex_unlock(rtp_session->ice_mutex);
Expand Down Expand Up @@ -6227,7 +6238,8 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
*bytes && rtp_session->last_rtp_hdr.pt != rtp_session->recv_te &&
ts && !rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session) && ts == rtp_session->last_cng_ts) {
/* we already sent this frame..... */
*bytes = 0;
invalidate_received_packet(rtp_session, bytes);

return SWITCH_STATUS_SUCCESS;
}

Expand Down Expand Up @@ -6308,7 +6320,11 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
rtp_session->srtp_errs[rtp_session->srtp_idx_rtp] = 0;
}

*bytes = sbytes;
if (sbytes > 0) {
*bytes = sbytes;
} else {
invalidate_received_packet(rtp_session, bytes);
}
}
switch_mutex_unlock(rtp_session->ice_mutex);
#endif
Expand All @@ -6333,7 +6349,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
if (*bytes > (length * 4 + 4)) {
*bytes -= (length * 4 + 4);
} else {
*bytes = 0;
invalidate_received_packet(rtp_session, bytes);
}
}
}
Expand Down
Loading