summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-11-22 18:25:27 +0000
committerMark Spencer <markster@digium.com>2004-11-22 18:25:27 +0000
commit23c2d6b12cd988474aa59dae7ba902e3c0a8d82c (patch)
tree024a37c6652ed0463ac8c9655ac50e291c24d44d
parentb48d2563aee286d54848c987c6acdcb370107bc3 (diff)
Release call lock while we look for the peer to avoid a deadlock
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xchannels/chan_iax2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1b49dcce3..7a7a7aefd 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3886,12 +3886,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]);
if (!p)
p = realtime_peer(peer);