Changeset 32818 in vbox

Timestamp:

Sep 29, 2010 3:28:35 PM (15 years ago)

Author:

vboxsync

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

66275

Message:

IPRT: RTTcpClientCloseEx - don't be nice to storage servers, they don't always repay the kindness.

Location:

trunk

Files:

• include/iprt/tcp.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)
• src/VBox/Main/MediumImpl.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/tcp.cpp (modified) (1 diff)

trunk/include/iprt/tcp.h

@@ -180 +180 @@
 
 /**
+ * Close a socket returned by RTTcpClientConnect().
+ *
+ * @returns iprt status code.
+ * @param   hSocket             The socket handle.
+ * @param   fGracefulShutdown   If true, try do a graceful shutdown of the
+ *                              outgoing pipe and draining any lingering input.
+ *                              This is sometimes better for the server side.
+ *                              If false, just close the connection without
+ *                              further ado.
+ */
+RTR3DECL(int) RTTcpClientCloseEx(RTSOCKET Sock, bool fGracefulShutdown);
+
+/**
  * Receive data from a socket.
  *

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

@@ -1044 +1044 @@
 
     if (pSockInt->hSocket != NIL_RTSOCKET)
-        rc = RTTcpClientClose(pSockInt->hSocket);
+        rc = RTTcpClientCloseEx(pSockInt->hSocket, false /*fGracefulShutdown*/);
 
     RTMemFree(pSockInt);
@@ -1072 +1072 @@
             return VINF_SUCCESS;
 
-        rc = RTTcpClientClose(pSockInt->hSocket);
+        rc = RTTcpClientCloseEx(pSockInt->hSocket, false /*fGracefulShutdown*/);
     }
 
@@ -1090 +1090 @@
     }
 
-    rc = RTTcpClientClose(pSockInt->hSocket);
+    rc = RTTcpClientCloseEx(pSockInt->hSocket, false /*fGracefulShutdown*/);
     pSockInt->hSocket = NIL_RTSOCKET;
 

trunk/src/VBox/Main/MediumImpl.cpp

@@ -5459 +5459 @@
 
     if (pSocketInt->hSocket != NIL_RTSOCKET)
-        RTTcpClientClose(pSocketInt->hSocket);
+        RTTcpClientCloseEx(pSocketInt->hSocket, false /*fGracefulShutdown*/);
 
     RTMemFree(pSocketInt);
@@ -5478 +5478 @@
     PVDSOCKETINT pSocketInt = (PVDSOCKETINT)Sock;
 
-    rc = RTTcpClientClose(pSocketInt->hSocket);
+    rc = RTTcpClientCloseEx(pSocketInt->hSocket, false /*fGracefulShutdown*/);
     pSocketInt->hSocket = NIL_RTSOCKET;
     return rc;

trunk/src/VBox/Runtime/r3/tcp.cpp

@@ -919 +919 @@
 
 
+RTR3DECL(int) RTTcpClientCloseEx(RTSOCKET Sock, bool fGracefulShutdown)
+{
+    return rtTcpClose(Sock, "RTTcpClientCloseEx", fGracefulShutdown);
+}
+
+
 #ifdef FIX_FOR_3_2
 /**