From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 55189210E38DB for ; Thu, 9 Aug 2018 03:22:02 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2018 03:22:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,214,1531810800"; d="scan'208";a="253325485" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 09 Aug 2018 03:22:00 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 9 Aug 2018 03:22:00 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 9 Aug 2018 03:21:59 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.226]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.150]) with mapi id 14.03.0319.002; Thu, 9 Aug 2018 18:21:57 +0800 From: "Zeng, Star" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Fu, Siyuan" , "Wu, Jiaxin" , "Zeng, Star" Thread-Topic: [PATCH 25/26] MdeModulePkg Tcp4Dxe: Remove redundant functions Thread-Index: AQHULvSR5sfEVpVBXEWZanY7n+P4fqS3N6Ig Date: Thu, 9 Aug 2018 10:21:56 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BBAA4B1@shsmsx102.ccr.corp.intel.com> References: <20180808084712.34696-1-shenglei.zhang@intel.com> <20180808084712.34696-26-shenglei.zhang@intel.com> In-Reply-To: <20180808084712.34696-26-shenglei.zhang@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 25/26] 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: , X-List-Received-Date: Thu, 09 Aug 2018 10:22:02 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc Siyuan and Jiaxin. Thanks, Star -----Original Message----- From: Zhang, Shenglei=20 Sent: Wednesday, August 8, 2018 4:47 PM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Dong, Eric Subject: [PATCH 25/26] 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=3D1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- .../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/= 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 ( } =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 -- 2.18.0.windows.1