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

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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index 46c6ba492cbd7d3598dfde983a7a3d70d9dd372c..b744f6892036c9a6b757db1842f14cc569f145b0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
@@ -262,7 +262,7 @@ SockProcessTcpSndData (
               );\r
 \r
   if (NULL == SndData) {\r
-    SOCK_DEBUG_ERROR (("SockKProcessSndData: Failed to"\r
+    DEBUG ((EFI_D_ERROR, "SockKProcessSndData: Failed to"\r
       " call NetBufferFromExt\n"));\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
@@ -316,7 +316,7 @@ STATIC
 VOID\r
 SockFlushPendingToken (\r
   IN SOCKET         *Sock,\r
-  IN NET_LIST_ENTRY *PendingTokenList\r
+  IN LIST_ENTRY     *PendingTokenList\r
   )\r
 {\r
   SOCK_TOKEN            *SockToken;\r
@@ -324,7 +324,7 @@ SockFlushPendingToken (
 \r
   ASSERT (Sock && PendingTokenList);\r
 \r
-  while (!NetListIsEmpty (PendingTokenList)) {\r
+  while (!IsListEmpty (PendingTokenList)) {\r
     SockToken = NET_LIST_HEAD (\r
                   PendingTokenList,\r
                   SOCK_TOKEN,\r
@@ -334,8 +334,8 @@ SockFlushPendingToken (
     Token = SockToken->Token;\r
     SIGNAL_TOKEN (Token, Sock->SockError);\r
 \r
-    NetListRemoveEntry (&(SockToken->TokenList));\r
-    NetFreePool (SockToken);\r
+    RemoveEntryList (&(SockToken->TokenList));\r
+    gBS->FreePool (SockToken);\r
   }\r
 }\r
 \r
@@ -392,7 +392,7 @@ SockWakeListenToken (
 \r
   ASSERT (Parent && SOCK_IS_LISTENING (Parent) && SOCK_IS_CONNECTED (Sock));\r
 \r
-  if (!NetListIsEmpty (&Parent->ListenTokenList)) {\r
+  if (!IsListEmpty (&Parent->ListenTokenList)) {\r
     SockToken = NET_LIST_HEAD (\r
                   &Parent->ListenTokenList,\r
                   SOCK_TOKEN,\r
@@ -404,14 +404,13 @@ SockWakeListenToken (
 \r
     SIGNAL_TOKEN (&(ListenToken->CompletionToken), EFI_SUCCESS);\r
 \r
-    NetListRemoveEntry (&SockToken->TokenList);\r
-    NetFreePool (SockToken);\r
+    RemoveEntryList (&SockToken->TokenList);\r
+    gBS->FreePool (SockToken);\r
 \r
-    NetListRemoveEntry (&Sock->ConnectionList);\r
+    RemoveEntryList (&Sock->ConnectionList);\r
 \r
     Parent->ConnCnt--;\r
-    SOCK_DEBUG_WARN (("SockWakeListenToken: accept a socket,"\r
-      "now conncnt is %d", Parent->ConnCnt));\r
+    DEBUG ((EFI_D_WARN, "SockWakeListenToken: accept a socket, now conncnt is %d", Parent->ConnCnt));\r
 \r
     Sock->Parent = NULL;\r
   }\r
@@ -443,7 +442,7 @@ SockWakeRcvToken (
 \r
   ASSERT (RcvdBytes > 0);\r
 \r
-  while (RcvdBytes > 0 && !NetListIsEmpty (&Sock->RcvTokenList)) {\r
+  while (RcvdBytes > 0 && !IsListEmpty (&Sock->RcvTokenList)) {\r
 \r
     SockToken = NET_LIST_HEAD (\r
                   &Sock->RcvTokenList,\r
@@ -458,8 +457,8 @@ SockWakeRcvToken (
       return ;\r
     }\r
 \r
-    NetListRemoveEntry (&(SockToken->TokenList));\r
-    NetFreePool (SockToken);\r
+    RemoveEntryList (&(SockToken->TokenList));\r
+    gBS->FreePool (SockToken);\r
     RcvdBytes -= TokenRcvdBytes;\r
   }\r
 }\r
@@ -495,7 +494,7 @@ SockProcessSndToken (
   // socket layer flow control policy\r
   //\r
   while ((FreeSpace >= Sock->SndBuffer.LowWater) &&\r
-         !NetListIsEmpty (&Sock->SndTokenList)) {\r
+         !IsListEmpty (&Sock->SndTokenList)) {\r
 \r
     SockToken = NET_LIST_HEAD (\r
                   &(Sock->SndTokenList),\r
@@ -506,8 +505,8 @@ SockProcessSndToken (
     //\r
     // process this token\r
     //\r
-    NetListRemoveEntry (&(SockToken->TokenList));\r
-    NetListInsertTail (\r
+    RemoveEntryList (&(SockToken->TokenList));\r
+    InsertTailList (\r
       &(Sock->ProcessingSndTokenList),\r
       &(SockToken->TokenList)\r
       );\r
@@ -538,9 +537,9 @@ SockProcessSndToken (
 \r
 OnError:\r
 \r
-  NetListRemoveEntry (&SockToken->TokenList);\r
+  RemoveEntryList (&SockToken->TokenList);\r
   SIGNAL_TOKEN (SockToken->Token, Status);\r
-  NetFreePool (SockToken);\r
+  gBS->FreePool (SockToken);\r
 }\r
 \r
 \r
@@ -568,8 +567,9 @@ SockCreate (
   Parent = SockInitData->Parent;\r
 \r
   if (Parent && (Parent->ConnCnt == Parent->BackLog)) {\r
-    SOCK_DEBUG_ERROR (\r
-      ("SockCreate: Socket parent has "\r
+    DEBUG (\r
+      (EFI_D_ERROR,\r
+      "SockCreate: Socket parent has "\r
       "reached its connection limit with %d ConnCnt and %d BackLog\n",\r
       Parent->ConnCnt,\r
       Parent->BackLog)\r
@@ -578,25 +578,25 @@ SockCreate (
     return NULL;\r
   }\r
 \r
-  Sock = NetAllocateZeroPool (sizeof (SOCKET));\r
+  Sock = AllocateZeroPool (sizeof (SOCKET));\r
   if (NULL == Sock) {\r
 \r
-    SOCK_DEBUG_ERROR (("SockCreate: No resource to create a new socket\n"));\r
+    DEBUG ((EFI_D_ERROR, "SockCreate: No resource to create a new socket\n"));\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&Sock->Link);\r
-  NetListInit (&Sock->ConnectionList);\r
-  NetListInit (&Sock->ListenTokenList);\r
-  NetListInit (&Sock->RcvTokenList);\r
-  NetListInit (&Sock->SndTokenList);\r
-  NetListInit (&Sock->ProcessingSndTokenList);\r
+  InitializeListHead (&Sock->Link);\r
+  InitializeListHead (&Sock->ConnectionList);\r
+  InitializeListHead (&Sock->ListenTokenList);\r
+  InitializeListHead (&Sock->RcvTokenList);\r
+  InitializeListHead (&Sock->SndTokenList);\r
+  InitializeListHead (&Sock->ProcessingSndTokenList);\r
 \r
-  NET_LOCK_INIT (&(Sock->Lock));\r
+  EfiInitializeLock (&(Sock->Lock), TPL_CALLBACK);\r
 \r
   Sock->SndBuffer.DataQueue = NetbufQueAlloc ();\r
   if (NULL == Sock->SndBuffer.DataQueue) {\r
-    SOCK_DEBUG_ERROR (("SockCreate: No resource to allocate"\r
+    DEBUG ((EFI_D_ERROR, "SockCreate: No resource to allocate"\r
       " SndBuffer for new socket\n"));\r
 \r
     goto OnError;\r
@@ -604,7 +604,7 @@ SockCreate (
 \r
   Sock->RcvBuffer.DataQueue = NetbufQueAlloc ();\r
   if (NULL == Sock->RcvBuffer.DataQueue) {\r
-    SOCK_DEBUG_ERROR (("SockCreate: No resource to allocate "\r
+    DEBUG ((EFI_D_ERROR, "SockCreate: No resource to allocate "\r
       "RcvBuffer for new socket\n"));\r
 \r
     goto OnError;\r
@@ -631,7 +631,7 @@ SockCreate (
   //\r
   // Install protocol on Sock->SockHandle\r
   //\r
-  NetCopyMem (\r
+  CopyMem (\r
     &(Sock->NetProtocol.TcpProtocol),\r
     SockInitData->Protocol,\r
     sizeof (EFI_TCP4_PROTOCOL)\r
@@ -640,7 +640,7 @@ SockCreate (
   //\r
   // copy the protodata into socket\r
   //\r
-  NetCopyMem (Sock->ProtoReserved, SockInitData->ProtoData, SockInitData->DataSize);\r
+  CopyMem (Sock->ProtoReserved, SockInitData->ProtoData, SockInitData->DataSize);\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Sock->SockHandle,\r
@@ -650,7 +650,7 @@ SockCreate (
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    SOCK_DEBUG_ERROR (("SockCreate: Install TCP protocol in "\r
+    DEBUG ((EFI_D_ERROR, "SockCreate: Install TCP protocol in "\r
       "socket failed with %r\n", Status));\r
 \r
     goto OnError;\r
@@ -666,10 +666,13 @@ SockCreate (
     //\r
     Parent->ConnCnt++;\r
 \r
-    SOCK_DEBUG_WARN (("SockCreate: Create a new socket and"\r
-      "add to parent, now conncnt is %d\n", Parent->ConnCnt));\r
+    DEBUG (\r
+      (EFI_D_WARN,\r
+      "SockCreate: Create a new socket and add to parent, now conncnt is %d\n",\r
+      Parent->ConnCnt)\r
+      );\r
 \r
-    NetListInsertTail (&Parent->ConnectionList, &Sock->ConnectionList);\r
+    InsertTailList (&Parent->ConnectionList, &Sock->ConnectionList);\r
   }\r
 \r
   if (Sock->CreateCallback != NULL) {\r
@@ -700,7 +703,7 @@ OnError:
     NetbufQueFree (Sock->RcvBuffer.DataQueue);\r
   }\r
 \r
-  NetFreePool (Sock);\r
+  gBS->FreePool (Sock);\r
 \r
   return NULL;\r
 }\r
@@ -751,11 +754,15 @@ SockDestroy (
   //\r
   if (Sock->Parent) {\r
 \r
-    NetListRemoveEntry (&(Sock->ConnectionList));\r
+    RemoveEntryList (&(Sock->ConnectionList));\r
     (Sock->Parent->ConnCnt)--;\r
 \r
-    SOCK_DEBUG_WARN (("SockDestory: Delete a unaccepted socket from parent"\r
-      "now conncnt is %d\n", Sock->Parent->ConnCnt));\r
+    DEBUG (\r
+      (EFI_D_WARN,\r
+      "SockDestory: Delete a unaccepted socket from parent"\r
+      "now conncnt is %d\n",\r
+      Sock->Parent->ConnCnt)\r
+      );\r
 \r
     Sock->Parent = NULL;\r
   }\r
@@ -780,7 +787,7 @@ SockDestroy (
 \r
   if (EFI_ERROR (Status)) {\r
 \r
-    SOCK_DEBUG_ERROR (("SockDestroy: Open protocol installed "\r
+    DEBUG ((EFI_D_ERROR, "SockDestroy: Open protocol installed "\r
       "on socket failed with %r\n", Status));\r
 \r
     goto FreeSock;\r
@@ -798,7 +805,7 @@ SockDestroy (
         );\r
 \r
 FreeSock:\r
-  NetFreePool (Sock);\r
+  gBS->FreePool (Sock);\r
   return ;\r
 }\r
 \r
@@ -853,7 +860,7 @@ SockConnFlush (
   // Destroy the pending connection, if it is a listening socket\r
   //\r
   if (SOCK_IS_LISTENING (Sock)) {\r
-    while (!NetListIsEmpty (&Sock->ConnectionList)) {\r
+    while (!IsListEmpty (&Sock->ConnectionList)) {\r
       Child = NET_LIST_HEAD (\r
                 &Sock->ConnectionList,\r
                 SOCKET,\r
@@ -924,7 +931,7 @@ SockClone (
   ClonedSock              = SockCreate (&InitData);\r
 \r
   if (NULL == ClonedSock) {\r
-    SOCK_DEBUG_ERROR (("SockClone: no resource to create a cloned sock\n"));\r
+    DEBUG ((EFI_D_ERROR, "SockClone: no resource to create a cloned sock\n"));\r
     return NULL;\r
   }\r
 \r
@@ -1019,7 +1026,7 @@ SockDataSent (
   SOCK_TOKEN            *SockToken;\r
   SOCK_COMPLETION_TOKEN *SndToken;\r
 \r
-  ASSERT (!NetListIsEmpty (&Sock->ProcessingSndTokenList));\r
+  ASSERT (!IsListEmpty (&Sock->ProcessingSndTokenList));\r
   ASSERT (Count <= (Sock->SndBuffer.DataQueue)->BufSize);\r
 \r
   NetbufQueTrim (Sock->SndBuffer.DataQueue, Count);\r
@@ -1038,10 +1045,10 @@ SockDataSent (
 \r
     if (SockToken->RemainDataLen <= Count) {\r
 \r
-      NetListRemoveEntry (&(SockToken->TokenList));\r
+      RemoveEntryList (&(SockToken->TokenList));\r
       SIGNAL_TOKEN (SndToken, EFI_SUCCESS);\r
       Count -= SockToken->RemainDataLen;\r
-      NetFreePool (SockToken);\r
+      gBS->FreePool (SockToken);\r
     } else {\r
 \r
       SockToken->RemainDataLen -= Count;\r
@@ -1181,7 +1188,7 @@ SockRcvdErr (
 {\r
   SOCK_TOKEN  *SockToken;\r
 \r
-  if (!NetListIsEmpty (&Sock->RcvTokenList)) {\r
+  if (!IsListEmpty (&Sock->RcvTokenList)) {\r
 \r
     SockToken = NET_LIST_HEAD (\r
                   &Sock->RcvTokenList,\r
@@ -1189,11 +1196,11 @@ SockRcvdErr (
                   TokenList\r
                   );\r
 \r
-    NetListRemoveEntry (&SockToken->TokenList);\r
+    RemoveEntryList (&SockToken->TokenList);\r
 \r
     SIGNAL_TOKEN (SockToken->Token, Error);\r
 \r
-    NetFreePool (SockToken);\r
+    gBS->FreePool (SockToken);\r
   } else {\r
 \r
     SOCK_ERROR (Sock, Error);\r
@@ -1222,7 +1229,7 @@ SockNoMoreData (
 \r
   SOCK_NO_MORE_DATA (Sock);\r
 \r
-  if (!NetListIsEmpty (&Sock->RcvTokenList)) {\r
+  if (!IsListEmpty (&Sock->RcvTokenList)) {\r
 \r
     ASSERT (0 == GET_RCV_DATASIZE (Sock));\r
 \r
@@ -1252,11 +1259,11 @@ SockBufFirst (
   IN SOCK_BUFFER *Sockbuf\r
   )\r
 {\r
-  NET_LIST_ENTRY  *NetbufList;\r
+  LIST_ENTRY      *NetbufList;\r
 \r
   NetbufList = &(Sockbuf->DataQueue->BufList);\r
 \r
-  if (NetListIsEmpty (NetbufList)) {\r
+  if (IsListEmpty (NetbufList)) {\r
     return NULL;\r
   }\r
 \r
@@ -1280,7 +1287,7 @@ SockBufNext (
   IN NET_BUF     *SockEntry\r
   )\r
 {\r
-  NET_LIST_ENTRY  *NetbufList;\r
+  LIST_ENTRY      *NetbufList;\r
 \r
   NetbufList = &(Sockbuf->DataQueue->BufList);\r
 \r