Changeset 53539 in vbox

Timestamp:

Dec 14, 2014 9:49:20 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97282

Message:

Storage/iSCSI: Fail when a connection attempt takes too long to pause the VM more quickly when the target is not responding

Location:

trunk

Files:

• include/VBox/vd-ifs.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)
• src/VBox/Storage/ISCSI.cpp (modified) (1 diff)

trunk/include/VBox/vd-ifs.h

@@ -1056 +1056 @@
      * @param   pszAddress      The address to connect to.
      * @param   uPort           The port to connect to.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnClientConnect, (VDSOCKET Sock, const char *pszAddress, uint32_t uPort));
+     * @param   cMillies        Number of milliseconds to wait for the connect attempt to complete.
+     *                          Use RT_INDEFINITE_WAIT to wait for ever.
+     *                          Use RT_SOCKETCONNECT_DEFAULT_WAIT to wait for the default time
+     *                          configured on the running system.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnClientConnect, (VDSOCKET Sock, const char *pszAddress, uint32_t uPort,
+                                                 RTMSINTERVAL cMillies));
 
     /**

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

@@ -728 +728 @@
 
 /** @copydoc VDINTERFACETCPNET::pfnClientConnect */
-static DECLCALLBACK(int) drvvdINIPClientConnect(VDSOCKET Sock, const char *pszAddress, uint32_t uPort)
+static DECLCALLBACK(int) drvvdINIPClientConnect(VDSOCKET Sock, const char *pszAddress, uint32_t uPort,
+                                                RTMSINTERVAL cMillies)
 {
     int rc = VINF_SUCCESS;
@@ -737 +738 @@
     ip6_addr_t ip6;
 #endif
+
+    NOREF(cMillies); /** LwIP doesn't support connect timeout. */
 
     /* Check whether lwIP is set up in this VM instance. */
@@ -1167 +1170 @@
 
 /** @copydoc VDINTERFACETCPNET::pfnClientConnect */
-static DECLCALLBACK(int) drvvdTcpClientConnect(VDSOCKET Sock, const char *pszAddress, uint32_t uPort)
+static DECLCALLBACK(int) drvvdTcpClientConnect(VDSOCKET Sock, const char *pszAddress, uint32_t uPort,
+                                               RTMSINTERVAL cMillies)
 {
     int rc = VINF_SUCCESS;
     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
 
-    rc = RTTcpClientConnect(pszAddress, uPort, &pSockInt->hSocket);
+    rc = RTTcpClientConnectEx(pszAddress, uPort, &pSockInt->hSocket, cMillies, NULL);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Storage/ISCSI.cpp

@@ -844 +844 @@
         return VERR_NET_DEST_ADDRESS_REQUIRED;
 
-    rc = pImage->pIfNet->pfnClientConnect(pImage->Socket, pImage->pszHostname, pImage->uPort);
+    rc = pImage->pIfNet->pfnClientConnect(pImage->Socket, pImage->pszHostname, pImage->uPort, pImage->uReadTimeout);
     if (RT_FAILURE(rc))
     {