NetworkPkg: Clean up source files

[mirror_edk2.git] / NetworkPkg / Dhcp6Dxe / Dhcp6Io.c

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
index b23147952517aae8d3447ce17c46551402865ea7..5ad2ac38bf89376bb716d8084d53470c1386b6ed 100644 (file)
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
@@ -2,7 +2,7 @@
   Dhcp6 internal functions implementation.\r
 \r
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -372,7 +372,7 @@ Dhcp6CleanupRetry (
 \r
   @retval   TRUE      The control block is in Instance's retry list.\r
   @retval   FALSE     The control block is NOT in Instance's retry list.\r
-  \r
+\r
 **/\r
 BOOLEAN\r
 Dhcp6IsValidTxCb (\r
@@ -1767,12 +1767,12 @@ Dhcp6StartInfoRequest (
   if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
     goto ON_ERROR;\r
   }\r
-  \r
+\r
   gBS->RestoreTPL (OldTpl);\r
   return EFI_SUCCESS;\r
-  \r
+\r
 ON_ERROR:\r
-  gBS->RestoreTPL (OldTpl); \r
+  gBS->RestoreTPL (OldTpl);\r
   RemoveEntryList (&InfCb->Link);\r
   FreePool (InfCb);\r
 \r
@@ -1896,7 +1896,7 @@ Dhcp6SendInfoRequestMsg (
   //\r
   Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
-  \r
+\r
   //\r
   // Clear initial time for current transaction.\r
   //\r
@@ -2232,15 +2232,15 @@ Dhcp6HandleReplyMsg (
       }\r
     } else if (Status == EFI_NOT_FOUND) {\r
       //\r
-      // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, \r
+      // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message,\r
       // the client sends a Renew or Rebind if the IA is not in the Reply message.\r
       // Return EFI_SUCCESS so we can continue to restart the Renew/Rebind process.\r
       //\r
       return EFI_SUCCESS;\r
     }\r
-    \r
+\r
     goto ON_EXIT;\r
-    \r
+\r
   } else if (Option != NULL) {\r
     //\r
     // Any error status code option is found.\r
@@ -2289,7 +2289,7 @@ Dhcp6HandleReplyMsg (
     case Dhcp6StsNoBinding:\r
       if (Instance->IaCb.Ia->State == Dhcp6Renewing || Instance->IaCb.Ia->State == Dhcp6Rebinding) {\r
         //\r
-        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client \r
+        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client\r
         // sends a Request message if the IA contained a Status Code option with the NoBinding status.\r
         //\r
         Status = Dhcp6SendRequestMsg(Instance);\r
@@ -2308,7 +2308,7 @@ Dhcp6HandleReplyMsg (
   }\r
 \r
   return EFI_SUCCESS;\r
-  \r
+\r
 ON_EXIT:\r
 \r
   if (!EFI_ERROR(Status)) {\r
@@ -2318,7 +2318,7 @@ ON_EXIT:
                FALSE\r
                );\r
   }\r
-  \r
+\r
   return Status;\r
 }\r
 \r
@@ -2812,6 +2812,7 @@ Dhcp6ReceivePacket (
   LIST_ENTRY                *Next1;\r
   LIST_ENTRY                *Entry2;\r
   LIST_ENTRY                *Next2;\r
+  EFI_STATUS                Status;\r
 \r
   ASSERT (Udp6Wrap != NULL);\r
   ASSERT (Context != NULL);\r
@@ -2826,6 +2827,10 @@ Dhcp6ReceivePacket (
     return ;\r
   }\r
 \r
+  if (Udp6Wrap->TotalSize < sizeof (EFI_DHCP6_HEADER)) {\r
+    goto ON_CONTINUE;\r
+  }\r
+\r
   //\r
   // Copy the net buffer received from upd6 to a Dhcp6 packet.\r
   //\r
@@ -2891,6 +2896,21 @@ Dhcp6ReceivePacket (
 \r
 ON_CONTINUE:\r
 \r
+  if (!IsDispatched) {\r
+    Status = UdpIoRecvDatagram (\r
+             Service->UdpIo,\r
+             Dhcp6ReceivePacket,\r
+             Service,\r
+             0\r
+             );\r
+    if (EFI_ERROR (Status)) {\r
+      NET_LIST_FOR_EACH_SAFE (Entry1, Next1, &Service->Child) {\r
+        Instance = NET_LIST_USER_STRUCT (Entry1, DHCP6_INSTANCE, Link);\r
+        Dhcp6CleanupRetry (Instance, DHCP6_PACKET_ALL);\r
+      }\r
+    }\r
+  }\r
+\r
   NetbufFree (Udp6Wrap);\r
 \r
   if (Packet != NULL) {\r