From nobody Mon May 12 13:49:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1534297732590142.03872317789444; Tue, 14 Aug 2018 18:48:52 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8E094210F2579; Tue, 14 Aug 2018 18:47:42 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 36537210F256A for ; Tue, 14 Aug 2018 18:47:41 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2018 18:47:41 -0700 Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga001.fm.intel.com with ESMTP; 14 Aug 2018 18:47:40 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=shenglei.zhang@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,241,1531810800"; d="scan'208";a="81435216" From: shenglei To: edk2-devel@lists.01.org Date: Wed, 15 Aug 2018 09:46:07 +0800 Message-Id: <20180815014609.19948-26-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20180815014609.19948-1-shenglei.zhang@intel.com> References: <20180815014609.19948-1-shenglei.zhang@intel.com> Subject: [edk2] [PATCH v2 25/27] MdeModulePkg Tcp4Dxe: Remove redundant functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Dong , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RDMRC_1 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The functions that are never called have been removed. They are SockRcvdErr,SockGroup and TcpPawsOK. https://bugzilla.tianocore.org/show_bug.cgi?id=3D1062 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/MdeModuleP= kg/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 ( } =20 =20 -/** - 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 =3D NET_LIST_HEAD ( - &Sock->RcvTokenList, - SOCK_TOKEN, - TokenList - ); - - RemoveEntryList (&SockToken->TokenList); - - SIGNAL_TOKEN (SockToken->Token, Error); - - FreePool (SockToken); - } else { - - SOCK_ERROR (Sock, Error); - } -} - =20 /** 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/MdeMo= dulePkg/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 ( } =20 =20 -/** - 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 =3D EfiAcquireLockOrFail (&(Sock->Lock)); - - if (EFI_ERROR (Status)) { =20 - DEBUG ((EFI_D_ERROR, "SockGroup: Get the access for socket" - " failed with %r", Status)); - - return EFI_ACCESS_DENIED; - } - - if (SOCK_IS_UNCONFIGURED (Sock)) { - Status =3D EFI_NOT_STARTED; - goto Exit; - } - - Status =3D Sock->ProtoHandler (Sock, SOCK_GROUP, GroupInfo); - -Exit: - EfiReleaseLock (&(Sock->Lock)); - return Status; -} =20 =20 /** 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 ); =20 -/** - 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 - ); =20 /// /// Proto type of the create callback @@ -909,25 +896,6 @@ SockGetMode ( IN OUT VOID *Mode ); =20 -/** - 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/MdeModul= ePkg/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 ( } =20 =20 -/** - 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/MdeModul= ePkg/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 ); =20 -/** - 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 - ); =20 #endif --=20 2.18.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel