]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/HttpDxe/HttpProto.c
Always set WP in CR0.
[mirror_edk2.git] / NetworkPkg / HttpDxe / HttpProto.c
index 829758ad5ea4173e1ab23333cf623912cc025cc7..999695125e5152554d3c3f2426d97549fab0a37d 100644 (file)
@@ -2,6 +2,7 @@
   Miscellaneous routines for HttpDxe driver.\r
 \r
 Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -36,39 +37,58 @@ HttpCommonNotify (
 }\r
 \r
 /**\r
-  The notify function associated with TxToken for Tcp4->Transmit().\r
+  The notify function associated with Tx4Token for Tcp4->Transmit() or Tx6Token for Tcp6->Transmit().\r
 \r
-  @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
-HttpTcpTransmitNotify (\r
-  IN EFI_EVENT  Event,\r
+HttpTcpTransmitNotifyDpc (\r
   IN VOID       *Context\r
   )\r
 {\r
   HTTP_TOKEN_WRAP          *Wrap;\r
+  HTTP_PROTOCOL            *HttpInstance;\r
 \r
-  if ((Event == NULL) || (Context == NULL)) {\r
+  if (Context == NULL) {\r
     return ;\r
   }\r
+  \r
+  Wrap         = (HTTP_TOKEN_WRAP *) Context;\r
+  HttpInstance = Wrap->HttpInstance;\r
+  \r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+      Wrap->HttpToken->Status = Wrap->TcpWrap.Tx4Token.CompletionToken.Status;\r
+      gBS->SignalEvent (Wrap->HttpToken->Event);\r
+\r
+      //\r
+      // Free resources.\r
+      //\r
+      if (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+        FreePool (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
+      }\r
 \r
-  Wrap = (HTTP_TOKEN_WRAP *) Context;\r
-  Wrap->HttpToken->Status = Wrap->TcpWrap.TxToken.CompletionToken.Status;\r
-  gBS->SignalEvent (Wrap->HttpToken->Event);\r
+      if (Wrap->TcpWrap.Tx4Token.CompletionToken.Event != NULL) {\r
+        gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
+      }\r
+      \r
+  } else {\r
+    Wrap->HttpToken->Status = Wrap->TcpWrap.Tx6Token.CompletionToken.Status;\r
+    gBS->SignalEvent (Wrap->HttpToken->Event);\r
+    \r
+    //\r
+    // Free resources.\r
+    //\r
+    if (Wrap->TcpWrap.Tx6Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+      FreePool (Wrap->TcpWrap.Tx6Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
+    }\r
 \r
-  //\r
-  // Free resources.\r
-  //\r
-  if (Wrap->TcpWrap.TxToken.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
-    FreePool (Wrap->TcpWrap.TxToken.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
+    if (Wrap->TcpWrap.Tx6Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (Wrap->TcpWrap.Tx6Token.CompletionToken.Event);\r
+    }   \r
   }\r
 \r
-  if (Wrap->TcpWrap.TxToken.CompletionToken.Event != NULL) {\r
-    gBS->CloseEvent (Wrap->TcpWrap.TxToken.CompletionToken.Event);\r
-  }\r
 \r
   Wrap->TcpWrap.IsTxDone = TRUE;\r
 \r
@@ -80,16 +100,34 @@ HttpTcpTransmitNotify (
 }\r
 \r
 /**\r
-  The notify function associated with RxToken for Tcp4->Receive ().\r
+  Request HttpTcpTransmitNotifyDpc as a DPC at TPL_CALLBACK.\r
+\r
+  @param  Event                 The receive event delivered to TCP for transmit.\r
+  @param  Context               Context for the callback.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+HttpTcpTransmitNotify (\r
+  IN EFI_EVENT                Event,\r
+  IN VOID                     *Context\r
+  )\r
+{\r
+  //\r
+  // Request HttpTcpTransmitNotifyDpc as a DPC at TPL_CALLBACK\r
+  //\r
+  QueueDpc (TPL_CALLBACK, HttpTcpTransmitNotifyDpc, Context);\r
+}\r
+\r
+/**\r
+  The notify function associated with Rx4Token for Tcp4->Receive () or Rx6Token for Tcp6->Receive().\r
 \r
-  @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
-HttpTcpReceiveNotify (\r
-  IN EFI_EVENT  Event,\r
+HttpTcpReceiveNotifyDpc (\r
   IN VOID       *Context\r
   )\r
 {\r
@@ -98,24 +136,41 @@ HttpTcpReceiveNotify (
   UINTN                    Length;\r
   EFI_STATUS               Status;\r
   HTTP_PROTOCOL            *HttpInstance;\r
+  BOOLEAN                  UsingIpv6;\r
 \r
-  if ((Event == NULL) || (Context == NULL)) {\r
+  if (Context == NULL) {\r
     return ;\r
   }\r
 \r
   Wrap = (HTTP_TOKEN_WRAP *) Context;\r
-  if (EFI_ERROR (Wrap->TcpWrap.RxToken.CompletionToken.Status)) {\r
-    return ;\r
-  }\r
-\r
   HttpInstance = Wrap->HttpInstance;\r
+  UsingIpv6    = HttpInstance->LocalAddressIsIPv6;\r
+  \r
+  if (UsingIpv6) {\r
+    gBS->CloseEvent (Wrap->TcpWrap.Rx6Token.CompletionToken.Event);\r
+    \r
+    if (EFI_ERROR (Wrap->TcpWrap.Rx6Token.CompletionToken.Status)) {\r
+      return ;\r
+    }\r
+\r
+  } else {\r
+    gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);\r
+    \r
+    if (EFI_ERROR (Wrap->TcpWrap.Rx4Token.CompletionToken.Status)) {\r
+      return ;\r
+    }\r
+  }\r
 \r
   //\r
   // Check whether we receive a complete HTTP message.\r
   //\r
   ASSERT (HttpInstance->MsgParser != NULL);\r
+  if (UsingIpv6) {\r
+    Length = (UINTN) Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLength;\r
+  } else {\r
+    Length = (UINTN) Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLength;\r
+  }\r
 \r
-  Length = (UINTN) Wrap->TcpWrap.RxData.FragmentTable[0].FragmentLength;\r
   Status = HttpParseMessageBody (\r
              HttpInstance->MsgParser,\r
              Length,\r
@@ -160,7 +215,12 @@ HttpTcpReceiveNotify (
 \r
 \r
   Wrap->TcpWrap.IsRxDone = TRUE;\r
-  Wrap->HttpToken->Status = Wrap->TcpWrap.RxToken.CompletionToken.Status;\r
+  if (UsingIpv6) {\r
+    Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;\r
+  } else {\r
+    Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;\r
+  }\r
+  \r
 \r
   gBS->SignalEvent (Wrap->HttpToken->Event);\r
 \r
@@ -173,7 +233,27 @@ HttpTcpReceiveNotify (
 }\r
 \r
 /**\r
-  Create events for the TCP4 connection token and TCP4 close token.\r
+  Request HttpTcpReceiveNotifyDpc as a DPC at TPL_CALLBACK.\r
+\r
+  @param  Event                 The receive event delivered to TCP for receive.\r
+  @param  Context               Context for the callback.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+HttpTcpReceiveNotify (\r
+  IN EFI_EVENT                Event,\r
+  IN VOID                     *Context\r
+  )\r
+{\r
+  //\r
+  // Request HttpTcpTransmitNotifyDpc as a DPC at TPL_CALLBACK\r
+  //\r
+  QueueDpc (TPL_CALLBACK, HttpTcpReceiveNotifyDpc, Context);\r
+}\r
+\r
+/**\r
+  Create events for the TCP connection token and TCP close token.\r
 \r
   @param[in]  HttpInstance       Pointer to HTTP_PROTOCOL structure.\r
 \r
@@ -182,11 +262,13 @@ HttpTcpReceiveNotify (
 \r
 **/\r
 EFI_STATUS\r
