Use abstract SocketListener class
Makes the code more general and not directly tied to specifically
TCP sockets.
diff --git a/common/network/Socket.h b/common/network/Socket.h
index 7a30cac..382b270 100644
--- a/common/network/Socket.h
+++ b/common/network/Socket.h
@@ -99,6 +99,8 @@
// if one is installed. Otherwise, returns 0.
virtual Socket* accept() = 0;
+ virtual int getMyPort() = 0;
+
// setFilter() applies the specified filter to all new connections
void setFilter(ConnectionFilter* f) {filter = f;}
int getFd() {return fd;}
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 9603c38..4287132 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -532,7 +532,7 @@
}
-void network::createLocalTcpListeners(std::list<TcpListener*> *listeners,
+void network::createLocalTcpListeners(std::list<SocketListener*> *listeners,
int port)
{
struct addrinfo ai[2];
@@ -562,7 +562,7 @@
createTcpListeners(listeners, ai);
}
-void network::createTcpListeners(std::list<TcpListener*> *listeners,
+void network::createTcpListeners(std::list<SocketListener*> *listeners,
const char *addr,
int port)
{
@@ -594,11 +594,11 @@
}
}
-void network::createTcpListeners(std::list<TcpListener*> *listeners,
+void network::createTcpListeners(std::list<SocketListener*> *listeners,
const struct addrinfo *ai)
{
const struct addrinfo *current;
- std::list<TcpListener*> new_listeners;
+ std::list<SocketListener*> new_listeners;
initSockets();
diff --git a/common/network/TcpSocket.h b/common/network/TcpSocket.h
index c1b142f..74ff4c5 100644
--- a/common/network/TcpSocket.h
+++ b/common/network/TcpSocket.h
@@ -80,16 +80,17 @@
virtual void shutdown();
virtual Socket* accept();
+ virtual int getMyPort();
+
static void getMyAddresses(std::list<char*>* result);
- int getMyPort();
};
- void createLocalTcpListeners(std::list<TcpListener*> *listeners,
+ void createLocalTcpListeners(std::list<SocketListener*> *listeners,
int port);
- void createTcpListeners(std::list<TcpListener*> *listeners,
+ void createTcpListeners(std::list<SocketListener*> *listeners,
const char *addr,
int port);
- void createTcpListeners(std::list<TcpListener*> *listeners,
+ void createTcpListeners(std::list<SocketListener*> *listeners,
const struct addrinfo *ai);
typedef struct vnc_sockaddr {
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index c8098f7..db91797 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -291,7 +291,7 @@
signal(SIGINT, CleanupSignalHandler);
signal(SIGTERM, CleanupSignalHandler);
- std::list<TcpListener*> listeners;
+ std::list<SocketListener*> listeners;
try {
TXWindow::init(dpy,"x0vncserver");
@@ -313,7 +313,7 @@
const char *hostsData = hostsFile.getData();
FileTcpFilter fileTcpFilter(hostsData);
if (strlen(hostsData) != 0)
- for (std::list<TcpListener*>::iterator i = listeners.begin();
+ for (std::list<SocketListener*>::iterator i = listeners.begin();
i != listeners.end();
i++)
(*i)->setFilter(&fileTcpFilter);
@@ -335,7 +335,7 @@
FD_ZERO(&wfds);
FD_SET(ConnectionNumber(dpy), &rfds);
- for (std::list<TcpListener*>::iterator i = listeners.begin();
+ for (std::list<SocketListener*>::iterator i = listeners.begin();
i != listeners.end();
i++)
FD_SET((*i)->getFd(), &rfds);
@@ -387,7 +387,7 @@
}
// Accept new VNC connections
- for (std::list<TcpListener*>::iterator i = listeners.begin();
+ for (std::list<SocketListener*>::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 c915336..c09dfe6 100644
--- a/unix/xserver/hw/vnc/RFBGlue.cc
+++ b/unix/xserver/hw/vnc/RFBGlue.cc
@@ -199,7 +199,7 @@
{
try {
// Attempt to create TCPListeners on that port.
- std::list<network::TcpListener*> dummy;
+ std::list<network::SocketListener*> 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 080943d..4aac765 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -32,7 +32,7 @@
#include <fcntl.h>
#include <sys/utsname.h>
-#include <network/TcpSocket.h>
+#include <network/Socket.h>
#include <rfb/Exception.h>
#include <rfb/VNCServerST.h>
#include <rfb/HTTPServer.h>
@@ -107,8 +107,8 @@
XserverDesktop::XserverDesktop(int screenIndex_,
- std::list<network::TcpListener*> listeners_,
- std::list<network::TcpListener*> httpListeners_,
+ std::list<network::SocketListener*> listeners_,
+ std::list<network::SocketListener*> httpListeners_,
const char* name, const rfb::PixelFormat &pf,
int width, int height,
void* fbptr, int stride)
@@ -127,13 +127,13 @@
if (!httpListeners.empty ())
httpServer = new FileHTTPServer(this);
- for (std::list<TcpListener*>::iterator i = listeners.begin();
+ for (std::list<SocketListener*>::iterator i = listeners.begin();
i != listeners.end();
i++) {
vncSetNotifyFd((*i)->getFd(), screenIndex, true, false);
}
- for (std::list<TcpListener*>::iterator i = httpListeners.begin();
+ for (std::list<SocketListener*>::iterator i = httpListeners.begin();
i != httpListeners.end();
i++) {
vncSetNotifyFd((*i)->getFd(), screenIndex, true, false);
@@ -386,10 +386,10 @@
}
bool XserverDesktop::handleListenerEvent(int fd,
- std::list<TcpListener*>* sockets,
+ std::list<SocketListener*>* sockets,
SocketServer* sockserv)
{
- std::list<TcpListener*>::iterator i;
+ std::list<SocketListener*>::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 f1c3e3e..f866a4c 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -44,7 +44,7 @@
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 @@
public:
XserverDesktop(int screenIndex,
- std::list<network::TcpListener*> listeners_,
- std::list<network::TcpListener*> httpListeners_,
+ std::list<network::SocketListener*> listeners_,
+ std::list<network::SocketListener*> httpListeners_,
const char* name, const rfb::PixelFormat &pf,
int width, int height, void* fbptr, int stride);
virtual ~XserverDesktop();
@@ -109,7 +109,7 @@
protected:
bool handleListenerEvent(int fd,
- std::list<network::TcpListener*>* sockets,
+ std::list<network::SocketListener*>* sockets,
network::SocketServer* sockserv);
bool handleSocketEvent(int fd,
network::SocketServer* sockserv,
@@ -122,8 +122,8 @@
int screenIndex;
rfb::VNCServerST* server;
rfb::HTTPServer* httpServer;
- std::list<network::TcpListener*> listeners;
- std::list<network::TcpListener*> httpListeners;
+ std::list<network::SocketListener*> listeners;
+ std::list<network::SocketListener*> httpListeners;
bool directFbptr;
uint32_t queryConnectId;
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 54cca95..f267451 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -173,8 +173,8 @@
for (int scr = 0; scr < vncGetScreenCount(); scr++) {
if (!desktop[scr]) {
- std::list<network::TcpListener*> listeners;
- std::list<network::TcpListener*> httpListeners;
+ std::list<network::SocketListener*> listeners;
+ std::list<network::SocketListener*> httpListeners;
if (scr == 0 && vncInetdSock != -1) {
if (network::TcpSocket::isListening(vncInetdSock))
{
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 413260d..f22648d 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -547,7 +547,7 @@
#endif
if (listenMode) {
- std::list<TcpListener*> listeners;
+ std::list<SocketListener*> listeners;
try {
int port = 5500;
if (isdigit(vncServerName[0]))
@@ -561,7 +561,7 @@
while (sock == NULL) {
fd_set rfds;
FD_ZERO(&rfds);
- for (std::list<TcpListener*>::iterator i = listeners.begin();
+ for (std::list<SocketListener*>::iterator i = listeners.begin();
i != listeners.end();
i++)
FD_SET((*i)->getFd(), &rfds);
@@ -576,7 +576,7 @@
}
}
- for (std::list<TcpListener*>::iterator i = listeners.begin ();
+ for (std::list<SocketListener*>::iterator i = listeners.begin ();
i != listeners.end();
i++)
if (FD_ISSET((*i)->getFd(), &rfds)) {
diff --git a/win/winvnc/ManagedListener.cxx b/win/winvnc/ManagedListener.cxx
index 9137238..a8c6f25 100644
--- a/win/winvnc/ManagedListener.cxx
+++ b/win/winvnc/ManagedListener.cxx
@@ -31,7 +31,7 @@
ManagedListener::~ManagedListener() {
if (!sockets.empty()) {
- std::list<network::TcpListener*>::iterator iter;
+ std::list<network::SocketListener*>::iterator iter;
for (iter = sockets.begin(); iter != sockets.end(); ++iter)
manager->remListener(*iter);
sockets.clear();
@@ -62,7 +62,7 @@
delete filter;
filter = new network::TcpFilter(filterStr);
if (!sockets.empty() && !localOnly) {
- std::list<network::TcpListener*>::iterator iter;
+ std::list<network::SocketListener*>::iterator iter;
for (iter = sockets.begin(); iter != sockets.end(); ++iter)
(*iter)->setFilter(filter);
}
@@ -80,7 +80,7 @@
}
void ManagedListener::refresh() {
- std::list<network::TcpListener*>::iterator iter;
+ std::list<network::SocketListener*>::iterator iter;
if (!sockets.empty()) {
for (iter = sockets.begin(); iter != sockets.end(); ++iter)
manager->remListener(*iter);
@@ -107,7 +107,7 @@
for (iter = sockets.begin(); iter != sockets.end(); ++iter)
manager->addListener(*iter, server, addrChangeNotifier);
} catch (...) {
- std::list<network::TcpListener*>::iterator iter2;
+ std::list<network::SocketListener*>::iterator iter2;
for (iter2 = sockets.begin(); iter2 != iter; ++iter2)
manager->remListener(*iter2);
for (; iter2 != sockets.end(); ++iter2)
diff --git a/win/winvnc/ManagedListener.h b/win/winvnc/ManagedListener.h
index e8d3c89..39223c7 100644
--- a/win/winvnc/ManagedListener.h
+++ b/win/winvnc/ManagedListener.h
@@ -45,7 +45,7 @@
protected:
void refresh();
- std::list<network::TcpListener*> sockets;
+ std::list<network::SocketListener*> sockets;
network::TcpFilter* filter;
rfb::win32::SocketManager* manager;
rfb::win32::SocketManager::AddressChangeNotifier* addrChangeNotifier;