kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Currently, zero-length voicemail messages cause a hangup in VoicemailMain.

Browse Source 
This change fixes the problem, with a multi-faceted approach.  First, we
do our best to avoid these messages from being created in the first place,
and second, if that fails, we detect when the voicemail message is
zero-length and avoid exiting at that point.
Reported by: dtyoo
Patch by: gkloepfer,tilghman
(Closes issue #11083)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-11-24 06:19:23 +00:00
parent 540a2c7098
commit e671cb909d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_voicemail.c
View File

@@ -4611,7 +4611,10 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
if (!res) {
make_file(vms->fn, sizeof(vms->fn), vms->curdir, vms->curmsg);
vms->heard[vms->curmsg] = 1;
res = wait_file(chan, vms, vms->fn);
if ((res = wait_file(chan, vms, vms->fn)) < 0) {
ast_log(LOG_WARNING, "Playback of message %s failed\n", vms->fn);
res = 0;
}
}
DISPOSE(vms->curdir, vms->curmsg);
return res;

14
main/app.c
View File

@@ -689,8 +689,6 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
} else {
ast_frfree(f);
}
if (end == start)
end = time(NULL);
} else {
ast_log(LOG_WARNING, "Error creating writestream '%s', format '%s'\n", recordfile, sfmt[x]);
}
@@ -699,7 +697,17 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
if (silgen)
ast_channel_stop_silence_generator(chan, silgen);
}
*duration = end - start;
/*!\note
* Instead of asking how much time passed (end - start), calculate the number
* of seconds of audio which actually went into the file. This fixes a
* problem where audio is stopped up on the network and never gets to us.
*
* Note that we still want to use the number of seconds passed for the max
* message, otherwise we could get a situation where this stream is never
* closed (which would create a resource leak).
*/
*duration = ast_tellstream(others[0]) / 8000;
if (!prepend) {
for (x = 0; x < fmtcnt; x++) {