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

FSCORE-527

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16331 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2010-01-17 00:26:29 +00:00
parent 7fa36e835d
commit 50cc7ab07d
1 changed files with 15 additions and 4 deletions

19
src/switch_ivr_originate.c

@ -2569,7 +2569,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
!oglobals.progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) { !oglobals.progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) {
to++; to++;
oglobals.idx = IDX_TIMEOUT; oglobals.idx = IDX_TIMEOUT;
force_reason = SWITCH_CAUSE_PROGRESS_TIMEOUT; if (force_reason == SWITCH_CAUSE_NONE) {
force_reason = SWITCH_CAUSE_PROGRESS_TIMEOUT;
}
goto notready; goto notready;
} }
@ -2619,7 +2621,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
time_t elapsed = switch_epoch_time_now(NULL) - start; time_t elapsed = switch_epoch_time_now(NULL) - start;
if (cancel_cause && *cancel_cause > 0) { if (cancel_cause && *cancel_cause > 0) {
force_reason = *cancel_cause; if (force_reason == SWITCH_CAUSE_NONE) {
force_reason = *cancel_cause;
}
oglobals.idx = IDX_CANCEL; oglobals.idx = IDX_CANCEL;
goto notready; goto notready;
} }
@ -2632,6 +2636,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (!oglobals.sent_ring && !oglobals.progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) { if (!oglobals.sent_ring && !oglobals.progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) {
oglobals.idx = IDX_TIMEOUT; oglobals.idx = IDX_TIMEOUT;
if (force_reason == SWITCH_CAUSE_NONE) {
force_reason = SWITCH_CAUSE_PROGRESS_TIMEOUT;
}
goto notready; goto notready;
} }
@ -2942,13 +2949,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_channel_hangup(peer_channel, SWITCH_CAUSE_ATTENDED_TRANSFER); switch_channel_hangup(peer_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
switch_core_session_rwunlock(peer_session); switch_core_session_rwunlock(peer_session);
} }
force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER; if (force_reason == SWITCH_CAUSE_NONE) {
force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
}
} else if (zstr(soft_holding)) { } else if (zstr(soft_holding)) {
if (peer_channel && switch_channel_ready(peer_channel)) { if (peer_channel && switch_channel_ready(peer_channel)) {
switch_core_session_t *holding_session; switch_core_session_t *holding_session;
force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER; if (force_reason == SWITCH_CAUSE_NONE) {
force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
}
if ((holding_session = switch_core_session_locate(holding))) { if ((holding_session = switch_core_session_locate(holding))) {
switch_channel_set_variable(switch_core_session_get_channel(holding_session), SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, "true"); switch_channel_set_variable(switch_core_session_get_channel(holding_session), SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, "true");