X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FIScsiDxe%2FIScsiMisc.c;h=2e43b415ec593b899d16426991d0aca73229805f;hp=dc9c7a7af17324a9aaba368737eb185cf642700e;hb=25a516ab1a9dfccf2b71ec15771e99192c307418;hpb=c5de0d5599d8833c511d8668583ee2d4fe5643fc
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index dc9c7a7af1..2e43b415ec 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -1,8 +1,8 @@
/** @file
- Miscellaneous routines for IScsi driver.
+ Miscellaneous routines for iSCSI driver.
-Copyright (c) 2004 - 2008, Intel Corporation.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
@@ -94,7 +94,7 @@ IScsiGetSubnetMaskPrefixLength (
//
ReverseMask = ~ReverseMask;
- if ((ReverseMask != 0) & ((ReverseMask + 1) != 0)) {
+ if ((ReverseMask & (ReverseMask + 1)) != 0) {
return 0;
}
@@ -123,55 +123,64 @@ IScsiAsciiStrToLun (
OUT UINT8 *Lun
)
{
- UINT32 Index;
- CHAR8 *LunUnitStr[4];
- CHAR8 Digit;
- UINTN Temp;
-
+ UINTN Index, IndexValue, IndexNum, SizeStr;
+ CHAR8 TemStr[2];
+ UINT8 TemValue;
+ UINT16 Value[4];
+
ZeroMem (Lun, 8);
- ZeroMem (LunUnitStr, sizeof (LunUnitStr));
-
- Index = 0;
- LunUnitStr[0] = Str;
-
- if (!IsHexDigit ((UINT8 *) &Digit, *Str)) {
- return EFI_INVALID_PARAMETER;
- }
-
- while (*Str != '\0') {
- //
- // Legal representations of LUN:
- // 4752-3A4F-6b7e-2F99,
- // 6734-9-156f-127,
- // 4186-9
- //
- if (*Str == '-') {
- *Str = '\0';
- Index++;
-
- if (*(Str + 1) != '\0') {
- if (!IsHexDigit ((UINT8 *) &Digit, *(Str + 1))) {
- return EFI_INVALID_PARAMETER;
- }
-
- LunUnitStr[Index] = Str + 1;
+ ZeroMem (TemStr, 2);
+ ZeroMem ((UINT8 *) Value, sizeof (Value));
+ SizeStr = AsciiStrLen (Str);
+ IndexValue = 0;
+ IndexNum = 0;
+
+ for (Index = 0; Index < SizeStr; Index ++) {
+ TemStr[0] = Str[Index];
+ TemValue = (UINT8) AsciiStrHexToUint64 (TemStr);
+ if (TemValue == 0 && TemStr[0] != '0') {
+ if ((TemStr[0] != '-') || (IndexNum == 0)) {
+ //
+ // Invalid Lun Char
+ //
+ return EFI_INVALID_PARAMETER;
}
- } else if (!IsHexDigit ((UINT8 *) &Digit, *Str)) {
- return EFI_INVALID_PARAMETER;
}
-
- Str++;
- }
-
- for (Index = 0; (Index < 4) && (LunUnitStr[Index] != NULL); Index++) {
- if (AsciiStrLen (LunUnitStr[Index]) > 4) {
+
+ if ((TemValue == 0) && (TemStr[0] == '-')) {
+ //
+ // Next Lun value
+ //
+ if (++IndexValue >= 4) {
+ //
+ // Max 4 Lun value
+ //
+ return EFI_INVALID_PARAMETER;
+ }
+ //
+ // Restart str index for the next lun value
+ //
+ IndexNum = 0;
+ continue;
+ }
+
+ if (++IndexNum > 4) {
+ //
+ // Each Lun Str can't exceed size 4, because it will be as UINT16 value
+ //
return EFI_INVALID_PARAMETER;
}
-
- Temp = AsciiStrHexToUintn (LunUnitStr[Index]);
- *((UINT16 *) &Lun[Index * 2]) = HTONS (Temp);
+
+ //
+ // Combine UINT16 value
+ //
+ Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);
}
-
+
+ for (Index = 0; Index <= IndexValue; Index ++) {
+ *((UINT16 *) &Lun[Index * 2]) = HTONS (Value[Index]);
+ }
+
return EFI_SUCCESS;
}
@@ -344,18 +353,21 @@ IScsiAsciiStrToIp (
/**
Convert the mac address into a hexadecimal encoded "-" seperated string.
- @param[in] Mac The mac address.
- @param[in] Len Length in bytes of the mac address.
- @param[out] Str The storage to return the mac string.
+ @param[in] Mac The mac address.
+ @param[in] Len Length in bytes of the mac address.
+ @param[in] VlanId VLAN ID of the network device.
+ @param[out] Str The storage to return the mac string.
**/
VOID
IScsiMacAddrToStr (
IN EFI_MAC_ADDRESS *Mac,
IN UINT32 Len,
+ IN UINT16 VlanId,
OUT CHAR16 *Str
)
{
UINT32 Index;
+ CHAR16 *String;
for (Index = 0; Index < Len; Index++) {
Str[3 * Index] = (CHAR16) IScsiHexString[(Mac->Addr[Index] >> 4) & 0x0F];
@@ -363,7 +375,12 @@ IScsiMacAddrToStr (
Str[3 * Index + 2] = L'-';
}
- Str[3 * Index - 1] = L'\0';
+ String = &Str[3 * Index - 1] ;
+ if (VlanId != 0) {
+ String += UnicodeSPrint (String, 6 * sizeof (CHAR16), L"\\%04x", (UINTN) VlanId);
+ }
+
+ *String = L'\0';
}
/**
@@ -434,52 +451,38 @@ IScsiHexToBin (
)
{
UINTN Index;
- UINT32 HexCount;
- CHAR8 *HexBuf;
+ UINTN Length;
UINT8 Digit;
- UINT8 Byte;
-
- Digit = 0;
+ CHAR8 TemStr[2];
+
+ ZeroMem (TemStr, sizeof (TemStr));
//
// Find out how many hex characters the string has.
//
- HexBuf = HexStr;
- if ((HexBuf[0] == '0') && ((HexBuf[1] == 'x') || (HexBuf[1] == 'X'))) {
- HexBuf += 2;
+ if ((HexStr[0] == '0') && ((HexStr[1] == 'x') || (HexStr[1] == 'X'))) {
+ HexStr += 2;
}
+
+ Length = AsciiStrLen (HexStr);
- for (Index = 0, HexCount = 0; IsHexDigit (&Digit, HexBuf[Index]); Index++, HexCount++)
- ;
-
- if (HexCount == 0) {
- *BinLength = 0;
- return EFI_SUCCESS;
- }
- //
- // Test if buffer is passed enough.
- //
- if (((HexCount + 1) / 2) > *BinLength) {
- *BinLength = (HexCount + 1) / 2;
- return EFI_BUFFER_TOO_SMALL;
- }
-
- *BinLength = (HexCount + 1) / 2;
-
- for (Index = 0; Index < HexCount; Index++) {
-
- IsHexDigit (&Digit, HexBuf[HexCount - 1 - Index]);
-
+ for (Index = 0; Index < Length; Index ++) {
+ TemStr[0] = HexStr[Index];
+ Digit = (UINT8) AsciiStrHexToUint64 (TemStr);
+ if (Digit == 0 && TemStr[0] != '0') {
+ //
+ // Invalid Lun Char
+ //
+ break;
+ }
if ((Index & 1) == 0) {
- Byte = Digit;
+ BinBuffer [Index/2] = Digit;
} else {
- Byte = BinBuffer[*BinLength - 1 - Index / 2];
- Byte &= 0x0F;
- Byte = (UINT8) (Byte | (Digit << 4));
+ BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);
}
-
- BinBuffer[*BinLength - 1 - Index / 2] = Byte;
}
+
+ *BinLength = (UINT32) ((Index + 1)/2);
return EFI_SUCCESS;
}
@@ -536,15 +539,16 @@ IScsiCreateDriverData (
// Create an event to be signal when the BS to RT transition is triggerd so
// as to abort the iSCSI session.
//
- Status = gBS->CreateEvent (
- EVT_SIGNAL_EXIT_BOOT_SERVICES,
+ Status = gBS->CreateEventEx (
+ EVT_NOTIFY_SIGNAL,
TPL_CALLBACK,
IScsiOnExitBootService,
Private,
+ &gEfiEventExitBootServicesGuid,
&Private->ExitBootServiceEvent
);
if (EFI_ERROR (Status)) {
- gBS->FreePool (Private);
+ FreePool (Private);
return NULL;
}
@@ -569,7 +573,7 @@ IScsiCreateDriverData (
);
if (EFI_ERROR (Status)) {
gBS->CloseEvent (Private->ExitBootServiceEvent);
- gBS->FreePool (Private);
+ FreePool (Private);
return NULL;
}
@@ -596,7 +600,7 @@ IScsiCleanDriverData (
Private->DevicePath
);
- gBS->FreePool (Private->DevicePath);
+ FreePool (Private->DevicePath);
}
if (Private->ExtScsiPassThruHandle != NULL) {
@@ -609,7 +613,60 @@ IScsiCleanDriverData (
gBS->CloseEvent (Private->ExitBootServiceEvent);
- gBS->FreePool (Private);
+ FreePool (Private);
+}
+
+/**
+ Check wheather the Controller is configured to use DHCP protocol.
+
+ @param[in] Controller The handle of the controller.
+
+ @retval TRUE The handle of the controller need the Dhcp protocol.
+ @retval FALSE The handle of the controller does not need the Dhcp protocol.
+
+**/
+BOOLEAN
+IScsiDhcpIsConfigured (
+ IN EFI_HANDLE Controller
+ )
+{
+ EFI_STATUS Status;
+ EFI_MAC_ADDRESS MacAddress;
+ UINTN HwAddressSize;
+ UINT16 VlanId;
+ CHAR16 MacString[70];
+ ISCSI_SESSION_CONFIG_NVDATA *ConfigDataTmp;
+
+ //
+ // Get the mac string, it's the name of various variable
+ //
+ Status = NetLibGetMacAddress (Controller, &MacAddress, &HwAddressSize);
+ if (EFI_ERROR (Status)) {
+ return FALSE;
+ }
+ VlanId = NetLibGetVlanId (Controller);
+ IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);
+
+ //
+ // Get the normal configuration.
+ //
+ Status = GetVariable2 (
+ MacString,
+ &gEfiIScsiInitiatorNameProtocolGuid,
+ (VOID**)&ConfigDataTmp,
+ NULL
+ );
+ if (ConfigDataTmp == NULL || EFI_ERROR (Status)) {
+ return FALSE;
+ }
+
+ if (ConfigDataTmp->Enabled && ConfigDataTmp->InitiatorInfoFromDhcp) {
+ FreePool (ConfigDataTmp);
+ return TRUE;
+ }
+
+ FreePool (ConfigDataTmp);
+ return FALSE;
}
/**
@@ -629,9 +686,10 @@ IScsiGetConfigData (
EFI_STATUS Status;
ISCSI_SESSION *Session;
UINTN BufferSize;
- EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
- EFI_SIMPLE_NETWORK_MODE *Mode;
- CHAR16 MacString[65];
+ EFI_MAC_ADDRESS MacAddress;
+ UINTN HwAddressSize;
+ UINT16 VlanId;
+ CHAR16 MacString[70];
//
// get the iSCSI Initiator Name
@@ -647,21 +705,13 @@ IScsiGetConfigData (
return Status;
}
- Status = gBS->HandleProtocol (
- Private->Controller,
- &gEfiSimpleNetworkProtocolGuid,
- (VOID **)&Snp
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- Mode = Snp->Mode;
-
//
// Get the mac string, it's the name of various variable
//
- IScsiMacAddrToStr (&Mode->PermanentAddress, Mode->HwAddressSize, MacString);
+ Status = NetLibGetMacAddress (Private->Controller, &MacAddress, &HwAddressSize);
+ ASSERT (Status == EFI_SUCCESS);
+ VlanId = NetLibGetVlanId (Private->Controller);
+ IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);
//
// Get the normal configuration.
@@ -687,7 +737,7 @@ IScsiGetConfigData (
BufferSize = sizeof (Session->AuthData.AuthConfig);
Status = gRT->GetVariable (
MacString,
- &mIScsiCHAPAuthInfoGuid,
+ &gIScsiCHAPAuthInfoGuid,
NULL,
&BufferSize,
&Session->AuthData.AuthConfig
@@ -748,6 +798,9 @@ IScsiGetTcpConnDevicePath (
// Duplicate it.
//
DevicePath = DuplicateDevicePath (DevicePath);
+ if (DevicePath == NULL) {
+ return NULL;
+ }
DPathNode = (EFI_DEV_PATH *) DevicePath;
@@ -757,7 +810,19 @@ IScsiGetTcpConnDevicePath (
) {
DPathNode->Ipv4.LocalPort = 0;
- DPathNode->Ipv4.StaticIpAddress = (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
+ DPathNode->Ipv4.StaticIpAddress =
+ (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
+
+ IP4_COPY_ADDRESS (
+ &DPathNode->Ipv4.GatewayIpAddress,
+ &Session->ConfigData.NvData.Gateway
+ );
+
+ IP4_COPY_ADDRESS (
+ &DPathNode->Ipv4.SubnetMask,
+ &Session->ConfigData.NvData.SubnetMask
+ );
+
break;
}