[Box Backup-commit] COMMIT r1887 - box/trunk/lib/server

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Wed Oct 17 13:52:47 BST 2007


Author: chris
Date: 2007-10-17 13:52:47 +0100 (Wed, 17 Oct 2007)
New Revision: 1887

Modified:
   box/trunk/lib/server/SocketStream.cpp
Log:
Report more useful error messages on connect() failure on Windows. 
(merges [1851])


Modified: box/trunk/lib/server/SocketStream.cpp
===================================================================
--- box/trunk/lib/server/SocketStream.cpp	2007-10-17 12:52:25 UTC (rev 1886)
+++ box/trunk/lib/server/SocketStream.cpp	2007-10-17 12:52:47 UTC (rev 1887)
@@ -161,17 +161,26 @@
 	{
 		// Dispose of the socket
 #ifdef WIN32
+		DWORD err = WSAGetLastError();
 		::closesocket(mSocketHandle);
 #else
+		int err = errno;
 		::close(mSocketHandle);
 #endif
+
 		BOX_ERROR("Failed to connect to socket (type " << Type <<
 			", name " << Name << ", port " << Port << "): " <<
-			"error " << errno << " (" << strerror(errno) << 
-			")");
+			#ifdef WIN32
+				GetErrorMessage(err)
+			#else
+				strerror(err) << " (" << err << ")"
+			#endif
+			);
+
 		mSocketHandle = INVALID_SOCKET_VALUE;
 		THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
 	}
+
 	ResetCounters();
 }
 




More information about the Boxbackup-commit mailing list