kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-12-03 19:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_voicemail: IMAP logout on MWI unsubscribe"

Browse Source
This commit is contained in:
George Joseph
2017-06-15 09:05:57 -05:00
committed by Gerrit Code Review
parent 2c3c862cee 023eede265
commit f743e2e84c
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/app_voicemail.c
View File

@@ -13106,6 +13106,40 @@ static void mwi_sub_destroy(struct mwi_sub *mwi_sub)
ast_free(mwi_sub); ast_free(mwi_sub);
} }
#ifdef IMAP_STORAGE
static void imap_logout(const char *mailbox_id)
{
char *context;
char *mailbox;
struct ast_vm_user vmus;
RAII_VAR(struct ast_vm_user *, vmu, NULL, free_user);
struct vm_state *vms = NULL;
if (ast_strlen_zero(mailbox_id)
|| separate_mailbox(ast_strdupa(mailbox_id), &mailbox, &context)) {
return;
}
memset(&vmus, 0, sizeof(vmus));
if (!(vmu = find_user(&vmus, context, mailbox)) || vmu->imapuser[0] == '\0') {
return;
}
vms = get_vm_state_by_imapuser(vmu->imapuser, 0);
if (!vms) {
vms = get_vm_state_by_mailbox(mailbox, context, 0);
}
if (!vms) {
return;
}
vms->mailstream = mail_close(vms->mailstream);
vmstate_delete(vms);
}
#endif
static int handle_unsubscribe(void *datap) static int handle_unsubscribe(void *datap)
{ {
struct mwi_sub *mwi_sub; struct mwi_sub *mwi_sub;
@@ -13117,6 +13151,9 @@ static int handle_unsubscribe(void *datap)
AST_LIST_REMOVE_CURRENT(entry); AST_LIST_REMOVE_CURRENT(entry);
/* Don't break here since a duplicate uniqueid /* Don't break here since a duplicate uniqueid
* may have been added as a result of a cache dump. */ * may have been added as a result of a cache dump. */
#ifdef IMAP_STORAGE
imap_logout(mwi_sub->mailbox);
#endif
mwi_sub_destroy(mwi_sub); mwi_sub_destroy(mwi_sub);
} }
} }