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

FS-5530 --resolve

This commit is contained in:
Anthony Minessale 2013-06-20 20:58:55 -05:00
parent f35ea43b38
commit e1b6d4d1be
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/switch_ivr_bridge.c
View File

@ -1542,17 +1542,25 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
switch_ivr_park_session(session); switch_ivr_park_session(session);
} else if ((var = switch_channel_get_variable(caller_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) { } else if ((var = switch_channel_get_variable(caller_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) {
transfer_after_bridge(session, var); transfer_after_bridge(session, var);
} else if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && } else {
switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { const char *hup = switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE);
switch_call_cause_t cause = switch_channel_get_cause(peer_channel); int explicit = 0;
if (cause == SWITCH_CAUSE_NONE) {
cause = SWITCH_CAUSE_NORMAL_CLEARING; if (hup) {
explicit = !strcasecmp(hup, "explicit");
} }
if (switch_channel_test_flag(peer_channel, CF_INTERCEPTED)) { if (explicit || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && switch_true(hup))) {
switch_channel_set_flag(peer_channel, CF_INTERCEPT); switch_call_cause_t cause = switch_channel_get_cause(peer_channel);
if (cause == SWITCH_CAUSE_NONE) {
cause = SWITCH_CAUSE_NORMAL_CLEARING;
}
if (switch_channel_test_flag(peer_channel, CF_INTERCEPTED)) {
switch_channel_set_flag(peer_channel, CF_INTERCEPT);
}
switch_channel_hangup(caller_channel, cause);
} }
switch_channel_hangup(caller_channel, cause);
} }
} }
} }