diff options
| -rw-r--r-- | channels/chan_agent.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index d5c327965..7ab6f61b0 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -815,7 +815,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; } @@ -955,7 +956,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, &ast_null_frame); ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */ @@ -971,7 +972,20 @@ 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, &ast_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; + } } + ast_indicate(p->chan, AST_CONTROL_UNHOLD); p->owning_app = pthread_self(); /* After the above step, there should not be any blockers. */ if (p->chan) { @@ -979,7 +993,6 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" ); CRASH; } - ast_indicate(p->chan, AST_CONTROL_UNHOLD); } return tmp; } |