The implementation for the 'tftp' Shell command.\r
\r
Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>\r
- Copyright (c) 2015, Intel Corporation. All rights reserved. <BR>\r
+ Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. <BR>\r
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
\r
This program and the accompanying materials\r
@param[in] FilePath Path of the file, Unicode encoded\r
@param[in] AsciiFilePath Path of the file, ASCII encoded\r
@param[in] FileSize Size of the file in number of bytes\r
+ @param[in] BlockSize Value of the TFTP blksize option\r
@param[out] Data Address where to store the address of the buffer\r
where the data of the file were downloaded in\r
case of success.\r
IN CONST CHAR16 *FilePath,\r
IN CONST CHAR8 *AsciiFilePath,\r
IN UINTN FileSize,\r
+ IN UINT16 BlockSize,\r
OUT VOID **Data\r
);\r
\r
{L"-r", TypeValue},\r
{L"-c", TypeValue},\r
{L"-t", TypeValue},\r
+ {L"-s", TypeValue},\r
{NULL , TypeMax}\r
};\r
\r
+///\r
+/// The default block size (512) of tftp is defined in the RFC1350.\r
+///\r
+#define MTFTP_DEFAULT_BLKSIZE 512\r
+///\r
+/// The valid range of block size option is defined in the RFC2348.\r
+///\r
+#define MTFTP_MIN_BLKSIZE 8\r
+#define MTFTP_MAX_BLKSIZE 65464\r
+\r
+\r
/**\r
Function for 'tftp' command.\r
\r
CONST CHAR16 *ValueStr;\r
CONST CHAR16 *RemoteFilePath;\r
CHAR8 *AsciiRemoteFilePath;\r
+ UINTN FilePathSize;\r
CONST CHAR16 *Walker;\r
CONST CHAR16 *LocalFilePath;\r
EFI_MTFTP4_CONFIG_DATA Mtftp4ConfigData;\r
EFI_HANDLE Mtftp4ChildHandle;\r
EFI_MTFTP4_PROTOCOL *Mtftp4;\r
UINTN FileSize;\r
+ UINTN DataSize;\r
VOID *Data;\r
SHELL_FILE_HANDLE FileHandle;\r
+ UINT16 BlockSize;\r
\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
ProblemParam = NULL;\r
AsciiRemoteFilePath = NULL;\r
Handles = NULL;\r
FileSize = 0;\r
+ DataSize = 0;\r
+ BlockSize = MTFTP_DEFAULT_BLKSIZE;\r
\r
//\r
// Initialize the Shell library (we must be in non-auto-init...)\r
goto Error;\r
}\r
\r
- Mtftp4ConfigData = DefaultMtftp4ConfigData;\r
+ CopyMem (&Mtftp4ConfigData, &DefaultMtftp4ConfigData, sizeof (EFI_MTFTP4_CONFIG_DATA));\r
\r
//\r
// Check the host IPv4 address\r
\r
RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2);\r
ASSERT(RemoteFilePath != NULL);\r
- AsciiRemoteFilePath = AllocatePool (\r
- (StrLen (RemoteFilePath) + 1) * sizeof (CHAR8)\r
- );\r
+ FilePathSize = StrLen (RemoteFilePath) + 1;\r
+ AsciiRemoteFilePath = AllocatePool (FilePathSize);\r
if (AsciiRemoteFilePath == NULL) {\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
goto Error;\r
}\r
- UnicodeStrToAsciiStr (RemoteFilePath, AsciiRemoteFilePath);\r
+ UnicodeStrToAsciiStrS (RemoteFilePath, AsciiRemoteFilePath, FilePathSize);\r
\r
if (ParamCount == 4) {\r
LocalFilePath = ShellCommandLineGetRawValue (CheckPackage, 3);\r
}\r
}\r
\r
+ ValueStr = ShellCommandLineGetValue (CheckPackage, L"-s");\r
+ if (ValueStr != NULL) {\r
+ if (!StringToUint16 (ValueStr, &BlockSize)) {\r
+ goto Error;\r
+ }\r
+ if (BlockSize < MTFTP_MIN_BLKSIZE || BlockSize > MTFTP_MAX_BLKSIZE) {\r
+ ShellPrintHiiEx (\r
+ -1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV),\r
+ gShellTftpHiiHandle, L"tftp", ValueStr\r
+ );\r
+ goto Error;\r
+ }\r
+ }\r
+\r
//\r
// Locate all MTFTP4 Service Binding protocols\r
//\r
goto NextHandle;\r
}\r
\r
- Status = DownloadFile (Mtftp4, RemoteFilePath, AsciiRemoteFilePath, FileSize, &Data);\r
+ Status = DownloadFile (Mtftp4, RemoteFilePath, AsciiRemoteFilePath, FileSize, BlockSize, &Data);\r
if (EFI_ERROR (Status)) {\r
ShellPrintHiiEx (\r
-1, -1, NULL, STRING_TOKEN (STR_TFTP_ERR_DOWNLOAD),\r
goto NextHandle;\r
}\r
\r
+ DataSize = FileSize;\r
Status = ShellWriteFile (FileHandle, &FileSize, Data);\r
if (!EFI_ERROR (Status)) {\r
ShellStatus = SHELL_SUCCESS;\r
NextHandle:\r
\r
if (Data != NULL) {\r
- gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, EFI_SIZE_TO_PAGES (FileSize));\r
+ gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, EFI_SIZE_TO_PAGES (DataSize));\r
}\r
\r
CloseProtocolAndDestroyServiceChild (\r
@param[in] FilePath Path of the file, Unicode encoded\r
@param[in] AsciiFilePath Path of the file, ASCII encoded\r
@param[in] FileSize Size of the file in number of bytes\r
+ @param[in] BlockSize Value of the TFTP blksize option\r
@param[out] Data Address where to store the address of the buffer\r
where the data of the file were downloaded in\r
case of success.\r
IN CONST CHAR16 *FilePath,\r
IN CONST CHAR8 *AsciiFilePath,\r
IN UINTN FileSize,\r
+ IN UINT16 BlockSize,\r
OUT VOID **Data\r
)\r
{\r
VOID *Buffer;\r
DOWNLOAD_CONTEXT *TftpContext;\r
EFI_MTFTP4_TOKEN Mtftp4Token;\r
+ EFI_MTFTP4_OPTION ReqOpt;\r
+ UINT8 OptBuf[10];\r
\r
// Downloaded file can be large. BS.AllocatePages() is more faster\r
// than AllocatePool() and avoid fragmentation.\r
Mtftp4Token.Buffer = Buffer;\r
Mtftp4Token.CheckPacket = CheckPacket;\r
Mtftp4Token.Context = (VOID*)TftpContext;\r
+ if (BlockSize != MTFTP_DEFAULT_BLKSIZE) {\r
+ ReqOpt.OptionStr = (UINT8 *) "blksize";\r
+ AsciiSPrint ((CHAR8 *)OptBuf, sizeof (OptBuf), "%d", BlockSize);\r
+ ReqOpt.ValueStr = OptBuf;\r
+\r
+ Mtftp4Token.OptionCount = 1;\r
+ Mtftp4Token.OptionList = &ReqOpt;\r
+ }\r
\r
ShellPrintHiiEx (\r
-1, -1, NULL, STRING_TOKEN (STR_TFTP_DOWNLOADING),\r