[asterisk-commits] tilghman: branch 1.6.0 r127001 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul  1 11:53:21 2008
New Revision: 127001

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127001
Log:
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.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=127001&r1=127000&r2=127001
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Tue Jul  1 11:53:21 2008
@@ -1641,6 +1641,15 @@
 				pvt = NULL;
 				return res;
 			}
+		}
+
+		/* 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++) {