kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 03:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't call find_peer in registry_authrequest with the pvt lock held to avoid a

Browse Source 
deadlock.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@79301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-08-13 20:37:50 +00:00
parent 68faf63811
commit f2de04d1d1
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
channels/chan_iax2.c
View File

@@ -5794,13 +5794,21 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
return send_command_final(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_REGACK, 0, ied.buf, ied.pos, -1); return send_command_final(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_REGACK, 0, ied.buf, ied.pos, -1);
} }
static int registry_authrequest(const char *name, int callno) static int registry_authrequest(int callno)
{ {
struct iax_ie_data ied; struct iax_ie_data ied;
struct iax2_peer *p; struct iax2_peer *p;
char challenge[10]; char challenge[10];
const char *peer_name;
peer_name = ast_strdupa(iaxs[callno]->peer);
/* SLD: third call to find_peer in registration */ /* SLD: third call to find_peer in registration */
p = find_peer(name, 1); ast_mutex_unlock(&iaxsl[callno]);
p = find_peer(peer_name, 1);
ast_mutex_lock(&iaxsl[callno]);
if (!iaxs[callno])
return -1;
if (p) { if (p) {
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
iax_ie_append_short(&ied, IAX_IE_AUTHMETHODS, p->authmethods); iax_ie_append_short(&ied, IAX_IE_AUTHMETHODS, p->authmethods);
@@ -5811,12 +5819,12 @@ static int registry_authrequest(const char *name, int callno)
/* snprintf(iaxs[callno]->challenge, sizeof(iaxs[callno]->challenge), "%d", (int)ast_random()); */ /* snprintf(iaxs[callno]->challenge, sizeof(iaxs[callno]->challenge), "%d", (int)ast_random()); */
iax_ie_append_str(&ied, IAX_IE_CHALLENGE, iaxs[callno]->challenge); iax_ie_append_str(&ied, IAX_IE_CHALLENGE, iaxs[callno]->challenge);
} }
iax_ie_append_str(&ied, IAX_IE_USERNAME, name); iax_ie_append_str(&ied, IAX_IE_USERNAME, peer_name);
if (ast_test_flag(p, IAX_TEMPONLY)) if (ast_test_flag(p, IAX_TEMPONLY))
destroy_peer(p); destroy_peer(p);
return send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_REGAUTH, 0, ied.buf, ied.pos, -1);; return send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_REGAUTH, 0, ied.buf, ied.pos, -1);;
} }
ast_log(LOG_WARNING, "No such peer '%s'\n", name); ast_log(LOG_WARNING, "No such peer '%s'\n", peer_name);
return 0; return 0;
} }
@@ -7650,7 +7658,11 @@ retryowner2:
} }
break; break;
} }
registry_authrequest(iaxs[fr->callno]->peer, fr->callno); registry_authrequest(fr->callno);
if (!iaxs[fr->callno]) {
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
break; break;
case IAX_COMMAND_REGACK: case IAX_COMMAND_REGACK:
if (iax2_ack_registry(&ies, &sin, fr->callno)) if (iax2_ack_registry(&ies, &sin, fr->callno))