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

FS-3000 revert previous - flush digits after pin error

This commit is contained in:
Jeff Lenk 2011-01-24 14:48:44 -06:00
parent 976859bb45
commit 4eb5bbf41c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mod/applications/mod_conference/mod_conference.c
View File

@ -5597,7 +5597,6 @@ SWITCH_STANDARD_APP(conference_function)
char pin_buf[80] = ""; char pin_buf[80] = "";
int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */
int pin_valid = 0; int pin_valid = 0;
int be_friendly = 0;
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
char *supplied_pin_value; char *supplied_pin_value;
@ -5632,23 +5631,19 @@ SWITCH_STANDARD_APP(conference_function)
switch_status_t pstatus = SWITCH_STATUS_FALSE; switch_status_t pstatus = SWITCH_STATUS_FALSE;
/* be friendly */ /* be friendly */
if (!be_friendly) { if (conference->pin_sound) {
if (conference->pin_sound) { pstatus = conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf));
pstatus = conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); } else if (conference->tts_engine && conference->tts_voice) {
} else if (conference->tts_engine && conference->tts_voice) { pstatus =
pstatus = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, "please enter the conference pin number", NULL);
switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, "please enter the conference pin number", NULL); } else {
} else { pstatus = switch_ivr_speak_text(session, "flite", "slt", "please enter the conference pin number", NULL);
pstatus = switch_ivr_speak_text(session, "flite", "slt", "please enter the conference pin number", NULL);
}
if (pstatus != SWITCH_STATUS_SUCCESS && pstatus != SWITCH_STATUS_BREAK) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call");
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
}
} }
be_friendly = 1; if (pstatus != SWITCH_STATUS_SUCCESS && pstatus != SWITCH_STATUS_BREAK) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call");
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
}
/* wait for them if neccessary */ /* wait for them if neccessary */
if (strlen(pin_buf) < strlen(dpin)) { if (strlen(pin_buf) < strlen(dpin)) {
@ -5665,12 +5660,14 @@ SWITCH_STANDARD_APP(conference_function)
pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, dpin) == 0); pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, dpin) == 0);
if (!pin_valid) { if (!pin_valid) {
/* more friendliness */
if (conference->bad_pin_sound) {
conference_local_play_file(conference, session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf));
}
/* zero the collected pin */ /* zero the collected pin */
memset(pin_buf, 0, sizeof(pin_buf)); memset(pin_buf, 0, sizeof(pin_buf));
/* more friendliness */
if (conference->bad_pin_sound) {
conference_local_play_file(conference, session, conference->bad_pin_sound, 20, NULL, 0);
}
switch_channel_flush_dtmf(channel);
} }
pin_retries--; pin_retries--;
} }