/** @file\r
This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL.\r
\r
- Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
\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
- http://opensource.org/licenses/bsd-license.php.\r
-\r
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+ SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
#include "PxeBcImpl.h"\r
\r
-\r
/**\r
Enables the use of the PXE Base Code Protocol functions.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcStart (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN BOOLEAN UseIpv6\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN BOOLEAN UseIpv6\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
//\r
// Detect whether using IPv6 or not, and set it into mode data.\r
//\r
- if (UseIpv6 && Mode->Ipv6Available && Mode->Ipv6Supported && Private->Ip6Nic != NULL) {\r
+ if (UseIpv6 && Mode->Ipv6Available && Mode->Ipv6Supported && (Private->Ip6Nic != NULL)) {\r
Mode->UsingIpv6 = TRUE;\r
- } else if (!UseIpv6 && Private->Ip4Nic != NULL) {\r
+ } else if (!UseIpv6 && (Private->Ip4Nic != NULL)) {\r
Mode->UsingIpv6 = FALSE;\r
} else {\r
return EFI_UNSUPPORTED;\r
\r
if (Mode->UsingIpv6) {\r
AsciiPrint ("\n>>Start PXE over IPv6");\r
+ //\r
+ // Configure udp6 instance to receive data.\r
+ //\r
+ Status = Private->Udp6Read->Configure (\r
+ Private->Udp6Read,\r
+ &Private->Udp6CfgData\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ON_ERROR;\r
+ }\r
+\r
//\r
// Configure block size for TFTP as a default value to handle all link layers.\r
//\r
- Private->BlockSize = (UINTN) (Private->Ip6MaxPacketSize -\r
- PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE);\r
+ Private->BlockSize = Private->Ip6MaxPacketSize -\r
+ PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
\r
//\r
// PXE over IPv6 starts here, initialize the fields and list header.\r
//\r
Private->Ip6Policy = PXEBC_IP6_POLICY_MAX;\r
- Private->ProxyOffer.Dhcp6.Packet.Offer.Size = PXEBC_DHCP6_PACKET_MAX_SIZE;\r
- Private->DhcpAck.Dhcp6.Packet.Ack.Size = PXEBC_DHCP6_PACKET_MAX_SIZE;\r
- Private->PxeReply.Dhcp6.Packet.Ack.Size = PXEBC_DHCP6_PACKET_MAX_SIZE;\r
+ Private->ProxyOffer.Dhcp6.Packet.Offer.Size = PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE;\r
+ Private->DhcpAck.Dhcp6.Packet.Ack.Size = PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE;\r
+ Private->PxeReply.Dhcp6.Packet.Ack.Size = PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE;\r
\r
for (Index = 0; Index < PXEBC_OFFER_MAX_NUM; Index++) {\r
- Private->OfferBuffer[Index].Dhcp6.Packet.Offer.Size = PXEBC_DHCP6_PACKET_MAX_SIZE;\r
+ Private->OfferBuffer[Index].Dhcp6.Packet.Offer.Size = PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE;\r
}\r
\r
//\r
// Create event and set status for token to capture ICMP6 error message.\r
//\r
Private->Icmp6Token.Status = EFI_NOT_READY;\r
- Status = gBS->CreateEvent (\r
- EVT_NOTIFY_SIGNAL,\r
- TPL_NOTIFY,\r
- PxeBcIcmp6ErrorUpdate,\r
- Private,\r
- &Private->Icmp6Token.Event\r
- );\r
+ Status = gBS->CreateEvent (\r
+ EVT_NOTIFY_SIGNAL,\r
+ TPL_NOTIFY,\r
+ PxeBcIcmp6ErrorUpdate,\r
+ Private,\r
+ &Private->Icmp6Token.Event\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ON_ERROR;\r
+ }\r
+\r
+ //\r
+ // Set Ip6 policy to Automatic to start the IP6 router discovery.\r
+ //\r
+ Status = PxeBcSetIp6Policy (Private);\r
if (EFI_ERROR (Status)) {\r
goto ON_ERROR;\r
}\r
} else {\r
AsciiPrint ("\n>>Start PXE over IPv4");\r
+ //\r
+ // Configure udp4 instance to receive data.\r
+ //\r
+ Status = Private->Udp4Read->Configure (\r
+ Private->Udp4Read,\r
+ &Private->Udp4CfgData\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ON_ERROR;\r
+ }\r
+\r
//\r
// Configure block size for TFTP as a default value to handle all link layers.\r
//\r
- Private->BlockSize = (UINTN) (Private->Ip4MaxPacketSize -\r
- PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE);\r
+ Private->BlockSize = Private->Ip4MaxPacketSize -\r
+ PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
\r
//\r
// PXE over IPv4 starts here, initialize the fields.\r
//\r
- Private->ProxyOffer.Dhcp4.Packet.Offer.Size = PXEBC_DHCP4_PACKET_MAX_SIZE;\r
- Private->DhcpAck.Dhcp4.Packet.Ack.Size = PXEBC_DHCP4_PACKET_MAX_SIZE;\r
- Private->PxeReply.Dhcp4.Packet.Ack.Size = PXEBC_DHCP4_PACKET_MAX_SIZE;\r
+ Private->ProxyOffer.Dhcp4.Packet.Offer.Size = PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE;\r
+ Private->DhcpAck.Dhcp4.Packet.Ack.Size = PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE;\r
+ Private->PxeReply.Dhcp4.Packet.Ack.Size = PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE;\r
\r
for (Index = 0; Index < PXEBC_OFFER_MAX_NUM; Index++) {\r
- Private->OfferBuffer[Index].Dhcp4.Packet.Offer.Size = PXEBC_DHCP4_PACKET_MAX_SIZE;\r
+ Private->OfferBuffer[Index].Dhcp4.Packet.Offer.Size = PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE;\r
}\r
\r
PxeBcSeedDhcp4Packet (&Private->SeedPacket, Private->Udp4Read);\r
// Create event and set status for token to capture ICMP error message.\r
//\r
Private->Icmp6Token.Status = EFI_NOT_READY;\r
- Status = gBS->CreateEvent (\r
- EVT_NOTIFY_SIGNAL,\r
- TPL_NOTIFY,\r
- PxeBcIcmpErrorUpdate,\r
- Private,\r
- &Private->IcmpToken.Event\r
- );\r
+ Status = gBS->CreateEvent (\r
+ EVT_NOTIFY_SIGNAL,\r
+ TPL_NOTIFY,\r
+ PxeBcIcmpErrorUpdate,\r
+ Private,\r
+ &Private->IcmpToken.Event\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ON_ERROR;\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
+ // so we need to switch its policy to static.\r
+ //\r
+ Status = PxeBcSetIp4Policy (Private);\r
if (EFI_ERROR (Status)) {\r
goto ON_ERROR;\r
}\r
// If PcdTftpBlockSize is set to non-zero, override the default value.\r
//\r
if (PcdGet64 (PcdTftpBlockSize) != 0) {\r
- Private->BlockSize = (UINTN) PcdGet64 (PcdTftpBlockSize);\r
+ Private->BlockSize = (UINTN)PcdGet64 (PcdTftpBlockSize);\r
}\r
\r
//\r
gBS->CloseEvent (Private->Icmp6Token.Event);\r
Private->Icmp6Token.Event = NULL;\r
}\r
+\r
Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
Private->Ip6->Configure (Private->Ip6, NULL);\r
} else {\r
gBS->CloseEvent (Private->ArpUpdateEvent);\r
Private->ArpUpdateEvent = NULL;\r
}\r
+\r
if (Private->IcmpToken.Event != NULL) {\r
gBS->CloseEvent (Private->IcmpToken.Event);\r
Private->IcmpToken.Event = NULL;\r
}\r
+\r
Private->Udp4Read->Configure (Private->Udp4Read, NULL);\r
Private->Ip4->Configure (Private->Ip4, NULL);\r
}\r
+\r
return Status;\r
}\r
\r
-\r
/**\r
Disable the use of the PXE Base Code Protocol functions.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcStop (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
gBS->CloseEvent (Private->Icmp6Token.Event);\r
Private->Icmp6Token.Event = NULL;\r
}\r
+\r
if (Private->Dhcp6Request != NULL) {\r
FreePool (Private->Dhcp6Request);\r
Private->Dhcp6Request = NULL;\r
}\r
+\r
if (Private->BootFileName != NULL) {\r
FreePool (Private->BootFileName);\r
Private->BootFileName = NULL;\r
gBS->CloseEvent (Private->ArpUpdateEvent);\r
Private->ArpUpdateEvent = NULL;\r
}\r
+\r
if (Private->IcmpToken.Event != NULL) {\r
gBS->CloseEvent (Private->IcmpToken.Event);\r
Private->IcmpToken.Event = NULL;\r
}\r
+\r
+ Private->BootFileName = NULL;\r
}\r
\r
gBS->CloseEvent (Private->UdpTimeOutEvent);\r
Private->BootFileSize = 0;\r
Private->SolicitTimes = 0;\r
Private->ElapsedTime = 0;\r
+ ZeroMem (&Private->StationIp, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->SubnetMask, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->GatewayIp, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
\r
//\r
// Reset the mode data.\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Attempts to complete a DHCPv4 D.O.R.A. (discover / offer / request / acknowledge) or DHCPv6\r
S.A.R.R (solicit / advertise / request / reply) sequence.\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcDhcp (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN BOOLEAN SortOffers\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN BOOLEAN SortOffers\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
}\r
\r
if (Mode->UsingIpv6) {\r
-\r
//\r
// Stop Udp6Read instance\r
//\r
// Start S.A.R.R. process to get a IPv6 address and other boot information.\r
//\r
Status = PxeBcDhcp6Sarr (Private, Private->Dhcp6);\r
-\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
- //\r
- // Configure Udp6Read instance\r
- //\r
- Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); \r
} else {\r
-\r
//\r
// Stop Udp4Read instance\r
//\r
// Start D.O.R.A. process to get a IPv4 address and other boot information.\r
//\r
Status = PxeBcDhcp4Dora (Private, Private->Dhcp4);\r
+ }\r
\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
- //\r
- // Configure Udp4Read instance\r
- //\r
- Status = Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
+ //\r
+ // Reconfigure the UDP instance with the default configuration.\r
+ //\r
+ if (Mode->UsingIpv6) {\r
+ Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);\r
+ } else {\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
// 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
+ 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
return Status;\r
}\r
\r
-\r
/**\r
Attempts to complete the PXE Boot Server and/or boot image discovery sequence.\r
\r
IN EFI_PXE_BASE_CODE_DISCOVER_INFO *Info OPTIONAL\r
)\r
{\r
- PXEBC_PRIVATE_DATA *Private;\r
- EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_PXE_BASE_CODE_DISCOVER_INFO DefaultInfo;\r
- EFI_PXE_BASE_CODE_SRVLIST *SrvList;\r
- PXEBC_BOOT_SVR_ENTRY *BootSvrEntry;\r
- UINT16 Index;\r
- EFI_STATUS Status;\r
- EFI_PXE_BASE_CODE_IP_FILTER IpFilter;\r
+ PXEBC_PRIVATE_DATA *Private;\r
+ EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_PXE_BASE_CODE_DISCOVER_INFO DefaultInfo;\r
+ EFI_PXE_BASE_CODE_SRVLIST *SrvList;\r
+ PXEBC_BOOT_SVR_ENTRY *BootSvrEntry;\r
+ UINT16 Index;\r
+ EFI_STATUS Status;\r
+ EFI_PXE_BASE_CODE_IP_FILTER IpFilter;\r
+ EFI_PXE_BASE_CODE_DISCOVER_INFO *NewCreatedInfo;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
SrvList = NULL;\r
Status = EFI_DEVICE_ERROR;\r
Private->Function = EFI_PXE_BASE_CODE_FUNCTION_DISCOVER;\r
+ NewCreatedInfo = NULL;\r
\r
if (!Mode->Started) {\r
return EFI_NOT_STARTED;\r
}\r
\r
if (Mode->UsingIpv6) {\r
-\r
//\r
// Stop Udp6Read instance\r
//\r
Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
} else {\r
-\r
//\r
// Stop Udp4Read instance\r
//\r
//\r
// There are 3 methods to get the information for discover.\r
//\r
+ ZeroMem (&DefaultInfo, sizeof (EFI_PXE_BASE_CODE_DISCOVER_INFO));\r
if (*Layer != EFI_PXE_BASE_CODE_BOOT_LAYER_INITIAL) {\r
//\r
// 1. Take the previous setting as the discover info.\r
//\r
if (!Mode->PxeDiscoverValid ||\r
!Mode->PxeReplyReceived ||\r
- (!Mode->PxeBisReplyReceived && UseBis)) {\r
+ (!Mode->PxeBisReplyReceived && UseBis))\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
SrvList[0].AcceptAnyResponse = FALSE;\r
\r
CopyMem (&SrvList->IpAddr, &Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
-\r
} else if (Info == NULL) {\r
//\r
// 2. Extract the discover information from the cached packets if unspecified.\r
//\r
- Info = &DefaultInfo;\r
- Status = PxeBcExtractDiscoverInfo (Private, Type, Info, &BootSvrEntry, &SrvList);\r
+ NewCreatedInfo = &DefaultInfo;\r
+ Status = PxeBcExtractDiscoverInfo (Private, Type, &NewCreatedInfo, &BootSvrEntry, &SrvList);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
\r
+ ASSERT (NewCreatedInfo != NULL);\r
+ Info = NewCreatedInfo;\r
} else {\r
//\r
// 3. Take the pass-in information as the discover info, and validate the server list.\r
break;\r
}\r
}\r
+\r
if (Index != Info->IpCnt) {\r
//\r
- // It's invalid if the first server doesn't accecpt any response\r
- // and meanwhile any of the rest servers accept any reponse.\r
+ // It's invalid if the first server doesn't accept any response\r
+ // but any of the other servers does accept any response.\r
//\r
Status = EFI_INVALID_PARAMETER;\r
goto ON_EXIT;\r
// Info and BootSvrEntry/SrvList are all ready by now, so execute discover by UniCast/BroadCast/MultiCast.\r
//\r
if ((!Info->UseUCast && !Info->UseBCast && !Info->UseMCast) ||\r
- (Info->MustUseList && Info->IpCnt == 0)) {\r
+ (Info->MustUseList && (Info->IpCnt == 0)))\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
\r
Private->IsDoDiscover = TRUE;\r
\r
- if (Info->UseUCast) {\r
- //\r
- // Do discover by unicast.\r
- //\r
- for (Index = 0; Index < Info->IpCnt; Index++) {\r
- if (BootSvrEntry == NULL) {\r
- CopyMem (&Private->ServerIp, &SrvList[Index].IpAddr, sizeof (EFI_IP_ADDRESS));\r
- } else {\r
- ASSERT (!Mode->UsingIpv6);\r
- ZeroMem (&Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
- CopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));\r
- }\r
-\r
- Status = PxeBcDiscoverBootServer (\r
- Private,\r
- Type,\r
- Layer,\r
- UseBis,\r
- &SrvList[Index].IpAddr,\r
- 0,\r
- NULL\r
- );\r
- }\r
- } else if (Info->UseMCast) {\r
+ if (Info->UseMCast) {\r
//\r
// Do discover by multicast.\r
//\r
Layer,\r
UseBis,\r
&Info->ServerMCastIp,\r
- 0,\r
- NULL\r
+ Info->IpCnt,\r
+ SrvList\r
);\r
-\r
} else if (Info->UseBCast) {\r
//\r
// Do discover by broadcast, but only valid for IPv4.\r
Info->IpCnt,\r
SrvList\r
);\r
+ } else if (Info->UseUCast) {\r
+ //\r
+ // Do discover by unicast.\r
+ //\r
+ for (Index = 0; Index < Info->IpCnt; Index++) {\r
+ if (BootSvrEntry == NULL) {\r
+ CopyMem (&Private->ServerIp, &SrvList[Index].IpAddr, sizeof (EFI_IP_ADDRESS));\r
+ } else {\r
+ ASSERT (!Mode->UsingIpv6);\r
+ ZeroMem (&Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
+ CopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));\r
+ }\r
+\r
+ Status = PxeBcDiscoverBootServer (\r
+ Private,\r
+ Type,\r
+ Layer,\r
+ UseBis,\r
+ &Private->ServerIp,\r
+ Info->IpCnt,\r
+ SrvList\r
+ );\r
+ }\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
if (!EFI_ERROR (Status)) {\r
CopyMem (\r
&Mode->PxeReply.Dhcpv6,\r
- &Private->PxeReply.Dhcp6.Packet.Offer,\r
- Private->PxeReply.Dhcp6.Packet.Offer.Length\r
+ &Private->PxeReply.Dhcp6.Packet.Ack.Dhcp6,\r
+ Private->PxeReply.Dhcp6.Packet.Ack.Length\r
);\r
Mode->PxeReplyReceived = TRUE;\r
Mode->PxeDiscoverValid = TRUE;\r
if (!EFI_ERROR (Status)) {\r
CopyMem (\r
&Mode->PxeReply.Dhcpv4,\r
- &Private->PxeReply.Dhcp4.Packet.Offer,\r
- Private->PxeReply.Dhcp4.Packet.Offer.Length\r
+ &Private->PxeReply.Dhcp4.Packet.Ack.Dhcp4,\r
+ Private->PxeReply.Dhcp4.Packet.Ack.Length\r
);\r
Mode->PxeReplyReceived = TRUE;\r
Mode->PxeDiscoverValid = TRUE;\r
\r
ON_EXIT:\r
\r
+ if ((NewCreatedInfo != NULL) && (NewCreatedInfo != &DefaultInfo)) {\r
+ FreePool (NewCreatedInfo);\r
+ }\r
+\r
if (Mode->UsingIpv6) {\r
- Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); \r
+ Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);\r
} else {\r
- Status = Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData); \r
+ Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
}\r
- \r
+\r
//\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
+ 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
return Status;\r
}\r
\r
-\r
/**\r
Used to perform TFTP and MTFTP services.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcMtftp (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN EFI_PXE_BASE_CODE_TFTP_OPCODE Operation,\r
- IN OUT VOID *BufferPtr OPTIONAL,\r
- IN BOOLEAN Overwrite,\r
- IN OUT UINT64 *BufferSize,\r
- IN UINTN *BlockSize OPTIONAL,\r
- IN EFI_IP_ADDRESS *ServerIp,\r
- IN UINT8 *Filename,\r
- IN EFI_PXE_BASE_CODE_MTFTP_INFO *Info OPTIONAL,\r
- IN BOOLEAN DontUseBuffer\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN EFI_PXE_BASE_CODE_TFTP_OPCODE Operation,\r
+ IN OUT VOID *BufferPtr OPTIONAL,\r
+ IN BOOLEAN Overwrite,\r
+ IN OUT UINT64 *BufferSize,\r
+ IN UINTN *BlockSize OPTIONAL,\r
+ IN EFI_IP_ADDRESS *ServerIp,\r
+ IN UINT8 *Filename,\r
+ IN EFI_PXE_BASE_CODE_MTFTP_INFO *Info OPTIONAL,\r
+ IN BOOLEAN DontUseBuffer\r
)\r
{\r
- PXEBC_PRIVATE_DATA *Private;\r
- EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_MTFTP4_CONFIG_DATA Mtftp4Config;\r
- EFI_MTFTP6_CONFIG_DATA Mtftp6Config;\r
- VOID *Config;\r
- EFI_STATUS Status;\r
- EFI_PXE_BASE_CODE_IP_FILTER IpFilter;\r
-\r
+ PXEBC_PRIVATE_DATA *Private;\r
+ EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_MTFTP4_CONFIG_DATA Mtftp4Config;\r
+ EFI_MTFTP6_CONFIG_DATA Mtftp6Config;\r
+ VOID *Config;\r
+ EFI_STATUS Status;\r
+ EFI_PXE_BASE_CODE_IP_FILTER IpFilter;\r
+ UINTN WindowSize;\r
\r
if ((This == NULL) ||\r
(Filename == NULL) ||\r
(BufferSize == NULL) ||\r
(ServerIp == NULL) ||\r
- ((BufferPtr == NULL) && DontUseBuffer) ||\r
- ((BlockSize != NULL) && (*BlockSize < PXE_MTFTP_DEFAULT_BLOCK_SIZE)) ||\r
- (!NetIp4IsUnicast (NTOHL (ServerIp->Addr[0]), 0) && !NetIp6IsValidUnicast (&ServerIp->v6))) {\r
+ ((BlockSize != NULL) && (*BlockSize < PXE_MTFTP_DEFAULT_BLOCK_SIZE)))\r
+ {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Config = NULL;\r
- Status = EFI_DEVICE_ERROR;\r
- Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
- Mode = Private->PxeBc.Mode;\r
+ if ((Operation == EFI_PXE_BASE_CODE_TFTP_READ_FILE) ||\r
+ (Operation == EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY) ||\r
+ (Operation == EFI_PXE_BASE_CODE_MTFTP_READ_FILE) ||\r
+ (Operation == EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY))\r
+ {\r
+ if ((BufferPtr == NULL) && !DontUseBuffer) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+\r
+ Config = NULL;\r
+ Status = EFI_DEVICE_ERROR;\r
+ Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
+ Mode = Private->PxeBc.Mode;\r
+\r
+ //\r
+ // Get PcdPxeTftpWindowSize.\r
+ //\r
+ WindowSize = (UINTN)PcdGet64 (PcdPxeTftpWindowSize);\r
+\r
+ if (Mode->UsingIpv6) {\r
+ if (!NetIp6IsValidUnicast (&ServerIp->v6)) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ } else {\r
+ if (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0]))) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
\r
if (Mode->UsingIpv6) {\r
//\r
// Set configuration data for Mtftp6 instance.\r
//\r
ZeroMem (&Mtftp6Config, sizeof (EFI_MTFTP6_CONFIG_DATA));\r
- Config = &Mtftp6Config;\r
- Mtftp6Config.TimeoutValue = PXEBC_MTFTP_TIMEOUT;\r
- Mtftp6Config.TryCount = PXEBC_MTFTP_RETRIES;\r
+ Config = &Mtftp6Config;\r
+ Mtftp6Config.TimeoutValue = PXEBC_MTFTP_TIMEOUT;\r
+ Mtftp6Config.TryCount = PXEBC_MTFTP_RETRIES;\r
CopyMem (&Mtftp6Config.StationIp, &Private->StationIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
CopyMem (&Mtftp6Config.ServerIp, &ServerIp->v6, sizeof (EFI_IPv6_ADDRESS));\r
//\r
Mode->IcmpErrorReceived = FALSE;\r
\r
switch (Operation) {\r
+ case EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE:\r
+ //\r
+ // Send TFTP request to get file size.\r
+ //\r
+ Status = PxeBcTftpGetFileSize (\r
+ Private,\r
+ Config,\r
+ Filename,\r
+ BlockSize,\r
+ (WindowSize > 1) ? &WindowSize : NULL,\r
+ BufferSize\r
+ );\r
\r
- case EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE:\r
- //\r
- // Send TFTP request to get file size.\r
- //\r
- Status = PxeBcTftpGetFileSize (\r
- Private,\r
- Config,\r
- Filename,\r
- BlockSize,\r
- BufferSize\r
- );\r
-\r
- break;\r
+ break;\r
\r
- case EFI_PXE_BASE_CODE_TFTP_READ_FILE:\r
- //\r
- // Send TFTP request to read file.\r
- //\r
- Status = PxeBcTftpReadFile (\r
- Private,\r
- Config,\r
- Filename,\r
- BlockSize,\r
- BufferPtr,\r
- BufferSize,\r
- DontUseBuffer\r
- );\r
+ case EFI_PXE_BASE_CODE_TFTP_READ_FILE:\r
+ //\r
+ // Send TFTP request to read file.\r
+ //\r
+ Status = PxeBcTftpReadFile (\r
+ Private,\r
+ Config,\r
+ Filename,\r
+ BlockSize,\r
+ (WindowSize > 1) ? &WindowSize : NULL,\r
+ BufferPtr,\r
+ BufferSize,\r
+ DontUseBuffer\r
+ );\r
\r
- break;\r
+ break;\r
\r
- case EFI_PXE_BASE_CODE_TFTP_WRITE_FILE:\r
- //\r
- // Send TFTP request to write file.\r
- //\r
- Status = PxeBcTftpWriteFile (\r
- Private,\r
- Config,\r
- Filename,\r
- Overwrite,\r
- BlockSize,\r
- BufferPtr,\r
- BufferSize\r
- );\r
+ case EFI_PXE_BASE_CODE_TFTP_WRITE_FILE:\r
+ //\r
+ // Send TFTP request to write file.\r
+ //\r
+ Status = PxeBcTftpWriteFile (\r
+ Private,\r
+ Config,\r
+ Filename,\r
+ Overwrite,\r
+ BlockSize,\r
+ BufferPtr,\r
+ BufferSize\r
+ );\r
\r
- break;\r
+ break;\r
\r
- case EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY:\r
- //\r
- // Send TFTP request to read directory.\r
- //\r
- Status = PxeBcTftpReadDirectory (\r
- Private,\r
- Config,\r
- Filename,\r
- BlockSize,\r
- BufferPtr,\r
- BufferSize,\r
- DontUseBuffer\r
- );\r
+ case EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY:\r
+ //\r
+ // Send TFTP request to read directory.\r
+ //\r
+ Status = PxeBcTftpReadDirectory (\r
+ Private,\r
+ Config,\r
+ Filename,\r
+ BlockSize,\r
+ (WindowSize > 1) ? &WindowSize : NULL,\r
+ BufferPtr,\r
+ BufferSize,\r
+ DontUseBuffer\r
+ );\r
\r
- break;\r
+ break;\r
\r
- case EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE:\r
- case EFI_PXE_BASE_CODE_MTFTP_READ_FILE:\r
- case EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY:\r
- Status = EFI_UNSUPPORTED;\r
+ case EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE:\r
+ case EFI_PXE_BASE_CODE_MTFTP_READ_FILE:\r
+ case EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY:\r
+ Status = EFI_UNSUPPORTED;\r
\r
- break;\r
+ break;\r
\r
- default:\r
- Status = EFI_INVALID_PARAMETER;\r
+ default:\r
+ Status = EFI_INVALID_PARAMETER;\r
\r
- break;\r
+ break;\r
}\r
\r
if (Status == EFI_ICMP_ERROR) {\r
Mode->IcmpErrorReceived = TRUE;\r
}\r
\r
+ //\r
+ // Reconfigure the UDP instance with the default configuration.\r
+ //\r
if (Mode->UsingIpv6) {\r
- Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); \r
+ Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);\r
} else {\r
- Status = Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData); \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
// 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
+ 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
return Status;\r
}\r
\r
-\r
/**\r
Writes a UDP packet to the network interface.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcUdpWrite (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN UINT16 OpFlags,\r
- IN EFI_IP_ADDRESS *DestIp,\r
- IN EFI_PXE_BASE_CODE_UDP_PORT *DestPort,\r
- IN EFI_IP_ADDRESS *GatewayIp OPTIONAL,\r
- IN EFI_IP_ADDRESS *SrcIp OPTIONAL,\r
- IN OUT EFI_PXE_BASE_CODE_UDP_PORT *SrcPort OPTIONAL,\r
- IN UINTN *HeaderSize OPTIONAL,\r
- IN VOID *HeaderPtr OPTIONAL,\r
- IN UINTN *BufferSize,\r
- IN VOID *BufferPtr\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN UINT16 OpFlags,\r
+ IN EFI_IP_ADDRESS *DestIp,\r
+ IN EFI_PXE_BASE_CODE_UDP_PORT *DestPort,\r
+ IN EFI_IP_ADDRESS *GatewayIp OPTIONAL,\r
+ IN EFI_IP_ADDRESS *SrcIp OPTIONAL,\r
+ IN OUT EFI_PXE_BASE_CODE_UDP_PORT *SrcPort OPTIONAL,\r
+ IN UINTN *HeaderSize OPTIONAL,\r
+ IN VOID *HeaderPtr OPTIONAL,\r
+ IN UINTN *BufferSize,\r
+ IN VOID *BufferPtr\r
)\r
{\r
- PXEBC_PRIVATE_DATA *Private;\r
- EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_UDP4_SESSION_DATA Udp4Session;\r
- EFI_UDP6_SESSION_DATA Udp6Session;\r
- EFI_STATUS Status;\r
- BOOLEAN DoNotFragment;\r
-\r
- if (This == NULL || DestIp == NULL || DestPort == NULL) {\r
+ PXEBC_PRIVATE_DATA *Private;\r
+ EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_UDP4_SESSION_DATA Udp4Session;\r
+ EFI_UDP6_SESSION_DATA Udp6Session;\r
+ EFI_STATUS Status;\r
+ BOOLEAN DoNotFragment;\r
+\r
+ if ((This == NULL) || (DestIp == NULL) || (DestPort == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
DoNotFragment = TRUE;\r
}\r
\r
- if (!Mode->UsingIpv6 && GatewayIp != NULL && !NetIp4IsUnicast (NTOHL (GatewayIp->Addr[0]), 0)) {\r
+ if (!Mode->UsingIpv6 && (GatewayIp != NULL) && (Mode->SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (GatewayIp->Addr[0]), EFI_NTOHL (Mode->SubnetMask)))\r
+ {\r
//\r
// Gateway is provided but it's not a unicast IPv4 address, while it will be ignored for IPv6.\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (HeaderSize != NULL && (*HeaderSize == 0 || HeaderPtr == NULL)) {\r
+ if ((HeaderSize != NULL) && ((*HeaderSize == 0) || (HeaderPtr == NULL))) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (BufferSize == NULL || (*BufferSize != 0 && BufferPtr == NULL)) {\r
+ if ((BufferSize == NULL) || ((*BufferSize != 0) && (BufferPtr == NULL))) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return EFI_NOT_STARTED;\r
}\r
\r
- if (!Private->IsAddressOk && SrcIp == NULL) {\r
+ if (!Private->IsAddressOk && (SrcIp == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (Private->CurSrcPort == 0 ||\r
- (SrcPort != NULL && *SrcPort != Private->CurSrcPort)) {\r
+ if ((Private->CurSrcPort == 0) ||\r
+ ((SrcPort != NULL) && (*SrcPort != Private->CurSrcPort)))\r
+ {\r
//\r
// Reconfigure UDPv4/UDPv6 for UdpWrite if the source port changed.\r
//\r
&Private->SubnetMask.v4,\r
&Private->GatewayIp.v4,\r
&Private->CurSrcPort,\r
- DoNotFragment\r
+ DoNotFragment,\r
+ Private->Mode.TTL,\r
+ Private->Mode.ToS\r
);\r
}\r
\r
if (SrcIp != NULL) {\r
CopyMem (&Udp6Session.SourceAddress, SrcIp, sizeof (EFI_IPv6_ADDRESS));\r
}\r
+\r
if (SrcPort != NULL) {\r
Udp6Session.SourcePort = *SrcPort;\r
}\r
if (SrcIp != NULL) {\r
CopyMem (&Udp4Session.SourceAddress, SrcIp, sizeof (EFI_IPv4_ADDRESS));\r
}\r
+\r
if (SrcPort != NULL) {\r
Udp4Session.SourcePort = *SrcPort;\r
}\r
+\r
//\r
// Override the gateway information if user specified.\r
//\r
Private->Udp4Write,\r
&Udp4Session,\r
Private->UdpTimeOutEvent,\r
- (EFI_IPv4_ADDRESS *) GatewayIp,\r
+ (EFI_IPv4_ADDRESS *)GatewayIp,\r
HeaderSize,\r
HeaderPtr,\r
BufferSize,\r
\r
gBS->SetTimer (Private->UdpTimeOutEvent, TimerCancel, 0);\r
\r
-\r
//\r
// Reset the UdpWrite instance.\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
Reads a UDP packet from the network interface.\r
+\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcUdpRead (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN UINT16 OpFlags,\r
- IN OUT EFI_IP_ADDRESS *DestIp OPTIONAL,\r
- IN OUT EFI_PXE_BASE_CODE_UDP_PORT *DestPort OPTIONAL,\r
- IN OUT EFI_IP_ADDRESS *SrcIp OPTIONAL,\r
- IN OUT EFI_PXE_BASE_CODE_UDP_PORT *SrcPort OPTIONAL,\r
- IN UINTN *HeaderSize OPTIONAL,\r
- IN VOID *HeaderPtr OPTIONAL,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *BufferPtr\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN UINT16 OpFlags,\r
+ IN OUT EFI_IP_ADDRESS *DestIp OPTIONAL,\r
+ IN OUT EFI_PXE_BASE_CODE_UDP_PORT *DestPort OPTIONAL,\r
+ IN OUT EFI_IP_ADDRESS *SrcIp OPTIONAL,\r
+ IN OUT EFI_PXE_BASE_CODE_UDP_PORT *SrcPort OPTIONAL,\r
+ IN UINTN *HeaderSize OPTIONAL,\r
+ IN VOID *HeaderPtr OPTIONAL,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *BufferPtr\r
)\r
{\r
- PXEBC_PRIVATE_DATA *Private;\r
- EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_UDP4_COMPLETION_TOKEN Udp4Token;\r
- EFI_UDP6_COMPLETION_TOKEN Udp6Token;\r
- EFI_UDP4_RECEIVE_DATA *Udp4Rx;\r
- EFI_UDP6_RECEIVE_DATA *Udp6Rx;\r
- EFI_STATUS Status;\r
- BOOLEAN IsDone;\r
- BOOLEAN IsMatched;\r
- UINTN CopiedLen;\r
+ PXEBC_PRIVATE_DATA *Private;\r
+ EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_UDP4_COMPLETION_TOKEN Udp4Token;\r
+ EFI_UDP6_COMPLETION_TOKEN Udp6Token;\r
+ EFI_UDP4_RECEIVE_DATA *Udp4Rx;\r
+ EFI_UDP6_RECEIVE_DATA *Udp6Rx;\r
+ EFI_STATUS Status;\r
+ BOOLEAN IsDone;\r
+ BOOLEAN IsMatched;\r
+ UINTN CopiedLen;\r
+ UINTN HeaderLen;\r
+ UINTN HeaderCopiedLen;\r
+ UINTN BufferCopiedLen;\r
+ UINT32 FragmentLength;\r
+ UINTN FragmentIndex;\r
+ UINT8 *FragmentBuffer;\r
\r
- if (This == NULL || DestIp == NULL || DestPort == NULL) {\r
+ if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
Udp4Rx = NULL;\r
Udp6Rx = NULL;\r
\r
- if (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) != 0 && DestPort == NULL) ||\r
- ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) != 0 && SrcIp == NULL) ||\r
- ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) != 0 && SrcPort == NULL)) {\r
+ if ((((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) == 0) && (DestPort == NULL)) ||\r
+ (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) == 0) && (SrcIp == NULL)) ||\r
+ (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) == 0) && (SrcPort == NULL)))\r
+ {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if ((HeaderSize != NULL && *HeaderSize == 0) || (HeaderSize != NULL && HeaderPtr == NULL)) {\r
+ if (((HeaderSize != NULL) && (*HeaderSize == 0)) || ((HeaderSize != NULL) && (HeaderPtr == NULL))) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
}\r
}\r
\r
- if (Status == EFI_ICMP_ERROR ||\r
- Status == EFI_NETWORK_UNREACHABLE ||\r
- Status == EFI_HOST_UNREACHABLE ||\r
- Status == EFI_PROTOCOL_UNREACHABLE ||\r
- Status == EFI_PORT_UNREACHABLE) {\r
+ if ((Status == EFI_ICMP_ERROR) ||\r
+ (Status == EFI_NETWORK_UNREACHABLE) ||\r
+ (Status == EFI_HOST_UNREACHABLE) ||\r
+ (Status == EFI_PROTOCOL_UNREACHABLE) ||\r
+ (Status == EFI_PORT_UNREACHABLE))\r
+ {\r
//\r
// Get different return status for icmp error from Udp, refers to UEFI spec.\r
//\r
Mode->IcmpErrorReceived = TRUE;\r
}\r
+\r
gBS->SetTimer (Private->UdpTimeOutEvent, TimerCancel, 0);\r
\r
if (IsMatched) {\r
//\r
- // Copy the rececived packet to user if matched by filter.\r
+ // Copy the received packet to user if matched by filter.\r
//\r
- CopiedLen = 0;\r
if (Mode->UsingIpv6) {\r
Udp6Rx = Udp6Token.Packet.RxData;\r
ASSERT (Udp6Rx != NULL);\r
- //\r
- // Copy the header part of received data.\r
- //\r
+\r
+ HeaderLen = 0;\r
if (HeaderSize != NULL) {\r
- CopiedLen = MIN (*HeaderSize, Udp6Rx->DataLength);\r
- *HeaderSize = CopiedLen;\r
- CopyMem (HeaderPtr, Udp6Rx->FragmentTable[0].FragmentBuffer, *HeaderSize);\r
+ HeaderLen = MIN (*HeaderSize, Udp6Rx->DataLength);\r
}\r
- //\r
- // Copy the other part of received data.\r
- //\r
- if (Udp6Rx->DataLength - CopiedLen > *BufferSize) {\r
+\r
+ if (Udp6Rx->DataLength - HeaderLen > *BufferSize) {\r
Status = EFI_BUFFER_TOO_SMALL;\r
} else {\r
- *BufferSize = Udp6Rx->DataLength - CopiedLen;\r
- CopyMem (BufferPtr, (UINT8 *) Udp6Rx->FragmentTable[0].FragmentBuffer + CopiedLen, *BufferSize);\r
+ if (HeaderSize != NULL) {\r
+ *HeaderSize = HeaderLen;\r
+ }\r
+\r
+ *BufferSize = Udp6Rx->DataLength - HeaderLen;\r
+\r
+ HeaderCopiedLen = 0;\r
+ BufferCopiedLen = 0;\r
+ for (FragmentIndex = 0; FragmentIndex < Udp6Rx->FragmentCount; FragmentIndex++) {\r
+ FragmentLength = Udp6Rx->FragmentTable[FragmentIndex].FragmentLength;\r
+ FragmentBuffer = Udp6Rx->FragmentTable[FragmentIndex].FragmentBuffer;\r
+ if (HeaderCopiedLen + FragmentLength < HeaderLen) {\r
+ //\r
+ // Copy the header part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
+ HeaderCopiedLen += FragmentLength;\r
+ } else if (HeaderCopiedLen < HeaderLen) {\r
+ //\r
+ // Copy the header part of received data.\r
+ //\r
+ CopiedLen = HeaderLen - HeaderCopiedLen;\r
+ CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
+ HeaderCopiedLen += CopiedLen;\r
+\r
+ //\r
+ // Copy the other part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
+ BufferCopiedLen += (FragmentLength - CopiedLen);\r
+ } else {\r
+ //\r
+ // Copy the other part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
+ BufferCopiedLen += FragmentLength;\r
+ }\r
+ }\r
}\r
+\r
//\r
// Recycle the receiving buffer after copy to user.\r
//\r
} else {\r
Udp4Rx = Udp4Token.Packet.RxData;\r
ASSERT (Udp4Rx != NULL);\r
- //\r
- // Copy the header part of received data.\r
- //\r
+\r
+ HeaderLen = 0;\r
if (HeaderSize != NULL) {\r
- CopiedLen = MIN (*HeaderSize, Udp4Rx->DataLength);\r
- *HeaderSize = CopiedLen;\r
- CopyMem (HeaderPtr, Udp4Rx->FragmentTable[0].FragmentBuffer, *HeaderSize);\r
+ HeaderLen = MIN (*HeaderSize, Udp4Rx->DataLength);\r
}\r
- //\r
- // Copy the other part of received data.\r
- //\r
- if (Udp4Rx->DataLength - CopiedLen > *BufferSize) {\r
+\r
+ if (Udp4Rx->DataLength - HeaderLen > *BufferSize) {\r
Status = EFI_BUFFER_TOO_SMALL;\r
} else {\r
- *BufferSize = Udp4Rx->DataLength - CopiedLen;\r
- CopyMem (BufferPtr, (UINT8 *) Udp4Rx->FragmentTable[0].FragmentBuffer + CopiedLen, *BufferSize);\r
+ if (HeaderSize != NULL) {\r
+ *HeaderSize = HeaderLen;\r
+ }\r
+\r
+ *BufferSize = Udp4Rx->DataLength - HeaderLen;\r
+\r
+ HeaderCopiedLen = 0;\r
+ BufferCopiedLen = 0;\r
+ for (FragmentIndex = 0; FragmentIndex < Udp4Rx->FragmentCount; FragmentIndex++) {\r
+ FragmentLength = Udp4Rx->FragmentTable[FragmentIndex].FragmentLength;\r
+ FragmentBuffer = Udp4Rx->FragmentTable[FragmentIndex].FragmentBuffer;\r
+ if (HeaderCopiedLen + FragmentLength < HeaderLen) {\r
+ //\r
+ // Copy the header part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
+ HeaderCopiedLen += FragmentLength;\r
+ } else if (HeaderCopiedLen < HeaderLen) {\r
+ //\r
+ // Copy the header part of received data.\r
+ //\r
+ CopiedLen = HeaderLen - HeaderCopiedLen;\r
+ CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
+ HeaderCopiedLen += CopiedLen;\r
+\r
+ //\r
+ // Copy the other part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
+ BufferCopiedLen += (FragmentLength - CopiedLen);\r
+ } else {\r
+ //\r
+ // Copy the other part of received data.\r
+ //\r
+ CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
+ BufferCopiedLen += FragmentLength;\r
+ }\r
+ }\r
}\r
+\r
//\r
// Recycle the receiving buffer after copy to user.\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
Updates the IP receive filters of a network device and enables software filtering.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcSetIpFilter (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN EFI_PXE_BASE_CODE_IP_FILTER *NewFilter\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN EFI_PXE_BASE_CODE_IP_FILTER *NewFilter\r
)\r
{\r
- EFI_STATUS Status;\r
- PXEBC_PRIVATE_DATA *Private;\r
- EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_UDP4_CONFIG_DATA *Udp4Cfg;\r
- EFI_UDP6_CONFIG_DATA *Udp6Cfg;\r
- UINTN Index;\r
- BOOLEAN NeedPromiscuous;\r
- BOOLEAN AcceptPromiscuous;\r
- BOOLEAN AcceptBroadcast;\r
- BOOLEAN MultiCastUpdate;\r
-\r
- if (This == NULL || NewFilter == NULL) {\r
+ EFI_STATUS Status;\r
+ PXEBC_PRIVATE_DATA *Private;\r
+ EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_UDP4_CONFIG_DATA *Udp4Cfg;\r
+ EFI_UDP6_CONFIG_DATA *Udp6Cfg;\r
+ UINTN Index;\r
+ BOOLEAN NeedPromiscuous;\r
+ BOOLEAN AcceptPromiscuous;\r
+ BOOLEAN AcceptBroadcast;\r
+ BOOLEAN MultiCastUpdate;\r
+\r
+ if ((This == NULL) || (NewFilter == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
for (Index = 0; Index < NewFilter->IpCnt; Index++) {\r
ASSERT (Index < EFI_PXE_BASE_CODE_MAX_IPCNT);\r
if (!Mode->UsingIpv6 &&\r
- IP4_IS_LOCAL_BROADCAST (EFI_IP4 (NewFilter->IpList[Index].v4))) {\r
+ IP4_IS_LOCAL_BROADCAST (EFI_IP4 (NewFilter->IpList[Index].v4)))\r
+ {\r
//\r
// IPv4 broadcast address should not be in IP filter.\r
//\r
return EFI_INVALID_PARAMETER;\r
}\r
- if ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0 &&\r
- (NetIp4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), 0) ||\r
- NetIp6IsValidUnicast (&NewFilter->IpList[Index].v6))) {\r
- //\r
- // If EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP is set and IPv4/IPv6 address\r
- // is in IpList, promiscuous mode is needed.\r
- //\r
+\r
+ if (Mode->UsingIpv6) {\r
+ if (((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0) &&\r
+ NetIp6IsValidUnicast (&NewFilter->IpList[Index].v6))\r
+ {\r
+ NeedPromiscuous = TRUE;\r
+ }\r
+ } else if ((EFI_NTOHL (Mode->StationIp) != 0) &&\r
+ (EFI_NTOHL (Mode->SubnetMask) != 0) &&\r
+ IP4_NET_EQUAL (EFI_NTOHL (Mode->StationIp), EFI_NTOHL (NewFilter->IpList[Index].v4), EFI_NTOHL (Mode->SubnetMask.v4)) &&\r
+ NetIp4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), EFI_NTOHL (Mode->SubnetMask)) &&\r
+ ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0))\r
+ {\r
NeedPromiscuous = TRUE;\r
}\r
}\r
MultiCastUpdate = FALSE;\r
\r
if (NeedPromiscuous ||\r
- (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS) != 0 ||\r
- (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0) {\r
+ ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS) != 0) ||\r
+ ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0))\r
+ {\r
//\r
// Configure UDPv4/UDPv6 as promiscuous mode to receive all packets.\r
//\r
//\r
// Configure UDPv4 to receive all broadcast packets.\r
//\r
- AcceptBroadcast = TRUE;\r
+ AcceptBroadcast = TRUE;\r
}\r
\r
//\r
//\r
Udp4Cfg = &Private->Udp4CfgData;\r
if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous) ||\r
- (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate) {\r
+ (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate)\r
+ {\r
//\r
// Clear the UDP4 instance configuration, all joined groups will be left\r
// during the operation.\r
//\r
Private->Udp4Read->Configure (Private->Udp4Read, NULL);\r
- \r
+\r
//\r
// Configure the UDP instance with the new configuration.\r
//\r
Udp4Cfg->AcceptPromiscuous = AcceptPromiscuous;\r
Udp4Cfg->AcceptBroadcast = AcceptBroadcast;\r
- Status = Private->Udp4Read->Configure (Private->Udp4Read, Udp4Cfg);\r
+ Status = Private->Udp4Read->Configure (Private->Udp4Read, Udp4Cfg);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- \r
+\r
//\r
// In not Promiscuous mode, need to join the new multicast group.\r
//\r
for (Index = 0; Index < NewFilter->IpCnt; ++Index) {\r
if (IP4_IS_MULTICAST (EFI_NTOHL (NewFilter->IpList[Index].v4))) {\r
//\r
- // Join the mutilcast group.\r
+ // Join the multicast group.\r
//\r
Status = Private->Udp4Read->Groups (Private->Udp4Read, TRUE, &NewFilter->IpList[Index].v4);\r
if (EFI_ERROR (Status)) {\r
// during the operation.\r
//\r
Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
- \r
+\r
//\r
// Configure the UDP instance with the new configuration.\r
//\r
Udp6Cfg->AcceptPromiscuous = AcceptPromiscuous;\r
- Status = Private->Udp6Read->Configure (Private->Udp6Read, Udp6Cfg);\r
+ Status = Private->Udp6Read->Configure (Private->Udp6Read, Udp6Cfg);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- \r
+\r
//\r
// In not Promiscuous mode, need to join the new multicast group.\r
//\r
for (Index = 0; Index < NewFilter->IpCnt; ++Index) {\r
if (IP6_IS_MULTICAST (&NewFilter->IpList[Index].v6)) {\r
//\r
- // Join the mutilcast group.\r
+ // Join the multicast group.\r
//\r
Status = Private->Udp6Read->Groups (Private->Udp6Read, TRUE, &NewFilter->IpList[Index].v6);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
-\r
/**\r
Uses the ARP protocol to resolve a MAC address. It is not supported for IPv6.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcArp (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN EFI_IP_ADDRESS *IpAddr,\r
- IN EFI_MAC_ADDRESS *MacAddr OPTIONAL\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN EFI_IP_ADDRESS *IpAddr,\r
+ IN EFI_MAC_ADDRESS *MacAddr OPTIONAL\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
EFI_MAC_ADDRESS ZeroMac;\r
BOOLEAN IsResolved;\r
\r
- if (This == NULL || IpAddr == NULL) {\r
+ if ((This == NULL) || (IpAddr == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
// If AutoArp is TRUE, try to send Arp request on initiative.\r
//\r
Status = Private->Arp->Request (Private->Arp, &IpAddr->v4, ResolvedEvent, &TempMac);\r
- if (EFI_ERROR (Status) && Status != EFI_NOT_READY) {\r
+ if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {\r
goto ON_EXIT;\r
}\r
\r
break;\r
}\r
}\r
+\r
if (CompareMem (&TempMac, &ZeroMac, sizeof (EFI_MAC_ADDRESS)) != 0) {\r
Status = EFI_SUCCESS;\r
} else {\r
//\r
// Copy the Mac address to user if needed.\r
//\r
- if (MacAddr != NULL && !EFI_ERROR (Status)) {\r
+ if ((MacAddr != NULL) && !EFI_ERROR (Status)) {\r
CopyMem (MacAddr, &TempMac, sizeof (EFI_MAC_ADDRESS));\r
}\r
\r
if (ResolvedEvent != NULL) {\r
gBS->CloseEvent (ResolvedEvent);\r
}\r
+\r
return Status;\r
}\r
\r
-\r
/**\r
Updates the parameters that affect the operation of the PXE Base Code Protocol.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcSetParameters (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN BOOLEAN *NewAutoArp OPTIONAL,\r
- IN BOOLEAN *NewSendGUID OPTIONAL,\r
- IN UINT8 *NewTTL OPTIONAL,\r
- IN UINT8 *NewToS OPTIONAL,\r
- IN BOOLEAN *NewMakeCallback OPTIONAL\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN BOOLEAN *NewAutoArp OPTIONAL,\r
+ IN BOOLEAN *NewSendGUID OPTIONAL,\r
+ IN UINT8 *NewTTL OPTIONAL,\r
+ IN UINT8 *NewToS OPTIONAL,\r
+ IN BOOLEAN *NewMakeCallback OPTIONAL\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
// Update the previous PxeBcCallback protocol.\r
//\r
Status = gBS->HandleProtocol (\r
- Private->Controller,\r
+ Mode->UsingIpv6 ? Private->Ip6Nic->Controller : Private->Ip4Nic->Controller,\r
&gEfiPxeBaseCodeCallbackProtocolGuid,\r
- (VOID **) &Private->PxeBcCallback\r
+ (VOID **)&Private->PxeBcCallback\r
);\r
\r
if (EFI_ERROR (Status) || (Private->PxeBcCallback->Callback == NULL)) {\r
} else {\r
Private->PxeBcCallback = NULL;\r
}\r
+\r
Mode->MakeCallbacks = *NewMakeCallback;\r
}\r
\r
if (NewSendGUID != NULL) {\r
if (*NewSendGUID && EFI_ERROR (NetLibGetSystemGuid (&SystemGuid))) {\r
+ DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
Mode->SendGUID = *NewSendGUID;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Updates the station IP address and/or subnet mask values of a network device.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcSetStationIP (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN EFI_IP_ADDRESS *NewStationIp OPTIONAL,\r
- IN EFI_IP_ADDRESS *NewSubnetMask OPTIONAL\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN EFI_IP_ADDRESS *NewStationIp OPTIONAL,\r
+ IN EFI_IP_ADDRESS *NewSubnetMask OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
PXEBC_PRIVATE_DATA *Private;\r
EFI_PXE_BASE_CODE_MODE *Mode;\r
- EFI_ARP_CONFIG_DATA ArpConfigData;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (NewStationIp != NULL &&\r
- (!NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), 0) &&\r
- !NetIp6IsValidUnicast (&NewStationIp->v6))) {\r
+ if ((NewStationIp != NULL) && !NetIp6IsValidUnicast (&NewStationIp->v6)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
Status = EFI_SUCCESS;\r
\r
if (!Mode->UsingIpv6 &&\r
- NewSubnetMask != NULL &&\r
- !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0]))) {\r
+ (NewSubnetMask != NULL) &&\r
+ !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0])))\r
+ {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ if (!Mode->UsingIpv6 && (NewStationIp != NULL)) {\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
+ {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+\r
if (!Mode->Started) {\r
return EFI_NOT_STARTED;\r
}\r
\r
- if (Mode->UsingIpv6 && NewStationIp != NULL) {\r
+ if (Mode->UsingIpv6 && (NewStationIp != NULL)) {\r
//\r
// Set the IPv6 address by Ip6Config protocol.\r
//\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
- } else if (!Mode->UsingIpv6 && NewStationIp != NULL) {\r
- //\r
- // Configure the corresponding ARP with the IPv4 address.\r
- //\r
- ZeroMem (&ArpConfigData, sizeof (EFI_ARP_CONFIG_DATA));\r
-\r
- ArpConfigData.SwAddressType = 0x0800;\r
- ArpConfigData.SwAddressLength = (UINT8) sizeof (EFI_IPv4_ADDRESS);\r
- ArpConfigData.StationAddress = &NewStationIp->v4;\r
-\r
- Private->Arp->Configure (Private->Arp, NULL);\r
- Private->Arp->Configure (Private->Arp, &ArpConfigData);\r
-\r
- if (NewSubnetMask != NULL) {\r
- Mode->RouteTableEntries = 1;\r
- Mode->RouteTable[0].IpAddr.Addr[0] = NewStationIp->Addr[0] & NewSubnetMask->Addr[0];\r
- Mode->RouteTable[0].SubnetMask.Addr[0] = NewSubnetMask->Addr[0];\r
- Mode->RouteTable[0].GwAddr.Addr[0] = 0;\r
- }\r
-\r
- Private->IsAddressOk = TRUE;\r
}\r
\r
if (NewStationIp != NULL) {\r
CopyMem (&Private->StationIp, NewStationIp, sizeof (EFI_IP_ADDRESS));\r
}\r
\r
- if (!Mode->UsingIpv6 && NewSubnetMask != NULL) {\r
+ if (!Mode->UsingIpv6 && (NewSubnetMask != NULL)) {\r
CopyMem (&Mode->SubnetMask, NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
- CopyMem (&Private->SubnetMask ,NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
+ CopyMem (&Private->SubnetMask, NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
+ }\r
+\r
+ Status = PxeBcFlushStationIp (Private, NewStationIp, NewSubnetMask);\r
+ if (!EFI_ERROR (Status)) {\r
+ Private->IsAddressOk = TRUE;\r
}\r
\r
- Status = PxeBcFlushStaionIp (Private, NewStationIp, NewSubnetMask);\r
ON_EXIT:\r
return Status;\r
}\r
\r
-\r
/**\r
Updates the contents of the cached DHCP and Discover packets.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeBcSetPackets (\r
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
- IN BOOLEAN *NewDhcpDiscoverValid OPTIONAL,\r
- IN BOOLEAN *NewDhcpAckReceived OPTIONAL,\r
- IN BOOLEAN *NewProxyOfferReceived OPTIONAL,\r
- IN BOOLEAN *NewPxeDiscoverValid OPTIONAL,\r
- IN BOOLEAN *NewPxeReplyReceived OPTIONAL,\r
- IN BOOLEAN *NewPxeBisReplyReceived OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewDhcpDiscover OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewDhcpAck OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewProxyOffer OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewPxeDiscover OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewPxeReply OPTIONAL,\r
- IN EFI_PXE_BASE_CODE_PACKET *NewPxeBisReply OPTIONAL\r
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,\r
+ IN BOOLEAN *NewDhcpDiscoverValid OPTIONAL,\r
+ IN BOOLEAN *NewDhcpAckReceived OPTIONAL,\r
+ IN BOOLEAN *NewProxyOfferReceived OPTIONAL,\r
+ IN BOOLEAN *NewPxeDiscoverValid OPTIONAL,\r
+ IN BOOLEAN *NewPxeReplyReceived OPTIONAL,\r
+ IN BOOLEAN *NewPxeBisReplyReceived OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewDhcpDiscover OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewDhcpAck OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewProxyOffer OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewPxeDiscover OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewPxeReply OPTIONAL,\r
+ IN EFI_PXE_BASE_CODE_PACKET *NewPxeBisReply OPTIONAL\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
NULL\r
};\r
\r
-\r
/**\r
Callback function that is invoked when the PXE Base Code Protocol is about to transmit, has\r
received, or is waiting to receive a packet.\r
IN EFI_PXE_BASE_CODE_PACKET *PacketPtr OPTIONAL\r
)\r
{\r
- EFI_INPUT_KEY Key;\r
- EFI_STATUS Status;\r
+ EFI_INPUT_KEY Key;\r
+ EFI_STATUS Status;\r
\r
//\r
// Catch Ctrl-C or ESC to abort.\r
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
\r
if (!EFI_ERROR (Status)) {\r
-\r
- if (Key.ScanCode == SCAN_ESC || Key.UnicodeChar == (0x1F & 'c')) {\r
-\r
+ if ((Key.ScanCode == SCAN_ESC) || (Key.UnicodeChar == (0x1F & 'c'))) {\r
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT;\r
}\r
}\r
+\r
//\r
// No print if receive packet\r
//\r
if (Received) {\r
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
}\r
+\r
//\r
// Print only for three functions\r
//\r
switch (Function) {\r
-\r
- case EFI_PXE_BASE_CODE_FUNCTION_MTFTP:\r
- //\r
- // Print only for open MTFTP packets, not every MTFTP packets\r
- //\r
- if (PacketLength != 0 && PacketPtr != NULL) {\r
- if (PacketPtr->Raw[0x1C] != 0x00 || PacketPtr->Raw[0x1D] != 0x01) {\r
- return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+ case EFI_PXE_BASE_CODE_FUNCTION_MTFTP:\r
+ //\r
+ // Print only for open MTFTP packets, not every MTFTP packets\r
+ //\r
+ if ((PacketLength != 0) && (PacketPtr != NULL)) {\r
+ if ((PacketPtr->Raw[0x1C] != 0x00) || (PacketPtr->Raw[0x1D] != 0x01)) {\r
+ return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+ }\r
}\r
- }\r
- break;\r
\r
- case EFI_PXE_BASE_CODE_FUNCTION_DHCP:\r
- case EFI_PXE_BASE_CODE_FUNCTION_DISCOVER:\r
- break;\r
+ break;\r
\r
- default:\r
- return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+ case EFI_PXE_BASE_CODE_FUNCTION_DHCP:\r
+ case EFI_PXE_BASE_CODE_FUNCTION_DISCOVER:\r
+ break;\r
+\r
+ default:\r
+ return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
}\r
\r
- if (PacketLength != 0 && PacketPtr != NULL) {\r
+ if ((PacketLength != 0) && (PacketPtr != NULL)) {\r
//\r
// Print '.' when transmit a packet\r
//\r
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
}\r
\r
-EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL gPxeBcCallBackTemplate = {\r
+EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL gPxeBcCallBackTemplate = {\r
EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION,\r
EfiPxeLoadFileCallback\r
};\r
\r
-\r
/**\r
Causes the driver to load a specified file.\r
\r
EFI_STATUS\r
EFIAPI\r
EfiPxeLoadFile (\r
- IN EFI_LOAD_FILE_PROTOCOL *This,\r
- IN EFI_DEVICE_PATH_PROTOCOL *FilePath,\r
- IN BOOLEAN BootPolicy,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *Buffer OPTIONAL\r
+ IN EFI_LOAD_FILE_PROTOCOL *This,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *FilePath,\r
+ IN BOOLEAN BootPolicy,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *Buffer OPTIONAL\r
)\r
{\r
PXEBC_PRIVATE_DATA *Private;\r
EFI_PXE_BASE_CODE_PROTOCOL *PxeBc;\r
BOOLEAN UsingIpv6;\r
EFI_STATUS Status;\r
- BOOLEAN MediaPresent;\r
+ EFI_STATUS MediaStatus;\r
\r
- VirtualNic = PXEBC_VIRTUAL_NIC_FROM_LOADFILE (This);\r
- Private = VirtualNic->Private;\r
- PxeBc = &Private->PxeBc;\r
- UsingIpv6 = FALSE;\r
- Status = EFI_DEVICE_ERROR;\r
-\r
- if (This == NULL || BufferSize == NULL) {\r
+ if ((This == NULL) || (BufferSize == NULL) || (FilePath == NULL) || !IsDevicePathEnd (FilePath)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
+ VirtualNic = PXEBC_VIRTUAL_NIC_FROM_LOADFILE (This);\r
+ Private = VirtualNic->Private;\r
+ PxeBc = &Private->PxeBc;\r
+ UsingIpv6 = FALSE;\r
+ Status = EFI_DEVICE_ERROR;\r
+\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
// Start Pxe Base Code to initialize PXE boot.\r
//\r
Status = PxeBc->Start (PxeBc, UsingIpv6);\r
- if (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED) {\r
+ if ((Status == EFI_ALREADY_STARTED) && (UsingIpv6 != PxeBc->Mode->UsingIpv6)) {\r
+ //\r
+ // PxeBc protocol has already been started but not on the required IP version, restart it.\r
+ //\r
+ Status = PxeBc->Stop (PxeBc);\r
+ if (!EFI_ERROR (Status)) {\r
+ Status = PxeBc->Start (PxeBc, UsingIpv6);\r
+ }\r
+ }\r
+\r
+ if ((Status == EFI_SUCCESS) || (Status == EFI_ALREADY_STARTED)) {\r
Status = PxeBcLoadBootFile (Private, BufferSize, Buffer);\r
}\r
\r
- if (Status != EFI_SUCCESS &&\r
- Status != EFI_UNSUPPORTED &&\r
- Status != EFI_BUFFER_TOO_SMALL) {\r
+ if ((Status != EFI_SUCCESS) &&\r
+ (Status != EFI_UNSUPPORTED) &&\r
+ (Status != EFI_BUFFER_TOO_SMALL))\r
+ {\r
//\r
// There are three cases, which needn't stop pxebc here.\r
// 1. success to download file.\r
// 3. unsupported.\r
//\r
PxeBc->Stop (PxeBc);\r
+ } else {\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 these programs which\r
+ // also need to use DHCP4 will be impacted.\r
+ //\r
+ if (!PxeBc->Mode->UsingIpv6) {\r
+ Private->Dhcp4->Stop (Private->Dhcp4);\r
+ Private->Dhcp4->Configure (Private->Dhcp4, NULL);\r
+ }\r
}\r
\r
return Status;\r
}\r
\r
EFI_LOAD_FILE_PROTOCOL gLoadFileProtocolTemplate = { EfiPxeLoadFile };\r
-\r
projects / mirror_edk2.git / blobdiff