Merged revisions 186286 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r186286 | mmichelson | 2009-04-03 09:32:05 -0500 (Fri, 03 Apr 2009) | 20 lines

  Fix the ability to retrieve voicemail messages from IMAP.

  A recent change made interactive vm_states no longer get
  added to the list of vm_states and instead get stored in
  thread-local storage.

  In trunk and all the 1.6.X branches, the problem is that
  when we search for messages in a voicemail box, we would
  attempt to update the appropriate vm_state struct by directly
  searching in the list of vm_states instead of using the
  get_vm_state_by_imap_user function. This meant we could not
  find the interactive vm_state that we wanted.

  (closes issue #14685)
  Reported by: BlargMaN
  Patches:
        14685.patch uploaded by mmichelson (license 60)
  Tested by: BlargMaN, qualleyiv, mmichelson
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186288 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 9fad62880f564427e4800eb389adcdf88e781e71..3bf966a9c09a12dcde49ce80bf32d120e3f432c2 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -142,7 +142,7 @@ static void write_file(char *filename, char *buffer, unsigned long len);
 static char *get_header_by_tag(char *header, char *tag, char *buf, size_t len);
 static void vm_imap_delete(int msgnum, struct ast_vm_user *vmu);
 static char *get_user_by_mailbox(char *mailbox, char *buf, size_t len);
-static struct vm_state *get_vm_state_by_imapuser(char *user, int interactive);
+static struct vm_state *get_vm_state_by_imapuser(const char *user, int interactive);
 static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, const char *context, int interactive);
 static struct vm_state *create_vm_state_from_user(struct ast_vm_user *vmu);
 static void vmstate_insert(struct vm_state *vms);
@@ -2168,22 +2168,14 @@ static void write_file(char *filename, char *buffer, unsigned long len)
 
 static void update_messages_by_imapuser(const char *user, unsigned long number)
 {
-       struct vmstate *vlist = NULL;
+       struct vm_state *vms = get_vm_state_by_imapuser(user, 1);
 
-       AST_LIST_LOCK(&vmstates);
-       AST_LIST_TRAVERSE(&vmstates, vlist, list) {
-               if (!vlist->vms) {
-                       ast_debug(3, "error: vms is NULL for %s\n", user);
-                       continue;
-               }
-               if (!vlist->vms->imapuser) {
-                       ast_debug(3, "error: imapuser is NULL for %s\n", user);
-                       continue;
-               }
-               ast_debug(3, "saving mailbox message number %lu as message %d. Interactive set to %d\n", number, vlist->vms->vmArrayIndex, vlist->vms->interactive);
-               vlist->vms->msgArray[vlist->vms->vmArrayIndex++] = number;
+       if (!vms && !(vms = get_vm_state_by_imapuser(user, 0))) {
+               return;
        }
-       AST_LIST_UNLOCK(&vmstates);
+
+       ast_debug(3, "saving mailbox message number %lu as message %d. Interactive set to %d\n", number, vms->vmArrayIndex, vms->interactive);
+       vms->msgArray[vms->vmArrayIndex++] = number;
 }
 
 void mm_searched(MAILSTREAM *stream, unsigned long number)
@@ -2474,7 +2466,7 @@ static struct vm_state *create_vm_state_from_user(struct ast_vm_user *vmu)
        return vms_p;
 }
 
-static struct vm_state *get_vm_state_by_imapuser(char *user, int interactive)
+static struct vm_state *get_vm_state_by_imapuser(const char *user, int interactive)
 {
        struct vmstate *vlist = NULL;