[asterisk-commits] russell: trunk r73552 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jul  5 17:32:30 2007
New Revision: 73552

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73552
Log:
Merged revisions 73551 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73551 | russell | 2007-07-05 17:31:31 -0500 (Thu, 05 Jul 2007) | 6 lines

* Store the call number that a thread is processing without the full frame bit
  set to ease debugging
* When deferring a full frame for processing, stick it into the queue for the
  thread that is processing frames for that call, not the one that read the
  current frame and is about to go back into the idle list

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=73552&r1=73551&r2=73552
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Thu Jul  5 17:32:30 2007
@@ -6624,23 +6624,24 @@
 	fh = (struct ast_iax2_full_hdr *) thread->buf;
 	if (ntohs(fh->scallno) & IAX_FLAG_FULL) {
 		struct iax2_thread *cur = NULL;
+		uint16_t callno = ntohs(fh->scallno) & ~IAX_FLAG_FULL;
 		
 		AST_LIST_LOCK(&active_list);
 		AST_LIST_TRAVERSE(&active_list, cur, list) {
-			if ((cur->ffinfo.callno == ntohs(fh->scallno)) &&
+			if ((cur->ffinfo.callno == callno) &&
 			    !inaddrcmp(&cur->ffinfo.sin, &thread->iosin))
 				break;
 		}
 		if (cur) {
 			/* we found another thread processing a full frame for this call,
 			   so queue it up for processing later. */
-			defer_full_frame(thread);
+			defer_full_frame(cur);
 			AST_LIST_UNLOCK(&active_list);
 			insert_idle_thread(thread);
 			return 1;
 		} else {
 			/* this thread is going to process this frame, so mark it */
-			thread->ffinfo.callno = ntohs(fh->scallno);
+			thread->ffinfo.callno = callno;
 			memcpy(&thread->ffinfo.sin, &thread->iosin, sizeof(thread->ffinfo.sin));
 			thread->ffinfo.type = fh->type;
 			thread->ffinfo.csub = fh->csub;