-HttpCreateTcp4ConnCloseEvent (\r
+HttpCreateTcpConnCloseEvent (\r
   IN  HTTP_PROTOCOL        *HttpInstance\r
   )\r
 {\r
   EFI_STATUS               Status;\r
+\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
     //\r
     // Create events for variuos asynchronous operations.\r
     //\r
@@ -194,64 +276,109 @@ HttpCreateTcp4ConnCloseEvent (
                     EVT_NOTIFY_SIGNAL,\r
                     TPL_NOTIFY,\r
                     HttpCommonNotify,\r
-                    &HttpInstance->IsConnDone,\r
-                    &HttpInstance->ConnToken.CompletionToken.Event\r
+                    &HttpInstance->IsTcp4ConnDone,\r
+                    &HttpInstance->Tcp4ConnToken.CompletionToken.Event\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       goto ERROR;\r
     }\r
 \r
     //\r
-    // Initialize CloseToken\r
+    // Initialize Tcp4CloseToken\r
+    //\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpCommonNotify,\r
+                    &HttpInstance->IsTcp4CloseDone,\r
+                    &HttpInstance->Tcp4CloseToken.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ERROR;\r
+    }\r
+    \r
+  } else {\r
+    //\r
+    // Create events for variuos asynchronous operations.\r
     //\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
                     TPL_NOTIFY,\r
                     HttpCommonNotify,\r
-                    &HttpInstance->IsCloseDone,\r
-                    &HttpInstance->CloseToken.CompletionToken.Event\r
+                    &HttpInstance->IsTcp6ConnDone,\r
+                    &HttpInstance->Tcp6ConnToken.CompletionToken.Event\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       goto ERROR;\r
     }\r
 \r
\r
+    //\r
+    // Initialize Tcp6CloseToken\r
+    //\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpCommonNotify,\r
+                    &HttpInstance->IsTcp6CloseDone,\r
+                    &HttpInstance->Tcp6CloseToken.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ERROR;\r
+    }\r
+  }\r
+     \r
   return EFI_SUCCESS;\r
 \r
 ERROR:\r
   //\r
   // Error handling\r
   //\r
-  HttpCloseTcp4ConnCloseEvent (HttpInstance);\r
+  HttpCloseTcpConnCloseEvent (HttpInstance);\r
 \r
   return Status;\r
 }\r
 \r
 \r
 /**\r
-  Close events in the TCP4 connection token and TCP4 close token.\r
+  Close events in the TCP connection token and TCP close token.\r
 \r
   @param[in]  HttpInstance   Pointer to HTTP_PROTOCOL structure.\r
 \r
 **/\r
 VOID\r
-HttpCloseTcp4ConnCloseEvent (\r
+HttpCloseTcpConnCloseEvent (\r
   IN  HTTP_PROTOCOL        *HttpInstance\r
   )\r
 {\r
   ASSERT (HttpInstance != NULL);\r
 \r
-  if (NULL != HttpInstance->ConnToken.CompletionToken.Event) {\r
-    gBS->CloseEvent (HttpInstance->ConnToken.CompletionToken.Event);\r
-  }\r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    if (NULL != HttpInstance->Tcp6ConnToken.CompletionToken.Event) {\r
+      gBS->CloseEvent (HttpInstance->Tcp6ConnToken.CompletionToken.Event);\r
+      HttpInstance->Tcp6ConnToken.CompletionToken.Event = NULL;\r
+    }\r
 \r
-  if (NULL != HttpInstance->CloseToken.CompletionToken.Event) {\r
-    gBS->CloseEvent(HttpInstance->CloseToken.CompletionToken.Event);\r
-  }  \r
+    if (NULL != HttpInstance->Tcp6CloseToken.CompletionToken.Event) {\r
+      gBS->CloseEvent(HttpInstance->Tcp6CloseToken.CompletionToken.Event);\r
+      HttpInstance->Tcp6CloseToken.CompletionToken.Event = NULL;\r
+    }\r
+\r
+  } else {\r
+    if (NULL != HttpInstance->Tcp4ConnToken.CompletionToken.Event) {\r
+      gBS->CloseEvent (HttpInstance->Tcp4ConnToken.CompletionToken.Event);\r
+      HttpInstance->Tcp4ConnToken.CompletionToken.Event = NULL;\r
+    }\r
+\r
+    if (NULL != HttpInstance->Tcp4CloseToken.CompletionToken.Event) {\r
+      gBS->CloseEvent(HttpInstance->Tcp4CloseToken.CompletionToken.Event);\r
+      HttpInstance->Tcp4CloseToken.CompletionToken.Event = NULL;\r
+    }\r
+  }\r
+  \r
 }\r
 \r
 /**\r
-  Create event for the TCP4 transmit token.\r
+  Create event for the TCP transmit token.\r
 \r
   @param[in]  Wrap               Point to HTTP token's wrap data.\r
 \r
@@ -260,7 +387,7 @@ HttpCloseTcp4ConnCloseEvent (
 \r
 **/\r
 EFI_STATUS\r
-HttpCreateTcp4TxEvent (\r
+HttpCreateTcpTxEvent (\r
   IN  HTTP_TOKEN_WRAP      *Wrap\r
   )\r
 {\r
@@ -271,28 +398,50 @@ HttpCreateTcp4TxEvent (
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_NOTIFY_SIGNAL,\r
-                  TPL_NOTIFY,\r
-                  HttpTcpTransmitNotify,\r
-                  Wrap,\r
-                  &TcpWrap->TxToken.CompletionToken.Event\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpTcpTransmitNotify,\r
+                    Wrap,\r
+                    &TcpWrap->Tx4Token.CompletionToken.Event\r
+                    );\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+    \r
+      TcpWrap->Tx4Data.Push = TRUE;\r
+      TcpWrap->Tx4Data.Urgent = FALSE;\r
+      TcpWrap->Tx4Data.FragmentCount = 1;\r
+      TcpWrap->Tx4Token.Packet.TxData = &Wrap->TcpWrap.Tx4Data;\r
+      TcpWrap->Tx4Token.CompletionToken.Status = EFI_NOT_READY;\r
 \r
-  TcpWrap->TxData.Push = TRUE;\r
-  TcpWrap->TxData.Urgent = FALSE;\r
-  TcpWrap->TxData.FragmentCount = 1;\r
-  TcpWrap->TxToken.Packet.TxData = &Wrap->TcpWrap.TxData;\r
-  TcpWrap->TxToken.CompletionToken.Status = EFI_NOT_READY;\r
+  } else {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpTcpTransmitNotify,\r
+                    Wrap,\r
+                    &TcpWrap->Tx6Token.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
 \r
+    TcpWrap->Tx6Data.Push   = TRUE;\r
+    TcpWrap->Tx6Data.Urgent = FALSE;\r
+    TcpWrap->Tx6Data.FragmentCount  = 1;\r
+    TcpWrap->Tx6Token.Packet.TxData = &Wrap->TcpWrap.Tx6Data;\r
+    TcpWrap->Tx6Token.CompletionToken.Status =EFI_NOT_READY;\r
+    \r
+    \r
+  }\r
+  \r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
-  Create event for the TCP4 receive token which is used to receive HTTP header.\r
+  Create event for the TCP receive token which is used to receive HTTP header.\r
 \r
   @param[in]  HttpInstance       Pointer to HTTP_PROTOCOL structure.\r
 \r
@@ -301,33 +450,52 @@ HttpCreateTcp4TxEvent (
 \r
 **/\r
 EFI_STATUS\r
-HttpCreateTcp4RxEventForHeader (\r
+HttpCreateTcpRxEventForHeader (\r
   IN  HTTP_PROTOCOL        *HttpInstance\r
   )\r
 {\r
   EFI_STATUS               Status;\r
 \r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpCommonNotify,\r
+                    &HttpInstance->IsRxDone,\r
+                    &HttpInstance->Rx4Token.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+    \r
+    HttpInstance->Rx4Data.FragmentCount = 1;\r
+    HttpInstance->Rx4Token.Packet.RxData = &HttpInstance->Rx4Data;\r
+    HttpInstance->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_NOTIFY_SIGNAL,\r
-                  TPL_NOTIFY,\r
-                  HttpCommonNotify,\r
-                  &HttpInstance->IsRxDone,\r
-                  &HttpInstance->RxToken.CompletionToken.Event\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
+  } else {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpCommonNotify,\r
+                    &HttpInstance->IsRxDone,\r
+                    &HttpInstance->Rx6Token.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    HttpInstance->Rx6Data.FragmentCount  =1;\r
+    HttpInstance->Rx6Token.Packet.RxData = &HttpInstance->Rx6Data;\r
+    HttpInstance->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
+    \r
   }\r
 \r
-  HttpInstance->RxData.FragmentCount = 1;\r
-  HttpInstance->RxToken.Packet.RxData = &HttpInstance->RxData;\r
-  HttpInstance->RxToken.CompletionToken.Status = EFI_NOT_READY;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
-  Create event for the TCP4 receive token which is used to receive HTTP body.\r
+  Create event for the TCP receive token which is used to receive HTTP body.\r
 \r
   @param[in]  Wrap               Point to HTTP token's wrap data.\r
 \r
@@ -336,7 +504,7 @@ HttpCreateTcp4RxEventForHeader (
 \r
 **/\r
 EFI_STATUS\r
-HttpCreateTcp4RxEvent (\r
+HttpCreateTcpRxEvent (\r
   IN  HTTP_TOKEN_WRAP      *Wrap \r
   )\r
 {\r
@@ -346,30 +514,91 @@ HttpCreateTcp4RxEvent (
 \r
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpTcpReceiveNotify,\r
+                    Wrap,\r
+                    &TcpWrap->Rx4Token.CompletionToken.Event\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+    \r
+    TcpWrap->Rx4Data.FragmentCount = 1;\r
+    TcpWrap->Rx4Token.Packet.RxData = &Wrap->TcpWrap.Rx4Data;\r
+    TcpWrap->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_NOTIFY_SIGNAL,\r
-                  TPL_NOTIFY,\r
-                  HttpTcpReceiveNotify,\r
-                  Wrap,\r
-                  &TcpWrap->RxToken.CompletionToken.Event\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
+  } else {\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_NOTIFY,\r
+                    HttpTcpReceiveNotify,\r
+                    Wrap,\r
+                    &TcpWrap->Rx6Token.CompletionToken.Event\r
+                    );  \r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    TcpWrap->Rx6Data.FragmentCount = 1;\r
+    TcpWrap->Rx6Token.Packet.RxData = &Wrap->TcpWrap.Rx6Data;\r
+    TcpWrap->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
   }\r
+  \r
+  return EFI_SUCCESS;\r
+}\r
 \r
-  TcpWrap->RxData.FragmentCount = 1;\r
-  TcpWrap->RxToken.Packet.RxData = &Wrap->TcpWrap.RxData;\r
-  TcpWrap->RxToken.CompletionToken.Status = EFI_NOT_READY;\r
+/**\r
+  Close Events for Tcp Receive Tokens for HTTP body and HTTP header.\r
 \r
-  return EFI_SUCCESS;\r
+  @param[in]  Wrap               Pointer to HTTP token's wrap data.\r
+  \r
+**/\r
+VOID\r
+HttpCloseTcpRxEvent (\r
+  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  )\r
+{\r
+  HTTP_PROTOCOL            *HttpInstance;\r
+  EFI_TCP4_IO_TOKEN        *Rx4Token;\r
+  EFI_TCP6_IO_TOKEN        *Rx6Token;\r
+\r
+  HttpInstance   = Wrap->HttpInstance;\r
+  Rx4Token       = NULL;\r
+  Rx6Token       = NULL;\r
+  \r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    if (Wrap != NULL) {\r
+      if (Wrap->TcpWrap.Rx6Token.CompletionToken.Event != NULL) {\r
+        gBS->CloseEvent (Wrap->TcpWrap.Rx6Token.CompletionToken.Event);\r
+      } \r
+    }\r
+\r
+    if (HttpInstance->Rx6Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (HttpInstance->Rx6Token.CompletionToken.Event);\r
+      HttpInstance->Rx6Token.CompletionToken.Event = NULL;\r
+    }\r
+  } else {\r
+    if (Wrap != NULL) {\r
+      if (Wrap->TcpWrap.Rx4Token.CompletionToken.Event != NULL) {\r
+        gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);\r
+      }\r
+    }\r
+    \r
+    if (HttpInstance->Rx4Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (HttpInstance->Rx4Token.CompletionToken.Event);\r
+      HttpInstance->Rx4Token.CompletionToken.Event = NULL;\r
+    }\r
+  }\r
 }\r
 \r
 /**\r
   Intiialize the HTTP_PROTOCOL structure to the unconfigured state.\r
 \r
-  @param[in]       HttpSb               The HTTP service private instance.\r
   @param[in, out]  HttpInstance         Pointer to HTTP_PROTOCOL structure.\r
+  @param[in]       IpVersion            Indicate us TCP4 protocol or TCP6 protocol.\r
 \r
   @retval EFI_SUCCESS       HTTP_PROTOCOL structure is initialized successfully.                                          \r
   @retval Others            Other error as indicated.\r
@@ -377,89 +606,198 @@ HttpCreateTcp4RxEvent (
 **/\r
 EFI_STATUS\r
 HttpInitProtocol (\r
-  IN     HTTP_SERVICE            *HttpSb,\r
-  IN OUT HTTP_PROTOCOL           *HttpInstance\r
+  IN OUT HTTP_PROTOCOL           *HttpInstance,\r
+  IN     BOOLEAN                 IpVersion\r
   )\r
 {\r
   EFI_STATUS                     Status;\r
   VOID                           *Interface;\r
+  BOOLEAN                        UsingIpv6;\r
+  \r
+  ASSERT (HttpInstance != NULL);\r
+  UsingIpv6 = IpVersion;\r
+  \r
+  if (!UsingIpv6) {\r
+    //\r
+    // Create TCP4 child.\r
+    //\r
+    Status = NetLibCreateServiceChild (\r
+               HttpInstance->Service->ControllerHandle,\r
+               HttpInstance->Service->ImageHandle,\r
+               &gEfiTcp4ServiceBindingProtocolGuid,\r
+               &HttpInstance->Tcp4ChildHandle\r
+               );\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
 \r
-  ASSERT ((HttpSb != NULL) && (HttpInstance != NULL));\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Tcp4ChildHandle,\r
+                    &gEfiTcp4ProtocolGuid,\r
+                    (VOID **) &Interface,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Service->ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                    );\r
+                    \r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
 \r
-  HttpInstance->Signature = HTTP_PROTOCOL_SIGNATURE;\r
-  CopyMem (&HttpInstance->Http, &mEfiHttpTemplate, sizeof (HttpInstance->Http));\r
-  HttpInstance->Service = HttpSb;\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Tcp4ChildHandle,\r
+                    &gEfiTcp4ProtocolGuid,\r
+                    (VOID **) &HttpInstance->Tcp4,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Handle,\r
+                    EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                    );\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
 \r
-  //\r
-  // Create TCP child.\r
-  //\r
-  Status = NetLibCreateServiceChild (\r
-             HttpInstance->Service->ControllerHandle,\r
-             HttpInstance->Service->ImageHandle,\r
-             &gEfiTcp4ServiceBindingProtocolGuid,\r
-             &HttpInstance->TcpChildHandle\r
-             );\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Service->Tcp4ChildHandle,\r
+                    &gEfiTcp4ProtocolGuid,\r
+                    (VOID **) &Interface,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Handle,\r
+                    EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                    );\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+  } else {\r
+    //\r
+    // Create TCP6 Child.\r
+    //\r
+    Status = NetLibCreateServiceChild (\r
+               HttpInstance->Service->ControllerHandle,\r
+               HttpInstance->Service->ImageHandle,\r
+               &gEfiTcp6ServiceBindingProtocolGuid,\r
+               &HttpInstance->Tcp6ChildHandle\r
+               );\r
 \r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
 \r
-  Status = gBS->OpenProtocol (\r
-                  HttpInstance->TcpChildHandle,\r
-                  &gEfiTcp4ProtocolGuid,\r
-                  (VOID **) &Interface,\r
-                  HttpInstance->Service->ImageHandle,\r
-                  HttpInstance->Service->ControllerHandle,\r
-                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                  );\r
-                  \r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Tcp6ChildHandle,\r
+                    &gEfiTcp6ProtocolGuid,\r
+                    (VOID **) &Interface,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Service->ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                    );\r
+    \r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Tcp6ChildHandle,\r
+                    &gEfiTcp6ProtocolGuid,\r
+                    (VOID **) &HttpInstance->Tcp6,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Handle,\r
+                    EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                    );\r
+    \r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }      \r
+\r
+    Status = gBS->OpenProtocol (\r
+                    HttpInstance->Service->Tcp6ChildHandle,\r
+                    &gEfiTcp6ProtocolGuid,\r
+                    (VOID **) &Interface,\r
+                    HttpInstance->Service->ImageHandle,\r
+                    HttpInstance->Handle,\r
+                    EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                    );\r
 \r
-  Status = gBS->OpenProtocol (\r
-                  HttpInstance->TcpChildHandle,\r
-                  &gEfiTcp4ProtocolGuid,\r
-                  (VOID **) &HttpInstance->Tcp4,\r
-                  HttpInstance->Service->ImageHandle,\r
-                  HttpInstance->Handle,\r
-                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                  );\r
-  if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+  }\r
+  \r
+  HttpInstance->Url = AllocateZeroPool (HTTP_URL_BUFFER_LEN);\r
+  if (HttpInstance->Url == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
 \r
-  NetMapInit (&HttpInstance->TxTokens);\r
-  NetMapInit (&HttpInstance->RxTokens);\r
-\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   \r
-  if (HttpInstance->TcpChildHandle != NULL) {\r
+  if (HttpInstance->Tcp4ChildHandle != NULL) {\r
     gBS->CloseProtocol (\r
-           HttpInstance->TcpChildHandle,\r
+           HttpInstance->Tcp4ChildHandle,\r
            &gEfiTcp4ProtocolGuid,\r
            HttpInstance->Service->ImageHandle,\r
            HttpInstance->Service->ControllerHandle\r
            );\r
 \r
     gBS->CloseProtocol (\r
-           HttpInstance->TcpChildHandle,\r
+           HttpInstance->Tcp4ChildHandle,\r
            &gEfiTcp4ProtocolGuid,\r
            HttpInstance->Service->ImageHandle,\r
            HttpInstance->Handle\r
-           );\r
+           );    \r
     \r
     NetLibDestroyServiceChild (\r
       HttpInstance->Service->ControllerHandle,\r
       HttpInstance->Service->ImageHandle,\r
       &gEfiTcp4ServiceBindingProtocolGuid,\r
-      HttpInstance->TcpChildHandle\r
+      HttpInstance->Tcp4ChildHandle\r
+      );\r
+  }\r
+  \r
+  if (HttpInstance->Service->Tcp4ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Service->Tcp4ChildHandle,\r
+           &gEfiTcp4ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+  }\r
+  \r
+  if (HttpInstance->Tcp6ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Service->ControllerHandle\r
+           );\r
+\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+    \r
+    NetLibDestroyServiceChild (\r
+      HttpInstance->Service->ControllerHandle,\r
+      HttpInstance->Service->ImageHandle,\r
+      &gEfiTcp6ServiceBindingProtocolGuid,\r
+      HttpInstance->Tcp6ChildHandle\r
       );\r
   }\r
+  \r
+  if (HttpInstance->Service->Tcp6ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Service->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+  }\r
 \r
-  return Status;\r
+  return EFI_UNSUPPORTED;\r
   \r
 }\r
 \r
@@ -476,7 +814,7 @@ HttpCleanProtocol (
 {\r
   HttpCloseConnection (HttpInstance);\r
   \r
-  HttpCloseTcp4ConnCloseEvent (HttpInstance);\r
+  HttpCloseTcpConnCloseEvent (HttpInstance);\r
 \r
   if (HttpInstance->CacheBody != NULL) {\r
     FreePool (HttpInstance->CacheBody);\r
@@ -493,20 +831,25 @@ HttpCleanProtocol (
     HttpFreeMsgParser (HttpInstance->MsgParser);\r
     HttpInstance->MsgParser = NULL;\r
   }\r
-\r
+  \r
+  if (HttpInstance->Url != NULL) {\r
+    FreePool (HttpInstance->Url);\r
+    HttpInstance->Url = NULL;\r
+  }\r
+  \r
   NetMapClean (&HttpInstance->TxTokens);\r
   NetMapClean (&HttpInstance->RxTokens);\r
 \r
-  if (HttpInstance->TcpChildHandle != NULL) {\r
+  if (HttpInstance->Tcp4ChildHandle != NULL) {\r
     gBS->CloseProtocol (\r
-           HttpInstance->TcpChildHandle,\r
+           HttpInstance->Tcp4ChildHandle,\r
            &gEfiTcp4ProtocolGuid,\r
            HttpInstance->Service->ImageHandle,\r
            HttpInstance->Service->ControllerHandle\r
            );\r
 \r
     gBS->CloseProtocol (\r
-           HttpInstance->TcpChildHandle,\r
+           HttpInstance->Tcp4ChildHandle,\r
            &gEfiTcp4ProtocolGuid,\r
            HttpInstance->Service->ImageHandle,\r
            HttpInstance->Handle\r
@@ -516,9 +859,51 @@ HttpCleanProtocol (
       HttpInstance->Service->ControllerHandle,\r
       HttpInstance->Service->ImageHandle,\r
       &gEfiTcp4ServiceBindingProtocolGuid,\r
-      HttpInstance->TcpChildHandle\r
+      HttpInstance->Tcp4ChildHandle\r
+      );\r
+  }\r
+\r
+  if (HttpInstance->Service->Tcp4ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Service->Tcp4ChildHandle,\r
+           &gEfiTcp4ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+  }  \r
+\r
+  if (HttpInstance->Tcp6ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Service->ControllerHandle\r
+           );\r
+\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+    \r
+    NetLibDestroyServiceChild (\r
+      HttpInstance->Service->ControllerHandle,\r
+      HttpInstance->Service->ImageHandle,\r
+      &gEfiTcp6ServiceBindingProtocolGuid,\r
+      HttpInstance->Tcp6ChildHandle\r
       );\r
   }\r
+  \r
+  if (HttpInstance->Service->Tcp6ChildHandle != NULL) {\r
+    gBS->CloseProtocol (\r
+           HttpInstance->Service->Tcp6ChildHandle,\r
+           &gEfiTcp6ProtocolGuid,\r
+           HttpInstance->Service->ImageHandle,\r
+           HttpInstance->Handle\r
+           );\r
+  }\r
+  \r
 }\r
 \r
 /**\r
@@ -537,27 +922,40 @@ HttpCreateConnection (
 {\r
   EFI_STATUS                    Status;\r
 \r
-  //\r
-  // Create events for variuos asynchronous operations.\r
-  //\r
-  HttpInstance->IsConnDone = FALSE;\r
-\r
   //\r
   // Connect to Http server\r
   //\r
-  HttpInstance->ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
-  Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->ConnToken);\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));\r
-    return Status;\r
-  }\r
-\r
-  while (!HttpInstance->IsConnDone) {\r
-    HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
-  }\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    HttpInstance->IsTcp4ConnDone = FALSE;\r
+    HttpInstance->Tcp4ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
+    Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));\r
+      return Status;\r
+    }\r
+    \r
+    while (!HttpInstance->IsTcp4ConnDone) {\r
+      HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
+    }\r
+    \r
+    Status = HttpInstance->Tcp4ConnToken.CompletionToken.Status;\r
+    \r
+  } else {\r
+    HttpInstance->IsTcp6ConnDone = FALSE;\r
+    HttpInstance->Tcp6ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
+    Status = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));\r
+      return Status;\r
+    }\r
 \r
-  Status = HttpInstance->ConnToken.CompletionToken.Status;\r
+    while(!HttpInstance->IsTcp6ConnDone) {\r
+      HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
+    }\r
 \r
+    Status = HttpInstance->Tcp6ConnToken.CompletionToken.Status;   \r
+  }\r
+  \r
   if (!EFI_ERROR (Status)) {\r
     HttpInstance->State = HTTP_STATE_TCP_CONNECTED;\r
   }\r
@@ -581,21 +979,37 @@ HttpCloseConnection (
 {\r
   EFI_STATUS                Status;\r
 \r
-  HttpInstance->CloseToken.AbortOnClose = TRUE;\r
-  HttpInstance->IsCloseDone             = FALSE;\r
-  \r
+  if (HttpInstance->State == HTTP_STATE_TCP_CONNECTED) {\r
 \r
-  Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->CloseToken);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
+    if (HttpInstance->LocalAddressIsIPv6) {\r
+      HttpInstance->Tcp6CloseToken.AbortOnClose = TRUE;\r
+      HttpInstance->IsTcp6CloseDone             = FALSE;\r
+      Status = HttpInstance->Tcp6->Close (HttpInstance->Tcp6, &HttpInstance->Tcp6CloseToken);\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+\r
+      while (!HttpInstance->IsTcp6CloseDone) {\r
+        HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
+      }\r
+      \r
+    } else {\r
+      HttpInstance->Tcp4CloseToken.AbortOnClose = TRUE;\r
+      HttpInstance->IsTcp4CloseDone             = FALSE;\r
+      Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->Tcp4CloseToken);\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+\r
+      while (!HttpInstance->IsTcp4CloseDone) {\r
+        HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
+      }\r
+    }\r
 \r
-  while (!HttpInstance->IsCloseDone) {\r
-    HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
   }\r
 \r
   HttpInstance->State = HTTP_STATE_TCP_CLOSED;\r
-  return Status;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -618,10 +1032,8 @@ HttpConfigureTcp4 (
   EFI_TCP4_CONFIG_DATA       *Tcp4CfgData;\r
   EFI_TCP4_ACCESS_POINT      *Tcp4AP;\r
   EFI_TCP4_OPTION            *Tcp4Option;\r
-  HTTP_TCP_TOKEN_WRAP        *TcpWrap;\r
 \r
   ASSERT (HttpInstance != NULL);\r
-  TcpWrap = &Wrap->TcpWrap;\r
 \r
 \r
   Tcp4CfgData = &HttpInstance->Tcp4CfgData;\r
@@ -662,12 +1074,82 @@ HttpConfigureTcp4 (
     return Status;\r
   }\r
 \r
-  Status = HttpCreateTcp4ConnCloseEvent (HttpInstance);\r
+  Status = HttpCreateTcpConnCloseEvent (HttpInstance);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  Status = HttpCreateTcpTxEvent (Wrap);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  HttpInstance->State = HTTP_STATE_TCP_CONFIGED;\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  Configure TCP6 protocol child.\r
+\r
+  @param[in]  HttpInstance       The HTTP instance private data.\r
+  @param[in]  Wrap               The HTTP token's wrap data.\r
+\r
+  @retval EFI_SUCCESS            The TCP6 protocol child is configured.\r
+  @retval Others                 Other error as indicated.\r
+\r
+**/\r
+EFI_STATUS\r
+HttpConfigureTcp6 (\r
+  IN  HTTP_PROTOCOL        *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  )\r
+{\r
+  EFI_STATUS               Status;\r
+  EFI_TCP6_CONFIG_DATA     *Tcp6CfgData;\r
+  EFI_TCP6_ACCESS_POINT    *Tcp6Ap;\r
+  EFI_TCP6_OPTION          *Tcp6Option;\r
+  \r
+  ASSERT (HttpInstance != NULL);\r
+  \r
+  Tcp6CfgData = &HttpInstance->Tcp6CfgData;\r
+  ZeroMem (Tcp6CfgData, sizeof (EFI_TCP6_CONFIG_DATA));\r
+\r
+  Tcp6CfgData->TrafficClass  = 0;\r
+  Tcp6CfgData->HopLimit      = 255;\r
+  Tcp6CfgData->ControlOption = &HttpInstance->Tcp6Option;\r
+  \r
+  Tcp6Ap  = &Tcp6CfgData->AccessPoint;\r
+  Tcp6Ap->ActiveFlag  = TRUE;\r
+  Tcp6Ap->StationPort = HttpInstance->Ipv6Node.LocalPort;\r
+  Tcp6Ap->RemotePort  = HttpInstance->RemotePort;\r
+  IP6_COPY_ADDRESS (&Tcp6Ap->StationAddress, &HttpInstance->Ipv6Node.LocalAddress);\r
+  IP6_COPY_ADDRESS (&Tcp6Ap->RemoteAddress , &HttpInstance->RemoteIpv6Addr);\r
+\r
+  Tcp6Option = Tcp6CfgData->ControlOption;\r
+  Tcp6Option->ReceiveBufferSize  = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->SendBufferSize     = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->MaxSynBackLog      = HTTP_MAX_SYN_BACK_LOG;\r
+  Tcp6Option->ConnectionTimeout  = HTTP_CONNECTION_TIMEOUT;\r
+  Tcp6Option->DataRetries        = HTTP_DATA_RETRIES;\r
+  Tcp6Option->FinTimeout         = HTTP_FIN_TIMEOUT;\r
+  Tcp6Option->KeepAliveProbes    = HTTP_KEEP_ALIVE_PROBES;\r
+  Tcp6Option->KeepAliveTime      = HTTP_KEEP_ALIVE_TIME;\r
+  Tcp6Option->KeepAliveInterval  = HTTP_KEEP_ALIVE_INTERVAL;\r
+  Tcp6Option->EnableNagle        = TRUE;\r
+\r
+  Status = HttpInstance->Tcp6->Configure (HttpInstance->Tcp6, Tcp6CfgData);\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((EFI_D_ERROR, "HttpConfigureTcp6 - %r\n", Status));\r
+    return Status;\r
+  }\r
+  \r
+  Status = HttpCreateTcpConnCloseEvent (HttpInstance);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = HttpCreateTcp4TxEvent (Wrap);\r
+  Status = HttpCreateTcpTxEvent (Wrap);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -675,10 +1157,11 @@ HttpConfigureTcp4 (
   HttpInstance->State = HTTP_STATE_TCP_CONFIGED;\r
 \r
   return EFI_SUCCESS;\r
\r
 }\r
 \r
 /**\r
-  Check existing TCP connection, if in error state, receover TCP4 connection.\r
+  Check existing TCP connection, if in error state, recover TCP4 connection.\r
 \r
   @param[in]  HttpInstance       The HTTP instance private data.\r
 \r
@@ -696,7 +1179,7 @@ HttpConnectTcp4 (
   EFI_TCP4_CONNECTION_STATE Tcp4State;\r
 \r
 \r
-  if (HttpInstance->State != HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp4 == NULL) {\r
+  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp4 == NULL) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
@@ -713,15 +1196,125 @@ HttpConnectTcp4 (
     return Status;\r
   }\r
 \r
-  if (Tcp4State > Tcp4StateEstablished) {\r
+  if (Tcp4State == Tcp4StateEstablished) {\r
+    return EFI_SUCCESS;\r
+  } else if (Tcp4State > Tcp4StateEstablished ) {\r
     HttpCloseConnection(HttpInstance);\r
-  }  \r
+  }\r
+\r
+  return HttpCreateConnection (HttpInstance);\r
+}\r
+\r
+/**\r
+  Check existing TCP connection, if in error state, recover TCP6 connection.\r
+\r
+  @param[in]  HttpInstance       The HTTP instance private data.\r
+\r
+  @retval EFI_SUCCESS            The TCP connection is established.\r
+  @retval EFI_NOT_READY          TCP6 protocol child is not created or configured.\r
+  @retval Others                 Other error as indicated.\r
+\r
+**/\r
+EFI_STATUS\r
+HttpConnectTcp6 (\r
+  IN  HTTP_PROTOCOL        *HttpInstance\r
+  )\r
+{\r
+  EFI_STATUS                Status;\r
+  EFI_TCP6_CONNECTION_STATE Tcp6State;\r
+\r
+  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp6 == NULL) {\r
+    return EFI_NOT_READY;\r
+  }\r
+\r
+  Status = HttpInstance->Tcp6->GetModeData (\r
+                                 HttpInstance->Tcp6,\r
+                                 &Tcp6State,\r
+                                 NULL,\r
+                                 NULL,\r
+                                 NULL,\r
+                                 NULL\r
+                                 );\r
+  \r
+  if (EFI_ERROR(Status)){\r
+     DEBUG ((EFI_D_ERROR, "Tcp6 GetModeData fail - %x\n", Status));\r
+     return Status;\r
+  }\r
+\r
+  if (Tcp6State == Tcp6StateEstablished) {\r
+    return EFI_SUCCESS;\r
+  } else if (Tcp6State > Tcp6StateEstablished ) {\r
+    HttpCloseConnection(HttpInstance);\r
+  }\r
 \r
   return HttpCreateConnection (HttpInstance);\r
 }\r
 \r
 /**\r
-  Send the HTTP message through TCP4.\r
+  Initialize TCP related data.\r
+\r
+  @param[in]  HttpInstance       The HTTP instance private data.\r
+  @param[in]  Wrap               The HTTP token's wrap data.\r
+  @param[in]  Configure          The Flag indicates whether the first time to initialize Tcp.\r
+\r
+  @retval EFI_SUCCESS            The initialization of TCP instance is done. \r
+  @retval Others                 Other error as indicated.\r
+\r
+**/\r
+EFI_STATUS\r
+HttpInitTcp (\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap,\r
+  IN  BOOLEAN          Configure\r
+  )\r
+{\r
+  EFI_STATUS           Status;\r
+  ASSERT (HttpInstance != NULL);\r
+\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    //\r
+    // Configure TCP instance.\r
+    //\r
+    if (Configure) {\r
+      Status = HttpConfigureTcp4 (HttpInstance, Wrap);\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+    }\r
+\r
+    //\r
+    // Connect TCP.\r
+    //\r
+    Status = HttpConnectTcp4 (HttpInstance);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+  } else {\r
+    //\r
+    // Configure TCP instance.\r
+    //\r
+    if (Configure) {\r
+      Status = HttpConfigureTcp6 (HttpInstance, Wrap);\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+    }\r
+\r
+    //\r
+    // Connect TCP.\r
+    //\r
+    Status = HttpConnectTcp6 (HttpInstance);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+  }\r
+  \r
+  return EFI_SUCCESS;\r
+  \r
+}\r
+\r
+/**\r
+  Send the HTTP message through TCP4 or TCP6.\r
 \r
   @param[in]  HttpInstance       The HTTP instance private data.\r
   @param[in]  Wrap               The HTTP token's wrap data.\r
@@ -733,7 +1326,7 @@ HttpConnectTcp4 (
 \r
 **/\r
 EFI_STATUS\r
-HttpTransmitTcp4 (\r
+HttpTransmitTcp (\r
   IN  HTTP_PROTOCOL    *HttpInstance,\r
   IN  HTTP_TOKEN_WRAP  *Wrap,\r
   IN  UINT8            *TxString,\r
@@ -741,23 +1334,44 @@ HttpTransmitTcp4 (
   )\r
 {\r
   EFI_STATUS                    Status;\r
-  EFI_TCP4_IO_TOKEN             *TxToken;\r
+  EFI_TCP4_IO_TOKEN             *Tx4Token;\r
   EFI_TCP4_PROTOCOL             *Tcp4;\r
+  EFI_TCP6_IO_TOKEN             *Tx6Token;\r
+  EFI_TCP6_PROTOCOL             *Tcp6;\r
   \r
-  Tcp4 = HttpInstance->Tcp4;\r
-  TxToken = &Wrap->TcpWrap.TxToken;\r
+  if (!HttpInstance->LocalAddressIsIPv6) {     \r
+    Tcp4 = HttpInstance->Tcp4;\r
+    Tx4Token = &Wrap->TcpWrap.Tx4Token;\r
+    \r
+    Tx4Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
+    Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
+    Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+    Tx4Token->CompletionToken.Status = EFI_NOT_READY;  \r
+    \r
+    Wrap->TcpWrap.IsTxDone = FALSE;\r
+    Status  = Tcp4->Transmit (Tcp4, Tx4Token);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));\r
+      return Status;\r
+    }\r
 \r
-  TxToken->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
-  TxToken->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
-  TxToken->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
-  TxToken->CompletionToken.Status = EFI_NOT_READY;  \r
+  } else {\r
+    Tcp6 = HttpInstance->Tcp6;\r
+    Tx6Token = &Wrap->TcpWrap.Tx6Token;\r
 \r
-  Wrap->TcpWrap.IsTxDone = FALSE;\r
-  Status  = Tcp4->Transmit (Tcp4, TxToken);\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));\r
-    return Status;\r
+    Tx6Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
+    Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
+    Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+    Tx6Token->CompletionToken.Status = EFI_NOT_READY;\r
+\r
+    Wrap->TcpWrap.IsTxDone = FALSE;\r
+    Status = Tcp6->Transmit (Tcp6, Tx6Token);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));\r
+      return Status;\r
+    }\r
   }\r
+  \r
 \r
   return Status;\r
 }\r
@@ -840,7 +1454,7 @@ HttpMappingToStatusCode (
   case 414:\r
     return HTTP_STATUS_414_REQUEST_URI_TOO_LARGE;\r
   case 415:\r
-    return HTTP_STATUS_415_UNSUPPORETD_MEDIA_TYPE;\r
+    return HTTP_STATUS_415_UNSUPPORTED_MEDIA_TYPE;\r
   case 416:\r
     return HTTP_STATUS_416_REQUESTED_RANGE_NOT_SATISFIED;\r
   case 417:\r
@@ -848,7 +1462,7 @@ HttpMappingToStatusCode (
   case 500:\r
     return HTTP_STATUS_500_INTERNAL_SERVER_ERROR;\r
   case 501:\r
-    return HTTP_STATUS_501_NOT_IMIPLEMENTED;\r
+    return HTTP_STATUS_501_NOT_IMPLEMENTED;\r
   case 502:\r
     return HTTP_STATUS_502_BAD_GATEWAY;\r
   case 503:\r
@@ -865,7 +1479,7 @@ HttpMappingToStatusCode (
 \r
 /**\r
   Check whether the user's token or event has already\r
-  been enqueue on HTTP TxToken or RxToken list.\r
+  been enqueue on HTTP Tx or Rx Token list.\r
 \r
   @param[in]  Map                The container of either user's transmit or receive\r
                                  token.\r
@@ -899,9 +1513,9 @@ HttpTokenExist (
 }\r
 \r
 /**\r
-  Check whether the HTTP message associated with TxToken is already sent out.\r
+  Check whether the HTTP message associated with Tx4Token or Tx6Token is already sent out.\r
 \r
-  @param[in]  Map                The container of TxToken.\r
+  @param[in]  Map                The container of Tx4Token or Tx6Token.\r
   @param[in]  Item               Current item to check against.\r
   @param[in]  Context            The Token to check againist.\r
 \r
@@ -931,7 +1545,7 @@ HttpTcpNotReady (
 /**\r
   Transmit the HTTP mssage by processing the associated HTTP token.\r
 \r
-  @param[in]  Map                The container of TxToken.\r
+  @param[in]  Map                The container of Tx4Token or Tx6Token.\r
   @param[in]  Item               Current item to check against.\r
   @param[in]  Context            The Token to check againist.\r
 \r
@@ -984,7 +1598,7 @@ HttpTcpTransmit (
   //\r
   // Transmit the request message.\r
   //\r
-  Status = HttpTransmitTcp4 (\r
+  Status = HttpTransmitTcp (\r
              ValueInItem->HttpInstance,\r
              ValueInItem,\r
              (UINT8*) RequestStr,\r
@@ -997,7 +1611,7 @@ HttpTcpTransmit (
 /**\r
   Receive the HTTP response by processing the associated HTTP token.\r
 \r
-  @param[in]  Map                The container of RxToken.\r
+  @param[in]  Map                The container of Rx4Token or Rx6Token.\r
   @param[in]  Item               Current item to check against.\r
   @param[in]  Context            The Token to check againist.\r
 \r
@@ -1020,6 +1634,319 @@ HttpTcpReceive (
   return HttpResponseWorker ((HTTP_TOKEN_WRAP *) Item->Value);\r
 }\r
 \r
+/**\r
+  Receive the HTTP header by processing the associated HTTP token.\r
+\r
+  @param[in]       HttpInstance     The HTTP instance private data.\r
+  @param[in, out]  SizeofHeaders    The HTTP header length.\r
+  @param[in, out]  BufferSize       The size of buffer to cacahe the header message.\r
+  \r
+  @retval EFI_SUCCESS               The HTTP header is received.                          \r
+  @retval Others                    Other errors as indicated.\r
+\r
+**/\r
+EFI_STATUS\r
+HttpTcpReceiveHeader (\r
+  IN  HTTP_PROTOCOL         *HttpInstance,\r
+  IN  OUT UINTN             *SizeofHeaders,\r
+  IN  OUT UINTN             *BufferSize\r
+  )\r
+{\r
+  EFI_STATUS                    Status;\r
+  EFI_TCP4_IO_TOKEN             *Rx4Token;\r
+  EFI_TCP4_PROTOCOL             *Tcp4;\r
+  EFI_TCP6_IO_TOKEN             *Rx6Token;\r
+  EFI_TCP6_PROTOCOL             *Tcp6;\r
+  CHAR8                         **EndofHeader;\r
+  CHAR8                         **HttpHeaders;\r
+  CHAR8                         *Buffer;\r
+\r
+  ASSERT (HttpInstance != NULL);\r
+\r
+  EndofHeader = HttpInstance->EndofHeader;\r
+  HttpHeaders = HttpInstance->HttpHeaders;\r
+  Tcp4 = HttpInstance->Tcp4;\r
+  Tcp6 = HttpInstance->Tcp6;\r
+  Buffer      = NULL;\r
+  Rx4Token    = NULL;\r
+  Rx6Token    = NULL;\r
+  \r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    ASSERT (Tcp6 != NULL);\r
+  } else {\r
+    ASSERT (Tcp4 != NULL);\r
+  }\r
+\r
+  if (!HttpInstance->LocalAddressIsIPv6) {\r
+    Rx4Token = &HttpInstance->Rx4Token;\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
+    if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      return Status;\r
+    }\r
+  \r
+    //\r
+    // Receive the HTTP headers only when EFI_HTTP_RESPONSE_DATA is not NULL.\r
+    //\r
+    while (*EndofHeader == NULL) {   \r
+      HttpInstance->IsRxDone = FALSE;\r
+      Rx4Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+      Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
+      Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));\r
+        return Status;\r
+      }\r
+      \r
+      while (!HttpInstance->IsRxDone) {\r
+       Tcp4->Poll (Tcp4);\r
+      }    \r
+  \r
+      Status = Rx4Token->CompletionToken.Status;\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+  \r
+      //\r
+      // Append the response string.\r
+      //\r
+      *BufferSize = (*SizeofHeaders) + Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
+      Buffer      = AllocateZeroPool (*BufferSize);\r
+      if (Buffer == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        return Status;\r
+      }\r
+  \r
+      if (*HttpHeaders != NULL) {\r
+        CopyMem (Buffer, *HttpHeaders, (*SizeofHeaders));\r
+        FreePool (*HttpHeaders);\r
+      }\r
+  \r
+      CopyMem (\r
+        Buffer + (*SizeofHeaders),\r
+        Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer,\r
+        Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength\r
+        );\r
+      *HttpHeaders    = Buffer;\r
+      *SizeofHeaders  = *BufferSize;\r
+  \r
+      //\r
+      // Check whether we received end of HTTP headers.\r
+      //\r
+      *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR); \r
+    }\r
+    FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
+    \r
+  } else {\r
+    Rx6Token = &HttpInstance->Rx6Token;\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
+    if (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      return Status;\r
+    }\r
+  \r
+    //\r
+    // Receive the HTTP headers only when EFI_HTTP_RESPONSE_DATA is not NULL.\r
+    //\r
+    while (*EndofHeader == NULL) {   \r
+      HttpInstance->IsRxDone = FALSE;\r
+      Rx6Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+      Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
+      Status = Tcp6->Receive (Tcp6, Rx6Token);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));\r
+        return Status;\r
+      }\r
+      \r
+      while (!HttpInstance->IsRxDone) {\r
+       Tcp6->Poll (Tcp6);\r
+      }    \r
+  \r
+      Status = Rx6Token->CompletionToken.Status;\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+  \r
+      //\r
+      // Append the response string.\r
+      //\r
+      *BufferSize = (*SizeofHeaders) + Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
+      Buffer      = AllocateZeroPool (*BufferSize);\r
+      if (Buffer == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        return Status;\r
+      }\r
+  \r
+      if (*HttpHeaders != NULL) {\r
+        CopyMem (Buffer, *HttpHeaders, (*SizeofHeaders));\r
+        FreePool (*HttpHeaders);\r
+      }\r
+  \r
+      CopyMem (\r
+        Buffer + (*SizeofHeaders),\r
+        Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer,\r
+        Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength\r
+        );\r
+      *HttpHeaders     = Buffer;\r
+      *SizeofHeaders  = *BufferSize;\r
+  \r
+      //\r
+      // Check whether we received end of HTTP headers.\r
+      //\r
+      *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR);\r
+  \r
+    }\r
+    FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;    \r
+  }     \r
+\r
+  //\r
+  // Skip the CRLF after the HTTP headers.\r
+  //\r
+  *EndofHeader = *EndofHeader + AsciiStrLen (HTTP_END_OF_HDR_STR);  \r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  Receive the HTTP body by processing the associated HTTP token.\r
+\r
+  @param[in]  Wrap               The HTTP token's wrap data.\r
+  @param[in]  HttpMsg            The HTTP message data.\r
+\r
+  @retval EFI_SUCCESS            The HTTP body is received.                          \r
+  @retval Others                 Other error as indicated.\r
+\r
+**/\r
+EFI_STATUS\r
+HttpTcpReceiveBody (\r
+  IN  HTTP_TOKEN_WRAP       *Wrap,\r
+  IN  EFI_HTTP_MESSAGE      *HttpMsg\r
+  )\r
+{\r
+  EFI_STATUS                Status;\r
+  HTTP_PROTOCOL             *HttpInstance;\r
+  EFI_TCP6_PROTOCOL         *Tcp6;\r
+  EFI_TCP6_IO_TOKEN         *Rx6Token;\r
+  EFI_TCP4_PROTOCOL         *Tcp4;\r
+  EFI_TCP4_IO_TOKEN         *Rx4Token;\r
+  \r
+  HttpInstance   = Wrap->HttpInstance;\r
+  Tcp4 = HttpInstance->Tcp4;\r
+  Tcp6 = HttpInstance->Tcp6;\r
+  Rx4Token       = NULL;\r
+  Rx6Token       = NULL;\r
+\r
+  \r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    ASSERT (Tcp6 != NULL);\r
+  } else {\r
+    ASSERT (Tcp4 != NULL);\r
+  }\r
+  \r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
+    Rx6Token ->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;\r
+    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) HttpMsg->BodyLength;\r
+    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
+    Rx6Token->CompletionToken.Status = EFI_NOT_READY;\r
+\r
+    Status = Tcp6->Receive (Tcp6, Rx6Token);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));\r
+      return Status;\r
+    }\r
+      \r
+  } else {\r
+    Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
+    Rx4Token->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) HttpMsg->BodyLength;\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
+    \r
+    Rx4Token->CompletionToken.Status = EFI_NOT_READY;\r
+    Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));\r
+      return Status;\r
+    }\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+\r
+}\r
+\r
+/**\r
+  Clean up Tcp Tokens while the Tcp transmission error occurs.\r
+\r
+  @param[in]  Wrap               Pointer to HTTP token's wrap data.\r
+  \r
+**/\r
+VOID\r
+HttpTcpTokenCleanup (\r
+  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  )\r
+{ \r
+  HTTP_PROTOCOL            *HttpInstance;\r
+  EFI_TCP4_IO_TOKEN        *Rx4Token;\r
+  EFI_TCP6_IO_TOKEN        *Rx6Token;\r
+\r
+  HttpInstance   = Wrap->HttpInstance;\r
+  Rx4Token       = NULL;\r
+  Rx6Token       = NULL;\r
+  \r
+  if (HttpInstance->LocalAddressIsIPv6) {\r
+    if (Wrap != NULL) {\r
+      if (Wrap->TcpWrap.Rx6Token.CompletionToken.Event != NULL) {\r
+        gBS->CloseEvent (Wrap->TcpWrap.Rx6Token.CompletionToken.Event);\r
+      }\r
+\r
+      Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
+      if (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+        FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+        Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
+      }\r
+      FreePool (Wrap); \r
+    }\r
+\r
+    if (HttpInstance->Rx6Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (HttpInstance->Rx6Token.CompletionToken.Event);\r
+      HttpInstance->Rx6Token.CompletionToken.Event = NULL;\r
+    }\r
+\r
+    Rx6Token = &HttpInstance->Rx6Token;\r
+    if (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+      FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+      Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
+    }\r
+    \r
+  } else {\r
+    if (Wrap != NULL) {\r
+      if (Wrap->TcpWrap.Rx4Token.CompletionToken.Event != NULL) {\r
+        gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);\r
+      }\r
+      Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
+      if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+        FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+        Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
+      }\r
+      FreePool (Wrap);\r
+    }\r
+    \r
+    if (HttpInstance->Rx4Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (HttpInstance->Rx4Token.CompletionToken.Event);\r
+      HttpInstance->Rx4Token.CompletionToken.Event = NULL;\r
+    }\r
+    \r
+    Rx4Token = &HttpInstance->Rx4Token;\r
+    if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+      FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
+      Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
+    }\r
+  }\r
+\r
+}\r
+\r
 /**\r
   Generate HTTP request string.\r
 \r