From 72156967ff44a76249f7ea8c035fa3099b4ca166 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 10 Nov 2008 21:15:57 +0000 Subject: [PATCH] Merged revisions 155863 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r155863 | mmichelson | 2008-11-10 15:14:44 -0600 (Mon, 10 Nov 2008) | 22 lines Merged revisions 155861 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155861 | mmichelson | 2008-11-10 15:07:39 -0600 (Mon, 10 Nov 2008) | 14 lines Channel drivers assume that when their indicate callback is invoked, that the channel on which the callback was called is locked. This patch corrects an instance in chan_agent where a channel's indicate callback is called directly without first locking the channel. This was leading to some observed locking issues in chan_local, but considering that all channel drivers operate under the same expectations, the generic fix in chan_agent is the right way to go. AST-126 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@155864 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_agent.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 13d98cb830..5cf24572a7 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -655,9 +655,15 @@ static int agent_indicate(struct ast_channel *ast, int condition, const void *da struct agent_pvt *p = ast->tech_pvt; int res = -1; ast_mutex_lock(&p->lock); - if (p->chan && !ast_check_hangup(p->chan)) - res = p->chan->tech->indicate ? p->chan->tech->indicate(p->chan, condition, data, datalen) : -1; - else + if (p->chan && !ast_check_hangup(p->chan)) { + while (ast_channel_trylock(p->chan)) { + ast_channel_unlock(ast); + usleep(1); + ast_channel_lock(ast); + } + res = p->chan->tech->indicate ? p->chan->tech->indicate(p->chan, condition, data, datalen) : -1; + ast_channel_unlock(p->chan); + } else res = 0; ast_mutex_unlock(&p->lock); return res;