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

Allow greetings-only mailboxes for Voicemail.

Browse Source 
(closes issue #15132)
 Reported by: floletarmo
 Patches: 
       voicemail_changes.patch uploaded by floletarmo (license 784)
       (with some additional changes by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@234820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-12-14 23:16:00 +00:00
parent e52ee5c8e6
commit 89a1af1d38
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -88,6 +88,8 @@ Applications
exit the application.
* The Voicemail application has been improved to automatically ignore messages
that only contain silence.
* If you set maxmsg to 0 in voicemail.conf, Voicemail will consider the
associated mailbox(es) to be greetings-only.
* The ChanSpy application now has the 'S' option, which makes the application
automatically exit once it hits a point where no more channels are available
to spy on.

23
apps/app_voicemail.c
View File

@@ -997,7 +997,8 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
ast_log(AST_LOG_WARNING, "Option 'maxmessage' has been deprecated in favor of 'maxsecs'. Please make that change in your voicemail config.\n");
} else if (!strcasecmp(var, "maxmsg")) {
vmu->maxmsg = atoi(value);
if (vmu->maxmsg <= 0) {
/* Accept maxmsg=0 (Greetings only voicemail) */
if (vmu->maxmsg < 0) {
ast_log(AST_LOG_WARNING, "Invalid number of messages per folder maxmsg=%s. Using default value %d\n", value, MAXMSG);
vmu->maxmsg = MAXMSG;
} else if (vmu->maxmsg > MAXMSGLIMIT) {
@@ -5393,6 +5394,13 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
ast_set_flag(options, OPT_SILENT);
res = 0;
}
/* If maxmsg is zero, act as a "greetings only" voicemail: Exit successfully without recording */
if (vmu->maxmsg == 0) {
if (option_debug > 2)
ast_log(LOG_DEBUG, "Greetings only VM (maxmsg=0), Skipping voicemail recording\n");
pbx_builtin_setvar_helper(chan, "VMSTATUS", "SUCCESS");
goto leave_vm_out;
}
if (!res && !ast_test_flag(options, OPT_SILENT)) {
res = ast_stream_and_wait(chan, INTRO, ecodes);
if (res == '#') {
@@ -7403,10 +7411,12 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
#endif
done:
if (vms->deleted)
if (vms->deleted && vmu->maxmsg) {
memset(vms->deleted, 0, vmu->maxmsg * sizeof(int));
if (vms->heard)
}
if (vms->heard && vmu->maxmsg) {
memset(vms->heard, 0, vmu->maxmsg * sizeof(int));
}
return 0;
}
@@ -9278,12 +9288,13 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
vmstate_insert(&vms);
init_vm_state(&vms);
#endif
if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) {
/* Avoid allocating a buffer of 0 bytes, because some platforms really don't like that. */
if (!(vms.deleted = ast_calloc(vmu->maxmsg ? vmu->maxmsg : 1, sizeof(int)))) {
ast_log(AST_LOG_ERROR, "Could not allocate memory for deleted message storage!\n");
cmd = ast_play_and_wait(chan, "an-error-has-occured");
return -1;
}
if (!(vms.heard = ast_calloc(vmu->maxmsg, sizeof(int)))) {
if (!(vms.heard = ast_calloc(vmu->maxmsg ? vmu->maxmsg : 1, sizeof(int)))) {
ast_log(AST_LOG_ERROR, "Could not allocate memory for heard message storage!\n");
cmd = ast_play_and_wait(chan, "an-error-has-occured");
return -1;
@@ -10759,7 +10770,7 @@ static int load_config(int reload)
maxmsg = MAXMSG;
} else {
maxmsg = atoi(val);
if (maxmsg <= 0) {
if (maxmsg < 0) {
ast_log(AST_LOG_WARNING, "Invalid number of messages per folder '%s'. Using default value %i\n", val, MAXMSG);
maxmsg = MAXMSG;
} else if (maxmsg > MAXMSGLIMIT) {

3
configs/voicemail.conf.sample
View File

@@ -34,7 +34,8 @@ serveremail=asterisk
; Should the email contain the voicemail as an attachment
attach=yes
; Maximum number of messages per folder. If not specified, a default value
; (100) is used. Maximum value for this option is 9999.
; (100) is used. Maximum value for this option is 9999. If set to 0, a
; mailbox will be greetings-only.
;maxmsg=100
; Maximum length of a voicemail message in seconds
;maxsecs=180