[asterisk-commits] rmudgett: branch rmudgett/ao2_enhancements r377904 - in /team/rmudgett/ao2_en...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Dec 11 16:26:57 CST 2012 

Author: rmudgett
Date: Tue Dec 11 16:26:55 2012
New Revision: 377904

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377904
Log:
Fix automerge.

Added:
    team/rmudgett/ao2_enhancements/include/asterisk/uuid.h
      - copied unchanged from r377884, trunk/include/asterisk/uuid.h
    team/rmudgett/ao2_enhancements/main/uuid.c
      - copied unchanged from r377884, trunk/main/uuid.c
    team/rmudgett/ao2_enhancements/tests/test_uuid.c
      - copied unchanged from r377884, trunk/tests/test_uuid.c
Modified:
    team/rmudgett/ao2_enhancements/   (props changed)
    team/rmudgett/ao2_enhancements/configure
    team/rmudgett/ao2_enhancements/configure.ac
    team/rmudgett/ao2_enhancements/include/asterisk/autoconfig.h.in
    team/rmudgett/ao2_enhancements/main/Makefile
    team/rmudgett/ao2_enhancements/main/aoc.c
    team/rmudgett/ao2_enhancements/main/asterisk.c
    team/rmudgett/ao2_enhancements/main/cel.c
    team/rmudgett/ao2_enhancements/main/channel.c
    team/rmudgett/ao2_enhancements/main/data.c
    team/rmudgett/ao2_enhancements/main/file.c
    team/rmudgett/ao2_enhancements/main/http.c
    team/rmudgett/ao2_enhancements/main/image.c
    team/rmudgett/ao2_enhancements/main/stun.c
    team/rmudgett/ao2_enhancements/main/timing.c
    team/rmudgett/ao2_enhancements/main/udptl.c

Propchange: team/rmudgett/ao2_enhancements/
------------------------------------------------------------------------------
--- ao2_enhancements-integrated (original)
+++ ao2_enhancements-integrated Tue Dec 11 16:26:55 2012
@@ -1,1 +1,1 @@
-/trunk:1-377833
+/trunk:1-377902

Propchange: team/rmudgett/ao2_enhancements/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/ao2_enhancements/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: team/rmudgett/ao2_enhancements/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/configure.ac?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/configure.ac (original)
+++ team/rmudgett/ao2_enhancements/configure.ac Tue Dec 11 16:26:55 2012
@@ -489,11 +489,12 @@
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
 
-# Any one of these 4 packages support a mandatory requirement, so we want to check on them as early as possible.
+# Any one of these 5 packages support a mandatory requirement, so we want to check on them as early as possible.
 AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
 AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
 AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
+AST_EXT_LIB_CHECK([UUID], [uuid], [uuid_generate_random], [uuid.h], [-luuid])
 
 EDITLINE_LIB=""
 if test "x$TERMCAP_LIB" != "x" ; then

Modified: team/rmudgett/ao2_enhancements/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/include/asterisk/autoconfig.h.in?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/include/asterisk/autoconfig.h.in (original)
+++ team/rmudgett/ao2_enhancements/include/asterisk/autoconfig.h.in Tue Dec 11 16:26:55 2012
@@ -848,19 +848,19 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
 
