Sync the bug that list node is free before it is removed from the list. That made...

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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index e2a78b7a9dd25c229e6c1202435caf7c587f7a24..8102b321821cd0728d9f6633b0fcec022e1e3450 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -51,6 +51,11 @@ SOCK_INIT_DATA mTcp4DefaultSockData = {
   TCP_SND_BUF_SIZE,\r
   TCP_RCV_BUF_SIZE,\r
   &mTcp4ProtocolTemplate,\r
+  Tcp4CreateSocketCallback,\r
+  Tcp4DestroySocketCallback,\r
+  NULL,\r
+  NULL,\r
+  0,\r
   Tcp4Dispatcher,\r
   NULL,\r
 };\r
@@ -471,6 +476,97 @@ Tcp4DriverBindingStop (
   return Status;\r
 }\r
 \r
+EFI_STATUS\r
+Tcp4CreateSocketCallback (\r
+  IN SOCKET  *This,\r
+  IN VOID    *Context\r
+  )\r
+{\r
+  EFI_STATUS         Status;\r
+  TCP4_SERVICE_DATA  *TcpServiceData;\r
+  EFI_IP4_PROTOCOL   *Ip4;\r
+\r
+  TcpServiceData = ((TCP4_PROTO_DATA *) This->ProtoReserved)->TcpService;\r
+\r
+  //\r
+  // Open the default Ip4 protocol of IP_IO BY_DRIVER.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                  TcpServiceData->IpIo->ChildHandle,\r
+                  &gEfiIp4ProtocolGuid,\r
+                  (VOID **) &Ip4,\r
+                  TcpServiceData->DriverBindingHandle,\r
+                  This->SockHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  //\r
+  // Open the device path on the handle where service binding resides on.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                  TcpServiceData->ControllerHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  (VOID **) &This->ParentDevicePath,\r
+                  TcpServiceData->DriverBindingHandle,\r
+                  This->SockHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    gBS->CloseProtocol (\r
+           TcpServiceData->IpIo->ChildHandle,\r
+           &gEfiIp4ProtocolGuid,\r
+           TcpServiceData->DriverBindingHandle,\r
+           This->SockHandle\r
+           );\r
+  } else {\r
+    //\r
+    // Insert this socket into the SocketList.\r
+    //\r
+    NetListInsertTail (&TcpServiceData->SocketList, &This->Link);\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
+VOID\r
+Tcp4DestroySocketCallback (\r
+  IN SOCKET  *This,\r
+  IN VOID    *Context\r
+  )\r
+{\r
+  TCP4_SERVICE_DATA  *TcpServiceData;\r
+\r
+  TcpServiceData = ((TCP4_PROTO_DATA *) This->ProtoReserved)->TcpService;\r
+\r
+  //\r
+  // Remove this node from the list.\r
+  //\r
+  NetListRemoveEntry (&This->Link);\r
+\r
+  //\r
+  // Close the device path protocol\r
+  //\r
+  gBS->CloseProtocol (\r
+         TcpServiceData->ControllerHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         TcpServiceData->DriverBindingHandle,\r
+         This->SockHandle\r
+         );\r
+\r
+  //\r
+  // Close the Ip4 protocol.\r
+  //\r
+  gBS->CloseProtocol (\r
+         TcpServiceData->IpIo->ChildHandle,\r
+         &gEfiIp4ProtocolGuid,\r
+         TcpServiceData->DriverBindingHandle,\r
+         This->SockHandle\r
+         );\r
+}\r
+\r
 /**\r
   Creates a child handle with a set of TCP4 services.\r
 \r
@@ -497,7 +593,6 @@ Tcp4ServiceBindingCreateChild (
   TCP4_SERVICE_DATA *TcpServiceData;\r
   TCP4_PROTO_DATA   TcpProto;\r
   EFI_STATUS        Status;\r
-  VOID              *Ip4;\r
   EFI_TPL           OldTpl;\r
 \r
   if (NULL == This || NULL == ChildHandle) {\r
@@ -505,6 +600,7 @@ Tcp4ServiceBindingCreateChild (
   }\r
 \r
   OldTpl              = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  Status              = EFI_SUCCESS;\r
   TcpServiceData      = TCP4_FROM_THIS (This);\r
   TcpProto.TcpService = TcpServiceData;\r
   TcpProto.TcpPcb     = NULL;\r
@@ -513,60 +609,20 @@ Tcp4ServiceBindingCreateChild (
   // Create a tcp instance with defualt Tcp default\r
   // sock init data and TcpProto\r
   //\r
+  mTcp4DefaultSockData.ProtoData     = &TcpProto;\r
+  mTcp4DefaultSockData.DataSize      = sizeof (TCP4_PROTO_DATA);\r
   mTcp4DefaultSockData.DriverBinding = TcpServiceData->DriverBindingHandle;\r
-\r
-  Sock = SockCreateChild (&mTcp4DefaultSockData, &TcpProto, sizeof (TCP4_PROTO_DATA));\r
+  \r
+  Sock = SockCreateChild (&mTcp4DefaultSockData);\r
   if (NULL == Sock) {\r
     TCP4_DEBUG_ERROR (("Tcp4DriverBindingCreateChild: "\r
       "No resource to create a Tcp Child\n"));\r
 \r
     Status = EFI_OUT_OF_RESOURCES;\r
-    goto ON_EXIT;\r
-  }\r
-\r
-  *ChildHandle = Sock->SockHandle;\r
-\r
-  //\r
-  // Open the default Ip4 protocol of IP_IO BY_DRIVER.\r
-  //\r
-  Status = gBS->OpenProtocol (\r
-                  TcpServiceData->IpIo->ChildHandle,\r
-                  &gEfiIp4ProtocolGuid,\r
-                  (VOID **) &Ip4,\r
-                  TcpServiceData->DriverBindingHandle,\r
-                  Sock->SockHandle,\r
-                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    SockDestroyChild (Sock);\r
-    goto ON_EXIT;\r
-  }\r
-\r
-  //\r
-  // Open the device path on the handle where service binding resides on.\r
-  //\r
-  Status = gBS->OpenProtocol (\r
-                  TcpServiceData->ControllerHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &Sock->ParentDevicePath,\r
-                  TcpServiceData->DriverBindingHandle,\r
-                  Sock->SockHandle,\r
-                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    gBS->CloseProtocol (\r
-           TcpServiceData->IpIo->ChildHandle,\r
-           &gEfiIp4ProtocolGuid,\r
-           TcpServiceData->DriverBindingHandle,\r
-           Sock->SockHandle\r
-           );\r
-    SockDestroyChild (Sock);\r
   } else {\r
-    NetListInsertTail (&TcpServiceData->SocketList, &Sock->Link);\r
+    *ChildHandle = Sock->SockHandle;\r
   }\r
 \r
-ON_EXIT:\r
-\r
   NET_RESTORE_TPL (OldTpl);\r
   return Status;\r
 }\r
@@ -594,8 +650,6 @@ Tcp4ServiceBindingDestroyChild (
   EFI_STATUS         Status;\r
   EFI_TCP4_PROTOCOL  *Tcp4;\r
   SOCKET             *Sock;\r
-  TCP4_PROTO_DATA    *TcpProtoData;\r
-  TCP4_SERVICE_DATA  *TcpServiceData;\r
   EFI_TPL            OldTpl;\r
 \r
   if (NULL == This || NULL == ChildHandle) {\r
@@ -617,42 +671,17 @@ Tcp4ServiceBindingDestroyChild (
                   );\r
   if (EFI_ERROR (Status)) {\r
     Status = EFI_UNSUPPORTED;\r
-    goto ON_EXIT;\r
-  }\r
-\r
-  //\r
-  // destroy this sock and related Tcp protocol control\r
-  // block\r
-  //\r
-  Sock           = SOCK_FROM_THIS (Tcp4);\r
-  TcpProtoData   = (TCP4_PROTO_DATA *) Sock->ProtoReserved;\r
-  TcpServiceData = TcpProtoData->TcpService;\r
-\r
-  NetListRemoveEntry (&Sock->Link);\r
-\r
-  SockDestroyChild (Sock);\r
-\r
-  //\r
-  // Close the device path protocol\r
-  //\r
-  gBS->CloseProtocol (\r
-         TcpServiceData->ControllerHandle,\r
-         &gEfiDevicePathProtocolGuid,\r
-         TcpServiceData->DriverBindingHandle,\r
-         ChildHandle\r
-         );\r
+  } else {\r
+    //\r
+    // destroy this sock and related Tcp protocol control\r
+    // block\r
+    //\r
+    Sock = SOCK_FROM_THIS (Tcp4);\r
 \r
-  //\r
-  // Close the Ip4 protocol.\r
-  //\r
-  gBS->CloseProtocol (\r
-         TcpServiceData->IpIo->ChildHandle,\r
-         &gEfiIp4ProtocolGuid,\r
-         TcpServiceData->DriverBindingHandle,\r
-         ChildHandle\r
-         );\r
+    SockDestroyChild (Sock);\r
+  }\r
 \r
-ON_EXIT:\r
   NET_RESTORE_TPL (OldTpl);\r
   return Status;\r
 }\r
+\r