[asterisk-commits] rmudgett: branch 11 r377849 - in /branches/11: ./ main/udptl.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Dec 11 15:12:26 2012
New Revision: 377849

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377849
Log:
Cleanup udptl on exit.

* Cleanup CLI commands on exit.

(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
      udptl-shutdown-1_8-10.patch (license #5909) patch uploaded by Corey Farrell
      udptl-shutdown-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
      Modified
........

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

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

Modified:
    branches/11/   (props changed)
    branches/11/main/udptl.c

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

Modified: branches/11/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/udptl.c?view=diff&rev=377849&r1=377848&r2=377849
==============================================================================
--- branches/11/main/udptl.c (original)
+++ branches/11/main/udptl.c Tue Dec 11 15:12:26 2012
@@ -1462,9 +1462,13 @@
 	return 0;
 }
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void udptl_shutdown(void)
 {
+	ast_cli_unregister_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
 	ao2_t_global_obj_release(globals, "Unref udptl global container in shutdown");
 	aco_info_destroy(&cfg_info);
 }
@@ -1500,9 +1504,9 @@
 	aco_option_register_custom(&cfg_info, "t38faxudpec", ACO_EXACT, general_options, NULL, removed_options_handler, 0);
 	aco_option_register_custom(&cfg_info, "t38faxmaxdatagram", ACO_EXACT, general_options, NULL, removed_options_handler, 0);
 
+	__ast_udptl_reload(0);
+
 	ast_cli_register_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
 
-	__ast_udptl_reload(0);
-
 	ast_register_atexit(udptl_shutdown);
 }