X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FTcp4Dxe%2FSockInterface.c;h=feed86c5903eef3e5e7ffb6238d331ea55bbb1d8;hp=0b71996e14c99dad4bfc65e43830ab730bc876f2;hb=216f79703b8cb8dc65abdd768bedb2bcdbc1a1f8;hpb=8a67d61da4d5a8f08a656cbeea2d902d0ad9042a
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index 0b71996e14..feed86c590 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 - 2012, 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,18 +22,17 @@ 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 NET_LIST_ENTRY *List,
+ IN LIST_ENTRY *List,
IN EFI_EVENT Event
)
{
- NET_LIST_ENTRY *ListEntry;
+ LIST_ENTRY *ListEntry;
SOCK_TOKEN *SockToken;
NET_LIST_FOR_EACH (ListEntry, 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;
}
@@ -112,17 +105,17 @@ SockTokenExisted (
SOCK_TOKEN *
SockBufferToken (
IN SOCKET *Sock,
- IN NET_LIST_ENTRY *List,
+ IN LIST_ENTRY *List,
IN VOID *Token,
IN UINT32 DataLen
)
{
SOCK_TOKEN *SockToken;
- SockToken = NetAllocatePool (sizeof (SOCK_TOKEN));
+ SockToken = AllocatePool (sizeof (SOCK_TOKEN));
if (NULL == SockToken) {
- SOCK_DEBUG_ERROR (("SockBufferIOToken: No Memory "
+ DEBUG ((EFI_D_ERROR, "SockBufferIOToken: No Memory "
"to allocate SockToken\n"));
return NULL;
@@ -131,14 +124,14 @@ SockBufferToken (
SockToken->Sock = Sock;
SockToken->Token = (SOCK_COMPLETION_TOKEN *) Token;
SockToken->RemainDataLen = DataLen;
- NetListInsertTail (List, &SockToken->TokenList);
+ InsertTailList (List, &SockToken->TokenList);
return SockToken;
}
/**
- 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,23 +141,23 @@ SockBufferToken (
**/
EFI_STATUS
SockDestroyChild (
- IN SOCKET *Sock
+ IN SOCKET *Sock
)
{
EFI_STATUS Status;
- 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;
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockDestroyChild: Get the lock to "
+ DEBUG ((EFI_D_ERROR, "SockDestroyChild: Get the lock to "
"access socket failed with %r\n", Status));
return EFI_ACCESS_DENIED;
@@ -177,10 +170,10 @@ SockDestroyChild (
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockDestroyChild: Protocol detach socket"
+ 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);
@@ -189,7 +182,7 @@ SockDestroyChild (
Sock->ConfigureState = SO_UNCONFIGURED;
}
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
if (EFI_ERROR (Status)) {
return Status;
@@ -206,49 +199,34 @@ 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.
**/
SOCKET *
SockCreateChild (
- IN SOCK_INIT_DATA *SockInitData,
- IN VOID *ProtoData,
- IN UINT32 Len
+ IN SOCK_INIT_DATA *SockInitData
)
{
SOCKET *Sock;
EFI_STATUS Status;
- ASSERT (ProtoData && (Len <= PROTO_RESERVED_LEN));
-
//
// create a new socket
//
Sock = SockCreate (SockInitData);
if (NULL == Sock) {
- SOCK_DEBUG_ERROR (("SockCreateChild: No resource to "
+ DEBUG ((EFI_D_ERROR, "SockCreateChild: No resource to "
"create a new socket\n"));
return NULL;
}
- //
- // Open the
- //
-
- //
- // copy the protodata into socket
- //
- NetCopyMem (Sock->ProtoReserved, ProtoData, Len);
-
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockCreateChild: Get the lock to "
+ DEBUG ((EFI_D_ERROR, "SockCreateChild: Get the lock to "
"access socket failed with %r\n", Status));
SockDestroy (Sock);
@@ -259,23 +237,22 @@ SockCreateChild (
// with a new protocol control block
//
Status = Sock->ProtoHandler (Sock, SOCK_ATTACH, NULL);
+ EfiReleaseLock (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockCreateChild: Protocol failed to"
+ DEBUG ((EFI_D_ERROR, "SockCreateChild: Protocol failed to"
" attach a socket with %r\n", Status));
SockDestroy (Sock);
Sock = NULL;
}
- NET_UNLOCK (&(Sock->Lock));
return Sock;
}
/**
- 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.
@@ -293,10 +270,10 @@ SockConfigure (
{
EFI_STATUS Status;
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockConfigure: Get the access for "
+ DEBUG ((EFI_D_ERROR, "SockConfigure: Get the access for "
"socket failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -312,7 +289,7 @@ SockConfigure (
Status = Sock->ProtoHandler (Sock, SOCK_CONFIGURE, ConfigData);
OnExit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -345,10 +322,10 @@ SockConnect (
EFI_STATUS Status;
EFI_EVENT Event;
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockConnect: Get the access for "
+ DEBUG ((EFI_D_ERROR, "SockConnect: Get the access for "
"socket failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -384,7 +361,7 @@ SockConnect (
Status = Sock->ProtoHandler (Sock, SOCK_CONNECT, NULL);
OnExit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -415,17 +392,17 @@ SockAccept (
)
{
EFI_TCP4_LISTEN_TOKEN *ListenToken;
- NET_LIST_ENTRY *ListEntry;
+ LIST_ENTRY *ListEntry;
EFI_STATUS Status;
SOCKET *Socket;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockAccept: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockAccept: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -469,14 +446,16 @@ SockAccept (
ListenToken->NewChildHandle = Socket->SockHandle;
SIGNAL_TOKEN (&(ListenToken->CompletionToken), EFI_SUCCESS);
- NetListRemoveEntry (ListEntry);
+ RemoveEntryList (ListEntry);
- ASSERT (Socket->Parent);
+ ASSERT (Socket->Parent != NULL);
Socket->Parent->ConnCnt--;
- SOCK_DEBUG_WARN (("SockAccept: Accept a socket,"
- "now conncount is %d", Socket->Parent->ConnCnt)
+ DEBUG (
+ (EFI_D_INFO,
+ "SockAccept: Accept a socket, now conncount is %d",
+ Socket->Parent->ConnCnt)
);
Socket->Parent = NULL;
@@ -493,7 +472,7 @@ SockAccept (
}
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -531,12 +510,12 @@ SockSend (
SOCK_TOKEN *SockToken;
UINT32 DataLen;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockSend: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockSend: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -571,7 +550,7 @@ SockSend (
goto Exit;
}
- DataLen = TxData->DataLength;
+ DataLen = (UINT32) TxData->DataLength;
//
// process this sending token now or buffer it only?
@@ -600,7 +579,7 @@ SockSend (
);
if (NULL == SockToken) {
- SOCK_DEBUG_ERROR (("SockSend: Failed to buffer IO token into"
+ DEBUG ((EFI_D_ERROR, "SockSend: Failed to buffer IO token into"
" socket processing SndToken List\n", Status));
Status = EFI_OUT_OF_RESOURCES;
@@ -610,16 +589,16 @@ SockSend (
Status = SockProcessTcpSndData (Sock, TxData);
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockSend: Failed to process "
+ DEBUG ((EFI_D_ERROR, "SockSend: Failed to process "
"Snd Data\n", Status));
- NetListRemoveEntry (&(SockToken->TokenList));
- NetFreePool (SockToken);
+ RemoveEntryList (&(SockToken->TokenList));
+ FreePool (SockToken);
}
}
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -654,12 +633,12 @@ SockRcv (
EFI_STATUS Status;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockRcv: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockRcv: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -733,7 +712,7 @@ SockRcv (
}
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -754,12 +733,12 @@ SockFlush (
{
EFI_STATUS Status;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockFlush: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockFlush: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -772,7 +751,7 @@ SockFlush (
Status = Sock->ProtoHandler (Sock, SOCK_FLUSH, NULL);
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockFlush: Protocol failed handling"
+ DEBUG ((EFI_D_ERROR, "SockFlush: Protocol failed handling"
" SOCK_FLUSH with %r", Status));
goto Exit;
@@ -785,7 +764,7 @@ SockFlush (
Sock->ConfigureState = SO_UNCONFIGURED;
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -819,11 +798,11 @@ SockClose (
EFI_STATUS Status;
EFI_EVENT Event;
- ASSERT (SOCK_STREAM == Sock->Type);
+ ASSERT (SockStream == Sock->Type);
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockClose: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockClose: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -861,7 +840,7 @@ SockClose (
}
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -879,8 +858,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);
@@ -908,11 +887,11 @@ SockGroup (
{
EFI_STATUS Status;
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockGroup: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockGroup: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -926,7 +905,7 @@ SockGroup (
Status = Sock->ProtoHandler (Sock, SOCK_GROUP, GroupInfo);
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}
@@ -954,9 +933,9 @@ SockRoute (
{
EFI_STATUS Status;
- Status = NET_TRYLOCK (&(Sock->Lock));
+ Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
- SOCK_DEBUG_ERROR (("SockRoute: Get the access for socket"
+ DEBUG ((EFI_D_ERROR, "SockRoute: Get the access for socket"
" failed with %r", Status));
return EFI_ACCESS_DENIED;
@@ -975,6 +954,6 @@ SockRoute (
Status = Sock->ProtoHandler (Sock, SOCK_ROUTE, RouteInfo);
Exit:
- NET_UNLOCK (&(Sock->Lock));
+ EfiReleaseLock (&(Sock->Lock));
return Status;
}