Consistently use SocketException for socket errors

The behaviour is not consistent as Windows doesn't use errno for socket errors, but Unix systems do. Always use the same exception to keep things somewhat sane.
TigerVNC · Sep 10, 2024 · 4b924af · 4b924af
1 parent 3ec3331
commit 4b924af
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/common/rdr/TLSInStream.cxx b/common/rdr/TLSInStream.cxx
@@ -56,10 +56,10 @@ ssize_t TLSInStream::pull(gnutls_transport_ptr_t str, void* data, size_t size)
     in->readBytes((uint8_t*)data, size);
   } catch (EndOfStream&) {
     return 0;
-  } catch (SystemException &e) {
+  } catch (SocketException& e) {
     vlog.error("Failure reading TLS data: %s", e.str());
     gnutls_transport_set_errno(self->session, e.err);
-    self->saved_exception = new SystemException(e);
+    self->saved_exception = new SocketException(e);
     return -1;
   } catch (Exception& e) {
     vlog.error("Failure reading TLS data: %s", e.str());

diff --git a/common/rdr/TLSOutStream.cxx b/common/rdr/TLSOutStream.cxx
@@ -46,10 +46,10 @@ ssize_t TLSOutStream::push(gnutls_transport_ptr_t str, const void* data,
   try {
     out->writeBytes((const uint8_t*)data, size);
     out->flush();
-  } catch (SystemException &e) {
+  } catch (SocketException& e) {
     vlog.error("Failure sending TLS data: %s", e.str());
     gnutls_transport_set_errno(self->session, e.err);
-    self->saved_exception = new SystemException(e);
+    self->saved_exception = new SocketException(e);
     return -1;
   } catch (Exception& e) {
     vlog.error("Failure sending TLS data: %s", e.str());

diff --git a/unix/tx/TXDialog.h b/unix/tx/TXDialog.h
@@ -63,7 +63,7 @@ class TXDialog : public TXWindow, public TXDeleteWindowCallback {
         FD_ZERO(&rfds);
         FD_SET(ConnectionNumber(dpy), &rfds);
         int n = select(FD_SETSIZE, &rfds, nullptr, nullptr, nullptr);
-        if (n < 0) throw rdr::SystemException("select",errno);
+        if (n < 0) throw rdr::SocketException("select", errno);
       }
     }
     return true;

diff --git a/unix/vncconfig/vncconfig.cxx b/unix/vncconfig/vncconfig.cxx
@@ -330,7 +330,7 @@ int main(int argc, char** argv)
       FD_ZERO(&rfds);
       FD_SET(ConnectionNumber(dpy), &rfds);
       int n = select(FD_SETSIZE, &rfds, nullptr, nullptr, tvp);
-      if (n < 0) throw rdr::SystemException("select",errno);
+      if (n < 0) throw rdr::SocketException("select", errno);
     }
 
     XCloseDisplay(dpy);

diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
@@ -441,7 +441,7 @@ int main(int argc, char** argv)
           vlog.debug("Interrupted select() system call");
           continue;
         } else {
-          throw rdr::SystemException("select", errno);
+          throw rdr::SocketException("select", errno);
         }
       }
 

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
@@ -808,7 +808,7 @@ int main(int argc, char** argv)
             vlog.debug("Interrupted select() system call");
             continue;
           } else {
-            throw rdr::SystemException("select", errno);
+            throw rdr::SocketException("select", errno);
           }
         }
 

diff --git a/win/rfb_win32/SocketManager.cxx b/win/rfb_win32/SocketManager.cxx
@@ -67,7 +67,7 @@ void SocketManager::addListener(network::SocketListener* sock_,
     flags |= FD_ADDRESS_LIST_CHANGE;
   try {
     if (event && (WSAEventSelect(sock_->getFd(), event, flags) == SOCKET_ERROR))
-      throw rdr::SystemException("Unable to select on listener", WSAGetLastError());
+      throw rdr::SocketException("Unable to select on listener", WSAGetLastError());
 
     // requestAddressChangeEvents MUST happen after WSAEventSelect, so that the socket is non-blocking
     if (acn)
@@ -184,7 +184,7 @@ int SocketManager::checkTimeouts() {
       if (j->second.sock->outStream().hasBufferedData())
         eventMask |= FD_WRITE;
       if (WSAEventSelect(j->second.sock->getFd(), j->first, eventMask) == SOCKET_ERROR)
-        throw rdr::SystemException("unable to adjust WSAEventSelect:%u", WSAGetLastError());
+        throw rdr::SocketException("unable to adjust WSAEventSelect:%u", WSAGetLastError());
     }
   }
 
@@ -234,11 +234,11 @@ void SocketManager::processEvent(HANDLE event) {
 
       // Fetch why this event notification triggered
       if (WSAEnumNetworkEvents(ci.sock->getFd(), event, &network_events) == SOCKET_ERROR)
-        throw rdr::SystemException("unable to get WSAEnumNetworkEvents:%u", WSAGetLastError());
+        throw rdr::SocketException("unable to get WSAEnumNetworkEvents:%u", WSAGetLastError());
 
       // Cancel event notification for this socket
       if (WSAEventSelect(ci.sock->getFd(), event, 0) == SOCKET_ERROR)
-        throw rdr::SystemException("unable to disable WSAEventSelect:%u", WSAGetLastError());
+        throw rdr::SocketException("unable to disable WSAEventSelect:%u", WSAGetLastError());
 
       // Reset the event object
       WSAResetEvent(event);
@@ -266,7 +266,7 @@ void SocketManager::processEvent(HANDLE event) {
       if (ci.sock->outStream().hasBufferedData())
         eventMask |= FD_WRITE;
       if (WSAEventSelect(ci.sock->getFd(), event, eventMask) == SOCKET_ERROR)
-        throw rdr::SystemException("unable to re-enable WSAEventSelect:%u", WSAGetLastError());
+        throw rdr::SocketException("unable to re-enable WSAEventSelect:%u", WSAGetLastError());
     } catch (rdr::Exception& e) {
       vlog.error("%s", e.str());
       remSocket(ci.sock);