Merge "pbx_dundi.c: Handle thread shutdown better." into 13

diff --cc pbx/pbx_dundi.c
index ca86dcf0c8c1c293896f078257553c486e59a465,19a26cd33cd38cbe0c124be9ac39123849ccb89a..bbcae06315076a3643a248fba7075cddf9ac340e
--- 1/pbx/pbx_dundi.c
--- 2/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@@ -4998,19 -4963,25 +4992,22 @@@ 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);
 -      io_context_destroy(io);
 -
        mark_mappings();
        prune_mappings();
        mark_peers();