Release call lock while we look for the peer to avoid a deadlock

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

diff --git a/CHANGES b/CHANGES
index 5ead87309ea17b014b8c79116cd818a738f0154f..1c9bfdf3899887b49c17cb87498c9916dddbc726 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@
     -- fix bug with supervised transfers
  -- chan_h323
     -- fix compilation problem
+ -- chan_iax2
+   -- avoid a deadlock related to a static config of a BUNCH of peers
  -- cdr_pgsql
     -- fix memory leak when reading config
  -- Numerous other minor bug fixes

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index b49afdbfa68e860c50dc92660f811a61121abef7..510995b7e049f1d784e9fb029a7af95614f49a9b 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3852,12 +3852,15 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
                ast_log(LOG_NOTICE, "Empty registration from %s\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
                return -1;
        }
-
+       /* We release the lock for the call to prevent a deadlock, but it's okay because
+          only the current thread could possibly make it go away or make changes */
+       ast_mutex_unlock(&iaxsl[callno]);
        ast_mutex_lock(&peerl.lock);
        for (p = peerl.peers; p ; p = p->next) 
                if (!strcasecmp(p->name, peer))
                        break;
        ast_mutex_unlock(&peerl.lock);
+       ast_mutex_lock(&iaxsl[callno]);
 #ifdef MYSQL_FRIENDS
        if (!p) 
                p = mysql_peer(peer);