X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FTcp4Dxe%2FSockInterface.c;h=6dbabc4e51cf1329765e106cf5370b3b96071a52;hp=c3a0b91deaff4854ec0aca9611f03bb76c1011b0;hb=d1102dba7210b95e41d06c2338a22ba6af248645;hpb=e48e37fce2611df7a52aff271835ff72ee396d9b
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index c3a0b91dea..6dbabc4e51 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
@@ -1,21 +1,15 @@
/** @file
+ Interface function of the Socket.
-Copyright (c) 2005 - 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
+This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-Module Name:
-
- SockInterface.c
-
-Abstract:
-
-
**/
@@ -28,11 +22,10 @@ Abstract:
@param List Pointer to the token list to be searched.
@param Event The event to be checked.
- @retval BOOLEAN If TRUE, the specific Event exists in the List. If
- FALSE, the specific Event is not in the List.
+ @retval TRUE The specific Event exists in the List.
+ @retval FALSE The specific Event is not in the List.
**/
-STATIC
BOOLEAN
SockTokenExistedInList (
IN LIST_ENTRY *List,
@@ -65,7 +58,8 @@ SockTokenExistedInList (
@param Sock Pointer to the instance's socket.
@param Event The event to be checked.
- @return The specific Event exists in one of socket's lists or not.
+ @retval TRUE The Event exists in related socket's lists.
+ @retval FALSE The Event is not in related socket's lists.
**/
BOOLEAN
@@ -78,8 +72,7 @@ SockTokenExisted (
if (SockTokenExistedInList (&Sock->SndTokenList, Event) ||
SockTokenExistedInList (&Sock->ProcessingSndTokenList, Event) ||
SockTokenExistedInList (&Sock->RcvTokenList, Event) ||
- SockTokenExistedInList (&Sock->ListenTokenList, Event)
- ) {
+ SockTokenExistedInList (&Sock->ListenTokenList, Event)) {
return TRUE;
}
@@ -138,7 +131,7 @@ SockBufferToken (
/**
- Destory the socket Sock and its associated protocol control block.
+ Destroy the socket Sock and its associated protocol control block.
@param Sock The socket to be destroyed.
@@ -148,18 +141,69 @@ SockBufferToken (
**/
EFI_STATUS
SockDestroyChild (
- IN SOCKET *Sock
+ IN SOCKET *Sock
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
+ TCP4_PROTO_DATA *ProtoData;
+ TCP_CB *Tcb;
+ VOID *SockProtocol;
- ASSERT (Sock && Sock->ProtoHandler);
+ ASSERT ((Sock != NULL) && (Sock->ProtoHandler != NULL));
- if (Sock->IsDestroyed) {
+ if (Sock->InDestroy) {
return EFI_SUCCESS;
}
- Sock->IsDestroyed = TRUE;
+ Sock->InDestroy = TRUE;
+
+ ProtoData = (TCP4_PROTO_DATA *) Sock->ProtoReserved;
+ Tcb = ProtoData->TcpPcb;
+
+ ASSERT (Tcb != NULL);
+
+ //
+ // Close the IP protocol.
+ //
+ gBS->CloseProtocol (
+ Tcb->IpInfo->ChildHandle,
+ &gEfiIp4ProtocolGuid,
+ ProtoData->TcpService->IpIo->Image,
+ Sock->SockHandle
+ );
+
+ if (Sock->DestroyCallback != NULL) {
+ Sock->DestroyCallback (Sock, Sock->Context);
+ }
+
+ //
+ // Retrieve the protocol installed on this sock
+ //
+ Status = gBS->OpenProtocol (
+ Sock->SockHandle,
+ &gEfiTcp4ProtocolGuid,
+ &SockProtocol,
+ Sock->DriverBinding,
+ Sock->SockHandle,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ );
+
+ if (EFI_ERROR (Status)) {
+
+ DEBUG ((EFI_D_ERROR, "SockDestroyChild: Open protocol installed "
+ "on socket failed with %r\n", Status));
+ }
+
+ //
+ // Uninstall the protocol installed on this sock
+ // in the light of Sock->SockType
+ //
+ gBS->UninstallMultipleProtocolInterfaces (
+ Sock->SockHandle,
+ &gEfiTcp4ProtocolGuid,
+ SockProtocol,
+ NULL
+ );
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -180,7 +224,7 @@ SockDestroyChild (
DEBUG ((EFI_D_ERROR, "SockDestroyChild: Protocol detach socket"
" failed with %r\n", Status));
- Sock->IsDestroyed = FALSE;
+ Sock->InDestroy = FALSE;
} else if (SOCK_IS_CONFIGURED (Sock)) {
SockConnFlush (Sock);
@@ -206,8 +250,6 @@ SockDestroyChild (
data ProtoData.
@param SockInitData Inital data to setting the socket.
- @param ProtoData Pointer to the protocol specific data.
- @param Len Length of the protocol specific data.
@return Pointer to the newly created socket. If NULL, error condition occured.
@@ -218,6 +260,7 @@ SockCreateChild (
)
{
SOCKET *Sock;
+ VOID *SockProtocol;
EFI_STATUS Status;
//
@@ -238,31 +281,54 @@ SockCreateChild (
DEBUG ((EFI_D_ERROR, "SockCreateChild: Get the lock to "
"access socket failed with %r\n", Status));
- SockDestroy (Sock);
- return NULL;
+ goto ERROR;
}
//
// inform the protocol layer to attach the socket
// with a new protocol control block
//
Status = Sock->ProtoHandler (Sock, SOCK_ATTACH, NULL);
+ EfiReleaseLock (&(Sock->Lock));
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "SockCreateChild: Protocol failed to"
" attach a socket with %r\n", Status));
- SockDestroy (Sock);
- Sock = NULL;
+ goto ERROR;
}
- EfiReleaseLock (&(Sock->Lock));
return Sock;
+
+ERROR:
+
+ if (Sock->DestroyCallback != NULL) {
+ Sock->DestroyCallback (Sock, Sock->Context);
+ }
+
+ gBS->OpenProtocol (
+ Sock->SockHandle,
+ &gEfiTcp4ProtocolGuid,
+ &SockProtocol,
+ Sock->DriverBinding,
+ Sock->SockHandle,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ );
+ //
+ // Uninstall the protocol installed on this sock
+ //
+ gBS->UninstallMultipleProtocolInterfaces (
+ Sock->SockHandle,
+ &gEfiTcp4ProtocolGuid,
+ SockProtocol,
+ NULL
+ );
+ SockDestroy (Sock);
+ return NULL;
}
/**
- Configure the specific socket Sock using configuration data
- ConfigData.
+ Configure the specific socket Sock using configuration data ConfigData.
@param Sock Pointer to the socket to be configured.
@param ConfigData Pointer to the configuration data.
@@ -407,7 +473,7 @@ SockAccept (
SOCKET *Socket;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -458,12 +524,12 @@ SockAccept (
RemoveEntryList (ListEntry);
- ASSERT (Socket->Parent);
+ ASSERT (Socket->Parent != NULL);
Socket->Parent->ConnCnt--;
DEBUG (
- (EFI_D_WARN,
+ (EFI_D_NET,
"SockAccept: Accept a socket, now conncount is %d",
Socket->Parent->ConnCnt)
);
@@ -520,7 +586,7 @@ SockSend (
SOCK_TOKEN *SockToken;
UINT32 DataLen;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -603,7 +669,7 @@ SockSend (
"Snd Data\n", Status));
RemoveEntryList (&(SockToken->TokenList));
- gBS->FreePool (SockToken);
+ FreePool (SockToken);
}
}
@@ -643,7 +709,7 @@ SockRcv (
EFI_STATUS Status;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -707,11 +773,7 @@ SockRcv (
}
if (RcvdBytes != 0) {
- Status = SockProcessRcvToken (Sock, RcvToken);
-
- if (EFI_ERROR (Status)) {
- goto Exit;
- }
+ SockProcessRcvToken (Sock, RcvToken);
Status = Sock->ProtoHandler (Sock, SOCK_CONSUMED, NULL);
} else {
@@ -743,7 +805,7 @@ SockFlush (
{
EFI_STATUS Status;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -808,7 +870,7 @@ SockClose (
EFI_STATUS Status;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
@@ -868,8 +930,8 @@ Exit:
**/
EFI_STATUS
SockGetMode (
- IN SOCKET *Sock,
- IN VOID *Mode
+ IN SOCKET *Sock,
+ IN OUT VOID *Mode
)
{
return Sock->ProtoHandler (Sock, SOCK_MODE, Mode);