kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-06 19:02:18 +00:00
parent a4beaa7dc7
commit cfb503c6a7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_agent.c
View File

@@ -828,7 +828,8 @@ static int agent_hangup(struct ast_channel *ast)
ast_mutex_unlock(&p->lock);
}
/* Release ownership of the agent to other threads (presumably running the login app). */
ast_mutex_unlock(&p->app_lock);
if (ast_strlen_zero(p->loginchan))
ast_mutex_unlock(&p->app_lock);
}
return 0;
}
@@ -972,7 +973,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
* implemented in the kernel for this.
*/
p->app_sleep_cond = 0;
if( ast_mutex_trylock(&p->app_lock) )
if( ast_strlen_zero(p->loginchan) && ast_mutex_trylock(&p->app_lock) )
{
if (p->chan) {
ast_queue_frame(p->chan, &null_frame);
@@ -991,6 +992,18 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
ast_mutex_unlock(&p->app_lock);
return NULL;
}
} else if (!ast_strlen_zero(p->loginchan)) {
if (p->chan)
ast_queue_frame(p->chan, &null_frame);
if (!p->chan) {
ast_log(LOG_WARNING, "Agent disconnected while we were connecting the call\n");
p->owner = NULL;
tmp->tech_pvt = NULL;
p->app_sleep_cond = 1;
ast_channel_free( tmp );
ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */
return NULL;
}
}
p->owning_app = pthread_self();
/* After the above step, there should not be any blockers. */