X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FLibrary%2FDxeNetLib%2FDxeNetLib.c;h=ce26b322bcb2cf619e705ae1e66af847fa019930;hb=f52e226e19c79e7276668e29c173fbf19a851a36;hp=61e4c8c9d1d9a7004cc56856e74a7bddbfe22388;hpb=f8c075d112ebb41f2dfc693426c33a9ed2e9bb22;p=mirror_edk2.git
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 61e4c8c9d1..ce26b322bc 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1,7 +1,7 @@
/** @file
Network library.
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2015, 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
@@ -19,12 +19,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include
#include
#include
-#include
+#include
#include
#include
-#include
-#include
#include
#include
@@ -35,7 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include
#include
#include
-#include
#include
#include
@@ -1686,86 +1683,6 @@ NetMapIterate (
}
-/**
- Internal function to get the child handle of the NIC handle.
-
- @param[in] Controller NIC controller handle.
- @param[out] ChildHandle Returned child handle.
-
- @retval EFI_SUCCESS Successfully to get child handle.
- @retval Others Failed to get child handle.
-
-**/
-EFI_STATUS
-NetGetChildHandle (
- IN EFI_HANDLE Controller,
- OUT EFI_HANDLE *ChildHandle
- )
-{
- EFI_STATUS Status;
- EFI_HANDLE *Handles;
- UINTN HandleCount;
- UINTN Index;
- EFI_DEVICE_PATH_PROTOCOL *ChildDeviceDevicePath;
- VENDOR_DEVICE_PATH *VendorDeviceNode;
-
- //
- // Locate all EFI Hii Config Access protocols
- //
- Status = gBS->LocateHandleBuffer (
- ByProtocol,
- &gEfiHiiConfigAccessProtocolGuid,
- NULL,
- &HandleCount,
- &Handles
- );
- if (EFI_ERROR (Status) || (HandleCount == 0)) {
- return Status;
- }
-
- Status = EFI_NOT_FOUND;
-
- for (Index = 0; Index < HandleCount; Index++) {
-
- Status = EfiTestChildHandle (Controller, Handles[Index], &gEfiManagedNetworkServiceBindingProtocolGuid);
- if (!EFI_ERROR (Status)) {
- //
- // Get device path on the child handle
- //
- Status = gBS->HandleProtocol (
- Handles[Index],
- &gEfiDevicePathProtocolGuid,
- (VOID **) &ChildDeviceDevicePath
- );
-
- if (!EFI_ERROR (Status)) {
- while (!IsDevicePathEnd (ChildDeviceDevicePath)) {
- ChildDeviceDevicePath = NextDevicePathNode (ChildDeviceDevicePath);
- //
- // Parse one instance
- //
- if (ChildDeviceDevicePath->Type == HARDWARE_DEVICE_PATH &&
- ChildDeviceDevicePath->SubType == HW_VENDOR_DP) {
- VendorDeviceNode = (VENDOR_DEVICE_PATH *) ChildDeviceDevicePath;
- if (CompareMem (&VendorDeviceNode->Guid, &gEfiNicIp4ConfigVariableGuid, sizeof (EFI_GUID)) == 0) {
- //
- // Found item matched gEfiNicIp4ConfigVariableGuid
- //
- *ChildHandle = Handles[Index];
- FreePool (Handles);
- return EFI_SUCCESS;
- }
- }
- }
- }
- }
- }
-
- FreePool (Handles);
- return Status;
-}
-
-
/**
This is the default unload handle for all the network drivers.
@@ -1788,6 +1705,7 @@ NetLibDefaultUnload (
EFI_HANDLE *DeviceHandleBuffer;
UINTN DeviceHandleCount;
UINTN Index;
+ UINTN Index2;
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;
@@ -1809,28 +1727,12 @@ NetLibDefaultUnload (
return Status;
}
- //
- // Disconnect the driver specified by ImageHandle from all
- // the devices in the handle database.
- //
- for (Index = 0; Index < DeviceHandleCount; Index++) {
- Status = gBS->DisconnectController (
- DeviceHandleBuffer[Index],
- ImageHandle,
- NULL
- );
- }
-
- //
- // Uninstall all the protocols installed in the driver entry point
- //
for (Index = 0; Index < DeviceHandleCount; Index++) {
Status = gBS->HandleProtocol (
DeviceHandleBuffer[Index],
&gEfiDriverBindingProtocolGuid,
(VOID **) &DriverBinding
);
-
if (EFI_ERROR (Status)) {
continue;
}
@@ -1838,12 +1740,28 @@ NetLibDefaultUnload (
if (DriverBinding->ImageHandle != ImageHandle) {
continue;
}
-
+
+ //
+ // Disconnect the driver specified by ImageHandle from all
+ // the devices in the handle database.
+ //
+ for (Index2 = 0; Index2 < DeviceHandleCount; Index2++) {
+ Status = gBS->DisconnectController (
+ DeviceHandleBuffer[Index2],
+ DriverBinding->DriverBindingHandle,
+ NULL
+ );
+ }
+
+ //
+ // Uninstall all the protocols installed in the driver entry point
+ //
gBS->UninstallProtocolInterface (
- ImageHandle,
+ DriverBinding->DriverBindingHandle,
&gEfiDriverBindingProtocolGuid,
DriverBinding
);
+
Status = gBS->HandleProtocol (
DeviceHandleBuffer[Index],
&gEfiComponentNameProtocolGuid,
@@ -1851,7 +1769,7 @@ NetLibDefaultUnload (
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
- ImageHandle,
+ DriverBinding->DriverBindingHandle,
&gEfiComponentNameProtocolGuid,
ComponentName
);
@@ -1864,7 +1782,7 @@ NetLibDefaultUnload (
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
- ImageHandle,
+ DriverBinding->DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
ComponentName2
);
@@ -2249,7 +2167,7 @@ NetLibGetMacAddress (
// Try to get SNP mode from MNP
//
Status = Mnp->GetModeData (Mnp, NULL, &SnpModeData);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {
MnpSb->DestroyChild (MnpSb, MnpChildHandle);
return Status;
}
@@ -2563,12 +2481,11 @@ Exit:
Check the default address used by the IPv4 driver is static or dynamic (acquired
from DHCP).
- If the controller handle does not have the NIC Ip4 Config Protocol installed, the
- default address is static. If the EFI variable to save the configuration is not found,
- the default address is static. Otherwise, get the result from the EFI variable which
- saving the configuration.
+ If the controller handle does not have the EFI_IP4_CONFIG2_PROTOCOL installed, the
+ default address is static. If failed to get the policy from Ip4 Config2 Protocol,
+ the default address is static. Otherwise, get the result from Ip4 Config2 Protocol.
- @param[in] Controller The controller handle which has the NIC Ip4 Config Protocol
+ @param[in] Controller The controller handle which has the EFI_IP4_CONFIG2_PROTOCOL
relative with the default address to judge.
@retval TRUE If the default address is static.
@@ -2581,107 +2498,34 @@ NetLibDefaultAddressIsStatic (
)
{
EFI_STATUS Status;
- EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;
- UINTN Len;
- NIC_IP4_CONFIG_INFO *ConfigInfo;
+ EFI_IP4_CONFIG2_PROTOCOL *Ip4Config2;
+ UINTN DataSize;
+ EFI_IP4_CONFIG2_POLICY Policy;
BOOLEAN IsStatic;
- EFI_STRING ConfigHdr;
- EFI_STRING ConfigResp;
- EFI_STRING AccessProgress;
- EFI_STRING AccessResults;
- EFI_STRING String;
- EFI_HANDLE ChildHandle;
-
- ConfigInfo = NULL;
- ConfigHdr = NULL;
- ConfigResp = NULL;
- AccessProgress = NULL;
- AccessResults = NULL;
- IsStatic = TRUE;
-
- Status = gBS->LocateProtocol (
- &gEfiHiiConfigRoutingProtocolGuid,
- NULL,
- (VOID **) &HiiConfigRouting
- );
- if (EFI_ERROR (Status)) {
- return TRUE;
- }
- Status = NetGetChildHandle (Controller, &ChildHandle);
- if (EFI_ERROR (Status)) {
- return TRUE;
- }
+ Ip4Config2 = NULL;
+
+ DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);
+
+ IsStatic = TRUE;
//
- // Construct config request string header
+ // Get Ip4Config2 policy.
//
- ConfigHdr = HiiConstructConfigHdr (&gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE, ChildHandle);
- if (ConfigHdr == NULL) {
- return TRUE;
- }
-
- Len = StrLen (ConfigHdr);
- ConfigResp = AllocateZeroPool ((Len + NIC_ITEM_CONFIG_SIZE * 2 + 100) * sizeof (CHAR16));
- if (ConfigResp == NULL) {
- goto ON_EXIT;
- }
- StrCpy (ConfigResp, ConfigHdr);
-
- String = ConfigResp + Len;
- UnicodeSPrint (
- String,
- (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
- L"&OFFSET=%04X&WIDTH=%04X",
- OFFSET_OF (NIC_IP4_CONFIG_INFO, Source),
- sizeof (UINT32)
- );
-
- Status = HiiConfigRouting->ExtractConfig (
- HiiConfigRouting,
- ConfigResp,
- &AccessProgress,
- &AccessResults
- );
+ Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- ConfigInfo = AllocateZeroPool (NIC_ITEM_CONFIG_SIZE);
- if (ConfigInfo == NULL) {
- goto ON_EXIT;
- }
-
- ConfigInfo->Source = IP4_CONFIG_SOURCE_STATIC;
- Len = NIC_ITEM_CONFIG_SIZE;
- Status = HiiConfigRouting->ConfigToBlock (
- HiiConfigRouting,
- AccessResults,
- (UINT8 *) ConfigInfo,
- &Len,
- &AccessProgress
- );
+ Status = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypePolicy, &DataSize, &Policy);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
-
- IsStatic = (BOOLEAN) (ConfigInfo->Source == IP4_CONFIG_SOURCE_STATIC);
+
+ IsStatic = (BOOLEAN) (Policy == Ip4Config2PolicyStatic);
ON_EXIT:
-
- if (AccessResults != NULL) {
- FreePool (AccessResults);
- }
- if (ConfigInfo != NULL) {
- FreePool (ConfigInfo);
- }
- if (ConfigResp != NULL) {
- FreePool (ConfigResp);
- }
- if (ConfigHdr != NULL) {
- FreePool (ConfigHdr);
- }
-
+
return IsStatic;
}
@@ -3386,7 +3230,7 @@ NetLibIp6ToStr (
return EFI_BUFFER_TOO_SMALL;
}
- StrCpy (String, Buffer);
+ StrCpyS (String, StringSize / sizeof (CHAR16), Buffer);
return EFI_SUCCESS;
}