Properly clean up manager resources on exit
authorMatthew Jordan <mjordan@digium.com>
Sun, 4 Nov 2012 02:38:19 +0000 (02:38 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sun, 4 Nov 2012 02:38:19 +0000 (02:38 +0000)
This patch does two things:
1) It properly unregisters the manager CLI commands
2) It cleans up AMI users on exit.  Prior to this patch, the AMI users
   were not being disposed of properly, resulting in a memory leak.

(closes issue ASTERISK-20646)
Reported by: Corey Farrell
patches:
  manager_shutdown.patch uploaded by Corey Farrell (license 5909)
........

Merged revisions 375793 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375794 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 375795 from http://svn.asterisk.org/svn/asterisk/branches/11

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

main/manager.c

index b383b87..69e8688 100644 (file)
@@ -7289,6 +7289,24 @@ static void load_channelvars(struct ast_variable *var)
        AST_RWLIST_UNLOCK(&channelvars);
 }
 
+/*! \internal \brief Free a user record.  Should already be removed from the list */
+static void manager_free_user(struct ast_manager_user *user)
+{
+       if (user->a1_hash) {
+               ast_free(user->a1_hash);
+       }
+       if (user->secret) {
+               ast_free(user->secret);
+       }
+       ao2_t_callback(user->whitefilters, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL, "unlink all white filters");
+       ao2_t_callback(user->blackfilters, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL, "unlink all black filters");
+       ao2_t_ref(user->whitefilters, -1, "decrement ref for white container, should be last one");
+       ao2_t_ref(user->blackfilters, -1, "decrement ref for black container, should be last one");
+       user->acl = ast_free_acl_list(user->acl);
+       ast_variables_destroy(user->chanvars);
+       ast_free(user);
+}
+
 /*! \internal \brief Clean up resources on Asterisk shutdown */
 static void manager_shutdown(void)
 {
@@ -7331,21 +7349,36 @@ static void manager_shutdown(void)
                ast_manager_unregister("AOCMessage");
                ast_manager_unregister("Filter");
                ast_custom_function_unregister(&managerclient_function);
+               ast_cli_unregister_multiple(cli_manager, ARRAY_LEN(cli_manager));
        }
 
 #ifdef AST_XML_DOCS
        ao2_t_global_obj_release(event_docs, "Dispose of event_docs");
 #endif
 
+       ast_tcptls_server_stop(&ami_desc);
+       ast_tcptls_server_stop(&amis_desc);
+
+       if (ami_tls_cfg.certfile) {
+               ast_free(ami_tls_cfg.certfile);
+               ami_tls_cfg.certfile = NULL;
+       }
+       if (ami_tls_cfg.pvtfile) {
+               ast_free(ami_tls_cfg.pvtfile);
+               ami_tls_cfg.pvtfile = NULL;
+       }
+       if (ami_tls_cfg.cipher) {
+               ast_free(ami_tls_cfg.cipher);
+               ami_tls_cfg.cipher = NULL;
+       }
+
        if (sessions) {
                ao2_ref(sessions, -1);
                sessions = NULL;
        }
 
        while ((user = AST_LIST_REMOVE_HEAD(&users, list))) {
-               ao2_ref(user->whitefilters, -1);
-               ao2_ref(user->blackfilters, -1);
-               ast_free(user);
+               manager_free_user(user);
        }
 }
 
@@ -7763,20 +7796,7 @@ static int __init_manager(int reload, int by_external_config)
                /* We do not need to keep this user so take them out of the list */
                AST_RWLIST_REMOVE_CURRENT(list);
                ast_debug(4, "Pruning user '%s'\n", user->username);
-               /* Free their memory now */
-               if (user->a1_hash) {
-                       ast_free(user->a1_hash);
-               }
-               if (user->secret) {
-                       ast_free(user->secret);
-               }
-               ao2_t_callback(user->whitefilters, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL, "unlink all white filters");
-               ao2_t_callback(user->blackfilters, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL, "unlink all black filters");
-               ao2_t_ref(user->whitefilters, -1, "decrement ref for white container, should be last one");
-               ao2_t_ref(user->blackfilters, -1, "decrement ref for black container, should be last one");
-               user->acl = ast_free_acl_list(user->acl);
-               ast_variables_destroy(user->chanvars);
-               ast_free(user);
+               manager_free_user(user);
        }
        AST_RWLIST_TRAVERSE_SAFE_END;