The implementation of EFI IPv4 Configuration II Protocol.\r
\r
Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
- (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
+ (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<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
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
// Start the dhcp configuration.\r
//\r
if (NewPolicy == Ip4Config2PolicyDhcp) {\r
- IpSb->Reconfig = TRUE;\r
Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r
}\r
\r
//\r
Count = 0;\r
\r
- for (Index = IP4_MASK_NUM - 1; Index >= 0; Index--) {\r
+ for (Index = IP4_MASK_MAX; Index >= 0; Index--) {\r
\r
NET_LIST_FOR_EACH (Entry, &(IpSb->DefaultRouteTable->RouteArea[Index])) {\r
RtEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_ENTRY, Link);\r
//\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
// 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
IN VOID *Data OPTIONAL\r
)\r
{\r
-\r
IP4_SERVICE *IpSb;\r
UINTN Length;\r
IP4_CONFIG2_DATA_ITEM *Item;\r
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
//\r
if (Instance->Dhcp4Event != NULL) {\r
gBS->CloseEvent (Instance->Dhcp4Event);\r
+ Instance->Dhcp4Event = NULL;\r
}\r
}\r
}\r
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
//\r
if (Instance->Dhcp4Event != NULL) {\r
gBS->CloseEvent (Instance->Dhcp4Event);\r
+ Instance->Dhcp4Event = NULL;\r
}\r
\r
for (Index = 0; Index < Ip4Config2DataTypeMaximum; Index++) {\r