[asterisk-commits] mmichelson: branch 1.6.1 r155864 - in /branches/1.6.1: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Nov 10 15:15:57 2008
New Revision: 155864

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155864
Log:
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


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_agent.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_agent.c?view=diff&rev=155864&r1=155863&r2=155864
==============================================================================
--- branches/1.6.1/channels/chan_agent.c (original)
+++ branches/1.6.1/channels/chan_agent.c Mon Nov 10 15:15:57 2008
@@ -655,9 +655,15 @@
 	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;