have resume media on hold not send invite back out at the holder but rather enable media in the 200ok

This commit is contained in:
Anthony Minessale committed 2014-10-10 16:09:43 -05:00
1 parent b5294c53d6
commit e4e9b1b9f9
4 files changed
+30 -16

No files matched your search

+8 -6
View File
@@ -1451,13 +1451,15 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
if (send_invite) {
if (!switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
switch_channel_set_flag(channel, CF_REQ_MEDIA);
if (!msg->numeric_arg) {
if (send_invite) {
if (!switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
switch_channel_set_flag(channel, CF_REQ_MEDIA);
}
sofia_glue_do_invite(session);
} else {
status = SWITCH_STATUS_FALSE;
}
sofia_glue_do_invite(session);
} else {
status = SWITCH_STATUS_FALSE;
}
}
break;
+1 -1
View File
@@ -6367,7 +6367,7 @@ void *SWITCH_THREAD_FUNC media_on_hold_thread_run(switch_thread_t *thread, void
switch_channel_wait_for_flag(channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
switch_channel_wait_for_flag(other_channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
switch_ivr_media(switch_core_session_get_uuid(other_session), SMF_REBRIDGE);
switch_ivr_media(switch_core_session_get_uuid(other_session), SMF_REBRIDGE|SMF_REPLYONLY_B);
if (switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO)) {
switch_core_media_clear_rtp_flag(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, SWITCH_RTP_FLAG_AUTOADJ);