[asterisk-commits] coreyfarrell: trunk r419268 - in /trunk: main/manager.c res/res_fax.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Tue Jul 22 20:28:57 2014
New Revision: 419268

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419268
Log:
res_fax: unregister manager actions on unload

* Unregister manager actions FAXSessions, FAXSession and FAXStats at unload.
* Update ast_manager_register2 use ao2_t_alloc tagged with the action name.

ASTERISK-24058 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/3831/

Modified:
    trunk/main/manager.c
    trunk/res/res_fax.c

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=419268&r1=419267&r2=419268
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Jul 22 20:28:57 2014
@@ -6317,7 +6317,7 @@
 {
 	struct manager_action *cur;
 
-	cur = ao2_alloc(sizeof(*cur), action_destroy);
+	cur = ao2_t_alloc(sizeof(*cur), action_destroy, action);
 	if (!cur) {
 		return -1;
 	}

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=419268&r1=419267&r2=419268
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Tue Jul 22 20:28:57 2014
@@ -4553,6 +4553,10 @@
 		ast_log(LOG_WARNING, "failed to unregister '%s'\n", app_receivefax);
 	}
 
+	ast_manager_unregister("FAXSessions");
+	ast_manager_unregister("FAXSession");
+	ast_manager_unregister("FAXStats");
+
 	if (fax_logger_level != -1) {
 		ast_logger_unregister_level("FAX");
 	}