dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 219816 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r219816 | tilghman | 2009-09-22 16:37:03 -0500 (Tue, 22 Sep 2009) | 10 lines
  
  When IMAP variables were changed during a reload, Voicemail did not use the new values.
  This change introduces a configuration version variable, which ensures that
  connections with the old values are not reused but are allowed to expire
  normally.
  (closes issue #15934)
   Reported by: viniciusfontes
   Patches: 
         20090922__issue15934.diff.txt uploaded by tilghman (license 14)
   Tested by: viniciusfontes
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@219818 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2009-09-22 21:43:22 +00:00
parent 494f4abbd8
commit 701d6f46ce
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/app_voicemail.c
View File

@ -323,6 +323,7 @@ static char imapparentfolder[64] = "\0";
static char greetingfolder[64];
static char authuser[32];
static char authpassword[42];
static int imapversion = 1;
static int expungeonhangup = 1;
static int imapgreetings = 0;
@ -592,6 +593,7 @@ struct ast_vm_user {
char imapuser[80]; /*!< IMAP server login */
char imappassword[80]; /*!< IMAP server password if authpassword not defined */
char imapvmshareid[80]; /*!< Shared mailbox ID to use rather than the dialed one */
int imapversion; /*!< If configuration changes, use the new values */
#endif
double volgain; /*!< Volume gain for voicemails sent via email */
AST_LIST_ENTRY(ast_vm_user) list;
@ -632,6 +634,7 @@ struct vm_state {
MAILSTREAM *mailstream;
int vmArrayIndex;
char imapuser[80]; /*!< IMAP server login */
int imapversion;
int interactive;
char introfn[PATH_MAX]; /*!< Name of prepended file */
unsigned int quota_limit;
@ -901,10 +904,13 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
#ifdef IMAP_STORAGE
} else if (!strcasecmp(var, "imapuser")) {
ast_copy_string(vmu->imapuser, value, sizeof(vmu->imapuser));
vmu->imapversion = imapversion;
} else if (!strcasecmp(var, "imappassword") || !strcasecmp(var, "imapsecret")) {
ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
vmu->imapversion = imapversion;
} else if (!strcasecmp(var, "imapvmshareid")) {
ast_copy_string(vmu->imapvmshareid, value, sizeof(vmu->imapvmshareid));
vmu->imapversion = imapversion;
#endif
} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
ast_set2_flag(vmu, ast_true(value), VM_DELETE);
@ -1139,10 +1145,13 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
#ifdef IMAP_STORAGE
} else if (!strcasecmp(var->name, "imapuser")) {
ast_copy_string(retval->imapuser, var->value, sizeof(retval->imapuser));
retval->imapversion = imapversion;
} else if (!strcasecmp(var->name, "imappassword") || !strcasecmp(var->name, "imapsecret")) {
ast_copy_string(retval->imappassword, var->value, sizeof(retval->imappassword));
retval->imapversion = imapversion;
} else if (!strcasecmp(var->name, "imapvmshareid")) {
ast_copy_string(retval->imapvmshareid, var->value, sizeof(retval->imapvmshareid));
retval->imapversion = imapversion;
#endif
} else
apply_option(retval, var->name, var->value);
@ -1228,6 +1237,11 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, const char *contex
context = "default";
AST_LIST_TRAVERSE(&users, cur, list) {
#ifdef IMAP_STORAGE
if (cur->imapversion != imapversion) {
continue;
}
#endif
if (ast_test_flag((&globalflags), VM_SEARCH) && !strcasecmp(mailbox, cur->mailbox))
break;
if (context && (!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
@ -2254,6 +2268,7 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box)
}
ast_copy_string(vms->imapuser, vmu->imapuser, sizeof(vms->imapuser));
vms->imapversion = vmu->imapversion;
ast_debug(3, "Before init_mailstream, user is %s\n", vmu->imapuser);
if ((ret = init_mailstream(vms, box)) || !vms->mailstream) {
@ -2610,6 +2625,7 @@ static struct vm_state *create_vm_state_from_user(struct ast_vm_user *vmu)
ast_copy_string(vms_p->username, vmu->mailbox, sizeof(vms_p->username)); /* save for access from interactive entry point */
ast_copy_string(vms_p->context, vmu->context, sizeof(vms_p->context));
vms_p->mailstream = NIL; /* save for access from interactive entry point */
vms_p->imapversion = vmu->imapversion;
if (option_debug > 4)
ast_log(AST_LOG_DEBUG, "Copied %s to %s\n", vmu->imapuser, vms_p->imapuser);
vms_p->updated = 1;
@ -2637,6 +2653,9 @@ static struct vm_state *get_vm_state_by_imapuser(const char *user, int interacti
ast_debug(3, "error: vms is NULL for %s\n", user);
continue;
}
if (vlist->vms->imapversion != imapversion) {
continue;
}
if (!vlist->vms->imapuser) {
ast_debug(3, "error: imapuser is NULL for %s\n", user);
continue;
@ -2673,6 +2692,9 @@ static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, const char
ast_debug(3, "error: vms is NULL for %s\n", mailbox);
continue;
}
if (vlist->vms->imapversion != imapversion) {
continue;
}
if (!vlist->vms->username || !vlist->vms->context) {
ast_debug(3, "error: username is NULL for %s\n", mailbox);
continue;
@ -10721,6 +10743,8 @@ static int load_config(int reload)
mail_parameters(NIL, SET_CLOSETIMEOUT, (void *) 60L);
}
/* Increment configuration version */
imapversion++;
#endif
/* External voicemail notify application */
if ((val = ast_variable_retrieve(cfg, "general", "externnotify"))) {