diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-06 19:02:18 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-06 19:02:18 +0000 |
| commit | 303c00556ddf9119994154ef45c7144f6d34406e (patch) | |
| tree | c1ae7e086e8a3ea796f5e15b7a9f9ccb7c5cd018 | |
| parent | a9fb80924b3fe6d54a102355a59abc3af1ba0520 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42147 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_agent.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 65a8fbef4..bba17969c 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -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. */ |