Changeset 1851

Timestamp:

21/09/2007 23:58:34 (4 years ago)

Author:

chris

Message:

Report more useful error messages on connect() failure on Windows.

File:

• box/chris/general/lib/server/SocketStream.cpp (modified) (1 diff)

box/chris/general/lib/server/SocketStream.cpp

@@ -162 +162 @@
                 // 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();
 }