/** @file\r
The implementation of iSCSI protocol based on RFC3720.\r
\r
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2014, 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
Conn->PartialRspRcvd = FALSE;\r
Conn->ParamNegotiated = FALSE;\r
Conn->Cid = Session->NextCid++;\r
- Conn->Ipv6Flag = mPrivate->Ipv6Flag;\r
+ Conn->Ipv6Flag = NvData->IpMode == IP_MODE_IP6 || Session->ConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6;\r
\r
Status = gBS->CreateEvent (\r
EVT_TIMER,\r
CopyMem (&Tcp4IoConfig->Gateway, &NvData->Gateway, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Tcp4IoConfig->RemoteIp, &NvData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
\r
- Tcp4IoConfig->RemotePort = NvData->TargetPort;\r
- Tcp4IoConfig->ActiveFlag = TRUE;\r
-\r
+ Tcp4IoConfig->RemotePort = NvData->TargetPort;\r
+ Tcp4IoConfig->ActiveFlag = TRUE;\r
+ Tcp4IoConfig->StationPort = 0;\r
} else {\r
Tcp6IoConfig = &TcpIoConfig.Tcp6IoConfigData;\r
\r
CopyMem (&Tcp6IoConfig->RemoteIp, &NvData->TargetIp, sizeof (EFI_IPv6_ADDRESS));\r
- Tcp6IoConfig->RemotePort = NvData->TargetPort;\r
- Tcp6IoConfig->ActiveFlag = TRUE;\r
+ Tcp6IoConfig->RemotePort = NvData->TargetPort;\r
+ Tcp6IoConfig->ActiveFlag = TRUE;\r
+ Tcp6IoConfig->StationPort = 0;\r
}\r
\r
//\r
if (!EFI_ERROR (Status)) {\r
Session->State = SESSION_STATE_LOGGED_IN;\r
\r
- if (!mPrivate->Ipv6Flag) {\r
+ if (!Conn->Ipv6Flag) {\r
ProtocolGuid = &gEfiTcp4ProtocolGuid; \r
} else {\r
ProtocolGuid = &gEfiTcp6ProtocolGuid;\r
\r
ASSERT_EFI_ERROR (Status);\r
\r
- if (mPrivate->Ipv6Flag) {\r
+ if (Conn->Ipv6Flag) {\r
Status = IScsiGetIp6NicInfo (Conn);\r
}\r
}\r
EFI_STATUS Status;\r
NET_BUF *Pdu;\r
\r
+ Pdu = NULL;\r
+\r
//\r
// Receive the iSCSI login response.\r
//\r
@retval EFI_DEVICE_ERROR Session state was not as required.\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
@retval EFI_PROTOCOL_ERROR There is no such data in the net buffer.\r
+ @retval EFI_NOT_READY The target can not accept new commands.\r
@retval Others Other errors as indicated.\r
\r
**/\r
Timeout = 0;\r
\r
if (Session->State != SESSION_STATE_LOGGED_IN) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto ON_EXIT;\r
}\r
\r
Conn = NET_LIST_USER_STRUCT_S (\r
IScsiDelTcb (Tcb);\r
}\r
\r
- if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_READY)) {\r
- //\r
- // Reinstate the session.\r
- //\r
- if (EFI_ERROR (IScsiSessionReinstatement (Session))) {\r
- Status = EFI_DEVICE_ERROR;\r
- }\r
- }\r
-\r
return Status;\r
}\r
\r
{\r
EFI_STATUS Status;\r
\r
- ASSERT (Session->State == SESSION_STATE_LOGGED_IN);\r
+ ASSERT (Session->State != SESSION_STATE_FREE);\r
\r
//\r
// Abort the session and re-init it.\r