tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mike Maslenkin 2023-12-14 02:36:41 +03:00 committed by mergify[bot]
parent 91f1ce4e27
commit d7d4f09ff8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
View File

@ -759,6 +759,7 @@ FreeInformationData (
The function initializes particular strings into the structure instance. The function initializes particular strings into the structure instance.
@param[in] Information EFI_REDFISH_DISCOVERED_INFORMATION @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] RedfishVersion Redfish version.
@param[in] RedfishLocation Redfish location. @param[in] RedfishLocation Redfish location.
@param[in] Uuid Service UUID string. @param[in] Uuid Service UUID string.
@ -772,6 +773,7 @@ STATIC
VOID VOID
InitInformationData ( InitInformationData (
IN EFI_REDFISH_DISCOVERED_INFORMATION *Information, IN EFI_REDFISH_DISCOVERED_INFORMATION *Information,
IN BOOLEAN IsIpv6,
IN UINTN *RedfishVersion OPTIONAL, IN UINTN *RedfishVersion OPTIONAL,
IN CONST CHAR8 *RedfishLocation OPTIONAL, IN CONST CHAR8 *RedfishLocation OPTIONAL,
IN CONST CHAR8 *Uuid OPTIONAL, IN CONST CHAR8 *Uuid OPTIONAL,
@ -789,10 +791,20 @@ InitInformationData (
} }
if (RedfishLocation != NULL) { 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); Information->Location = AllocatePool (AllocationSize);
if (Information->Location != NULL) { 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)); DEBUG ((DEBUG_MANAGEABILITY, "Redfish service location: %s.\n", Information->Location));
} else { } else {
DEBUG (( DEBUG ((
@ -1038,6 +1050,7 @@ AddAndSignalNewRedfishService (
InitInformationData ( InitInformationData (
&DiscoveredInstance->Information, &DiscoveredInstance->Information,
CheckIsIpVersion6 (NetworkInterface),
RedfishVersion, RedfishVersion,
RedfishLocation, RedfishLocation,
Uuid, Uuid,