kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be fanatic about locking when calling check_hangup

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-08-11 21:10:52 +00:00
parent 0e2190687f
commit b5fb02dc70
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channel.c
View File

@@ -96,6 +96,15 @@ time_t myt;
return 1;
}
static int ast_check_hangup_locked(struct ast_channel *chan)
{
int res;
ast_pthread_mutex_lock(&chan->lock);
res = ast_check_hangup(chan);
ast_pthread_mutex_unlock(&chan->lock);
return res;
}
void ast_begin_shutdown(int hangup)
{
struct ast_channel *c;
@@ -2067,7 +2076,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
int nativefailed=0;
/* Stop if we're a zombie or need a soft hangup */
if (c0->zombie || ast_check_hangup(c0) || c1->zombie || ast_check_hangup(c1))
if (c0->zombie || ast_check_hangup_locked(c0) || c1->zombie || ast_check_hangup_locked(c1))
return -1;
if (c0->bridge) {
ast_log(LOG_WARNING, "%s is already in a bridge with %s\n",