Quellcode durchsuchen

Harmonise new client handlers

One was missing a call to register the fd with the X server, and
one forgot to set it to non-blocking. One result of this was a crash
when hitting the blacklist.
tags/v1.7.90
Pierre Ossman vor 7 Jahren
Ursprung
Commit
4b35524594
1 geänderte Dateien mit 2 neuen und 0 gelöschten Zeilen
  1. 2
    0
      unix/xserver/hw/vnc/XserverDesktop.cc

+ 2
- 0
unix/xserver/hw/vnc/XserverDesktop.cc Datei anzeigen

@@ -443,6 +443,7 @@ bool XserverDesktop::handleListenerEvent(int fd,
sock->outStream().setBlocking(false);
vlog.debug("new client, sock %d", sock->getFd());
sockserv->addSocket(sock);
vncSetNotifyFd(sock->getFd(), screenIndex, true, false);

return true;
}
@@ -536,6 +537,7 @@ void XserverDesktop::blockHandler(int* timeout)
void XserverDesktop::addClient(Socket* sock, bool reverse)
{
vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse);
sock->outStream().setBlocking(false);
server->addSocket(sock, reverse);
vncSetNotifyFd(sock->getFd(), screenIndex, true, false);
}

Laden…
Abbrechen
Speichern