kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-08 08:51:50 +00:00
Code Issues Projects Releases Wiki Activity

fix reaction in att_xfer when call is cancelled or times out

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14650 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-08-27 16:43:55 +00:00
parent 5176da3dfe
commit 8a753a4f42
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_ivr_originate.c
View File

@ -1893,7 +1893,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_dtmf_t dtmf = { 0, 0 }; switch_dtmf_t dtmf = { 0, 0 };
if (switch_channel_dequeue_dtmf(caller_channel, &dtmf) == SWITCH_STATUS_SUCCESS) { if (switch_channel_dequeue_dtmf(caller_channel, &dtmf) == SWITCH_STATUS_SUCCESS) {
if (dtmf.digit == *cancel_key) { if (dtmf.digit == *cancel_key) {
oglobals.idx = IDX_TIMEOUT; oglobals.idx = IDX_CANCEL;
goto notready; goto notready;
} }
} }
@ -2014,10 +2014,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (switch_channel_up(originate_status[i].peer_channel)) { if (switch_channel_up(originate_status[i].peer_channel)) {
if (caller_channel && i == 0) { if (caller_channel && i == 0) {
holding = switch_channel_get_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE); holding = switch_channel_get_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE);
holding = switch_core_session_strdup(oglobals.session, holding);
switch_channel_set_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE, NULL); switch_channel_set_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE, NULL);
} }
if (holding) { if (holding && oglobals.idx != IDX_TIMEOUT && oglobals.idx != IDX_CANCEL) {
switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(originate_status[i].peer_session)); switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(originate_status[i].peer_session));
} else { } else {
switch_channel_hangup(originate_status[i].peer_channel, reason); switch_channel_hangup(originate_status[i].peer_channel, reason);