kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 114674 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114674 | russell | 2008-04-25 17:00:35 -0500 (Fri, 25 Apr 2008) | 11 lines

Merged revisions 114673 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114673 | russell | 2008-04-25 16:54:40 -0500 (Fri, 25 Apr 2008) | 3 lines

Use consistent logic for checking to see if a call number has been chosen yet.
Also, remove some redundant logic I recently added in a fix.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-04-25 22:03:25 +00:00
parent 583b8b1cb8
commit 35c3c7770f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_iax2.c
View File

@@ -1492,7 +1492,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
char host[80]; char host[80];
if (new <= NEW_ALLOW) { if (new <= NEW_ALLOW) {
for (x=1;(res < 1) && (x<maxnontrunkcall);x++) { for (x = 1; !res && x < maxnontrunkcall; x++) {
ast_mutex_lock(&iaxsl[x]); ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) { if (iaxs[x]) {
/* Look for an exact match */ /* Look for an exact match */
@@ -1500,10 +1500,10 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
res = x; res = x;
} }
} }
if (!res || (res && !return_locked)) if (!res || !return_locked)
ast_mutex_unlock(&iaxsl[x]); ast_mutex_unlock(&iaxsl[x]);
} }
for (x=TRUNK_CALL_START;(res < 1) && (x<maxtrunkcall);x++) { for (x = TRUNK_CALL_START; !res && x < maxtrunkcall; x++) {
ast_mutex_lock(&iaxsl[x]); ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) { if (iaxs[x]) {
/* Look for an exact match */ /* Look for an exact match */
@@ -1511,11 +1511,11 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
res = x; res = x;
} }
} }
if (!res || (res && !return_locked)) if (!res || !return_locked)
ast_mutex_unlock(&iaxsl[x]); ast_mutex_unlock(&iaxsl[x]);
} }
} }
if ((res < 1) && (new >= NEW_ALLOW)) { if (!res && (new >= NEW_ALLOW)) {
int start, found = 0; int start, found = 0;
/* It may seem odd that we look through the peer list for a name for /* It may seem odd that we look through the peer list for a name for