1. add error handling in case DHCP success but boot request fail

[mirror_edk2.git] / MdeModulePkg / Universal / Network / UefiPxeBcDxe / PxeBcMtftp.c

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
index 928b99a8202401703673f0a5be078b5a17528b6f..1dbe32d1607807fc9e1e6501da766e7c82cfa540 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
@@ -1,7 +1,7 @@
 /** @file\r
   PxeBc MTFTP functions.\r
   \r
-Copyright (c) 2007, Intel Corporation.<BR>\r
+Copyright (c) 2007 - 2009, Intel Corporation.<BR>\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "PxeBcImpl.h"\r
 \r
-VOID *TokenContext = NULL;\r
-\r
 CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {\r
   "blksize",\r
   "timeout",\r
@@ -43,6 +41,7 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 PxeBcCheckPacket (\r
   IN EFI_MTFTP4_PROTOCOL        *This,\r
   IN EFI_MTFTP4_TOKEN           *Token,\r
@@ -54,7 +53,7 @@ PxeBcCheckPacket (
   EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *Callback;\r
   EFI_STATUS                          Status;\r
 \r
-  Private   = (PXEBC_PRIVATE_DATA *) TokenContext;\r
+  Private   = (PXEBC_PRIVATE_DATA *) Token->Context;\r
   Callback  = Private->PxeBcCallback;\r
   Status    = EFI_SUCCESS;\r
 \r
@@ -157,7 +156,7 @@ PxeBcTftpGetFileSize (
                     );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    if (Packet->OpCode == EFI_MTFTP4_OPCODE_ERROR) {\r
+    if (Status == EFI_TFTP_ERROR) {\r
       Private->Mode.TftpErrorReceived = TRUE;\r
       Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;\r
       AsciiStrnCpy (\r
@@ -197,12 +196,12 @@ PxeBcTftpGetFileSize (
     OptCnt--;\r
   }\r
 \r
-  gBS->FreePool (Option);\r
+  FreePool (Option);\r
 \r
 ON_ERROR:\r
 \r
   if (Packet != NULL) {\r
-    gBS->FreePool (Packet);\r
+    FreePool (Packet);\r
   }\r
 \r
   Mtftp4->Configure (Mtftp4, NULL);\r
@@ -270,7 +269,7 @@ PxeBcTftpReadFile (
   Token.ModeStr       = NULL;\r
   Token.OptionCount   = OptCnt;\r
   Token.OptionList    = ReqOpt;\r
-  TokenContext        = Private;\r
+  Token.Context       = Private;\r
 \r
   if (DontUseBuffer) {\r
     Token.BufferSize  = 0;\r
@@ -427,7 +426,7 @@ PxeBcTftpReadDirectory (
   Token.ModeStr       = NULL;\r
   Token.OptionCount   = OptCnt;\r
   Token.OptionList    = ReqOpt;\r
-  TokenContext        = Private;\r
+  Token.Context       = Private;\r
 \r
   if (DontUseBuffer) {\r
     Token.BufferSize  = 0;\r