The patch acknowledges the TCP zero window probe message, either the format with...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Tcp4Dxe / Tcp4Timer.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 65c98de048fff4379efe92a91def6874dc4d3402..a8e4a933cfd62452c5a1865bde03ca7ab872c7cd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -1,23 +1,15 @@
 /** @file\r
-\r
-Copyright (c) 2005 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+  TCP timer related functions.\r
+    \r
+Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
+http://opensource.org/licenses/bsd-license.php<BR>\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-\r
-  Tcp4Timer.c\r
-\r
-Abstract:\r
-\r
-  TCP timer related functions.\r
-\r
-\r
 **/\r
 \r
 #include "Tcp4Main.h"\r
@@ -32,7 +24,7 @@ UINT32    mTcpTick = 1000;
 **/\r
 VOID\r
 TcpConnectTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
 \r
 /**\r
@@ -43,7 +35,7 @@ TcpConnectTimeout (
 **/\r
 VOID\r
 TcpRexmitTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
   \r
 /**\r
@@ -54,7 +46,7 @@ TcpRexmitTimeout (
 **/\r
 VOID\r
 TcpProbeTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
 \r
 /**\r
@@ -65,7 +57,7 @@ TcpProbeTimeout (
 **/\r
 VOID\r
 TcpKeepaliveTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
 \r
 /**\r
@@ -76,7 +68,7 @@ TcpKeepaliveTimeout (
 **/\r
 VOID\r
 TcpFinwait2Timeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
 \r
 /**\r
@@ -87,7 +79,7 @@ TcpFinwait2Timeout (
 **/\r
 VOID\r
 Tcp2MSLTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   );\r
 \r
 TCP_TIMER_HANDLER mTcpTimerHandler[TCP_TIMER_NUMBER] = {\r
@@ -107,7 +99,7 @@ TCP_TIMER_HANDLER mTcpTimerHandler[TCP_TIMER_NUMBER] = {
 **/\r
 VOID\r
 TcpClose (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   NetbufFreeList (&Tcb->SndQue);\r
@@ -125,7 +117,7 @@ TcpClose (
 **/\r
 VOID\r
 TcpConnectTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   if (!TCP_CONNECTED (Tcb->State)) {\r
@@ -157,7 +149,7 @@ TcpConnectTimeout (
 **/\r
 VOID\r
 TcpRexmitTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   UINT32  FlightSize;\r
@@ -208,7 +200,7 @@ TcpRexmitTimeout (
 **/\r
 VOID\r
 TcpProbeTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   //\r
@@ -219,7 +211,8 @@ TcpProbeTimeout (
   //\r
   if ((TcpDataToSend (Tcb, 1) != 0) && (TcpToSendData (Tcb, 1) > 0)) {\r
 \r
-    ASSERT (TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT));\r
+    ASSERT (TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT) != 0);\r
+    Tcb->ProbeTimerOn = FALSE;\r
     return ;\r
   }\r
 \r
@@ -236,7 +229,7 @@ TcpProbeTimeout (
 **/\r
 VOID\r
 TcpKeepaliveTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   Tcb->KeepAliveProbes++;\r
@@ -267,7 +260,7 @@ TcpKeepaliveTimeout (
 **/\r
 VOID\r
 TcpFinwait2Timeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "TcpFinwait2Timeout: connection closed "\r
@@ -285,7 +278,7 @@ TcpFinwait2Timeout (
 **/\r
 VOID\r
 Tcp2MSLTimeout (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "Tcp2MSLTimeout: connection closed "\r
@@ -304,7 +297,7 @@ Tcp2MSLTimeout (
 **/\r
 VOID\r
 TcpUpdateTimer (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   UINT16  Index;\r
@@ -338,9 +331,9 @@ TcpUpdateTimer (
 **/\r
 VOID\r
 TcpSetTimer (\r
-  IN TCP_CB *Tcb,\r
-  IN UINT16 Timer,\r
-  IN UINT32 TimeOut\r
+  IN OUT TCP_CB *Tcb,\r
+  IN     UINT16 Timer,\r
+  IN     UINT32 TimeOut\r
   )\r
 {\r
   TCP_SET_TIMER (Tcb->EnabledTimer, Timer);\r
@@ -359,8 +352,8 @@ TcpSetTimer (
 **/\r
 VOID\r
 TcpClearTimer (\r
-  IN TCP_CB *Tcb,\r
-  IN UINT16 Timer\r
+  IN OUT TCP_CB *Tcb,\r
+  IN     UINT16 Timer\r
   )\r
 {\r
   TCP_CLEAR_TIMER (Tcb->EnabledTimer, Timer);\r
@@ -376,7 +369,7 @@ TcpClearTimer (
 **/\r
 VOID\r
 TcpClearAllTimer (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   Tcb->EnabledTimer = 0;\r
@@ -392,11 +385,12 @@ TcpClearAllTimer (
 **/\r
 VOID\r
 TcpSetProbeTimer (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
-  if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_PROBE)) {\r
-    Tcb->ProbeTime = Tcb->Rto;\r
+  if (!Tcb->ProbeTimerOn) {\r
+    Tcb->ProbeTime    = Tcb->Rto;\r
+    Tcb->ProbeTimerOn = TRUE;\r
 \r
   } else {\r
     Tcb->ProbeTime <<= 1;\r
@@ -422,7 +416,7 @@ TcpSetProbeTimer (
 **/\r
 VOID\r
 TcpSetKeepaliveTimer (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_KEEPALIVE)) {\r
@@ -458,7 +452,7 @@ TcpSetKeepaliveTimer (
 **/\r
 VOID\r
 TcpBackoffRto (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   //\r
@@ -557,15 +551,17 @@ TcpTickingDpc (
         //\r
         if ((Next->BackLink != Entry) ||\r
             (Tcb->EnabledTimer == 0)) {\r
-\r
-          goto NextConnection;\r
+          break;\r
         }\r
       }\r
     }\r
-\r
-    TcpUpdateTimer (Tcb);\r
-NextConnection:\r
-    ;\r
+    \r
+    //\r
+    // If the Tcb still exist or some timer is set, update the timer\r
+    //\r
+    if (Index == TCP_TIMER_NUMBER) {\r
+      TcpUpdateTimer (Tcb);\r
+    }\r
   }\r
 }\r
 \r
@@ -583,6 +579,6 @@ TcpTicking (
   IN VOID      *Context\r
   )\r
 {\r
-  NetLibQueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);\r
 }\r
 \r