kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-01 22:33:48 +00:00
Code Issues Projects Releases Wiki Activity

FS-7678 #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2015-06-19 01:34:31 -05:00
parent 70684fe109
commit 0865c7e331
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/switch_ivr_originate.c
View File

@ -82,6 +82,7 @@ static const switch_state_handler_table_t originate_state_handlers = {
typedef struct { typedef struct {
switch_core_session_t *down_session;
switch_core_session_t *peer_session; switch_core_session_t *peer_session;
switch_channel_t *peer_channel; switch_channel_t *peer_channel;
switch_caller_profile_t *caller_profile; switch_caller_profile_t *caller_profile;
@ -1891,7 +1892,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_channel_t *caller_channel = NULL; switch_channel_t *caller_channel = NULL;
char *peer_names[MAX_PEERS] = { 0 }; char *peer_names[MAX_PEERS] = { 0 };
switch_core_session_t *new_session = NULL, *peer_session; switch_core_session_t *new_session = NULL, *peer_session = NULL;
switch_caller_profile_t *new_profile = NULL, *caller_caller_profile; switch_caller_profile_t *new_profile = NULL, *caller_caller_profile;
char *chan_type = NULL, *chan_data; char *chan_type = NULL, *chan_data;
switch_channel_t *peer_channel = NULL; switch_channel_t *peer_channel = NULL;
@ -2278,11 +2279,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
list of cause names which should be considered fatal list of cause names which should be considered fatal
*/ */
if ((var = switch_event_get_header(var_event, "hangup_on_single_reject"))) { if ((var = switch_event_get_header(var_event, "hangup_on_single_reject"))) {
hangup_on_single_reject = 1; hangup_on_single_reject = switch_true(var);
} }
if (hangup_on_single_reject || (var = switch_event_get_header(var_event, "fail_on_single_reject"))) { if ((var = switch_event_get_header(var_event, "fail_on_single_reject")) || hangup_on_single_reject) {
fail_on_single_reject_var = strdup(var); if (var) {
fail_on_single_reject_var = strdup(var);
}
if (switch_true(var)) { if (switch_true(var)) {
fail_on_single_reject = 1; fail_on_single_reject = 1;
} else { } else {
@ -2650,6 +2654,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
originate_status[i].caller_profile = NULL; originate_status[i].caller_profile = NULL;
originate_status[i].peer_channel = NULL; originate_status[i].peer_channel = NULL;
originate_status[i].peer_session = NULL; originate_status[i].peer_session = NULL;
new_session = NULL; new_session = NULL;
if (and_argc > 1 || or_argc > 1) { if (and_argc > 1 || or_argc > 1) {
@ -2728,7 +2733,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
reason = switch_core_session_outgoing_channel(oglobals.session, originate_var_event, chan_type, reason = switch_core_session_outgoing_channel(oglobals.session, originate_var_event, chan_type,
new_profile, &new_session, NULL, myflags, cancel_cause); new_profile, &new_session, NULL, myflags, cancel_cause);
switch_event_destroy(&originate_var_event); switch_event_destroy(&originate_var_event);
if (reason != SWITCH_CAUSE_SUCCESS) { if (reason != SWITCH_CAUSE_SUCCESS) {
@ -3815,8 +3819,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_channel_clear_flag(originate_status[i].peer_channel, CF_ORIGINATING); switch_channel_clear_flag(originate_status[i].peer_channel, CF_ORIGINATING);
peer_session = originate_status[i].peer_session; peer_session = originate_status[i].peer_session;
originate_status[i].down_session = originate_status[i].peer_session;
originate_status[i].peer_session = NULL; originate_status[i].peer_session = NULL;
originate_status[i].peer_channel = NULL; originate_status[i].peer_channel = NULL;
switch_core_session_rwunlock(peer_session); switch_core_session_rwunlock(peer_session);
} }
@ -3830,11 +3836,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_channel_t *pchannel; switch_channel_t *pchannel;
const char *cause_str; const char *cause_str;
if (!originate_status[i].peer_session) { if (!originate_status[i].down_session) {
continue; continue;
} }
pchannel = switch_core_session_get_channel(originate_status[i].peer_session); pchannel = switch_core_session_get_channel(originate_status[i].down_session);
wait_for_cause(pchannel); wait_for_cause(pchannel);
if (switch_channel_down_nosig(pchannel)) { if (switch_channel_down_nosig(pchannel)) {
@ -3849,7 +3855,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
pos = !pos; pos = !pos;
} }
if (pos) { if (pos) {
ok = 0; ok = 0;
break; break;