[asterisk-commits] mjordan: branch 10 r375794 - in /branches/10: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Nov  3 21:30:30 2012
New Revision: 375794

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375794
Log:
Properly clean up manager resources on exit

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

Modified:
    branches/10/   (props changed)
    branches/10/main/manager.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/manager.c?view=diff&rev=375794&r1=375793&r2=375794
==============================================================================
--- branches/10/main/manager.c (original)
+++ branches/10/main/manager.c Sat Nov  3 21:30:30 2012
@@ -6760,6 +6760,23 @@
 	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");
+	ast_free_ha(user->ha);
+	ast_free(user);
+}
+
 /*! \internal \brief Clean up resources on Asterisk shutdown */
 static void manager_shutdown(void)
 {
@@ -6800,6 +6817,23 @@
 		ast_manager_unregister("ModuleCheck");
 		ast_manager_unregister("AOCMessage");
 		ast_manager_unregister("Filter");
+		ast_cli_unregister_multiple(cli_manager, ARRAY_LEN(cli_manager));
+	}
+
+	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) {
@@ -6808,12 +6842,9 @@
 	}
 
 	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);
+	}
+}
 
 static int __init_manager(int reload)
 {
@@ -7171,19 +7202,7 @@
 		/* 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");
-		ast_free_ha(user->ha);
-		ast_free(user);
+		manager_free_user(user);
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END;