Changeset 33121 in vbox

Timestamp:

Oct 14, 2010 8:54:27 AM (14 years ago)

Author:

vboxsync

Message:

iSCSI: Fix broken disconnect handling

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -3335 +3335 @@
                     case ISCSICMDTYPE_REQ:
                     {
-                        rc = iscsiPDUTxPrepare(pImage, pIScsiCmd);
-                        AssertRC(rc);
+                        /* If there is no connection complete the command with an error. */
+                        if (RT_LIKELY(iscsiIsClientConnected(pImage)))
+                        {
+                            rc = iscsiPDUTxPrepare(pImage, pIScsiCmd);
+                            AssertRC(rc);
+                        }
+                        else
+                            iscsiCmdComplete(pImage, pIScsiCmd, VERR_NET_CONNECTION_REFUSED);
                         break;
                     }
@@ -3694 +3700 @@
             pImage->pvRecvPDUBuf = NULL;
         }
+
+        pImage->cbRecvPDUResidual = 0;
     }
 
@@ -3720 +3728 @@
     fHostIPDef = !!uHostIPTmp;
 
-#if 0
-    if (uOpenFlags & VD_OPEN_FLAGS_ASYNC_IO)
-        return VERR_NOT_SUPPORTED;
-#endif
-
     pImage->uOpenFlags      = uOpenFlags;
 
@@ -3957 +3960 @@
 
     memset(pImage->aCmdsWaiting, 0, sizeof(pImage->aCmdsWaiting));
+    pImage->cbRecvPDUResidual = 0;
 
     /* Create the socket structure. */
@@ -4560 +4564 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("iscsiCommand(%s, %#llx) -> %Rrc\n", pImage->pszTargetName, uOffset, rc));
+        LogFlow(("iscsiCommandSync(%s, %#llx) -> %Rrc\n", pImage->pszTargetName, uOffset, rc));
         *pcbActuallyRead = 0;
     }
@@ -4664 +4668 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("iscsiCommand(%s, %#llx) -> %Rrc\n", pImage->pszTargetName, uOffset, rc));
+        LogFlow(("iscsiCommandSync(%s, %#llx) -> %Rrc\n", pImage->pszTargetName, uOffset, rc));
         *pcbWriteProcess = 0;
     }