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

fix small originate issues 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8834 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-06-24 22:14:47 +00:00
parent f33aa02132
commit 50e9411c82
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/switch_ivr_originate.c
View File

@ -771,7 +771,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
pass = 0;
var = NULL;
to = 0;
progress_timelimit_sec = 0;
sent_ring = 0;
progress = 0;
@ -1017,7 +1016,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
goto notready;
}
if (!sent_ring && !progress && (switch_timestamp(NULL) - start) > (time_t) progress_timelimit_sec) {
if (!sent_ring && !progress && progress_timelimit_sec && (switch_timestamp(NULL) - start) > (time_t) progress_timelimit_sec) {
to++;
idx = IDX_TIMEOUT;
goto notready;
@ -1417,9 +1416,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
continue;
}
switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING);
if (status == SWITCH_STATUS_SUCCESS && bleg && *bleg && *bleg == peer_sessions[i]) {
continue;
if (status == SWITCH_STATUS_SUCCESS) {
if (bleg && *bleg && *bleg == peer_sessions[i]) {
continue;
}
} else if (switch_channel_get_state(switch_core_session_get_channel(peer_sessions[i])) < CS_HANGUP) {
switch_channel_hangup(switch_core_session_get_channel(peer_sessions[i]), *cause);
}
switch_core_session_rwunlock(peer_sessions[i]);
}