chan_agent: Fix agent_indicate() locking.

Avoid deadlock potential with local channels and simplify the locking.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@378427 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 92aa796817a0e2dc1d4436950d5fde692918a108..41b2d0a7917ba419d64e2563e3f6d79df98e6658 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -784,23 +784,19 @@ 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)) {
-               while (ast_channel_trylock(p->chan)) {
-                       int res;
-                       if ((res = ast_channel_unlock(ast))) {
-                               ast_log(LOG_ERROR, "chan_agent bug! Channel was not locked upon entry to agent_indicate: %s\n", res > 0 ? strerror(res) : "Bad ao2obj data");
-                               ast_mutex_unlock(&p->lock);
-                               return -1;
-                       }
-                       usleep(1);
-                       ast_channel_lock(ast);
-               }
+               ast_channel_unlock(ast);
+               ast_channel_lock(p->chan);
                res = p->chan->tech->indicate ? p->chan->tech->indicate(p->chan, condition, data, datalen) : -1;
                ast_channel_unlock(p->chan);
-       } else
+               ast_mutex_unlock(&p->lock);
+               ast_channel_lock(ast);
+       } else {
+               ast_mutex_unlock(&p->lock);
                res = 0;
-       ast_mutex_unlock(&p->lock);
+       }
        return res;
 }