[svn-commits] tilghman: branch 1.6.0 r160590 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec  3 12:01:04 2008
New Revision: 160590

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160590
Log:
Merged revisions 160585 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160585 | tilghman | 2008-12-03 11:59:36 -0600 (Wed, 03 Dec 2008) | 11 lines
  
  Blocked revisions 160570 via svnmerge
  
  ........
    r160570 | tilghman | 2008-12-03 11:55:12 -0600 (Wed, 03 Dec 2008) | 5 lines
    
    During bridge code, the channel bridge may return a retry code, if a transfer
    was initiated but not yet completed.  If the bridge is immediately retried,
    then we may send a storm of TXREQ packets, even though the first set is sent
    reliably (retransmitted).  Fixes AST-137.
  ........
................

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=160590&r1=160589&r2=160590
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Wed Dec  3 12:01:04 2008
@@ -3917,6 +3917,10 @@
 	if (!flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
 		iaxs[callno0]->bridgecallno = callno1;
 		iaxs[callno1]->bridgecallno = callno0;
+	}
+	/* If the bridge got retried, don't queue up more packets - the transfer request will be retransmitted as necessary */
+	if (iaxs[callno0]->transferring && iaxs[callno1]->transferring) {
+		transferstarted = 1;
 	}
 	unlock_both(callno0, callno1);