diff options
| author | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-15 07:51:22 +0000 |
|---|---|---|
| committer | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-15 07:51:22 +0000 |
| commit | 1c4a4007af71e31785d40ca0d6a371043dc8e908 (patch) | |
| tree | 9da7eefab98149c7669e84b70601e9e9d3b91ae5 /channels/chan_iax.c | |
| parent | 318e676ec538397aa307deccf765e4131d113fe1 (diff) | |
Fix bug 1217. Change pthread_t initializers to AST_PTHREADT_NULL and
AST_PTHREADT_STOP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2434 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax.c')
| -rwxr-xr-x | channels/chan_iax.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_iax.c b/channels/chan_iax.c index ce0897066..a88e855f6 100755 --- a/channels/chan_iax.c +++ b/channels/chan_iax.c @@ -149,7 +149,7 @@ static int iaxdebug = 0; static char accountcode[20]; static int amaflags = 0; -static pthread_t netthreadid; +static pthread_t netthreadid = AST_PTHREADT_NULL; #define IAX_STATE_STARTED (1 << 0) #define IAX_STATE_AUTHENTICATED (1 << 1) @@ -5345,8 +5345,10 @@ static int __unload_module(void) { int x; /* Cancel the network thread, close the net socket */ - pthread_cancel(netthreadid); - pthread_join(netthreadid, NULL); + if (netthreadid != AST_PTHREADT_NULL) { + pthread_cancel(netthreadid); + pthread_join(netthreadid, NULL); + } close(netsocket); for (x=0;x<AST_IAX_MAX_CALLS;x++) if (iaxs[x]) |