mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
Merged revisions 114587 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114587 | russell | 2008-04-23 12:16:32 -0500 (Wed, 23 Apr 2008) | 2 lines Fix find_callno_locked() to actually return the callno locked in some more cases. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1507,7 +1507,8 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
|
||||
res = x;
|
||||
}
|
||||
}
|
||||
ast_mutex_unlock(&iaxsl[x]);
|
||||
if (res && !return_locked)
|
||||
ast_mutex_unlock(&iaxsl[x]);
|
||||
}
|
||||
for (x=TRUNK_CALL_START;(res < 1) && (x<maxtrunkcall);x++) {
|
||||
ast_mutex_lock(&iaxsl[x]);
|
||||
@@ -1517,7 +1518,8 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
|
||||
res = x;
|
||||
}
|
||||
}
|
||||
ast_mutex_unlock(&iaxsl[x]);
|
||||
if (res && !return_locked)
|
||||
ast_mutex_unlock(&iaxsl[x]);
|
||||
}
|
||||
}
|
||||
if ((res < 1) && (new >= NEW_ALLOW)) {
|
||||
|
Reference in New Issue
Block a user