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

FS-10521 FS-10612 [mod_callcenter] Member exit reason set to EXIT_WITH_KEY when it should be TIMEOUT and only set EXIT_WITH_KEY if the key pressed is set at cc_exit_keys

This commit is contained in:
Italo Rossi 2018-01-25 10:49:53 -03:00
parent 6b1dccc3b2
commit 19e543ba3d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_callcenter/mod_callcenter.c
View File

@ -3102,11 +3102,12 @@ SWITCH_STANDARD_APP(callcenter_function)
if (moh_valid && moh_expanded) { if (moh_valid && moh_expanded) {
switch_status_t status = switch_ivr_play_file(member_session, NULL, moh_expanded, &args); switch_status_t status = switch_ivr_play_file(member_session, NULL, moh_expanded, &args);
switch_bool_t exiting_with_key = ht.exit_keys && *(ht.exit_keys) && !zstr(&ht.dtmf) && strchr(ht.exit_keys, ht.dtmf);
if (status == SWITCH_STATUS_FALSE /* Invalid Recording */ && SWITCH_READ_ACCEPTABLE(status)) { if (status == SWITCH_STATUS_FALSE /* Invalid Recording */ && SWITCH_READ_ACCEPTABLE(status)) {
/* Sadly, there doesn't seem to be a return to switch_ivr_play_file that tell you the file wasn't found. FALSE also mean that the channel got switch to BRAKE state, so we check for read acceptable */ /* Sadly, there doesn't seem to be a return to switch_ivr_play_file that tell you the file wasn't found. FALSE also mean that the channel got switch to BRAKE state, so we check for read acceptable */
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member_session), SWITCH_LOG_WARNING, "Couldn't play file '%s', continuing wait with no audio\n", cur_moh); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member_session), SWITCH_LOG_WARNING, "Couldn't play file '%s', continuing wait with no audio\n", cur_moh);
moh_valid = SWITCH_FALSE; moh_valid = SWITCH_FALSE;
} else if (status == SWITCH_STATUS_BREAK) { } else if ((status == SWITCH_STATUS_BREAK) && exiting_with_key) {
char buf[2] = { ht.dtmf, 0 }; char buf[2] = { ht.dtmf, 0 };
switch_channel_set_variable(member_channel, "cc_exit_key", buf); switch_channel_set_variable(member_channel, "cc_exit_key", buf);
h->member_cancel_reason = CC_MEMBER_CANCEL_REASON_EXIT_WITH_KEY; h->member_cancel_reason = CC_MEMBER_CANCEL_REASON_EXIT_WITH_KEY;
@ -3115,7 +3116,9 @@ SWITCH_STANDARD_APP(callcenter_function)
break; break;
} }
} else { } else {
if ((switch_ivr_collect_digits_callback(member_session, &args, 0, 0)) == SWITCH_STATUS_BREAK) { switch_status_t status = switch_ivr_collect_digits_callback(member_session, &args, 0, 0);
switch_bool_t exiting_with_key = ht.exit_keys && *(ht.exit_keys) && !zstr(&ht.dtmf) && strchr(ht.exit_keys, ht.dtmf);
if ((status == SWITCH_STATUS_BREAK) && exiting_with_key) {
char buf[2] = { ht.dtmf, 0 }; char buf[2] = { ht.dtmf, 0 };
switch_channel_set_variable(member_channel, "cc_exit_key", buf); switch_channel_set_variable(member_channel, "cc_exit_key", buf);
h->member_cancel_reason = CC_MEMBER_CANCEL_REASON_EXIT_WITH_KEY; h->member_cancel_reason = CC_MEMBER_CANCEL_REASON_EXIT_WITH_KEY;