Merge branch 'master' into multicastvnc

Author: Christian Beier

CMakeLists.txt

@@ -144,7 +144,7 @@ endif(WITH_THREADS)
 
 
 if(WITH_GNUTLS)
-  find_package(GnuTLS)
+  find_package(GnuTLS 3.4.0)
 endif(WITH_GNUTLS)
 
 

libvncclient/rfbproto.c

@@ -2168,7 +2168,7 @@ HandleRFBServerMessage(rfbClient* client)
           if (!ReadFromRFBServer(client, ((char *)&screen), sz_rfbExtDesktopScreen)) {
             return FALSE;
           }
-          if (screen.id != 0) {
+          if (screen.id != 0 && screen.width && screen.height) {
             client->screen = screen;
           } else {
             invalidScreen = TRUE;

libvncclient/tls_gnutls.c

@@ -22,10 +22,6 @@
 #include <gnutls/x509.h>
 #include <rfb/rfbclient.h>
 #include <errno.h>
-#ifdef WIN32
-#include <windows.h>           /* for Sleep() */
-#define sleep(X) Sleep(1000*X) /* MinGW32 has no sleep() */
-#endif
 #include "tls.h"
 
 
@@ -228,6 +224,27 @@ PullTLS(gnutls_transport_ptr_t transport, void *data, size_t len)
   }
 }
 
+static int
+PullTimeout(gnutls_transport_ptr_t transport, unsigned int timeout)
+{
+  rfbClient *client = (rfbClient*)transport;
+  int ret;
+
+  while (1)
+  {
+    ret = gnutls_system_recv_timeout((gnutls_transport_ptr_t)(long)client->sock, timeout);
+
+    if (ret < 0)
+    {
+#ifdef WIN32
+      WSAtoTLSErrno((gnutls_session_t*)&client->tlsSession);
+#endif
+      if (errno == EINTR) continue;
+    }
+    return ret;
+  }
+}
+
 static rfbBool
 InitializeTLSSession(rfbClient* client, rfbBool anonTLS)
 {
@@ -252,6 +269,9 @@ InitializeTLSSession(rfbClient* client, rfbBool anonTLS)
   gnutls_transport_set_push_function((gnutls_session_t)client->tlsSession, PushTLS);
   gnutls_transport_set_pull_function((gnutls_session_t)client->tlsSession, PullTLS);
 
+  gnutls_transport_set_pull_timeout_function((gnutls_session_t)client->tlsSession, PullTimeout);
+  gnutls_handshake_set_timeout((gnutls_session_t)client->tlsSession, 15000);
+
   INIT_MUTEX(client->tlsRwMutex);
 
   rfbClientLog("TLS session initialized.\n");
@@ -279,27 +299,16 @@ SetTLSAnonCredential(rfbClient* client)
 static rfbBool
 HandshakeTLS(rfbClient* client)
 {
-  int timeout = 15;
   int ret;
 
-  while (timeout > 0 && (ret = gnutls_handshake((gnutls_session_t)client->tlsSession)) < 0)
+  while ((ret = gnutls_handshake((gnutls_session_t)client->tlsSession)) < 0)
   {
     if (!gnutls_error_is_fatal(ret))
     {
-      rfbClientLog("TLS handshake blocking.\n");
-      sleep(1);
-      timeout--;
+      rfbClientLog("TLS handshake got a temporary error: %s.\n", gnutls_strerror(ret));
       continue;
     }
-    rfbClientLog("TLS handshake failed: %s.\n", gnutls_strerror(ret));
-
-    FreeTLS(client);
-    return FALSE;
-  }
-
-  if (timeout <= 0)
-  {
-    rfbClientLog("TLS handshake timeout.\n");
+    rfbClientLog("TLS handshake failed: %s\n", gnutls_strerror(ret));
     FreeTLS(client);
     return FALSE;
   }

libvncserver/main.c

@@ -1164,6 +1164,16 @@ void rfbNewFramebuffer(rfbScreenInfoPtr screen, char *framebuffer,
   rfbClientIteratorPtr iterator;
   rfbClientPtr cl;
 
+  /* Lock out client reads. */
+  iterator = rfbGetClientIterator(screen);
+  while ((cl = rfbClientIteratorNext(iterator))) {
+      LOCK(cl->sendMutex);
+  }
+  rfbReleaseClientIterator(iterator);
+
+  /* Prevent cursor drawing into framebuffer */
+  LOCK(screen->cursorMutex);
+
   /* Update information in the screenInfo structure */
 
   old_format = screen->serverFormat;
@@ -1223,8 +1233,14 @@ void rfbNewFramebuffer(rfbScreenInfoPtr screen, char *framebuffer,
 
     TSIGNAL(cl->updateCond);
     UNLOCK(cl->updateMutex);
+
+    /* Swapping frame buffers finished, re-enable client reads. */
+    UNLOCK(cl->sendMutex);
   }
   rfbReleaseClientIterator(iterator);
+
+  /* Re-enable cursor drawing into framebuffer */
+  UNLOCK(screen->cursorMutex);
 }
 
 /* hang up on all clients and free all reserved memory */

libvncserver/tight.c

@@ -212,7 +212,7 @@ rfbNumCodedRectsTight(rfbClientPtr cl,
     maxRectSize = tightConf[cl->tightCompressLevel].maxRectSize;
     maxRectWidth = tightConf[cl->tightCompressLevel].maxRectWidth;
 
-    if (w > maxRectWidth || w * h > maxRectSize) {
+    if (maxRectWidth > 0 && (w > maxRectWidth || w * h > maxRectSize)) {
         subrectMaxWidth = (w > maxRectWidth) ? maxRectWidth : w;
         subrectMaxHeight = maxRectSize / subrectMaxWidth;
         return (((w - 1) / maxRectWidth + 1) *