kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4382 reverse this so you have to enable instead of disable, this patch has been causing srtp issues because the change in ssrc

This commit is contained in:
Anthony Minessale 2012-07-18 22:01:41 -05:00
parent 5867d0424d
commit f4715781dc
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_types.h
View File

@ -727,7 +727,7 @@ typedef enum {
*/
RTP_BUG_NEVER_CHANGE_SSRC_ON_MARKER = (1 << 9)
RTP_BUG_CHANGE_SSRC_ON_MARKER = (1 << 9)
/*
By default FS will change the SSRC when the marker is set and it detects a timestamp reset.

8
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -7021,12 +7021,12 @@ void sofia_glue_parse_rtp_bugs(switch_rtp_bug_flag_t *flag_pole, const char *str
*flag_pole &= ~RTP_BUG_GEN_ONE_GEN_ALL;
}
if (switch_stristr("NEVER_CHANGE_SSRC_ON_MARKER", str)) {
*flag_pole |= RTP_BUG_NEVER_CHANGE_SSRC_ON_MARKER;
if (switch_stristr("CHANGE_SSRC_ON_MARKER", str)) {
*flag_pole |= RTP_BUG_CHANGE_SSRC_ON_MARKER;
}
if (switch_stristr("~NEVER_CHANGE_SSRC_ON_MARKER", str)) {
*flag_pole &= ~RTP_BUG_NEVER_CHANGE_SSRC_ON_MARKER;
if (switch_stristr("~CHANGE_SSRC_ON_MARKER", str)) {
*flag_pole &= ~RTP_BUG_CHANGE_SSRC_ON_MARKER;
}
}

3
src/switch_rtp.c
View File

@ -4130,7 +4130,8 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
send_msg->header.m = (m && !(rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) ? 1 : 0;
/* If the marker was set, and the timestamp seems to have started over - set a new SSRC, to indicate this is a new stream */
if (send_msg->header.m && !(rtp_session->rtp_bugs & RTP_BUG_NEVER_CHANGE_SSRC_ON_MARKER) && (rtp_session->last_write_ts == RTP_TS_RESET ||
if (send_msg->header.m && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND) &&
(rtp_session->rtp_bugs & RTP_BUG_CHANGE_SSRC_ON_MARKER) && (rtp_session->last_write_ts == RTP_TS_RESET ||
(rtp_session->ts <= rtp_session->last_write_ts && rtp_session->last_write_ts > 0))) {
switch_rtp_set_ssrc(rtp_session, (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL)));
}