kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 17:41:53 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16392 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2010-01-18 19:36:30 +00:00
parent 6f51744301
commit 6151c4aa75
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/switch_ivr_originate.c
View File

@ -1709,7 +1709,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
oglobals.bridge_early_media = -1; oglobals.bridge_early_media = -1;
if (session) { if (session) {
const char *to_var; const char *to_var, bypass_media = NULL, proxy_media = NULL;
caller_channel = switch_core_session_get_channel(session); caller_channel = switch_core_session_get_channel(session);
switch_channel_set_flag(caller_channel, CF_ORIGINATOR); switch_channel_set_flag(caller_channel, CF_ORIGINATOR);
oglobals.session = session; oglobals.session = session;
@ -1719,27 +1719,39 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
timelimit_sec = atoi(to_var); timelimit_sec = atoi(to_var);
} }
if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE))) { proxy_media = switch_channel_get_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE);
bypass_media = switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE);
if (switch_true(proxy_media)) {
switch_channel_set_flag(caller_channel, CF_PROXY_MEDIA); switch_channel_set_flag(caller_channel, CF_PROXY_MEDIA);
} else {
switch_channel_clear_flag(caller_channel, CF_PROXY_MEDIA);
} }
if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) if (switch_true(bypass_media)) {
|| (switch_true(switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE)))) {
if (!switch_channel_test_flag(caller_channel, CF_ANSWERED)
&& !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
switch_channel_set_flag(caller_channel, CF_PROXY_MODE); switch_channel_set_flag(caller_channel, CF_PROXY_MODE);
} else { } else {
if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) { switch_channel_clear_flag(caller_channel, CF_PROXY_MODE);
}
switch_channel_set_variable(caller_channel, SWITCH_B_SDP_VARIABLE, NULL); switch_channel_set_variable(caller_channel, SWITCH_B_SDP_VARIABLE, NULL);
} else {
if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && switch_channel_media_ready(caller_channel)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"Channel is already up, delaying proxy mode 'till both legs are answered.\n"); "Channel is already up, delaying proxy mode 'till both legs are answered.\n");
switch_channel_set_variable(caller_channel, "bypass_media_after_bridge", "true"); switch_channel_set_variable(caller_channel, "bypass_media_after_bridge", "true");
switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL); switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL);
switch_channel_clear_flag(caller_channel, CF_PROXY_MODE); switch_channel_clear_flag(caller_channel, CF_PROXY_MODE);
} }
if (switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA) && switch_channel_media_ready(caller_channel)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"Channel is already up, proxy media cannot be used anymore\n");
switch_channel_set_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE, NULL);
switch_channel_clear_flag(caller_channel, CF_PROXY_MEDIA);
} }
}
} }
if (timelimit_sec <= 0) { if (timelimit_sec <= 0) {