\r
IsIdStr = (CHAR16 *) String;\r
\r
- if (StrLen (IsIdStr) != 6) {\r
+ if (StrLen (IsIdStr) != 6 && StrLen (IsIdStr) != 12) {\r
UnicodeSPrint (\r
PortString,\r
(UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
- L"Error! Input is incorrect, please input 6 hex numbers!\n"\r
+ L"Error! Only last 3 bytes are configurable, please input 6 hex numbers for last 3 bytes only or 12 hex numbers for full SSID!\n"\r
);\r
\r
CreatePopUp (\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ if (StrLen (IsIdStr) == 12) {\r
+ IsIdStr += 6;\r
+ }\r
+\r
for (Index = 3; Index < 6; Index++) {\r
CopyMem (TempStr, IsIdStr, sizeof (TempStr));\r
TempStr[2] = L'\0';\r
return EFI_SUCCESS;\r
}\r
\r
+/**\r
+ Get the Offset value specified by the input String.\r
+\r
+ @param[in] Configuration A null-terminated Unicode string in\r
+ <ConfigString> format.\r
+ @param[in] String The string is "&OFFSET=".\r
+ @param[out] Value The Offset value.\r
+\r
+ @retval EFI_OUT_OF_RESOURCES Insufficient resources to store neccessary\r
+ structures.\r
+ @retval EFI_SUCCESS Value of <Number> is outputted in Number\r
+ successfully.\r
+\r
+**/\r
+EFI_STATUS\r
+IScsiGetValue (\r
+ IN CONST EFI_STRING Configuration,\r
+ IN CHAR16 *String,\r
+ OUT UINTN *Value\r
+ )\r
+{\r
+ CHAR16 *StringPtr;\r
+ CHAR16 *TmpPtr;\r
+ CHAR16 *Str;\r
+ CHAR16 TmpStr[2];\r
+ UINTN Length;\r
+ UINTN Len;\r
+ UINTN Index;\r
+ UINT8 *Buf;\r
+ UINT8 DigitUint8;\r
+ EFI_STATUS Status;\r
+\r
+ //\r
+ // Get Value.\r
+ //\r
+ Buf = NULL;\r
+ StringPtr = StrStr (Configuration, String);\r
+ ASSERT(StringPtr != NULL);\r
+ StringPtr += StrLen (String);\r
+ TmpPtr = StringPtr;\r
+\r
+ while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
+ StringPtr ++;\r
+ }\r
+ Length = StringPtr - TmpPtr;\r
+ Len = Length + 1;\r
+\r
+ Str = AllocateZeroPool (Len * sizeof (CHAR16));\r
+ if (Str == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
+\r
+ CopyMem (Str, TmpPtr, Len * sizeof (CHAR16));\r
+ *(Str + Length) = L'\0';\r
+\r
+ Len = (Len + 1) / 2;\r
+ Buf = (UINT8 *) AllocateZeroPool (Len);\r
+ if (Buf == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
+\r
+ ZeroMem (TmpStr, sizeof (TmpStr));\r
+ for (Index = 0; Index < Length; Index ++) {\r
+ TmpStr[0] = Str[Length - Index - 1];\r
+ DigitUint8 = (UINT8) StrHexToUint64 (TmpStr);\r
+ if ((Index & 1) == 0) {\r
+ Buf [Index/2] = DigitUint8;\r
+ } else {\r
+ Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
+ }\r
+ }\r
+\r
+ *Value = 0;\r
+ CopyMem (\r
+ Value,\r
+ Buf,\r
+ (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)\r
+ );\r
+\r
+ FreePool (Buf);\r
+ Status = EFI_SUCCESS;\r
+\r
+Exit:\r
+ if (Str != NULL) {\r
+ FreePool (Str);\r
+ }\r
+\r
+ return Status;\r
+}\r
+\r
/**\r
Get the attempt config data from global structure by the ConfigIndex.\r
\r
return NULL;\r
}\r
\r
+/**\r
+ Extract the Index of the attempt list.\r
+\r
+ @param[in] AttemptNameList The Name list of the Attempts.\r
+ @param[out] AttemptIndexList The Index list of the Attempts.\r
+ @param[in] IsAddAttempts If TRUE, Indicates add one or more attempts.\r
+ If FALSE, Indicates delete attempts or change attempt order.\r
+\r
+ @retval EFI_SUCCESS The Attempt list is valid.\r
+ @retval EFI_INVALID_PARAMETERS The Attempt List is invalid.\r
+\r
+**/\r
+EFI_STATUS\r
+IScsiGetAttemptIndexList (\r
+ IN CHAR16 *AttemptNameList,\r
+ OUT UINT8 *AttemptIndexList,\r
+ IN BOOLEAN IsAddAttempts\r
+)\r
+{\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ CHAR16 *AttemptStr;\r
+ UINT8 AttemptIndex;\r
+ UINTN Len;\r
+ UINTN Index;\r
+\r
+ Index = 0;\r
+\r
+ if ((AttemptNameList == NULL) || (*AttemptNameList == L'\0')) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ AttemptStr = AttemptNameList;\r
+ Len = StrLen (L"attempt:");\r
+\r
+ while (*AttemptStr != L'\0') {\r
+ AttemptStr = StrStr (AttemptStr, L"attempt:");\r
+ if (AttemptStr == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ AttemptStr += Len;\r
+ AttemptIndex = (UINT8)(*AttemptStr - L'0');\r
+ AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (IsAddAttempts) {\r
+ if ((AttemptConfigData != NULL) || ((AttemptIndex) > PcdGet8 (PcdMaxIScsiAttemptNumber))) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ } else {\r
+ if (AttemptConfigData == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+\r
+ AttemptIndexList[Index] = AttemptIndex;\r
+ Index ++;\r
+ AttemptStr += 2;\r
+ }\r
+ return EFI_SUCCESS;\r
+}\r
\r
/**\r
Convert the iSCSI configuration data into the IFR data.\r
IScsiIpToStr (&Ip, FALSE, IfrNvData->SubnetMask);\r
CopyMem (&Ip.v4, &SessionConfigData->Gateway, sizeof (EFI_IPv4_ADDRESS));\r
IScsiIpToStr (&Ip, FALSE, IfrNvData->Gateway);\r
+ ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
if (SessionConfigData->TargetIp.v4.Addr[0] != '\0') {\r
CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);\r
);\r
}\r
\r
+/**\r
+ Convert the iSCSI configuration data into the IFR data Which will be used\r
+ to extract the iSCSI Keyword configuration in <ConfigAltResp> format.\r
+\r
+ @param[in, out] IfrNvData The IFR nv data.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (\r
+ IN OUT ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
+ )\r
+{\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
+ ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;\r
+ ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
+ CHAR16 AttemptNameList[ATTEMPT_NAME_LIST_SIZE];\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ EFI_IP_ADDRESS Ip;\r
+ UINTN Index;\r
+ UINTN StringLen;\r
+\r
+ NicInfo = NULL;\r
+ ZeroMem (AttemptNameList, sizeof (AttemptNameList));\r
+\r
+ if ((mPrivate != NULL) && (mPrivate->AttemptCount != 0)) {\r
+ NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
+ Attempt = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ //\r
+ // Normal session configuration parameters.\r
+ //\r
+ SessionConfigData = &Attempt->SessionConfigData;\r
+\r
+ ASSERT ((Attempt->AttemptConfigIndex > 0) && (Attempt->AttemptConfigIndex <= FixedPcdGet8 (PcdMaxIScsiAttemptNumber)));\r
+ Index = Attempt->AttemptConfigIndex - 1;\r
+\r
+ //\r
+ // Save the attempt to AttemptNameList as Attempt:1 Attempt:2\r
+ //\r
+ AsciiStrToUnicodeStrS (\r
+ Attempt->AttemptName,\r
+ AttemptNameList + StrLen (AttemptNameList),\r
+ ATTEMPT_NAME_LIST_SIZE - StrLen (AttemptNameList)\r
+ );\r
+\r
+ StringLen = StrLen (AttemptNameList);\r
+ ASSERT (StringLen > 2);\r
+ *(AttemptNameList + StringLen - 2) = L':';\r
+ *(AttemptNameList + StringLen) = L' ';\r
+\r
+ AsciiStrToUnicodeStrS (\r
+ Attempt->AttemptName,\r
+ IfrNvData->ISCSIAttemptName + ATTEMPT_NAME_SIZE * Index,\r
+ ATTEMPT_NAME_LIST_SIZE - ATTEMPT_NAME_SIZE * Index\r
+ );\r
+\r
+ IfrNvData->ISCSIBootEnableList[Index] = SessionConfigData->Enabled;\r
+ IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;\r
+\r
+ IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;\r
+ IfrNvData->ISCSITargetInfoViaDHCP[Index] = SessionConfigData->TargetInfoFromDhcp;\r
+ IfrNvData->ISCSIConnectRetry[Index] = SessionConfigData->ConnectRetryCount;\r
+ IfrNvData->ISCSIConnectTimeout[Index] = SessionConfigData->ConnectTimeout;\r
+ IfrNvData->ISCSITargetTcpPort[Index] = SessionConfigData->TargetPort;\r
+\r
+ if (SessionConfigData->IpMode == IP_MODE_IP4) {\r
+ CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
+ IScsiIpToStr (&Ip, FALSE, IfrNvData->Keyword[Index].ISCSIInitiatorIpAddress);\r
+ CopyMem (&Ip.v4, &SessionConfigData->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ IScsiIpToStr (&Ip, FALSE, IfrNvData->Keyword[Index].ISCSIInitiatorNetmask);\r
+ CopyMem (&Ip.v4, &SessionConfigData->Gateway, sizeof (EFI_IPv4_ADDRESS));\r
+ IScsiIpToStr (&Ip, FALSE, IfrNvData->Keyword[Index].ISCSIInitiatorGateway);\r
+ if (SessionConfigData->TargetIp.v4.Addr[0] != '\0') {\r
+ CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
+ IScsiIpToStr (&Ip, FALSE, IfrNvData->Keyword[Index].ISCSITargetIpAddress);\r
+ }\r
+ } else if (SessionConfigData->IpMode == IP_MODE_IP6) {\r
+ ZeroMem (IfrNvData->Keyword[Index].ISCSITargetIpAddress, sizeof (IfrNvData->TargetIp));\r
+ if (SessionConfigData->TargetIp.v6.Addr[0] != '\0') {\r
+ IP6_COPY_ADDRESS (&Ip.v6, &SessionConfigData->TargetIp);\r
+ IScsiIpToStr (&Ip, TRUE, IfrNvData->Keyword[Index].ISCSITargetIpAddress);\r
+ }\r
+ }\r
+\r
+ AsciiStrToUnicodeStrS (\r
+ SessionConfigData->TargetName,\r
+ IfrNvData->Keyword[Index].ISCSITargetName,\r
+ ISCSI_NAME_MAX_SIZE\r
+ );\r
+\r
+ if (SessionConfigData->DnsMode) {\r
+ AsciiStrToUnicodeStrS (\r
+ SessionConfigData->TargetUrl,\r
+ IfrNvData->Keyword[Index].ISCSITargetIpAddress,\r
+ sizeof (IfrNvData->Keyword[Index].ISCSITargetIpAddress) / sizeof (IfrNvData->Keyword[Index].ISCSITargetIpAddress[0])\r
+ );\r
+ }\r
+\r
+ IScsiLunToUnicodeStr (SessionConfigData->BootLun, IfrNvData->Keyword[Index].ISCSILun);\r
+ IScsiConvertIsIdToString (IfrNvData->Keyword[Index].ISCSIIsId, SessionConfigData->IsId);\r
+\r
+ IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;\r
+\r
+ if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
+ AuthConfigData = &Attempt->AuthConfigData.CHAP;\r
+ IfrNvData->ISCSIChapType[Index] = AuthConfigData->CHAPType;\r
+ AsciiStrToUnicodeStrS (\r
+ AuthConfigData->CHAPName,\r
+ IfrNvData->Keyword[Index].ISCSIChapUsername,\r
+ ISCSI_CHAP_NAME_STORAGE\r
+ );\r
+\r
+ AsciiStrToUnicodeStrS (\r
+ AuthConfigData->CHAPSecret,\r
+ IfrNvData->Keyword[Index].ISCSIChapSecret,\r
+ ISCSI_CHAP_SECRET_STORAGE\r
+ );\r
+\r
+ AsciiStrToUnicodeStrS (\r
+ AuthConfigData->ReverseCHAPName,\r
+ IfrNvData->Keyword[Index].ISCSIReverseChapUsername,\r
+ ISCSI_CHAP_NAME_STORAGE\r
+ );\r
+\r
+ AsciiStrToUnicodeStrS (\r
+ AuthConfigData->ReverseCHAPSecret,\r
+ IfrNvData->Keyword[Index].ISCSIReverseChapSecret,\r
+ ISCSI_CHAP_SECRET_STORAGE\r
+ );\r
+ }\r
+ }\r
+ CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
+\r
+ ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));\r
+ NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
+ NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
+ IScsiMacAddrToStr (\r
+ &NicInfo->PermanentAddress,\r
+ NicInfo->HwAddressSize,\r
+ NicInfo->VlanId,\r
+ MacString\r
+ );\r
+ CopyMem (\r
+ IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),\r
+ MacString,\r
+ StrLen (MacString) * sizeof (CHAR16)\r
+ );\r
+\r
+ *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';\r
+ }\r
+\r
+ StringLen = StrLen (IfrNvData->ISCSIMacAddr);\r
+ if (StringLen > 0) {\r
+ *(IfrNvData->ISCSIMacAddr + StringLen - 1) = L'\0';\r
+ }\r
+ }\r
+}\r
+\r
/**\r
Convert the IFR data to iSCSI configuration data.\r
\r
L"Connection Establishing Timeout is less than minimum value 100ms.",\r
NULL\r
);\r
- \r
+\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
L"Gateway address is set but subnet mask is zero.",\r
NULL\r
);\r
- \r
+\r
return EFI_INVALID_PARAMETER;\r
} else if (!IP4_NET_EQUAL (HostIp.Addr[0], Gateway.Addr[0], SubnetMask.Addr[0])) {\r
CreatePopUp (\r
L"Local IP and Gateway are not in the same subnet.",\r
NULL\r
);\r
- \r
+\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
}\r
}\r
\r
-\r
//\r
// Validate the authentication info.\r
//\r
//\r
SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
if (SameNicAttempt != NULL) {\r
- AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_MAX_SIZE * sizeof (CHAR16));\r
+ AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName1 == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_MAX_SIZE * sizeof (CHAR16));\r
+ AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName2 == NULL) {\r
FreePool (AttemptName1);\r
return EFI_OUT_OF_RESOURCES;\r
} \r
- \r
- AsciiStrToUnicodeStrS (Attempt->AttemptName, AttemptName1, ATTEMPT_NAME_MAX_SIZE);\r
- if (StrLen (AttemptName1) > ATTEMPT_NAME_SIZE) {\r
- CopyMem (&AttemptName1[ATTEMPT_NAME_SIZE], L"...", 4 * sizeof (CHAR16));\r
- }\r
\r
- AsciiStrToUnicodeStrS (SameNicAttempt->AttemptName, AttemptName2, ATTEMPT_NAME_MAX_SIZE);\r
- if (StrLen (AttemptName2) > ATTEMPT_NAME_SIZE) {\r
- CopyMem (&AttemptName2[ATTEMPT_NAME_SIZE], L"...", 4 * sizeof (CHAR16));\r
- }\r
+ AsciiStrToUnicodeStrS (Attempt->AttemptName, AttemptName1, ATTEMPT_NAME_SIZE);\r
+ AsciiStrToUnicodeStrS (SameNicAttempt->AttemptName, AttemptName2, ATTEMPT_NAME_SIZE);\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
//\r
// Update the iSCSI Mode data and record it in attempt help info.\r
//\r
- Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
if (IfrNvData->Enabled == ISCSI_DISABLED) {\r
UnicodeSPrint (IScsiMode, 64, L"Disabled");\r
} else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
} else if (ExistAttempt == NULL) {\r
//\r
// When a new attempt is created, pointer of the attempt is saved to\r
- // mPrivate->NewAttempt, and also saved to mCallbackInfo->Current in\r
- // IScsiConfigProcessDefault. If input Attempt does not match any existing\r
- // attempt, it should be a new created attempt. Save it to system now.\r
- // \r
- ASSERT (Attempt == mPrivate->NewAttempt);\r
+ // mCallbackInfo->Current in IScsiConfigProcessDefault. If input Attempt\r
+ // does not match any existing attempt, it should be a new created attempt.\r
+ // Save it to system now.\r
+ //\r
\r
//\r
// Save current order number for this attempt.\r
//\r
InsertTailList (&mPrivate->AttemptConfigs, &Attempt->Link);\r
mPrivate->AttemptCount++;\r
- //\r
- // Reset mPrivate->NewAttempt to NULL, which indicates none attempt is created\r
- // but not saved now.\r
- //\r
- mPrivate->NewAttempt = NULL;\r
\r
if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
//\r
\r
IScsiConfigUpdateAttempt ();\r
}\r
+ Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
\r
//\r
// Record the user configuration information in NVR.\r
//\r
- UnicodeSPrint (\r
- mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
- L"%s%d",\r
- MacString,\r
- (UINTN) Attempt->AttemptConfigIndex\r
- );\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
\r
FreePool (MacString);\r
\r
}\r
\r
/**\r
- Create Hii Extend Label OpCode as the start opcode and end opcode. It is \r
- a help function.\r
+ Convert the IFR data configured by keyword to iSCSI configuration data.\r
\r
- @param[in] StartLabelNumber The number of start label.\r
- @param[out] StartOpCodeHandle Points to the start opcode handle.\r
- @param[out] StartLabel Points to the created start opcode.\r
- @param[out] EndOpCodeHandle Points to the end opcode handle.\r
- @param[out] EndLabel Points to the created end opcode.\r
+ @param[in] IfrNvData Point to ISCSI_CONFIG_IFR_NVDATA.\r
+ @param[in] OffSet The offset of the variable to the configuration structure.\r
\r
- @retval EFI_OUT_OF_RESOURCES Do not have sufficient resource to finish this\r
- operation.\r
- @retval EFI_INVALID_PARAMETER Any input parameter is invalid. \r
+ @retval EFI_INVALID_PARAMETER Any input or configured parameter is invalid.\r
@retval EFI_SUCCESS The operation is completed successfully.\r
\r
**/\r
EFI_STATUS\r
-IScsiCreateOpCode (\r
- IN UINT16 StartLabelNumber,\r
- OUT VOID **StartOpCodeHandle,\r
- OUT EFI_IFR_GUID_LABEL **StartLabel,\r
- OUT VOID **EndOpCodeHandle,\r
- OUT EFI_IFR_GUID_LABEL **EndLabel\r
+IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (\r
+ IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData,\r
+ IN UINTN OffSet\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_IFR_GUID_LABEL *InternalStartLabel;\r
- EFI_IFR_GUID_LABEL *InternalEndLabel;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
+ UINT8 AttemptIndex;\r
+ UINT8 Index;\r
+ UINT8 ChapSecretLen;\r
+ UINT8 ReverseChapSecretLen;\r
+ CHAR16 *AttemptName1;\r
+ CHAR16 *AttemptName2;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
+ CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
+ CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];\r
+ CHAR8 IpString[IP_STR_MAX_SIZE];\r
+ EFI_IP_ADDRESS HostIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS Gateway;\r
+ EFI_INPUT_KEY Key;\r
+ UINT64 Lun;\r
+ EFI_STATUS Status;\r
\r
- if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {\r
- return EFI_INVALID_PARAMETER;\r
- }\r
+ Attempt = NULL;\r
+ ZeroMem (IScsiName, sizeof (IScsiName));\r
\r
- *StartOpCodeHandle = NULL;\r
- *EndOpCodeHandle = NULL;\r
- Status = EFI_OUT_OF_RESOURCES;\r
+ if (OffSet < ATTEMPT_BOOTENABLE_VAR_OFFSET) {\r
+ return EFI_SUCCESS;\r
\r
- //\r
- // Initialize the container for dynamic opcodes.\r
- //\r
- *StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
- if (*StartOpCodeHandle == NULL) {\r
- return Status;\r
- }\r
+ } else if ((OffSet >= ATTEMPT_BOOTENABLE_VAR_OFFSET) && (OffSet < ATTEMPT_ADDRESS_TYPE_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ IfrNvData->Enabled = IfrNvData->ISCSIBootEnableList[AttemptIndex - 1];\r
+ //\r
+ // Validate the configuration of attempt.\r
+ //\r
+ if (IfrNvData->Enabled != ISCSI_DISABLED) {\r
+ //\r
+ // Check whether this attempt uses NIC which is already used by existing attempt.\r
+ //\r
+ SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
+ if (SameNicAttempt != NULL) {\r
+ AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ if (AttemptName1 == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- *EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
- if (*EndOpCodeHandle == NULL) {\r
- goto Exit;\r
- }\r
+ AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ if (AttemptName2 == NULL) {\r
+ FreePool (AttemptName1);\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- //\r
- // Create Hii Extend Label OpCode as the start opcode.\r
- //\r
- InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
- *StartOpCodeHandle,\r
- &gEfiIfrTianoGuid,\r
- NULL,\r
- sizeof (EFI_IFR_GUID_LABEL)\r
- );\r
- if (InternalStartLabel == NULL) {\r
- goto Exit;\r
- }\r
- \r
- InternalStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
- InternalStartLabel->Number = StartLabelNumber;\r
+ AsciiStrToUnicodeStrS (Attempt->AttemptName, AttemptName1, ATTEMPT_NAME_SIZE);\r
+ AsciiStrToUnicodeStrS (SameNicAttempt->AttemptName, AttemptName2, ATTEMPT_NAME_SIZE);\r
\r
- //\r
- // Create Hii Extend Label OpCode as the end opcode.\r
- //\r
- InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
- *EndOpCodeHandle,\r
- &gEfiIfrTianoGuid,\r
- NULL,\r
- sizeof (EFI_IFR_GUID_LABEL)\r
- );\r
- if (InternalEndLabel == NULL) {\r
- goto Exit;\r
- }\r
+ UnicodeSPrint (\r
+ mPrivate->PortString,\r
+ (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ L"Warning! \"%s\" uses same NIC as Attempt \"%s\".",\r
+ AttemptName1,\r
+ AttemptName2\r
+ );\r
\r
- InternalEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
- InternalEndLabel->Number = LABEL_END;\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ mPrivate->PortString,\r
+ NULL\r
+ );\r
\r
- *StartLabel = InternalStartLabel;\r
- *EndLabel = InternalEndLabel;\r
+ FreePool (AttemptName1);\r
+ FreePool (AttemptName2);\r
+ }\r
+ }\r
\r
- return EFI_SUCCESS;\r
+ if (IfrNvData->Enabled == ISCSI_DISABLED &&\r
+ Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
\r
-Exit:\r
+ //\r
+ // User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".\r
+ //\r
+ if (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+ if (mPrivate->MpioCount < 1) {\r
+ return EFI_ABORTED;\r
+ }\r
\r
- if (*StartOpCodeHandle != NULL) {\r
- HiiFreeOpCodeHandle (*StartOpCodeHandle);\r
- }\r
+ if (--mPrivate->MpioCount == 0) {\r
+ mPrivate->EnableMpio = FALSE;\r
+ }\r
+ } else if (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+ if (mPrivate->SinglePathCount < 1) {\r
+ return EFI_ABORTED;\r
+ }\r
+ mPrivate->SinglePathCount--;\r
+ }\r
\r
- if (*EndOpCodeHandle != NULL) {\r
+ } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&\r
+ Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+ //\r
+ // User updates the Attempt from "Enabled" to "Enabled for MPIO".\r
+ //\r
+ if (mPrivate->SinglePathCount < 1) {\r
+ return EFI_ABORTED;\r
+ }\r
+\r
+ mPrivate->EnableMpio = TRUE;\r
+ mPrivate->MpioCount++;\r
+ mPrivate->SinglePathCount--;\r
+\r
+ } else if (IfrNvData->Enabled == ISCSI_ENABLED &&\r
+ Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+ //\r
+ // User updates the Attempt from "Enabled for MPIO" to "Enabled".\r
+ //\r
+ if (mPrivate->MpioCount < 1) {\r
+ return EFI_ABORTED;\r
+ }\r
+\r
+ if (--mPrivate->MpioCount == 0) {\r
+ mPrivate->EnableMpio = FALSE;\r
+ }\r
+ mPrivate->SinglePathCount++;\r
+\r
+ } else if (IfrNvData->Enabled != ISCSI_DISABLED &&\r
+ Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+ //\r
+ // User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".\r
+ //\r
+ if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+ mPrivate->EnableMpio = TRUE;\r
+ mPrivate->MpioCount++;\r
+\r
+ } else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
+ mPrivate->SinglePathCount++;\r
+ }\r
+ }\r
+ Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
+\r
+ } else if ((OffSet >= ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_RETRY_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ Attempt->SessionConfigData.IpMode = IfrNvData->ISCSIIpAddressTypeList[AttemptIndex - 1];\r
+ if (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {\r
+ Attempt->AutoConfigureMode = 0;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_CONNECT_RETRY_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ if (IfrNvData->ISCSIConnectRetry[AttemptIndex - 1] > CONNECT_MAX_RETRY) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"The minimum value is 0 and the maximum is 16. 0 means no retry.",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];\r
+\r
+ } else if ((OffSet >= ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ if ((IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] < CONNECT_MIN_TIMEOUT) ||\r
+ (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"The minimum value is 100 milliseconds and the maximum is 20 seconds.",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ Attempt->SessionConfigData.ConnectTimeout = IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1];\r
+ if (Attempt->SessionConfigData.ConnectTimeout == 0) {\r
+ Attempt->SessionConfigData.ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];\r
+\r
+ } else if ((OffSet >= ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
+ Attempt->SessionConfigData.TargetInfoFromDhcp = IfrNvData->ISCSITargetInfoViaDHCP[AttemptIndex - 1];\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Enable DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) && (OffSet < ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
+ Attempt->SessionConfigData.TargetPort = IfrNvData->ISCSITargetTcpPort[AttemptIndex - 1];\r
+ if (Attempt->SessionConfigData.TargetPort == 0) {\r
+ Attempt->SessionConfigData.TargetPort = ISCSI_WELL_KNOWN_PORT;\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Target Via DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) && (OffSet < ATTEMPT_CHARTYPE_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ Attempt->AuthenticationType = IfrNvData->ISCSIAuthenticationMethod[AttemptIndex - 1];\r
+\r
+ } else if ((OffSet >= ATTEMPT_CHARTYPE_VAR_OFFSET) && (OffSet < ATTEMPT_ISID_VAR_OFFSET)) {\r
+ AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
+ Attempt->AuthConfigData.CHAP.CHAPType = IfrNvData->ISCSIChapType[AttemptIndex - 1];\r
+ }\r
+\r
+ } else if (OffSet >= ATTEMPT_ISID_VAR_OFFSET) {\r
+ Index = (UINT8) ((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));\r
+ AttemptIndex = Index + 1;\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ if (Attempt == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ OffSet = OffSet - Index * sizeof (KEYWORD_STR);\r
+\r
+ if ((OffSet >= ATTEMPT_ISID_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET)) {\r
+ IScsiParseIsIdFromString (IfrNvData->Keyword[Index].ISCSIIsId, Attempt->SessionConfigData.IsId);\r
+\r
+ } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
+ //\r
+ // Config Local ip\r
+ //\r
+ Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorIpAddress, &HostIp.v4);\r
+ if (EFI_ERROR (Status) || ((Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid IP address!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Attempt->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Enable DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
+ Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorNetmask, &SubnetMask.v4);\r
+ if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Subnet Mask!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Attempt->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Enable DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_NAME_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
+ Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorGateway, &Gateway.v4);\r
+ if (EFI_ERROR (Status) ||\r
+ ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Gateway!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Attempt->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Enable DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_TARGET_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
+ UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
+ Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid iSCSI Name!",\r
+ NULL\r
+ );\r
+ } else {\r
+ AsciiStrCpyS (Attempt->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
+ }\r
+ if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+ if (Attempt->SessionConfigData.TargetName[0] == L'\0') {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"iSCSI target name is NULL!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Target Via DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_LUN_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
+ UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetIpAddress, IpString, sizeof (IpString));\r
+ Status = IScsiAsciiStrToIp (IpString, Attempt->SessionConfigData.IpMode, &HostIp);\r
+ if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, Attempt->SessionConfigData.IpMode)) {\r
+ Attempt->SessionConfigData.DnsMode = TRUE;\r
+ ZeroMem (&Attempt->SessionConfigData.TargetIp, sizeof (Attempt->SessionConfigData.TargetIp));\r
+ UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetIpAddress, Attempt->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);\r
+ } else {\r
+ Attempt->SessionConfigData.DnsMode = FALSE;\r
+ CopyMem (&Attempt->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Target Via DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_LUN_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_USER_NAME_VAR_OFFSET)) {\r
+ if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (Attempt->SessionConfigData.TargetInfoFromDhcp == 0)) {\r
+ //\r
+ // Config LUN.\r
+ //\r
+ UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSILun, LunString, ISCSI_LUN_STR_MAX_LEN);\r
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid LUN string, Examples are: 4752-3A4F-6b7e-2F99, 6734-9-156f-127, 4186-9!",\r
+ NULL\r
+ );\r
+ } else {\r
+ CopyMem (&Attempt->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of IpMode or Target Via DHCP!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_CHAR_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_SECRET_VAR_OFFSET)) {\r
+ if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->Keyword[Index].ISCSIChapUsername,\r
+ Attempt->AuthConfigData.CHAP.CHAPName,\r
+ ISCSI_CHAP_NAME_STORAGE\r
+ );\r
+\r
+ if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+ if (IfrNvData->Keyword[Index].ISCSIChapUsername[0] == L'\0') {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"CHAP Name is invalid!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of AuthenticationType!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_CHAR_SECRET_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET)) {\r
+ if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
+ ChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIChapSecret);\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->Keyword[Index].ISCSIChapSecret,\r
+ Attempt->AuthConfigData.CHAP.CHAPSecret,\r
+ ISCSI_CHAP_SECRET_STORAGE\r
+ );\r
+\r
+ if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+ if ((ChapSecretLen < ISCSI_CHAP_SECRET_MIN_LEN) || (ChapSecretLen > ISCSI_CHAP_SECRET_MAX_LEN)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"The Chap Secret minimum length is 12 bytes and the maximum length is 16 bytes.",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of AuthenticationType!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if ((OffSet >= ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET)) {\r
+ if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->Keyword[Index].ISCSIReverseChapUsername,\r
+ Attempt->AuthConfigData.CHAP.ReverseCHAPName,\r
+ ISCSI_CHAP_NAME_STORAGE\r
+ );\r
+ if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+ if (IfrNvData->Keyword[Index].ISCSIReverseChapUsername[0] == L'\0') {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Reverse CHAP Name is invalid!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of AuthenticationType or Chap Type!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ } else if (OffSet >= ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET) {\r
+ if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
+ ReverseChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIReverseChapSecret);\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->Keyword[Index].ISCSIReverseChapSecret,\r
+ Attempt->AuthConfigData.CHAP.ReverseCHAPSecret,\r
+ ISCSI_CHAP_SECRET_STORAGE\r
+ );\r
+\r
+ if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+ if ((ReverseChapSecretLen < ISCSI_CHAP_SECRET_MIN_LEN) || (ReverseChapSecretLen > ISCSI_CHAP_SECRET_MAX_LEN)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"The Reverse CHAP Secret minimum length is 12 bytes and the maximum length is 16 bytes.",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ } else {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Configuration, Check value of AuthenticationType or Chap Type!",\r
+ NULL\r
+ );\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
+ }\r
+\r
+\r
+\r
+ //\r
+ // Record the user configuration information in NVR.\r
+ //\r
+ ASSERT (Attempt != NULL);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
+ return gRT->SetVariable (\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
+ Attempt\r
+ );\r
+\r
+}\r
+\r
+/**\r
+ Create Hii Extend Label OpCode as the start opcode and end opcode. It is\r
+ a help function.\r
+\r
+ @param[in] StartLabelNumber The number of start label.\r
+ @param[out] StartOpCodeHandle Points to the start opcode handle.\r
+ @param[out] StartLabel Points to the created start opcode.\r
+ @param[out] EndOpCodeHandle Points to the end opcode handle.\r
+ @param[out] EndLabel Points to the created end opcode.\r
+\r
+ @retval EFI_OUT_OF_RESOURCES Do not have sufficient resource to finish this\r
+ operation.\r
+ @retval EFI_INVALID_PARAMETER Any input parameter is invalid.\r
+ @retval EFI_SUCCESS The operation is completed successfully.\r
+\r
+**/\r
+EFI_STATUS\r
+IScsiCreateOpCode (\r
+ IN UINT16 StartLabelNumber,\r
+ OUT VOID **StartOpCodeHandle,\r
+ OUT EFI_IFR_GUID_LABEL **StartLabel,\r
+ OUT VOID **EndOpCodeHandle,\r
+ OUT EFI_IFR_GUID_LABEL **EndLabel\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EFI_IFR_GUID_LABEL *InternalStartLabel;\r
+ EFI_IFR_GUID_LABEL *InternalEndLabel;\r
+\r
+ if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ *StartOpCodeHandle = NULL;\r
+ *EndOpCodeHandle = NULL;\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+\r
+ //\r
+ // Initialize the container for dynamic opcodes.\r
+ //\r
+ *StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+ if (*StartOpCodeHandle == NULL) {\r
+ return Status;\r
+ }\r
+\r
+ *EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+ if (*EndOpCodeHandle == NULL) {\r
+ goto Exit;\r
+ }\r
+\r
+ //\r
+ // Create Hii Extend Label OpCode as the start opcode.\r
+ //\r
+ InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
+ *StartOpCodeHandle,\r
+ &gEfiIfrTianoGuid,\r
+ NULL,\r
+ sizeof (EFI_IFR_GUID_LABEL)\r
+ );\r
+ if (InternalStartLabel == NULL) {\r
+ goto Exit;\r
+ }\r
+\r
+ InternalStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+ InternalStartLabel->Number = StartLabelNumber;\r
+\r
+ //\r
+ // Create Hii Extend Label OpCode as the end opcode.\r
+ //\r
+ InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
+ *EndOpCodeHandle,\r
+ &gEfiIfrTianoGuid,\r
+ NULL,\r
+ sizeof (EFI_IFR_GUID_LABEL)\r
+ );\r
+ if (InternalEndLabel == NULL) {\r
+ goto Exit;\r
+ }\r
+\r
+ InternalEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+ InternalEndLabel->Number = LABEL_END;\r
+\r
+ *StartLabel = InternalStartLabel;\r
+ *EndLabel = InternalEndLabel;\r
+\r
+ return EFI_SUCCESS;\r
+\r
+Exit:\r
+\r
+ if (*StartOpCodeHandle != NULL) {\r
+ HiiFreeOpCodeHandle (*StartOpCodeHandle);\r
+ }\r
+\r
+ if (*EndOpCodeHandle != NULL) {\r
HiiFreeOpCodeHandle (*EndOpCodeHandle);\r
}\r
- \r
return Status;\r
}\r
\r
+/**\r
+ Update the MAIN form to display the configured attempts.\r
+\r
+**/\r
+VOID\r
+IScsiConfigUpdateAttempt (\r
+ VOID\r
+ )\r
+{\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ VOID *StartOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *StartLabel;\r
+ VOID *EndOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *EndLabel;\r
+ EFI_STATUS Status;\r
+\r
+ Status = IScsiCreateOpCode (\r
+ ATTEMPT_ENTRY_LABEL,\r
+ &StartOpCodeHandle,\r
+ &StartLabel,\r
+ &EndOpCodeHandle,\r
+ &EndLabel\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return ;\r
+ }\r
+\r
+ NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
+ AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ if (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+ //\r
+ // Update Attempt Help Info.\r
+ //\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN) AttemptConfigData->AttemptConfigIndex);\r
+ AttemptConfigData->AttemptTitleToken = HiiSetString (\r
+ mCallbackInfo->RegisteredHandle,\r
+ 0,\r
+ mPrivate->PortString,\r
+ NULL\r
+ );\r
+ if (AttemptConfigData->AttemptTitleToken == 0) {\r
+ return ;\r
+ }\r
+\r
+ HiiCreateGotoOpCode (\r
+ StartOpCodeHandle, // Container for dynamic created opcodes\r
+ FORMID_ATTEMPT_FORM, // Form ID\r
+ AttemptConfigData->AttemptTitleToken, // Prompt text\r
+ AttemptConfigData->AttemptTitleHelpToken, // Help text\r
+ EFI_IFR_FLAG_CALLBACK, // Question flag\r
+ (UINT16) (KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID\r
+ );\r
+ }\r
+ }\r
+\r
+ HiiUpdateForm (\r
+ mCallbackInfo->RegisteredHandle, // HII handle\r
+ &gIScsiConfigGuid, // Formset GUID\r
+ FORMID_MAIN_FORM, // Form ID\r
+ StartOpCodeHandle, // Label for where to insert opcodes\r
+ EndOpCodeHandle // Replace data\r
+ );\r
+\r
+ HiiFreeOpCodeHandle (StartOpCodeHandle);\r
+ HiiFreeOpCodeHandle (EndOpCodeHandle);\r
+}\r
+\r
/**\r
Callback function when user presses "Add an Attempt".\r
\r
return Status;\r
}\r
\r
-\r
/**\r
- Update the MAIN form to display the configured attempts.\r
+ Add the attempts by keyword 'iSCSIAddAttempts', you can use this keyword with\r
+ value 'attempt:1 attempt:2' etc to add one or more attempts once. This is different\r
+ with IScsiConfigAddAttempt function which is used to add attempt by UI configuration. \r
+\r
+ @param[in] AttemptList The new attempt List will be added.\r
+\r
+ @retval EFI_SUCCESS The operation to add attempt list successfully.\r
+ @retval EFI_INVALID_PARAMETER Any parameter is invalid.\r
+ @retval EFI_NOT_FOUND Cannot find the corresponding variable.\r
+ @retval EFI_OUT_OF_RESOURCES Fail to finish the operation due to lack of\r
+ resources.\r
\r
**/\r
-VOID\r
-IScsiConfigUpdateAttempt (\r
- VOID\r
+EFI_STATUS\r
+IScsiConfigAddAttemptsByKeywords (\r
+ IN UINT8 *AttemptList\r
)\r
{\r
- CHAR16 AttemptName[ATTEMPT_NAME_MAX_SIZE];\r
- LIST_ENTRY *Entry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- VOID *StartOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *StartLabel;\r
- VOID *EndOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *EndLabel;\r
- EFI_STATUS Status;\r
+ UINT8 Index;\r
+ UINT8 Number;\r
+ UINTN TotalNumber;\r
+ UINT8 Nic;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 *AttemptConfigOrderTmp;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ CHAR16 IScsiMode[64];\r
+ CHAR16 IpMode[64];\r
+ EFI_STATUS Status;\r
\r
- Status = IScsiCreateOpCode (\r
- ATTEMPT_ENTRY_LABEL,\r
- &StartOpCodeHandle,\r
- &StartLabel,\r
- &EndOpCodeHandle,\r
- &EndLabel\r
- );\r
- if (EFI_ERROR (Status)) {\r
- return ;\r
+ Nic = mPrivate->CurrentNic;\r
+ NicInfo = IScsiGetNicInfoByIndex (Nic);\r
+ if (NicInfo == NULL) {\r
+ return EFI_NOT_FOUND;\r
}\r
\r
- NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
- AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ //\r
+ // The MAC info will be recorded in Config Data.\r
+ //\r
+ IScsiMacAddrToStr (\r
+ &NicInfo->PermanentAddress,\r
+ NicInfo->HwAddressSize,\r
+ NicInfo->VlanId,\r
+ MacString\r
+ );\r
\r
- AsciiStrToUnicodeStrS (AttemptConfigData->AttemptName, AttemptName, ARRAY_SIZE (AttemptName));\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) 128, L"Attempt %s", AttemptName);\r
- AttemptConfigData->AttemptTitleToken = HiiSetString (\r
- mCallbackInfo->RegisteredHandle,\r
- 0,\r
- mPrivate->PortString,\r
- NULL\r
- );\r
- if (AttemptConfigData->AttemptTitleToken == 0) {\r
- return ;\r
+ for (Index = 0; Index < PcdGet8 (PcdMaxIScsiAttemptNumber); Index++) {\r
+ if (AttemptList[Index] == 0) {\r
+ continue;\r
}\r
\r
- HiiCreateGotoOpCode (\r
- StartOpCodeHandle, // Container for dynamic created opcodes\r
- FORMID_ATTEMPT_FORM, // Form ID\r
- AttemptConfigData->AttemptTitleToken, // Prompt text\r
- AttemptConfigData->AttemptTitleHelpToken, // Help text\r
- EFI_IFR_FLAG_CALLBACK, // Question flag\r
- (UINT16) (KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID\r
+ //\r
+ // Add the attempt.\r
+ //\r
+ Number = AttemptList[Index];\r
+\r
+ UnicodeSPrint (\r
+ mPrivate->PortString,\r
+ (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ L"Attempt %d",\r
+ Number\r
);\r
- }\r
\r
- HiiUpdateForm (\r
- mCallbackInfo->RegisteredHandle, // HII handle\r
- &gIScsiConfigGuid, // Formset GUID\r
- FORMID_MAIN_FORM, // Form ID\r
- StartOpCodeHandle, // Label for where to insert opcodes\r
- EndOpCodeHandle // Replace data\r
- ); \r
+ GetVariable2 (\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ (VOID**)&AttemptConfigData,\r
+ NULL\r
+ );\r
+ if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
+ AttemptConfigData->NicIndex = NicInfo->NicIndex;\r
+ UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, ISCSI_MAX_MAC_STRING_LEN);\r
+\r
+ //\r
+ // Generate OUI-format ISID based on MAC address.\r
+ //\r
+ CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);\r
+ AttemptConfigData->SessionConfigData.IsId[0] =\r
+ (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
+\r
+ //\r
+ // Configure the iSCSI Mode and IpMode to default.\r
+ // Add Attempt Help Info.\r
+ //\r
+ UnicodeSPrint (IScsiMode, 64, L"Disabled");\r
+ UnicodeSPrint (IpMode, 64, L"IP4");\r
+ UnicodeSPrint (\r
+ mPrivate->PortString,\r
+ (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
+ MacString,\r
+ NicInfo->BusNumber,\r
+ NicInfo->DeviceNumber,\r
+ NicInfo->FunctionNumber,\r
+ IScsiMode,\r
+ IpMode\r
+ );\r
+\r
+ AttemptConfigData->AttemptTitleHelpToken = HiiSetString (\r
+ mCallbackInfo->RegisteredHandle,\r
+ 0,\r
+ mPrivate->PortString,\r
+ NULL\r
+ );\r
+ if (AttemptConfigData->AttemptTitleHelpToken == 0) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ //\r
+ // Get current Attempt order and number.\r
+ //\r
+ AttemptConfigOrder = IScsiGetVariableAndSize (\r
+ L"AttemptOrder",\r
+ &gIScsiConfigGuid,\r
+ &AttemptConfigOrderSize\r
+ );\r
+ TotalNumber = AttemptConfigOrderSize / sizeof (UINT8);\r
+ TotalNumber++;\r
+\r
+ //\r
+ // Append the new created attempt order to the end.\r
+ //\r
+ AttemptConfigOrderTmp = AllocateZeroPool (TotalNumber * sizeof (UINT8));\r
+ if (AttemptConfigOrderTmp == NULL) {\r
+ if (AttemptConfigOrder != NULL) {\r
+ FreePool (AttemptConfigOrder);\r
+ }\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+ if (AttemptConfigOrder != NULL) {\r
+ CopyMem (AttemptConfigOrderTmp, AttemptConfigOrder, AttemptConfigOrderSize);\r
+ FreePool (AttemptConfigOrder);\r
+ }\r
+\r
+ AttemptConfigOrderTmp[TotalNumber - 1] = Number;\r
+ AttemptConfigOrder = AttemptConfigOrderTmp;\r
+ AttemptConfigOrderSize = TotalNumber * sizeof (UINT8);\r
+\r
+ Status = gRT->SetVariable (\r
+ L"AttemptOrder",\r
+ &gIScsiConfigGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ AttemptConfigOrderSize,\r
+ AttemptConfigOrder\r
+ );\r
+ FreePool (AttemptConfigOrder);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ //\r
+ // Record the attempt in global link list.\r
+ //\r
+ InsertTailList (&mPrivate->AttemptConfigs, &AttemptConfigData->Link);\r
+ mPrivate->AttemptCount++;\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);\r
+ gRT->SetVariable (\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
+ AttemptConfigData\r
+ );\r
+\r
+ }\r
\r
- HiiFreeOpCodeHandle (StartOpCodeHandle);\r
- HiiFreeOpCodeHandle (EndOpCodeHandle);\r
+ return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
- Callback function when user presses "Commit Changes and Exit" in Delete Attempts.\r
+ Callback function when user presses "Commit Changes and Exit" in Delete Attempts or Delete Attempts by Keyword.\r
\r
@param[in] IfrNvData The IFR NV data.\r
\r
IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
- UINTN NewIndex;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINT8 *AttemptNewOrder;\r
- UINT32 Attribute;\r
- UINTN Total;\r
- UINTN NewTotal;\r
- LIST_ENTRY *Entry;\r
- LIST_ENTRY *NextEntry;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
+ UINTN NewIndex;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 *AttemptNewOrder;\r
+ UINT8 AttemptConfigIndex;\r
+ UINT32 Attribute;\r
+ UINTN Total;\r
+ UINTN NewTotal;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
+ ISCSI_SESSION_CONFIG_NVDATA *ConfigData;\r
+\r
+ Index = 0;\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
\r
Total = AttemptConfigOrderSize / sizeof (UINT8);\r
NewTotal = Total;\r
- Index = 0;\r
\r
NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &mPrivate->AttemptConfigs) {\r
if (IfrNvData->DeleteAttemptList[Index] == 0) {\r
mPrivate->SinglePathCount--;\r
}\r
\r
- AsciiStrToUnicodeStrS (AttemptConfigData->MacString, MacString, ARRAY_SIZE (MacString));\r
+ AttemptConfigIndex = AttemptConfigData->AttemptConfigIndex;\r
+ FreePool (AttemptConfigData);\r
+\r
+ //\r
+ // Create a new Attempt\r
+ //\r
+ AttemptConfigData = AllocateZeroPool (sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA));\r
+ if (AttemptConfigData == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+ ConfigData = &AttemptConfigData->SessionConfigData;\r
+ ConfigData->TargetPort = ISCSI_WELL_KNOWN_PORT;\r
+ ConfigData->ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
+ ConfigData->ConnectRetryCount = CONNECT_MIN_RETRY;\r
+\r
+ AttemptConfigData->AuthenticationType = ISCSI_AUTH_TYPE_CHAP;\r
+ AttemptConfigData->AuthConfigData.CHAP.CHAPType = ISCSI_CHAP_UNI;\r
+ //\r
+ // Configure the Attempt index and set variable.\r
+ //\r
+ AttemptConfigData->AttemptConfigIndex = AttemptConfigIndex;\r
\r
+ //\r
+ // Set the attempt name to default.\r
+ //\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) 128,\r
- L"%s%d",\r
- MacString,\r
+ (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ L"Attempt %d",\r
(UINTN) AttemptConfigData->AttemptConfigIndex\r
);\r
-\r
+ UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, ATTEMPT_NAME_SIZE);\r
gRT->SetVariable (\r
mPrivate->PortString,\r
&gEfiIScsiInitiatorNameProtocolGuid,\r
- 0,\r
- 0,\r
- NULL\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
+ AttemptConfigData\r
);\r
\r
//\r
}\r
\r
NewTotal--;\r
+ if (mCallbackInfo->Current == AttemptConfigData) {\r
+ mCallbackInfo->Current = NULL;\r
+ }\r
FreePool (AttemptConfigData);\r
\r
//\r
if (AttemptNewOrder != NULL) {\r
FreePool (AttemptNewOrder);\r
}\r
- \r
+\r
return Status;\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
- Callback function when user presses "Commit Changes and Exit" in Change Attempt Order.\r
+ Callback function when user presses "Commit Changes and Exit" in Change Attempt Order or Change Attempt Order by Keyword.\r
\r
@param[in] IfrNvData The IFR nv data.\r
\r
@retval EFI_OUT_OF_RESOURCES Does not have sufficient resources to finish this\r
operation.\r
@retval EFI_NOT_FOUND Cannot find the corresponding variable.\r
+ @retval EFI_UNSUPPORTED Can not create more attempts.\r
@retval EFI_SUCCESS The operation is completed successfully.\r
\r
**/\r
{\r
BOOLEAN NewAttempt;\r
ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- ISCSI_SESSION_CONFIG_NVDATA *ConfigData;\r
UINT8 CurrentAttemptConfigIndex;\r
ISCSI_NIC_INFO *NicInfo;\r
UINT8 NicIndex;\r
CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
UINT8 *AttemptConfigOrder;\r
UINTN AttemptConfigOrderSize;\r
- UINTN TotalNumber;\r
UINTN Index;\r
+ EFI_INPUT_KEY Key;\r
\r
+ AttemptConfigData = NULL;\r
//\r
// Is User creating a new attempt?\r
//\r
//\r
return EFI_SUCCESS;\r
}\r
- \r
- //\r
- // Free any attempt that is previously created but not saved to system.\r
- //\r
- if (mPrivate->NewAttempt != NULL) {\r
- FreePool (mPrivate->NewAttempt);\r
- mPrivate->NewAttempt = NULL;\r
- }\r
\r
if (NewAttempt) {\r
//\r
if (NicInfo == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
- \r
- //\r
- // Create new attempt.\r
- //\r
-\r
- AttemptConfigData = AllocateZeroPool (sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA));\r
- if (AttemptConfigData == NULL) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
-\r
- ConfigData = &AttemptConfigData->SessionConfigData;\r
- ConfigData->TargetPort = ISCSI_WELL_KNOWN_PORT;\r
- ConfigData->ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
- ConfigData->ConnectRetryCount = CONNECT_MIN_RETRY;\r
-\r
- AttemptConfigData->AuthenticationType = ISCSI_AUTH_TYPE_CHAP;\r
- AttemptConfigData->AuthConfigData.CHAP.CHAPType = ISCSI_CHAP_UNI;\r
\r
//\r
- // Get current order number for this attempt.\r
+ // Create an attempt following the initialized attempt order.\r
//\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
- L"AttemptOrder",\r
+ L"InitialAttemptOrder",\r
&gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
\r
- TotalNumber = AttemptConfigOrderSize / sizeof (UINT8);\r
-\r
if (AttemptConfigOrder == NULL) {\r
- CurrentAttemptConfigIndex = 1;\r
- } else {\r
- //\r
- // Get the max attempt config index.\r
- //\r
- CurrentAttemptConfigIndex = AttemptConfigOrder[0];\r
- for (Index = 1; Index < TotalNumber; Index++) {\r
- if (CurrentAttemptConfigIndex < AttemptConfigOrder[Index]) {\r
- CurrentAttemptConfigIndex = AttemptConfigOrder[Index];\r
- }\r
- }\r
-\r
- CurrentAttemptConfigIndex++;\r
+ return EFI_NOT_FOUND;\r
}\r
\r
- TotalNumber++;\r
-\r
- //\r
- // Record the mapping between attempt order and attempt's configdata.\r
- //\r
- AttemptConfigData->AttemptConfigIndex = CurrentAttemptConfigIndex;\r
+ for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
+ UnicodeSPrint (\r
+ mPrivate->PortString,\r
+ (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ L"Attempt %d",\r
+ (UINTN) AttemptConfigOrder[Index]\r
+ );\r
+ GetVariable2 (\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ (VOID**)&AttemptConfigData,\r
+ NULL\r
+ );\r
+ if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+ continue;\r
+ }\r
+ \r
+ break;\r
+ }\r
+ \r
+ if (Index > PcdGet8 (PcdMaxIScsiAttemptNumber)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Can not create more attempts, Please configure the PcdMaxIScsiAttemptNumber if needed!",\r
+ NULL\r
+ );\r
+ return EFI_UNSUPPORTED;\r
+ }\r
\r
if (AttemptConfigOrder != NULL) {\r
FreePool (AttemptConfigOrder);\r
MacString\r
);\r
\r
+ ASSERT (AttemptConfigData != NULL);\r
UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, sizeof (AttemptConfigData->MacString));\r
AttemptConfigData->NicIndex = NicIndex;\r
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
\r
//\r
// Generate OUI-format ISID based on MAC address.\r
);\r
if (AttemptConfigData->AttemptTitleHelpToken == 0) {\r
FreePool (AttemptConfigData);\r
- return EFI_INVALID_PARAMETER;\r
+ return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- //\r
- // Set the attempt name to default.\r
- //\r
- UnicodeSPrint (\r
- mPrivate->PortString,\r
- (UINTN) 128,\r
- L"%d",\r
- (UINTN) AttemptConfigData->AttemptConfigIndex\r
- );\r
- UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, sizeof (AttemptConfigData->AttemptName));\r
-\r
- //\r
- // Save the created Attempt temporarily. If user does not save the attempt\r
- // by press 'KEY_SAVE_ATTEMPT_CONFIG' later, iSCSI driver would know that\r
- // and free resources.\r
- //\r
- mPrivate->NewAttempt = (VOID *) AttemptConfigData;\r
-\r
} else {\r
//\r
// Determine which Attempt user has selected to configure.\r
if (IfrNvData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- \r
- if (Private->Current != NULL) {\r
+\r
+\r
+ if (Private->Current!= NULL) {\r
IScsiConvertAttemptConfigDataToIfrNvData (Private->Current, IfrNvData);\r
}\r
\r
+ //\r
+ // Extract all AttemptConfigData to Keyword stroage of IfrNvData.\r
+ //\r
+ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (IfrNvData);\r
+\r
BufferSize = ISCSI_NAME_MAX_SIZE;\r
InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
if (InitiatorName == NULL) {\r
OUT EFI_STRING *Progress\r
)\r
{\r
+ EFI_STATUS Status;\r
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ EFI_INPUT_KEY Key;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ CHAR8 *InitiatorName;\r
+ UINT8 *AttemptList;\r
+ UINTN BufferSize;\r
+ UINTN OffSet;\r
+ UINTN Index;\r
+ UINTN Index2;\r
+\r
+ Index = 0;\r
+ Index2 = 0;\r
+ NicInfo = NULL;\r
+ AttemptList = NULL;\r
+ Status = EFI_SUCCESS;\r
+\r
if (This == NULL || Configuration == NULL || Progress == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
return EFI_NOT_FOUND;\r
}\r
\r
- *Progress = Configuration + StrLen (Configuration);\r
- return EFI_SUCCESS;\r
-}\r
+ IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));\r
+ if (IfrNvData == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ BufferSize = ISCSI_NAME_MAX_SIZE;\r
+ InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
+ if (InitiatorName == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
+\r
+ //\r
+ // Convert <ConfigResp> to buffer data by helper function ConfigToBlock().\r
+ //\r
+ BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
+ Status = gHiiConfigRouting->ConfigToBlock (\r
+ gHiiConfigRouting,\r
+ Configuration,\r
+ (UINT8 *) IfrNvData,\r
+ &BufferSize,\r
+ Progress\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+\r
+ if (IfrNvData->InitiatorName[0] != L'\0') {\r
+ UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, InitiatorName, ISCSI_NAME_MAX_SIZE);\r
+ BufferSize = AsciiStrSize (InitiatorName);\r
+\r
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid iSCSI Name!",\r
+ NULL\r
+ );\r
+ goto Exit;\r
+ }\r
+ } else {\r
+ Status = IScsiGetValue (Configuration, L"&OFFSET=", &OffSet);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+\r
+ if (OffSet >= ATTEMPT_MAC_ADDR_VAR_OFFSET) {\r
+ Status = gIScsiInitiatorName.Get (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: please configure iSCSI initiator name first!",\r
+ NULL\r
+ );\r
+ goto Exit;\r
+ }\r
+ } else {\r
+ goto Exit;\r
+ }\r
+\r
+ if (IfrNvData->ISCSIAddAttemptList[0] != L'\0') {\r
+ Status =IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The add attempt list is invalid",\r
+ NULL\r
+ );\r
+ goto Exit;\r
+ }\r
+\r
+ Status = IScsiConfigAddAttemptsByKeywords (IfrNvData->AddAttemptList);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+\r
+ } else if (IfrNvData->ISCSIDeleteAttemptList[0] != L'\0') {\r
+ AttemptList =(UINT8 *) AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));\r
+ if (AttemptList == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Exit;\r
+ }\r
+ Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIDeleteAttemptList, AttemptList, FALSE);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The delete attempt list is invalid",\r
+ NULL\r
+ );\r
+ goto Exit;\r
+ }\r
+\r
+ //\r
+ // Mark the attempt which will be delete in the global list.\r
+ //\r
+ NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &mPrivate->AttemptConfigs) {\r
+ AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ while (AttemptList[Index] != 0) {\r
+ if (AttemptConfigData->AttemptConfigIndex == AttemptList[Index]) {\r
+ IfrNvData->DeleteAttemptList[Index2] = 1;\r
+ break;\r
+ }\r
+ Index ++;\r
+ }\r
+ Index2 ++;\r
+ Index = 0;\r
+ }\r
+\r
+ Status = IScsiConfigDeleteAttempts (IfrNvData);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+\r
+ FreePool (AttemptList);\r
+\r
+ } else if (IfrNvData->ISCSIAttemptOrder[0] != L'\0') {\r
+ Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAttemptOrder, IfrNvData->DynamicOrderedList, FALSE);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The new attempt order list is invalid",\r
+ NULL\r
+ );\r
+ goto Exit;\r
+ }\r
+\r
+ Status = IScsiConfigOrderAttempts (IfrNvData);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+\r
+ } else if (IfrNvData->ISCSIMacAddr[0] != L'\0') {\r
+ NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
+ NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
+ IScsiMacAddrToStr (\r
+ &NicInfo->PermanentAddress,\r
+ NicInfo->HwAddressSize,\r
+ NicInfo->VlanId,\r
+ MacString\r
+ );\r
+ if (!StrCmp(MacString, IfrNvData->ISCSIMacAddr)) {\r
+ mPrivate->CurrentNic = NicInfo->NicIndex;\r
+ break;\r
+ }\r
+ }\r
+\r
+ if ((NicInfo == NULL) || (NicInfo->NicIndex == 0)) {\r
+ Status = EFI_NOT_FOUND;\r
+ goto Exit;\r
+ }\r
+\r
+ } else {\r
+ Status = IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (IfrNvData, OffSet);\r
+ if (EFI_ERROR (Status)) {\r
+ goto Exit;\r
+ }\r
+ }\r
+ }\r
+\r
+ IScsiConfigUpdateAttempt ();\r
+\r
+Exit:\r
+ if (InitiatorName != NULL) {\r
+ FreePool (InitiatorName);\r
+ }\r
\r
+ if (IfrNvData != NULL) {\r
+ FreePool (IfrNvData);\r
+ }\r
+\r
+ return Status;\r
+}\r
\r
/**\r
\r
ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
ISCSI_CONFIG_IFR_NVDATA OldIfrNvData;\r
EFI_STATUS Status;\r
- CHAR16 AttemptName[ATTEMPT_NAME_SIZE + 4];\r
EFI_INPUT_KEY Key;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+\r
+ NicInfo = NULL;\r
\r
if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
//\r
); \r
}\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
- break;\r
- case KEY_ATTEMPT_NAME:\r
- if (StrLen (IfrNvData->AttemptName) > ATTEMPT_NAME_SIZE) {\r
- CopyMem (AttemptName, IfrNvData->AttemptName, ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
- CopyMem (&AttemptName[ATTEMPT_NAME_SIZE], L"...", 4 * sizeof (CHAR16));\r
- } else {\r
- CopyMem (\r
- AttemptName,\r
- IfrNvData->AttemptName,\r
- (StrLen (IfrNvData->AttemptName) + 1) * sizeof (CHAR16)\r
- );\r
- }\r
-\r
- UnicodeStrToAsciiStrS (IfrNvData->AttemptName, Private->Current->AttemptName, sizeof (Private->Current->AttemptName));\r
-\r
- IScsiConfigUpdateAttempt ();\r
-\r
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
break;\r
\r
break;\r
}\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
break;\r
\r
case KEY_SAVE_ORDER_CHANGES:\r
case KEY_IP_MODE:\r
switch (Value->u8) {\r
case IP_MODE_IP6:\r
+ NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex); \r
+ if(NicInfo == NULL) {\r
+ break;\r
+ }\r
+\r
+ if(!NicInfo->Ipv6Available) { \r
+ //\r
+ // Current NIC doesn't Support IPv6, hence use IPv4. \r
+ // \r
+ IfrNvData->IpMode = IP_MODE_IP4;\r
+ \r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Current NIC doesn't Support IPv6!",\r
+ NULL\r
+ );\r
+ }\r
+ \r
case IP_MODE_IP4:\r
+ ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
+ ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
+ ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
Private->Current->AutoConfigureMode = 0;\r
-\r
+ ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
+ \r
break;\r
}\r
\r
\r
ASSERT (mPrivate->NicCount == 0);\r
\r
- //\r
- // Free attempt is created but not saved to system.\r
- //\r
- if (mPrivate->NewAttempt != NULL) {\r
- FreePool (mPrivate->NewAttempt);\r
- }\r
-\r
FreePool (mPrivate);\r
mPrivate = NULL;\r
\r
projects / mirror_edk2.git / blobdiff