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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160590 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

@@ -3918,6 +3918,10 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
 		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);
 
 	/* If not, try to bridge until we can execute a transfer, if we can */