tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Refine the error handling when the PXE-v4 DHCP offer isn't valid 

Signed-off-by: hhuan13
Reviewed-by: xdu2

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12192 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hhuan13 2011-08-24 08:53:22 +00:00
parent 379db4ac17
commit 4496ff751f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c
View File

@ -1164,6 +1164,8 @@ ON_EXIT:
AsciiPrint ("\n PXE-E22: Client received ICMP error from server.\n"); AsciiPrint ("\n PXE-E22: Client received ICMP error from server.\n");
} else if (Status == EFI_TFTP_ERROR) { } else if (Status == EFI_TFTP_ERROR) {
AsciiPrint ("\n PXE-E23: Client received TFTP error from server.\n"); AsciiPrint ("\n PXE-E23: Client received TFTP error from server.\n");
} else if (Status == EFI_NOT_FOUND) {
AsciiPrint ("\n PXE-E53: No boot filename received.\n");
} else if (Status != EFI_BUFFER_TOO_SMALL) { } else if (Status != EFI_BUFFER_TOO_SMALL) {
AsciiPrint ("\n PXE-E99: Unexpected network error.\n"); AsciiPrint ("\n PXE-E99: Unexpected network error.\n");
} }

5
NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
View File

@ -960,6 +960,7 @@ PxeBcSelectDhcp4Offer (
@retval EFI_SUCCESS Handled the DHCPv4 offer packet successfully. @retval EFI_SUCCESS Handled the DHCPv4 offer packet successfully.
@retval EFI_NO_RESPONSE No response to the following request packet. @retval EFI_NO_RESPONSE No response to the following request packet.
@retval EFI_NOT_FOUND No boot filename received.
**/ **/
EFI_STATUS EFI_STATUS
@ -1070,7 +1071,9 @@ PxeBcHandleDhcp4Offer (
// //
// Othewise, the bootfile name must be included in DhcpOnly offer. // Othewise, the bootfile name must be included in DhcpOnly offer.
// //
ASSERT (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL); if (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL) {
Status = EFI_NOT_FOUND;
}
} }
} }

2
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -388,6 +388,8 @@ EfiPxeBcDhcp (
Mode->IcmpErrorReceived = FALSE; Mode->IcmpErrorReceived = FALSE;
Private->Function = EFI_PXE_BASE_CODE_FUNCTION_DHCP; Private->Function = EFI_PXE_BASE_CODE_FUNCTION_DHCP;
Private->IsOfferSorted = SortOffers; Private->IsOfferSorted = SortOffers;
Private->SolicitTimes = 0;
Private->ElapsedTime = 0;
if (!Mode->Started) { if (!Mode->Started) {
return EFI_NOT_STARTED; return EFI_NOT_STARTED;