Changeset 81060 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Sep 27, 2019 2:32:13 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/VBoxClient: Cleaned up connecting to host service.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -181 +181 @@
  * @returns VBox status code
  */
-int SharedClipboardSvcImplConnect(void)
-{
-    int rc = VINF_SUCCESS;
-    LogRelFlowFunc(("\n"));
+static int vboxClipboardConnect(void)
+{
+    LogFlowFuncEnter();
 
     /* Sanity */
-    AssertReturn(g_ctx.client == 0, VERR_WRONG_ORDER);
+    AssertReturn(g_ctx.client   == 0,    VERR_WRONG_ORDER);
+    AssertReturn(g_ctx.pBackend == NULL, VERR_WRONG_ORDER);
+
+    int rc;
+
     g_ctx.pBackend = ClipConstructX11(&g_ctx, false);
-    if (!g_ctx.pBackend)
+    if (g_ctx.pBackend)
+    {
+        rc = ClipStartX11(g_ctx.pBackend, false /* grab */);
+        if (RT_SUCCESS(rc))
+        {
+            rc = VbglR3ClipboardConnect(&g_ctx.client);
+            if (RT_SUCCESS(rc))
+            {
+                Assert(g_ctx.client);
+            }
+            else
+                VBClLogError("Error connecting to host, rc=%Rrc\n", rc);
+        }
+    }
+    else
         rc = VERR_NO_MEMORY;
-    if (RT_SUCCESS(rc))
-        rc = ClipStartX11(g_ctx.pBackend, false /* grab */);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3ClipboardConnect(&g_ctx.client);
-        if (RT_FAILURE(rc))
-            VBClLogError("Error connecting to host, rc=%Rrc\n", rc);
-        else if (!g_ctx.client)
-        {
-            VBClLogError("Invalid client ID of 0\n");
-            rc = VERR_NOT_SUPPORTED;
-        }
-    }
 
     if (rc != VINF_SUCCESS && g_ctx.pBackend)
@@ -300 +304 @@
 
     /* Initialise the guest library. */
-    int rc = SharedClipboardSvcImplConnect();
-    /* Not RT_SUCCESS: VINF_PERMISSION_DENIED is host service not present. */
-    if (rc == VINF_SUCCESS)
+    int rc = vboxClipboardConnect();
+    if (RT_SUCCESS(rc))
+    {
         rc = vboxClipboardMain();
-    if (rc == VERR_NOT_SUPPORTED)
-        rc = VINF_SUCCESS;  /* Prevent automatic restart. */
+    }
+
     if (RT_FAILURE(rc))
-        LogRelFunc(("guest clipboard service terminated abnormally: return code %Rrc\n", rc));
+        VBClLogError("Service terminated abnormally with %Rrc\n", rc);
+
+    if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
+        rc = VINF_SUCCESS; /* Prevent automatic restart by daemon script if host service not available. */
+
     return rc;
 }