/** @file\r
Interface routines for PxeBc.\r
\r
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
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
return;\r
}\r
\r
- if (EFI_ERROR (Status) || (RxData == NULL)) {\r
+ if (RxData == NULL) {\r
+ goto Resume;\r
+ }\r
+\r
+ if (Status != EFI_ICMP_ERROR) {\r
//\r
- // Only process the normal packets and the icmp error packets, if RxData is NULL\r
- // with Status == EFI_SUCCESS or EFI_ICMP_ERROR, just resume the receive although\r
- // this should be a bug of the low layer (IP).\r
+ // The return status should be recognized as EFI_ICMP_ERROR.\r
//\r
- goto Resume;\r
+ goto CleanUp;\r
}\r
\r
if (EFI_IP4 (RxData->Header->SourceAddress) != 0 &&\r
CopiedPointer += CopiedLen;\r
}\r
\r
- goto Resume;\r
-\r
CleanUp:\r
gBS->SignalEvent (RxData->RecycleSignal);\r
\r
\r
//\r
// Configure block size for TFTP as a default value to handle all link layers.\r
- // \r
+ //\r
Private->BlockSize = MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -\r
PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
//\r
if (PcdGet64 (PcdTftpBlockSize) != 0) {\r
Private->BlockSize = (UINTN) PcdGet64 (PcdTftpBlockSize);\r
}\r
- \r
+\r
Private->AddressIsOk = FALSE;\r
\r
ZeroMem (Mode, sizeof (EFI_PXE_BASE_CODE_MODE));\r
}\r
\r
//\r
- //DHCP4 service allows only one of its children to be configured in \r
- //the active state, If the DHCP4 D.O.R.A started by IP4 auto \r
- //configuration and has not been completed, the Dhcp4 state machine \r
- //will not be in the right state for the PXE to start a new round D.O.R.A. \r
+ //DHCP4 service allows only one of its children to be configured in\r
+ //the active state, If the DHCP4 D.O.R.A started by IP4 auto\r
+ //configuration and has not been completed, the Dhcp4 state machine\r
+ //will not be in the right state for the PXE to start a new round D.O.R.A.\r
//so we need to switch it's policy to static.\r
//\r
Status = PxeBcSetIp4Policy (Private);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
- \r
+\r
Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
CopyMem (&Private->Udp4CfgData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Private->Ip4ConfigData.StationAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Private->Ip4ConfigData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
- \r
+\r
//\r
// Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.\r
//\r
Private->Ip4->Cancel (Private->Ip4, &Private->IcmpErrorRcvToken);\r
Private->Ip4->Configure (Private->Ip4, NULL);\r
- \r
+\r
Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
- \r
+\r
Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpErrorRcvToken);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
- } \r
+ }\r
}\r
}\r
\r
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
\r
//\r
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
//\r
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
This->SetIpFilter (This, &IpFilter);\r
- \r
+\r
return Status;\r
}\r
\r
if (!Mode->PxeDiscoverValid || !Mode->PxeReplyReceived || (!Mode->PxeBisReplyReceived && UseBis)) {\r
\r
Status = EFI_INVALID_PARAMETER;\r
- goto ON_EXIT; \r
+ goto ON_EXIT;\r
}\r
\r
DefaultInfo.IpCnt = 1;\r
// Address is not acquired or no discovery options.\r
//\r
Status = EFI_INVALID_PARAMETER;\r
- goto ON_EXIT; \r
+ goto ON_EXIT;\r
}\r
\r
DefaultInfo.UseMCast = (BOOLEAN)!IS_DISABLE_MCAST_DISCOVER (VendorOpt->DiscoverCtrl);\r
if (CreatedInfo == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto ON_EXIT;\r
- \r
- } \r
- \r
+\r
+ }\r
+\r
CopyMem (CreatedInfo, &DefaultInfo, sizeof (DefaultInfo));\r
Info = CreatedInfo;\r
SrvList = Info->SrvList;\r
\r
if (Index != Info->IpCnt) {\r
Status = EFI_INVALID_PARAMETER;\r
- goto ON_EXIT; \r
+ goto ON_EXIT;\r
}\r
}\r
}\r
);\r
if (!EFI_ERROR (Status)) {\r
break;\r
- } \r
+ }\r
}\r
\r
} else if (Info->UseMCast) {\r
ON_EXIT:\r
\r
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
- \r
+\r
//\r
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
//\r
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
This->SetIpFilter (This, &IpFilter);\r
- \r
+\r
return Status;\r
}\r
\r
if ((This == NULL) ||\r
(Filename == NULL) ||\r
(BufferSize == NULL) ||\r
- ((ServerIp == NULL) || \r
- (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) || \r
+ ((ServerIp == NULL) ||\r
+ (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) ||\r
IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0])))) ||\r
((BufferPtr == NULL) && DontUseBuffer) ||\r
((BlockSize != NULL) && (*BlockSize < 512))) {\r
ON_EXIT:\r
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
//\r
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
//\r
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
Private->CurrentUdpSrcPort = 0;\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));\r
ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));\r
\r
}\r
}\r
}\r
- \r
+\r
//\r
// Check whether we need reconfigure the UDP instance.\r
//\r
Udp4Cfg = &Private->Udp4CfgData;\r
if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous) ||\r
- (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate) {\r
+ (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate) {\r
//\r
// Clear the UDP instance configuration, all joined groups will be left\r
// during the operation.\r
}\r
\r
if (NewStationIp != NULL) {\r
- if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) || \r
+ if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||\r
IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||\r
(NewSubnetMask != NULL && NewSubnetMask->Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
- \r
+\r
Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
Mode = Private->PxeBc.Mode;\r
\r
BOOLEAN NewMakeCallback;\r
EFI_STATUS Status;\r
UINT64 TmpBufSize;\r
- BOOLEAN MediaPresent;\r
+ EFI_STATUS MediaStatus;\r
\r
if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
Private = PXEBC_PRIVATE_DATA_FROM_LOADFILE (This);\r
PxeBc = &Private->PxeBc;\r
NewMakeCallback = FALSE;\r
//\r
// Check media status before PXE start\r
//\r
- MediaPresent = TRUE;\r
- NetLibDetectMedia (Private->Controller, &MediaPresent);\r
- if (!MediaPresent) {\r
+ MediaStatus = EFI_SUCCESS;\r
+ NetLibDetectMediaWaitTimeout (Private->Controller, PXEBC_CHECK_MEDIA_WAITING_TIME, &MediaStatus);\r
+ if (MediaStatus != EFI_SUCCESS) {\r
return EFI_NO_MEDIA;\r
}\r
\r
AsciiPrint ("\n NBP file downloaded successfully.\n");\r
//\r
// The DHCP4 can have only one configured child instance so we need to stop\r
- // reset the DHCP4 child before we return. Otherwise the other programs which \r
+ // reset the DHCP4 child before we return. Otherwise the other programs which\r
// also need to use DHCP4 will be impacted.\r
// The functionality of PXE Base Code protocol will not be stopped,\r
// when downloading is successfully.\r
projects / mirror_edk2.git / blobdiff