forked from Mirrors/freeswitch
try this rupa
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14921 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
89e6324c17
commit
feb4601946
@ -2075,8 +2075,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
|
||||
|
||||
done:
|
||||
|
||||
switch_safe_free(fail_on_single_reject_var);
|
||||
|
||||
*cause = SWITCH_CAUSE_NONE;
|
||||
|
||||
if (caller_channel && !switch_channel_ready(caller_channel)) {
|
||||
@ -2219,6 +2217,32 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
|
||||
|
||||
if (status == SWITCH_STATUS_SUCCESS) {
|
||||
goto outer_for;
|
||||
} else {
|
||||
int ok = 0;
|
||||
|
||||
if (fail_on_single_reject_var && !switch_true(fail_on_single_reject_var)) {
|
||||
ok = 1;
|
||||
for (i = 0; i < and_argc; i++) {
|
||||
switch_channel_t *pchannel;
|
||||
const char *cause_str;
|
||||
|
||||
if (!originate_status[i].peer_session) {
|
||||
continue;
|
||||
}
|
||||
pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
|
||||
|
||||
if (switch_channel_down(pchannel)) {
|
||||
cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
|
||||
if (switch_stristr(cause_str, fail_on_single_reject_var)) {
|
||||
ok = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!ok) {
|
||||
goto outer_for;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2251,7 +2275,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
|
||||
if (var_event && var_event != ovars) {
|
||||
switch_event_destroy(&var_event);
|
||||
}
|
||||
|
||||
switch_safe_free(write_frame.data);
|
||||
switch_safe_free(fail_on_single_reject_var);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user