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

adding fail_on_single_reject dialplan option that can be set, which then immediately rejects the call even when sent to multiple destinations upon one party rejecting, useful if you are doing a ring all (, separated in the dial string for multiple calls at once) and you want a single rejection to make the call flow to the next action in the dialplan (in combination w/ continue_on_fail) for example to flow to voicemail. Thanks to George Shaw for this patch. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4193 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-02-10 21:47:12 +00:00
parent 59d4d0b071
commit d1d9fd9a23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/switch_ivr.c
View File

@ -2339,21 +2339,22 @@ static uint8_t check_channel_status(switch_channel_t **peer_channels,
switch_core_session_t **peer_sessions, switch_core_session_t **peer_sessions,
uint32_t len, uint32_t len,
int32_t *idx, int32_t *idx,
uint32_t *hups,
char *file, char *file,
char *key, char *key,
uint8_t early_ok) uint8_t early_ok)
{ {
uint32_t i; uint32_t i;
uint32_t hups = 0; *hups = 0;
*idx = -1; *idx = IDX_NADA;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!peer_channels[i]) { if (!peer_channels[i]) {
continue; continue;
} }
if (switch_channel_get_state(peer_channels[i]) >= CS_HANGUP) { if (switch_channel_get_state(peer_channels[i]) >= CS_HANGUP) {
hups++; (*hups)++;
} else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) ||
(early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) &&
!switch_channel_test_flag(peer_channels[i], CF_TAGGED)) { !switch_channel_test_flag(peer_channels[i], CF_TAGGED)) {
@ -2382,7 +2383,7 @@ static uint8_t check_channel_status(switch_channel_t **peer_channels,
} }
} }
if (hups == len) { if (*hups == len) {
return 0; return 0;
} else { } else {
return 1; return 1;
@ -2454,6 +2455,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
uint8_t sent_ring = 0, early_ok = 1; uint8_t sent_ring = 0, early_ok = 1;
switch_core_session_message_t *message = NULL; switch_core_session_message_t *message = NULL;
switch_event_t *var_event = NULL; switch_event_t *var_event = NULL;
uint8_t fail_on_single_reject = 0;
write_frame.data = fdata; write_frame.data = fdata;
@ -2548,6 +2550,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
} }
// When using the AND operator, the fail_on_single_reject flage may be set in order to indicate that a single
// rejections should terminate the attempt rather than a timeout, answer, or rejection by all.
if ((var = switch_event_get_header(var_event, "fail_on_single_reject")) && switch_true(var)) {
fail_on_single_reject = 1;
}
if (file && !strcmp(file, "undef")) { if (file && !strcmp(file, "undef")) {
file = NULL; file = NULL;
} }
@ -2573,6 +2581,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
for (r = 0; r < or_argc; r++) { for (r = 0; r < or_argc; r++) {
uint32_t hups;
reason = SWITCH_CAUSE_UNALLOCATED; reason = SWITCH_CAUSE_UNALLOCATED;
memset(peer_names, 0, sizeof(peer_names)); memset(peer_names, 0, sizeof(peer_names));
peer_session = NULL; peer_session = NULL;
@ -2841,9 +2850,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
while ((!caller_channel || switch_channel_ready(caller_channel)) && while ((!caller_channel || switch_channel_ready(caller_channel)) &&
check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, early_ok)) { check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok)) {
if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec))) { // When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail.
if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec)) || (fail_on_single_reject && hups)) {
idx = IDX_CANCEL; idx = IDX_CANCEL;
goto notready; goto notready;
} }