[asterisk-commits] russell: branch 1.4 r79276 - /branches/1.4/channels/chan_iax2.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Aug 13 15:18:30 CDT 2007
Author: russell
Date: Mon Aug 13 15:18:30 2007
New Revision: 79276
URL: http://svn.digium.com/view/asterisk?view=rev&rev=79276
Log:
Release the pvt lock before calling find_peer in register_verify to avoid a
deadlock. Also, remove some unnecessary locking in auth_fail that was only done
recursively.
Modified:
branches/1.4/channels/chan_iax2.c
Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=79276&r1=79275&r2=79276
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Mon Aug 13 15:18:30 2007
@@ -5063,10 +5063,11 @@
}
/* SLD: first call to lookup peer during registration */
+ ast_mutex_unlock(&iaxsl[callno]);
p = find_peer(peer, 1);
-
- if (!p) {
- if (authdebug)
+ ast_mutex_lock(&iaxsl[callno]);
+ if (!p || !iaxs[callno]) {
+ if (authdebug && !p)
ast_log(LOG_NOTICE, "No registration for peer '%s' (from %s)\n", peer, ast_inet_ntoa(sin->sin_addr));
return -1;
}
@@ -5173,8 +5174,8 @@
if (ast_test_flag(p, IAX_TEMPONLY))
destroy_peer(p);
+
return 0;
-
}
static int authenticate(const char *challenge, const char *secret, const char *keyn, int authmethods, struct iax_ie_data *ied, struct sockaddr_in *sin, aes_encrypt_ctx *ecx, aes_decrypt_ctx *dcx)
@@ -5909,7 +5910,6 @@
{
/* Schedule sending the authentication failure in one second, to prevent
guessing */
- ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) {
iaxs[callno]->authfail = failcode;
if (delayreject) {
@@ -5919,7 +5919,6 @@
} else
auth_reject((void *)(long)callno);
}
- ast_mutex_unlock(&iaxsl[callno]);
return 0;
}
@@ -7618,9 +7617,17 @@
if (delayreject)
send_command_immediate(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACK, fr->ts, NULL, 0,fr->iseqno);
if (register_verify(fr->callno, &sin, &ies)) {
+ if (!iaxs[fr->callno]) {
+ ast_mutex_unlock(&iaxsl[fr->callno]);
+ return 1;
+ }
/* Send delayed failure */
auth_fail(fr->callno, IAX_COMMAND_REGREJ);
break;
+ }
+ if (!iaxs[fr->callno]) {
+ ast_mutex_unlock(&iaxsl[fr->callno]);
+ return 1;
}
if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) ||
ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED | IAX_STATE_UNCHANGED)) {
More information about the asterisk-commits
mailing list