[svn-commits] tilghman: branch 1.4 r160570 - /branches/1.4/channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec  3 11:55:12 2008
New Revision: 160570

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160570
Log:
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.4/channels/chan_iax2.c

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=160570&r1=160569&r2=160570
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Wed Dec  3 11:55:12 2008
@@ -3613,6 +3613,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);