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

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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 863ebc1ea0e014066cd70c22d6d22eb94a7e1855..82e3a600db0ea86326b601bbc8ef315f20df3b33 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -25,12 +25,12 @@ Abstract:
 \r
 #include <Library/DevicePathLib.h>\r
 \r
-NET_LIST_ENTRY  mTcpRunQue = {\r
+LIST_ENTRY      mTcpRunQue = {\r
   &mTcpRunQue,\r
   &mTcpRunQue\r
 };\r
 \r
-NET_LIST_ENTRY  mTcpListenQue = {\r
+LIST_ENTRY      mTcpListenQue = {\r
   &mTcpListenQue,\r
   &mTcpListenQue\r
 };\r
@@ -193,7 +193,7 @@ TcpLocateListenTcb (
   IN TCP_PEER *Remote\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   TCP_CB          *Node;\r
   TCP_CB          *Match;\r
   INTN            Last;\r
@@ -259,7 +259,7 @@ TcpFindTcbByPeer (
   )\r
 {\r
   TCP_PORTNO      LocalPort;\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   TCP_CB          *Tcb;\r
 \r
   ASSERT ((Addr != NULL) && (Port != 0));\r
@@ -314,7 +314,7 @@ TcpLocateTcb (
 {\r
   TCP_PEER        Local;\r
   TCP_PEER        Remote;\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   TCP_CB          *Tcb;\r
 \r
   Local.Port  = LocalPort;\r
@@ -332,8 +332,8 @@ TcpLocateTcb (
     if (TCP_PEER_EQUAL (&Remote, &Tcb->RemoteEnd) &&\r
         TCP_PEER_EQUAL (&Local, &Tcb->LocalEnd)) {\r
 \r
-      NetListRemoveEntry (&Tcb->List);\r
-      NetListInsertHead (&mTcpRunQue, &Tcb->List);\r
+      RemoveEntryList (&Tcb->List);\r
+      InsertHeadList (&mTcpRunQue, &Tcb->List);\r
 \r
       return Tcb;\r
     }\r
@@ -364,8 +364,8 @@ TcpInsertTcb (
   IN TCP_CB *Tcb\r
   )\r
 {\r
-  NET_LIST_ENTRY   *Entry;\r
-  NET_LIST_ENTRY   *Head;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *Head;\r
   TCP_CB           *Node;\r
   TCP4_PROTO_DATA  *TcpProto;\r
 \r
@@ -402,7 +402,7 @@ TcpInsertTcb (
     }\r
   }\r
 \r
-  NetListInsertHead (Head, &Tcb->List);\r
+  InsertHeadList (Head, &Tcb->List);\r
 \r
   TcpProto = (TCP4_PROTO_DATA *) Tcb->Sk->ProtoReserved;\r
   TcpSetVariableData (TcpProto->TcpService);\r
@@ -426,28 +426,28 @@ TcpCloneTcb (
 {\r
   TCP_CB               *Clone;\r
 \r
-  Clone = NetAllocatePool (sizeof (TCP_CB));\r
+  Clone = AllocatePool (sizeof (TCP_CB));\r
 \r
   if (Clone == NULL) {\r
     return NULL;\r
 \r
   }\r
 \r
-  NetCopyMem (Clone, Tcb, sizeof (TCP_CB));\r
+  CopyMem (Clone, Tcb, sizeof (TCP_CB));\r
 \r
   //\r
   // Increate the reference count of the shared IpInfo.\r
   //\r
   NET_GET_REF (Tcb->IpInfo);\r
 \r
-  NetListInit (&Clone->List);\r
-  NetListInit (&Clone->SndQue);\r
-  NetListInit (&Clone->RcvQue);\r
+  InitializeListHead (&Clone->List);\r
+  InitializeListHead (&Clone->SndQue);\r
+  InitializeListHead (&Clone->RcvQue);\r
 \r
   Clone->Sk = SockClone (Tcb->Sk);\r
   if (Clone->Sk == NULL) {\r
-    TCP4_DEBUG_ERROR (("TcpCloneTcb: failed to clone a sock\n"));\r
-    NetFreePool (Clone);\r
+    DEBUG ((EFI_D_ERROR, "TcpCloneTcb: failed to clone a sock\n"));\r
+    gBS->FreePool (Clone);\r
     return NULL;\r
   }\r
 \r
@@ -519,8 +519,9 @@ TcpSetState (
   IN UINT8  State\r
   )\r
 {\r
-  TCP4_DEBUG_TRACE (\r
-    ("Tcb (%x) state %s --> %s\n",\r
+  DEBUG (\r
+    (EFI_D_INFO,\r
+    "Tcb (%x) state %s --> %s\n",\r
     Tcb,\r
     mTcpStateName[Tcb->State],\r
     mTcpStateName[State])\r
@@ -722,9 +723,9 @@ TcpOnAppClose (
 {\r
   ASSERT (Tcb);\r
 \r
-  if (!NetListIsEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk)) {\r
+  if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk)) {\r
 \r
-    TCP4_DEBUG_WARN (("TcpOnAppClose: connection reset "\r
+    DEBUG ((EFI_D_WARN, "TcpOnAppClose: connection reset "\r
       "because data is lost for TCB %x\n", Tcb));\r
 \r
     TcpResetConnection (Tcb);\r
@@ -839,13 +840,13 @@ TcpOnAppConsume (
 \r
       if (TcpOld < Tcb->RcvMss) {\r
 \r
-        TCP4_DEBUG_TRACE (("TcpOnAppConsume: send a window"\r
+        DEBUG ((EFI_D_INFO, "TcpOnAppConsume: send a window"\r
           " update for a window closed Tcb(%x)\n", Tcb));\r
 \r
         TcpSendAck (Tcb);\r
       } else if (Tcb->DelayedAck == 0) {\r
 \r
-        TCP4_DEBUG_TRACE (("TcpOnAppConsume: scheduled a delayed"\r
+        DEBUG ((EFI_D_INFO, "TcpOnAppConsume: scheduled a delayed"\r
           " ACK to update window for Tcb(%x)\n", Tcb));\r
 \r
         Tcb->DelayedAck = 1;\r
@@ -885,7 +886,7 @@ TcpOnAppAbort (
   IN TCP_CB *Tcb\r
   )\r
 {\r
-  TCP4_DEBUG_WARN (("TcpOnAppAbort: connection reset "\r
+  DEBUG ((EFI_D_WARN, "TcpOnAppAbort: connection reset "\r
     "issued by application for TCB %x\n", Tcb));\r
 \r
   switch (Tcb->State) {\r
@@ -917,7 +918,7 @@ TcpSetVariableData (
   )\r
 {\r
   UINT32                  NumConfiguredInstance;\r
-  NET_LIST_ENTRY          *Entry;\r
+  LIST_ENTRY              *Entry;\r
   TCP_CB                  *TcpPcb;\r
   TCP4_PROTO_DATA         *TcpProto;\r
   UINTN                   VariableDataSize;\r
@@ -971,7 +972,7 @@ TcpSetVariableData (
     VariableDataSize += sizeof (EFI_TCP4_SERVICE_POINT) * (NumConfiguredInstance - 1);\r
   }\r
 \r
-  Tcp4VariableData = NetAllocatePool (VariableDataSize);\r
+  Tcp4VariableData = AllocatePool (VariableDataSize);\r
   if (Tcp4VariableData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -994,9 +995,9 @@ TcpSetVariableData (
       // This tcp instance belongs to the Tcp4Service.\r
       //\r
       Tcp4ServicePoint->InstanceHandle          = TcpPcb->Sk->SockHandle;\r
-      NetCopyMem (&Tcp4ServicePoint->LocalAddress, &TcpPcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Tcp4ServicePoint->LocalAddress, &TcpPcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
       Tcp4ServicePoint->LocalPort               = NTOHS (TcpPcb->LocalEnd.Port);\r
-      NetCopyMem (&Tcp4ServicePoint->RemoteAddress, &TcpPcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Tcp4ServicePoint->RemoteAddress, &TcpPcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
       Tcp4ServicePoint->RemotePort              = NTOHS (TcpPcb->RemoteEnd.Port);\r
 \r
       Tcp4ServicePoint++;\r
@@ -1016,9 +1017,9 @@ TcpSetVariableData (
       // This tcp instance belongs to the Tcp4Service.\r
       //\r
       Tcp4ServicePoint->InstanceHandle          = TcpPcb->Sk->SockHandle;\r
-      NetCopyMem (&Tcp4ServicePoint->LocalAddress, &TcpPcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Tcp4ServicePoint->LocalAddress, &TcpPcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
       Tcp4ServicePoint->LocalPort               = NTOHS (TcpPcb->LocalEnd.Port);\r
-      NetCopyMem (&Tcp4ServicePoint->RemoteAddress, &TcpPcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Tcp4ServicePoint->RemoteAddress, &TcpPcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));\r
       Tcp4ServicePoint->RemotePort              = NTOHS (TcpPcb->RemoteEnd.Port);\r
 \r
       Tcp4ServicePoint++;\r
@@ -1054,7 +1055,7 @@ TcpSetVariableData (
              );\r
     }\r
 \r
-    NetFreePool (Tcp4Service->MacString);\r
+    gBS->FreePool (Tcp4Service->MacString);\r
   }\r
 \r
   Tcp4Service->MacString = NewMacString;\r
@@ -1069,7 +1070,7 @@ TcpSetVariableData (
 \r
 ON_ERROR:\r
 \r
-  NetFreePool (Tcp4VariableData);\r
+  gBS->FreePool (Tcp4VariableData);\r
 \r
   return Status;\r
 }\r
@@ -1098,7 +1099,7 @@ TcpClearVariableData (
          NULL\r
          );\r
 \r
-  NetFreePool (Tcp4Service->MacString);\r
+  gBS->FreePool (Tcp4Service->MacString);\r
   Tcp4Service->MacString = NULL;\r
 }\r
 \r
@@ -1159,7 +1160,7 @@ Returns:
                   Sock->DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Sock->DevicePath);\r
+    gBS->FreePool (Sock->DevicePath);\r
   }\r
 \r
   return Status;\r