aboutsummaryrefslogtreecommitdiffstats
path: root/common/network
diff options
context:
space:
mode:
authorAlex Tanskanen <aleta@cendio.com>2020-03-10 13:33:01 +0100
committerAlex Tanskanen <aleta@cendio.com>2020-03-17 14:46:20 +0100
commite52923415e55add9aa448ffcbb018a84fa39b742 (patch)
tree5ac63ed06a13c6a6a28e389ec051c4e82bfca2e4 /common/network
parent01ca961b0cf009a6f1e4603ad84b09d475b9f515 (diff)
downloadtigervnc-e52923415e55add9aa448ffcbb018a84fa39b742.tar.gz
tigervnc-e52923415e55add9aa448ffcbb018a84fa39b742.zip
Throw GAIException() for getaddrinfo errors
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.
Diffstat (limited to 'common/network')
-rw-r--r--common/network/TcpSocket.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index f5d92e25..07c8d2cd 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -133,8 +133,7 @@ TcpSocket::TcpSocket(const char *host, int port)
hints.ai_next = NULL;
if ((result = getaddrinfo(host, NULL, &hints, &ai)) != 0) {
- throw Exception("unable to resolve host by name: %s",
- gai_strerror(result));
+ throw GAIException("unable to resolve host by name", result);
}
sock = -1;
@@ -452,8 +451,7 @@ void network::createTcpListeners(std::list<SocketListener*> *listeners,
snprintf (service, sizeof (service) - 1, "%d", port);
service[sizeof (service) - 1] = '\0';
if ((result = getaddrinfo(addr, service, &hints, &ai)) != 0)
- throw rdr::Exception("unable to resolve listening address: %s",
- gai_strerror(result));
+ throw GAIException("unable to resolve listening address", result);
try {
createTcpListeners(listeners, ai);
@@ -645,8 +643,7 @@ TcpFilter::Pattern TcpFilter::parsePattern(const char* p) {
}
if ((result = getaddrinfo (p, NULL, &hints, &ai)) != 0) {
- throw Exception("unable to resolve host by name: %s",
- gai_strerror(result));
+ throw GAIException("unable to resolve host by name", result);
}
memcpy (&pattern.address.u.sa, ai->ai_addr, ai->ai_addrlen);