diff options
Diffstat (limited to 'MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c')
| -rw-r--r-- | MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c | 247 |
1 files changed, 74 insertions, 173 deletions
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c index 5f8821a4d6..2c74a80308 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c @@ -1,8 +1,8 @@ /** @file
This code implements the IP4Config and NicIp4Config protocols.
-Copyright (c) 2006 - 2009, Intel Corporation.<BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+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<BR>
http://opensource.org/licenses/bsd-license.php
@@ -13,43 +13,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
#include "Ip4Config.h"
+#include "NicIp4Variable.h"
-IP4_CONFIG_INSTANCE *mIp4ConfigNicList[MAX_IP4_CONFIG_IN_VARIABLE];
-
+//
+// Ip4 Config Protocol
+//
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP4_CONFIG_PROTOCOL mIp4ConfigProtocolTemplate = {
+ EfiIp4ConfigStart,
+ EfiIp4ConfigStop,
+ EfiIp4ConfigGetData
+};
/**
Get the NIC's configure information from the IP4 configure variable.
It will remove the invalid variable.
- @param NicAddr The NIC to check
+ @param Instance The IP4 CONFIG instance.
@return NULL if no configure for the NIC in the variable, or it is invalid.
Otherwise the pointer to the NIC's IP configure parameter will be returned.
**/
NIC_IP4_CONFIG_INFO *
-Ip4ConfigGetNicInfo (
- IN NIC_ADDR *NicAddr
+EfiNicIp4ConfigGetInfo (
+ IN IP4_CONFIG_INSTANCE *Instance
)
{
- IP4_CONFIG_VARIABLE *Variable;
- IP4_CONFIG_VARIABLE *NewVariable;
- NIC_IP4_CONFIG_INFO *Config;
+ NIC_IP4_CONFIG_INFO *NicConfig;
//
- // Read the configuration parameter for this NicAddr from
+ // Read the configuration parameter for this NIC from
// the EFI variable
//
- Variable = Ip4ConfigReadVariable ();
-
- if (Variable == NULL) {
- return NULL;
- }
-
- Config = Ip4ConfigFindNicVariable (Variable, NicAddr);
-
- if (Config == NULL) {
- FreePool (Variable);
+ NicConfig = Ip4ConfigReadVariable (Instance);
+ if (NicConfig == NULL) {
return NULL;
}
@@ -57,106 +54,37 @@ Ip4ConfigGetNicInfo ( // Validate the configuration, if the configuration is invalid,
// remove it from the variable.
//
- if (!Ip4ConfigIsValid (Config)) {
- NewVariable = Ip4ConfigModifyVariable (Variable, &Config->NicAddr, NULL);
- Ip4ConfigWriteVariable (NewVariable);
-
- if (NewVariable != NULL) {
- FreePool (NewVariable);
- };
-
- FreePool (Config);
- Config = NULL;
- }
-
- FreePool (Variable);
- return Config;
-}
-
-
-/**
- Get the configure parameter for this NIC.
-
- @param Instance The IP4 CONFIG Instance.
- @param ConfigLen The length of the NicConfig buffer.
- @param NicConfig The buffer to receive the NIC's configure
- parameter.
-
- @retval EFI_SUCCESS The configure parameter for this NIC was
- obtained successfully .
- @retval EFI_INVALID_PARAMETER This or ConfigLen is NULL.
- @retval EFI_NOT_FOUND There is no configure parameter for the NIC in
- NVRam.
- @retval EFI_BUFFER_TOO_SMALL The ConfigLen is too small or the NicConfig is
- NULL.
-
-**/
-EFI_STATUS
-EFIAPI
-EfiNicIp4ConfigGetInfo (
- IN IP4_CONFIG_INSTANCE *Instance,
- IN OUT UINTN *ConfigLen,
- OUT NIC_IP4_CONFIG_INFO *NicConfig
- )
-{
- NIC_IP4_CONFIG_INFO *Config;
- EFI_STATUS Status;
- UINTN Len;
-
- if ((Instance == NULL) || (ConfigLen == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Read the Nic's configuration parameter from variable
- //
- Config = Ip4ConfigGetNicInfo (&Instance->NicAddr);
+ if (!Ip4ConfigIsValid (NicConfig)) {
+ Ip4ConfigWriteVariable (Instance, NULL);
- if (Config == NULL) {
- return EFI_NOT_FOUND;
- }
-
- //
- // Copy the data to user's buffer
- //
- Len = SIZEOF_NIC_IP4_CONFIG_INFO (Config);
-
- if ((*ConfigLen < Len) || (NicConfig == NULL)) {
- Status = EFI_BUFFER_TOO_SMALL;
- } else {
- Status = EFI_SUCCESS;
- CopyMem (NicConfig, Config, Len);
- Ip4ConfigFixRouteTablePointer (&NicConfig->Ip4Info);
+ FreePool (NicConfig);
+ NicConfig = NULL;
}
- *ConfigLen = Len;
-
- FreePool (Config);
- return Status;
+ return NicConfig;
}
-
/**
- Set the IP configure parameters for this NIC.
+ Set the IP configure parameters for this NIC.
- If Reconfig is TRUE, the IP driver will be informed to discard current
- auto configure parameter and restart the auto configuration process.
+ If Reconfig is TRUE, the IP driver will be informed to discard current
+ auto configure parameter and restart the auto configuration process.
If current there is a pending auto configuration, EFI_ALREADY_STARTED is
returned. You can only change the configure setting when either
the configure has finished or not started yet. If NicConfig, the
NIC's configure parameter is removed from the variable.
@param Instance The IP4 CONFIG instance.
- @param NicConfig The new NIC IP4 configure parameter
+ @param NicConfig The new NIC IP4 configure parameter.
@param Reconfig Inform the IP4 driver to restart the auto
- configuration
-
- @retval EFI_SUCCESS The configure parameter for this NIC was
- set successfully .
+ configuration.
+
+ @retval EFI_SUCCESS The configure parameter for this NIC was
+ set successfully.
@retval EFI_INVALID_PARAMETER This is NULL or the configure parameter is
invalid.
@retval EFI_ALREADY_STARTED There is a pending auto configuration.
- @retval EFI_NOT_FOUND No auto configure parameter is found
+ @retval EFI_NOT_FOUND No auto configure parameter is found.
**/
EFI_STATUS
@@ -167,9 +95,7 @@ EfiNicIp4ConfigSetInfo ( IN BOOLEAN Reconfig
)
{
- IP4_CONFIG_VARIABLE *Variable;
- IP4_CONFIG_VARIABLE *NewVariable;
- EFI_STATUS Status;
+ EFI_STATUS Status;
//
// Validate the parameters
@@ -190,26 +116,7 @@ EfiNicIp4ConfigSetInfo ( //
// Update the parameter in the configure variable
//
- Variable = Ip4ConfigReadVariable ();
-
- if ((Variable == NULL) && (NicConfig == NULL)) {
- return EFI_NOT_FOUND;
- }
-
- NewVariable = Ip4ConfigModifyVariable (Variable, &Instance->NicAddr, NicConfig);
- Status = Ip4ConfigWriteVariable (NewVariable);
-
- if (NewVariable != NULL) {
- FreePool (NewVariable);
- }
-
- //
- // Variable is NULL when saving the first configure parameter
- //
- if (Variable != NULL) {
- FreePool (Variable);
- }
-
+ Status = Ip4ConfigWriteVariable (Instance, NicConfig);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -342,47 +249,47 @@ ON_EXIT: /**
Starts running the configuration policy for the EFI IPv4 Protocol driver.
-
- The Start() function is called to determine and to begin the platform
- configuration policy by the EFI IPv4 Protocol driver. This determination may
- be as simple as returning EFI_UNSUPPORTED if there is no EFI IPv4 Protocol
- driver configuration policy. It may be as involved as loading some defaults
- from nonvolatile storage, downloading dynamic data from a DHCP server, and
+
+ The Start() function is called to determine and to begin the platform
+ configuration policy by the EFI IPv4 Protocol driver. This determination may
+ be as simple as returning EFI_UNSUPPORTED if there is no EFI IPv4 Protocol
+ driver configuration policy. It may be as involved as loading some defaults
+ from nonvolatile storage, downloading dynamic data from a DHCP server, and
checking permissions with a site policy server.
- Starting the configuration policy is just the beginning. It may finish almost
- instantly or it may take several minutes before it fails to retrieve configuration
- information from one or more servers. Once the policy is started, drivers
- should use the DoneEvent parameter to determine when the configuration policy
- has completed. EFI_IP4_CONFIG_PROTOCOL.GetData() must then be called to
+ Starting the configuration policy is just the beginning. It may finish almost
+ instantly or it may take several minutes before it fails to retrieve configuration
+ information from one or more servers. Once the policy is started, drivers
+ should use the DoneEvent parameter to determine when the configuration policy
+ has completed. EFI_IP4_CONFIG_PROTOCOL.GetData() must then be called to
determine if the configuration succeeded or failed.
- Until the configuration completes successfully, EFI IPv4 Protocol driver instances
+ Until the configuration completes successfully, EFI IPv4 Protocol driver instances
that are attempting to use default configurations must return EFI_NO_MAPPING.
- Once the configuration is complete, the EFI IPv4 Configuration Protocol driver
- signals DoneEvent. The configuration may need to be updated in the future,
- however; in this case, the EFI IPv4 Configuration Protocol driver must signal
- ReconfigEvent, and all EFI IPv4 Protocol driver instances that are using default
- configurations must return EFI_NO_MAPPING until the configuration policy has
+ Once the configuration is complete, the EFI IPv4 Configuration Protocol driver
+ signals DoneEvent. The configuration may need to be updated in the future,
+ however; in this case, the EFI IPv4 Configuration Protocol driver must signal
+ ReconfigEvent, and all EFI IPv4 Protocol driver instances that are using default
+ configurations must return EFI_NO_MAPPING until the configuration policy has
been rerun.
@param This Pointer to the EFI_IP4_CONFIG_PROTOCOL instance.
- @param DoneEvent Event that will be signaled when the EFI IPv4
- Protocol driver configuration policy completes
+ @param DoneEvent Event that will be signaled when the EFI IPv4
+ Protocol driver configuration policy completes
execution. This event must be of type EVT_NOTIFY_SIGNAL.
- @param ReconfigEvent Event that will be signaled when the EFI IPv4
- Protocol driver configuration needs to be updated.
+ @param ReconfigEvent Event that will be signaled when the EFI IPv4
+ Protocol driver configuration needs to be updated.
This event must be of type EVT_NOTIFY_SIGNAL.
-
- @retval EFI_SUCCESS The configuration policy for the EFI IPv4 Protocol
+
+ @retval EFI_SUCCESS The configuration policy for the EFI IPv4 Protocol
driver is now running.
@retval EFI_INVALID_PARAMETER One or more of the following parameters is NULL:
This
DoneEvent
ReconfigEvent
@retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
- @retval EFI_ALREADY_STARTED The configuration policy for the EFI IPv4 Protocol
+ @retval EFI_ALREADY_STARTED The configuration policy for the EFI IPv4 Protocol
driver was already started.
@retval EFI_DEVICE_ERROR An unexpected system error or network error occurred.
- @retval EFI_UNSUPPORTED This interface does not support the EFI IPv4 Protocol
+ @retval EFI_UNSUPPORTED This interface does not support the EFI IPv4 Protocol
driver configuration.
**/
@@ -420,7 +327,7 @@ EfiIp4ConfigStart ( Instance->DoneEvent = DoneEvent;
Instance->ReconfigEvent = ReconfigEvent;
- Instance->NicConfig = Ip4ConfigGetNicInfo (&Instance->NicAddr);
+ Instance->NicConfig = EfiNicIp4ConfigGetInfo (Instance);
if (Instance->NicConfig == NULL) {
Source = IP4_CONFIG_SOURCE_DHCP;
@@ -546,18 +453,18 @@ ON_EXIT: /**
Stops running the configuration policy for the EFI IPv4 Protocol driver.
-
- The Stop() function stops the configuration policy for the EFI IPv4 Protocol driver.
+
+ The Stop() function stops the configuration policy for the EFI IPv4 Protocol driver.
All configuration data will be lost after calling Stop().
@param This Pointer to the EFI_IP4_CONFIG_PROTOCOL instance.
- @retval EFI_SUCCESS The configuration policy for the EFI IPv4 Protocol
+ @retval EFI_SUCCESS The configuration policy for the EFI IPv4 Protocol
driver has been stopped.
@retval EFI_INVALID_PARAMETER This is NULL.
- @retval EFI_NOT_STARTED The configuration policy for the EFI IPv4 Protocol
+ @retval EFI_NOT_STARTED The configuration policy for the EFI IPv4 Protocol
driver was not started.
-
+
**/
EFI_STATUS
EFIAPI
@@ -600,26 +507,26 @@ ON_EXIT: /**
Returns the default configuration data (if any) for the EFI IPv4 Protocol driver.
- The GetData() function returns the current configuration data for the EFI IPv4
+ The GetData() function returns the current configuration data for the EFI IPv4
Protocol driver after the configuration policy has completed.
-
+
@param This Pointer to the EFI_IP4_CONFIG_PROTOCOL instance.
- @param ConfigDataSize On input, the size of the ConfigData buffer.
- On output, the count of bytes that were written
+ @param ConfigDataSize On input, the size of the ConfigData buffer.
+ On output, the count of bytes that were written
into the ConfigData buffer.
- @param ConfigData Pointer to the EFI IPv4 Configuration Protocol
- driver configuration data structure.
- Type EFI_IP4_IPCONFIG_DATA is defined in
+ @param ConfigData Pointer to the EFI IPv4 Configuration Protocol
+ driver configuration data structure.
+ Type EFI_IP4_IPCONFIG_DATA is defined in
"Related Definitions" below.
@retval EFI_SUCCESS The EFI IPv4 Protocol driver configuration has been returned.
@retval EFI_INVALID_PARAMETER This is NULL.
- @retval EFI_NOT_STARTED The configuration policy for the EFI IPv4 Protocol
+ @retval EFI_NOT_STARTED The configuration policy for the EFI IPv4 Protocol
driver is not running.
@retval EFI_NOT_READY EFI IPv4 Protocol driver configuration is still running.
@retval EFI_ABORTED EFI IPv4 Protocol driver configuration could not complete.
Currently not implemented.
- @retval EFI_BUFFER_TOO_SMALL *ConfigDataSize is smaller than the configuration
+ @retval EFI_BUFFER_TOO_SMALL *ConfigDataSize is smaller than the configuration
data buffer or ConfigData is NULL.
**/
@@ -752,9 +659,3 @@ Ip4ConfigCleanConfig ( Ip4ConfigCleanDhcp4 (Instance);
}
-EFI_IP4_CONFIG_PROTOCOL mIp4ConfigProtocolTemplate = {
- EfiIp4ConfigStart,
- EfiIp4ConfigStop,
- EfiIp4ConfigGetData
-};
-
|