From nobody Mon May 6 13:44:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+85802+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85802+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1642572771; cv=none; d=zohomail.com; s=zohoarc; b=JWFtWvrhtY7CDOAFM/wnjTFHQ+YYb7SoDoUJInlZBRIhK0reOdPOAAwsKyD9medxW25SiX1pACyFIabcuwUqA/ryZP7dRsnHsmaSlo/p17whVzJ29+3BKz4NlPwVOYmGBpp8u8QxVfEDaoEx9bbmZoG9vpj+2xE0caulIpc5W0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642572771; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5eJkymWDHpWz9pTeiG5nePpkIPnNIUK7YU7FAD0LR+Q=; b=C5tguZbM+9tBsx4fiT8UCE5RdapeHWXLleRv4X0sFTW9pYkL7RP6lrMD7KqED4Tmb1K5KHnHeBHy0etLDcBYgKW+pExYFDSe0A728vDyt4VtIMEoQzmuf019cfigO5JTz8LAvQmjArlxJZp9vsjvzdRNbVkcjp/0i8/Y5ySKHaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85802+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1642572771798935.3151231995336; Tue, 18 Jan 2022 22:12:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id w5xqYY1788612xE6opX6gdul; Tue, 18 Jan 2022 22:12:51 -0800 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web10.3009.1642572769759002705 for ; Tue, 18 Jan 2022 22:12:50 -0800 X-Received: from kwepemi500004.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4JdwFV32LszZf9r; Wed, 19 Jan 2022 14:09:02 +0800 (CST) X-Received: from kwepemm600004.china.huawei.com (7.193.23.242) by kwepemi500004.china.huawei.com (7.221.188.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 19 Jan 2022 14:12:47 +0800 X-Received: from kwephisprg16640.huawei.com (10.247.83.252) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 19 Jan 2022 14:12:47 +0800 From: "wenyi,xie via groups.io" To: , , CC: , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] RedfishPkg/RedfishRestExDxe:Simplify status check Date: Wed, 19 Jan 2022 14:12:41 +0800 Message-ID: <20220119061241.686837-2-xiewenyi2@huawei.com> In-Reply-To: <20220119061241.686837-1-xiewenyi2@huawei.com> References: <20220119061241.686837-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xiewenyi2@huawei.com X-Gm-Message-State: rbTctRzKvJJHYlImP3yFPoMZx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642572771; bh=OfJgSs2MrzGFhyvWkaDE40Gu5dxYWwWo+ZnOHwqNLhA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YlkofrHGyfYGA99k8B0UaxY2KZx5kFKKPiYWGrB0YaEIBD1rDWT5u3mG/Cpm5phT4b2 LWwLbUygDI6ghJompPhvGEAsDYaxsJ1sg0egvUFl1QrfQ45bsliPWn9a92o4uhcDjHMjy 0y/cj/6LBFrHPEtUnCM2AQGTUjw/5wY0D6Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642572772479100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove redundant determine statements. No functional change. Cc: Abner Chang Cc: Nickle Wang Signed-off-by: Wenyi Xie --- RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c | 38 +++++++++----------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c b/RedfishPkg/R= edfishRestExDxe/RedfishRestExImpl.c index eb1d8b8fa236..ba0a42097b92 100644 --- a/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c +++ b/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c @@ -44,7 +44,7 @@ ResetHttpTslSession ( } =20 /** - This function check + This function check Http receive status =20 @param[in] Instance Pointer to EFI_REST_EX_PROTOCOL instanc= e for a particular REST service. @@ -67,37 +67,33 @@ RedfishCheckHttpReceiveStatus ( =20 if (!EFI_ERROR (HttpIoReceiveStatus)) { ReturnStatus =3D EFI_SUCCESS; - } else if (EFI_ERROR (HttpIoReceiveStatus) && (HttpIoReceiveStatus !=3D = EFI_CONNECTION_FIN)) { + } else if (HttpIoReceiveStatus !=3D EFI_CONNECTION_FIN) { if ((Instance->Flags & RESTEX_INSTANCE_FLAGS_TCP_ERROR_RETRY) =3D=3D 0= ) { DEBUG ((DEBUG_ERROR, "%a: TCP error, reset HTTP session.\n", __FUNCT= ION__)); Instance->Flags |=3D RESTEX_INSTANCE_FLAGS_TCP_ERROR_RETRY; gBS->Stall (500); Status =3D ResetHttpTslSession (Instance); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION= __)); - ReturnStatus =3D EFI_DEVICE_ERROR; - } else { + if (!EFI_ERROR (Status)) { return EFI_NOT_READY; } - } else { - ReturnStatus =3D EFI_DEVICE_ERROR; + DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION__= )); } + + ReturnStatus =3D EFI_DEVICE_ERROR; } else { - if (HttpIoReceiveStatus =3D=3D EFI_CONNECTION_FIN) { - if ((Instance->Flags & RESTEX_INSTANCE_FLAGS_TLS_RETRY) !=3D 0) { - DEBUG ((DEBUG_ERROR, "%a: REST_EX Send and receive fail even with = a new TLS session.\n", __FUNCTION__)); - ReturnStatus =3D EFI_DEVICE_ERROR; - } - - Instance->Flags |=3D RESTEX_INSTANCE_FLAGS_TLS_RETRY; - Status =3D ResetHttpTslSession (Instance); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION= __)); - ReturnStatus =3D EFI_DEVICE_ERROR; - } + if ((Instance->Flags & RESTEX_INSTANCE_FLAGS_TLS_RETRY) !=3D 0) { + DEBUG ((DEBUG_ERROR, "%a: REST_EX Send and receive fail even with a = new TLS session.\n", __FUNCTION__)); + ReturnStatus =3D EFI_DEVICE_ERROR; + } =20 - return EFI_NOT_READY; + Instance->Flags |=3D RESTEX_INSTANCE_FLAGS_TLS_RETRY; + Status =3D ResetHttpTslSession (Instance); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION__= )); + ReturnStatus =3D EFI_DEVICE_ERROR; } + + return EFI_NOT_READY; } =20 // --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85802): https://edk2.groups.io/g/devel/message/85802 Mute This Topic: https://groups.io/mt/88529319/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-