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

FS-5500 --resolve

This commit is contained in:
Anthony Minessale 2013-06-11 11:38:18 -05:00
parent efe3ff7be4
commit f2db9b56be
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -3099,17 +3099,16 @@ SWITCH_STANDARD_APP(audio_bridge_function)
return; return;
} else { } else {
if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE)) || if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE)) ||
switch_true(switch_channel_get_variable(peer_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE))) { switch_true(switch_channel_get_variable(peer_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE))) {
switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA_AFTER_BRIDGE); switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA_AFTER_BRIDGE);
} }
if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
switch_ivr_signal_bridge(session, peer_session); switch_ivr_signal_bridge(session, peer_session);
} else { } else {
switch_channel_t *channel = switch_core_session_get_channel(session); char *a_key = (char *) switch_channel_get_variable(caller_channel, "bridge_terminate_key");
switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
char *a_key = (char *) switch_channel_get_variable(channel, "bridge_terminate_key");
char *b_key = (char *) switch_channel_get_variable(peer_channel, "bridge_terminate_key"); char *b_key = (char *) switch_channel_get_variable(peer_channel, "bridge_terminate_key");
int ok = 0; int ok = 0;
switch_input_callback_function_t func = NULL; switch_input_callback_function_t func = NULL;
@ -3129,11 +3128,6 @@ SWITCH_STANDARD_APP(audio_bridge_function)
b_key = NULL; b_key = NULL;
} }
if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE)) ||
switch_true(switch_channel_get_variable(peer_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE))) {
switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA_AFTER_BRIDGE);
}
switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, b_key); switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, b_key);
} }