kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 14:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43469 via svnmerge from

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

........
r43469 | qwell | 2006-09-21 20:01:16 -0700 (Thu, 21 Sep 2006) | 4 lines

First shot at unload_module in chan_skinny..

More to come.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2006-09-22 03:09:22 +00:00
parent 08368f00ab
commit 81bfa44bb8
1 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
channels/chan_skinny.c
View File

@@ -4521,17 +4521,9 @@ static int load_module(void)
static int unload_module(void) static int unload_module(void)
{ {
#if 0 delete_devices();
struct skinnysession *s;
/* close all IP connections */ ast_mutex_lock(&monlock);
if (!ast_mutex_lock(&devicelock)) {
/* Terminate tcp listener thread */
} else {
ast_log(LOG_WARNING, "Unable to lock the monitor\n");
return -1;
}
if (!ast_mutex_lock(&monlock)) {
if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) { if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) {
pthread_cancel(monitor_thread); pthread_cancel(monitor_thread);
pthread_kill(monitor_thread, SIGURG); pthread_kill(monitor_thread, SIGURG);
@@ -4539,11 +4531,9 @@ static int unload_module(void)
} }
monitor_thread = AST_PTHREADT_STOP; monitor_thread = AST_PTHREADT_STOP;
ast_mutex_unlock(&monlock); ast_mutex_unlock(&monlock);
} else {
ast_log(LOG_WARNING, "Unable to lock the monitor\n"); #if 0 /* XXX This is...funky. Will fix shortly */
return -1; ast_mutex_lock(&sessionlock);
}
if (!ast_mutex_lock(&iflock)) {
/* Destroy all the interfaces and free their memory */ /* Destroy all the interfaces and free their memory */
p = iflist; p = iflist;
while(p) { while(p) {
@@ -4554,19 +4544,17 @@ static int unload_module(void)
free(pl); free(pl);
} }
iflist = NULL; iflist = NULL;
ast_mutex_unlock(&iflock); ast_mutex_unlock(&sessionlock);
} else { #endif
ast_log(LOG_WARNING, "Unable to lock the monitor\n");
return -1;
}
ast_rtp_proto_unregister(&skinny_rtp); ast_rtp_proto_unregister(&skinny_rtp);
ast_channel_unregister(&skinny_tech); ast_channel_unregister(&skinny_tech);
ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry)); ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry));
close(skinnysock);
sched_context_destroy(sched);
return 0; return 0;
#endif
return -1;
} }
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)", AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",