[asterisk-commits] file: trunk r72007 - in /trunk: ./ pbx/pbx_dundi.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jun 26 20:00:47 2007
New Revision: 72007

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72007
Log:
Merged revisions 72006 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72006 | file | 2007-06-26 20:58:35 -0400 (Tue, 26 Jun 2007) | 2 lines

Make unloading of pbx_dundi actually work.

........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_dundi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_dundi.c?view=diff&rev=72007&r1=72006&r2=72007
==============================================================================
--- trunk/pbx/pbx_dundi.c (original)
+++ trunk/pbx/pbx_dundi.c Tue Jun 26 20:00:47 2007
@@ -52,6 +52,8 @@
 #include <ifaddrs.h>
 #endif
 #include <zlib.h>
+#include <sys/signal.h>
+#include <pthread.h>
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -136,6 +138,7 @@
 static char ipaddr[80];
 static time_t rotatetime;
 static dundi_eid empty_eid = { { 0, 0, 0, 0, 0, 0 } };
+static int dundi_shutdown = 0;
 
 struct permission {
 	AST_LIST_ENTRY(permission) list;
@@ -2107,7 +2110,8 @@
 	int res;
 	/* Establish I/O callback for socket read */
 	ast_io_add(io, netsocket, socket_read, AST_IO_IN, NULL);
-	for(;;) {
+	
+	while (!dundi_shutdown) {
 		res = ast_sched_wait(sched);
 		if ((res > 1000) || (res < 0))
 			res = 1000;
@@ -2130,7 +2134,7 @@
 	char number[256];
 	int run;
 
-	for (;;) {
+	while (!dundi_shutdown) {
 		time(&now);
 		run = 0;
 		AST_LIST_LOCK(&pcq);
@@ -4705,11 +4709,20 @@
 {
 	ast_module_user_hangup_all();
 
+	/* Stop all currently running threads */
+	dundi_shutdown = 1;
+	pthread_kill(netthreadid, SIGURG);
+	pthread_join(netthreadid, NULL);
+	pthread_kill(precachethreadid, SIGURG);
+	pthread_join(precachethreadid, NULL);
+
 	ast_cli_unregister_multiple(cli_dundi, sizeof(cli_dundi) / sizeof(struct ast_cli_entry));
 	ast_unregister_switch(&dundi_switch);
 	ast_custom_function_unregister(&dundi_function);
 	ast_custom_function_unregister(&dundi_query_function);
 	ast_custom_function_unregister(&dundi_result_function);
+	close(netsocket);
+	io_context_destroy(io);
 	sched_context_destroy(sched);
 
 	return 0;