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

pull cause from channels in ent originate when none of them answer or the call times out

This commit is contained in:
Anthony Minessale 2012-09-11 10:38:29 -05:00
parent a478a5de04
commit 02c24da081
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/switch_ivr_originate.c
View File

@ -1435,11 +1435,15 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
struct ent_originate_ringback rb_data = { 0 };
const char *ringback_data = NULL;
switch_event_t *var_event = NULL;
int getcause = 1;
*cause = SWITCH_CAUSE_SUCCESS;
switch_core_new_memory_pool(&pool);
if (zstr(bridgeto)) {
*cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
getcause = 0;
switch_goto_status(SWITCH_STATUS_FALSE, end);
}
@ -1512,6 +1516,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
if (!(x_argc = switch_separate_string_string(data, SWITCH_ENT_ORIGINATE_DELIM, x_argv, MAX_PEERS))) {
*cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
getcause = 0;
switch_goto_status(SWITCH_STATUS_FALSE, end);
}
@ -1601,6 +1606,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
if (hp) {
*cause = hp->cause;
getcause = 0;
status = hp->status;
*bleg = hp->bleg;
switch_mutex_unlock(hp->mutex);
@ -1625,11 +1631,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
continue;
}
switch_mutex_unlock(handles[i].mutex);
if (getcause && *cause != handles[i].cause && handles[i].cause != SWITCH_CAUSE_LOSE_RACE) {
*cause = handles[i].cause;
getcause++;
}
switch_thread_join(&tstatus, handles[i].thread);
switch_event_destroy(&handles[i].ovars);
}
if (channel && rb_data.thread) {
switch_channel_set_flag(channel, CF_NOT_READY);
switch_thread_join(&tstatus, rb_data.thread);
@ -1639,6 +1650,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
end:
if (getcause == 1 && *cause == SWITCH_CAUSE_SUCCESS) {
*cause = SWITCH_CAUSE_NO_ANSWER;
}
if (var_event && var_event != ovars) {
switch_event_destroy(&var_event);
}