[Development] Add new "-i" and "-interface" parameters to Xvnc. Now Xvnc is able
to listen on specific interface.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3963 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index e2b61a8..75d388d 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -331,8 +331,8 @@
}
-TcpListener::TcpListener(int port, bool localhostOnly, int sock, bool close_)
- : closeFd(close_)
+TcpListener::TcpListener(const char *listenaddr, int port, bool localhostOnly,
+ int sock, bool close_) : closeFd(close_)
{
if (sock != -1) {
fd = sock;
@@ -360,11 +360,24 @@
struct sockaddr_in addr;
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
- addr.sin_port = htons(port);
- if (localhostOnly)
+
+ if (localhostOnly) {
addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- else
- addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ } else if (listenaddr != NULL) {
+#ifndef WIN32
+ if (inet_aton(listenaddr, &addr.sin_addr) == 0)
+#else
+ /* Windows doesn't have inet_aton, sigh */
+ if ((addr.sin_addr.s_addr = inet_addr(listenaddr)) == INADDR_NONE)
+#endif
+ {
+ closesocket(fd);
+ throw Exception("invalid network interface address: %s", listenaddr);
+ }
+ } else
+ addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Bind to 0.0.0.0 by default. */
+
+ addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
int e = errorNumber;
closesocket(fd);
diff --git a/common/network/TcpSocket.h b/common/network/TcpSocket.h
index 00ccf78..f45c2ee 100644
--- a/common/network/TcpSocket.h
+++ b/common/network/TcpSocket.h
@@ -65,8 +65,8 @@
class TcpListener : public SocketListener {
public:
- TcpListener(int port, bool localhostOnly=false, int sock=-1,
- bool close=true);
+ TcpListener(const char *listenaddr, int port, bool localhostOnly=false,
+ int sock=-1, bool close=true);
virtual ~TcpListener();
virtual void shutdown();