Functions implementation related with DHCPv6 for UefiPxeBc Driver.\r
\r
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
- Copyright (c) 2009 - 2017, 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
// Append client option request option\r
//\r
OptList[Index]->OpCode = HTONS (DHCP6_OPT_ORO);\r
- OptList[Index]->OpLen = HTONS (6);\r
+ OptList[Index]->OpLen = HTONS (8);\r
OptEnt.Oro = (PXEBC_DHCP6_OPTION_ORO *) OptList[Index]->Data;\r
OptEnt.Oro->OpCode[0] = HTONS(DHCP6_OPT_BOOT_FILE_URL);\r
OptEnt.Oro->OpCode[1] = HTONS(DHCP6_OPT_BOOT_FILE_PARAM);\r
OptEnt.Oro->OpCode[2] = HTONS(DHCP6_OPT_DNS_SERVERS);\r
+ OptEnt.Oro->OpCode[3] = HTONS(DHCP6_OPT_VENDOR_CLASS);\r
Index++;\r
OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate needed resources.\r
@retval EFI_DEVICE_ERROR An unexpected network error occurred.\r
@retval Others Other errors as indicated.\r
- \r
+\r
**/\r
EFI_STATUS\r
PxeBcDns6 (\r
IN PXEBC_PRIVATE_DATA *Private,\r
IN CHAR16 *HostName,\r
- OUT EFI_IPv6_ADDRESS *IpAddress \r
+ OUT EFI_IPv6_ADDRESS *IpAddress\r
)\r
{\r
EFI_STATUS Status;\r
EFI_HANDLE Dns6Handle;\r
EFI_IPv6_ADDRESS *DnsServerList;\r
BOOLEAN IsDone;\r
- \r
+\r
Dns6 = NULL;\r
Dns6Handle = NULL;\r
DnsServerList = Private->DnsServer;\r
);\r
if (EFI_ERROR (Status)) {\r
goto Exit;\r
- } \r
- \r
+ }\r
+\r
Status = gBS->OpenProtocol (\r
Dns6Handle,\r
&gEfiDns6ProtocolGuid,\r
//\r
// Name resolution is done, check result.\r
//\r
- Status = Token.Status; \r
+ Status = Token.Status;\r
if (!EFI_ERROR (Status)) {\r
if (Token.RspData.H2AData == NULL) {\r
Status = EFI_DEVICE_ERROR;\r
IP6_COPY_ADDRESS (IpAddress, Token.RspData.H2AData->IpList);\r
Status = EFI_SUCCESS;\r
}\r
- \r
+\r
Exit:\r
FreePool (HostName);\r
\r
\r
if (Dns6 != NULL) {\r
Dns6->Configure (Dns6, NULL);\r
- \r
+\r
gBS->CloseProtocol (\r
Dns6Handle,\r
&gEfiDns6ProtocolGuid,\r
if (DnsServerList != NULL) {\r
FreePool (DnsServerList);\r
}\r
- \r
- return Status; \r
+\r
+ return Status;\r
}\r
\r
/**\r
while (*ServerAddress != '\0' && *ServerAddress != PXEBC_ADDR_END_DELIMITER) {\r
ServerAddress++;\r
}\r
- \r
+\r
if (*ServerAddress != PXEBC_ADDR_END_DELIMITER) {\r
FreePool (TmpStr);\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
*ServerAddress = '\0';\r
- \r
+\r
//\r
// Convert the string of server address to Ipv6 address format and store it.\r
//\r
if (ModeStr != NULL && *(ModeStr + AsciiStrLen (";mode=octet")) == '\0') {\r
*ModeStr = '\0';\r
} else if (AsciiStrStr (BootFileNamePtr, ";mode=") != NULL) {\r
+ FreePool (TmpStr);\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
UINT16 OpCode;\r
UINT16 OpLen;\r
EFI_STATUS Status;\r
- EFI_DHCP6_PACKET *ProxyOffer;\r
+ EFI_DHCP6_PACKET *IndexOffer;\r
UINT8 *Option;\r
\r
PxeBc = &Private->PxeBc;\r
Request = Private->Dhcp6Request;\r
- ProxyOffer = &Private->OfferBuffer[Index].Dhcp6.Packet.Offer;\r
+ IndexOffer = &Private->OfferBuffer[Index].Dhcp6.Packet.Offer;\r
SrcPort = PXEBC_BS_DISCOVER_PORT;\r
DestPort = PXEBC_BS_DISCOVER_PORT;\r
OpFlags = 0;\r
//\r
// Build the request packet by the cached request packet before.\r
//\r
- Discover->TransactionId = ProxyOffer->Dhcp6.Header.TransactionId;\r
+ Discover->TransactionId = IndexOffer->Dhcp6.Header.TransactionId;\r
Discover->MessageType = Request->Dhcp6.Header.MessageType;\r
RequestOpt = Request->Dhcp6.Option;\r
DiscoverOpt = Discover->DhcpOptions;\r
//\r
// Find Server ID Option from ProxyOffer.\r
//\r
- Option = PxeBcDhcp6SeekOption (\r
- ProxyOffer->Dhcp6.Option,\r
- ProxyOffer->Length - 4,\r
- DHCP6_OPT_SERVER_ID\r
- );\r
- if (Option == NULL) {\r
- return EFI_NOT_FOUND;\r
+ if (Private->OfferBuffer[Index].Dhcp6.OfferType == PxeOfferTypeProxyBinl) {\r
+ Option = PxeBcDhcp6SeekOption (\r
+ IndexOffer->Dhcp6.Option,\r
+ IndexOffer->Length - 4,\r
+ DHCP6_OPT_SERVER_ID\r
+ );\r
+ if (Option == NULL) {\r
+ return EFI_NOT_FOUND;\r
+ }\r
+\r
+ //\r
+ // Add Server ID Option.\r
+ //\r
+ OpLen = NTOHS (((EFI_DHCP6_PACKET_OPTION *) Option)->OpLen);\r
+ CopyMem (DiscoverOpt, Option, OpLen + 4);\r
+ DiscoverOpt += (OpLen + 4);\r
+ DiscoverLen += (OpLen + 4);\r
}\r
- \r
- //\r
- // Add Server ID Option.\r
- //\r
- OpLen = NTOHS (((EFI_DHCP6_PACKET_OPTION *) Option)->OpLen);\r
- CopyMem (DiscoverOpt, Option, OpLen + 4);\r
- DiscoverOpt += (OpLen + 4);\r
- DiscoverLen += (OpLen + 4);\r
\r
while (RequestLen < Request->Length) {\r
OpCode = NTOHS (((EFI_DHCP6_PACKET_OPTION *) RequestOpt)->OpCode);\r
}\r
\r
//\r
- // Update Elapsed option in the package \r
+ // Update Elapsed option in the package\r
//\r
Option = PxeBcDhcp6SeekOption (\r
Discover->DhcpOptions,\r
if (Option != NULL) {\r
CalcElapsedTime (Private);\r
WriteUnaligned16 ((UINT16*)(Option + 4), HTONS((UINT16) Private->ElapsedTime));\r
- } \r
+ }\r
\r
Status = PxeBc->UdpWrite (\r
PxeBc,\r
);\r
\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
\r
//\r
//\r
Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
- \r
+\r
Status = PxeBc->UdpRead (\r
PxeBc,\r
EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP | EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP,\r
Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
\r
//\r
Reply->Length = (UINT32) ReadSize;\r
\r
return EFI_SUCCESS;\r
+\r
+ON_ERROR:\r
+ if (Discover != NULL) {\r
+ FreePool (Discover);\r
+ }\r
+\r
+ return Status;\r
}\r
\r
\r
Mode = Private->PxeBc.Mode;\r
Private->IsDoDiscover = FALSE;\r
Offer = &Private->OfferBuffer[Index].Dhcp6;\r
- if (Offer->OfferType == PxeOfferTypeDhcpBinl) {\r
+ if (Offer->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL] == NULL) {\r
//\r
// There is no BootFileUrl option in dhcp6 offer, so use servers multi-cast address instead.\r
//\r
//\r
Private->OfferIndex[OfferType][Private->OfferCount[OfferType]] = Private->OfferNum;\r
Private->OfferCount[OfferType]++;\r
- } else if ((OfferType == PxeOfferTypeProxyPxe10 || OfferType == PxeOfferTypeProxyWfm11a) && \r
+ } else if ((OfferType == PxeOfferTypeProxyPxe10 || OfferType == PxeOfferTypeProxyWfm11a) &&\r
Private->OfferCount[OfferType] < 1) {\r
//\r
// Only cache the first PXE10/WFM11a offer, and discard the others.\r
\r
/**\r
Check whether IP driver could route the message which will be sent to ServerIp address.\r
- \r
+\r
This function will check the IP6 route table every 1 seconds until specified timeout is expired, if a valid\r
route is found in IP6 route table, the address will be filed in GatewayAddr and return.\r
\r
@retval EFI_SUCCESS Found a valid gateway address successfully.\r
@retval EFI_TIMEOUT The operation is time out.\r
@retval Other Unexpect error happened.\r
- \r
+\r
**/\r
EFI_STATUS\r
PxeBcCheckRouteTable (\r
if (Ip6ModeData.IcmpTypeList != NULL) {\r
FreePool (Ip6ModeData.IcmpTypeList);\r
}\r
- \r
+\r
if (GatewayIsFound || RetryCount == TimeOutInSecond) {\r
break;\r
}\r
- \r
+\r
RetryCount++;\r
- \r
+\r
//\r
// Delay 1 second then recheck it again.\r
//\r
Ip6->Poll (Ip6);\r
}\r
}\r
- \r
+\r
ON_EXIT:\r
if (TimeOutEvt != NULL) {\r
gBS->CloseEvent (TimeOutEvt);\r
}\r
- \r
+\r
if (GatewayIsFound) {\r
Status = EFI_SUCCESS;\r
} else if (RetryCount == TimeOutInSecond) {\r
Status = EFI_TIMEOUT;\r
}\r
\r
- return Status; \r
+ return Status;\r
}\r
\r
/**\r
if (EFI_ERROR (Status)) {\r
NoGateway = TRUE;\r
}\r
- \r
+\r
//\r
// There is no channel between IP6 and PXE driver about address setting,\r
// so it has to set the new address by Ip6ConfigProtocol manually.\r
goto ON_EXIT;\r
}\r
}\r
- \r
+\r
//\r
// Set the default gateway address back if needed.\r
//\r
\r
/**\r
This function will register the station IP address and flush IP instance to start using the new IP address.\r
- \r
+\r
@param[in] Private The pointer to PXEBC_PRIVATE_DATA.\r
\r
@retval EFI_SUCCESS The new IP address has been configured successfully.\r
{\r
EFI_STATUS Status;\r
EFI_DHCP6_PROTOCOL *Dhcp6;\r
- \r
+\r
Dhcp6 = Private->Dhcp6;\r
\r
CopyMem (&Private->StationIp.v6, &Private->TmpStationIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
Status = EFI_ABORTED;\r
break;\r
}\r
- \r
+\r
//\r
// Record the first Solicate msg time\r
//\r
Status = EFI_ABORTED;\r
break;\r
}\r
- \r
+\r
//\r
// Store the request packet as seed packet for discover.\r
//\r
SelectAd = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp6.Packet.Offer;\r
*NewPacket = AllocateZeroPool (SelectAd->Size);\r
ASSERT (*NewPacket != NULL);\r
+ if (*NewPacket == NULL) {\r
+ return EFI_ABORTED;\r
+ }\r
CopyMem (*NewPacket, SelectAd, SelectAd->Size);\r
}\r
break;\r
(VOID *) Discover\r
);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
\r
//\r
//\r
Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
- \r
+\r
Status = PxeBc->UdpRead (\r
PxeBc,\r
EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP,\r
//\r
Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
if (EFI_ERROR (Status)) {\r
- return Status;\r
+ goto ON_ERROR;\r
}\r
\r
return EFI_SUCCESS;\r
+\r
+ON_ERROR:\r
+ if (Discover != NULL) {\r
+ FreePool (Discover);\r
+ }\r
+\r
+ return Status;\r
}\r
\r
\r
}\r
\r
do {\r
- \r
+\r
TimerStatus = gBS->CheckEvent (Timer);\r
if (!EFI_ERROR (TimerStatus)) {\r
Status = Dhcp6->Start (Dhcp6);\r
}\r
} while (TimerStatus == EFI_NOT_READY);\r
- \r
+\r
gBS->CloseEvent (Timer);\r
}\r
if (EFI_ERROR (Status)) {\r
// DHCP6 doesn't have an option to specify the router address on the subnet, the only way to get the\r
// router address in IP6 is the router discovery mechanism (the RS and RA, which only be handled when\r
// the IP policy is Automatic). So we just hold the station IP address here and leave the IP policy as\r
- // Automatic, until we get the server IP address. This could let IP6 driver finish the router discovery \r
+ // Automatic, until we get the server IP address. This could let IP6 driver finish the router discovery\r
// to find a valid router address.\r
//\r
CopyMem (&Private->TmpStationIp.v6, &Mode.Ia->IaAddress[0].IpAddress, sizeof (EFI_IPv6_ADDRESS));\r
Dhcp6->Stop (Dhcp6);\r
return Status;\r
}\r
- \r
+\r
return EFI_SUCCESS;\r
}\r
projects / mirror_edk2.git / blobdiff