/** @file\r
Implementation of the boot file download function.\r
\r
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials are licensed and made available under \r
the terms and conditions of the BSD License that accompanies this distribution. \r
Private->BootFileUri = Private->FilePathUri;\r
}\r
\r
+ //\r
+ // Check the URI scheme.\r
+ //\r
+ Status = HttpBootCheckUriScheme (Private->BootFileUri);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "HttpBootDhcp4ExtractUriInfo: %r.\n", Status));\r
+ return Status;\r
+ }\r
+\r
//\r
// Configure the default DNS server if server assigned.\r
//\r
EFI_DHCP6_PACKET_OPTION *Option;\r
EFI_IPv6_ADDRESS IpAddr;\r
CHAR8 *HostName;\r
+ UINTN HostNameSize;\r
CHAR16 *HostNameStr;\r
EFI_STATUS Status;\r
\r
Private->BootFileUri = Private->FilePathUri;\r
}\r
\r
+ //\r
+ // Check the URI scheme.\r
+ //\r
+ Status = HttpBootCheckUriScheme (Private->BootFileUri);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "HttpBootDhcp6ExtractUriInfo: %r.\n", Status));\r
+ return Status;\r
+ }\r
+\r
//\r
// Set the Local station address to IP layer.\r
//\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
+ //\r
+ // Register the IPv6 gateway address to the network device.\r
+ //\r
+ Status = HttpBootSetIp6Gateway (Private);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
//\r
// Configure the default DNS server if server assigned.\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- \r
- HostNameStr = AllocateZeroPool ((AsciiStrLen (HostName) + 1) * sizeof (CHAR16));\r
+\r
+ HostNameSize = AsciiStrSize (HostName);\r
+ HostNameStr = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
if (HostNameStr == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Error;\r
}\r
\r
- AsciiStrToUnicodeStr (HostName, HostNameStr);\r
+ AsciiStrToUnicodeStrS (HostName, HostNameStr, HostNameSize);\r
Status = HttpBootDns (Private, HostNameStr, &IpAddr);\r
FreePool (HostNameStr);\r
if (EFI_ERROR (Status)) {\r
} \r
} \r
\r
- CopyMem (&Private->ServerIp.v6, &IpAddr, sizeof (EFI_IPv6_ADDRESS)); \r
- \r
- //\r
- // register the IPv6 gateway address to the network device.\r
- //\r
- Status = HttpBootSetIp6Gateway (Private);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ CopyMem (&Private->ServerIp.v6, &IpAddr, sizeof (EFI_IPv6_ADDRESS));\r
\r
//\r
// Extract the port from URL, and use default HTTP port 80 if not provided.\r
{\r
HTTP_IO_CONFIG_DATA ConfigData;\r
EFI_STATUS Status;\r
+ EFI_HANDLE ImageHandle;\r
\r
ASSERT (Private != NULL);\r
\r
ConfigData.Config4.RequestTimeOut = HTTP_BOOT_REQUEST_TIMEOUT;\r
IP4_COPY_ADDRESS (&ConfigData.Config4.LocalIp, &Private->StationIp.v4);\r
IP4_COPY_ADDRESS (&ConfigData.Config4.SubnetMask, &Private->SubnetMask.v4);\r
+ ImageHandle = Private->Ip4Nic->ImageHandle;\r
} else {\r
ConfigData.Config6.HttpVersion = HttpVersion11;\r
ConfigData.Config6.RequestTimeOut = HTTP_BOOT_REQUEST_TIMEOUT;\r
IP6_COPY_ADDRESS (&ConfigData.Config6.LocalIp, &Private->StationIp.v6);\r
+ ImageHandle = Private->Ip6Nic->ImageHandle;\r
}\r
\r
Status = HttpIoCreateIo (\r
- Private->Image,\r
+ ImageHandle,\r
Private->Controller,\r
Private->UsingIpv6 ? IP_VERSION_6 : IP_VERSION_4,\r
&ConfigData,\r
@param[out] Buffer The memory buffer to transfer the file to. IF Buffer is NULL,\r
then the size of the requested file is returned in\r
BufferSize.\r
+ @param[out] ImageType The image type of the downloaded file.\r
\r
@retval EFI_SUCCESS Successfully created.\r
@retval Others Failed to create HttpIo.\r
IN HTTP_BOOT_PRIVATE_DATA *Private,\r
IN CHAR16 *Uri,\r
IN OUT UINTN *BufferSize,\r
- OUT UINT8 *Buffer\r
+ OUT UINT8 *Buffer,\r
+ OUT HTTP_BOOT_IMAGE_TYPE *ImageType\r
)\r
{\r
LIST_ENTRY *Entry;\r
HTTP_BOOT_ENTITY_DATA *EntityData;\r
UINTN CopyedSize;\r
\r
- if (Uri == NULL || BufferSize == 0 || Buffer == NULL) {\r
+ if (Uri == NULL || BufferSize == 0 || Buffer == NULL || ImageType == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
(StrCmp (Uri, Cache->RequestData->Url) == 0)) \r
{\r
//\r
- // Hit cache, check buffer size.\r
+ // Hit in cache, record image type.\r
+ //\r
+ *ImageType = Cache->ImageType;\r
+\r
+ //\r
+ // Check buffer size.\r
//\r
if (*BufferSize < Cache->EntityLength) {\r
*BufferSize = Cache->EntityLength;\r
@param[out] Buffer The memory buffer to transfer the file to. IF Buffer is NULL,\r
then the size of the requested file is returned in\r
BufferSize.\r
+ @param[out] ImageType The image type of the downloaded file.\r
\r
@retval EFI_SUCCESS The file was loaded.\r
@retval EFI_INVALID_PARAMETER BufferSize is NULL or Buffer Size is not NULL but Buffer is NULL.\r
IN HTTP_BOOT_PRIVATE_DATA *Private,\r
IN BOOLEAN HeaderOnly,\r
IN OUT UINTN *BufferSize,\r
- OUT UINT8 *Buffer\r
+ OUT UINT8 *Buffer,\r
+ OUT HTTP_BOOT_IMAGE_TYPE *ImageType\r
)\r
{\r
EFI_STATUS Status;\r
UINTN ContentLength;\r
HTTP_BOOT_CACHE_CONTENT *Cache;\r
UINT8 *Block;\r
+ UINTN UrlSize;\r
CHAR16 *Url;\r
BOOLEAN IdentityMode;\r
UINTN ReceivedSize;\r
ASSERT (Private != NULL);\r
ASSERT (Private->HttpCreated);\r
\r
- if (BufferSize == NULL) {\r
+ if (BufferSize == NULL || ImageType == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// First, check whether we already cached the requested Uri.\r
//\r
- Url = AllocatePool ((AsciiStrLen (Private->BootFileUri) + 1) * sizeof (CHAR16));\r
+ UrlSize = AsciiStrSize (Private->BootFileUri);\r
+ Url = AllocatePool (UrlSize * sizeof (CHAR16));\r
if (Url == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- AsciiStrToUnicodeStr (Private->BootFileUri, Url);\r
+ AsciiStrToUnicodeStrS (Private->BootFileUri, Url, UrlSize);\r
if (!HeaderOnly) {\r
- Status = HttpBootGetFileFromCache (Private, Url, BufferSize, Buffer);\r
+ Status = HttpBootGetFileFromCache (Private, Url, BufferSize, Buffer, ImageType);\r
if (Status != EFI_NOT_FOUND) {\r
FreePool (Url);\r
return Status;\r
Status = EFI_OUT_OF_RESOURCES;\r
goto ERROR_1;\r
}\r
+ Cache->ImageType = ImageTypeMax;\r
InitializeListHead (&Cache->EntityDataList);\r
}\r
\r
}\r
RequestData->Method = HeaderOnly ? HttpMethodHead : HttpMethodGet;\r
RequestData->Url = Url;\r
- if (RequestData->Url == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto ERROR_4;\r
- }\r
- AsciiStrToUnicodeStr (Private->BootFileUri, RequestData->Url);\r
\r
//\r
// 2.3 Record the request info in a temp cache item.\r
goto ERROR_5;\r
}\r
\r
+ //\r
+ // Check the image type according to server's response.\r
+ //\r
+ Status = HttpBootCheckImageType (\r
+ Private->BootFileUri,\r
+ Private->BootFileUriParser,\r
+ ResponseData->HeaderCount,\r
+ ResponseData->Headers,\r
+ ImageType\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ERROR_5;\r
+ }\r
+\r
//\r
// 3.2 Cache the response header.\r
//\r
if (Cache != NULL) {\r
Cache->ResponseData = ResponseData;\r
+ Cache->ImageType = *ImageType;\r
}\r
\r
//\r
FALSE,\r
&ResponseBody\r
);\r
- if (EFI_ERROR (Status)) {\r
+ if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
+ if (EFI_ERROR (ResponseBody.Status)) {\r
+ Status = ResponseBody.Status;\r
+ }\r
goto ERROR_6;\r
}\r
ReceivedSize += ResponseBody.BodyLength;\r
FALSE,\r
&ResponseBody\r
);\r
- if (EFI_ERROR (Status)) {\r
+ if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
+ if (EFI_ERROR (ResponseBody.Status)) {\r
+ Status = ResponseBody.Status;\r
+ }\r
goto ERROR_6;\r
}\r
\r
\r
if (*BufferSize < ContentLength) {\r
Status = EFI_BUFFER_TOO_SMALL;\r
+ } else {\r
+ Status = EFI_SUCCESS;\r
}\r
*BufferSize = ContentLength;\r
\r
HttpFreeMsgParser (Parser);\r
}\r
\r
- return EFI_SUCCESS;\r
+ return Status;\r
\r
ERROR_6:\r
if (Parser != NULL) {\r
projects / mirror_edk2.git / blobdiff