Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[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 3a3e904c7c246497fda6c041d7c64f245285ed1c..a054a4a56d03528144ac0a0fdf50805f475d6c12 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -84,7 +84,7 @@ TcpFastRecover (
     TcpRetransmit (Tcb, Tcb->SndUna);\r
     Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;\r
 \r
-    TCP4_DEBUG_TRACE (("TcpFastRecover: enter fast retransmission"\r
+    DEBUG ((EFI_D_INFO, "TcpFastRecover: enter fast retransmission"\r
       " for TCB %x, recover point is %d\n", Tcb, Tcb->Recover));\r
     return;\r
   }\r
@@ -103,7 +103,7 @@ TcpFastRecover (
     // by TcpToSendData\r
     //\r
     Tcb->CWnd += Tcb->SndMss;\r
-    TCP4_DEBUG_TRACE (("TcpFastRecover: received another"\r
+    DEBUG ((EFI_D_INFO, "TcpFastRecover: received another"\r
       " duplicated ACK (%d) for TCB %x\n", Seg->Ack, Tcb));\r
 \r
   } else {\r
@@ -123,7 +123,7 @@ TcpFastRecover (
       Tcb->CWnd         = MIN (Tcb->Ssthresh, FlightSize + Tcb->SndMss);\r
 \r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
-      TCP4_DEBUG_TRACE (("TcpFastRecover: received a full ACK(%d)"\r
+      DEBUG ((EFI_D_INFO, "TcpFastRecover: received a full ACK(%d)"\r
         " for TCB %x, exit fast recovery\n", Seg->Ack, Tcb));\r
 \r
     } else {\r
@@ -148,7 +148,7 @@ TcpFastRecover (
 \r
       Tcb->CWnd -= Acked;\r
 \r
-      TCP4_DEBUG_TRACE (("TcpFastRecover: received a partial"\r
+      DEBUG ((EFI_D_INFO, "TcpFastRecover: received a partial"\r
         " ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
 \r
     }\r
@@ -185,7 +185,7 @@ TcpFastLossRecover (
       Tcb->LossTimes    = 0;\r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
 \r
-      TCP4_DEBUG_TRACE (("TcpFastLossRecover: received a "\r
+      DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r
         "full ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
 \r
     } else {\r
@@ -195,7 +195,7 @@ TcpFastLossRecover (
       // fast retransmit the first unacknowledge field.\r
       //\r
       TcpRetransmit (Tcb, Seg->Ack);\r
-      TCP4_DEBUG_TRACE (("TcpFastLossRecover: received a "\r
+      DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r
         "partial ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
     }\r
   }\r
@@ -256,7 +256,7 @@ TcpComputeRtt (
 \r
   }\r
 \r
-  TCP4_DEBUG_TRACE (("TcpComputeRtt: new RTT for TCB %x"\r
+  DEBUG ((EFI_D_INFO, "TcpComputeRtt: new RTT for TCB %x"\r
     " computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
     Tcb, Tcb->SRtt, Tcb->RttVar, Tcb->Rto));\r
 \r
@@ -392,7 +392,7 @@ TcpDeliverData (
   IN TCP_CB *Tcb\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   NET_BUF         *Nbuf;\r
   TCP_SEQNO       Seq;\r
   TCP_SEG         *Seg;\r
@@ -404,7 +404,7 @@ TcpDeliverData (
   // make sure there is some data queued,\r
   // and TCP is in a proper state\r
   //\r
-  if (NetListIsEmpty (&Tcb->RcvQue) || !TCP_CONNECTED (Tcb->State)) {\r
+  if (IsListEmpty (&Tcb->RcvQue) || !TCP_CONNECTED (Tcb->State)) {\r
 \r
     return 0;\r
   }\r
@@ -430,7 +430,7 @@ TcpDeliverData (
     Seq         = Seg->End;\r
     Tcb->RcvNxt = Seq;\r
 \r
-    NetListRemoveEntry (&Nbuf->List);\r
+    RemoveEntryList (&Nbuf->List);\r
 \r
     //\r
     // RFC793 Eighth step: process FIN in sequence\r
@@ -441,15 +441,15 @@ TcpDeliverData (
       // The peer sends to us junky data after FIN,\r
       // reset the connection.\r
       //\r
-      if (!NetListIsEmpty (&Tcb->RcvQue)) {\r
-        TCP4_DEBUG_ERROR (("TcpDeliverData: data received after"\r
+      if (!IsListEmpty (&Tcb->RcvQue)) {\r
+        DEBUG ((EFI_D_ERROR, "TcpDeliverData: data received after"\r
           " FIN from peer of TCB %x, reset connection\n", Tcb));\r
 \r
         NetbufFree (Nbuf);\r
         return -1;\r
       }\r
 \r
-      TCP4_DEBUG_TRACE (("TcpDeliverData: processing FIN "\r
+      DEBUG ((EFI_D_INFO, "TcpDeliverData: processing FIN "\r
         "from peer of TCB %x\n", Tcb));\r
 \r
       switch (Tcb->State) {\r
@@ -480,7 +480,7 @@ TcpDeliverData (
           TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
         } else {\r
 \r
-          TCP4_DEBUG_WARN (("Connection closed immediately "\r
+          DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
             "because app disables TIME_WAIT timer for %x\n", Tcb));\r
 \r
           TcpSendAck (Tcb);\r
@@ -558,9 +558,9 @@ TcpQueueData (
   )\r
 {\r
   TCP_SEG         *Seg;\r
-  NET_LIST_ENTRY  *Head;\r
-  NET_LIST_ENTRY  *Prev;\r
-  NET_LIST_ENTRY  *Cur;\r
+  LIST_ENTRY      *Head;\r
+  LIST_ENTRY      *Prev;\r
+  LIST_ENTRY      *Cur;\r
   NET_BUF         *Node;\r
 \r
   ASSERT (Tcb && Nbuf && (Nbuf->Tcp == NULL));\r
@@ -574,9 +574,9 @@ TcpQueueData (
   // Fast path to process normal case. That is,\r
   // no out-of-order segments are received.\r
   //\r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
 \r
-    NetListInsertTail (Head, &Nbuf->List);\r
+    InsertTailList (Head, &Nbuf->List);\r
     return ;\r
   }\r
 \r
@@ -613,7 +613,7 @@ TcpQueueData (
     }\r
   }\r
 \r
-  NetListInsertHead (Prev, &Nbuf->List);\r
+  InsertHeadList (Prev, &Nbuf->List);\r
 \r
   TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
 \r
@@ -627,7 +627,7 @@ TcpQueueData (
 \r
       Cur = Cur->ForwardLink;\r
 \r
-      NetListRemoveEntry (&Node->List);\r
+      RemoveEntryList (&Node->List);\r
       NetbufFree (Node);\r
       continue;\r
     }\r
@@ -636,7 +636,7 @@ TcpQueueData (
 \r
       if (TCP_SEQ_LEQ (TCPSEG_NETBUF (Node)->Seq, Seg->Seq)) {\r
 \r
-        NetListRemoveEntry (&Nbuf->List);\r
+        RemoveEntryList (&Nbuf->List);\r
         NetbufFree (Nbuf);\r
         return ;\r
       }\r
@@ -665,8 +665,8 @@ TcpAdjustSndQue (
   IN TCP_SEQNO Ack\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Head;\r
-  NET_LIST_ENTRY  *Cur;\r
+  LIST_ENTRY      *Head;\r
+  LIST_ENTRY      *Cur;\r
   NET_BUF         *Node;\r
   TCP_SEG         *Seg;\r
 \r
@@ -687,7 +687,7 @@ TcpAdjustSndQue (
     if (TCP_SEQ_LEQ (Seg->End, Ack)) {\r
       Cur = Cur->ForwardLink;\r
 \r
-      NetListRemoveEntry (&Node->List);\r
+      RemoveEntryList (&Node->List);\r
       NetbufFree (Node);\r
       continue;\r
     }\r
@@ -738,7 +738,7 @@ TcpInput (
   if ((Head->HeadLen < 5) || (Len < 0) ||\r
       TcpChecksum (Nbuf, NetPseudoHeadChecksum (Src, Dst, 6, 0))) {\r
 \r
-    TCP4_DEBUG_TRACE (("TcpInput: received an mal-formated packet\n"));\r
+    DEBUG ((EFI_D_INFO, "TcpInput: received an mal-formated packet\n"));\r
     goto DISCARD;\r
   }\r
 \r
@@ -759,7 +759,7 @@ TcpInput (
           );\r
 \r
   if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {\r
-    TCP4_DEBUG_TRACE (("TcpInput: send reset because no TCB find\n"));\r
+    DEBUG ((EFI_D_INFO, "TcpInput: send reset because no TCB find\n"));\r
 \r
     Tcb = NULL;\r
     goto SEND_RESET;\r
@@ -772,7 +772,7 @@ TcpInput (
   // (in fact, an illegal option length) is reset.\r
   //\r
   if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {\r
-    TCP4_DEBUG_ERROR (("TcpInput: reset the peer because"\r
+    DEBUG ((EFI_D_ERROR, "TcpInput: reset the peer because"\r
       " of mal-format option for Tcb %x\n", Tcb));\r
 \r
     goto SEND_RESET;\r
@@ -796,7 +796,7 @@ TcpInput (
     // First step: Check RST\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
-      TCP4_DEBUG_WARN (("TcpInput: discard a reset segment "\r
+      DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "\r
         "for TCB %x in listening\n", Tcb));\r
 \r
       goto DISCARD;\r
@@ -807,7 +807,7 @@ TcpInput (
     // Any ACK sent to TCP in LISTEN is reseted.\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
-      TCP4_DEBUG_WARN (("TcpInput: send reset because of"\r
+      DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r
         " segment with ACK for TCB %x in listening\n", Tcb));\r
 \r
       goto SEND_RESET;\r
@@ -824,13 +824,13 @@ TcpInput (
 \r
       Tcb     = TcpCloneTcb (Parent);\r
       if (Tcb == NULL) {\r
-        TCP4_DEBUG_ERROR (("TcpInput: discard a segment because"\r
+        DEBUG ((EFI_D_ERROR, "TcpInput: discard a segment because"\r
           "failed to clone a child for TCB%x\n", Tcb));\r
 \r
         goto DISCARD;\r
       }\r
 \r
-      TCP4_DEBUG_TRACE (("TcpInput: create a child for TCB %x"\r
+      DEBUG ((EFI_D_INFO, "TcpInput: create a child for TCB %x"\r
         " in listening\n", Tcb));\r
 \r
       //\r
@@ -859,7 +859,7 @@ TcpInput (
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {\r
 \r
-      TCP4_DEBUG_WARN (("TcpInput: send reset because of "\r
+      DEBUG ((EFI_D_WARN, "TcpInput: send reset because of "\r
         "wrong ACK received for TCB %x in SYN_SENT\n", Tcb));\r
 \r
       goto SEND_RESET;\r
@@ -872,14 +872,14 @@ TcpInput (
 \r
       if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
 \r
-        TCP4_DEBUG_WARN (("TcpInput: connection reset by"\r
+        DEBUG ((EFI_D_WARN, "TcpInput: connection reset by"\r
           " peer for TCB%x in SYN_SENT\n", Tcb));\r
 \r
         SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
         goto DROP_CONNECTION;\r
       } else {\r
 \r
-        TCP4_DEBUG_WARN (("TcpInput: discard a reset segment "\r
+        DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "\r
           "because of no ACK for TCB%x in SYN_SENT\n", Tcb));\r
 \r
         goto DISCARD;\r
@@ -922,7 +922,7 @@ TcpInput (
 \r
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
 \r
-        TCP4_DEBUG_TRACE (("TcpInput: connection established"\r
+        DEBUG ((EFI_D_INFO, "TcpInput: connection established"\r
           " for TCB %x in SYN_SENT\n", Tcb));\r
 \r
         goto StepSix;\r
@@ -937,7 +937,7 @@ TcpInput (
 \r
         TcpTrimInWnd (Tcb, Nbuf);\r
 \r
-        TCP4_DEBUG_WARN (("TcpInput: simultanous open "\r
+        DEBUG ((EFI_D_WARN, "TcpInput: simultanous open "\r
           "for TCB %x in SYN_SENT\n", Tcb));\r
 \r
         goto StepSix;\r
@@ -955,7 +955,7 @@ TcpInput (
   // First step: Check whether SEG.SEQ is acceptable\r
   //\r
   if (!TcpSeqAcceptable (Tcb, Seg)) {\r
-    TCP4_DEBUG_WARN (("TcpInput: sequence acceptance"\r
+    DEBUG ((EFI_D_WARN, "TcpInput: sequence acceptance"\r
       " test failed for segment of TCB %x\n", Tcb));\r
 \r
     if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
@@ -977,7 +977,7 @@ TcpInput (
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
 \r
-    TCP4_DEBUG_WARN (("TcpInput: connection reset for TCB %x\n", Tcb));\r
+    DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %x\n", Tcb));\r
 \r
     if (Tcb->State == TCP_SYN_RCVD) {\r
 \r
@@ -1020,7 +1020,7 @@ TcpInput (
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
 \r
-    TCP4_DEBUG_WARN (("TcpInput: connection reset "\r
+    DEBUG ((EFI_D_WARN, "TcpInput: connection reset "\r
       "because received extra SYN for TCB %x\n", Tcb));\r
 \r
     SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
@@ -1031,7 +1031,7 @@ TcpInput (
   // Fifth step: Check the ACK\r
   //\r
   if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
-    TCP4_DEBUG_WARN (("TcpInput: segment discard because"\r
+    DEBUG ((EFI_D_WARN, "TcpInput: segment discard because"\r
       " of no ACK for connected TCB %x\n", Tcb));\r
 \r
     goto DISCARD;\r
@@ -1052,14 +1052,14 @@ TcpInput (
       TcpClearTimer (Tcb, TCP_TIMER_CONNECT);\r
       TcpDeliverData (Tcb);\r
 \r
-      TCP4_DEBUG_TRACE (("TcpInput: connection established "\r
+      DEBUG ((EFI_D_INFO, "TcpInput: connection established "\r
         " for TCB %x in SYN_RCVD\n", Tcb));\r
 \r
       //\r
       // Continue the process as ESTABLISHED state\r
       //\r
     } else {\r
-      TCP4_DEBUG_WARN (("TcpInput: send reset because of"\r
+      DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r
         " wrong ACK for TCB %x in SYN_RCVD\n", Tcb));\r
 \r
       goto SEND_RESET;\r
@@ -1068,14 +1068,14 @@ TcpInput (
 \r
   if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {\r
 \r
-    TCP4_DEBUG_WARN (("TcpInput: ignore the out-of-data"\r
+    DEBUG ((EFI_D_WARN, "TcpInput: ignore the out-of-data"\r
       " ACK for connected TCB %x\n", Tcb));\r
 \r
     goto StepSix;\r
 \r
   } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {\r
 \r
-    TCP4_DEBUG_WARN (("TcpInput: discard segment for "\r
+    DEBUG ((EFI_D_WARN, "TcpInput: discard segment for "\r
       "future ACK for connected TCB %x\n", Tcb));\r
 \r
     TcpSendAck (Tcb);\r
@@ -1186,7 +1186,7 @@ TcpInput (
         goto NO_UPDATE;\r
       }\r
 \r
-      TCP4_DEBUG_WARN (("TcpInput: peer shrinks the"\r
+      DEBUG ((EFI_D_WARN, "TcpInput: peer shrinks the"\r
         " window  for connected TCB %x\n", Tcb));\r
 \r
       if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&\r
@@ -1224,7 +1224,7 @@ NO_UPDATE:
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_SENT) &&\r
       (Tcb->SndUna == Tcb->SndNxt)) {\r
 \r
-    TCP4_DEBUG_TRACE (("TcpInput: local FIN is ACKed by"\r
+    DEBUG ((EFI_D_INFO, "TcpInput: local FIN is ACKed by"\r
       " peer for connected TCB %x\n", Tcb));\r
 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);\r
@@ -1264,7 +1264,7 @@ NO_UPDATE:
         TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
       } else {\r
 \r
-        TCP4_DEBUG_WARN (("Connection closed immediately "\r
+        DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
           "because app disables TIME_WAIT timer for %x\n", Tcb));\r
 \r
         TcpClose (Tcb);\r
@@ -1290,7 +1290,7 @@ NO_UPDATE:
       TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
     } else {\r
 \r
-      TCP4_DEBUG_WARN (("Connection closed immediately "\r
+      DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
         "because app disables TIME_WAIT timer for %x\n", Tcb));\r
 \r
       TcpClose (Tcb);\r
@@ -1315,7 +1315,7 @@ StepSix:
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) &&\r
       !TCP_FIN_RCVD (Tcb->State)) {\r
 \r
-    TCP4_DEBUG_TRACE (("TcpInput: received urgent data "\r
+    DEBUG ((EFI_D_INFO, "TcpInput: received urgent data "\r
       "from peer for connected TCB %x\n", Tcb));\r
 \r
     Urg = Seg->Seq + Seg->Urg;\r
@@ -1338,14 +1338,14 @@ StepSix:
 \r
     if (TCP_FIN_RCVD (Tcb->State)) {\r
 \r
-      TCP4_DEBUG_WARN (("TcpInput: connection reset because"\r
+      DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r
         " data is lost for connected TCB %x\n", Tcb));\r
 \r
       goto RESET_THEN_DROP;\r
     }\r
 \r
     if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {\r
-      TCP4_DEBUG_WARN (("TcpInput: connection reset because"\r
+      DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r
         " data is lost for connected TCB %x\n", Tcb));\r
 \r
       goto RESET_THEN_DROP;\r
@@ -1356,7 +1356,7 @@ StepSix:
       goto RESET_THEN_DROP;\r
     }\r
 \r
-    if (!NetListIsEmpty (&Tcb->RcvQue)) {\r
+    if (!IsListEmpty (&Tcb->RcvQue)) {\r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
     }\r
   }\r
@@ -1407,7 +1407,7 @@ DISCARD:
   //\r
   // Tcb is a child of Parent, and it doesn't survive\r
   //\r
-  TCP4_DEBUG_WARN (("Tcp4Input: Discard a packet\n"));\r
+  DEBUG ((EFI_D_WARN, "Tcp4Input: Discard a packet\n"));\r
   NetbufFree (Nbuf);\r
 \r
   if (Parent && Tcb) {\r