Changeset 106808 in vbox for trunk/src/VBox

Timestamp:

Oct 31, 2024 2:20:11 PM (3 months ago)

Author:

vboxsync

Message:

Additions: Linux/Wayland: Add customizable prefix to IPC server sock name to destinguish between clipboard and DnD IPC sockets, bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• vboxwl.cpp (modified) (2 diffs)
• wayland-helper-gtk.cpp (modified) (3 diffs)
• wayland-helper-ipc.cpp (modified) (3 diffs)
• wayland-helper-ipc.h (modified) (2 diffs)

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

@@ -534 +534 @@
 
 /**
+ * Get IPC server socket name prefix depending on session type.
+ *
+ * @returns Prefix name or NULL if session type is unknown.
+ */
+static const char *vboxwl_ipc_srv_name_prefix(void)
+{
+    const char *pcszPrefix;
+
+    switch (g_enmSessionType)
+    {
+        case VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_GUEST:
+        case VBCL_WL_CLIPBOARD_SESSION_TYPE_ANNOUNCE_TO_HOST:
+        case VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_HOST:
+        {
+            pcszPrefix = VBOXWL_SRV_NAME_PREFIX_CLIP;
+            break;
+        }
+
+        default:
+            pcszPrefix = NULL;
+    }
+
+    return pcszPrefix;
+}
+
+/**
  * Connect to VBoxClient service.
  *
@@ -543 +569 @@
     int rc;
     char szIpcServerName[128];
+    const char *pcszPrefix = vboxwl_ipc_srv_name_prefix();
 
     AssertPtrReturn(phIpcSession, VERR_INVALID_PARAMETER);
-
-    rc = vbcl_wayland_hlp_gtk_ipc_srv_name(szIpcServerName, sizeof(szIpcServerName));
+    AssertPtrReturn(pcszPrefix, VERR_INVALID_POINTER);
+
+    rc = vbcl_wayland_hlp_gtk_ipc_srv_name(pcszPrefix, szIpcServerName, sizeof(szIpcServerName));
     if (RT_SUCCESS(rc))
         rc = RTLocalIpcSessionConnect(phIpcSession, szIpcServerName, 0);

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp

@@ -83 +83 @@
     /** Local IPC server object. */
     RTLOCALIPCSERVER                        hIpcServer;
+
+    /** IPC server socket name prefix. */
+    const char                              *pcszIpcSockPrefix;
 } vbox_wl_gtk_ctx_t;
 
@@ -337 +340 @@
     char szIpcServerName[128];
 
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCtx->pcszIpcSockPrefix, VERR_INVALID_POINTER);
+
     RTThreadUserSignal(hThreadSelf);
 
     VBClLogVerbose(1, "starting IPC\n");
 
-    rc = vbcl_wayland_hlp_gtk_ipc_srv_name(szIpcServerName, sizeof(szIpcServerName));
+    rc = vbcl_wayland_hlp_gtk_ipc_srv_name(pCtx->pcszIpcSockPrefix, szIpcServerName, sizeof(szIpcServerName));
 
     if (RT_SUCCESS(rc))
@@ -429 +435 @@
 
     RT_ZERO(g_GtkClipCtx);
+
+    /* Set IPC server socket name prefix before server is started. */
+    g_GtkClipCtx.pcszIpcSockPrefix = VBOXWL_SRV_NAME_PREFIX_CLIP;
 
     return vbcl_wayland_thread_start(&g_GtkClipCtx.Thread, vbcl_wayland_hlp_gtk_worker, "wl-gtk-ipc", &g_GtkClipCtx);

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp

@@ -45 +45 @@
 #include "wayland-helper-ipc.h"
 
-RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(char *szBuf, size_t cbBuf)
+RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(const char *szNamePrefix, char *szBuf, size_t cbBuf)
 {
     int rc;
@@ -53 +53 @@
     struct passwd *pwd;
 
-    AssertReturn(RT_VALID_PTR(szBuf), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(szNamePrefix, VERR_INVALID_POINTER);
+    AssertPtrReturn(szBuf, VERR_INVALID_POINTER);
     AssertReturn(cbBuf > 0, VERR_INVALID_PARAMETER);
 
@@ -60 +61 @@
 
     rc = RTStrCat(szBuf, cbBuf, "GtkHlpIpcServer-");
+    if (RT_SUCCESS(rc))
+        rc = RTStrCat(szBuf, cbBuf, szNamePrefix);
+    if (RT_SUCCESS(rc))
+        rc = RTStrCat(szBuf, cbBuf, "-");
     if (RT_SUCCESS(rc))
         rc = RTLinuxSysFsReadStrFile(pszActiveTTY, sizeof(pszActiveTTY) - 1 /* reserve last byte for string termination */,

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h

@@ -60 +60 @@
 /** Limit maximum log verbosity level for popup tool. */
 #define VBOXWL_VERBOSITY_MAX            (5)
+
+/** IPC server socket name prefixes. */
+#define VBOXWL_SRV_NAME_PREFIX_CLIP     "clip"
 
 /** Arguments to vboxwl tool. */
@@ -415 +418 @@
  * This function should be used by both IPC server and client code
  * in order to connect one to another. Output string will be in
- * format: GtkHlpIpcServer-<active tty>-<user name>.
+ * format: GtkHlpIpcServer-<prefix>--<active tty>-<user name>.
  *
  * @returns     IPRT status code.
- * @param       szBuf   Where to store generated name string.
- * @param       cbBuf   Size of buffer.
+ * @param       szNamePrefix    Name prefix.
+ * @param       szBuf           Where to store generated name string.
+ * @param       cbBuf           Size of buffer.
  */
-RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(char *szBuf, size_t cbBuf);
+RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(const char *szNamePrefix, char *szBuf, size_t cbBuf);
 
 #endif /* !GA_INCLUDED_SRC_x11_VBoxClient_wayland_helper_ipc_h */