summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickle Wang <nicklew@nvidia.com>2023-07-21 21:35:51 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-09-19 15:41:18 +0000
commit7275993dc64481b1c21d7d70af434bfaafe86e81 (patch)
tree8d428e207df6a2bfee7a59ba3c48bf807b833dbf
parentcbcf0428e83bbe8314de47207072b3b4f1557dc6 (diff)
downloadedk2-7275993dc64481b1c21d7d70af434bfaafe86e81.tar.gz
edk2-7275993dc64481b1c21d7d70af434bfaafe86e81.tar.bz2
edk2-7275993dc64481b1c21d7d70af434bfaafe86e81.zip
RedfishPkg/RedfishRestExDxe: return HTTP status code to caller.
Return unsupported HTTP status code to caller so caller can handle HTTP error status code. Current implementation only return EFI error to caller. Without knowing the HTTP status code, caller has trouble to handle HTTP request failure. Signed-off-by: Nickle Wang <nicklew@nvidia.com> Cc: Abner Chang <abner.chang@amd.com> Cc: Igor Kulchytskyy <igork@ami.com> Cc: Nick Ramirez <nramirez@nvidia.com> Cc: Mike Maslenkin <mike.maslenkin@gmail.com> Reviewed-by: Igor Kulchytskyy <igork@ami.com> Reviewed-by: Abner Chang <abner.chang@amd.com> Acked-by: Mike Maslenkin <mike.maslenkin@gmail.com>
-rw-r--r--MdePkg/Include/Protocol/RestEx.h3
-rw-r--r--RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c27
2 files changed, 16 insertions, 14 deletions
diff --git a/MdePkg/Include/Protocol/RestEx.h b/MdePkg/Include/Protocol/RestEx.h
index e9bc7be94f..da9f1c3f87 100644
--- a/MdePkg/Include/Protocol/RestEx.h
+++ b/MdePkg/Include/Protocol/RestEx.h
@@ -131,7 +131,8 @@ typedef struct {
response when the data is retrieved from the service. RequestMessage contains the HTTP
request to the REST resource identified by RequestMessage.Request.Url. The
ResponseMessage is the returned HTTP response for that request, including any HTTP
- status.
+ status. It's caller's responsibility to free this ResponseMessage using FreePool().
+ RestConfigFreeHttpMessage() in RedfishLib is an example to release ResponseMessage structure.
@param[in] This Pointer to EFI_REST_EX_PROTOCOL instance for a particular
REST service.
diff --git a/RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c b/RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c
index 90973619f2..5bcdade4b1 100644
--- a/RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c
+++ b/RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c
@@ -29,7 +29,8 @@ EFI_REST_EX_PROTOCOL mRedfishRestExProtocol = {
response when the data is retrieved from the service. RequestMessage contains the HTTP
request to the REST resource identified by RequestMessage.Request.Url. The
ResponseMessage is the returned HTTP response for that request, including any HTTP
- status.
+ status. It's caller's responsibility to free this ResponseMessage using FreePool().
+ RestConfigFreeHttpMessage() in RedfishLib is an example to release ResponseMessage structure.
@param[in] This Pointer to EFI_REST_EX_PROTOCOL instance for a particular
REST service.
@@ -320,6 +321,18 @@ ReSendRequest:;
DEBUG ((DEBUG_ERROR, "This HTTP Status is not handled!\n"));
DumpHttpStatusCode (DEBUG_REDFISH_NETWORK, ResponseData->Response.StatusCode);
Status = EFI_UNSUPPORTED;
+
+ //
+ // Deliver status code back to caller so caller can handle it.
+ //
+ ResponseMessage->Data.Response = AllocateZeroPool (sizeof (EFI_HTTP_RESPONSE_DATA));
+ if (ResponseMessage->Data.Response == NULL) {
+ Status = EFI_OUT_OF_RESOURCES;
+ goto ON_EXIT;
+ }
+
+ ResponseMessage->Data.Response->StatusCode = ResponseData->Response.StatusCode;
+
goto ON_EXIT;
}
@@ -443,18 +456,6 @@ ON_EXIT:
FreePool (ResponseData);
}
- if (EFI_ERROR (Status)) {
- if (ResponseMessage->Data.Response != NULL) {
- FreePool (ResponseMessage->Data.Response);
- ResponseMessage->Data.Response = NULL;
- }
-
- if (ResponseMessage->Body != NULL) {
- FreePool (ResponseMessage->Body);
- ResponseMessage->Body = NULL;
- }
- }
-
return Status;
}