Merged revisions 126999 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 1 Jul 2008 16:52:29 +0000 (16:52 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 1 Jul 2008 16:52:29 +0000 (16:52 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126999 | tilghman | 2008-07-01 11:50:46 -0500 (Tue, 01 Jul 2008) | 2 lines

Suppress annoying warning by finding the remaining cases where the callno is not in the hash.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127000 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index 2432a6b..6276441 100644 (file)
@@ -1650,6 +1650,15 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
                        }
                }
 
                        }
                }
 
+               /* This will occur on the first response to a message that we initiated,
+                * such as a PING. */
+               if (callno && dcallno && iaxs[dcallno] && !iaxs[dcallno]->peercallno && match(sin, callno, dcallno, iaxs[dcallno], check_dcallno)) {
+                       iaxs[dcallno]->peercallno = callno;
+                       res = dcallno;
+                       store_by_peercallno(iaxs[dcallno]);
+                       return res;
+               }
+
                for (x = 1; !res && x < maxnontrunkcall; x++) {
                        ast_mutex_lock(&iaxsl[x]);
                        if (iaxs[x]) {
                for (x = 1; !res && x < maxnontrunkcall; x++) {
                        ast_mutex_lock(&iaxsl[x]);
                        if (iaxs[x]) {