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
........

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

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

diff --git a/main/udptl.c b/main/udptl.c
index 4e48ac8..bc96790 100644 (file)
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1471,9 +1471,13 @@ int ast_udptl_reload(void)
        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);
 }
@@ -1509,9 +1513,9 @@ void ast_udptl_init(void)
        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_cli_register_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
-
        __ast_udptl_reload(0);
 
+       ast_cli_register_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
+
        ast_register_atexit(udptl_shutdown);
 }