[asterisk-commits] tilghman: branch 1.6.1 r240417 - in /branches/1.6.1: ./ apps/app_voicemail.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jan 15 14:57:12 CST 2010
Author: tilghman
Date: Fri Jan 15 14:57:07 2010
New Revision: 240417
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240417
Log:
Merged revisions 240415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r240415 | tilghman | 2010-01-15 14:54:24 -0600 (Fri, 15 Jan 2010) | 22 lines
Merged revisions 240414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r240414 | tilghman | 2010-01-15 14:52:27 -0600 (Fri, 15 Jan 2010) | 15 lines
Disallow leaving more than maxmsg voicemails.
This is a possibility because our previous method assumed that no messages are
left in parallel, which is not a safe assumption. Due to the vmu structure
duplication, it was necessary to track in-process messages via a separate
structure. If at some point, we switch vmu to an ao2-reference-counted
structure, which would eliminate the prior noted duplication of structures,
then we could incorporate this new in-process structure directly into vmu.
(closes issue #16271)
Reported by: sohosys
Patches:
20100108__issue16271.diff.txt uploaded by tilghman (license 14)
20100108__issue16271__trunk.diff.txt uploaded by tilghman (license 14)
20100108__issue16271__1.6.0.diff.txt uploaded by tilghman (license 14)
Tested by: jsutton
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/apps/app_voicemail.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=240417&r1=240416&r2=240417
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Fri Jan 15 14:57:07 2010
@@ -115,6 +115,7 @@
#include "asterisk/utils.h"
#include "asterisk/stringfields.h"
#include "asterisk/smdi.h"
+#include "asterisk/astobj2.h"
#include "asterisk/event.h"
#include "asterisk/taskprocessor.h"
@@ -716,6 +717,56 @@
static void apply_options(struct ast_vm_user *vmu, const char *options);
static int add_email_attachment(FILE *p, struct ast_vm_user *vmu, char *format, char *attach, char *greeting_attachment, char *mailbox, char *bound, char *filename, int last, int msgnum);
static int is_valid_dtmf(const char *key);
+
+struct ao2_container *inprocess_container;
+
+struct inprocess {
+ int count;
+ char *context;
+ char mailbox[0];
+};
+
+static int inprocess_hash_fn(const void *obj, const int flags)
+{
+ const struct inprocess *i = obj;
+ return atoi(i->mailbox);
+}
+
+static int inprocess_cmp_fn(void *obj, void *arg, int flags)
+{
+ struct inprocess *i = obj, *j = arg;
+ if (!strcmp(i->mailbox, j->mailbox)) {
+ return 0;
+ }
+ return !strcmp(i->context, j->context) ? CMP_MATCH : 0;
+}
+
+static int inprocess_count(const char *context, const char *mailbox, int delta)
+{
+ struct inprocess *i, *arg = alloca(sizeof(*arg) + strlen(context) + strlen(mailbox) + 2);
+ arg->context = arg->mailbox + strlen(mailbox) + 1;
+ strcpy(arg->mailbox, mailbox); /* SAFE */
+ strcpy(arg->context, context); /* SAFE */
+ ao2_lock(inprocess_container);
+ if ((i = ao2_find(inprocess_container, &arg, 0))) {
+ int ret = ast_atomic_fetchadd_int(&i->count, delta);
+ ao2_unlock(inprocess_container);
+ ao2_ref(i, -1);
+ return ret;
+ }
+ if (!(i = ao2_alloc(sizeof(*i) + strlen(context) + strlen(mailbox) + 2, NULL))) {
+ ao2_unlock(inprocess_container);
+ return 0;
+ }
+ i->context = i->mailbox + strlen(mailbox) + 1;
+ strcpy(i->mailbox, mailbox); /* SAFE */
+ strcpy(i->context, context); /* SAFE */
+ i->count = delta;
+ ao2_link(inprocess_container, i);
+ ao2_unlock(inprocess_container);
+ ao2_ref(i, -1);
+ return 0;
+}
#if !(defined(ODBC_STORAGE) || defined(IMAP_STORAGE))
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
@@ -4721,7 +4772,7 @@
return ERROR_LOCK_PATH;
recipmsgnum = last_message_index(recip, todir) + 1;
- if (recipmsgnum < recip->maxmsg) {
+ if (recipmsgnum < recip->maxmsg - (imbox ? 0 : inprocess_count(vmu->mailbox, vmu->context, 0))) {
make_file(topath, sizeof(topath), todir, recipmsgnum);
if (EXISTS(fromdir, msgnum, frompath, chan->language)) {
COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath);
@@ -5230,19 +5281,20 @@
}
/* Check if we have exceeded maxmsg */
- if (msgnum >= vmu->maxmsg) {
+ if (msgnum >= vmu->maxmsg - inprocess_count(vmu->mailbox, vmu->context, 0)) {
ast_log(AST_LOG_WARNING, "Unable to leave message since we will exceed the maximum number of messages allowed (%u > %u)\n", msgnum, vmu->maxmsg);
ast_play_and_wait(chan, "vm-mailboxfull");
ast_free(tmp);
return -1;
}
#else
- if (count_messages(vmu, dir) >= vmu->maxmsg) {
+ if (count_messages(vmu, dir) >= vmu->maxmsg - inprocess_count(vmu->mailbox, vmu->context, +1)) {
res = ast_streamfile(chan, "vm-mailboxfull", chan->language);
if (!res)
res = ast_waitstream(chan, "");
ast_log(AST_LOG_WARNING, "No more messages possible\n");
pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
+ inprocess_count(vmu->mailbox, vmu->context, -1);
goto leave_vm_out;
}
@@ -5256,6 +5308,7 @@
res = ast_waitstream(chan, "");
ast_log(AST_LOG_ERROR, "Unable to create message file: %s\n", strerror(errno));
pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
+ inprocess_count(vmu->mailbox, vmu->context, -1);
goto leave_vm_out;
}
@@ -5301,8 +5354,15 @@
ast_callerid_merge(callerid, sizeof(callerid), S_OR(chan->cid.cid_name, NULL), S_OR(chan->cid.cid_num, NULL), "Unknown"),
date, (long)time(NULL),
category ? category : "");
- } else
+ } else {
ast_log(AST_LOG_WARNING, "Error opening text file for output\n");
+ inprocess_count(vmu->mailbox, vmu->context, -1);
+ if (ast_check_realtime("voicemail_data")) {
+ ast_destroy_realtime("voicemail_data", "filename", tmptxtfile, SENTINEL);
+ }
+ res = ast_streamfile(chan, "vm-mailboxfull", chan->language);
+ goto leave_vm_out;
+ }
res = play_record_review(chan, NULL, tmptxtfile, vmu->maxsecs, fmt, 1, vmu, &duration, NULL, options->record_gain, vms, flag);
if (txt) {
@@ -5317,6 +5377,7 @@
snprintf(tmpid, sizeof(tmpid), "%d", rtmsgid);
ast_destroy_realtime("voicemail_data", "id", tmpid, SENTINEL);
}
+ inprocess_count(vmu->mailbox, vmu->context, -1);
} else {
fprintf(txt, "duration=%d\n", duration);
fclose(txt);
@@ -5325,10 +5386,12 @@
/* Delete files */
ast_filedelete(tmptxtfile, NULL);
unlink(tmptxtfile);
+ inprocess_count(vmu->mailbox, vmu->context, -1);
} else if (ast_fileexists(tmptxtfile, NULL, NULL) <= 0) {
ast_debug(1, "The recorded media file is gone, so we should remove the .txt file too!\n");
unlink(tmptxtfile);
ast_unlock_path(dir);
+ inprocess_count(vmu->mailbox, vmu->context, -1);
if (ast_check_realtime("voicemail_data")) {
snprintf(tmpid, sizeof(tmpid), "%d", rtmsgid);
ast_destroy_realtime("voicemail_data", "id", tmpid, SENTINEL);
@@ -5349,6 +5412,7 @@
snprintf(txtfile, sizeof(txtfile), "%s.txt", fn);
ast_filerename(tmptxtfile, fn, NULL);
rename(tmptxtfile, txtfile);
+ inprocess_count(vmu->mailbox, vmu->context, -1);
/* Properly set permissions on voicemail text descriptor file.
Unfortunately mkstemp() makes this file 0600 on most unix systems. */
@@ -5414,6 +5478,8 @@
}
}
}
+ } else {
+ inprocess_count(vmu->mailbox, vmu->context, -1);
}
if (res == '0') {
goto transfer;
@@ -11049,6 +11115,7 @@
res |= ast_manager_unregister("VoicemailUsersList");
ast_cli_unregister_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry));
ast_uninstall_vm_functions();
+ ao2_ref(inprocess_container, -1);
if (poll_thread != AST_PTHREADT_NULL)
stop_poll_thread();
@@ -11067,6 +11134,10 @@
int res;
my_umask = umask(0);
umask(my_umask);
+
+ if (!(inprocess_container = ao2_container_alloc(573, inprocess_hash_fn, inprocess_cmp_fn))) {
+ return AST_MODULE_LOAD_DECLINE;
+ }
/* compute the location of the voicemail spool directory */
snprintf(VM_SPOOL_DIR, sizeof(VM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR);
More information about the asterisk-commits
mailing list