From 8d285ec0ce8b4c85f8e98b98ed95cbc801817fb9 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 10 Mar 2008 06:55:15 +0000 Subject: [PATCH] 1. Enabled SetIpFilter() in UefiPxeBcDxe module. 2. Ported Arp() in UefiPxeBcDxe module. 3. Sync tracker: enabled unload() for PxeBcDxe module. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4813 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Library/DxeNetLib/NetBuffer.c | 2 +- MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c | 49 ++- MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h | 1 + .../Universal/Network/PxeBcDxe/PxeBcDxe.inf | 1 + .../Network/UefiPxeBcDxe/PxeBcDriver.c | 54 +++- .../Network/UefiPxeBcDxe/PxeBcImpl.c | 289 ++++++++++++++++-- .../Network/UefiPxeBcDxe/PxeBcImpl.h | 3 + .../Network/UefiPxeBcDxe/UefiPxeBcDxe.inf | 3 +- 8 files changed, 377 insertions(+), 25 deletions(-) diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c index d1dbd0aee5..69e9082f02 100644 --- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c +++ b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c @@ -653,7 +653,7 @@ NetbufGetFragment ( CurBlockOp++ ); - for (Index = First + 1; Index < Last; Index++) { + for (Index = First + 1; Index <= Last - 1 ; Index++) { NetbufSetBlockOp ( Child, BlockOp[Index].Head, diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c index fbdeba5d52..cd0ef4a27b 100644 --- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c +++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c @@ -2344,6 +2344,41 @@ PxeBcDriverStop ( return Status; } +EFI_STATUS +EFIAPI +PxeBcUnload ( + IN EFI_HANDLE ImageHandle + ) +{ + EFI_STATUS Status; + UINTN DeviceHandleCount; + EFI_HANDLE *DeviceHandleBuffer; + UINTN Index; + + Status = gBS->LocateHandleBuffer ( + AllHandles, + NULL, + NULL, + &DeviceHandleCount, + &DeviceHandleBuffer + ); + if (!EFI_ERROR (Status)) { + for (Index = 0; Index < DeviceHandleCount; Index++) { + Status = gBS->DisconnectController ( + DeviceHandleBuffer[Index], + mPxeBcDriverBinding.DriverBindingHandle, + NULL + ); + } + + if (DeviceHandleBuffer != NULL) { + gBS->FreePool (DeviceHandleBuffer); + } + } + + return Status; +} + /** Initialize the base code drivers and install the driver binding @@ -2360,7 +2395,8 @@ InitializeBCDriver ( IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status; + EFI_STATUS Status; + EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; // // Initialize EFI library @@ -2374,6 +2410,17 @@ InitializeBCDriver ( &gPxeBcComponentName2 ); + Status = gBS->HandleProtocol ( + ImageHandle, + &gEfiLoadedImageProtocolGuid, + (VOID **) &LoadedImage + ); + if (EFI_ERROR (Status)) { + return Status; + } else { + LoadedImage->Unload = PxeBcUnload; + } + InitArpHeader (); OptionsStrucInit (); diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h index 8d09ee6e71..31162e4971 100644 --- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h +++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h @@ -32,6 +32,7 @@ Abstract: #include #include #include +#include #include #include diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf index 1971731e08..9fac52867f 100644 --- a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf +++ b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf @@ -88,4 +88,5 @@ gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiTcpProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiNetworkInterfaceIdentifierProtocolGuid_31 # PROTOCOL ALWAYS_CONSUMED + gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c index d6907955a5..91ebd8c27f 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c @@ -141,6 +141,7 @@ PxeBcDriverBindingStart ( UINTN Index; EFI_STATUS Status; + CpuDeadLoop (); Private = AllocateZeroPool (sizeof (PXEBC_PRIVATE_DATA)); if (Private == NULL) { return EFI_OUT_OF_RESOURCES; @@ -176,6 +177,28 @@ PxeBcDriverBindingStart ( goto ON_ERROR; } + Status = NetLibCreateServiceChild ( + ControllerHandle, + This->DriverBindingHandle, + &gEfiArpServiceBindingProtocolGuid, + &Private->ArpChild + ); + if (EFI_ERROR (Status)) { + goto ON_ERROR; + } + + Status = gBS->OpenProtocol ( + Private->ArpChild, + &gEfiArpProtocolGuid, + (VOID **) &Private->Arp, + This->DriverBindingHandle, + ControllerHandle, + EFI_OPEN_PROTOCOL_BY_DRIVER + ); + if (EFI_ERROR (Status)) { + goto ON_ERROR; + } + Status = NetLibCreateServiceChild ( ControllerHandle, This->DriverBindingHandle, @@ -247,7 +270,7 @@ PxeBcDriverBindingStart ( } ZeroMem (&Private->Udp4CfgData, sizeof (EFI_UDP4_CONFIG_DATA)); - Private->Udp4CfgData.AcceptBroadcast = TRUE; + Private->Udp4CfgData.AcceptBroadcast = FALSE; Private->Udp4CfgData.AcceptPromiscuous = FALSE; Private->Udp4CfgData.AcceptAnyPort = FALSE; Private->Udp4CfgData.AllowDuplicatePort = TRUE; @@ -322,6 +345,22 @@ ON_ERROR: ); } + if (Private->ArpChild != NULL) { + gBS->CloseProtocol ( + Private->ArpChild, + &gEfiArpProtocolGuid, + This->DriverBindingHandle, + ControllerHandle + ); + + NetLibDestroyServiceChild ( + ControllerHandle, + This->DriverBindingHandle, + &gEfiArpServiceBindingProtocolGuid, + Private->ArpChild + ); + } + gBS->FreePool (Private); return Status; @@ -433,6 +472,19 @@ PxeBcDriverBindingStop ( Private->Mtftp4Child ); + gBS->CloseProtocol ( + Private->ArpChild, + &gEfiArpProtocolGuid, + This->DriverBindingHandle, + NicHandle + ); + NetLibDestroyServiceChild ( + NicHandle, + This->DriverBindingHandle, + &gEfiArpServiceBindingProtocolGuid, + Private->ArpChild + ); + gBS->FreePool (Private); } diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c index 85542f2b2e..193daf1f86 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2007, Intel Corporation +Copyright (c) 2007 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -128,6 +128,11 @@ EfiPxeBcStop ( Mode->Started = FALSE; + // + // Reset and leave joined groups + // + Private->Udp4->Groups (Private->Udp4, FALSE, NULL); + Private->Udp4->Configure (Private->Udp4, NULL); Private->Dhcp4->Stop (Private->Dhcp4); @@ -170,6 +175,7 @@ EfiPxeBcDhcp ( UINT32 DiscoverTimeout; UINTN Index; EFI_STATUS Status; + EFI_ARP_CONFIG_DATA ArpConfigData; if (This == NULL) { return EFI_INVALID_PARAMETER; @@ -266,6 +272,21 @@ EfiPxeBcDhcp ( Dhcp4->Configure (Dhcp4, &Dhcp4CfgData); Private->AddressIsOk = TRUE; + + if (!Mode->UsingIpv6) { + // + // If in IPv4 mode, configure the corresponding ARP with this new + // station IP address. + // + ZeroMem (&ArpConfigData, sizeof (EFI_ARP_CONFIG_DATA)); + + ArpConfigData.SwAddressType = 0x0800; + ArpConfigData.SwAddressLength = sizeof (EFI_IPv4_ADDRESS); + ArpConfigData.StationAddress = &Private->StationIp.v4; + + Private->Arp->Configure (Private->Arp, NULL); + Private->Arp->Configure (Private->Arp, &ArpConfigData); + } } return Status; @@ -831,6 +852,62 @@ ON_EXIT: return Status; } +/** + Validate IP packages by IP filter settings + + @param PxeBcMode Pointer to EFI_PXEBC_MODE + + @param Session Received UDP session + + @retval TRUE The UDP package matches IP filters + + @retval FLASE The UDP package doesn't matches IP filters + +**/ +STATIC +BOOLEAN +CheckIpByFilter ( + EFI_PXE_BASE_CODE_MODE *PxeBcMode, + EFI_UDP4_SESSION_DATA *Session + ) +{ + UINTN Index; + EFI_IPv4_ADDRESS Ip4Address; + EFI_IPv4_ADDRESS DestIp4Address; + + if (PxeBcMode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS) { + return TRUE; + } + + CopyMem (&DestIp4Address, &Session->DestinationAddress, sizeof (DestIp4Address)); + if ((PxeBcMode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) && + IP4_IS_MULTICAST (NTOHL (EFI_IP4 (DestIp4Address))) + ) { + return TRUE; + } + + if ((PxeBcMode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST) && + IP4_IS_LOCAL_BROADCAST (EFI_NTOHL (DestIp4Address)) + ) { + return TRUE; + } + + CopyMem (&Ip4Address, &PxeBcMode->StationIp.v4, sizeof (Ip4Address)); + if ((PxeBcMode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) && + EFI_IP4_EQUAL (&PxeBcMode->StationIp.v4, &DestIp4Address) + ) { + return TRUE; + } + + for (Index = 0; Index < PxeBcMode->IpFilter.IpCnt; ++Index) { + CopyMem (&Ip4Address, &PxeBcMode->IpFilter.IpList[Index].v4, sizeof (Ip4Address)); + if (EFI_IP4_EQUAL (&Ip4Address, &DestIp4Address)) { + return TRUE; + } + } + + return FALSE; +} /** GC_NOTO: Add function description @@ -900,10 +977,6 @@ EfiPxeBcUdpRead ( return EFI_INVALID_PARAMETER; } - if (OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER) { - return EFI_UNSUPPORTED; - } - if ((!(OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) && (DestPort == NULL)) || (!(OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) && (SrcIp == NULL)) || (!(OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) && (SrcPort == NULL))) { @@ -961,23 +1034,34 @@ EfiPxeBcUdpRead ( Matched = FALSE; - // - // Match the destination ip of the received udp dgram - // - if (OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP) { - Matched = TRUE; - - if (DestIp != NULL) { - CopyMem (DestIp, &Session->DestinationAddress, sizeof (EFI_IPv4_ADDRESS)); + if (OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER) { + // + // Check UDP package by IP filter settings + // + if (CheckIpByFilter (Mode, Session)) { + Matched = TRUE; } - } else { - if (DestIp != NULL) { - if (EFI_IP4_EQUAL (DestIp, &Session->DestinationAddress)) { - Matched = TRUE; + } + + if (Matched) { + // + // Match the destination ip of the received udp dgram + // + if (OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP) { + Matched = TRUE; + + if (DestIp != NULL) { + CopyMem (DestIp, &Session->DestinationAddress, sizeof (EFI_IPv4_ADDRESS)); } } else { - if (EFI_IP4_EQUAL (&Private->StationIp, &Session->DestinationAddress)) { - Matched = TRUE; + if (DestIp != NULL) { + if (EFI_IP4_EQUAL (DestIp, &Session->DestinationAddress)) { + Matched = TRUE; + } + } else { + if (EFI_IP4_EQUAL (&Private->StationIp, &Session->DestinationAddress)) { + Matched = TRUE; + } } } } @@ -1091,7 +1175,120 @@ EfiPxeBcSetIpFilter ( IN EFI_PXE_BASE_CODE_IP_FILTER *NewFilter ) { - return EFI_UNSUPPORTED; + EFI_STATUS Status; + PXEBC_PRIVATE_DATA *Private; + EFI_PXE_BASE_CODE_MODE *Mode; + UINTN Index; + BOOLEAN PromiscuousNeed; + + if (This == NULL) { + DEBUG ((EFI_D_ERROR, "BC *This pointer == NULL.\n")); + return EFI_INVALID_PARAMETER; + } + + Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This); + Mode = Private->PxeBc.Mode; + + if (Private == NULL) { + DEBUG ((EFI_D_ERROR, "PXEBC_PRIVATE_DATA poiner == NULL.\n")); + return EFI_INVALID_PARAMETER; + } + + if (NewFilter == NULL) { + DEBUG ((EFI_D_ERROR, "IP Filter *NewFilter == NULL.\n")); + return EFI_INVALID_PARAMETER; + } + + if (!Mode->Started) { + DEBUG ((EFI_D_ERROR, "BC was not started.\n")); + return EFI_NOT_STARTED; + } + + PromiscuousNeed = FALSE; + for (Index = 0; Index < NewFilter->IpCnt; ++Index) { + if (IP4_IS_LOCAL_BROADCAST (EFI_IP4 (NewFilter->IpList[Index].v4))) { + // + // The IP is a broadcast address. + // + DEBUG ((EFI_D_ERROR, "There is broadcast address in NewFilter.\n")); + return EFI_INVALID_PARAMETER; + } + if (Ip4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), 0) && + (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) + ) { + // + // If EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP is set and IP4 address is in IpList, + // promiscuous mode is needed. + // + PromiscuousNeed = TRUE; + } + } + + // + // Clear the UDP instance configuration, all joined groups will be left + // during the operation. + // + Private->Udp4->Configure (Private->Udp4, NULL); + Private->Udp4CfgData.AcceptPromiscuous = FALSE; + Private->Udp4CfgData.AcceptBroadcast = FALSE; + + if (PromiscuousNeed || + NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS || + NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST + ) { + // + // Configure the udp4 filter to receive all packages + // + Private->Udp4CfgData.AcceptPromiscuous = TRUE; + + // + // Configure the UDP instance with the new configuration. + // + Status = Private->Udp4->Configure (Private->Udp4, &Private->Udp4CfgData); + if (EFI_ERROR (Status)) { + return Status; + } + + } else { + + if (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST) { + // + // Configure the udp4 filter to receive all broadcast packages + // + Private->Udp4CfgData.AcceptBroadcast = TRUE; + } + + // + // Configure the UDP instance with the new configuration. + // + Status = Private->Udp4->Configure (Private->Udp4, &Private->Udp4CfgData); + if (EFI_ERROR (Status)) { + return Status; + } + + if (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) { + + for (Index = 0; Index < NewFilter->IpCnt; ++Index) { + if (IP4_IS_MULTICAST (EFI_NTOHL (NewFilter->IpList[Index].v4))) { + // + // Join the mutilcast group + // + Status = Private->Udp4->Groups (Private->Udp4, TRUE, &NewFilter->IpList[Index].v4); + if (EFI_ERROR (Status)) { + return Status; + } + } + } + } + } + + + // + // Save the new filter. + // + CopyMem (&Mode->IpFilter, NewFilter, sizeof (Mode->IpFilter)); + + return EFI_SUCCESS; } @@ -1117,10 +1314,44 @@ EfiPxeBcArp ( IN EFI_MAC_ADDRESS * MacAddr OPTIONAL ) { - return EFI_UNSUPPORTED; + PXEBC_PRIVATE_DATA *Private; + EFI_PXE_BASE_CODE_MODE *Mode; + EFI_STATUS Status; + EFI_MAC_ADDRESS TempMacAddr; + + if (This == NULL || IpAddr == NULL) { + return EFI_INVALID_PARAMETER; + } + + Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This); + Mode = Private->PxeBc.Mode; + + if (!Mode->Started) { + return EFI_NOT_STARTED; + } + + if (!Private->AddressIsOk || Mode->UsingIpv6) { + // + // We can't resolve the IP address if we don't have a local address now. + // Don't have ARP for IPv6. + // + return EFI_INVALID_PARAMETER; + } + + Status = Private->Arp->Request (Private->Arp, &IpAddr->v4, NULL, &TempMacAddr); + if (EFI_ERROR (Status)) { + return Status; + } + + if (MacAddr != NULL) { + CopyMem (MacAddr, &TempMacAddr, sizeof (EFI_MAC_ADDRESS)); + } + + return EFI_SUCCESS; } + /** GC_NOTO: Add function description @@ -1266,6 +1497,7 @@ EfiPxeBcSetStationIP ( { PXEBC_PRIVATE_DATA *Private; EFI_PXE_BASE_CODE_MODE *Mode; + EFI_ARP_CONFIG_DATA ArpConfigData; if (This == NULL) { return EFI_INVALID_PARAMETER; @@ -1296,6 +1528,21 @@ EfiPxeBcSetStationIP ( Private->AddressIsOk = TRUE; + if (!Mode->UsingIpv6) { + // + // If in IPv4 mode, configure the corresponding ARP with this new + // station IP address. + // + ZeroMem (&ArpConfigData, sizeof (EFI_ARP_CONFIG_DATA)); + + ArpConfigData.SwAddressType = 0x0800; + ArpConfigData.SwAddressLength = sizeof (EFI_IPv4_ADDRESS); + ArpConfigData.StationAddress = &Private->StationIp.v4; + + Private->Arp->Configure (Private->Arp, NULL); + Private->Arp->Configure (Private->Arp, &ArpConfigData); + } + return EFI_SUCCESS; } diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h index 61992521b9..6bd7a55531 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h @@ -35,6 +35,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA; #include #include #include +#include #include #include @@ -58,6 +59,7 @@ struct _PXEBC_PRIVATE_DATA { UINT32 Signature; EFI_HANDLE Controller; EFI_HANDLE Image; + EFI_HANDLE ArpChild; EFI_HANDLE Dhcp4Child; EFI_HANDLE Mtftp4Child; EFI_HANDLE Udp4Child; @@ -68,6 +70,7 @@ struct _PXEBC_PRIVATE_DATA { EFI_LOAD_FILE_PROTOCOL LoadFile; EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL LoadFileCallback; EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *PxeBcCallback; + EFI_ARP_PROTOCOL *Arp; EFI_DHCP4_PROTOCOL *Dhcp4; EFI_MTFTP4_PROTOCOL *Mtftp4; EFI_UDP4_PROTOCOL *Udp4; diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf index fd4ab6be68..9e24a7bc7a 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf @@ -79,6 +79,8 @@ [Protocols] + gEfiArpServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED + gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiMtftp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiMtftp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiUdp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED @@ -90,4 +92,3 @@ gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiNetworkInterfaceIdentifierProtocolGuid_31 # PROTOCOL ALWAYS_CONSUMED - -- 2.39.2