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

FS-3675 --resolve

Browse Source
This commit is contained in:
Anthony Minessale 2011-11-09 10:07:54 -06:00
parent b4518aaeed
commit 522c0d5325
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/switch_ivr_originate.c
View File

@ -2462,9 +2462,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (fail_on_single_reject_var) { if (fail_on_single_reject_var) {
const char *cause_str = switch_channel_cause2str(reason); const char *cause_str = switch_channel_cause2str(reason);
int neg = *fail_on_single_reject_var == '!';
int pos = !!switch_stristr(cause_str, fail_on_single_reject_var);
if (neg) {
pos = !pos;
}
check_reject = 0; check_reject = 0;
if (fail_on_single_reject == 1 || switch_stristr(cause_str, fail_on_single_reject_var)) { if (fail_on_single_reject == 1 || pos) {
force_reason = reason; force_reason = reason;
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
goto outer_for; goto outer_for;
@ -2747,8 +2754,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
pchannel = switch_core_session_get_channel(originate_status[i].peer_session); pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
if (switch_channel_down(pchannel)) { if (switch_channel_down(pchannel)) {
int neg, pos;
cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel)); cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
if (switch_stristr(cause_str, fail_on_single_reject_var)) { neg = *fail_on_single_reject_var == '!';
pos = !!switch_stristr(cause_str, fail_on_single_reject_var);
if (neg) {
pos = !pos;
}
if (pos) {
ok = 0; ok = 0;
break; break;
} }
@ -3454,8 +3469,19 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
pchannel = switch_core_session_get_channel(originate_status[i].peer_session); pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
wait_for_cause(pchannel); wait_for_cause(pchannel);
if (switch_channel_down(pchannel)) { if (switch_channel_down(pchannel)) {
int neg, pos;
cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel)); cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
if (switch_stristr(cause_str, fail_on_single_reject_var)) {
neg = *fail_on_single_reject_var == '!';
pos = !!switch_stristr(cause_str, fail_on_single_reject_var);
if (neg) {
pos = !pos;
}
if (pos) {
ok = 0; ok = 0;
break; break;
} }