From d1ee16cd9aee22c16dc4742f6c70fd0da4d6181e Mon Sep 17 00:00:00 2001 From: Michiel van Baak Date: Sat, 20 Sep 2008 10:39:20 +0000 Subject: make 'module unload chan_skinny.so' actually work. (closes issue #13524) Reported by: wedhorn Patches: unload.diff uploaded by wedhorn (license 30) With small tweak by me to prevent a crash git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143799 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_skinny.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6eb2c5902..fde90cdc6 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3555,6 +3555,7 @@ static int skinny_hangup(struct ast_channel *ast) } ast_mutex_unlock(&sub->lock); ast_free(sub); + ast_module_unref(ast_module_info->self); return 0; } @@ -6065,7 +6066,6 @@ static void *accept_thread(void *ignore) struct skinnysession *s; struct protoent *p; int arg = 1; - pthread_t tcp_thread; for (;;) { sinlen = sizeof(sin); @@ -6090,7 +6090,7 @@ static void *accept_thread(void *ignore) AST_LIST_INSERT_HEAD(&sessions, s, list); AST_LIST_UNLOCK(&sessions); - if (ast_pthread_create_detached(&tcp_thread, NULL, skinny_session, s)) { + if (ast_pthread_create_detached(&s->t, NULL, skinny_session, s)) { destroy_session(s); } } @@ -6465,6 +6465,10 @@ static int unload_module(void) struct skinny_subchannel *sub; struct ast_context *con; + ast_rtp_proto_unregister(&skinny_rtp); + ast_channel_unregister(&skinny_tech); + ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry)); + AST_LIST_LOCK(&sessions); /* Destroy all the interfaces and free their memory */ while((s = AST_LIST_REMOVE_HEAD(&sessions, list))) { @@ -6482,9 +6486,13 @@ static int unload_module(void) if (l->mwi_event_sub) ast_event_unsubscribe(l->mwi_event_sub); ast_mutex_unlock(&l->lock); + unregister_exten(l); } if (s->fd > -1) close(s->fd); + pthread_cancel(s->t); + pthread_kill(s->t, SIGURG); + pthread_join(s->t, NULL); free(s); } AST_LIST_UNLOCK(&sessions); @@ -6509,10 +6517,6 @@ static int unload_module(void) accept_t = AST_PTHREADT_STOP; ast_mutex_unlock(&netlock); - ast_rtp_proto_unregister(&skinny_rtp); - ast_channel_unregister(&skinny_tech); - ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry)); - close(skinnysock); if (sched) sched_context_destroy(sched); -- cgit v1.2.3