kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 72006 via svnmerge from

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-27 01:00:47 +00:00
parent 1961b57705
commit 36668045a6
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pbx/pbx_dundi.c
View File

@@ -52,6 +52,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <ifaddrs.h> #include <ifaddrs.h>
#endif #endif
#include <zlib.h> #include <zlib.h>
#include <sys/signal.h>
#include <pthread.h>
#include "asterisk/file.h" #include "asterisk/file.h"
#include "asterisk/logger.h" #include "asterisk/logger.h"
@@ -136,6 +138,7 @@ static char cursecret[80];
static char ipaddr[80]; static char ipaddr[80];
static time_t rotatetime; static time_t rotatetime;
static dundi_eid empty_eid = { { 0, 0, 0, 0, 0, 0 } }; static dundi_eid empty_eid = { { 0, 0, 0, 0, 0, 0 } };
static int dundi_shutdown = 0;
struct permission { struct permission {
AST_LIST_ENTRY(permission) list; AST_LIST_ENTRY(permission) list;
@@ -2107,7 +2110,8 @@ static void *network_thread(void *ignore)
int res; int res;
/* Establish I/O callback for socket read */ /* Establish I/O callback for socket read */
ast_io_add(io, netsocket, socket_read, AST_IO_IN, NULL); ast_io_add(io, netsocket, socket_read, AST_IO_IN, NULL);
for(;;) {
while (!dundi_shutdown) {
res = ast_sched_wait(sched); res = ast_sched_wait(sched);
if ((res > 1000) || (res < 0)) if ((res > 1000) || (res < 0))
res = 1000; res = 1000;
@@ -2130,7 +2134,7 @@ static void *process_precache(void *ign)
char number[256]; char number[256];
int run; int run;
for (;;) { while (!dundi_shutdown) {
time(&now); time(&now);
run = 0; run = 0;
AST_LIST_LOCK(&pcq); AST_LIST_LOCK(&pcq);
@@ -4705,11 +4709,20 @@ static int unload_module(void)
{ {
ast_module_user_hangup_all(); 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_cli_unregister_multiple(cli_dundi, sizeof(cli_dundi) / sizeof(struct ast_cli_entry));
ast_unregister_switch(&dundi_switch); ast_unregister_switch(&dundi_switch);
ast_custom_function_unregister(&dundi_function); ast_custom_function_unregister(&dundi_function);
ast_custom_function_unregister(&dundi_query_function); ast_custom_function_unregister(&dundi_query_function);
ast_custom_function_unregister(&dundi_result_function); ast_custom_function_unregister(&dundi_result_function);
close(netsocket);
io_context_destroy(io);
sched_context_destroy(sched); sched_context_destroy(sched);
return 0; return 0;