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

FS-6054 --resolve

This commit is contained in:
Anthony Minessale 2013-12-18 23:22:13 +05:00
parent 713303a2a9
commit 9a20d0ab0c
Notes: Travis Cross 2013-12-30 15:59:41 +00:00 
Causes FS to crash during hold operations
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switch_core_media.c
View File

@ -3717,6 +3717,8 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session
switch_channel_clear_flag(session->channel, CF_HOLD_LOCK); switch_channel_clear_flag(session->channel, CF_HOLD_LOCK);
if (switch_channel_test_flag(session->channel, CF_PROTO_HOLD)) { if (switch_channel_test_flag(session->channel, CF_PROTO_HOLD)) {
const char *val;
switch_yield(250000); switch_yield(250000);
if (a_engine->max_missed_packets) { if (a_engine->max_missed_packets) {
@ -3735,6 +3737,13 @@ SWITCH_DECLARE(int) switch_core_media_toggle_hold(switch_core_session_t *session
} }
} }
if (!switch_media_handle_test_media_flag(smh, SCMF_DISABLE_RTP_AUTOADJ) &&
!((val = switch_channel_get_variable(session->channel, "disable_rtp_auto_adjust")) && switch_true(val)) &&
!switch_channel_test_flag(session->channel, CF_WEBRTC)) {
/* Reactivate the NAT buster flag. */
switch_rtp_set_flag(a_engine->rtp_session, SWITCH_RTP_FLAG_AUTOADJ);
}
switch_channel_clear_flag(session->channel, CF_PROTO_HOLD); switch_channel_clear_flag(session->channel, CF_PROTO_HOLD);
switch_channel_mark_hold(session->channel, SWITCH_FALSE); switch_channel_mark_hold(session->channel, SWITCH_FALSE);
switch_channel_presence(session->channel, "unknown", "unhold", NULL); switch_channel_presence(session->channel, "unknown", "unhold", NULL);