FCL/sf/os/networkingsrv: comparison networkprotocols/tcpipv4v6prt/src/tcp

equal deleted inserted replaced

-:88121cf79045
+:78fceed50f62
 			}
 		if (iFlags.iRetransmitPending)
 			{
 			iFlags.iRetransmitPending = EFalse;
-			RetransmitSegments();
+			if(RetransmitSegments())
+				return;
 			}
 		if (iFlags.iTransmitPending)
 			{
 			iFlags.iTransmitPending = EFalse;
 		// Exponential backoff.
 		//
 		++iBackoff;
 		if (iRTO < Protocol()->MaxRTO())  // Avoid RTO overflow
 			ResetRTO();
+		if(DetachIfDead())
+			{
+			Expire();
+			return;
+			}
 		//
 		// Timeout?
 		//
 		// Note: we time out if this is a connect attempt or a retransmission,
 		// but we must not time out if we're probing a zero window.
 //
 // Try to retransmit segments. This routine gets called from two places:
 //  - directly from RetransmitTimeout()
 //  - from CanSend(), in which case this is a delayed retransmission timeout
 //
-void CProviderTCP6::RetransmitSegments()
+TBool CProviderTCP6::RetransmitSegments()
 	{
 	ASSERT(iRetransTimer);
 	LOG(Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): queue=%u wnd=%u cwnd=%u, ssthresh=%u dupacks=%d"),
 		(TInt)this, iSockOutQLen, iSND.WND, iCwnd, iSsthresh, iDupAcks));
 	iFlags.iRetransmitPending = (iFlow.Status() == EFlow_PENDING);
 	if (iFlags.iRetransmitPending)
 		{
 		LOG(Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Flow pending"), (TInt)this));
 		ReSchedRetransmit();
-		return;
+		return EFalse;
 		}
 	//
 	// Handle retransmission of data segments and zero window probing.
 	// We must have something in output queue. SYN or FIN retransmissions
 			//
 			// Note 2: We may also end up with iSND.NXT pointing beyond the window if
 			// the receiver suddenly shrinks its window. The current solution covers
 			// both cases.
 			//
-			return;
+			return EFalse;
 			}
 		//
 		// This is a retransmit timout. Do we have anything to do?
 		//
 		if (!unacked)
-			return;
+			return EFalse;
 		LOG(if (iFlags.iFastRetransMode) Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Leaving FAST RETRANS mode"), (TInt)this));
 		iFlags.iFastRetransMode = EFalse;
 		iDupAcks = 0;
 			iSendHigh = iTransmitSeq;
 		// If the server doesn't respond because of broken NAT/FW or other, don't keep interface up.
 		if (InState(ETcpFinWait1|ETcpClosing|ETcpLastAck))
 			DetachIfDead();
-		return;
+		return EFalse;
 		}
 	//
 	// Ok, this is either a SYN/FIN retransmit or a TIME-WAIT/FIN-WAIT-2 timeout.
 	//
 	if (InState(ETcpSynSent))
 		{
 		// Retransmit SYN
 		SendSegment(KTcpCtlSYN, iSND.UNA);
-		return;
+		return EFalse;
 		}
 	if (InState(ETcpSynReceived))
 		{
 		// Retransmit SYN,ACK
 		SendSegment(KTcpCtlSYN|KTcpCtlACK, iSND.UNA);
-		return;
+		return EFalse;
 		}
 	if (InState(ETcpFinWait1|ETcpClosing|ETcpLastAck))
 		{
 		// If the server doesn't respond because of broken NAT/FW or other, don't keep interface up.
 	    //TSW error:JHAA-82JBNG -- FIN retransmission
 		//Depending on the function return value the decision to
 	    //retransmitt FIN is decided
-		TBool continue_send = DetachIfDead();
 		// Retransmit FIN
-		if(continue_send == EFalse)
+		if(DetachIfDead()== EFalse)
+			{
 			SendSegment(KTcpCtlFIN|KTcpCtlACK, iSND.UNA);
-		return;
+			return EFalse;
+			}
 		}
 	LOG(Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Retransmitter stopping"), (TInt)this));
 	if (!iSockFlags.iAttached)
+		{
 		Expire();
-	return;
+		return ETrue;
+		}
+	return EFalse;
 	}
 //
 // Respond to an explicit congestion control signal.

changeset 51	78fceed50f62
parent 25	d15a50675083
child 66	34ec136802c5