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

Merge "app_voicemail: IMAP logout on reload/unload" into 13

Browse Source
This commit is contained in:
George Joseph
2017-06-19 09:19:38 -05:00
committed by Gerrit Code Review
parent 707e0e62e6 3b6c327c51
commit 470bccd769
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/app_voicemail.c
View File

@@ -13057,10 +13057,25 @@ static void imap_logout(const char *mailbox_id)
return; return;
} }
ast_mutex_lock(&vms->lock);
vms->mailstream = mail_close(vms->mailstream); vms->mailstream = mail_close(vms->mailstream);
ast_mutex_unlock(&vms->lock);
vmstate_delete(vms); vmstate_delete(vms);
} }
static void imap_close_subscribed_mailboxes(void)
{
struct mwi_sub *mwi_sub;
AST_RWLIST_RDLOCK(&mwi_subs);
AST_RWLIST_TRAVERSE(&mwi_subs, mwi_sub, entry) {
if (!ast_strlen_zero(mwi_sub->mailbox)) {
imap_logout(mwi_sub->mailbox);
}
}
AST_RWLIST_UNLOCK(&mwi_subs);
}
#endif #endif
static int handle_unsubscribe(void *datap) static int handle_unsubscribe(void *datap)
@@ -13514,7 +13529,11 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con
strcpy(listen_control_restart_key, DEFAULT_LISTEN_CONTROL_RESTART_KEY); strcpy(listen_control_restart_key, DEFAULT_LISTEN_CONTROL_RESTART_KEY);
strcpy(listen_control_stop_key, DEFAULT_LISTEN_CONTROL_STOP_KEY); strcpy(listen_control_stop_key, DEFAULT_LISTEN_CONTROL_STOP_KEY);
/* Free all the users structure */ #ifdef IMAP_STORAGE
imap_close_subscribed_mailboxes();
#endif
/* Free all the users structure */
free_vm_users(); free_vm_users();
/* Free all the zones structure */ /* Free all the zones structure */
@@ -14908,6 +14927,9 @@ static int unload_module(void)
ast_unload_realtime("voicemail"); ast_unload_realtime("voicemail");
ast_unload_realtime("voicemail_data"); ast_unload_realtime("voicemail_data");
#ifdef IMAP_STORAGE
imap_close_subscribed_mailboxes();
#endif
free_vm_users(); free_vm_users();
free_vm_zones(); free_vm_zones();
return res; return res;