ShellPkg/ShellLib: Constructor doesn't depend on ShellParameters

[mirror_edk2.git] / ShellPkg / Library / UefiShellTftpCommandLib / Tftp.c

diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
old mode 100644 (file)
new mode 100755 (executable)
index 02099fe..fbde3bf
--- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
@@ -2,7 +2,7 @@
   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
@@ -163,6 +163,7 @@ GetFileSize (
   @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
@@ -180,6 +181,7 @@ DownloadFile (
   IN   CONST CHAR16         *FilePath,\r
   IN   CONST CHAR8          *AsciiFilePath,\r
   IN   UINTN                FileSize,\r
+  IN   UINT16               BlockSize,\r
   OUT  VOID                 **Data\r
   );\r
 \r
@@ -223,9 +225,21 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   {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
@@ -258,6 +272,7 @@ ShellCommandRunTftp (
   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
@@ -269,8 +284,10 @@ ShellCommandRunTftp (
   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
@@ -278,6 +295,8 @@ ShellCommandRunTftp (
   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
@@ -325,7 +344,7 @@ ShellCommandRunTftp (
     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
@@ -341,14 +360,14 @@ ShellCommandRunTftp (
   }\r
 \r
   RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2);\r
-  AsciiRemoteFilePath = AllocatePool (\r
-                          (StrLen (RemoteFilePath) + 1) * sizeof (CHAR8)\r
-                          );\r
+  ASSERT(RemoteFilePath != NULL);\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
@@ -403,6 +422,20 @@ ShellCommandRunTftp (
     }\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
@@ -477,7 +510,7 @@ ShellCommandRunTftp (
       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
@@ -506,6 +539,7 @@ ShellCommandRunTftp (
       goto NextHandle;\r
     }\r
 \r
+    DataSize = FileSize;\r
     Status = ShellWriteFile (FileHandle, &FileSize, Data);\r
     if (!EFI_ERROR (Status)) {\r
       ShellStatus = SHELL_SUCCESS;\r
@@ -520,7 +554,7 @@ ShellCommandRunTftp (
     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
@@ -842,6 +876,7 @@ Error :
   @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
@@ -859,6 +894,7 @@ DownloadFile (
   IN   CONST CHAR16         *FilePath,\r
   IN   CONST CHAR8          *AsciiFilePath,\r
   IN   UINTN                FileSize,\r
+  IN   UINT16               BlockSize,\r
   OUT  VOID                 **Data\r
   )\r
 {\r
@@ -867,6 +903,8 @@ DownloadFile (
   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
@@ -899,6 +937,14 @@ DownloadFile (
   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