Changeset 53539 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

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/src/VBox

Files:

• Devices/Storage/DrvVD.cpp (modified) (3 diffs)
• Storage/ISCSI.cpp (modified) (1 diff)

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))
     {