summaryrefslogtreecommitdiff
path: root/RedfishPkg
diff options
context:
space:
mode:
authorMike Maslenkin <mike.maslenkin@gmail.com>2023-12-14 02:36:41 +0300
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-12-27 00:09:49 +0000
commitd7d4f09ff815794761f84d06e307001afe6376c4 (patch)
tree07e5ae752f8d89f9aeb153b5c4b603c7746e6335 /RedfishPkg
parent91f1ce4e27649e8e6911a505539b137302f1b02d (diff)
downloadedk2-d7d4f09ff815794761f84d06e307001afe6376c4.zip
edk2-d7d4f09ff815794761f84d06e307001afe6376c4.tar.gz
edk2-d7d4f09ff815794761f84d06e307001afe6376c4.tar.bz2
RedfishPkg: RedfishDiscoverDxe: add [] brackets to URI for IPv6 addresses
URI is generated based on the RedfishLocation containing an ASCII string representing the IP address. So, in the case of IPv4 the canonical representation of an IPv4 address was inserted into the resulting Unicode string i.e: "http{,s}://X.X.X.X/". In the case of IPv6, to access resources, the IP address must be specified in brackets, i.e. the resulting string should look like: "http{,s}://[X::X:X:X:X]/". Cc: Nickle Wang <nicklew@nvidia.com> Cc: Igor Kulchytskyy <igork@ami.com> Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com> Reviewed-by: Abner Chang <abner.chang@amd.com>
Diffstat (limited to 'RedfishPkg')
-rw-r--r--RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
index 3373088..f56ef0e 100644
--- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
+++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
@@ -759,6 +759,7 @@ FreeInformationData (
The function initializes particular strings into the structure instance.
@param[in] Information EFI_REDFISH_DISCOVERED_INFORMATION
+ @param[in] IsIpv6 Flag indicating IP version 6 protocol is used
@param[in] RedfishVersion Redfish version.
@param[in] RedfishLocation Redfish location.
@param[in] Uuid Service UUID string.
@@ -772,6 +773,7 @@ STATIC
VOID
InitInformationData (
IN EFI_REDFISH_DISCOVERED_INFORMATION *Information,
+ IN BOOLEAN IsIpv6,
IN UINTN *RedfishVersion OPTIONAL,
IN CONST CHAR8 *RedfishLocation OPTIONAL,
IN CONST CHAR8 *Uuid OPTIONAL,
@@ -789,10 +791,20 @@ InitInformationData (
}
if (RedfishLocation != NULL) {
- AllocationSize = AsciiStrSize (RedfishLocation) * sizeof (CHAR16);
+ AllocationSize = AsciiStrSize (RedfishLocation) * sizeof (CHAR16);
+
+ if (IsIpv6) {
+ AllocationSize += 2 * sizeof (CHAR16); // take into account '[' and ']'
+ }
+
Information->Location = AllocatePool (AllocationSize);
if (Information->Location != NULL) {
- AsciiStrToUnicodeStrS (RedfishLocation, Information->Location, AllocationSize);
+ if (IsIpv6) {
+ UnicodeSPrintAsciiFormat (Information->Location, AllocationSize, "[%a]", RedfishLocation);
+ } else {
+ AsciiStrToUnicodeStrS (RedfishLocation, Information->Location, AllocationSize);
+ }
+
DEBUG ((DEBUG_MANAGEABILITY, "Redfish service location: %s.\n", Information->Location));
} else {
DEBUG ((
@@ -1038,6 +1050,7 @@ AddAndSignalNewRedfishService (
InitInformationData (
&DiscoveredInstance->Information,
+ CheckIsIpVersion6 (NetworkInterface),
RedfishVersion,
RedfishLocation,
Uuid,