[Box Backup-commit] COMMIT r1851 - box/chris/general/lib/server

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-09-21 23:58:34 +0100 (Fri, 21 Sep 2007)
New Revision: 1851

Modified:
   box/chris/general/lib/server/SocketStream.cpp
Log:
Report more useful error messages on connect() failure on Windows.


Modified: box/chris/general/lib/server/SocketStream.cpp
===================================================================
--- box/chris/general/lib/server/SocketStream.cpp	2007-09-21 20:34:09 UTC (rev 1850)
+++ box/chris/general/lib/server/SocketStream.cpp	2007-09-21 22:58:34 UTC (rev 1851)
@@ -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();
 }