publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw GAIException() for getaddrinfo errors

Browse Source 
Created a new subclass of Exception called GAIException() that will
handle error messages from getaddrinfo() instead of letting Exception()
handle it. GAIException() will make use of gai_strerror() to map the
error code to text. On Windows, gai_strerrorW() must be used if the text
is encoded with UTF-8.
This commit is contained in:
Alex Tanskanen
2020-03-10 13:33:01 +01:00
committed by Lauri Kasanen
parent 209712b18f
commit 03639406dc
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/rdr/Exception.cxx
View File

@@ -31,6 +31,9 @@
#include <tchar.h>
#include <winsock2.h>
#include <windows.h>
#include <ws2tcpip.h>
#else
#include <netdb.h>
#endif
#include <string.h>
@@ -49,6 +52,21 @@ Exception::Exception(const char *format, ...) {
va_end(ap);
}
GAIException::GAIException(const char* s, int err)
: Exception("%s", s)
{
strncat(str_, ": ", len-1-strlen(str_));
#ifdef _WIN32
wchar_t currStr[len-strlen(str_)];
wcsncpy(currStr, gai_strerrorW(err), len-1-strlen(str_));
WideCharToMultiByte(CP_UTF8, 0, currStr, -1, str_+strlen(str_),
len-1-strlen(str_), 0, 0);
#else
//FIXME: perhaps print the error number (NNNN)
strncat(str_, gai_strerror(err), len-1-strlen(str_));
#endif
}
SystemException::SystemException(const char* s, int err_)
: Exception("%s", s), err(err_)
{

9
common/rdr/Exception.h
View File

@@ -40,12 +40,17 @@ namespace rdr {
struct SystemException : public Exception {
int err;
SystemException(const char* s, int err_);
};
};
struct GAIException : public Exception {
int err;
GAIException(const char* s, int err_);
};
struct TimedOut : public Exception {
TimedOut() : Exception("Timed out") {}
};
struct EndOfStream : public Exception {
EndOfStream() : Exception("End of stream") {}
};