pbx_dundi.c: Handle thread shutdown better.

Change-Id: Id52f99bd6a948fe6dd82acc0a28b2447a224fe87

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index c8ddffb6c969183752ad9618c8ae68a3a3ea60f4..19a26cd33cd38cbe0c124be9ac39123849ccb89a 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -2200,7 +2200,6 @@ static void *network_thread(void *ignore)
        }
 
        ast_io_remove(io, socket_read_id);
-       netthreadid = AST_PTHREADT_NULL;
 
        return NULL;
 }
@@ -2235,7 +2234,6 @@ static void *process_clearcache(void *ignore)
                pthread_testcancel();
        }
 
-       clearcachethreadid = AST_PTHREADT_NULL;
        return NULL;
 }
 
@@ -2271,8 +2269,6 @@ static void *process_precache(void *ign)
                        sleep(1);
        }
 
-       precachethreadid = AST_PTHREADT_NULL;
-
        return NULL;
 }
 
@@ -4959,8 +4955,6 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
 
 static int unload_module(void)
 {
-       pthread_t previous_netthreadid = netthreadid, previous_precachethreadid = precachethreadid, previous_clearcachethreadid = clearcachethreadid;
-
        ast_cli_unregister_multiple(cli_dundi, ARRAY_LEN(cli_dundi));
        ast_unregister_switch(&dundi_switch);
        ast_custom_function_unregister(&dundi_function);
@@ -4969,17 +4963,20 @@ static int unload_module(void)
 
        /* Stop all currently running threads */
        dundi_shutdown = 1;
-       if (previous_netthreadid != AST_PTHREADT_NULL) {
-               pthread_kill(previous_netthreadid, SIGURG);
-               pthread_join(previous_netthreadid, NULL);
-       }
-       if (previous_precachethreadid != AST_PTHREADT_NULL) {
-               pthread_kill(previous_precachethreadid, SIGURG);
-               pthread_join(previous_precachethreadid, NULL);
-       }
-       if (previous_clearcachethreadid != AST_PTHREADT_NULL) {
-               pthread_cancel(previous_clearcachethreadid);
-               pthread_join(previous_clearcachethreadid, NULL);
+       if (netthreadid != AST_PTHREADT_NULL) {
+               pthread_kill(netthreadid, SIGURG);
+               pthread_join(netthreadid, NULL);
+               netthreadid = AST_PTHREADT_NULL;
+       }
+       if (precachethreadid != AST_PTHREADT_NULL) {
+               pthread_kill(precachethreadid, SIGURG);
+               pthread_join(precachethreadid, NULL);
+               precachethreadid = AST_PTHREADT_NULL;
+       }
+       if (clearcachethreadid != AST_PTHREADT_NULL) {
+               pthread_cancel(clearcachethreadid);
+               pthread_join(clearcachethreadid, NULL);
+               clearcachethreadid = AST_PTHREADT_NULL;
        }
 
        close(netsocket);