diff options
Diffstat (limited to 'NetworkPkg/IScsiDxe/IScsiConfig.c')
| -rw-r--r-- | NetworkPkg/IScsiDxe/IScsiConfig.c | 1654 |
1 files changed, 824 insertions, 830 deletions
diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c index 326b1da39e..37f6255af0 100644 --- a/NetworkPkg/IScsiDxe/IScsiConfig.c +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c @@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "IScsiImpl.h"
-CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";
-ISCSI_FORM_CALLBACK_INFO *mCallbackInfo = NULL;
+CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";
+ISCSI_FORM_CALLBACK_INFO *mCallbackInfo = NULL;
HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = {
{
@@ -17,8 +17,8 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = { HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
- (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
- (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+ (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
+ (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
ISCSI_CONFIG_GUID
@@ -27,13 +27,12 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = { END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
- (UINT8) (END_DEVICE_PATH_LENGTH),
- (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
+ (UINT8)(END_DEVICE_PATH_LENGTH),
+ (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)
}
}
};
-
/**
Convert the IP address into a dotted string.
@@ -44,32 +43,32 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = { **/
VOID
IScsiIpToStr (
- IN EFI_IP_ADDRESS *Ip,
- IN BOOLEAN Ipv6Flag,
- OUT CHAR16 *Str
+ IN EFI_IP_ADDRESS *Ip,
+ IN BOOLEAN Ipv6Flag,
+ OUT CHAR16 *Str
)
{
- EFI_IPv4_ADDRESS *Ip4;
- EFI_IPv6_ADDRESS *Ip6;
- UINTN Index;
- BOOLEAN Short;
- UINTN Number;
- CHAR16 FormatString[8];
+ EFI_IPv4_ADDRESS *Ip4;
+ EFI_IPv6_ADDRESS *Ip6;
+ UINTN Index;
+ BOOLEAN Short;
+ UINTN Number;
+ CHAR16 FormatString[8];
if (!Ipv6Flag) {
Ip4 = &Ip->v4;
UnicodeSPrint (
Str,
- (UINTN) 2 * IP4_STR_MAX_SIZE,
+ (UINTN)2 * IP4_STR_MAX_SIZE,
L"%d.%d.%d.%d",
- (UINTN) Ip4->Addr[0],
- (UINTN) Ip4->Addr[1],
- (UINTN) Ip4->Addr[2],
- (UINTN) Ip4->Addr[3]
+ (UINTN)Ip4->Addr[0],
+ (UINTN)Ip4->Addr[1],
+ (UINTN)Ip4->Addr[2],
+ (UINTN)Ip4->Addr[3]
);
- return ;
+ return;
}
Ip6 = &Ip->v6;
@@ -77,10 +76,11 @@ IScsiIpToStr ( for (Index = 0; Index < 15; Index = Index + 2) {
if (!Short &&
- Index % 2 == 0 &&
- Ip6->Addr[Index] == 0 &&
- Ip6->Addr[Index + 1] == 0
- ) {
+ (Index % 2 == 0) &&
+ (Ip6->Addr[Index] == 0) &&
+ (Ip6->Addr[Index + 1] == 0)
+ )
+ {
//
// Deal with the case of ::.
//
@@ -89,8 +89,8 @@ IScsiIpToStr ( *(Str + 1) = L':';
Str = Str + 2;
} else {
- *Str = L':';
- Str = Str + 1;
+ *Str = L':';
+ Str = Str + 1;
}
while ((Index < 15) && (Ip6->Addr[Index] == 0) && (Ip6->Addr[Index + 1] == 0)) {
@@ -111,7 +111,7 @@ IScsiIpToStr ( ASSERT (Index < 15);
if (Ip6->Addr[Index] == 0) {
- Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN) Ip6->Addr[Index + 1]);
+ Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN)Ip6->Addr[Index + 1]);
} else {
if (Ip6->Addr[Index + 1] < 0x10) {
CopyMem (FormatString, L"%x0%x:", StrSize (L"%x0%x:"));
@@ -122,9 +122,9 @@ IScsiIpToStr ( Number = UnicodeSPrint (
Str,
2 * IP_STR_MAX_SIZE,
- (CONST CHAR16 *) FormatString,
- (UINTN) Ip6->Addr[Index],
- (UINTN) Ip6->Addr[Index + 1]
+ (CONST CHAR16 *)FormatString,
+ (UINTN)Ip6->Addr[Index],
+ (UINTN)Ip6->Addr[Index + 1]
);
}
@@ -151,14 +151,15 @@ IScsiIpToStr ( **/
BOOLEAN
IpIsUnicast (
- IN EFI_IP_ADDRESS *Ip,
+ IN EFI_IP_ADDRESS *Ip,
IN UINT8 IpMode
)
{
if (IpMode == IP_MODE_IP4) {
- if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0]))) {
+ if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0]))) {
return FALSE;
}
+
return TRUE;
} else if (IpMode == IP_MODE_IP6) {
return NetIp6IsValidUnicast (&Ip->v6);
@@ -180,27 +181,27 @@ IpIsUnicast ( **/
EFI_STATUS
IScsiParseIsIdFromString (
- IN CONST CHAR16 *String,
- IN OUT UINT8 *IsId
+ IN CONST CHAR16 *String,
+ IN OUT UINT8 *IsId
)
{
- UINT8 Index;
- CHAR16 *IsIdStr;
- CHAR16 TempStr[3];
- UINTN NodeVal;
- CHAR16 PortString[ISCSI_NAME_IFR_MAX_SIZE];
- EFI_INPUT_KEY Key;
+ UINT8 Index;
+ CHAR16 *IsIdStr;
+ CHAR16 TempStr[3];
+ UINTN NodeVal;
+ CHAR16 PortString[ISCSI_NAME_IFR_MAX_SIZE];
+ EFI_INPUT_KEY Key;
if ((String == NULL) || (IsId == NULL)) {
return EFI_INVALID_PARAMETER;
}
- IsIdStr = (CHAR16 *) String;
+ IsIdStr = (CHAR16 *)String;
- if (StrLen (IsIdStr) != 6 && StrLen (IsIdStr) != 12) {
+ if ((StrLen (IsIdStr) != 6) && (StrLen (IsIdStr) != 12)) {
UnicodeSPrint (
PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
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"
);
@@ -228,7 +229,7 @@ IScsiParseIsIdFromString ( //
NodeVal = StrHexToUintn (TempStr);
- IsId[Index] = (UINT8) NodeVal;
+ IsId[Index] = (UINT8)NodeVal;
IsIdStr = IsIdStr + 2;
}
@@ -248,12 +249,12 @@ IScsiParseIsIdFromString ( **/
EFI_STATUS
IScsiConvertIsIdToString (
- OUT CHAR16 *String,
- IN UINT8 *IsId
+ OUT CHAR16 *String,
+ IN UINT8 *IsId
)
{
- UINT8 Index;
- UINTN Number;
+ UINT8 Index;
+ UINTN Number;
if ((String == NULL) || (IsId == NULL)) {
return EFI_INVALID_PARAMETER;
@@ -265,16 +266,15 @@ IScsiConvertIsIdToString ( String,
2 * ISID_CONFIGURABLE_STORAGE,
L"0%X",
- (UINTN) IsId[Index]
+ (UINTN)IsId[Index]
);
} else {
Number = UnicodeSPrint (
String,
2 * ISID_CONFIGURABLE_STORAGE,
L"%X",
- (UINTN) IsId[Index]
+ (UINTN)IsId[Index]
);
-
}
String = String + Number;
@@ -301,36 +301,37 @@ IScsiConvertIsIdToString ( **/
EFI_STATUS
IScsiGetValue (
- IN CONST EFI_STRING Configuration,
- IN CHAR16 *String,
- OUT UINTN *Value
+ IN CONST EFI_STRING Configuration,
+ IN CHAR16 *String,
+ OUT UINTN *Value
)
{
- CHAR16 *StringPtr;
- CHAR16 *TmpPtr;
- CHAR16 *Str;
- CHAR16 TmpStr[2];
- UINTN Length;
- UINTN Len;
- UINTN Index;
- UINT8 *Buf;
- UINT8 DigitUint8;
- EFI_STATUS Status;
+ CHAR16 *StringPtr;
+ CHAR16 *TmpPtr;
+ CHAR16 *Str;
+ CHAR16 TmpStr[2];
+ UINTN Length;
+ UINTN Len;
+ UINTN Index;
+ UINT8 *Buf;
+ UINT8 DigitUint8;
+ EFI_STATUS Status;
//
// Get Value.
//
- Buf = NULL;
+ Buf = NULL;
StringPtr = StrStr (Configuration, String);
- ASSERT(StringPtr != NULL);
+ ASSERT (StringPtr != NULL);
StringPtr += StrLen (String);
- TmpPtr = StringPtr;
+ TmpPtr = StringPtr;
while (*StringPtr != L'\0' && *StringPtr != L'&') {
- StringPtr ++;
+ StringPtr++;
}
+
Length = StringPtr - TmpPtr;
- Len = Length + 1;
+ Len = Length + 1;
Str = AllocateZeroPool (Len * sizeof (CHAR16));
if (Str == NULL) {
@@ -342,20 +343,20 @@ IScsiGetValue ( *(Str + Length) = L'\0';
Len = (Len + 1) / 2;
- Buf = (UINT8 *) AllocateZeroPool (Len);
+ Buf = (UINT8 *)AllocateZeroPool (Len);
if (Buf == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
ZeroMem (TmpStr, sizeof (TmpStr));
- for (Index = 0; Index < Length; Index ++) {
- TmpStr[0] = Str[Length - Index - 1];
- DigitUint8 = (UINT8) StrHexToUint64 (TmpStr);
+ for (Index = 0; Index < Length; Index++) {
+ TmpStr[0] = Str[Length - Index - 1];
+ DigitUint8 = (UINT8)StrHexToUint64 (TmpStr);
if ((Index & 1) == 0) {
- Buf [Index/2] = DigitUint8;
+ Buf[Index/2] = DigitUint8;
} else {
- Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);
+ Buf[Index/2] = (UINT8)((DigitUint8 << 4) + Buf[Index/2]);
}
}
@@ -388,7 +389,7 @@ Exit: **/
ISCSI_ATTEMPT_CONFIG_NVDATA *
IScsiConfigGetAttemptByConfigIndex (
- IN UINT8 AttemptConfigIndex
+ IN UINT8 AttemptConfigIndex
)
{
LIST_ENTRY *Entry;
@@ -404,7 +405,6 @@ IScsiConfigGetAttemptByConfigIndex ( return NULL;
}
-
/**
Get the existing attempt config data from global structure by the NicIndex.
@@ -419,8 +419,8 @@ IScsiConfigGetAttemptByConfigIndex ( **/
ISCSI_ATTEMPT_CONFIG_NVDATA *
IScsiConfigGetAttemptByNic (
- IN ISCSI_ATTEMPT_CONFIG_NVDATA *NewAttempt,
- IN UINT8 IScsiMode
+ IN ISCSI_ATTEMPT_CONFIG_NVDATA *NewAttempt,
+ IN UINT8 IScsiMode
)
{
LIST_ENTRY *Entry;
@@ -428,8 +428,9 @@ IScsiConfigGetAttemptByNic ( NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {
Attempt = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);
- if (Attempt != NewAttempt && Attempt->NicIndex == NewAttempt->NicIndex &&
- Attempt->SessionConfigData.Enabled == IScsiMode) {
+ if ((Attempt != NewAttempt) && (Attempt->NicIndex == NewAttempt->NicIndex) &&
+ (Attempt->SessionConfigData.Enabled == IScsiMode))
+ {
return Attempt;
}
}
@@ -451,16 +452,16 @@ IScsiConfigGetAttemptByNic ( **/
EFI_STATUS
IScsiGetAttemptIndexList (
- IN CHAR16 *AttemptNameList,
- OUT UINT8 *AttemptIndexList,
- IN BOOLEAN IsAddAttempts
-)
+ IN CHAR16 *AttemptNameList,
+ OUT UINT8 *AttemptIndexList,
+ IN BOOLEAN IsAddAttempts
+ )
{
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- CHAR16 *AttemptStr;
- UINT8 AttemptIndex;
- UINTN Len;
- UINTN Index;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ CHAR16 *AttemptStr;
+ UINT8 AttemptIndex;
+ UINTN Len;
+ UINTN Index;
Index = 0;
@@ -469,16 +470,17 @@ IScsiGetAttemptIndexList ( }
AttemptStr = AttemptNameList;
- Len = StrLen (L"attempt:");
+ Len = StrLen (L"attempt:");
while (*AttemptStr != L'\0') {
AttemptStr = StrStr (AttemptStr, L"attempt:");
if (AttemptStr == NULL) {
return EFI_INVALID_PARAMETER;
}
- AttemptStr += Len;
- AttemptIndex = (UINT8)(*AttemptStr - L'0');
- AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+
+ AttemptStr += Len;
+ AttemptIndex = (UINT8)(*AttemptStr - L'0');
+ AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (IsAddAttempts) {
if ((AttemptConfigData != NULL) || ((AttemptIndex) > PcdGet8 (PcdMaxIScsiAttemptNumber))) {
return EFI_INVALID_PARAMETER;
@@ -490,9 +492,10 @@ IScsiGetAttemptIndexList ( }
AttemptIndexList[Index] = AttemptIndex;
- Index ++;
+ Index++;
AttemptStr += 2;
}
+
return EFI_SUCCESS;
}
@@ -509,22 +512,22 @@ IScsiConvertAttemptConfigDataToIfrNvData ( IN OUT ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
- ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;
- ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;
- EFI_IP_ADDRESS Ip;
- BOOLEAN DnsMode;
+ ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;
+ ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;
+ EFI_IP_ADDRESS Ip;
+ BOOLEAN DnsMode;
//
// Normal session configuration parameters.
//
- SessionConfigData = &Attempt->SessionConfigData;
- IfrNvData->Enabled = SessionConfigData->Enabled;
- IfrNvData->IpMode = SessionConfigData->IpMode;
- DnsMode = SessionConfigData->DnsMode;
+ SessionConfigData = &Attempt->SessionConfigData;
+ IfrNvData->Enabled = SessionConfigData->Enabled;
+ IfrNvData->IpMode = SessionConfigData->IpMode;
+ DnsMode = SessionConfigData->DnsMode;
- IfrNvData->InitiatorInfoFromDhcp = SessionConfigData->InitiatorInfoFromDhcp;
- IfrNvData->TargetInfoFromDhcp = SessionConfigData->TargetInfoFromDhcp;
- IfrNvData->TargetPort = SessionConfigData->TargetPort;
+ IfrNvData->InitiatorInfoFromDhcp = SessionConfigData->InitiatorInfoFromDhcp;
+ IfrNvData->TargetInfoFromDhcp = SessionConfigData->TargetInfoFromDhcp;
+ IfrNvData->TargetPort = SessionConfigData->TargetPort;
if (IfrNvData->IpMode == IP_MODE_IP4) {
CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));
@@ -538,7 +541,6 @@ IScsiConvertAttemptConfigDataToIfrNvData ( CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));
IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);
}
-
} else if (IfrNvData->IpMode == IP_MODE_IP6) {
ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));
if (SessionConfigData->TargetIp.v6.Addr[0] != '\0') {
@@ -620,16 +622,16 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( IN OUT ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
- LIST_ENTRY *Entry;
- ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;
- ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;
- ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;
- CHAR16 AttemptNameList[ATTEMPT_NAME_LIST_SIZE];
- ISCSI_NIC_INFO *NicInfo;
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
- EFI_IP_ADDRESS Ip;
- UINTN Index;
- UINTN StringLen;
+ LIST_ENTRY *Entry;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;
+ ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;
+ ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;
+ CHAR16 AttemptNameList[ATTEMPT_NAME_LIST_SIZE];
+ ISCSI_NIC_INFO *NicInfo;
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
+ EFI_IP_ADDRESS Ip;
+ UINTN Index;
+ UINTN StringLen;
NicInfo = NULL;
ZeroMem (AttemptNameList, sizeof (AttemptNameList));
@@ -640,10 +642,10 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( //
// Normal session configuration parameters.
//
- SessionConfigData = &Attempt->SessionConfigData;
+ SessionConfigData = &Attempt->SessionConfigData;
ASSERT ((Attempt->AttemptConfigIndex > 0) && (Attempt->AttemptConfigIndex <= FixedPcdGet8 (PcdMaxIScsiAttemptNumber)));
- Index = Attempt->AttemptConfigIndex - 1;
+ Index = Attempt->AttemptConfigIndex - 1;
//
// Save the attempt to AttemptNameList as Attempt:1 Attempt:2
@@ -652,7 +654,7 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( Attempt->AttemptName,
AttemptNameList + StrLen (AttemptNameList),
ATTEMPT_NAME_LIST_SIZE - StrLen (AttemptNameList)
- );
+ );
StringLen = StrLen (AttemptNameList);
ASSERT (StringLen > 2);
@@ -663,16 +665,16 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( Attempt->AttemptName,
IfrNvData->ISCSIAttemptName + ATTEMPT_NAME_SIZE * Index,
ATTEMPT_NAME_LIST_SIZE - ATTEMPT_NAME_SIZE * Index
- );
+ );
- IfrNvData->ISCSIBootEnableList[Index] = SessionConfigData->Enabled;
- IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;
+ IfrNvData->ISCSIBootEnableList[Index] = SessionConfigData->Enabled;
+ IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;
- IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;
- IfrNvData->ISCSITargetInfoViaDHCP[Index] = SessionConfigData->TargetInfoFromDhcp;
- IfrNvData->ISCSIConnectRetry[Index] = SessionConfigData->ConnectRetryCount;
- IfrNvData->ISCSIConnectTimeout[Index] = SessionConfigData->ConnectTimeout;
- IfrNvData->ISCSITargetTcpPort[Index] = SessionConfigData->TargetPort;
+ IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;
+ IfrNvData->ISCSITargetInfoViaDHCP[Index] = SessionConfigData->TargetInfoFromDhcp;
+ IfrNvData->ISCSIConnectRetry[Index] = SessionConfigData->ConnectRetryCount;
+ IfrNvData->ISCSIConnectTimeout[Index] = SessionConfigData->ConnectTimeout;
+ IfrNvData->ISCSITargetTcpPort[Index] = SessionConfigData->TargetPort;
if (SessionConfigData->IpMode == IP_MODE_IP4) {
CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));
@@ -710,10 +712,10 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( IScsiLunToUnicodeStr (SessionConfigData->BootLun, IfrNvData->Keyword[Index].ISCSILun);
IScsiConvertIsIdToString (IfrNvData->Keyword[Index].ISCSIIsId, SessionConfigData->IsId);
- IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;
+ IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {
- AuthConfigData = &Attempt->AuthConfigData.CHAP;
+ AuthConfigData = &Attempt->AuthConfigData.CHAP;
IfrNvData->ISCSIChapType[Index] = AuthConfigData->CHAPType;
AsciiStrToUnicodeStrS (
AuthConfigData->CHAPName,
@@ -740,7 +742,7 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( );
}
}
- CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);
+ CopyMem (IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);
ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));
NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
@@ -786,34 +788,34 @@ IScsiConvertIfrNvDataToAttemptConfigData ( IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt
)
{
- EFI_IP_ADDRESS HostIp;
- EFI_IP_ADDRESS SubnetMask;
- EFI_IP_ADDRESS Gateway;
- CHAR16 *MacString;
- CHAR16 *AttemptName1;
- CHAR16 *AttemptName2;
- ISCSI_ATTEMPT_CONFIG_NVDATA *ExistAttempt;
- ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;
- CHAR16 IScsiMode[64];
- CHAR16 IpMode[64];
- ISCSI_NIC_INFO *NicInfo;
- EFI_INPUT_KEY Key;
- UINT8 *AttemptConfigOrder;
- UINTN AttemptConfigOrderSize;
- UINT8 *AttemptOrderTmp;
- UINTN TotalNumber;
- EFI_STATUS Status;
-
- if (IfrNvData == NULL || Attempt == NULL) {
+ EFI_IP_ADDRESS HostIp;
+ EFI_IP_ADDRESS SubnetMask;
+ EFI_IP_ADDRESS Gateway;
+ CHAR16 *MacString;
+ CHAR16 *AttemptName1;
+ CHAR16 *AttemptName2;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *ExistAttempt;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;
+ CHAR16 IScsiMode[64];
+ CHAR16 IpMode[64];
+ ISCSI_NIC_INFO *NicInfo;
+ EFI_INPUT_KEY Key;
+ UINT8 *AttemptConfigOrder;
+ UINTN AttemptConfigOrderSize;
+ UINT8 *AttemptOrderTmp;
+ UINTN TotalNumber;
+ EFI_STATUS Status;
+
+ if ((IfrNvData == NULL) || (Attempt == NULL)) {
return EFI_INVALID_PARAMETER;
}
//
// Update those fields which don't have INTERACTIVE attribute.
//
- Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ConnectRetryCount;
- Attempt->SessionConfigData.ConnectTimeout = IfrNvData->ConnectTimeout;
- Attempt->SessionConfigData.IpMode = IfrNvData->IpMode;
+ Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ConnectRetryCount;
+ Attempt->SessionConfigData.ConnectTimeout = IfrNvData->ConnectTimeout;
+ Attempt->SessionConfigData.IpMode = IfrNvData->IpMode;
if (IfrNvData->IpMode < IP_MODE_AUTOCONFIG) {
Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->InitiatorInfoFromDhcp;
@@ -878,10 +880,11 @@ IScsiConvertIfrNvDataToAttemptConfigData ( }
}
}
+
//
// Validate target configuration if DHCP isn't deployed.
//
- if (!Attempt->SessionConfigData.TargetInfoFromDhcp && Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {
+ if (!Attempt->SessionConfigData.TargetInfoFromDhcp && (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG)) {
if (!Attempt->SessionConfigData.DnsMode) {
if (!IpIsUnicast (&Attempt->SessionConfigData.TargetIp, IfrNvData->IpMode)) {
CreatePopUp (
@@ -937,7 +940,8 @@ IScsiConvertIfrNvDataToAttemptConfigData ( if ((IfrNvData->CHAPType == ISCSI_CHAP_MUTUAL) &&
((IfrNvData->ReverseCHAPName[0] == '\0') || (IfrNvData->ReverseCHAPSecret[0] == '\0'))
- ) {
+ )
+ {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
@@ -953,12 +957,12 @@ IScsiConvertIfrNvDataToAttemptConfigData ( //
SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);
if (SameNicAttempt != NULL) {
- AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
+ AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
if (AttemptName1 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
+ AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
if (AttemptName2 == NULL) {
FreePool (AttemptName1);
return EFI_OUT_OF_RESOURCES;
@@ -969,7 +973,7 @@ IScsiConvertIfrNvDataToAttemptConfigData ( UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"Warning! Attempt \"%s\" uses same NIC as Attempt \"%s\".",
AttemptName1,
AttemptName2
@@ -1011,7 +1015,7 @@ IScsiConvertIfrNvDataToAttemptConfigData ( return EFI_NOT_FOUND;
}
- MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));
+ MacString = (CHAR16 *)AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));
if (MacString == NULL) {
return EFI_OUT_OF_RESOURCES;
}
@@ -1020,7 +1024,7 @@ IScsiConvertIfrNvDataToAttemptConfigData ( UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",
MacString,
NicInfo->BusNumber,
@@ -1048,9 +1052,9 @@ IScsiConvertIfrNvDataToAttemptConfigData ( if (ExistAttempt != NULL) {
ASSERT (ExistAttempt == Attempt);
- if (IfrNvData->Enabled == ISCSI_DISABLED &&
- Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {
-
+ if ((IfrNvData->Enabled == ISCSI_DISABLED) &&
+ (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))
+ {
//
// User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".
//
@@ -1066,11 +1070,12 @@ IScsiConvertIfrNvDataToAttemptConfigData ( if (mPrivate->SinglePathCount < 1) {
return EFI_ABORTED;
}
+
mPrivate->SinglePathCount--;
}
-
- } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))
+ {
//
// User updates the Attempt from "Enabled" to "Enabled for MPIO".
//
@@ -1081,9 +1086,9 @@ IScsiConvertIfrNvDataToAttemptConfigData ( mPrivate->EnableMpio = TRUE;
mPrivate->MpioCount++;
mPrivate->SinglePathCount--;
-
- } else if (IfrNvData->Enabled == ISCSI_ENABLED &&
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))
+ {
//
// User updates the Attempt from "Enabled for MPIO" to "Enabled".
//
@@ -1094,22 +1099,21 @@ IScsiConvertIfrNvDataToAttemptConfigData ( if (--mPrivate->MpioCount == 0) {
mPrivate->EnableMpio = FALSE;
}
- mPrivate->SinglePathCount++;
- } else if (IfrNvData->Enabled != ISCSI_DISABLED &&
- Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {
+ mPrivate->SinglePathCount++;
+ } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))
+ {
//
// User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".
//
if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {
mPrivate->EnableMpio = TRUE;
mPrivate->MpioCount++;
-
} else if (IfrNvData->Enabled == ISCSI_ENABLED) {
mPrivate->SinglePathCount++;
}
}
-
} else if (ExistAttempt == NULL) {
//
// When a new attempt is created, pointer of the attempt is saved to
@@ -1138,6 +1142,7 @@ IScsiConvertIfrNvDataToAttemptConfigData ( if (AttemptConfigOrder != NULL) {
FreePool (AttemptConfigOrder);
}
+
return EFI_OUT_OF_RESOURCES;
}
@@ -1180,12 +1185,13 @@ IScsiConvertIfrNvDataToAttemptConfigData ( IScsiConfigUpdateAttempt ();
}
+
Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;
//
// Record the user configuration information in NVR.
//
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);
FreePool (MacString);
@@ -1210,40 +1216,40 @@ IScsiConvertIfrNvDataToAttemptConfigData ( **/
EFI_STATUS
IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
- IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData,
- IN UINTN OffSet
+ IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData,
+ IN UINTN OffSet
)
{
- ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;
- UINT8 AttemptIndex;
- UINT8 Index;
- UINT8 ChapSecretLen;
- UINT8 ReverseChapSecretLen;
- CHAR16 *AttemptName1;
- CHAR16 *AttemptName2;
- ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;
- CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];
- CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];
- CHAR8 IpString[IP_STR_MAX_SIZE];
- EFI_IP_ADDRESS HostIp;
- EFI_IP_ADDRESS SubnetMask;
- EFI_IP_ADDRESS Gateway;
- EFI_INPUT_KEY Key;
- UINT64 Lun;
- EFI_STATUS Status;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;
+ UINT8 AttemptIndex;
+ UINT8 Index;
+ UINT8 ChapSecretLen;
+ UINT8 ReverseChapSecretLen;
+ CHAR16 *AttemptName1;
+ CHAR16 *AttemptName2;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;
+ CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];
+ CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];
+ CHAR8 IpString[IP_STR_MAX_SIZE];
+ EFI_IP_ADDRESS HostIp;
+ EFI_IP_ADDRESS SubnetMask;
+ EFI_IP_ADDRESS Gateway;
+ EFI_INPUT_KEY Key;
+ UINT64 Lun;
+ EFI_STATUS Status;
Attempt = NULL;
ZeroMem (IScsiName, sizeof (IScsiName));
if (OffSet < ATTEMPT_BOOTENABLE_VAR_OFFSET) {
return EFI_SUCCESS;
-
} else if ((OffSet >= ATTEMPT_BOOTENABLE_VAR_OFFSET) && (OffSet < ATTEMPT_ADDRESS_TYPE_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
+
IfrNvData->Enabled = IfrNvData->ISCSIBootEnableList[AttemptIndex - 1];
//
// Validate the configuration of attempt.
@@ -1254,12 +1260,12 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( //
SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);
if (SameNicAttempt != NULL) {
- AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
+ AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
if (AttemptName1 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
+ AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));
if (AttemptName2 == NULL) {
FreePool (AttemptName1);
return EFI_OUT_OF_RESOURCES;
@@ -1270,7 +1276,7 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"Warning! \"%s\" uses same NIC as Attempt \"%s\".",
AttemptName1,
AttemptName2
@@ -1288,9 +1294,9 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( }
}
- if (IfrNvData->Enabled == ISCSI_DISABLED &&
- Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {
-
+ if ((IfrNvData->Enabled == ISCSI_DISABLED) &&
+ (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))
+ {
//
// User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".
//
@@ -1306,11 +1312,12 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( if (mPrivate->SinglePathCount < 1) {
return EFI_ABORTED;
}
+
mPrivate->SinglePathCount--;
}
-
- } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))
+ {
//
// User updates the Attempt from "Enabled" to "Enabled for MPIO".
//
@@ -1321,9 +1328,9 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( mPrivate->EnableMpio = TRUE;
mPrivate->MpioCount++;
mPrivate->SinglePathCount--;
-
- } else if (IfrNvData->Enabled == ISCSI_ENABLED &&
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))
+ {
//
// User updates the Attempt from "Enabled for MPIO" to "Enabled".
//
@@ -1334,61 +1341,62 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( if (--mPrivate->MpioCount == 0) {
mPrivate->EnableMpio = FALSE;
}
- mPrivate->SinglePathCount++;
- } else if (IfrNvData->Enabled != ISCSI_DISABLED &&
- Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {
+ mPrivate->SinglePathCount++;
+ } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&
+ (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))
+ {
//
// User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".
//
if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {
mPrivate->EnableMpio = TRUE;
mPrivate->MpioCount++;
-
} else if (IfrNvData->Enabled == ISCSI_ENABLED) {
mPrivate->SinglePathCount++;
}
}
- Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;
+ Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;
} else if ((OffSet >= ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_RETRY_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
+
Attempt->SessionConfigData.IpMode = IfrNvData->ISCSIIpAddressTypeList[AttemptIndex - 1];
if (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {
Attempt->AutoConfigureMode = 0;
}
-
} else if ((OffSet >= ATTEMPT_CONNECT_RETRY_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
if (IfrNvData->ISCSIConnectRetry[AttemptIndex - 1] > CONNECT_MAX_RETRY) {
CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"The minimum value is 0 and the maximum is 16. 0 means no retry.",
- NULL
- );
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"The minimum value is 0 and the maximum is 16. 0 means no retry.",
+ NULL
+ );
return EFI_INVALID_PARAMETER;
}
- Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];
+ Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];
} else if ((OffSet >= ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
if ((IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] < CONNECT_MIN_TIMEOUT) ||
- (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT)) {
+ (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT))
+ {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
@@ -1402,18 +1410,17 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( if (Attempt->SessionConfigData.ConnectTimeout == 0) {
Attempt->SessionConfigData.ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;
}
-
} else if ((OffSet >= ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
- Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];
+ Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];
} else if ((OffSet >= ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -1429,13 +1436,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) && (OffSet < ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
+
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {
Attempt->SessionConfigData.TargetPort = IfrNvData->ISCSITargetTcpPort[AttemptIndex - 1];
if (Attempt->SessionConfigData.TargetPort == 0) {
@@ -1450,30 +1457,28 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) && (OffSet < ATTEMPT_CHARTYPE_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
Attempt->AuthenticationType = IfrNvData->ISCSIAuthenticationMethod[AttemptIndex - 1];
-
} else if ((OffSet >= ATTEMPT_CHARTYPE_VAR_OFFSET) && (OffSet < ATTEMPT_ISID_VAR_OFFSET)) {
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
+
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {
Attempt->AuthConfigData.CHAP.CHAPType = IfrNvData->ISCSIChapType[AttemptIndex - 1];
}
-
} else if (OffSet >= ATTEMPT_ISID_VAR_OFFSET) {
- Index = (UINT8) ((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));
+ Index = (UINT8)((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));
AttemptIndex = Index + 1;
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);
if (Attempt == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -1482,15 +1487,15 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( if ((OffSet >= ATTEMPT_ISID_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET)) {
IScsiParseIsIdFromString (IfrNvData->Keyword[Index].ISCSIIsId, Attempt->SessionConfigData.IsId);
-
- } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {
+ } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {
//
// Config Local ip
//
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorIpAddress, &HostIp.v4);
if (EFI_ERROR (Status) || ((Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&
- !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {
+ !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))
+ {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
@@ -1510,7 +1515,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorNetmask, &SubnetMask.v4);
@@ -1534,13 +1538,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_NAME_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorGateway, &Gateway.v4);
if (EFI_ERROR (Status) ||
- ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&
- !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {
+ ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))
+ {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
@@ -1560,7 +1564,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_TARGET_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetName, IScsiName, ISCSI_NAME_MAX_SIZE);
@@ -1575,6 +1578,7 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( } else {
AsciiStrCpyS (Attempt->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);
}
+
if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {
if (Attempt->SessionConfigData.TargetName[0] == L'\0') {
CreatePopUp (
@@ -1595,7 +1599,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_LUN_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetIpAddress, IpString, sizeof (IpString));
@@ -1617,14 +1620,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_LUN_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_USER_NAME_VAR_OFFSET)) {
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (Attempt->SessionConfigData.TargetInfoFromDhcp == 0)) {
//
// Config LUN.
//
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSILun, LunString, ISCSI_LUN_STR_MAX_LEN);
- Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);
if (EFI_ERROR (Status)) {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
@@ -1644,7 +1646,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_CHAR_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_SECRET_VAR_OFFSET)) {
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {
UnicodeStrToAsciiStrS (
@@ -1673,7 +1674,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_CHAR_SECRET_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET)) {
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {
ChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIChapSecret);
@@ -1703,7 +1703,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if ((OffSet >= ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET)) {
if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {
UnicodeStrToAsciiStrS (
@@ -1731,7 +1730,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( );
return EFI_INVALID_PARAMETER;
}
-
} else if (OffSet >= ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET) {
if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {
ReverseChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIReverseChapSecret);
@@ -1764,13 +1762,11 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( }
}
-
-
//
// Record the user configuration information in NVR.
//
ASSERT (Attempt != NULL);
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);
return gRT->SetVariable (
mPrivate->PortString,
&gEfiIScsiInitiatorNameProtocolGuid,
@@ -1778,7 +1774,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),
Attempt
);
-
}
/**
@@ -1799,18 +1794,18 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword ( **/
EFI_STATUS
IScsiCreateOpCode (
- IN UINT16 StartLabelNumber,
- OUT VOID **StartOpCodeHandle,
- OUT EFI_IFR_GUID_LABEL **StartLabel,
- OUT VOID **EndOpCodeHandle,
- OUT EFI_IFR_GUID_LABEL **EndLabel
+ IN UINT16 StartLabelNumber,
+ OUT VOID **StartOpCodeHandle,
+ OUT EFI_IFR_GUID_LABEL **StartLabel,
+ OUT VOID **EndOpCodeHandle,
+ OUT EFI_IFR_GUID_LABEL **EndLabel
)
{
- EFI_STATUS Status;
- EFI_IFR_GUID_LABEL *InternalStartLabel;
- EFI_IFR_GUID_LABEL *InternalEndLabel;
+ EFI_STATUS Status;
+ EFI_IFR_GUID_LABEL *InternalStartLabel;
+ EFI_IFR_GUID_LABEL *InternalEndLabel;
- if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {
+ if ((StartOpCodeHandle == NULL) || (StartLabel == NULL) || (EndOpCodeHandle == NULL) || (EndLabel == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -1834,12 +1829,12 @@ IScsiCreateOpCode ( //
// Create Hii Extend Label OpCode as the start opcode.
//
- InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (
- *StartOpCodeHandle,
- &gEfiIfrTianoGuid,
- NULL,
- sizeof (EFI_IFR_GUID_LABEL)
- );
+ InternalStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (
+ *StartOpCodeHandle,
+ &gEfiIfrTianoGuid,
+ NULL,
+ sizeof (EFI_IFR_GUID_LABEL)
+ );
if (InternalStartLabel == NULL) {
goto Exit;
}
@@ -1850,12 +1845,12 @@ IScsiCreateOpCode ( //
// Create Hii Extend Label OpCode as the end opcode.
//
- InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (
- *EndOpCodeHandle,
- &gEfiIfrTianoGuid,
- NULL,
- sizeof (EFI_IFR_GUID_LABEL)
- );
+ InternalEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (
+ *EndOpCodeHandle,
+ &gEfiIfrTianoGuid,
+ NULL,
+ sizeof (EFI_IFR_GUID_LABEL)
+ );
if (InternalEndLabel == NULL) {
goto Exit;
}
@@ -1877,6 +1872,7 @@ Exit: if (*EndOpCodeHandle != NULL) {
HiiFreeOpCodeHandle (*EndOpCodeHandle);
}
+
return Status;
}
@@ -1889,13 +1885,13 @@ IScsiConfigUpdateAttempt ( VOID
)
{
- LIST_ENTRY *Entry;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- VOID *StartOpCodeHandle;
- EFI_IFR_GUID_LABEL *StartLabel;
- VOID *EndOpCodeHandle;
- EFI_IFR_GUID_LABEL *EndLabel;
- EFI_STATUS Status;
+ LIST_ENTRY *Entry;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ VOID *StartOpCodeHandle;
+ EFI_IFR_GUID_LABEL *StartLabel;
+ VOID *EndOpCodeHandle;
+ EFI_IFR_GUID_LABEL *EndLabel;
+ EFI_STATUS Status;
Status = IScsiCreateOpCode (
ATTEMPT_ENTRY_LABEL,
@@ -1905,7 +1901,7 @@ IScsiConfigUpdateAttempt ( &EndLabel
);
if (EFI_ERROR (Status)) {
- return ;
+ return;
}
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {
@@ -1914,7 +1910,7 @@ IScsiConfigUpdateAttempt ( //
// Update Attempt Help Info.
//
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN) AttemptConfigData->AttemptConfigIndex);
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN)AttemptConfigData->AttemptConfigIndex);
AttemptConfigData->AttemptTitleToken = HiiSetString (
mCallbackInfo->RegisteredHandle,
0,
@@ -1922,16 +1918,16 @@ IScsiConfigUpdateAttempt ( NULL
);
if (AttemptConfigData->AttemptTitleToken == 0) {
- return ;
+ return;
}
HiiCreateGotoOpCode (
- StartOpCodeHandle, // Container for dynamic created opcodes
- FORMID_ATTEMPT_FORM, // Form ID
- AttemptConfigData->AttemptTitleToken, // Prompt text
- AttemptConfigData->AttemptTitleHelpToken, // Help text
- EFI_IFR_FLAG_CALLBACK, // Question flag
- (UINT16) (KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID
+ StartOpCodeHandle, // Container for dynamic created opcodes
+ FORMID_ATTEMPT_FORM, // Form ID
+ AttemptConfigData->AttemptTitleToken, // Prompt text
+ AttemptConfigData->AttemptTitleHelpToken, // Help text
+ EFI_IFR_FLAG_CALLBACK, // Question flag
+ (UINT16)(KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID
);
}
}
@@ -1942,7 +1938,7 @@ IScsiConfigUpdateAttempt ( FORMID_MAIN_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
- );
+ );
HiiFreeOpCodeHandle (StartOpCodeHandle);
HiiFreeOpCodeHandle (EndOpCodeHandle);
@@ -1961,16 +1957,16 @@ IScsiConfigAddAttempt ( VOID
)
{
- LIST_ENTRY *Entry;
- ISCSI_NIC_INFO *NicInfo;
- EFI_STRING_ID PortTitleToken;
- EFI_STRING_ID PortTitleHelpToken;
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
- EFI_STATUS Status;
- VOID *StartOpCodeHandle;
- EFI_IFR_GUID_LABEL *StartLabel;
- VOID *EndOpCodeHandle;
- EFI_IFR_GUID_LABEL *EndLabel;
+ LIST_ENTRY *Entry;
+ ISCSI_NIC_INFO *NicInfo;
+ EFI_STRING_ID PortTitleToken;
+ EFI_STRING_ID PortTitleHelpToken;
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
+ EFI_STATUS Status;
+ VOID *StartOpCodeHandle;
+ EFI_IFR_GUID_LABEL *StartLabel;
+ VOID *EndOpCodeHandle;
+ EFI_IFR_GUID_LABEL *EndLabel;
Status = IScsiCreateOpCode (
MAC_ENTRY_LABEL,
@@ -1995,7 +1991,7 @@ IScsiConfigAddAttempt ( MacString
);
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);
PortTitleToken = HiiSetString (
mCallbackInfo->RegisteredHandle,
0,
@@ -2009,7 +2005,7 @@ IScsiConfigAddAttempt ( UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"PFA: Bus %d | Dev %d | Func %d",
NicInfo->BusNumber,
NicInfo->DeviceNumber,
@@ -2027,7 +2023,7 @@ IScsiConfigAddAttempt ( PortTitleToken,
PortTitleHelpToken,
EFI_IFR_FLAG_CALLBACK, // Question flag
- (UINT16) (KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)
+ (UINT16)(KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)
);
}
@@ -2062,24 +2058,24 @@ Exit: **/
EFI_STATUS
IScsiConfigAddAttemptsByKeywords (
- IN UINT8 *AttemptList
+ IN UINT8 *AttemptList
)
{
- UINT8 Index;
- UINT8 Number;
- UINTN TotalNumber;
- UINT8 Nic;
- UINT8 *AttemptConfigOrder;
- UINTN AttemptConfigOrderSize;
- UINT8 *AttemptConfigOrderTmp;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- ISCSI_NIC_INFO *NicInfo;
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
- CHAR16 IScsiMode[64];
- CHAR16 IpMode[64];
- EFI_STATUS Status;
-
- Nic = mPrivate->CurrentNic;
+ UINT8 Index;
+ UINT8 Number;
+ UINTN TotalNumber;
+ UINT8 Nic;
+ UINT8 *AttemptConfigOrder;
+ UINTN AttemptConfigOrderSize;
+ UINT8 *AttemptConfigOrderTmp;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ ISCSI_NIC_INFO *NicInfo;
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
+ CHAR16 IScsiMode[64];
+ CHAR16 IpMode[64];
+ EFI_STATUS Status;
+
+ Nic = mPrivate->CurrentNic;
NicInfo = IScsiGetNicInfoByIndex (Nic);
if (NicInfo == NULL) {
return EFI_NOT_FOUND;
@@ -2107,22 +2103,22 @@ IScsiConfigAddAttemptsByKeywords ( UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"Attempt %d",
Number
);
GetVariable2 (
- mPrivate->PortString,
- &gEfiIScsiInitiatorNameProtocolGuid,
- (VOID**)&AttemptConfigData,
- NULL
- );
- if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {
+ mPrivate->PortString,
+ &gEfiIScsiInitiatorNameProtocolGuid,
+ (VOID **)&AttemptConfigData,
+ NULL
+ );
+ if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {
return EFI_INVALID_PARAMETER;
}
- AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;
AttemptConfigData->NicIndex = NicInfo->NicIndex;
UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, ISCSI_MAX_MAC_STRING_LEN);
@@ -2131,7 +2127,7 @@ IScsiConfigAddAttemptsByKeywords ( //
CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);
AttemptConfigData->SessionConfigData.IsId[0] =
- (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);
+ (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);
//
// Configure the iSCSI Mode and IpMode to default.
@@ -2141,7 +2137,7 @@ IScsiConfigAddAttemptsByKeywords ( UnicodeSPrint (IpMode, 64, L"IP4");
UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",
MacString,
NicInfo->BusNumber,
@@ -2180,16 +2176,18 @@ IScsiConfigAddAttemptsByKeywords ( if (AttemptConfigOrder != NULL) {
FreePool (AttemptConfigOrder);
}
+
return EFI_OUT_OF_RESOURCES;
}
+
if (AttemptConfigOrder != NULL) {
CopyMem (AttemptConfigOrderTmp, AttemptConfigOrder, AttemptConfigOrderSize);
FreePool (AttemptConfigOrder);
}
AttemptConfigOrderTmp[TotalNumber - 1] = Number;
- AttemptConfigOrder = AttemptConfigOrderTmp;
- AttemptConfigOrderSize = TotalNumber * sizeof (UINT8);
+ AttemptConfigOrder = AttemptConfigOrderTmp;
+ AttemptConfigOrderSize = TotalNumber * sizeof (UINT8);
Status = gRT->SetVariable (
L"AttemptOrder",
@@ -2208,7 +2206,7 @@ IScsiConfigAddAttemptsByKeywords ( //
InsertTailList (&mPrivate->AttemptConfigs, &AttemptConfigData->Link);
mPrivate->AttemptCount++;
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);
gRT->SetVariable (
mPrivate->PortString,
&gEfiIScsiInitiatorNameProtocolGuid,
@@ -2216,7 +2214,6 @@ IScsiConfigAddAttemptsByKeywords ( sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),
AttemptConfigData
);
-
}
return EFI_SUCCESS;
@@ -2240,22 +2237,22 @@ IScsiConfigDeleteAttempts ( IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
- EFI_STATUS Status;
- UINTN Index;
- UINTN NewIndex;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- UINT8 *AttemptConfigOrder;
- UINTN AttemptConfigOrderSize;
- UINT8 *AttemptNewOrder;
- UINT8 AttemptConfigIndex;
- UINT32 Attribute;
- UINTN Total;
- UINTN NewTotal;
- LIST_ENTRY *Entry;
- LIST_ENTRY *NextEntry;
- ISCSI_SESSION_CONFIG_NVDATA *ConfigData;
-
- Index = 0;
+ EFI_STATUS Status;
+ UINTN Index;
+ UINTN NewIndex;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ UINT8 *AttemptConfigOrder;
+ UINTN AttemptConfigOrderSize;
+ UINT8 *AttemptNewOrder;
+ UINT8 AttemptConfigIndex;
+ UINT32 Attribute;
+ UINTN Total;
+ UINTN NewTotal;
+ LIST_ENTRY *Entry;
+ LIST_ENTRY *NextEntry;
+ ISCSI_SESSION_CONFIG_NVDATA *ConfigData;
+
+ Index = 0;
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
@@ -2324,6 +2321,7 @@ IScsiConfigDeleteAttempts ( if (AttemptConfigData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
+
ConfigData = &AttemptConfigData->SessionConfigData;
ConfigData->TargetPort = ISCSI_WELL_KNOWN_PORT;
ConfigData->ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;
@@ -2341,9 +2339,9 @@ IScsiConfigDeleteAttempts ( //
UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"Attempt %d",
- (UINTN) AttemptConfigData->AttemptConfigIndex
+ (UINTN)AttemptConfigData->AttemptConfigIndex
);
UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, ATTEMPT_NAME_SIZE);
gRT->SetVariable (
@@ -2368,6 +2366,7 @@ IScsiConfigDeleteAttempts ( if (mCallbackInfo->Current == AttemptConfigData) {
mCallbackInfo->Current = NULL;
}
+
FreePool (AttemptConfigData);
//
@@ -2411,7 +2410,6 @@ Error: return Status;
}
-
/**
Callback function when user presses "Delete Attempts".
@@ -2427,17 +2425,16 @@ IScsiConfigDisplayDeleteAttempts ( IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
-
- UINT8 *AttemptConfigOrder;
- UINTN AttemptConfigOrderSize;
- LIST_ENTRY *Entry;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- UINT8 Index;
- VOID *StartOpCodeHandle;
- EFI_IFR_GUID_LABEL *StartLabel;
- VOID *EndOpCodeHandle;
- EFI_IFR_GUID_LABEL *EndLabel;
- EFI_STATUS Status;
+ UINT8 *AttemptConfigOrder;
+ UINTN AttemptConfigOrderSize;
+ LIST_ENTRY *Entry;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ UINT8 Index;
+ VOID *StartOpCodeHandle;
+ EFI_IFR_GUID_LABEL *StartLabel;
+ VOID *EndOpCodeHandle;
+ EFI_IFR_GUID_LABEL *EndLabel;
+ EFI_STATUS Status;
Status = IScsiCreateOpCode (
DELETE_ENTRY_LABEL,
@@ -2462,14 +2459,14 @@ IScsiConfigDisplayDeleteAttempts ( Index = 0;
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {
- AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);
+ AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);
IfrNvData->DeleteAttemptList[Index] = 0x00;
- HiiCreateCheckBoxOpCode(
+ HiiCreateCheckBoxOpCode (
StartOpCodeHandle,
- (EFI_QUESTION_ID) (ATTEMPT_DEL_QUESTION_ID + Index),
+ (EFI_QUESTION_ID)(ATTEMPT_DEL_QUESTION_ID + Index),
CONFIGURATION_VARSTORE_ID,
- (UINT16) (ATTEMPT_DEL_VAR_OFFSET + Index),
+ (UINT16)(ATTEMPT_DEL_VAR_OFFSET + Index),
AttemptConfigData->AttemptTitleToken,
AttemptConfigData->AttemptTitleHelpToken,
0,
@@ -2501,7 +2498,6 @@ IScsiConfigDisplayDeleteAttempts ( return Status;
}
-
/**
Callback function when user presses "Change Attempt Order".
@@ -2516,15 +2512,15 @@ IScsiConfigDisplayOrderAttempts ( VOID
)
{
- EFI_STATUS Status;
- UINT8 Index;
- LIST_ENTRY *Entry;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- VOID *StartOpCodeHandle;
- EFI_IFR_GUID_LABEL *StartLabel;
- VOID *EndOpCodeHandle;
- EFI_IFR_GUID_LABEL *EndLabel;
- VOID *OptionsOpCodeHandle;
+ EFI_STATUS Status;
+ UINT8 Index;
+ LIST_ENTRY *Entry;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ VOID *StartOpCodeHandle;
+ EFI_IFR_GUID_LABEL *StartLabel;
+ VOID *EndOpCodeHandle;
+ EFI_IFR_GUID_LABEL *EndLabel;
+ VOID *OptionsOpCodeHandle;
Status = IScsiCreateOpCode (
ORDER_ENTRY_LABEL,
@@ -2536,6 +2532,7 @@ IScsiConfigDisplayOrderAttempts ( if (EFI_ERROR (Status)) {
return Status;
}
+
ASSERT (StartOpCodeHandle != NULL);
OptionsOpCodeHandle = NULL;
@@ -2622,14 +2619,14 @@ IScsiConfigOrderAttempts ( IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
- EFI_STATUS Status;
- UINTN Index;
- UINTN Indexj;
- UINT8 AttemptConfigIndex;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- UINT8 *AttemptConfigOrder;
- UINT8 *AttemptConfigOrderTmp;
- UINTN AttemptConfigOrderSize;
+ EFI_STATUS Status;
+ UINTN Index;
+ UINTN Indexj;
+ UINT8 AttemptConfigIndex;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ UINT8 *AttemptConfigOrder;
+ UINT8 *AttemptConfigOrderTmp;
+ UINTN AttemptConfigOrderSize;
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
@@ -2683,7 +2680,7 @@ IScsiConfigOrderAttempts ( //
// Adjust the attempt order in NVR.
//
- for (; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {
+ for ( ; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {
for (Indexj = 0; Indexj < AttemptConfigOrderSize / sizeof (UINT8); Indexj++) {
if (AttemptConfigOrder[Indexj] != 0) {
AttemptConfigOrderTmp[Index] = AttemptConfigOrder[Indexj];
@@ -2710,7 +2707,6 @@ Exit: return Status;
}
-
/**
Callback function when a user presses "Attempt *" or when a user selects a NIC to
create the new attempt.
@@ -2729,20 +2725,20 @@ Exit: **/
EFI_STATUS
IScsiConfigProcessDefault (
- IN EFI_QUESTION_ID KeyValue,
- IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData
+ IN EFI_QUESTION_ID KeyValue,
+ IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData
)
{
- BOOLEAN NewAttempt;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- UINT8 CurrentAttemptConfigIndex;
- ISCSI_NIC_INFO *NicInfo;
- UINT8 NicIndex;
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
- UINT8 *AttemptConfigOrder;
- UINTN AttemptConfigOrderSize;
- UINTN Index;
- EFI_INPUT_KEY Key;
+ BOOLEAN NewAttempt;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ UINT8 CurrentAttemptConfigIndex;
+ ISCSI_NIC_INFO *NicInfo;
+ UINT8 NicIndex;
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
+ UINT8 *AttemptConfigOrder;
+ UINTN AttemptConfigOrderSize;
+ UINTN Index;
+ EFI_INPUT_KEY Key;
AttemptConfigData = NULL;
//
@@ -2751,14 +2747,15 @@ IScsiConfigProcessDefault ( NewAttempt = FALSE;
if ((KeyValue >= KEY_MAC_ENTRY_BASE) &&
- (KeyValue <= (UINT16) (mPrivate->MaxNic + KEY_MAC_ENTRY_BASE))) {
+ (KeyValue <= (UINT16)(mPrivate->MaxNic + KEY_MAC_ENTRY_BASE)))
+ {
//
// User has pressed "Add an Attempt" and then selects a NIC.
//
NewAttempt = TRUE;
} else if ((KeyValue >= KEY_ATTEMPT_ENTRY_BASE) &&
- (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE))) {
-
+ (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE)))
+ {
//
// User has pressed "Attempt *".
//
@@ -2774,8 +2771,8 @@ IScsiConfigProcessDefault ( //
// Determine which NIC user has selected for the new created attempt.
//
- NicIndex = (UINT8) (KeyValue - KEY_MAC_ENTRY_BASE);
- NicInfo = IScsiGetNicInfoByIndex (NicIndex);
+ NicIndex = (UINT8)(KeyValue - KEY_MAC_ENTRY_BASE);
+ NicInfo = IScsiGetNicInfoByIndex (NicIndex);
if (NicInfo == NULL) {
return EFI_NOT_FOUND;
}
@@ -2796,17 +2793,17 @@ IScsiConfigProcessDefault ( for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {
UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"Attempt %d",
- (UINTN) AttemptConfigOrder[Index]
+ (UINTN)AttemptConfigOrder[Index]
);
GetVariable2 (
- mPrivate->PortString,
- &gEfiIScsiInitiatorNameProtocolGuid,
- (VOID**)&AttemptConfigData,
- NULL
- );
- if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {
+ mPrivate->PortString,
+ &gEfiIScsiInitiatorNameProtocolGuid,
+ (VOID **)&AttemptConfigData,
+ NULL
+ );
+ if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {
continue;
}
@@ -2840,21 +2837,21 @@ IScsiConfigProcessDefault ( ASSERT (AttemptConfigData != NULL);
UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, sizeof (AttemptConfigData->MacString));
AttemptConfigData->NicIndex = NicIndex;
- AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;
//
// Generate OUI-format ISID based on MAC address.
//
CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);
AttemptConfigData->SessionConfigData.IsId[0] =
- (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);
+ (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);
//
// Add the help info for the new attempt.
//
UnicodeSPrint (
mPrivate->PortString,
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d",
MacString,
NicInfo->BusNumber,
@@ -2862,23 +2859,22 @@ IScsiConfigProcessDefault ( NicInfo->FunctionNumber
);
- AttemptConfigData->AttemptTitleHelpToken = HiiSetString (
- mCallbackInfo->RegisteredHandle,
- 0,
- mPrivate->PortString,
- NULL
- );
+ AttemptConfigData->AttemptTitleHelpToken = HiiSetString (
+ mCallbackInfo->RegisteredHandle,
+ 0,
+ mPrivate->PortString,
+ NULL
+ );
if (AttemptConfigData->AttemptTitleHelpToken == 0) {
FreePool (AttemptConfigData);
return EFI_OUT_OF_RESOURCES;
}
-
} else {
//
// Determine which Attempt user has selected to configure.
// Get the attempt configuration data.
//
- CurrentAttemptConfigIndex = (UINT8) (KeyValue - KEY_ATTEMPT_ENTRY_BASE);
+ CurrentAttemptConfigIndex = (UINT8)(KeyValue - KEY_ATTEMPT_ENTRY_BASE);
AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (CurrentAttemptConfigIndex);
if (AttemptConfigData == NULL) {
@@ -2907,7 +2903,6 @@ IScsiConfigProcessDefault ( return EFI_SUCCESS;
}
-
/**
This function allows the caller to request the current
@@ -2982,23 +2977,23 @@ IScsiConfigProcessDefault ( EFI_STATUS
EFIAPI
IScsiFormExtractConfig (
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
- IN CONST EFI_STRING Request,
- OUT EFI_STRING *Progress,
- OUT EFI_STRING *Results
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
+ IN CONST EFI_STRING Request,
+ OUT EFI_STRING *Progress,
+ OUT EFI_STRING *Results
)
{
- EFI_STATUS Status;
- CHAR8 *InitiatorName;
- UINTN BufferSize;
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
- ISCSI_FORM_CALLBACK_INFO *Private;
- EFI_STRING ConfigRequestHdr;
- EFI_STRING ConfigRequest;
- BOOLEAN AllocatedRequest;
- UINTN Size;
-
- if (This == NULL || Progress == NULL || Results == NULL) {
+ EFI_STATUS Status;
+ CHAR8 *InitiatorName;
+ UINTN BufferSize;
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
+ ISCSI_FORM_CALLBACK_INFO *Private;
+ EFI_STRING ConfigRequestHdr;
+ EFI_STRING ConfigRequest;
+ BOOLEAN AllocatedRequest;
+ UINTN Size;
+
+ if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -3012,14 +3007,13 @@ IScsiFormExtractConfig ( AllocatedRequest = FALSE;
Size = 0;
- Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);
+ Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);
IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));
if (IfrNvData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
- if (Private->Current!= NULL) {
+ if (Private->Current != NULL) {
IScsiConvertAttemptConfigDataToIfrNvData (Private->Current, IfrNvData);
}
@@ -3029,7 +3023,7 @@ IScsiFormExtractConfig ( IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (IfrNvData);
BufferSize = ISCSI_NAME_MAX_SIZE;
- InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);
+ InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);
if (InitiatorName == NULL) {
FreePool (IfrNvData);
return EFI_OUT_OF_RESOURCES;
@@ -3049,7 +3043,7 @@ IScsiFormExtractConfig ( //
// Convert buffer data to <ConfigResp> by helper function BlockToConfig().
//
- BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);
+ BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);
ConfigRequest = Request;
if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {
//
@@ -3058,13 +3052,14 @@ IScsiFormExtractConfig ( // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
//
ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);
- Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
- ConfigRequest = AllocateZeroPool (Size);
+ Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
+ ConfigRequest = AllocateZeroPool (Size);
if (ConfigRequest == NULL) {
FreePool (IfrNvData);
FreePool (InitiatorName);
return EFI_OUT_OF_RESOURCES;
}
+
AllocatedRequest = TRUE;
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);
FreePool (ConfigRequestHdr);
@@ -3073,7 +3068,7 @@ IScsiFormExtractConfig ( Status = gHiiConfigRouting->BlockToConfig (
gHiiConfigRouting,
ConfigRequest,
- (UINT8 *) IfrNvData,
+ (UINT8 *)IfrNvData,
BufferSize,
Results,
Progress
@@ -3088,6 +3083,7 @@ IScsiFormExtractConfig ( FreePool (ConfigRequest);
ConfigRequest = NULL;
}
+
//
// Set Progress string to the original request string.
//
@@ -3100,7 +3096,6 @@ IScsiFormExtractConfig ( return Status;
}
-
/**
This function applies changes in a driver's configuration.
@@ -3144,33 +3139,33 @@ IScsiFormExtractConfig ( EFI_STATUS
EFIAPI
IScsiFormRouteConfig (
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
- IN CONST EFI_STRING Configuration,
- OUT EFI_STRING *Progress
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
+ IN CONST EFI_STRING Configuration,
+ OUT EFI_STRING *Progress
)
{
- EFI_STATUS Status;
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- LIST_ENTRY *Entry;
- LIST_ENTRY *NextEntry;
- ISCSI_NIC_INFO *NicInfo;
- EFI_INPUT_KEY Key;
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
- CHAR8 *InitiatorName;
- UINT8 *AttemptList;
- UINTN BufferSize;
- UINTN OffSet;
- UINTN Index;
- UINTN Index2;
-
- Index = 0;
- Index2 = 0;
- NicInfo = NULL;
+ EFI_STATUS Status;
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ LIST_ENTRY *Entry;
+ LIST_ENTRY *NextEntry;
+ ISCSI_NIC_INFO *NicInfo;
+ EFI_INPUT_KEY Key;
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];
+ CHAR8 *InitiatorName;
+ UINT8 *AttemptList;
+ UINTN BufferSize;
+ UINTN OffSet;
+ UINTN Index;
+ UINTN Index2;
+
+ Index = 0;
+ Index2 = 0;
+ NicInfo = NULL;
AttemptList = NULL;
- Status = EFI_SUCCESS;
+ Status = EFI_SUCCESS;
- if (This == NULL || Configuration == NULL || Progress == NULL) {
+ if ((This == NULL) || (Configuration == NULL) || (Progress == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -3189,7 +3184,7 @@ IScsiFormRouteConfig ( }
BufferSize = ISCSI_NAME_MAX_SIZE;
- InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);
+ InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);
if (InitiatorName == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
@@ -3199,22 +3194,22 @@ IScsiFormRouteConfig ( // Convert <ConfigResp> to buffer data by helper function ConfigToBlock().
//
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);
- Status = gHiiConfigRouting->ConfigToBlock (
- gHiiConfigRouting,
- Configuration,
- (UINT8 *) IfrNvData,
- &BufferSize,
- Progress
- );
+ Status = gHiiConfigRouting->ConfigToBlock (
+ gHiiConfigRouting,
+ Configuration,
+ (UINT8 *)IfrNvData,
+ &BufferSize,
+ Progress
+ );
if (EFI_ERROR (Status)) {
goto Exit;
}
if (IfrNvData->InitiatorName[0] != L'\0') {
UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, InitiatorName, ISCSI_NAME_MAX_SIZE);
- BufferSize = AsciiStrSize (InitiatorName);
+ BufferSize = AsciiStrSize (InitiatorName);
- Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);
if (EFI_ERROR (Status)) {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
@@ -3246,14 +3241,14 @@ IScsiFormRouteConfig ( }
if (IfrNvData->ISCSIAddAttemptList[0] != L'\0') {
- Status =IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);
+ Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);
if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Error: The add attempt list is invalid",
- NULL
- );
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Error: The add attempt list is invalid",
+ NULL
+ );
goto Exit;
}
@@ -3261,21 +3256,21 @@ IScsiFormRouteConfig ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
} else if (IfrNvData->ISCSIDeleteAttemptList[0] != L'\0') {
- AttemptList =(UINT8 *) AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));
+ AttemptList = (UINT8 *)AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));
if (AttemptList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
+
Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIDeleteAttemptList, AttemptList, FALSE);
if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Error: The delete attempt list is invalid",
- NULL
- );
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Error: The delete attempt list is invalid",
+ NULL
+ );
goto Exit;
}
@@ -3289,9 +3284,11 @@ IScsiFormRouteConfig ( IfrNvData->DeleteAttemptList[Index2] = 1;
break;
}
- Index ++;
+
+ Index++;
}
- Index2 ++;
+
+ Index2++;
Index = 0;
}
@@ -3301,16 +3298,15 @@ IScsiFormRouteConfig ( }
FreePool (AttemptList);
-
} else if (IfrNvData->ISCSIAttemptOrder[0] != L'\0') {
Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAttemptOrder, IfrNvData->DynamicOrderedList, FALSE);
if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Error: The new attempt order list is invalid",
- NULL
- );
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Error: The new attempt order list is invalid",
+ NULL
+ );
goto Exit;
}
@@ -3318,17 +3314,16 @@ IScsiFormRouteConfig ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
} else if (IfrNvData->ISCSIMacAddr[0] != L'\0') {
NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
IScsiMacAddrToStr (
- &NicInfo->PermanentAddress,
- NicInfo->HwAddressSize,
- NicInfo->VlanId,
- MacString
- );
- if (!StrCmp(MacString, IfrNvData->ISCSIMacAddr)) {
+ &NicInfo->PermanentAddress,
+ NicInfo->HwAddressSize,
+ NicInfo->VlanId,
+ MacString
+ );
+ if (!StrCmp (MacString, IfrNvData->ISCSIMacAddr)) {
mPrivate->CurrentNic = NicInfo->NicIndex;
break;
}
@@ -3338,7 +3333,6 @@ IScsiFormRouteConfig ( Status = EFI_NOT_FOUND;
goto Exit;
}
-
} else {
Status = IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (IfrNvData, OffSet);
if (EFI_ERROR (Status)) {
@@ -3389,28 +3383,28 @@ Exit: EFI_STATUS
EFIAPI
IScsiFormCallback (
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
- IN EFI_BROWSER_ACTION Action,
- IN EFI_QUESTION_ID QuestionId,
- IN UINT8 Type,
- IN OUT EFI_IFR_TYPE_VALUE *Value,
- OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
+ IN EFI_BROWSER_ACTION Action,
+ IN EFI_QUESTION_ID QuestionId,
+ IN UINT8 Type,
+ IN OUT EFI_IFR_TYPE_VALUE *Value,
+ OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
)
{
- ISCSI_FORM_CALLBACK_INFO *Private;
- UINTN BufferSize;
- CHAR8 *IScsiName;
- CHAR8 IpString[ISCSI_NAME_MAX_SIZE];
- CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];
- UINT64 Lun;
- EFI_IP_ADDRESS HostIp;
- EFI_IP_ADDRESS SubnetMask;
- EFI_IP_ADDRESS Gateway;
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
- ISCSI_CONFIG_IFR_NVDATA OldIfrNvData;
- EFI_STATUS Status;
- EFI_INPUT_KEY Key;
- ISCSI_NIC_INFO *NicInfo;
+ ISCSI_FORM_CALLBACK_INFO *Private;
+ UINTN BufferSize;
+ CHAR8 *IScsiName;
+ CHAR8 IpString[ISCSI_NAME_MAX_SIZE];
+ CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];
+ UINT64 Lun;
+ EFI_IP_ADDRESS HostIp;
+ EFI_IP_ADDRESS SubnetMask;
+ EFI_IP_ADDRESS Gateway;
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
+ ISCSI_CONFIG_IFR_NVDATA OldIfrNvData;
+ EFI_STATUS Status;
+ EFI_INPUT_KEY Key;
+ ISCSI_NIC_INFO *NicInfo;
NicInfo = NULL;
@@ -3439,12 +3433,12 @@ IScsiFormCallback ( //
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);
- IfrNvData = AllocateZeroPool (BufferSize);
+ IfrNvData = AllocateZeroPool (BufferSize);
if (IfrNvData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- IScsiName = (CHAR8 *) AllocateZeroPool (ISCSI_NAME_MAX_SIZE);
+ IScsiName = (CHAR8 *)AllocateZeroPool (ISCSI_NAME_MAX_SIZE);
if (IScsiName == NULL) {
FreePool (IfrNvData);
return EFI_OUT_OF_RESOURCES;
@@ -3454,332 +3448,334 @@ IScsiFormCallback ( ZeroMem (&OldIfrNvData, BufferSize);
- HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData);
+ HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData);
CopyMem (&OldIfrNvData, IfrNvData, BufferSize);
if (Action == EFI_BROWSER_ACTION_CHANGING) {
switch (QuestionId) {
- case KEY_ADD_ATTEMPT:
- //
- // Check whether iSCSI initiator name is configured already.
- //
- mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;
- Status = gIScsiInitiatorName.Get (
- &gIScsiInitiatorName,
- &mPrivate->InitiatorNameLength,
- mPrivate->InitiatorName
- );
- if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Error: please configure iSCSI initiator name first!",
- NULL
- );
- break;
- }
+ case KEY_ADD_ATTEMPT:
+ //
+ // Check whether iSCSI initiator name is configured already.
+ //
+ mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;
+ Status = gIScsiInitiatorName.Get (
+ &gIScsiInitiatorName,
+ &mPrivate->InitiatorNameLength,
+ mPrivate->InitiatorName
+ );
+ if (EFI_ERROR (Status)) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Error: please configure iSCSI initiator name first!",
+ NULL
+ );
+ break;
+ }
- Status = IScsiConfigAddAttempt ();
- break;
+ Status = IScsiConfigAddAttempt ();
+ break;
- case KEY_DELETE_ATTEMPT:
- CopyMem (
- OldIfrNvData.DeleteAttemptList,
- IfrNvData->DeleteAttemptList,
- sizeof (IfrNvData->DeleteAttemptList)
- );
- Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);
- break;
+ case KEY_DELETE_ATTEMPT:
+ CopyMem (
+ OldIfrNvData.DeleteAttemptList,
+ IfrNvData->DeleteAttemptList,
+ sizeof (IfrNvData->DeleteAttemptList)
+ );
+ Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);
+ break;
- case KEY_ORDER_ATTEMPT_CONFIG:
- //
- // Order the attempt according to user input.
- //
- CopyMem (
- OldIfrNvData.DynamicOrderedList,
- IfrNvData->DynamicOrderedList,
- sizeof (IfrNvData->DynamicOrderedList)
- );
- IScsiConfigDisplayOrderAttempts ();
- break;
+ case KEY_ORDER_ATTEMPT_CONFIG:
+ //
+ // Order the attempt according to user input.
+ //
+ CopyMem (
+ OldIfrNvData.DynamicOrderedList,
+ IfrNvData->DynamicOrderedList,
+ sizeof (IfrNvData->DynamicOrderedList)
+ );
+ IScsiConfigDisplayOrderAttempts ();
+ break;
- default:
- Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);
- break;
+ default:
+ Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);
+ break;
}
} else if (Action == EFI_BROWSER_ACTION_CHANGED) {
switch (QuestionId) {
- case KEY_INITIATOR_NAME:
- UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);
- BufferSize = AsciiStrSize (IScsiName);
+ case KEY_INITIATOR_NAME:
+ UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);
+ BufferSize = AsciiStrSize (IScsiName);
- Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);
- if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid iSCSI Name!",
- NULL
- );
- }
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);
+ if (EFI_ERROR (Status)) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Invalid iSCSI Name!",
+ NULL
+ );
+ }
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
- break;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
+ break;
- case KEY_SAVE_ATTEMPT_CONFIG:
- Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);
- if (EFI_ERROR (Status)) {
+ case KEY_SAVE_ATTEMPT_CONFIG:
+ Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);
+ if (EFI_ERROR (Status)) {
+ break;
+ }
+
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
- }
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
- break;
+ case KEY_SAVE_ORDER_CHANGES:
+ //
+ // Sync the Attempt Order to NVR.
+ //
+ Status = IScsiConfigOrderAttempts (IfrNvData);
+ if (EFI_ERROR (Status)) {
+ break;
+ }
- case KEY_SAVE_ORDER_CHANGES:
- //
- // Sync the Attempt Order to NVR.
- //
- Status = IScsiConfigOrderAttempts (IfrNvData);
- if (EFI_ERROR (Status)) {
+ IScsiConfigUpdateAttempt ();
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
- }
- IScsiConfigUpdateAttempt ();
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
- break;
+ case KEY_IGNORE_ORDER_CHANGES:
+ CopyMem (
+ IfrNvData->DynamicOrderedList,
+ OldIfrNvData.DynamicOrderedList,
+ sizeof (IfrNvData->DynamicOrderedList)
+ );
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;
+ break;
- case KEY_IGNORE_ORDER_CHANGES:
- CopyMem (
- IfrNvData->DynamicOrderedList,
- OldIfrNvData.DynamicOrderedList,
- sizeof (IfrNvData->DynamicOrderedList)
- );
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;
- break;
+ case KEY_SAVE_DELETE_ATTEMPT:
+ //
+ // Delete the Attempt Order from NVR
+ //
+ Status = IScsiConfigDeleteAttempts (IfrNvData);
+ if (EFI_ERROR (Status)) {
+ break;
+ }
- case KEY_SAVE_DELETE_ATTEMPT:
- //
- // Delete the Attempt Order from NVR
- //
- Status = IScsiConfigDeleteAttempts (IfrNvData);
- if (EFI_ERROR (Status)) {
+ IScsiConfigUpdateAttempt ();
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
- }
- IScsiConfigUpdateAttempt ();
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
- break;
+ case KEY_IGNORE_DELETE_ATTEMPT:
+ CopyMem (
+ IfrNvData->DeleteAttemptList,
+ OldIfrNvData.DeleteAttemptList,
+ sizeof (IfrNvData->DeleteAttemptList)
+ );
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;
+ break;
- case KEY_IGNORE_DELETE_ATTEMPT:
- CopyMem (
- IfrNvData->DeleteAttemptList,
- OldIfrNvData.DeleteAttemptList,
- sizeof (IfrNvData->DeleteAttemptList)
- );
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;
- break;
+ case KEY_IP_MODE:
+ switch (Value->u8) {
+ case IP_MODE_IP6:
+ NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);
+ if (NicInfo == NULL) {
+ break;
+ }
+
+ if (!NicInfo->Ipv6Available) {
+ //
+ // Current NIC doesn't Support IPv6, hence use IPv4.
+ //
+ IfrNvData->IpMode = IP_MODE_IP4;
+
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Current NIC doesn't Support IPv6!",
+ NULL
+ );
+ }
+
+ case IP_MODE_IP4:
+ ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));
+ ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));
+ ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));
+ ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));
+ Private->Current->AutoConfigureMode = 0;
+ ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));
+ ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));
+ ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));
+ ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));
- case KEY_IP_MODE:
- switch (Value->u8) {
- case IP_MODE_IP6:
- NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);
- if(NicInfo == NULL) {
- break;
+ break;
}
- if(!NicInfo->Ipv6Available) {
- //
- // Current NIC doesn't Support IPv6, hence use IPv4.
- //
- IfrNvData->IpMode = IP_MODE_IP4;
+ break;
+ case KEY_LOCAL_IP:
+ Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);
+ if (EFI_ERROR (Status) ||
+ ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))
+ {
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
&Key,
- L"Current NIC doesn't Support IPv6!",
+ L"Invalid IP address!",
NULL
);
- }
- case IP_MODE_IP4:
- ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));
- ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));
- ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));
- ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));
- Private->Current->AutoConfigureMode = 0;
- ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));
- ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));
- ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));
- ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));
+ Status = EFI_INVALID_PARAMETER;
+ } else {
+ CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));
+ }
break;
- }
- break;
+ case KEY_SUBNET_MASK:
+ Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);
+ if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Invalid Subnet Mask!",
+ NULL
+ );
- case KEY_LOCAL_IP:
- Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);
- if (EFI_ERROR (Status) ||
- ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
- !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid IP address!",
- NULL
- );
+ Status = EFI_INVALID_PARAMETER;
+ } else {
+ CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));
+ }
- Status = EFI_INVALID_PARAMETER;
- } else {
- CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));
- }
+ break;
- break;
+ case KEY_GATE_WAY:
+ Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);
+ if (EFI_ERROR (Status) ||
+ ((Gateway.Addr[0] != 0) &&
+ (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))
+ {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Invalid Gateway!",
+ NULL
+ );
+ Status = EFI_INVALID_PARAMETER;
+ } else {
+ CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));
+ }
- case KEY_SUBNET_MASK:
- Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);
- if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid Subnet Mask!",
- NULL
- );
+ break;
- Status = EFI_INVALID_PARAMETER;
- } else {
- CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));
- }
+ case KEY_TARGET_IP:
+ UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));
+ Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);
+ if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {
+ //
+ // The target is expressed in URL format or an invalid Ip address, just save.
+ //
+ Private->Current->SessionConfigData.DnsMode = TRUE;
+ ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));
+ UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);
+ } else {
+ Private->Current->SessionConfigData.DnsMode = FALSE;
+ CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));
+ }
- break;
+ break;
- case KEY_GATE_WAY:
- Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);
- if (EFI_ERROR (Status) ||
- ((Gateway.Addr[0] != 0) &&
- (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
- !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid Gateway!",
- NULL
- );
- Status = EFI_INVALID_PARAMETER;
- } else {
- CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));
- }
+ case KEY_TARGET_NAME:
+ UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);
+ Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));
+ if (EFI_ERROR (Status)) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Invalid iSCSI Name!",
+ NULL
+ );
+ } else {
+ AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);
+ }
- break;
+ break;
- case KEY_TARGET_IP:
- UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));
- Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);
- if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {
- //
- // The target is expressed in URL format or an invalid Ip address, just save.
- //
- Private->Current->SessionConfigData.DnsMode = TRUE;
- ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));
- UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);
- } else {
- Private->Current->SessionConfigData.DnsMode = FALSE;
- CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));
- }
+ case KEY_DHCP_ENABLE:
+ if (IfrNvData->InitiatorInfoFromDhcp == 0) {
+ IfrNvData->TargetInfoFromDhcp = 0;
+ }
- break;
+ break;
- case KEY_TARGET_NAME:
- UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);
- Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));
- if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid iSCSI Name!",
- NULL
- );
- } else {
- AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);
- }
+ case KEY_BOOT_LUN:
+ UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);
+ if (EFI_ERROR (Status)) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"Invalid LUN string!",
+ NULL
+ );
+ } else {
+ CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));
+ }
- break;
+ break;
- case KEY_DHCP_ENABLE:
- if (IfrNvData->InitiatorInfoFromDhcp == 0) {
- IfrNvData->TargetInfoFromDhcp = 0;
- }
+ case KEY_AUTH_TYPE:
+ switch (Value->u8) {
+ case ISCSI_AUTH_TYPE_CHAP:
+ IfrNvData->CHAPType = ISCSI_CHAP_UNI;
+ break;
+ default:
+ break;
+ }
- break;
+ break;
- case KEY_BOOT_LUN:
- UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));
- Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);
- if (EFI_ERROR (Status)) {
- CreatePopUp (
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
- &Key,
- L"Invalid LUN string!",
- NULL
+ case KEY_CHAP_NAME:
+ UnicodeStrToAsciiStrS (
+ IfrNvData->CHAPName,
+ Private->Current->AuthConfigData.CHAP.CHAPName,
+ sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)
);
- } else {
- CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));
- }
-
- break;
-
- case KEY_AUTH_TYPE:
- switch (Value->u8) {
- case ISCSI_AUTH_TYPE_CHAP:
- IfrNvData->CHAPType = ISCSI_CHAP_UNI;
- break;
- default:
break;
- }
-
- break;
- case KEY_CHAP_NAME:
- UnicodeStrToAsciiStrS (
- IfrNvData->CHAPName,
- Private->Current->AuthConfigData.CHAP.CHAPName,
- sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)
- );
- break;
-
- case KEY_CHAP_SECRET:
- UnicodeStrToAsciiStrS (
- IfrNvData->CHAPSecret,
- Private->Current->AuthConfigData.CHAP.CHAPSecret,
- sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)
- );
- break;
+ case KEY_CHAP_SECRET:
+ UnicodeStrToAsciiStrS (
+ IfrNvData->CHAPSecret,
+ Private->Current->AuthConfigData.CHAP.CHAPSecret,
+ sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)
+ );
+ break;
- case KEY_REVERSE_CHAP_NAME:
- UnicodeStrToAsciiStrS (
- IfrNvData->ReverseCHAPName,
- Private->Current->AuthConfigData.CHAP.ReverseCHAPName,
- sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)
- );
- break;
+ case KEY_REVERSE_CHAP_NAME:
+ UnicodeStrToAsciiStrS (
+ IfrNvData->ReverseCHAPName,
+ Private->Current->AuthConfigData.CHAP.ReverseCHAPName,
+ sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)
+ );
+ break;
- case KEY_REVERSE_CHAP_SECRET:
- UnicodeStrToAsciiStrS (
- IfrNvData->ReverseCHAPSecret,
- Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,
- sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)
- );
- break;
+ case KEY_REVERSE_CHAP_SECRET:
+ UnicodeStrToAsciiStrS (
+ IfrNvData->ReverseCHAPSecret,
+ Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,
+ sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)
+ );
+ break;
- case KEY_CONFIG_ISID:
- IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);
- IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);
+ case KEY_CONFIG_ISID:
+ IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);
+ IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);
- break;
+ break;
- default:
- break;
+ default:
+ break;
}
}
@@ -3788,7 +3784,7 @@ IScsiFormCallback ( // Pass changed uncommitted data back to Form Browser.
//
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);
- HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);
+ HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData, NULL);
}
FreePool (IfrNvData);
@@ -3797,7 +3793,6 @@ IScsiFormCallback ( return Status;
}
-
/**
Initialize the iSCSI configuration form.
@@ -3812,16 +3807,16 @@ IScsiConfigFormInit ( IN EFI_HANDLE DriverBindingHandle
)
{
- EFI_STATUS Status;
- ISCSI_FORM_CALLBACK_INFO *CallbackInfo;
+ EFI_STATUS Status;
+ ISCSI_FORM_CALLBACK_INFO *CallbackInfo;
- CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));
+ CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *)AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));
if (CallbackInfo == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- CallbackInfo->Signature = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;
- CallbackInfo->Current = NULL;
+ CallbackInfo->Signature = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;
+ CallbackInfo->Current = NULL;
CallbackInfo->ConfigAccess.ExtractConfig = IScsiFormExtractConfig;
CallbackInfo->ConfigAccess.RouteConfig = IScsiFormRouteConfig;
@@ -3859,7 +3854,7 @@ IScsiConfigFormInit ( &CallbackInfo->ConfigAccess,
NULL
);
- FreePool(CallbackInfo);
+ FreePool (CallbackInfo);
return EFI_OUT_OF_RESOURCES;
}
@@ -3868,7 +3863,6 @@ IScsiConfigFormInit ( return EFI_SUCCESS;
}
-
/**
Unload the iSCSI configuration form, this includes: delete all the iSCSI
configuration entries, uninstall the form callback protocol, and
@@ -3885,13 +3879,13 @@ IScsiConfigFormUnload ( IN EFI_HANDLE DriverBindingHandle
)
{
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
- ISCSI_NIC_INFO *NicInfo;
- LIST_ENTRY *Entry;
- EFI_STATUS Status;
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;
+ ISCSI_NIC_INFO *NicInfo;
+ LIST_ENTRY *Entry;
+ EFI_STATUS Status;
while (!IsListEmpty (&mPrivate->AttemptConfigs)) {
- Entry = NetListRemoveHead (&mPrivate->AttemptConfigs);
+ Entry = NetListRemoveHead (&mPrivate->AttemptConfigs);
AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);
FreePool (AttemptConfigData);
mPrivate->AttemptCount--;
@@ -3900,7 +3894,7 @@ IScsiConfigFormUnload ( ASSERT (mPrivate->AttemptCount == 0);
while (!IsListEmpty (&mPrivate->NicInfoList)) {
- Entry = NetListRemoveHead (&mPrivate->NicInfoList);
+ Entry = NetListRemoveHead (&mPrivate->NicInfoList);
NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
FreePool (NicInfo);
mPrivate->NicCount--;
|