diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-18 21:54:38 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-18 21:54:38 +0000 |
| commit | 2c87f51159d36731c8b702ffdfa0620b4146484e (patch) | |
| tree | e44825b0b4ad3efb267c1bd7528dad1f998ca158 | |
| parent | 71ca0bb8889e2a1be1da96fe32a670333fe48c53 (diff) | |
Merged revisions 292223 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r292223 | jpeeler | 2010-10-18 16:50:30 -0500 (Mon, 18 Oct 2010) | 11 lines
Fix improper operator key acceptance and clean up temp recording files.
This is a fix for when pressing the operator key after recording an unavailable,
busy, name, or temporary message in mailbox options. The operator key should not
be accepted here, but should be allowed during the message recording. If the
operator key is pressed during ensure the file is saved or deleted as
apporopriate. Also, ensure removal of temporary recorded files after an early
hang up or when message acceptance confirmation times out.
ABE-2518
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@292226 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 6e9b2df07..097ccfcc1 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -11692,6 +11692,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re char tempfile[PATH_MAX]; char *acceptdtmf = "#"; char *canceldtmf = ""; + int canceleddtmf = 0; /* Note that urgent and private are for flagging messages as such in the future */ @@ -11753,6 +11754,10 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (ast_test_flag(vmu, VM_OPERATOR)) canceldtmf = "0"; cmd = ast_play_and_record_full(chan, playfile, tempfile, maxtime, fmt, duration, silencethreshold, maxsilence, unlockdir, acceptdtmf, canceldtmf); + if (strchr(canceldtmf, cmd)) { + /* need this flag here to distinguish between pressing '0' during message recording or after */ + canceleddtmf = 1; + } if (record_gain) ast_channel_setoption(chan, AST_OPTION_RXGAIN, &zero_gain, sizeof(zero_gain), 0); if (cmd == -1) { @@ -11832,7 +11837,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re return 1; #endif case '0': - if (!ast_test_flag(vmu, VM_OPERATOR) || !outsidecaller) { + if (!ast_test_flag(vmu, VM_OPERATOR) || (!canceleddtmf && !outsidecaller)) { cmd = ast_play_and_wait(chan, "vm-sorry"); break; } @@ -11841,6 +11846,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (!cmd) cmd = ast_waitfordigit(chan, 3000); if (cmd == '1') { + ast_filerename(tempfile, recordfile, NULL); ast_play_and_wait(chan, "vm-msgsaved"); cmd = '0'; } else if (cmd == '4') { @@ -11852,7 +11858,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re cmd = '0'; } else { ast_play_and_wait(chan, "vm-deleted"); - DELETE(recordfile, -1, recordfile, vmu); + DELETE(tempfile, -1, tempfile, vmu); cmd = '0'; } } @@ -11897,6 +11903,10 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re } } } + if (!outsidecaller && (cmd == -1 || cmd == 't')) { + /* Hang up or timeout, so delete the recording. */ + ast_filedelete(tempfile, NULL); + } if (cmd == 't') cmd = 0; else if (outsidecaller) /* won't play if time out occurs */ |