MdeModulePkg: Clean the previous address since the policy changed

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Config2Impl.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
index d0fa1326215e7c469734c31a15949748acd25fc5..97b555b5fe8bfe15b2a1dc27683ac00ad67baf34 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
@@ -142,7 +142,7 @@ Ip4Config2OnPolicyChanged (
   IpSb->DefaultRouteTable = RouteTable;\r
   Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
 \r
-  if (IpSb->State == IP4_SERVICE_CONFIGED) {\r
+  if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {\r
     IpSb->State = IP4_SERVICE_UNSTARTED;\r
   }\r
 \r
@@ -150,7 +150,6 @@ Ip4Config2OnPolicyChanged (
   // Start the dhcp configuration.\r
   //\r
   if (NewPolicy == Ip4Config2PolicyDhcp) {\r
-    IpSb->Reconfig = TRUE;\r
     Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r
   }\r
 \r
@@ -874,7 +873,7 @@ Ip4Config2OnDhcp4Complete (
       //\r
       // Look for DNS Server opcode (6).\r
       //\r
-      if (OptionList[Index]->OpCode == DHCP_TAG_DNS_SERVER) {\r
+      if (OptionList[Index]->OpCode == DHCP4_TAG_DNS_SERVER) {\r
         if (((OptionList[Index]->Length & 0x3) != 0) || (OptionList[Index]->Length == 0)) {\r
           break;\r
         }\r
@@ -992,11 +991,11 @@ Ip4StartAutoConfig (
   // DHCP configuration to avoid problems if some DHCP client\r
   // yields the control of this DHCP service to us.\r
   //\r
-  ParaList.Head.OpCode             = DHCP_TAG_PARA_LIST;\r
+  ParaList.Head.OpCode             = DHCP4_TAG_PARA_LIST;\r
   ParaList.Head.Length             = 3;\r
-  ParaList.Head.Data[0]            = DHCP_TAG_NETMASK;\r
-  ParaList.Route                   = DHCP_TAG_ROUTER;\r
-  ParaList.Dns                     = DHCP_TAG_DNS_SERVER;\r
+  ParaList.Head.Data[0]            = DHCP4_TAG_NETMASK;\r
+  ParaList.Route                   = DHCP4_TAG_ROUTER;\r
+  ParaList.Dns                     = DHCP4_TAG_DNS_SERVER;\r
   OptionList[0]                    = &ParaList.Head;\r
   Dhcp4Mode.ConfigData.OptionCount = 1;\r
   Dhcp4Mode.ConfigData.OptionList  = OptionList;\r
@@ -1060,7 +1059,6 @@ Ip4Config2GetIfInfo (
   IN VOID                 *Data      OPTIONAL\r
   )\r
 {\r
-\r
   IP4_SERVICE                    *IpSb;\r
   UINTN                          Length;\r
   IP4_CONFIG2_DATA_ITEM          *Item;\r
@@ -1148,38 +1146,39 @@ Ip4Config2SetPolicy (
       return EFI_ABORTED;\r
     }\r
   } else {\r
+    //\r
+    // The policy is changed. Clean the ManualAddress, Gateway and DnsServers, \r
+    // shrink the variable data size, and fire up all the related events.\r
+    //\r
+    DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
+    if (DataItem->Data.Ptr != NULL) {\r
+      FreePool (DataItem->Data.Ptr);\r
+    }\r
+    DataItem->Data.Ptr = NULL;\r
+    DataItem->DataSize = 0;\r
+    DataItem->Status   = EFI_NOT_FOUND;\r
+    NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
+\r
+    DataItem           = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
+    if (DataItem->Data.Ptr != NULL) {\r
+      FreePool (DataItem->Data.Ptr);\r
+    }\r
+    DataItem->Data.Ptr = NULL;\r
+    DataItem->DataSize = 0;\r
+    DataItem->Status   = EFI_NOT_FOUND;\r
+    NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
+\r
+    DataItem           = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
+    if (DataItem->Data.Ptr != NULL) {\r
+      FreePool (DataItem->Data.Ptr);\r
+    }\r
+    DataItem->Data.Ptr = NULL;\r
+    DataItem->DataSize = 0;\r
+    DataItem->Status   = EFI_NOT_FOUND;\r
+    NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
+    \r
     if (NewPolicy == Ip4Config2PolicyDhcp) {\r
-      //\r
-      // The policy is changed from static to dhcp:\r
-      // Clean the ManualAddress, Gateway and DnsServers, shrink the variable\r
-      // data size, and fire up all the related events.\r
-      //\r
-      DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
-      if (DataItem->Data.Ptr != NULL) {\r
-        FreePool (DataItem->Data.Ptr);\r
-      }\r
-      DataItem->Data.Ptr = NULL;\r
-      DataItem->DataSize = 0;\r
-      DataItem->Status   = EFI_NOT_FOUND;\r
-      NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
-\r
-      DataItem           = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
-      if (DataItem->Data.Ptr != NULL) {\r
-        FreePool (DataItem->Data.Ptr);\r
-      }\r
-      DataItem->Data.Ptr = NULL;\r
-      DataItem->DataSize = 0;\r
-      DataItem->Status   = EFI_NOT_FOUND;\r
-      NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
-\r
-      DataItem           = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
-      if (DataItem->Data.Ptr != NULL) {\r
-        FreePool (DataItem->Data.Ptr);\r
-      }\r
-      DataItem->Data.Ptr = NULL;\r
-      DataItem->DataSize = 0;\r
-      DataItem->Status   = EFI_NOT_FOUND;\r
-      NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
+      SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_VOLATILE);\r
     } else {\r
       //\r
       // The policy is changed from dhcp to static. Stop the DHCPv4 process\r
@@ -1459,10 +1458,20 @@ Ip4Config2SetDnsServer (
   IN VOID                 *Data\r
   )\r
 {\r
+  IP4_CONFIG2_DATA_ITEM *Item;\r
+\r
+  Item = NULL;\r
+\r
   if (Instance->Policy != Ip4Config2PolicyStatic) {\r
     return EFI_WRITE_PROTECTED;\r
   }\r
 \r
+  Item = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
+\r
+  if (DATA_ATTRIB_SET (Item->Attribute, DATA_ATTRIB_VOLATILE)) {\r
+    REMOVE_DATA_ATTRIB (Item->Attribute, DATA_ATTRIB_VOLATILE);\r
+  }\r
+\r
   return Ip4Config2SetDnsServerWorker (Instance, DataSize, Data);\r
 }\r
 \r