summaryrefslogtreecommitdiffstats
path: root/NetworkPkg
diff options
context:
space:
mode:
authorJiaxin Wu <Jiaxin.wu@intel.com>2018-07-20 10:30:13 +0800
committerJiaxin Wu <Jiaxin.wu@intel.com>2018-08-03 08:34:03 +0800
commit7191827f90b4a09cfef56e1cf23a768a9cb90e07 (patch)
treee8263d969046779f693e925e0843fd78826e198f /NetworkPkg
parentdf4c129833ab5a94a4920620938e32979cf2f241 (diff)
downloadedk2-7191827f90b4a09cfef56e1cf23a768a9cb90e07.tar.gz
edk2-7191827f90b4a09cfef56e1cf23a768a9cb90e07.tar.bz2
edk2-7191827f90b4a09cfef56e1cf23a768a9cb90e07.zip
NetworkPkg/HttpDxe: Strip square brackets in IPv6 expressed HostName.
*v2: Optimize the patch by calculating AsciiStrSize() only once. In URI, the colon (:) is used to terminate the HostName path before a port number. However, if HostName is expressed as IPv6 format, colon characters in IPv6 addresses will conflict with the colon before port number. To alleviate this conflict in URI, the IPv6 expressed HostName are enclosed in square brackets ([]). To record the real IPv6 HostName, square brackets should be stripped. Cc: Ye Ting <ting.ye@intel.com> Cc: Fu Siyuan <siyuan.fu@intel.com> Cc: Laszlo Ersek <lersek@redhat.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com> Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'NetworkPkg')
-rw-r--r--NetworkPkg/HttpDxe/HttpImpl.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c
index 17deceb395..de48243982 100644
--- a/NetworkPkg/HttpDxe/HttpImpl.c
+++ b/NetworkPkg/HttpDxe/HttpImpl.c
@@ -405,10 +405,22 @@ EfiHttpRequest (
goto Error1;
}
- HostName = NULL;
- Status = HttpUrlGetHostName (Url, UrlParser, &HostName);
+ Status = HttpUrlGetHostName (Url, UrlParser, &HostName);
if (EFI_ERROR (Status)) {
- goto Error1;
+ goto Error1;
+ }
+
+ if (HttpInstance->LocalAddressIsIPv6) {
+ HostNameSize = AsciiStrSize (HostName);
+
+ if (HostNameSize > 2 && HostName[0] == '[' && HostName[HostNameSize - 2] == ']') {
+ //
+ // HostName format is expressed as IPv6, so, remove '[' and ']'.
+ //
+ HostNameSize -= 2;
+ CopyMem (HostName, HostName + 1, HostNameSize - 1);
+ HostName[HostNameSize - 1] = '\0';
+ }
}
Status = HttpUrlGetPort (Url, UrlParser, &RemotePort);