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

FS-7636 #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2015-06-10 16:18:32 -05:00
parent 2cc0348422
commit 7b47692597
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/switch_ivr_bridge.c
View File

@ -724,14 +724,18 @@ static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *ses
state = switch_channel_get_state(channel); state = switch_channel_get_state(channel);
if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) &&
!switch_channel_test_flag(channel, CF_XFER_ZOMBIE) && bd && !bd->clean_exit && state != CS_PARK && state != CS_ROUTING &&
state == CS_EXCHANGE_MEDIA && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) {
if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) {
switch_ivr_park_session(session); switch_ivr_park_session(session);
return SWITCH_STATUS_FALSE;
} else if (state < CS_HANGUP && (var = switch_channel_get_variable(channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) { } else if (state < CS_HANGUP && (var = switch_channel_get_variable(channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) {
transfer_after_bridge(session, var); transfer_after_bridge(session, var);
} else { return SWITCH_STATUS_FALSE;
if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && }
!switch_channel_test_flag(channel, CF_XFER_ZOMBIE) && bd && !bd->clean_exit
&& state != CS_PARK && state != CS_ROUTING && state == CS_EXCHANGE_MEDIA && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) {
if (switch_channel_test_flag(channel, CF_INTERCEPTED)) { if (switch_channel_test_flag(channel, CF_INTERCEPTED)) {
switch_channel_clear_flag(channel, CF_INTERCEPT); switch_channel_clear_flag(channel, CF_INTERCEPT);
switch_channel_clear_flag(channel, CF_INTERCEPTED); switch_channel_clear_flag(channel, CF_INTERCEPTED);
@ -748,7 +752,6 @@ static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *ses
} }
} }
} }
}
if (switch_channel_get_state(channel) == CS_EXCHANGE_MEDIA) { if (switch_channel_get_state(channel) == CS_EXCHANGE_MEDIA) {
switch_channel_set_variable(channel, "park_timeout", "3"); switch_channel_set_variable(channel, "park_timeout", "3");