/** @file\r
Helper functions for configuring or getting the parameters relating to iSCSI.\r
\r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
#include "IScsiImpl.h"\r
\r
-EFI_GUID mVendorGuid = ISCSI_CONFIG_GUID;\r
CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
BOOLEAN mIScsiDeviceListUpdated = FALSE;\r
UINTN mNumberOfIScsiDevices = 0;\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {49D7B73E-143D-4716-977B-C45F1CB038CC}\r
- //\r
- { 0x49d7b73e, 0x143d, 0x4716, { 0x97, 0x7b, 0xc4, 0x5f, 0x1c, 0xb0, 0x38, 0xcc } }\r
+ IP4_ISCSI_CONFIG_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
if (StrLen (IsIdStr) != 6) {\r
UnicodeSPrint (\r
PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN) sizeof (PortString),\r
L"Error! Input is incorrect, please input 6 hex numbers!\n"\r
);\r
\r
DataSize = 0;\r
Status = gRT->GetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
NULL,\r
&DataSize,\r
NULL\r
\r
gRT->GetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
NULL,\r
&DataSize,\r
DeviceList\r
CurMacInfo = &DeviceList->MacInfo[Index];\r
IScsiMacAddrToStr (&CurMacInfo->Mac, CurMacInfo->Len, CurMacInfo->VlanId, MacString);\r
gRT->SetVariable (MacString, &gEfiIScsiInitiatorNameProtocolGuid, 0, 0, NULL);\r
- gRT->SetVariable (MacString, &mIScsiCHAPAuthInfoGuid, 0, 0, NULL);\r
+ gRT->SetVariable (MacString, &gIScsiCHAPAuthInfoGuid, 0, 0, NULL);\r
}\r
\r
FreePool (DeviceList);\r
\r
gRT->SetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
ISCSI_CONFIG_VAR_ATTR,\r
DeviceListSize,\r
DeviceList\r
)\r
{\r
EFI_STATUS Status;\r
- CHAR8 InitiatorName[ISCSI_NAME_IFR_MAX_SIZE];\r
+ CHAR8 InitiatorName[ISCSI_NAME_MAX_SIZE];\r
UINTN BufferSize;\r
ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
ISCSI_FORM_CALLBACK_INFO *Private;\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gIp4IScsiConfigGuid, mVendorStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
IScsiConvertDeviceConfigDataToIfrNvData (Private->Current, IfrNvData);\r
}\r
\r
- BufferSize = ISCSI_NAME_IFR_MAX_SIZE;\r
+ BufferSize = ISCSI_NAME_MAX_SIZE;\r
Status = gIScsiInitiatorName.Get (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
if (EFI_ERROR (Status)) {\r
IfrNvData->InitiatorName[0] = L'\0';\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mVendorGuid, mVendorStorageName, Private->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gIp4IScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Configuration, &mVendorGuid, mVendorStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gIp4IScsiConfigGuid, mVendorStorageName)) {\r
*Progress = Configuration;\r
return EFI_NOT_FOUND;\r
}\r
{\r
ISCSI_FORM_CALLBACK_INFO *Private;\r
UINTN BufferSize;\r
- CHAR8 IScsiName[ISCSI_NAME_IFR_MAX_SIZE];\r
+ CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];\r
CHAR16 PortString[128];\r
CHAR8 Ip4String[IP4_STR_MAX_SIZE];\r
CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
EFI_STATUS Status;\r
EFI_INPUT_KEY Key;\r
\r
- if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
- //\r
- // Do nothing for UEFI OPEN/CLOSE Action\r
- //\r
- return EFI_SUCCESS;\r
+ if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {\r
+ return EFI_UNSUPPORTED;\r
}\r
\r
Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);\r
-\r
//\r
// Retrive uncommitted data from Browser\r
//\r
IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));\r
ASSERT (IfrNvData != NULL);\r
- if (!HiiGetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData)) {\r
+ if (!HiiGetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData)) {\r
FreePool (IfrNvData);\r
return EFI_NOT_FOUND;\r
}\r
- \r
Status = EFI_SUCCESS;\r
\r
- switch (QuestionId) {\r
- case KEY_INITIATOR_NAME:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);\r
- BufferSize = AsciiStrLen (IScsiName) + 1;\r
+ if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+ if ((QuestionId >= KEY_DEVICE_ENTRY_BASE) && (QuestionId < (mNumberOfIScsiDevices + KEY_DEVICE_ENTRY_BASE))) {\r
+ //\r
+ // In case goto the device configuration form, update the device form title.\r
+ //\r
+ ConfigFormEntry = IScsiGetConfigFormEntryByIndex ((UINT32) (QuestionId - KEY_DEVICE_ENTRY_BASE));\r
+ ASSERT (ConfigFormEntry != NULL);\r
\r
- Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid iSCSI Name!", NULL);\r
- }\r
+ UnicodeSPrint (PortString, (UINTN) sizeof (PortString), L"Port %s", ConfigFormEntry->MacString);\r
+ DeviceFormTitleToken = (EFI_STRING_ID) STR_ISCSI_DEVICE_FORM_TITLE;\r
+ HiiSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString, NULL);\r
\r
- break;\r
+ IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData);\r
\r
- case KEY_LOCAL_IP:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);\r
- Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r
- if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+ Private->Current = ConfigFormEntry;\r
}\r
+ } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
+ switch (QuestionId) { \r
+ case KEY_INITIATOR_NAME:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);\r
+ BufferSize = AsciiStrSize (IScsiName);\r
\r
- break;\r
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid iSCSI Name!", NULL);\r
+ }\r
\r
- case KEY_SUBNET_MASK:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->SubnetMask, Ip4String);\r
- Status = IScsiAsciiStrToIp (Ip4String, &SubnetMask.v4);\r
- if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
- }\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+ break;\r
\r
- break;\r
+ case KEY_LOCAL_IP:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);\r
+ Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r
+ if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+ }\r
\r
- case KEY_GATE_WAY:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);\r
- Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);\r
- if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_SUBNET_MASK:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->SubnetMask, Ip4String);\r
+ Status = IScsiAsciiStrToIp (Ip4String, &SubnetMask.v4);\r
+ if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+ }\r
\r
- case KEY_TARGET_IP:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->TargetIp, Ip4String);\r
- Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r
- if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_GATE_WAY:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);\r
+ Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);\r
+ if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+ }\r
\r
- case KEY_TARGET_NAME:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->TargetName, IScsiName);\r
- Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid iSCSI Name!", NULL);\r
- } else {\r
- AsciiStrCpy (Private->Current->SessionConfigData.TargetName, IScsiName);\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_TARGET_IP:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->TargetIp, Ip4String);\r
+ Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r
+ if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));\r
+ }\r
\r
- case KEY_DHCP_ENABLE:\r
- if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
- IfrNvData->TargetInfoFromDhcp = 0;\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_TARGET_NAME:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->TargetName, IScsiName);\r
+ Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid iSCSI Name!", NULL);\r
+ } else {\r
+ AsciiStrCpy (Private->Current->SessionConfigData.TargetName, IScsiName);\r
+ }\r
\r
- case KEY_BOOT_LUN:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->BootLun, LunString);\r
- Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid LUN string!", NULL);\r
- } else {\r
- CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_DHCP_ENABLE:\r
+ if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
+ IfrNvData->TargetInfoFromDhcp = 0;\r
+ }\r
\r
- case KEY_CHAP_NAME:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->CHAPName, Private->Current->AuthConfigData.CHAPName);\r
- break;\r
+ break;\r
\r
- case KEY_CHAP_SECRET:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->CHAPSecret, Private->Current->AuthConfigData.CHAPSecret);\r
- break;\r
+ case KEY_BOOT_LUN:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->BootLun, LunString);\r
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid LUN string!", NULL);\r
+ } else {\r
+ CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
+ }\r
\r
- case KEY_REVERSE_CHAP_NAME:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->ReverseCHAPName, Private->Current->AuthConfigData.ReverseCHAPName);\r
- break;\r
+ break;\r
\r
- case KEY_REVERSE_CHAP_SECRET:\r
- IScsiUnicodeStrToAsciiStr (IfrNvData->ReverseCHAPSecret, Private->Current->AuthConfigData.ReverseCHAPSecret);\r
- break;\r
+ case KEY_CHAP_NAME:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->CHAPName, Private->Current->AuthConfigData.CHAPName);\r
+ break;\r
\r
- case KEY_CONFIG_ISID:\r
- IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
- IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+ case KEY_CHAP_SECRET:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->CHAPSecret, Private->Current->AuthConfigData.CHAPSecret);\r
+ break;\r
\r
- break;\r
+ case KEY_REVERSE_CHAP_NAME:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->ReverseCHAPName, Private->Current->AuthConfigData.ReverseCHAPName);\r
+ break;\r
\r
- case KEY_SAVE_CHANGES:\r
- //\r
- // First, update those fields which don't have INTERACTIVE set.\r
- //\r
- Private->Current->SessionConfigData.Enabled = IfrNvData->Enabled;\r
- Private->Current->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->InitiatorInfoFromDhcp;\r
- Private->Current->SessionConfigData.TargetPort = IfrNvData->TargetPort;\r
- if (Private->Current->SessionConfigData.TargetPort == 0) {\r
- Private->Current->SessionConfigData.TargetPort = ISCSI_WELL_KNOWN_PORT;\r
- }\r
+ case KEY_REVERSE_CHAP_SECRET:\r
+ IScsiUnicodeStrToAsciiStr (IfrNvData->ReverseCHAPSecret, Private->Current->AuthConfigData.ReverseCHAPSecret);\r
+ break;\r
\r
- Private->Current->SessionConfigData.TargetInfoFromDhcp = IfrNvData->TargetInfoFromDhcp;\r
- Private->Current->AuthConfigData.CHAPType = IfrNvData->CHAPType;\r
+ case KEY_CONFIG_ISID:\r
+ IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+ IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
\r
- //\r
- // Only do full parameter validation if iSCSI is enabled on this device.\r
- //\r
- if (Private->Current->SessionConfigData.Enabled) {\r
+ break;\r
+\r
+ case KEY_SAVE_CHANGES:\r
//\r
- // Validate the address configuration of the Initiator if DHCP isn't\r
- // deployed.\r
+ // First, update those fields which don't have INTERACTIVE set.\r
//\r
- if (!Private->Current->SessionConfigData.InitiatorInfoFromDhcp) {\r
- CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));\r
- CopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));\r
- CopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));\r
-\r
- if ((Gateway.Addr[0] != 0)) {\r
- if (SubnetMask.Addr[0] == 0) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Gateway address is set but subnet mask is zero.", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- break;\r
- } else if (!IP4_NET_EQUAL (HostIp.Addr[0], Gateway.Addr[0], SubnetMask.Addr[0])) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Local IP and Gateway are not in the same subnet.", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- break;\r
- }\r
- }\r
+ Private->Current->SessionConfigData.Enabled = IfrNvData->Enabled;\r
+ Private->Current->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->InitiatorInfoFromDhcp;\r
+ Private->Current->SessionConfigData.TargetPort = IfrNvData->TargetPort;\r
+ if (Private->Current->SessionConfigData.TargetPort == 0) {\r
+ Private->Current->SessionConfigData.TargetPort = ISCSI_WELL_KNOWN_PORT;\r
}\r
+\r
+ Private->Current->SessionConfigData.TargetInfoFromDhcp = IfrNvData->TargetInfoFromDhcp;\r
+ Private->Current->AuthConfigData.CHAPType = IfrNvData->CHAPType;\r
+\r
//\r
- // Validate target configuration if DHCP isn't deployed.\r
+ // Only do full parameter validation if iSCSI is enabled on this device.\r
//\r
- if (!Private->Current->SessionConfigData.TargetInfoFromDhcp) {\r
- CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));\r
- if (!NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Target IP is invalid!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- break;\r
+ if (Private->Current->SessionConfigData.Enabled) {\r
+ //\r
+ // Validate the address configuration of the Initiator if DHCP isn't\r
+ // deployed.\r
+ //\r
+ if (!Private->Current->SessionConfigData.InitiatorInfoFromDhcp) {\r
+ CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));\r
+ CopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));\r
+ CopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));\r
+\r
+ if ((Gateway.Addr[0] != 0)) {\r
+ if (SubnetMask.Addr[0] == 0) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Gateway address is set but subnet mask is zero.", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ break;\r
+ } else if (!IP4_NET_EQUAL (HostIp.Addr[0], Gateway.Addr[0], SubnetMask.Addr[0])) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Local IP and Gateway are not in the same subnet.", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ break;\r
+ }\r
+ }\r
}\r
- }\r
-\r
- if (IfrNvData->CHAPType != ISCSI_CHAP_NONE) {\r
- if ((IfrNvData->CHAPName[0] == '\0') || (IfrNvData->CHAPSecret[0] == '\0')) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"CHAP Name or CHAP Secret is invalid!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- break;\r
+ //\r
+ // Validate target configuration if DHCP isn't deployed.\r
+ //\r
+ if (!Private->Current->SessionConfigData.TargetInfoFromDhcp) {\r
+ CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));\r
+ if (!NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Target IP is invalid!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ break;\r
+ }\r
}\r
\r
- if ((IfrNvData->CHAPType == ISCSI_CHAP_MUTUAL) &&\r
- ((IfrNvData->ReverseCHAPName[0] == '\0') || (IfrNvData->ReverseCHAPSecret[0] == '\0'))\r
- ) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Reverse CHAP Name or Reverse CHAP Secret is invalid!", NULL);\r
- Status = EFI_INVALID_PARAMETER;\r
- break;\r
+ if (IfrNvData->CHAPType != ISCSI_CHAP_NONE) {\r
+ if ((IfrNvData->CHAPName[0] == '\0') || (IfrNvData->CHAPSecret[0] == '\0')) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"CHAP Name or CHAP Secret is invalid!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ break;\r
+ }\r
+\r
+ if ((IfrNvData->CHAPType == ISCSI_CHAP_MUTUAL) &&\r
+ ((IfrNvData->ReverseCHAPName[0] == '\0') || (IfrNvData->ReverseCHAPSecret[0] == '\0'))\r
+ ) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Reverse CHAP Name or Reverse CHAP Secret is invalid!", NULL);\r
+ Status = EFI_INVALID_PARAMETER;\r
+ break;\r
+ }\r
}\r
}\r
- }\r
-\r
- BufferSize = sizeof (Private->Current->SessionConfigData);\r
- gRT->SetVariable (\r
- Private->Current->MacString,\r
- &gEfiIScsiInitiatorNameProtocolGuid,\r
- ISCSI_CONFIG_VAR_ATTR,\r
- BufferSize,\r
- &Private->Current->SessionConfigData\r
- );\r
\r
- BufferSize = sizeof (Private->Current->AuthConfigData);\r
- gRT->SetVariable (\r
- Private->Current->MacString,\r
- &mIScsiCHAPAuthInfoGuid,\r
- ISCSI_CONFIG_VAR_ATTR,\r
- BufferSize,\r
- &Private->Current->AuthConfigData\r
- );\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
- break;\r
-\r
- default:\r
- if ((QuestionId >= KEY_DEVICE_ENTRY_BASE) && (QuestionId < (mNumberOfIScsiDevices + KEY_DEVICE_ENTRY_BASE))) {\r
- //\r
- // In case goto the device configuration form, update the device form title.\r
- //\r
- ConfigFormEntry = IScsiGetConfigFormEntryByIndex ((UINT32) (QuestionId - KEY_DEVICE_ENTRY_BASE));\r
- ASSERT (ConfigFormEntry != NULL);\r
-\r
- UnicodeSPrint (PortString, (UINTN) 128, L"Port %s", ConfigFormEntry->MacString);\r
- DeviceFormTitleToken = (EFI_STRING_ID) STR_ISCSI_DEVICE_FORM_TITLE;\r
- HiiSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString, NULL);\r
-\r
- IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData);\r
+ BufferSize = sizeof (Private->Current->SessionConfigData);\r
+ gRT->SetVariable (\r
+ Private->Current->MacString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ BufferSize,\r
+ &Private->Current->SessionConfigData\r
+ );\r
+\r
+ BufferSize = sizeof (Private->Current->AuthConfigData);\r
+ gRT->SetVariable (\r
+ Private->Current->MacString,\r
+ &gIScsiCHAPAuthInfoGuid,\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ BufferSize,\r
+ &Private->Current->AuthConfigData\r
+ );\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+ break;\r
\r
- Private->Current = ConfigFormEntry;\r
+ default:\r
+ break;\r
}\r
-\r
- break;\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
//\r
// Pass changed uncommitted data back to Form Browser\r
//\r
- HiiSetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
+ HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
}\r
-\r
+ \r
FreePool (IfrNvData);\r
+ \r
return Status;\r
}\r
\r
BufferSize = sizeof (ConfigFormEntry->AuthConfigData);\r
Status = gRT->GetVariable (\r
ConfigFormEntry->MacString,\r
- &mIScsiCHAPAuthInfoGuid,\r
+ &gIScsiCHAPAuthInfoGuid,\r
NULL,\r
&BufferSize,\r
&ConfigFormEntry->AuthConfigData\r
//\r
// Compose the Port string and create a new EFI_STRING_ID.\r
//\r
- UnicodeSPrint (PortString, 128, L"Port %s", ConfigFormEntry->MacString);\r
+ UnicodeSPrint (PortString, sizeof (PortString), L"Port %s", ConfigFormEntry->MacString);\r
ConfigFormEntry->PortTitleToken = HiiSetString (mCallbackInfo->RegisteredHandle, 0, PortString, NULL);\r
\r
//\r
// Compose the help string of this port and create a new EFI_STRING_ID.\r
//\r
- UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);\r
+ UnicodeSPrint (PortString, sizeof (PortString), L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);\r
ConfigFormEntry->PortTitleHelpToken = HiiSetString (mCallbackInfo->RegisteredHandle, 0, PortString, NULL);\r
\r
InsertTailList (&mIScsiConfigFormList, &ConfigFormEntry->Link);\r
\r
HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle,\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
FORMID_MAIN_FORM,\r
StartOpCodeHandle, // Label DEVICE_ENTRY_LABEL\r
EndOpCodeHandle // LABEL_END\r
// Publish our HII data\r
//\r
CallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
CallbackInfo->DriverHandle,\r
IScsiDxeStrings,\r
IScsiConfigDxeBin,\r
projects / mirror_edk2.git / blobdiff