mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-28 00:10:25 -07:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user