From e3a2be69c48893ef086110b8d92f1fadd004a997 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 3 May 2018 14:03:55 +0200 Subject: Use abstract SocketListener class Makes the code more general and not directly tied to specifically TCP sockets. --- unix/x0vncserver/x0vncserver.cxx | 8 ++++---- unix/xserver/hw/vnc/RFBGlue.cc | 2 +- unix/xserver/hw/vnc/XserverDesktop.cc | 14 +++++++------- unix/xserver/hw/vnc/XserverDesktop.h | 12 ++++++------ unix/xserver/hw/vnc/vncExtInit.cc | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'unix') diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx index c8098f70..db917975 100644 --- a/unix/x0vncserver/x0vncserver.cxx +++ b/unix/x0vncserver/x0vncserver.cxx @@ -291,7 +291,7 @@ int main(int argc, char** argv) signal(SIGINT, CleanupSignalHandler); signal(SIGTERM, CleanupSignalHandler); - std::list listeners; + std::list listeners; try { TXWindow::init(dpy,"x0vncserver"); @@ -313,7 +313,7 @@ int main(int argc, char** argv) const char *hostsData = hostsFile.getData(); FileTcpFilter fileTcpFilter(hostsData); if (strlen(hostsData) != 0) - for (std::list::iterator i = listeners.begin(); + for (std::list::iterator i = listeners.begin(); i != listeners.end(); i++) (*i)->setFilter(&fileTcpFilter); @@ -335,7 +335,7 @@ int main(int argc, char** argv) FD_ZERO(&wfds); FD_SET(ConnectionNumber(dpy), &rfds); - for (std::list::iterator i = listeners.begin(); + for (std::list::iterator i = listeners.begin(); i != listeners.end(); i++) FD_SET((*i)->getFd(), &rfds); @@ -387,7 +387,7 @@ int main(int argc, char** argv) } // Accept new VNC connections - for (std::list::iterator i = listeners.begin(); + for (std::list::iterator i = listeners.begin(); i != listeners.end(); i++) { if (FD_ISSET((*i)->getFd(), &rfds)) { diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc index c9153364..c09dfe6c 100644 --- a/unix/xserver/hw/vnc/RFBGlue.cc +++ b/unix/xserver/hw/vnc/RFBGlue.cc @@ -199,7 +199,7 @@ int vncIsTCPPortUsed(int port) { try { // Attempt to create TCPListeners on that port. - std::list dummy; + std::list dummy; network::createTcpListeners (&dummy, 0, port); while (!dummy.empty()) { delete dummy.back(); diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index 080943d0..4aac7655 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.cc +++ b/unix/xserver/hw/vnc/XserverDesktop.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -107,8 +107,8 @@ public: XserverDesktop::XserverDesktop(int screenIndex_, - std::list listeners_, - std::list httpListeners_, + std::list listeners_, + std::list httpListeners_, const char* name, const rfb::PixelFormat &pf, int width, int height, void* fbptr, int stride) @@ -127,13 +127,13 @@ XserverDesktop::XserverDesktop(int screenIndex_, if (!httpListeners.empty ()) httpServer = new FileHTTPServer(this); - for (std::list::iterator i = listeners.begin(); + for (std::list::iterator i = listeners.begin(); i != listeners.end(); i++) { vncSetNotifyFd((*i)->getFd(), screenIndex, true, false); } - for (std::list::iterator i = httpListeners.begin(); + for (std::list::iterator i = httpListeners.begin(); i != httpListeners.end(); i++) { vncSetNotifyFd((*i)->getFd(), screenIndex, true, false); @@ -386,10 +386,10 @@ void XserverDesktop::handleSocketEvent(int fd, bool read, bool write) } bool XserverDesktop::handleListenerEvent(int fd, - std::list* sockets, + std::list* sockets, SocketServer* sockserv) { - std::list::iterator i; + std::list::iterator i; for (i = sockets->begin(); i != sockets->end(); i++) { if ((*i)->getFd() == fd) diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h index f1c3e3e7..f866a4cc 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.h +++ b/unix/xserver/hw/vnc/XserverDesktop.h @@ -44,7 +44,7 @@ namespace rfb { class VNCServerST; } -namespace network { class TcpListener; class Socket; class SocketServer; } +namespace network { class SocketListener; class Socket; class SocketServer; } class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer, public rdr::Substitutor, @@ -53,8 +53,8 @@ class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer, public: XserverDesktop(int screenIndex, - std::list listeners_, - std::list httpListeners_, + std::list listeners_, + std::list httpListeners_, const char* name, const rfb::PixelFormat &pf, int width, int height, void* fbptr, int stride); virtual ~XserverDesktop(); @@ -109,7 +109,7 @@ public: protected: bool handleListenerEvent(int fd, - std::list* sockets, + std::list* sockets, network::SocketServer* sockserv); bool handleSocketEvent(int fd, network::SocketServer* sockserv, @@ -122,8 +122,8 @@ private: int screenIndex; rfb::VNCServerST* server; rfb::HTTPServer* httpServer; - std::list listeners; - std::list httpListeners; + std::list listeners; + std::list httpListeners; bool directFbptr; uint32_t queryConnectId; diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc index 54cca953..f2674511 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -173,8 +173,8 @@ void vncExtensionInit(void) for (int scr = 0; scr < vncGetScreenCount(); scr++) { if (!desktop[scr]) { - std::list listeners; - std::list httpListeners; + std::list listeners; + std::list httpListeners; if (scr == 0 && vncInetdSock != -1) { if (network::TcpSocket::isListening(vncInetdSock)) { -- cgit v1.2.3