diff options
| author | James Golovich <james@gnuinter.net> | 2004-03-15 07:51:22 +0000 |
|---|---|---|
| committer | James Golovich <james@gnuinter.net> | 2004-03-15 07:51:22 +0000 |
| commit | 0e90480d6b6999320942b4e367836c20c0191a17 (patch) | |
| tree | 9da7eefab98149c7669e84b70601e9e9d3b91ae5 /channels/chan_iax2.c | |
| parent | c30ff0935d896c337fd9e72f560d924666fc044e (diff) | |
Fix bug 1217. Change pthread_t initializers to AST_PTHREADT_NULL and
AST_PTHREADT_STOP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rwxr-xr-x | channels/chan_iax2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 04f80738f..c9da32ea9 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -172,7 +172,7 @@ static char accountcode[20]; static int amaflags = 0; static int notransfer = 0; -static pthread_t netthreadid; +static pthread_t netthreadid = AST_PTHREADT_NULL; #define IAX_STATE_STARTED (1 << 0) #define IAX_STATE_AUTHENTICATED (1 << 1) @@ -6521,8 +6521,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<IAX_MAX_CALLS;x++) if (iaxs[x]) |