/** @file\r
The implementation of iSCSI protocol based on RFC3720.\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
&Conn->TimeoutEvent\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
return NULL;\r
}\r
\r
// set the default connection-only parameters\r
//\r
Conn->MaxRecvDataSegmentLength = DEFAULT_MAX_RECV_DATA_SEG_LEN;\r
- Conn->HeaderDigest = ISCSI_DIGEST_NONE;\r
- Conn->DataDigest = ISCSI_DIGEST_NONE;\r
+ Conn->HeaderDigest = IScsiDigestNone;\r
+ Conn->DataDigest = IScsiDigestNone;\r
\r
CopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
);\r
if (EFI_ERROR (Status)) {\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
Conn = NULL;\r
}\r
\r
Tcp4IoDestroySocket (&Conn->Tcp4Io);\r
NetbufQueFlush (&Conn->RspQue);\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
}\r
\r
/**\r
\r
@retval EFI_SUCCESS The iSCSI session login procedure finished.\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
+ @retval EFI_NO_MEDIA There was a media error.\r
@retval Others Other errors as indicated.\r
+\r
**/\r
EFI_STATUS\r
IScsiSessionLogin (\r
ISCSI_SESSION *Session;\r
ISCSI_CONNECTION *Conn;\r
EFI_TCP4_PROTOCOL *Tcp4;\r
+ BOOLEAN MediaPresent;\r
\r
Session = &Private->Session;\r
\r
+ //\r
+ // Check media status before session login\r
+ //\r
+ MediaPresent = TRUE;\r
+ NetLibDetectMedia (Private->Controller, &MediaPresent);\r
+ if (!MediaPresent) {\r
+ return EFI_NO_MEDIA;\r
+ }\r
+\r
+ //\r
+ // Set session identifier\r
+ //\r
+ CopyMem (Session->Isid, Session->ConfigData.NvData.IsId, 6);\r
+\r
//\r
// Create a connection for the session.\r
//\r
//\r
// A Login Response is received, process it.\r
//\r
+ ASSERT (Pdu != NULL);\r
Status = IScsiProcessLoginRsp (Conn, Pdu);\r
\r
NetbufFree (Pdu);\r
}\r
\r
LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufAllocSpace (Nbuf, sizeof (ISCSI_LOGIN_REQUEST), NET_BUF_TAIL);\r
+ ASSERT (LoginReq != NULL);\r
ZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));\r
\r
//\r
LoginRsp->MaxCmdSN = NTOHL (LoginRsp->MaxCmdSN);\r
\r
if ((Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION) && (Conn->CHAPStep == ISCSI_CHAP_INITIAL)) {\r
+ //\r
+ // If the Login Request is a leading Login Request, the target MUST use\r
+ // the value presented in CmdSN as the target value for ExpCmdSN.\r
+ //\r
+ if ((Session->State == SESSION_STATE_FREE) && (Session->CmdSN != LoginRsp->ExpCmdSN)) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
+\r
//\r
// It's the initial Login Response, initialize the local ExpStatSN, MaxCmdSN\r
// and ExpCmdSN.\r
@param[in] Arg The opaque parameter.\r
**/\r
VOID\r
+EFIAPI\r
IScsiFreeNbufList (\r
VOID *Arg\r
)\r
ASSERT (Arg != NULL);\r
\r
NetbufFreeList ((LIST_ENTRY *) Arg);\r
- gBS->FreePool (Arg);\r
+ FreePool (Arg);\r
}\r
\r
/**\r
@param[in] Arg The opaque parameter.\r
**/\r
VOID\r
+EFIAPI\r
IScsiNbufExtFree (\r
VOID *Arg\r
)\r
NET_BUF *DataSeg;\r
UINT32 PadAndCRC32[2];\r
\r
- NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY));\r
if (NbufList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
Len = sizeof (ISCSI_BASIC_HEADER) + (HeaderDigest ? sizeof (UINT32) : 0);\r
PduHdr = NetbufAlloc (Len);\r
if (PduHdr == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto ON_EXIT;\r
+ FreePool (NbufList);\r
+ return EFI_OUT_OF_RESOURCES;\r
}\r
\r
Header = NetbufAllocSpace (PduHdr, Len, NET_BUF_TAIL);\r
+ ASSERT (Header != NULL);\r
InsertTailList (NbufList, &PduHdr->List);\r
\r
//\r
// The first to receive the useful data. The second to receive the padding.\r
//\r
Fragment[1].Len = PadLen + (DataDigest ? sizeof (UINT32) : 0);\r
- Fragment[1].Bulk = (UINT8 *) ((UINTN) &PadAndCRC32[1] - PadLen);\r
-\r
+ Fragment[1].Bulk = (UINT8 *)PadAndCRC32 + (4 - PadLen);\r
FragmentCount = 2;\r
} else {\r
FragmentCount = 1;\r
//\r
KeyValueList = IScsiBuildKeyValueList (Data, Len);\r
if (KeyValueList == NULL) {\r
- gBS->FreePool (Data);\r
+ FreePool (Data);\r
return Status;\r
}\r
//\r
}\r
\r
if (AsciiStrCmp (Value, "CRC32") == 0) {\r
- if (Conn->HeaderDigest != ISCSI_DIGEST_CRC32) {\r
+ if (Conn->HeaderDigest != IScsiDigestCRC32) {\r
goto ON_ERROR;\r
}\r
} else if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) == 0) {\r
- Conn->HeaderDigest = ISCSI_DIGEST_NONE;\r
+ Conn->HeaderDigest = IScsiDigestNone;\r
} else {\r
goto ON_ERROR;\r
}\r
}\r
\r
if (AsciiStrCmp (Value, "CRC32") == 0) {\r
- if (Conn->DataDigest != ISCSI_DIGEST_CRC32) {\r
+ if (Conn->DataDigest != IScsiDigestCRC32) {\r
goto ON_ERROR;\r
}\r
} else if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) == 0) {\r
- Conn->DataDigest = ISCSI_DIGEST_NONE;\r
+ Conn->DataDigest = IScsiDigestNone;\r
} else {\r
goto ON_ERROR;\r
}\r
//\r
// FirstBurstLength, result function is Minimum. Irrelevant when InitialR2T=Yes and\r
// ImmediateData=No.\r
+ // This Key/Value is negotiation type.\r
//\r
Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);\r
- if ((Value == NULL) && !(Session->InitialR2T && !Session->ImmediateData)) {\r
+ if (Value == NULL) {\r
goto ON_ERROR;\r
}\r
\r
\r
IScsiFreeKeyValueList (KeyValueList);\r
\r
- gBS->FreePool (Data);\r
+ FreePool (Data);\r
\r
return Status;\r
}\r
\r
Session = Conn->Session;\r
\r
- AsciiSPrint (Value, sizeof (Value), "%a", (Conn->HeaderDigest == ISCSI_DIGEST_CRC32) ? "None,CRC32" : "None");\r
+ AsciiSPrint (Value, sizeof (Value), "%a", (Conn->HeaderDigest == IScsiDigestCRC32) ? "None,CRC32" : "None");\r
IScsiAddKeyValuePair (Pdu, ISCSI_KEY_HEADER_DIGEST, Value);\r
\r
- AsciiSPrint (Value, sizeof (Value), "%a", (Conn->DataDigest == ISCSI_DIGEST_CRC32) ? "None,CRC32" : "None");\r
+ AsciiSPrint (Value, sizeof (Value), "%a", (Conn->DataDigest == IScsiDigestCRC32) ? "None,CRC32" : "None");\r
IScsiAddKeyValuePair (Pdu, ISCSI_KEY_DATA_DIGEST, Value);\r
\r
AsciiSPrint (Value, sizeof (Value), "%d", Session->ErrorRecoveryLevel);\r
LIST_ENTRY *ListHead;\r
ISCSI_KEY_VALUE_PAIR *KeyValuePair;\r
\r
- ListHead = AllocatePool (sizeof (LIST_ENTRY ));\r
+ ListHead = AllocatePool (sizeof (LIST_ENTRY));\r
if (ListHead == NULL) {\r
return NULL;\r
}\r
Data++;\r
Len--;\r
} else {\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
goto ON_ERROR;\r
}\r
\r
Value = KeyValuePair->Value;\r
\r
RemoveEntryList (&KeyValuePair->List);\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
break;\r
}\r
}\r
Entry = NetListRemoveHead (KeyValueList);\r
KeyValuePair = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);\r
\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
}\r
\r
- gBS->FreePool (KeyValueList);\r
+ FreePool (KeyValueList);\r
}\r
\r
/**\r
{\r
RemoveEntryList (&Tcb->Link);\r
\r
- gBS->FreePool (Tcb);\r
+ FreePool (Tcb);\r
}\r
\r
/**\r
}\r
\r
ScsiCmd = (SCSI_COMMAND *) NetbufAllocSpace (PduHeader, Length, NET_BUF_TAIL);\r
+ if (ScsiCmd == NULL) {\r
+ NetbufFree (PduHeader);\r
+ return NULL;\r
+ } \r
Header = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);\r
\r
ZeroMem (ScsiCmd, Length);\r
ScsiCmd->CmdSN = NTOHL (Tcb->CmdSN);\r
ScsiCmd->ExpStatSN = NTOHL (Tcb->Conn->ExpStatSN);\r
\r
- CopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));\r
+ CopyMem (ScsiCmd->Cdb, Packet->Cdb, sizeof (ScsiCmd->Cdb));\r
\r
if (Packet->CdbLength > 16) {\r
- Header->Length = NTOHS (Packet->CdbLength - 15);\r
+ Header->Length = NTOHS ((UINT16) (Packet->CdbLength - 15));\r
Header->Type = ISCSI_AHS_TYPE_EXT_CDB;\r
\r
CopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);\r
goto ON_EXIT;\r
}\r
\r
- NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY));\r
if (NbufList == NULL) {\r
NetbufFree (PduHeader);\r
NetbufFree (DataSeg);\r
) {\r
//\r
// Unsolicited data out sequence is not allowed,\r
- // or FirstBustLength data is already sent out by immediate data\r
+ // or FirstBurstLength data is already sent out by immediate data\r
// or all the OUT data accompany this SCSI packet is sent as\r
// immediate data, the final flag should be set on this SCSI Command\r
// PDU.\r
ISCSI_SCSI_DATA_OUT *DataOutHdr;\r
ISCSI_XFER_CONTEXT *XferContext;\r
\r
- NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY));\r
if (NbufList == NULL) {\r
return NULL;\r
}\r
//\r
PduHdr = NetbufAlloc (sizeof (ISCSI_SCSI_DATA_OUT));\r
if (PduHdr == NULL) {\r
- gBS->FreePool (NbufList);\r
+ FreePool (NbufList);\r
return NULL;\r
}\r
//\r
InsertTailList (NbufList, &PduHdr->List);\r
\r
DataOutHdr = (ISCSI_SCSI_DATA_OUT *) NetbufAllocSpace (PduHdr, sizeof (ISCSI_SCSI_DATA_OUT), NET_BUF_TAIL);\r
+ ASSERT (DataOutHdr != NULL);\r
XferContext = &Tcb->XferContext;\r
\r
ZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));\r
ISCSI_CONNECTION *Conn;\r
ISCSI_XFER_CONTEXT *XferContext;\r
\r
- PduList = AllocatePool (sizeof (LIST_ENTRY ));\r
+ PduList = AllocatePool (sizeof (LIST_ENTRY));\r
if (PduList == NULL) {\r
return NULL;\r
}\r
R2THdr->InitiatorTaskTag = NTOHL (R2THdr->InitiatorTaskTag);\r
R2THdr->TargetTransferTag = NTOHL (R2THdr->TargetTransferTag);\r
R2THdr->StatSN = NTOHL (R2THdr->StatSN);\r
- R2THdr->R2TSN = NTOHL (R2THdr->R2TSN);\r
+ R2THdr->R2TSeqNum = NTOHL (R2THdr->R2TSeqNum);\r
R2THdr->BufferOffset = NTOHL (R2THdr->BufferOffset);\r
R2THdr->DesiredDataTransferLength = NTOHL (R2THdr->DesiredDataTransferLength);\r
\r
//\r
// Check the sequence number.\r
//\r
- Status = IScsiCheckSN (&Tcb->ExpDataSN, R2THdr->R2TSN);\r
+ Status = IScsiCheckSN (&Tcb->ExpDataSN, R2THdr->R2TSeqNum);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
IN BOOLEAN Recovery\r
)\r
{\r
- UINT32 Random;\r
-\r
if (!Recovery) {\r
Session->Signature = ISCSI_SESSION_SIGNATURE;\r
Session->State = SESSION_STATE_FREE;\r
\r
- Random = NET_RANDOM (NetRandomInitSeed ());\r
-\r
- Session->Isid[0] = ISID_BYTE_0;\r
- Session->Isid[1] = ISID_BYTE_1;\r
- Session->Isid[2] = ISID_BYTE_2;\r
- Session->Isid[3] = ISID_BYTE_3;\r
- Session->Isid[4] = (UINT8) Random;\r
- Session->Isid[5] = (UINT8) (Random >> 8);\r
-\r
InitializeListHead (&Session->Conns);\r
InitializeListHead (&Session->TcbList);\r
}\r
projects / mirror_edk2.git / blobdiff