public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch] NetworkPkg/HttpDxe: Stripped square brackets in IPv6 expressed HostName.
@ 2018-08-01  1:54 Jiaxin Wu
  2018-08-01  2:05 ` Fu, Siyuan
  2018-08-01  9:49 ` Laszlo Ersek
  0 siblings, 2 replies; 6+ messages in thread
From: Jiaxin Wu @ 2018-08-01  1:54 UTC (permalink / raw)
  To: edk2-devel; +Cc: Ye Ting, Fu Siyuan, Laszlo Ersek, Wu Jiaxin

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>
---
 NetworkPkg/HttpDxe/HttpImpl.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c
index 17deceb395..e05ee9344b 100644
--- a/NetworkPkg/HttpDxe/HttpImpl.c
+++ b/NetworkPkg/HttpDxe/HttpImpl.c
@@ -403,14 +403,25 @@ EfiHttpRequest (
     Status = HttpParseUrl (Url, (UINT32) AsciiStrLen (Url), FALSE, &UrlParser);
     if (EFI_ERROR (Status)) {
       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 && AsciiStrSize (HostName) > 2 &&
+        HostName[0] == '[' && *(HostName + (AsciiStrSize (HostName) - 2)) == ']') {
+      //
+      // HostName format is expressed as IPv6, so, remove '[' and ']'.
+      //
+      HostNameSize = AsciiStrSize (HostName) - 2;
+
+      CopyMem (HostName, HostName + 1, HostNameSize - 1);
+
+      *(HostName + HostNameSize - 1) = '\0';
     }
 
     Status = HttpUrlGetPort (Url, UrlParser, &RemotePort);
     if (EFI_ERROR (Status)) {
       if (HttpInstance->UseHttps) {
-- 
2.17.1.windows.2



^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-08-02  1:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-01  1:54 [Patch] NetworkPkg/HttpDxe: Stripped square brackets in IPv6 expressed HostName Jiaxin Wu
2018-08-01  2:05 ` Fu, Siyuan
2018-08-01  2:42   ` Wu, Jiaxin
2018-08-01  3:22     ` Fu, Siyuan
2018-08-01  9:49 ` Laszlo Ersek
2018-08-02  1:24   ` Wu, Jiaxin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox