Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103761

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• NetworkPkg/Dhcp6Dxe/ComponentName.c (modified) (4 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c (modified) (19 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Driver.h (modified) (2 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf (modified) (3 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c (modified) (9 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h (modified) (6 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Io.c (modified) (33 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Io.h (modified) (2 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c (modified) (22 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Utility.h (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/ComponentName.c

@@ -2 +2 @@
   UEFI Component Name(2) protocol implementation for Dhcp6 driver.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -173 +173 @@
 };
 
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE   *gDhcp6ControllerNameTable = NULL;
+
+CHAR16 *mDhcp6ControllerName[] = {
+  L"DHCPv6 (State=0, Init)",
+  L"DHCPv6 (State=1, Selecting)",
+  L"DHCPv6 (State=2, Requesting)",
+  L"DHCPv6 (State=3, Declining)",
+  L"DHCPv6 (State=4, Confirming)",
+  L"DHCPv6 (State=5, Releasing)",
+  L"DHCPv6 (State=6, Bound)",
+  L"DHCPv6 (State=7, Renewing)",
+  L"DHCPv6 (State=8, Rebinding)"
+};
 
 /**
@@ -230 +243 @@
 }
 
+/**
+  Update the component name for the Dhcp6 child handle.
+
+  @param  Dhcp6[in]                   A pointer to the EFI_DHCP6_PROTOCOL.
+
+  
+  @retval EFI_SUCCESS                 Update the ControllerNameTable of this instance successfully.
+  @retval EFI_INVALID_PARAMETER       The input parameter is invalid.
+  
+**/
+EFI_STATUS
+UpdateName (
+  IN   EFI_DHCP6_PROTOCOL             *Dhcp6
+  )
+{
+  EFI_STATUS                       Status;
+  EFI_DHCP6_MODE_DATA              Dhcp6ModeData;
+  CHAR16                           *HandleName;
+
+  if (Dhcp6 == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  //
+  // Format the child name into the string buffer.
+  //
+  Status = Dhcp6->GetModeData (Dhcp6, &Dhcp6ModeData, NULL);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  
+  if (gDhcp6ControllerNameTable != NULL) {
+    FreeUnicodeStringTable (gDhcp6ControllerNameTable);
+    gDhcp6ControllerNameTable = NULL;
+  }
+  
+  if (Dhcp6ModeData.Ia == NULL) {
+    HandleName = L"DHCPv6 (No configured IA)";
+  } else {
+    if (Dhcp6ModeData.Ia->State > Dhcp6Rebinding) {
+      return EFI_DEVICE_ERROR;
+    }
+    HandleName = mDhcp6ControllerName[Dhcp6ModeData.Ia->State];
+  }
+  
+  Status = AddUnicodeString2 (
+             "eng",
+             gDhcp6ComponentName.SupportedLanguages,
+             &gDhcp6ControllerNameTable,
+             HandleName,
+             TRUE
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  
+  return AddUnicodeString2 (
+           "en",
+           gDhcp6ComponentName2.SupportedLanguages,
+           &gDhcp6ControllerNameTable,
+           HandleName,
+           FALSE
+           );
+}
 
 /**
@@ -309 +386 @@
   )
 {
-  return EFI_UNSUPPORTED;
+  EFI_STATUS                    Status;
+  EFI_DHCP6_PROTOCOL            *Dhcp6;
+
+  //
+  // Only provide names for child handles.
+  //
+  if (ChildHandle == NULL) {
+    return EFI_UNSUPPORTED;
+  }
+  
+  // 
+  // Make sure this driver produced ChildHandle 
+  // 
+  Status = EfiTestChildHandle (
+             ControllerHandle,
+             ChildHandle, 
+             &gEfiUdp6ProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Retrieve an instance of a produced protocol from ChildHandle
+  //
+  Status = gBS->OpenProtocol (
+                  ChildHandle,
+                  &gEfiDhcp6ProtocolGuid,
+                  (VOID **)&Dhcp6, 
+                  NULL,
+                  NULL,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Update the component name for this child handle.
+  //
+  Status = UpdateName (Dhcp6);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  return LookupUnicodeString2 (
+           Language,
+           This->SupportedLanguages,
+           gDhcp6ControllerNameTable,
+           ControllerName,
+           (BOOLEAN)(This == &gDhcp6ComponentName)
+           );
 }
+

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c

@@ -3 +3 @@
   implementationfor for Dhcp6 Driver.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -32 +32 @@
 };
 
-
 /**
   Configure the default Udp6Io to receive all the DHCP6 traffic
@@ -83 +82 @@
 
 /**
-  Destory the Dhcp6 service. The Dhcp6 service may be partly initialized,
+  Destroy the Dhcp6 service. The Dhcp6 service may be partly initialized,
   or partly destroyed. If a resource is destroyed, it is marked as such in
   case the destroy failed and being called again later.
@@ -96 +95 @@
 {
   //
-  // All children instances should have been already destoryed here.
+  // All children instances should have been already destroyed here.
   //
   ASSERT (Service->NumOfChild == 0);
@@ -133 +132 @@
 {
   DHCP6_SERVICE             *Dhcp6Srv;
+  EFI_STATUS                Status;
 
   *Service = NULL;
@@ -155 +155 @@
   //
   Dhcp6Srv->Signature       = DHCP6_SERVICE_SIGNATURE;
-  Dhcp6Srv->InDestory       = FALSE;
   Dhcp6Srv->Controller      = Controller;
   Dhcp6Srv->Image           = ImageHandle;
@@ -165 +164 @@
     sizeof (EFI_SERVICE_BINDING_PROTOCOL)
     );
+
+  //
+  // Locate Ip6->Ip6Config and store it for get IP6 Duplicate Address Detection transmits.
+  //
+  Status = gBS->HandleProtocol (
+                  Controller,
+                  &gEfiIp6ConfigProtocolGuid,
+                  (VOID **) &Dhcp6Srv->Ip6Cfg
+                  );
+  if (EFI_ERROR (Status)) {
+    FreePool (Dhcp6Srv);
+    return Status;
+  }
 
   //
@@ -281 +293 @@
   Dhcp6Ins->UdpSts          = EFI_ALREADY_STARTED;
   Dhcp6Ins->Service         = Service;
-  Dhcp6Ins->InDestory       = FALSE;
+  Dhcp6Ins->InDestroy       = FALSE;
   Dhcp6Ins->MediaPresent    = TRUE;
 
@@ -313 +325 @@
 
   return EFI_SUCCESS;
+}
+
+/**
+  Callback function which provided by user to remove one node in NetDestroyLinkList process.
+  
+  @param[in]    Entry           The entry to be removed.
+  @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
+
+  @retval EFI_SUCCESS           The entry has been removed successfully.
+  @retval Others                Fail to remove the entry.
+
+**/
+EFI_STATUS
+EFIAPI
+Dhcp6DestroyChildEntry (
+  IN LIST_ENTRY         *Entry,
+  IN VOID               *Context
+  )
+{
+  DHCP6_INSTANCE                   *Instance;
+  EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;
+
+  if (Entry == NULL || Context == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Instance = NET_LIST_USER_STRUCT_S (Entry, DHCP6_INSTANCE, Link, DHCP6_INSTANCE_SIGNATURE);
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;
+  
+  return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
 }
 
@@ -485 +527 @@
 {
   EFI_STATUS                       Status;
-  EFI_TPL                          OldTpl;
   EFI_HANDLE                       NicHandle;
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;
   DHCP6_SERVICE                    *Service;
-  DHCP6_INSTANCE                   *Instance;
+  LIST_ENTRY                       *List;
+  UINTN                            ListLength;
 
   //
@@ -497 +539 @@
 
   if (NicHandle == NULL) {
-    return EFI_DEVICE_ERROR;
+    return EFI_SUCCESS;
   }
 
@@ -514 +556 @@
 
   Service = DHCP6_SERVICE_FROM_THIS (ServiceBinding);
-
-  if (Service->InDestory) {
-    return EFI_SUCCESS;
-  }
-
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
-
-  if (NumberOfChildren == 0) {
+  if (!IsListEmpty (&Service->Child)) {
     //
-    // Destory the service itself if no child instance left.
+    // Destroy all the children instances before destory the service.
+    //  
+    List = &Service->Child;
+    Status = NetDestroyLinkList (
+               List,
+               Dhcp6DestroyChildEntry,
+               ServiceBinding,
+               &ListLength
+               );
+    if (EFI_ERROR (Status) || ListLength != 0) {
+      Status = EFI_DEVICE_ERROR;
+    }
+  }
+
+  if (NumberOfChildren == 0 && !IsListEmpty (&Service->Child)) {
+    Status = EFI_DEVICE_ERROR;
+  }
+
+  if (NumberOfChildren == 0 && IsListEmpty (&Service->Child)) {
     //
-    Service->InDestory = TRUE;
-
+    // Destroy the service itself if no child instance left.
+    //
     Status = gBS->UninstallProtocolInterface (
                     NicHandle,
@@ -532 +585 @@
                     ServiceBinding
                     );
-
     if (EFI_ERROR (Status)) {
-      Service->InDestory = FALSE;
       goto ON_EXIT;
     }
 
     Dhcp6DestroyService (Service);
-
-  } else {
-    //
-    // Destory all the children instances before destory the service.
-    //
-    while (!IsListEmpty (&Service->Child)) {
-      Instance = NET_LIST_HEAD (&Service->Child, DHCP6_INSTANCE, Link);
-      ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
-    }
-    //
-    // Any of child failed to be destroyed.
-    //
-    if (Service->NumOfChild != 0) {
-      Status = EFI_DEVICE_ERROR;
-    }
-  }
-
+    Status = EFI_SUCCESS;
+  }
+  
 ON_EXIT:
-  gBS->RestoreTPL (OldTpl);
   return Status;
 }
@@ -734 +770 @@
   }
 
-  if (Instance->InDestory) {
+  if (Instance->InDestroy) {
     return EFI_SUCCESS;
   }
@@ -740 +776 @@
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
 
-  Instance->InDestory = TRUE;
+  Instance->InDestroy = TRUE;
 
   Status = gBS->CloseProtocol (
@@ -750 +786 @@
 
   if (EFI_ERROR (Status)) {
-    Instance->InDestory = FALSE;
+    Instance->InDestroy = FALSE;
     gBS->RestoreTPL (OldTpl);
     return Status;
@@ -758 +794 @@
   // Uninstall the MTFTP6 protocol first to enable a top down destruction.
   //
+  gBS->RestoreTPL (OldTpl);
   Status = gBS->UninstallProtocolInterface (
                   ChildHandle,
@@ -763 +800 @@
                   Dhcp6
                   );
-
-  if (EFI_ERROR (Status)) {
-    Instance->InDestory = FALSE;
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+  if (EFI_ERROR (Status)) {
+    Instance->InDestroy = FALSE;
     gBS->RestoreTPL (OldTpl);
     return Status;
@@ -776 +813 @@
   Service->NumOfChild--;
 
+  gBS->RestoreTPL (OldTpl);
+
   Dhcp6DestroyInstance (Instance);
-
-  gBS->RestoreTPL (OldTpl);
-
   return EFI_SUCCESS;
 }

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.h

@@ -3 +3 @@
   declaration for Dhcp6 Driver.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -22 +22 @@
 extern EFI_COMPONENT_NAME_PROTOCOL  gDhcp6ComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL gDhcp6ComponentName2;
+extern EFI_UNICODE_STRING_TABLE     *gDhcp6ControllerNameTable;
 
 /**

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

@@ -1 +1 @@
 ## @file
-#  Component description file for Dhcp6 module.
+#  Client-side DHCPv6 services.
+#  
+#  This driver produces EFI DHCPv6 Protocol which is used to get IPv6 addresses
+#  and other configuration parameters from DHCPv6 servers.
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -22 +25 @@
   ENTRY_POINT                    = Dhcp6DriverEntryPoint
   UNLOAD_IMAGE                   = NetLibDefaultUnload
+  MODULE_UNI_FILE                = Dhcp6Dxe.uni
+
 #
 # The following information is for reference only and not required by the build tools.
@@ -63 +68 @@
 
 [Protocols]
-  gEfiUdp6ServiceBindingProtocolGuid
-  gEfiUdp6ProtocolGuid
-  gEfiDhcp6ServiceBindingProtocolGuid
-  gEfiDhcp6ProtocolGuid
+  gEfiUdp6ServiceBindingProtocolGuid                 ## TO_START
+  gEfiUdp6ProtocolGuid                               ## TO_START
+  gEfiDhcp6ServiceBindingProtocolGuid                ## BY_START
+  gEfiDhcp6ProtocolGuid                              ## BY_START
+  gEfiIp6ConfigProtocolGuid                          ## TO_START
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  Dhcp6DxeExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c

@@ -2 +2 @@
   This EFI_DHCP6_PROTOCOL interface implementation.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -105 +105 @@
 
   //
-  // Need to clear initial time to make sure that elapsed-time
-  // is set to 0 for first Solicit.
-  //
-  Instance->StartTime = 0;
-
-  //
   // Send the solicit message to start S.A.R.R process.
   //
@@ -201 +195 @@
 
   //
-  // The instance has already been stopped.
+  // No valid REPLY message received yet, cleanup this instance directly.
   //
   if (Instance->IaCb.Ia->State == Dhcp6Init ||
@@ -207 +201 @@
       Instance->IaCb.Ia->State == Dhcp6Requesting
       ) {
-    return Status;
+    goto ON_EXIT;
   }
 
@@ -216 +210 @@
 
   Instance->UdpSts = EFI_ALREADY_STARTED;
-  Dhcp6SendReleaseMsg (Instance, Instance->IaCb.Ia);
-
+  Status = Dhcp6SendReleaseMsg (Instance, Instance->IaCb.Ia);
   gBS->RestoreTPL (OldTpl);
+  if (EFI_ERROR (Status)) {
+    goto ON_EXIT;
+  }
 
   //
@@ -230 +226 @@
     Status = Instance->UdpSts;
   }
-
+  
+ON_EXIT:
   //
   // Clean up the session data for the released Ia.
@@ -605 +602 @@
 {
   EFI_STATUS                   Status;
-  EFI_TPL                      OldTpl;
   DHCP6_INSTANCE               *Instance;
   DHCP6_SERVICE                *Service;
-  DHCP6_INF_CB                 *InfCb;
   UINTN                        Index;
+  EFI_EVENT                    Timer;
+  EFI_STATUS                   TimerStatus;
+  UINTN                        GetMappingTimeOut;
 
   if (This == NULL || OptionRequest == NULL || Retransmission == NULL || ReplyCallback == NULL) {
@@ -634 +632 @@
   Service  = Instance->Service;
 
-  OldTpl           = gBS->RaiseTPL (TPL_CALLBACK);
-  Instance->UdpSts = EFI_ALREADY_STARTED;
-
-  //
-  // Create and initialize the control block for the info-request.
-  //
-  InfCb = AllocateZeroPool (sizeof(DHCP6_INF_CB));
-
-  if (InfCb == NULL) {
-    gBS->RestoreTPL (OldTpl);
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  InfCb->ReplyCallback   = ReplyCallback;
-  InfCb->CallbackContext = CallbackContext;
-  InfCb->TimeoutEvent    = TimeoutEvent;
-
-  InsertTailList (&Instance->InfList, &InfCb->Link);
-
-  //
-  // Send the info-request message to start exchange process.
-  //
-  Status = Dhcp6SendInfoRequestMsg (
+  Status = Dhcp6StartInfoRequest (
              Instance,
-             InfCb,
              SendClientId,
              OptionRequest,
              OptionCount,
              OptionList,
-             Retransmission
+             Retransmission,
+             TimeoutEvent,
+             ReplyCallback,
+             CallbackContext
              );
-
+  if (Status == EFI_NO_MAPPING) {
+    //
+    // The link local address is not ready, wait for some time and restart
+    // the DHCP6 information request process.
+    //
+    Status = Dhcp6GetMappingTimeOut(Service->Ip6Cfg, &GetMappingTimeOut);
+    if (EFI_ERROR(Status)) {
+      return Status;
+    }
+
+    Status = gBS->CreateEvent (EVT_TIMER, TPL_CALLBACK, NULL, NULL, &Timer);
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+
+    //
+    // Start the timer, wait for link local address DAD to finish.
+    //
+    Status = gBS->SetTimer (Timer, TimerRelative, GetMappingTimeOut);
+    if (EFI_ERROR (Status)) {
+      gBS->CloseEvent (Timer);
+      return Status;
+    }
+
+    do {  
+      TimerStatus = gBS->CheckEvent (Timer);
+      if (!EFI_ERROR (TimerStatus)) {
+        Status = Dhcp6StartInfoRequest (
+                   Instance,
+                   SendClientId,
+                   OptionRequest,
+                   OptionCount,
+                   OptionList,
+                   Retransmission,
+                   TimeoutEvent,
+                   ReplyCallback,
+                   CallbackContext
+                   );
+      }
+    } while (TimerStatus == EFI_NOT_READY);
+    
+    gBS->CloseEvent (Timer);
+  }
   if (EFI_ERROR (Status)) {
-    goto ON_ERROR;
-  }
-
-  //
-  // Register receive callback for the stateless exchange process.
-  //
-  Status = UdpIoRecvDatagram(
-             Service->UdpIo,
-             Dhcp6ReceivePacket,
-             Service,
-             0
-             );
-
-  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
-    goto ON_ERROR;
-  }
-
-  gBS->RestoreTPL (OldTpl);
+    return Status;
+  }
 
   //
@@ -698 +702 @@
 
   return EFI_SUCCESS;
-
-ON_ERROR:
-
-  RemoveEntryList (&InfCb->Link);
-  FreePool (InfCb);
-  gBS->RestoreTPL (OldTpl);
-
-  return Status;
 }
 

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h

@@ -2 +2 @@
   Dhcp6 internal data structure and definition declaration.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -22 +22 @@
 #include <Protocol/Dhcp6.h>
 #include <Protocol/Udp6.h>
+#include <Protocol/Ip6Config.h>
 #include <Protocol/ServiceBinding.h>
 #include <Protocol/DriverBinding.h>
@@ -34 +35 @@
 #include <Library/BaseLib.h>
 #include <Library/NetLib.h>
+#include <Library/PrintLib.h>
 
 
@@ -245 +247 @@
   UINT8                         AdPref;
   EFI_IPv6_ADDRESS              *Unicast;
-  EFI_STATUS                    UdpSts;
-  BOOLEAN                       InDestory;
+  volatile EFI_STATUS           UdpSts;
+  BOOLEAN                       InDestroy;
   BOOLEAN                       MediaPresent;
+  //
+  // StartTime is used to calculate the 'elapsed-time' option. Refer to RFC3315,
+  // the elapsed-time is amount of time since the client began its current DHCP transaction. 
+  //
   UINT64                        StartTime;
 };
@@ -260 +266 @@
   EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;
   EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;
+  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg;
   EFI_DHCP6_DUID                *ClientId;
   UDP_IO                        *UdpIo;
@@ -265 +272 @@
   LIST_ENTRY                    Child;
   UINTN                         NumOfChild;
-  BOOLEAN                       InDestory;
 };
 

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c

@@ -2 +2 @@
   Dhcp6 internal functions implementation.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -53 +53 @@
 
   //
-  // Save tx packet pointer, and it will be destoryed when reply received.
+  // Save tx packet pointer, and it will be destroyed when reply received.
   //
   TxCb->TxPacket = Packet;
@@ -364 +364 @@
 }
 
+/**
+  Check whether the TxCb is still a valid control block in the instance's retry list.
+
+  @param[in]  Instance       The pointer to DHCP6_INSTANCE.
+  @param[in]  TxCb           The control block for a transmitted message.
+
+  @retval   TRUE      The control block is in Instance's retry list.
+  @retval   FALSE     The control block is NOT in Instance's retry list.
+  
+**/
+BOOLEAN
+Dhcp6IsValidTxCb (
+  IN  DHCP6_INSTANCE          *Instance,
+  IN  DHCP6_TX_CB             *TxCb
+  )
+{
+  LIST_ENTRY                *Entry;
+
+  NET_LIST_FOR_EACH (Entry, &Instance->TxList) {
+    if (TxCb == NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link)) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
 
 /**
@@ -594 +620 @@
     T1 = NTOHL (ReadUnaligned32 ((UINT32 *) (Option + 8)));
     T2 = NTOHL (ReadUnaligned32 ((UINT32 *) (Option + 12)));
+    //
+    // Refer to RFC3155 Chapter 22.4. If a client receives an IA_NA with T1 greater than T2,
+    // and both T1 and T2 are greater than 0, the client discards the IA_NA option and processes
+    // the remainder of the message as though the server had not  included the invalid IA_NA option.
+    //
+    if (T1 > T2 && T2 > 0) {
+      return EFI_DEVICE_ERROR;
+    }
     IaInnerOpt = Option + 16;
     IaInnerLen = (UINT16) (NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 2))) - 12);
@@ -698 +732 @@
               );
   if (*Option == NULL) {
-    return EFI_DEVICE_ERROR;
+    return EFI_SUCCESS;
   }
 
@@ -950 +984 @@
              Instance->IaCb.Ia,
              Instance->IaCb.T1,
-             Instance->IaCb.T2
+             Instance->IaCb.T2,
+             Packet->Dhcp6.Header.MessageType
              );
 
@@ -988 +1023 @@
   //
   Instance->IaCb.Ia->State = Dhcp6Selecting;
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   Status = Dhcp6TransmitPacket (Instance, Packet, Elapsed);
@@ -1134 +1173 @@
              Instance->IaCb.Ia,
              Instance->IaCb.T1,
-             Instance->IaCb.T2
+             Instance->IaCb.T2,
+             Packet->Dhcp6.Header.MessageType
              );
 
@@ -1172 +1212 @@
   //
   Instance->IaCb.Ia->State = Dhcp6Requesting;
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   Status = Dhcp6TransmitPacket (Instance, Packet, Elapsed);
@@ -1283 +1327 @@
              );
 
-  Cursor = Dhcp6AppendIaOption (Cursor, DecIa, 0, 0);
+  Cursor = Dhcp6AppendIaOption (Cursor, DecIa, 0, 0, Packet->Dhcp6.Header.MessageType);
 
   //
@@ -1306 +1350 @@
   //
   Instance->IaCb.Ia->State = Dhcp6Declining;
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   Status = Dhcp6TransmitPacket (Instance, Packet, Elapsed);
@@ -1416 +1464 @@
              );
 
-  Cursor = Dhcp6AppendIaOption (Cursor, RelIa, 0, 0);
+  Cursor = Dhcp6AppendIaOption (Cursor, RelIa, 0, 0, Packet->Dhcp6.Header.MessageType);
 
   //
@@ -1541 +1589 @@
              Instance->IaCb.Ia,
              Instance->IaCb.T1,
-             Instance->IaCb.T2
+             Instance->IaCb.T2,
+             Packet->Dhcp6.Header.MessageType
              );
 
@@ -1613 +1662 @@
   Instance->IaCb.Ia->State = State;
   Instance->IaCb.LeaseTime = (RebindRequest) ? Instance->IaCb.T2 : Instance->IaCb.T1;
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   Status = Dhcp6TransmitPacket (Instance, Packet, Elapsed);
@@ -1627 +1680 @@
 }
 
+/**
+  Start the information request process.
+
+  @param[in]  Instance          The pointer to the Dhcp6 instance.
+  @param[in]  SendClientId      If TRUE, the client identifier option will be included in
+                                information request message. Otherwise, the client identifier
+                                option will not be included.
+  @param[in]  OptionRequest     The pointer to the option request option.
+  @param[in]  OptionCount       The number options in the OptionList.
+  @param[in]  OptionList        The array pointers to the appended options.
+  @param[in]  Retransmission    The pointer to the retransmission control.
+  @param[in]  TimeoutEvent      The event of timeout.
+  @param[in]  ReplyCallback     The callback function when the reply was received.
+  @param[in]  CallbackContext   The pointer to the parameter passed to the callback.
+
+  @retval EFI_SUCCESS           Start the info-request process successfully.
+  @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.
+  @retval EFI_NO_MAPPING        No source address is available for use.
+  @retval Others                Failed to start the info-request process.
+
+**/
+EFI_STATUS
+Dhcp6StartInfoRequest (
+  IN DHCP6_INSTANCE            *Instance,
+  IN BOOLEAN                   SendClientId,
+  IN EFI_DHCP6_PACKET_OPTION   *OptionRequest,
+  IN UINT32                    OptionCount,
+  IN EFI_DHCP6_PACKET_OPTION   *OptionList[]    OPTIONAL,
+  IN EFI_DHCP6_RETRANSMISSION  *Retransmission,
+  IN EFI_EVENT                 TimeoutEvent     OPTIONAL,
+  IN EFI_DHCP6_INFO_CALLBACK   ReplyCallback,
+  IN VOID                      *CallbackContext OPTIONAL
+  )
+{
+  EFI_STATUS                   Status;
+  DHCP6_INF_CB                 *InfCb;
+  DHCP6_SERVICE                *Service;
+  EFI_TPL                      OldTpl;
+
+  Service  = Instance->Service;
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+  Instance->UdpSts = EFI_ALREADY_STARTED;
+  //
+  // Create and initialize the control block for the info-request.
+  //
+  InfCb = AllocateZeroPool (sizeof(DHCP6_INF_CB));
+
+  if (InfCb == NULL) {
+    gBS->RestoreTPL (OldTpl);
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  InfCb->ReplyCallback   = ReplyCallback;
+  InfCb->CallbackContext = CallbackContext;
+  InfCb->TimeoutEvent    = TimeoutEvent;
+
+  InsertTailList (&Instance->InfList, &InfCb->Link);
+
+  //
+  // Send the info-request message to start exchange process.
+  //
+  Status = Dhcp6SendInfoRequestMsg (
+             Instance,
+             InfCb,
+             SendClientId,
+             OptionRequest,
+             OptionCount,
+             OptionList,
+             Retransmission
+             );
+
+  if (EFI_ERROR (Status)) {
+    goto ON_ERROR;
+  }
+
+  //
+  // Register receive callback for the stateless exchange process.
+  //
+  Status = UdpIoRecvDatagram(
+             Service->UdpIo,
+             Dhcp6ReceivePacket,
+             Service,
+             0
+             );
+
+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
+    goto ON_ERROR;
+  }
+  
+  gBS->RestoreTPL (OldTpl);
+  return EFI_SUCCESS;
+  
+ON_ERROR:
+  gBS->RestoreTPL (OldTpl); 
+  RemoveEntryList (&InfCb->Link);
+  FreePool (InfCb);
+
+  return Status;
+}
 
 /**
@@ -1745 +1898 @@
   Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);
   ASSERT (Packet->Size > Packet->Length + 8);
+  
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   //
@@ -1842 +2000 @@
              Instance->IaCb.Ia,
              Instance->IaCb.T1,
-             Instance->IaCb.T2
+             Instance->IaCb.T2,
+             Packet->Dhcp6.Header.MessageType
              );
 
@@ -1879 +2038 @@
   //
   Instance->IaCb.Ia->State = Dhcp6Confirming;
+  //
+  // Clear initial time for current transaction.
+  //
+  Instance->StartTime = 0;
 
   Status = Dhcp6TransmitPacket (Instance, Packet, Elapsed);
@@ -1921 +2084 @@
   ASSERT (Packet != NULL);
 
+  Status = EFI_SUCCESS;
+
   if (Packet->Dhcp6.Header.MessageType != Dhcp6MsgReply) {
     return EFI_DEVICE_ERROR;
@@ -1957 +2122 @@
                );
     if (Option == NULL) {
-      return EFI_DEVICE_ERROR;
+      return EFI_SUCCESS;
     }
   }
@@ -1965 +2130 @@
   //
   Status = Dhcp6CallbackUser (Instance, Dhcp6RcvdReply, &Packet);
-
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Dequeue the sent packet from retransmit list since reply received.
-  //
-  Status = Dhcp6DequeueRetry (
-             Instance,
-             Packet->Dhcp6.Header.TransactionId,
-             FALSE
-             );
 
   if (EFI_ERROR (Status)) {
@@ -2016 +2168 @@
     Instance->StartTime       = 0;
 
-    return EFI_SUCCESS;
+    Status = EFI_SUCCESS;
+    goto ON_EXIT;
   }
 
@@ -2033 +2186 @@
   if (!EFI_ERROR (Status)) {
     //
-    // Reset start time for next exchange.
-    //
-    Instance->StartTime       = 0;
-
-    //
     // No status code or no error status code means succeed to reply.
     //
     Status = Dhcp6UpdateIaInfo (Instance, Packet);
-
-    if (EFI_ERROR (Status)) {
-      return Status;
+    if (!EFI_ERROR (Status)) {
+      //
+      // Reset start time for next exchange.
+      //
+      Instance->StartTime       = 0;
+
+      //
+      // Set bound state and store the reply packet.
+      //
+      if (Instance->IaCb.Ia->ReplyPacket != NULL) {
+        FreePool (Instance->IaCb.Ia->ReplyPacket);
+      }
+
+      Instance->IaCb.Ia->ReplyPacket = AllocateZeroPool (Packet->Size);
+
+      if (Instance->IaCb.Ia->ReplyPacket == NULL) {
+        Status = EFI_OUT_OF_RESOURCES;
+        goto ON_EXIT;
+      }
+
+      CopyMem (Instance->IaCb.Ia->ReplyPacket, Packet, Packet->Size);
+
+      Instance->IaCb.Ia->State = Dhcp6Bound;
+
+      //
+      // For sync, set the success flag out of polling in start/renewrebind.
+      //
+      Instance->UdpSts         = EFI_SUCCESS;
+
+      //
+      // Maybe this is a new round DHCP process due to some reason, such as NotOnLink
+      // ReplyMsg for ConfirmMsg should triger new round to acquire new address. In that
+      // case, clear old address.ValidLifetime and append to new address. Therefore, DHCP
+      // consumers can be notified to flush old address.
+      //
+      Dhcp6AppendCacheIa (Instance);
+
+      //
+      // For async, signal the Ia event to inform Ia infomation update.
+      //
+      if (Instance->Config->IaInfoEvent != NULL) {
+        gBS->SignalEvent (Instance->Config->IaInfoEvent);
+      }
+    } else if (Status == EFI_NOT_FOUND) {
+      //
+      // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, 
+      // the client sends a Renew or Rebind if the IA is not in the Reply message.
+      // Return EFI_SUCCESS so we can continue to restart the Renew/Rebind process.
+      //
+      return EFI_SUCCESS;
     }
-
-    //
-    // Set bound state and store the reply packet.
-    //
-    if (Instance->IaCb.Ia->ReplyPacket != NULL) {
-      FreePool (Instance->IaCb.Ia->ReplyPacket);
-    }
-
-    Instance->IaCb.Ia->ReplyPacket = AllocateZeroPool (Packet->Size);
-
-    if (Instance->IaCb.Ia->ReplyPacket == NULL) {
-      return EFI_OUT_OF_RESOURCES;
-    }
-
-    CopyMem (Instance->IaCb.Ia->ReplyPacket, Packet, Packet->Size);
-
-    Instance->IaCb.Ia->State = Dhcp6Bound;
-
-    //
-    // For sync, set the success flag out of polling in start/renewrebind.
-    //
-    Instance->UdpSts         = EFI_SUCCESS;
-
-    //
-    // Maybe this is a new round DHCP process due to some reason, such as NotOnLink
-    // ReplyMsg for ConfirmMsg should triger new round to acquire new address. In that
-    // case, clear old address.ValidLifetime and append to new address. Therefore, DHCP
-    // consumers can be notified to flush old address.
-    //
-    Dhcp6AppendCacheIa (Instance);
-
-    //
-    // For async, signal the Ia event to inform Ia infomation update.
-    //
-    if (Instance->Config->IaInfoEvent != NULL) {
-      gBS->SignalEvent (Instance->Config->IaInfoEvent);
-    }
+    
+    goto ON_EXIT;
+    
   } else if (Option != NULL) {
     //
@@ -2127 +2288 @@
       break;
 
+    case Dhcp6StsNoBinding:
+      if (Instance->IaCb.Ia->State == Dhcp6Renewing || Instance->IaCb.Ia->State == Dhcp6Rebinding) {
+        //
+        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client 
+        // sends a Request message if the IA contained a Status Code option with the NoBinding status.
+        //
+        Status = Dhcp6SendRequestMsg(Instance);
+        if (EFI_ERROR (Status)) {
+          return Status;
+        }
+      }
+      break;
+
     default:
       //
@@ -2136 +2310 @@
 
   return EFI_SUCCESS;
+  
+ON_EXIT:
+
+  if (!EFI_ERROR(Status)) {
+    Status = Dhcp6DequeueRetry (
+               Instance,
+               Packet->Dhcp6.Header.TransactionId,
+               FALSE
+               );
+  }
+  
+  return Status;
 }
 
@@ -2279 +2465 @@
   // See the details in the section-17.1.3 of rfc-3315.
   //
-  Option = Dhcp6SeekOption(
-             Packet->Dhcp6.Option,
-             Packet->Length - 4,
-             Dhcp6OptStatusCode
-             );
-
-  if (Option != NULL) {
-    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 4)));
-    if (StsCode != Dhcp6StsSuccess) {
-      return EFI_DEVICE_ERROR;
-    }
+  Status = Dhcp6SeekStsOption (
+             Instance,
+             Packet,
+             &Option
+             );
+  if (EFI_ERROR (Status)) {
+    return EFI_DEVICE_ERROR;
   }
 
@@ -2411 +2593 @@
   Status   = EFI_SUCCESS;
 
-  if (Instance->InDestory || Instance->Config == NULL) {
+  if (Instance->Config == NULL) {
     goto ON_CONTINUE;
   }
@@ -2524 +2706 @@
   IsMatched = FALSE;
   InfCb     = NULL;
-
-  if (Instance->InDestory) {
-    goto ON_EXIT;
-  }
 
   if (Packet->Dhcp6.Header.MessageType != Dhcp6MsgReply) {
@@ -2830 +3008 @@
           //
           Status = Dhcp6SelectAdvertiseMsg (Instance, Instance->AdSelect);
-          if (EFI_ERROR (Status)) {
+          if (Status == EFI_ABORTED) {
+            goto ON_CLOSE;
+          } else if (EFI_ERROR (Status)) {
             TxCb->RetryCnt++;
           }
@@ -2846 +3026 @@
       //
       if (TxCb->RetryCtl.Mrc != 0 && TxCb->RetryCtl.Mrc < TxCb->RetryCnt) {
+        Status = EFI_NO_RESPONSE;
         goto ON_CLOSE;
       }
@@ -2853 +3034 @@
       //
       if (TxCb->RetryCtl.Mrd != 0 && TxCb->RetryCtl.Mrd <= TxCb->RetryLos) {
+        Status = EFI_NO_RESPONSE;
         goto ON_CLOSE;
       }
@@ -2942 +3124 @@
  ON_CLOSE:
 
-  if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest ||
+  if (Dhcp6IsValidTxCb (Instance, TxCb) &&
+      TxCb->TxPacket != NULL &&
+      (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest ||
       TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgRenew       ||
-      TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm
+      TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm)
       ) {
     //
@@ -2969 +3153 @@
     // The failure of the others will terminate current state machine if timeout.
     //
-    Dhcp6CleanupSession (Instance, EFI_NO_RESPONSE);
+    Dhcp6CleanupSession (Instance, Status);
   }
 }

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Io.h

@@ -2 +2 @@
   Dhcp6 internal functions declaration.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -128 +128 @@
   IN DHCP6_INSTANCE            *Instance,
   IN EFI_DHCP6_IA              *RelIa
+  );
+
+/**
+  Start the information request process.
+
+  @param[in]  Instance          The pointer to the Dhcp6 instance.
+  @param[in]  SendClientId      If TRUE, the client identifier option will be included in
+                                information request message. Otherwise, the client identifier
+                                option will not be included.
+  @param[in]  OptionRequest     The pointer to the option request option.
+  @param[in]  OptionCount       The number options in the OptionList.
+  @param[in]  OptionList        The array pointers to the appended options.
+  @param[in]  Retransmission    The pointer to the retransmission control.
+  @param[in]  TimeoutEvent      The event of timeout.
+  @param[in]  ReplyCallback     The callback function when the reply was received.
+  @param[in]  CallbackContext   The pointer to the parameter passed to the callback.
+
+  @retval EFI_SUCCESS           Start the info-request process successfully.
+  @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.
+  @retval EFI_NO_MAPPING        No source address is available for use.
+  @retval Others                Failed to start the info-request process.
+
+**/
+EFI_STATUS
+Dhcp6StartInfoRequest (
+  IN DHCP6_INSTANCE            *Instance,
+  IN BOOLEAN                   SendClientId,
+  IN EFI_DHCP6_PACKET_OPTION   *OptionRequest,
+  IN UINT32                    OptionCount,
+  IN EFI_DHCP6_PACKET_OPTION   *OptionList[]    OPTIONAL,
+  IN EFI_DHCP6_RETRANSMISSION  *Retransmission,
+  IN EFI_EVENT                 TimeoutEvent     OPTIONAL,
+  IN EFI_DHCP6_INFO_CALLBACK   ReplyCallback,
+  IN VOID                      *CallbackContext OPTIONAL
   );
 

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c

@@ -2 +2 @@
   Dhcp6 support functions implementation.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -42 +42 @@
   // See details in section-9 of rfc-3315.
   //
-  Duid = GetVariable (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid);
+  GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, (VOID**)&Duid, NULL);
   if (Duid != NULL) {
     return Duid;
@@ -144 +144 @@
     // Set the Duid-type, hardware-type, time and copy the hardware address.
     //
-    WriteUnaligned16 ((UINT16 *) (Duid->Duid), HTONS (Dhcp6DuidTypeLlt));
-    WriteUnaligned16 ((UINT16 *) (Duid->Duid + 2), HTONS (NET_IFTYPE_ETHERNET));
-    WriteUnaligned32 ((UINT32 *) (Duid->Duid + 4), HTONL (Stamp));
-  
+    WriteUnaligned16 ((UINT16 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid)), HTONS (Dhcp6DuidTypeLlt));
+    WriteUnaligned16 ((UINT16 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 2), HTONS (NET_IFTYPE_ETHERNET));
+    WriteUnaligned32 ((UINT32 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 4), HTONL (Stamp));
+
     CopyMem (Duid->Duid + 8, &Mode->CurrentAddress, Mode->HwAddressSize);
   }
@@ -158 +158 @@
                   (VOID *) Duid
                   );
-  ASSERT_EFI_ERROR (Status);
+  if (EFI_ERROR (Status)) {
+    FreePool (Duid);
+    return NULL;
+  }
 
   return Duid;
@@ -384 +387 @@
   )
 {
-  EFI_DHCP6_IA_ADDRESS        *IaAddr;
   UINT32                      MinLt;
   UINT32                      MaxLt;
@@ -399 +401 @@
   //
   for (Index = 0; Index < IaCb->Ia->IaAddressCount; Index++) {
-    IaAddr = IaCb->Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);
-    MinLt  = MIN (MinLt, IaAddr->ValidLifetime);
-    MaxLt  = MAX (MinLt, IaAddr->ValidLifetime);
+    MinLt  = MIN (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);
+    MaxLt  = MAX (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);
   }
 
@@ -648 +649 @@
 }
 
+/**
+  Append the appointed IA Address option to Buf, and move Buf to the end.
+
+  @param[in, out] Buf           The pointer to the position to append.
+  @param[in]      IaAddr        The pointer to the IA Address.
+  @param[in]      MessageType   Message type of DHCP6 package.
+
+  @return         Buf           The position to append the next option.
+
+**/
+UINT8 *
+Dhcp6AppendIaAddrOption (
+  IN OUT UINT8                  *Buf,
+  IN     EFI_DHCP6_IA_ADDRESS   *IaAddr,
+  IN     UINT32                 MessageType
+)
+{
+
+  //  The format of the IA Address option is:
+  //
+  //       0                   1                   2                   3
+  //       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  //      |          OPTION_IAADDR        |          option-len           |
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  //      |                                                               |
+  //      |                         IPv6 address                          |
+  //      |                                                               |
+  //      |                                                               |
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  //      |                      preferred-lifetime                       |
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  //      |                        valid-lifetime                         |
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  //      .                                                               .
+  //      .                        IAaddr-options                         .
+  //      .                                                               .
+  //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  
+  //
+  // Fill the value of Ia Address option type
+  //
+  WriteUnaligned16 ((UINT16 *) Buf, HTONS (Dhcp6OptIaAddr));
+  Buf                     += 2;
+
+  WriteUnaligned16 ((UINT16 *) Buf, HTONS (sizeof (EFI_DHCP6_IA_ADDRESS)));
+  Buf                     += 2;
+
+  CopyMem (Buf, &IaAddr->IpAddress, sizeof(EFI_IPv6_ADDRESS));
+  Buf                     += sizeof(EFI_IPv6_ADDRESS);
+
+  //
+  // Fill the value of preferred-lifetime and valid-lifetime.
+  // According to RFC3315 Chapter 18.1.2, the preferred-lifetime and valid-lifetime fields
+  // should set to 0 when initiate a Confirm message.
+  //
+  if (MessageType != Dhcp6MsgConfirm) {
+    WriteUnaligned32 ((UINT32 *) Buf, HTONL (IaAddr->PreferredLifetime));
+  }
+  Buf                     += 4;
+
+  if (MessageType != Dhcp6MsgConfirm) {
+    WriteUnaligned32 ((UINT32 *) Buf, HTONL (IaAddr->ValidLifetime));
+  }
+  Buf                     += 4;
+
+  return Buf;
+}
+
 
 /**
@@ -656 +726 @@
   @param[in]      T1            The time of T1.
   @param[in]      T2            The time of T2.
+  @param[in]      MessageType   Message type of DHCP6 package.
 
   @return         Buf           The position to append the next Ia option.
@@ -665 +736 @@
   IN     EFI_DHCP6_IA           *Ia,
   IN     UINT32                 T1,
-  IN     UINT32                 T2
+  IN     UINT32                 T2,
+  IN     UINT32                 MessageType
   )
 {
@@ -671 +743 @@
   UINT16                    *Len;
   UINTN                     Index;
-  UINT16                    Length;
 
   //
@@ -714 +785 @@
   //
   if (Ia->Descriptor.Type == Dhcp6OptIana) {
-    WriteUnaligned32 ((UINT32 *) Buf, ((T1 != 0) ? T1 : 0xffffffff));
+    WriteUnaligned32 ((UINT32 *) Buf, HTONL ((T1 != 0) ? T1 : 0xffffffff));
     Buf                   += 4;
-    WriteUnaligned32 ((UINT32 *) Buf, ((T2 != 0) ? T2 : 0xffffffff));
+    WriteUnaligned32 ((UINT32 *) Buf, HTONL ((T2 != 0) ? T2 : 0xffffffff));
     Buf                   += 4;
   }
@@ -724 +795 @@
   //
   for (Index = 0; Index < Ia->IaAddressCount; Index++) {
-
-     AddrOpt = (UINT8 *) Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);
-     Length  = HTONS ((UINT16) sizeof (EFI_DHCP6_IA_ADDRESS));
-     Buf     = Dhcp6AppendOption (
-                 Buf,
-                 HTONS (Dhcp6OptIaAddr),
-                 Length,
-                 AddrOpt
-                 );
+    AddrOpt = (UINT8 *) Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);
+    Buf = Dhcp6AppendIaAddrOption (Buf, (EFI_DHCP6_IA_ADDRESS *) AddrOpt, MessageType);
   }
 
@@ -828 +892 @@
   //
   // Sentinel value of 0 means that this is the first DHCP packet that we are
-  // sending and that we need to initialize the value.  First DHCP Solicit
+  // sending and that we need to initialize the value.  First DHCP message
   // gets 0 elapsed-time.  Otherwise, calculate based on StartTime.
   //
@@ -935 +999 @@
 }
 
+/**
+  Check whether the incoming IPv6 address in IaAddr is one of the maintained 
+  addresses in the IA control blcok.
+
+  @param[in]  IaAddr            The pointer to the IA Address to be checked.
+  @param[in]  CurrentIa         The pointer to the IA in IA control block.
+
+  @retval     TRUE              Yes, this Address is already in IA control block.
+  @retval     FALSE             No, this Address is NOT in IA control block.
+
+**/
+BOOLEAN
+Dhcp6AddrIsInCurrentIa (
+  IN    EFI_DHCP6_IA_ADDRESS      *IaAddr,
+  IN    EFI_DHCP6_IA              *CurrentIa
+  )
+{
+  UINT32    Index;
+
+  ASSERT (IaAddr != NULL && CurrentIa != NULL);
+  
+  for (Index = 0; Index < CurrentIa->IaAddressCount; Index++) {
+    if (EFI_IP6_EQUAL(&IaAddr->IpAddress, &CurrentIa->IaAddress[Index].IpAddress)) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
 
 /**
   Parse the address option and update the address infomation.
 
+  @param[in]      CurrentIa     The pointer to the Ia Address in control blcok.
   @param[in]      IaInnerOpt    The pointer to the buffer.
   @param[in]      IaInnerLen    The length to parse.
@@ -947 +1040 @@
 VOID
 Dhcp6ParseAddrOption (
+  IN     EFI_DHCP6_IA            *CurrentIa,
   IN     UINT8                   *IaInnerOpt,
   IN     UINT16                  IaInnerLen,
@@ -957 +1051 @@
   UINT16                      OpCode;
   UINT32                      ValidLt;
+  UINT32                      PreferredLt;
+  EFI_DHCP6_IA_ADDRESS        *IaAddr;
 
   //
@@ -993 +1089 @@
   while (Cursor < IaInnerOpt + IaInnerLen) {
     //
-    // Count the Ia address option with non-0 valid time.
+    // Refer to RFC3315 Chapter 18.1.8, we need to update lifetimes for any addresses in the IA option
+    // that the client already has recorded in the IA, and discard the Ia address option with 0 valid time.
     //
     OpCode  = ReadUnaligned16 ((UINT16 *) Cursor);
-    ValidLt = ReadUnaligned32 ((UINT32 *) (Cursor + 24));
-    if (OpCode == HTONS (Dhcp6OptIaAddr) && ValidLt != 0) {
-
+    PreferredLt = NTOHL (ReadUnaligned32 ((UINT32 *) (Cursor + 20)));
+    ValidLt = NTOHL (ReadUnaligned32 ((UINT32 *) (Cursor + 24)));
+    IaAddr = (EFI_DHCP6_IA_ADDRESS *) (Cursor + 4);
+    if (OpCode == HTONS (Dhcp6OptIaAddr) && ValidLt >= PreferredLt &&
+        (Dhcp6AddrIsInCurrentIa(IaAddr, CurrentIa) || ValidLt !=0)) {
       if (AddrBuf != NULL) {
-        CopyMem (AddrBuf, Cursor + 4, sizeof (EFI_DHCP6_IA_ADDRESS));
-        AddrBuf->PreferredLifetime = NTOHL (AddrBuf->PreferredLifetime);
-        AddrBuf->ValidLifetime     = NTOHL (AddrBuf->ValidLifetime);
+        CopyMem (AddrBuf, IaAddr, sizeof (EFI_DHCP6_IA_ADDRESS));
+        AddrBuf->PreferredLifetime = PreferredLt;
+        AddrBuf->ValidLifetime     = ValidLt;
         AddrBuf = (EFI_DHCP6_IA_ADDRESS *) ((UINT8 *) AddrBuf + sizeof (EFI_DHCP6_IA_ADDRESS));
       }
-
       (*AddrNum)++;
     }
@@ -1026 +1124 @@
   @retval     EFI_SUCCESS           Create an IA control block successfully.
   @retval     EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.
+  @retval     EFI_DEVICE_ERROR      An unexpected error.
 
 **/
@@ -1042 +1141 @@
 
   if (Instance->IaCb.Ia == NULL) {
-    return EFI_NOT_FOUND;
+    return EFI_DEVICE_ERROR;
   }
 
@@ -1049 +1148 @@
   // the value 0 of valid lifetime.
   //
-  Dhcp6ParseAddrOption (IaInnerOpt, IaInnerLen, &AddrNum, NULL);
+  Dhcp6ParseAddrOption (Instance->IaCb.Ia, IaInnerOpt, IaInnerLen, &AddrNum, NULL);
 
   if (AddrNum == 0) {
@@ -1071 +1170 @@
   Ia->IaAddressCount = AddrNum;
   CopyMem (&Ia->Descriptor, &Instance->Config->IaDescriptor, sizeof (EFI_DHCP6_IA_DESCRIPTOR));
-  Dhcp6ParseAddrOption (IaInnerOpt, IaInnerLen, &AddrNum, Ia->IaAddress);
+  Dhcp6ParseAddrOption (Instance->IaCb.Ia, IaInnerOpt, IaInnerLen, &AddrNum, Ia->IaAddress);
 
   //
@@ -1190 +1289 @@
   }
 }
+
+/**
+  Calculate the Dhcp6 get mapping timeout by adding additinal delay to the IP6 DAD transmits count.
+
+  @param[in]   Ip6Cfg              The pointer to Ip6 config protocol.
+  @param[out]  TimeOut             The time out value in 100ns units.
+
+  @retval   EFI_INVALID_PARAMETER  Input parameters are invalid.
+  @retval   EFI_SUCCESS            Calculate the time out value successfully.
+**/
+EFI_STATUS
+Dhcp6GetMappingTimeOut (
+  IN  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg,
+  OUT UINTN                         *TimeOut
+  ) 
+{
+  EFI_STATUS            Status;
+  UINTN                 DataSize;
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    DadXmits;
+
+  if (Ip6Cfg == NULL || TimeOut == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  DataSize = sizeof (EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS);
+  Status = Ip6Cfg->GetData (
+                     Ip6Cfg,
+                     Ip6ConfigDataTypeDupAddrDetectTransmits,
+                     &DataSize,
+                     &DadXmits
+                     );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  
+  *TimeOut = TICKS_PER_SECOND * DadXmits.DupAddrDetectTransmits + DHCP6_DAD_ADDITIONAL_DELAY;
+  
+  return EFI_SUCCESS;
+}

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.h

@@ -2 +2 @@
   Dhcp6 support functions declaration.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -18 +18 @@
 
 
-#define  DHCP6_10_BIT_MASK     0x3ff
+#define  DHCP6_10_BIT_MASK             0x3ff
+#define  DHCP6_DAD_ADDITIONAL_DELAY    30000000 // 3 seconds
 
 /**
@@ -192 +193 @@
   @param[in]      T1            The time of T1.
   @param[in]      T2            The time of T2.
+  @param[in]      MessageType   Message type of DHCP6 package.
 
   @return         Buf           The position to append the next Ia option.
@@ -201 +203 @@
   IN     EFI_DHCP6_IA           *Ia,
   IN     UINT32                 T1,
-  IN     UINT32                 T2
+  IN     UINT32                 T2,
+  IN     UINT32                 MessageType
   );
 
@@ -274 +277 @@
   Parse the address option and update the address info.
 
+  @param[in]      CurrentIa     The pointer to the Ia Address in control blcok.
   @param[in]      IaInnerOpt    The pointer to the buffer.
   @param[in]      IaInnerLen    The length to parse.
@@ -282 +286 @@
 VOID
 Dhcp6ParseAddrOption (
+  IN     EFI_DHCP6_IA            *CurrentIa,
   IN     UINT8                   *IaInnerOpt,
   IN     UINT16                  IaInnerLen,
@@ -300 +305 @@
   @retval     EFI_SUCCESS           Create an IA control block successfully.
   @retval     EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.
+  @retval     EFI_DEVICE_ERROR      An unexpected error.
 
 **/
@@ -338 +344 @@
   );
 
+/**
+  Calculate the Dhcp6 get mapping timeout by adding additinal delay to the IP6 DAD transmits count.
+
+  @param[in]   Ip6Cfg              The pointer to Ip6 config protocol.
+  @param[out]  TimeOut             The time out value in 100ns units.
+
+  @retval   EFI_INVALID_PARAMETER  Input parameters are invalid.
+  @retval   EFI_SUCCESS            Calculate the time out value successfully.
+**/
+EFI_STATUS
+Dhcp6GetMappingTimeOut (
+  IN  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg,
+  OUT UINTN                         *TimeOut
+  );
 #endif