-/* Define to 1 if `uid' is member of `struct sockpeercred'. */
+/* Define to 1 if `uid' is a member of `struct sockpeercred'. */
 #undef HAVE_STRUCT_SOCKPEERCRED_UID
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `cr_uid' is member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_CR_UID
 
-/* Define to 1 if `uid' is member of `struct ucred'. */
+/* Define to 1 if `uid' is a member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_UID
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1137,6 +1137,9 @@
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

Modified: team/rmudgett/ao2_enhancements/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/Makefile?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/Makefile (original)
+++ team/rmudgett/ao2_enhancements/main/Makefile Tue Dec 11 16:26:55 2012
@@ -43,7 +43,7 @@
   ifneq (x$(CAP_LIB),x)
     AST_LIBS+=$(CAP_LIB)
   endif
-  AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
+  AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv -luuid
 else
   AST_LIBS+=$(EDITLINE_LIB) -lm
 endif

Modified: team/rmudgett/ao2_enhancements/main/aoc.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/aoc.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/aoc.c (original)
+++ team/rmudgett/ao2_enhancements/main/aoc.c Tue Dec 11 16:26:55 2012
@@ -1605,7 +1605,12 @@
 	AST_CLI_DEFINE(aoc_cli_debug_enable, "enable cli debugging of AOC messages"),
 };
 
+static void aoc_shutdown(void)
+{
+	ast_cli_unregister_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
+}
 int ast_aoc_cli_init(void)
 {
+	ast_register_atexit(aoc_shutdown);
 	return ast_cli_register_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
 }

Modified: team/rmudgett/ao2_enhancements/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/asterisk.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/asterisk.c (original)
+++ team/rmudgett/ao2_enhancements/main/asterisk.c Tue Dec 11 16:26:55 2012
@@ -238,6 +238,7 @@
 #include "asterisk/rtp_engine.h"
 #include "asterisk/format.h"
 #include "asterisk/aoc.h"
+#include "asterisk/uuid.h"
 
 #include "../defaults.h"
 
@@ -4112,6 +4113,7 @@
 	}
 
 	ast_aoc_cli_init();
+	ast_uuid_init();
 
 	ast_makesocket();
 	sigemptyset(&sigs);

Modified: team/rmudgett/ao2_enhancements/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/cel.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/cel.c (original)
+++ team/rmudgett/ao2_enhancements/main/cel.c Tue Dec 11 16:26:55 2012
@@ -729,6 +729,7 @@
 		ao2_ref(linkedids, -1);
 		linkedids = NULL;
 	}
+	ast_cli_unregister(&cli_status);
 }
 
 int ast_cel_engine_init(void)

Modified: team/rmudgett/ao2_enhancements/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/channel.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/channel.c (original)
+++ team/rmudgett/ao2_enhancements/main/channel.c Tue Dec 11 16:26:55 2012
@@ -8620,9 +8620,11 @@
 static void channels_shutdown(void)
 {
 	ast_data_unregister(NULL);
+	ast_cli_unregister_multiple(cli_channel, ARRAY_LEN(cli_channel));
 	if (channels) {
 		ao2_container_unregister("channels");
 		ao2_ref(channels, -1);
+		channels = NULL;
 	}
 }
 

Modified: team/rmudgett/ao2_enhancements/main/data.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/data.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/data.c (original)
+++ team/rmudgett/ao2_enhancements/main/data.c Tue Dec 11 16:26:55 2012
@@ -3318,7 +3318,9 @@
 static void data_shutdown(void)
 {
 	ast_manager_unregister("DataGet");
+	ast_cli_unregister_multiple(cli_data, ARRAY_LEN(cli_data));
 	ao2_t_ref(root_data.container, -1, "Unref root_data.container in data_shutdown");
+	root_data.container = NULL;
 	ast_rwlock_destroy(&root_data.lock);
 }
 

Modified: team/rmudgett/ao2_enhancements/main/file.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/file.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/file.c (original)
+++ team/rmudgett/ao2_enhancements/main/file.c Tue Dec 11 16:26:55 2012
@@ -1583,8 +1583,14 @@
 	AST_CLI_DEFINE(handle_cli_core_show_file_formats, "Displays file formats")
 };
 
+static void file_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_file, ARRAY_LEN(cli_file));
+}
+
 int ast_file_init(void)
 {
 	ast_cli_register_multiple(cli_file, ARRAY_LEN(cli_file));
+	ast_register_atexit(file_shutdown);
 	return 0;
 }

Modified: team/rmudgett/ao2_enhancements/main/http.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/http.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/http.c (original)
+++ team/rmudgett/ao2_enhancements/main/http.c Tue Dec 11 16:26:55 2012
@@ -1203,11 +1203,17 @@
 	AST_CLI_DEFINE(handle_show_http, "Display HTTP server status"),
 };
 
+static void http_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_http, ARRAY_LEN(cli_http));
+}
+
 int ast_http_init(void)
 {
 	ast_http_uri_link(&statusuri);
 	ast_http_uri_link(&staticuri);
 	ast_cli_register_multiple(cli_http, ARRAY_LEN(cli_http));
+	ast_register_atexit(http_shutdown);
 
 	return __ast_http_load(0);
 }

Modified: team/rmudgett/ao2_enhancements/main/image.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/image.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/image.c (original)
+++ team/rmudgett/ao2_enhancements/main/image.c Tue Dec 11 16:26:55 2012
@@ -206,8 +206,14 @@
 	AST_CLI_DEFINE(handle_core_show_image_formats, "Displays image formats")
 };
 
+static void image_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_image, ARRAY_LEN(cli_image));
+}
+
 int ast_image_init(void)
 {
 	ast_cli_register_multiple(cli_image, ARRAY_LEN(cli_image));
+	ast_register_atexit(image_shutdown);
 	return 0;
 }

Modified: team/rmudgett/ao2_enhancements/main/stun.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/stun.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/stun.c (original)
+++ team/rmudgett/ao2_enhancements/main/stun.c Tue Dec 11 16:26:55 2012
@@ -504,8 +504,14 @@
 	AST_CLI_DEFINE(handle_cli_stun_set_debug, "Enable/Disable STUN debugging"),
 };
 
+static void stun_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
+}
+
 /*! \brief Initialize the STUN system in Asterisk */
 void ast_stun_init(void)
 {
 	ast_cli_register_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
-}
+	ast_register_atexit(stun_shutdown);
+}

Modified: team/rmudgett/ao2_enhancements/main/timing.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/timing.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/timing.c (original)
+++ team/rmudgett/ao2_enhancements/main/timing.c Tue Dec 11 16:26:55 2012
@@ -299,11 +299,21 @@
 	AST_CLI_DEFINE(timing_test, "Run a timing test"),
 };
 
+static void timing_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_timing, ARRAY_LEN(cli_timing));
+
+	ast_heap_destroy(timing_interfaces);
+	timing_interfaces = NULL;
+}
+
 int ast_timing_init(void)
 {
 	if (!(timing_interfaces = ast_heap_create(2, timing_holder_cmp, 0))) {
 		return -1;
 	}
 
+	ast_register_atexit(timing_shutdown);
+
 	return ast_cli_register_multiple(cli_timing, ARRAY_LEN(cli_timing));
 }

Modified: team/rmudgett/ao2_enhancements/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/udptl.c?view=diff&rev=377904&r1=377903&r2=377904
==============================================================================
--- team/rmudgett/ao2_enhancements/main/udptl.c (original)
+++ team/rmudgett/ao2_enhancements/main/udptl.c Tue Dec 11 16:26:55 2012
@@ -1471,9 +1471,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);
 }
@@ -1509,9 +1513,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);
 }

More information about the asterisk-commits mailing list