Ticket #12555: 0002-Fix-white-screen-of-death-in-remotedesktop.patch

src/apps/remotedesktop/RemoteView.cpp

@@ -75 +75 @@
     fReceiveBuffer = new(std::nothrow) StreamingRingBuffer(16 * 1024);
     if (fReceiveBuffer == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -85 +86 @@
     fSendBuffer = new(std::nothrow) StreamingRingBuffer(16 * 1024);
     if (fSendBuffer == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -95 +97 @@
     fReceiveEndpoint = new(std::nothrow) BNetEndpoint();
     if (fReceiveEndpoint == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -105 +108 @@
     fReceiver = new(std::nothrow) NetReceiver(fReceiveEndpoint, fReceiveBuffer);
     if (fReceiver == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
     fSendEndpoint = new(std::nothrow) BNetEndpoint();
     if (fSendEndpoint == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
     fSender = new(std::nothrow) NetSender(fSendEndpoint, fSendBuffer);
     if (fSender == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -125 +131 @@
         B_RGB32);
     if (fOffscreenBitmap == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -132 +139 @@
         B_FOLLOW_NONE, B_WILL_DRAW);
     if (fOffscreen == NULL) {
         fInitStatus = B_NO_MEMORY;
+        TRACE_ERROR("no memory available\n");
         return;
     }
 
@@ -142 +150 @@
         this);
     if (fDrawThread < 0) {
         fInitStatus = fDrawThread;
+
+        TRACE_ERROR("failed to start _DrawThread()\n");
+        TRACE_ERROR("status = %" B_PRIx32 "\n", fInitStatus);
+
         return;
     }
 
@@ -438 +450 @@
     while (!fStopThread) {
         uint16 code;
         status_t status = message.NextMessage(code);
+
         if (status != B_OK) {
-            TRACE_ERROR("failed to read message from receiver\n");
-            break;
+            if (status == B_TIMED_OUT || status == -1) {
+                TRACE_ERROR("could not connect to device\n");
+            } else {
+                TRACE_ERROR("failed to read message from receiver\n");
+                break;
+            }
         }
 
         TRACE("code %u with %ld bytes data\n", code, message.DataLeft());

src/servers/app/drawing/interface/remote/NetReceiver.cpp

@@ -7 +7 @@
  */
 
 #include "NetReceiver.h"
+#include "RemoteMessage.h"
 
 #include "StreamingRingBuffer.h"
 
@@ -59 +60 @@
 status_t
 NetReceiver::_NetworkReceiver()
 {
+    static const uint16_t shutdown_message[] = { RP_CLOSE_CONNECTION, 0, 0 };
+
     status_t result = fListener->Listen();
     if (result != B_OK) {
         TRACE_ERROR("failed to listen on port: %s\n", strerror(result));
+        fTarget->Write(shutdown_message, sizeof(shutdown_message));
         return result;
     }
 
     while (!fStopThread) {
-        fEndpoint = fListener->Accept(1000);
-        if (fEndpoint == NULL)
-            continue;
+        fEndpoint = fListener->Accept(5000);
+        if (fEndpoint == NULL) {
+            fTarget->Write(shutdown_message, sizeof(shutdown_message));
+            return B_ERROR;
+        }
 
         int32 errorCount = 0;
         TRACE("new endpoint connection: %p\n", fEndpoint);
@@ -81 +87 @@
                 BNetEndpoint *endpoint = fEndpoint;
                 fEndpoint = NULL;
                 delete endpoint;
+                fTarget->Write(shutdown_message, sizeof(shutdown_message));
                 return readSize;
             }
 
@@ -101 +108 @@
             if (result != B_OK) {
                 TRACE_ERROR("writing to ring buffer failed: %s\n",
                     strerror(result));
+                fTarget->Write(shutdown_message, sizeof(shutdown_message));
                 return result;
             }
         }