Skip to content

Commit

Permalink
RedfishPkg: RedfishDiscoverDxe: add [] brackets to URI for IPv6 addre…
Browse files Browse the repository at this point in the history
…sses

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>
  • Loading branch information
ghbaccount authored and mergify[bot] committed Dec 27, 2023
1 parent 91f1ce4 commit d7d4f09
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
Expand All @@ -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 ((
Expand Down Expand Up @@ -1038,6 +1050,7 @@ AddAndSignalNewRedfishService (

InitInformationData (
&DiscoveredInstance->Information,
CheckIsIpVersion6 (NetworkInterface),
RedfishVersion,
RedfishLocation,
Uuid,
Expand Down

0 comments on commit d7d4f09

Please sign in to comment.