Code clean up in NetLib:

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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index f525f240e40604dec0d625da3a270f4249c7a8e8..9bea6b298b5ab5f1f7dbf3817efa06d6df033082 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -1,25 +1,18 @@
 /** @file\r
+  TCP input process routines.\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation\r
+Copyright (c) 2005 - 2009, Intel Corporation<BR>\r
 All rights reserved. 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
-  Tcp4Input.c\r
-\r
-Abstract:\r
-\r
-  TCP input process routines.\r
-\r
-\r
 **/\r
 \r
+\r
 #include "Tcp4Main.h"\r
 \r
 \r
@@ -53,8 +46,8 @@ TcpSeqAcceptable (
 **/\r
 VOID\r
 TcpFastRecover (\r
-  IN TCP_CB  *Tcb,\r
-  IN TCP_SEG *Seg\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     TCP_SEG *Seg\r
   )\r
 {\r
   UINT32  FlightSize;\r
@@ -163,8 +156,8 @@ TcpFastRecover (
 **/\r
 VOID\r
 TcpFastLossRecover (\r
-  IN TCP_CB  *Tcb,\r
-  IN TCP_SEG *Seg\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     TCP_SEG *Seg\r
   )\r
 {\r
   if (TCP_SEQ_GT (Seg->Ack, Tcb->SndUna)) {\r
@@ -207,8 +200,8 @@ TcpFastLossRecover (
 **/\r
 VOID\r
 TcpComputeRtt (\r
-  IN TCP_CB *Tcb,\r
-  IN UINT32 Measure\r
+  IN OUT TCP_CB *Tcb,\r
+  IN     UINT32 Measure\r
   )\r
 {\r
   INT32 Var;\r
@@ -264,10 +257,8 @@ TcpComputeRtt (
   @param  Left     The sequence number of the window's left edge.\r
   @param  Right    The sequence number of the window's right edge.\r
 \r
-  @return 0        The data is successfully trimmed.\r
-\r
 **/\r
-INTN\r
+VOID\r
 TcpTrimSegment (\r
   IN NET_BUF   *Nbuf,\r
   IN TCP_SEQNO Left,\r
@@ -291,7 +282,7 @@ TcpTrimSegment (
 \r
     Seg->Seq = Seg->End;\r
     NetbufTrim (Nbuf, Nbuf->TotalSize, NET_BUF_HEAD);\r
-    return 0;\r
+    return;\r
   }\r
 \r
   //\r
@@ -345,7 +336,6 @@ TcpTrimSegment (
   }\r
 \r
   ASSERT (TcpVerifySegment (Nbuf) != 0);\r
-  return 0;\r
 }\r
 \r
 \r
@@ -355,16 +345,14 @@ TcpTrimSegment (
   @param  Tcb      Pointer to the TCP_CB of this TCP instance.\r
   @param  Nbuf     Pointer to the NET_BUF containing the received tcp segment.\r
 \r
-  @return 0        The data is trimmed.\r
-\r
 **/\r
-INTN\r
+VOID\r
 TcpTrimInWnd (\r
   IN TCP_CB  *Tcb,\r
   IN NET_BUF *Nbuf\r
   )\r
 {\r
-  return TcpTrimSegment (Nbuf, Tcb->RcvNxt, Tcb->RcvWl2 + Tcb->RcvWnd);\r
+  TcpTrimSegment (Nbuf, Tcb->RcvNxt, Tcb->RcvWl2 + Tcb->RcvWnd);\r
 }\r
 \r
 \r
@@ -381,7 +369,7 @@ TcpTrimInWnd (
 **/\r
 INTN\r
 TcpDeliverData (\r
-  IN TCP_CB *Tcb\r
+  IN OUT TCP_CB *Tcb\r
   )\r
 {\r
   LIST_ENTRY      *Entry;\r
@@ -491,6 +479,8 @@ TcpDeliverData (
         NetbufFree (Nbuf);\r
         return -1;\r
         break;\r
+      default:\r
+        break;\r
       }\r
 \r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
@@ -506,7 +496,7 @@ TcpDeliverData (
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
     }\r
 \r
-    if (Nbuf->TotalSize) {\r
+    if (Nbuf->TotalSize != 0) {\r
       Urgent = 0;\r
 \r
       if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_URG) &&\r
@@ -543,8 +533,8 @@ TcpDeliverData (
 **/\r
 VOID\r
 TcpQueueData (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     NET_BUF *Nbuf\r
   )\r
 {\r
   TCP_SEG         *Seg;\r
@@ -772,10 +762,6 @@ TcpInput (
   NetbufTrim (Nbuf, (Head->HeadLen << 2), NET_BUF_HEAD);\r
   Nbuf->Tcp = NULL;\r
 \r
-  //\r
-  // TODO: add fast path process here\r
-  //\r
-\r
   //\r
   // Process the segment in LISTEN state.\r
   //\r
@@ -813,7 +799,7 @@ TcpInput (
       Tcb     = TcpCloneTcb (Parent);\r
       if (Tcb == NULL) {\r
         DEBUG ((EFI_D_ERROR, "TcpInput: discard a segment because"\r
-          "failed to clone a child for TCB%x\n", Tcb));\r
+          " failed to clone a child for TCB%x\n", Tcb));\r
 \r
         goto DISCARD;\r
       }\r
@@ -861,14 +847,14 @@ TcpInput (
       if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
 \r
         DEBUG ((EFI_D_WARN, "TcpInput: connection reset by"\r
-          " peer for TCB%x in SYN_SENT\n", Tcb));\r
+          " peer for TCB %p in SYN_SENT\n", Tcb));\r
 \r
         SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
         goto DROP_CONNECTION;\r
       } else {\r
 \r
         DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "\r
-          "because of no ACK for TCB%x in SYN_SENT\n", Tcb));\r
+          "because of no ACK for TCB %p in SYN_SENT\n", Tcb));\r
 \r
         goto DISCARD;\r
       }\r
@@ -985,9 +971,7 @@ TcpInput (
       SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
 \r
     } else {\r
-      //\r
-      // TODO: set socket error to CLOSED\r
-      //\r
+\r
     }\r
 \r
     goto DROP_CONNECTION;\r
@@ -1174,7 +1158,7 @@ TcpInput (
       }\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: peer shrinks the"\r
-        " window  for connected TCB %p\n", Tcb));\r
+        " window for connected TCB %p\n", Tcb));\r
 \r
       if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&\r
           (TCP_SEQ_LT (Right, Tcb->Recover))) {\r
@@ -1283,6 +1267,9 @@ NO_UPDATE:
       TcpClose (Tcb);\r
     }\r
     break;\r
+\r
+  default:\r
+    break;\r
   }\r
 \r
   //\r
@@ -1366,7 +1353,7 @@ StepSix:
 \r
   if ((Tcb->State != TCP_CLOSED) &&\r
       (TcpToSendData (Tcb, 0) == 0) &&\r
-      (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW) || Nbuf->TotalSize)) {\r
+      (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW) || (Nbuf->TotalSize != 0))) {\r
 \r
     TcpToSendAck (Tcb);\r
   }\r
@@ -1420,7 +1407,7 @@ DISCARD:
 VOID\r
 TcpIcmpInput (\r
   IN NET_BUF     *Nbuf,\r
-  IN ICMP_ERROR  IcmpErr,\r
+  IN UINT8       IcmpErr,\r
   IN UINT32      Src,\r
   IN UINT32      Dst\r
   )\r
@@ -1454,7 +1441,12 @@ TcpIcmpInput (
     goto CLEAN_EXIT;\r
   }\r
 \r
-  IcmpErrStatus = IpIoGetIcmpErrStatus (IcmpErr, &IcmpErrIsHard, &IcmpErrNotify);\r
+  IcmpErrStatus = IpIoGetIcmpErrStatus (\r
+                    IcmpErr,\r
+                    IP_VERSION_4,\r
+                    &IcmpErrIsHard,\r
+                    &IcmpErrNotify\r
+                    );\r
 \r
   if (IcmpErrNotify) {\r
 \r