Merged revisions 127000 via svnmerge from

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

................
r127000 | tilghman | 2008-07-01 11:52:29 -0500 (Tue, 01 Jul 2008) | 10 lines

Merged revisions 126999 via svnmerge from 
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/branches/1.6.0@127001 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

@@ -1643,6 +1643,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]) {