From 4750f754fc573b9a7dd8057dbea94757fffdbad6 Mon Sep 17 00:00:00 2001 From: shenglei Date: Wed, 8 Aug 2018 16:28:31 +0800 Subject: [PATCH] MdeModulePkg Tcp4Dxe: Remove redundant functions The functions that are never called have been removed. They are SockRcvdErr,SockGroup and TcpPawsOK. https://bugzilla.tianocore.org/show_bug.cgi?id=1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei Reviewed-by: Laszlo Ersek --- .../Universal/Network/Tcp4Dxe/SockImpl.c | 35 ---------------- .../Universal/Network/Tcp4Dxe/SockInterface.c | 41 ------------------- .../Universal/Network/Tcp4Dxe/Socket.h | 32 --------------- .../Universal/Network/Tcp4Dxe/Tcp4Option.c | 28 ------------- .../Universal/Network/Tcp4Dxe/Tcp4Option.h | 15 ------- 5 files changed, 151 deletions(-) diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c index 0476077c20..adb5aa35cd 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c @@ -1107,41 +1107,6 @@ SockGetFreeSpace ( } -/** - Signal the receive token with the specific error or - set socket error code after error is received. - - @param Sock Pointer to the socket. - @param Error The error code received. - -**/ -VOID -SockRcvdErr ( - IN OUT SOCKET *Sock, - IN EFI_STATUS Error - ) -{ - SOCK_TOKEN *SockToken; - - if (!IsListEmpty (&Sock->RcvTokenList)) { - - SockToken = NET_LIST_HEAD ( - &Sock->RcvTokenList, - SOCK_TOKEN, - TokenList - ); - - RemoveEntryList (&SockToken->TokenList); - - SIGNAL_TOKEN (SockToken->Token, Error); - - FreePool (SockToken); - } else { - - SOCK_ERROR (Sock, Error); - } -} - /** Called by the low layer protocol to indicate that there will be no more data diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c index 6dbabc4e51..cd20b8bcb2 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c @@ -938,48 +938,7 @@ SockGetMode ( } -/** - Configure the low level protocol to join a multicast group for - this socket's connection. - - @param Sock Pointer to the socket of the connection to join the - specific multicast group. - @param GroupInfo Pointer to the multicast group info. - - @retval EFI_SUCCESS The configuration is done successfully. - @retval EFI_ACCESS_DENIED Failed to get the lock to access the socket. - @retval EFI_NOT_STARTED The socket is not configured. - -**/ -EFI_STATUS -SockGroup ( - IN SOCKET *Sock, - IN VOID *GroupInfo - ) -{ - EFI_STATUS Status; - - Status = EfiAcquireLockOrFail (&(Sock->Lock)); - - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "SockGroup: Get the access for socket" - " failed with %r", Status)); - - return EFI_ACCESS_DENIED; - } - - if (SOCK_IS_UNCONFIGURED (Sock)) { - Status = EFI_NOT_STARTED; - goto Exit; - } - - Status = Sock->ProtoHandler (Sock, SOCK_GROUP, GroupInfo); - -Exit: - EfiReleaseLock (&(Sock->Lock)); - return Status; -} /** diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h index 7ff2fc565e..650a7dd865 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h @@ -550,19 +550,6 @@ SockClone ( IN SOCKET *Sock ); -/** - Signal the receive token with the specific error or - set socket error code after error is received. - - @param Sock Pointer to the socket. - @param Error The error code received. - -**/ -VOID -SockRcvdErr ( - IN OUT SOCKET *Sock, - IN EFI_STATUS Error - ); /// /// Proto type of the create callback @@ -909,25 +896,6 @@ SockGetMode ( IN OUT VOID *Mode ); -/** - Configure the low level protocol to join a multicast group for - this socket's connection. - - @param Sock Pointer to the socket of the connection to join the - specific multicast group. - @param GroupInfo Pointer to the multicast group info. - - @retval EFI_SUCCESS The configuration is done successfully. - @retval EFI_ACCESS_DENIED Failed to get the lock to access the socket. - @retval EFI_NOT_STARTED The socket is not configured. - -**/ -EFI_STATUS -SockGroup ( - IN SOCKET *Sock, - IN VOID *GroupInfo - ); - /** Add or remove route information in IP route table associated with this socket. diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c index 2817b80295..e84310f6c6 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c @@ -350,31 +350,3 @@ TcpParseOption ( } -/** - Check the segment against PAWS. - - @param Tcb Pointer to the TCP_CB of this TCP instance. - @param TSVal The timestamp value. - - @retval 1 The segment passed the PAWS check. - @retval 0 The segment failed to pass the PAWS check. - -**/ -UINT32 -TcpPawsOK ( - IN TCP_CB *Tcb, - IN UINT32 TSVal - ) -{ - // - // PAWS as defined in RFC1323, buggy... - // - if (TCP_TIME_LT (TSVal, Tcb->TsRecent) && - TCP_TIME_LT (Tcb->TsRecentAge + TCP_PAWS_24DAY, mTcpTick)) { - - return 0; - - } - - return 1; -} diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h index 5185aecea8..f9782cb598 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h @@ -126,20 +126,5 @@ TcpParseOption ( IN OUT TCP_OPTION *Option ); -/** - Check the segment against PAWS. - - @param Tcb Pointer to the TCP_CB of this TCP instance. - @param TSVal The timestamp value. - - @retval 1 The segment passed the PAWS check. - @retval 0 The segment failed to pass the PAWS check. - -**/ -UINT32 -TcpPawsOK ( - IN TCP_CB *Tcb, - IN UINT32 TSVal - ); #endif -- 2.39.2