diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-08-23 20:50:55 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-08-23 20:50:55 +0000 |
| commit | 5191b8f95031ad12fb12b6ac56c53e51c1bb8681 (patch) | |
| tree | 577f44e1ceda4a60ad686d96f1cd5c922e32b616 /cpp/src/Ice/Network.cpp | |
| parent | fix (diff) | |
| download | ice-5191b8f95031ad12fb12b6ac56c53e51c1bb8681.tar.bz2 ice-5191b8f95031ad12fb12b6ac56c53e51c1bb8681.tar.xz ice-5191b8f95031ad12fb12b6ac56c53e51c1bb8681.zip | |
added missing config files; better error messages
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 34d88b86045..94a5c947ed4 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -617,9 +617,24 @@ IceInternal::createPipe(int fds[2]) #ifdef WIN32 -const char* +string IceInternal::errorToString(int error) { + if (error < WSABASEERR) + { + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR)&lpMsgBuf, + 0, + NULL); + string result = (LPCTSTR)lpMsgBuf; + LocalFree( lpMsgBuf ); + return result; + } + switch (error) { case WSAEINTR: @@ -776,11 +791,11 @@ IceInternal::errorToString(int error) return "WSANO_DATA"; default: - return "unknown error"; + return "unknown socket error"; } } -const char* +string IceInternal::errorToStringDNS(int error) { return errorToString(error); @@ -788,13 +803,13 @@ IceInternal::errorToStringDNS(int error) #else -const char* +string IceInternal::errorToString(int error) { return strerror(error); } -const char* +string IceInternal::errorToStringDNS(int error) { switch (error) @@ -818,13 +833,13 @@ IceInternal::errorToStringDNS(int error) return "name has no IP address"; default: - return "unknown error"; + return "unknown DNS error"; } } #endif -const char* +string IceInternal::lastErrorToString() { #ifdef WIN32 @@ -834,7 +849,7 @@ IceInternal::lastErrorToString() #endif } -const char* +string IceInternal::lastErrorToStringDNS() { #ifdef WIN32 |