Merge branch 'server-ipv6'

2 files changed, 13 insertions, 1 deletions

diff --git a/rfb/rfb.h b/rfb/rfb.h
index e068e76..bf4e011 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -377,6 +377,14 @@ typedef struct _rfbScreenInfo
     char *sslkeyfile;
     char *sslcertfile;
 #endif
+    int ipv6port; /**< The port to listen on when using IPv6.  */
+    char* listen6Interface;
+    /* We have an additional IPv6 listen socket since there are systems that
+       don't support dual binding sockets under *any* circumstances, for
+       instance OpenBSD */
+    SOCKET listen6Sock;
+    int http6Port;
+    SOCKET httpListen6Sock;
 } rfbScreenInfo, *rfbScreenInfoPtr;
 
 
@@ -738,6 +746,7 @@ extern int rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
 extern int rfbConnect(rfbScreenInfoPtr rfbScreen, char* host, int port);
 extern int rfbConnectToTcpAddr(char* host, int port);
 extern int rfbListenOnTCPPort(int port, in_addr_t iface);
+extern int rfbListenOnTCP6Port(int port, const char* iface);
 extern int rfbListenOnUDPPort(int port, in_addr_t iface);
 extern int rfbStringToAddr(char* string,in_addr_t* addr);
 extern rfbBool rfbSetNonBlocking(int sock);
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index 36ffe13..36c109e 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -347,7 +347,10 @@ typedef struct _rfbClient {
 	FinishedFrameBufferUpdateProc FinishedFrameBufferUpdate;
 
 	char *listenAddress;
-
+        /* IPv6 listen socket, address and port*/
+        int listen6Sock;
+        char* listen6Address;
+        int listen6Port;
 } rfbClient;
 
 /* cursor.c */