Merged revisions 75583 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75583 | file | 2007-07-18 11:18:53 -0300 (Wed, 18 Jul 2007) | 5 lines

(closes issue #10224)
Reported by: irroot

Record the threadid of each running thread before shutting them down as the thread themselves may change the value.

........

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

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index b21b17e..59e43a9 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4712,17 +4712,18 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
 
 static int unload_module(void)
 {
+       pthread_t previous_netthreadid = netthreadid, previous_precachethreadid = precachethreadid;
        ast_module_user_hangup_all();
 
        /* Stop all currently running threads */
        dundi_shutdown = 1;
-       if (netthreadid != AST_PTHREADT_NULL) {
-               pthread_kill(netthreadid, SIGURG);
-               pthread_join(netthreadid, NULL);
+       if (previous_netthreadid != AST_PTHREADT_NULL) {
+               pthread_kill(previous_netthreadid, SIGURG);
+               pthread_join(previous_netthreadid, NULL);
        }
-       if (precachethreadid != AST_PTHREADT_NULL) {
-               pthread_kill(precachethreadid, SIGURG);
-               pthread_join(precachethreadid, NULL);
+       if (previous_precachethreadid != AST_PTHREADT_NULL) {
+               pthread_kill(previous_precachethreadid, SIGURG);
+               pthread_join(previous_precachethreadid, NULL);
        }
 
        ast_cli_unregister_multiple(cli_dundi, sizeof(cli_dundi) / sizeof(struct ast_cli_entry));