Changeset 102654 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 20, 2023 4:10:26 PM (13 months ago)

Author:

vboxsync

Message:

Guest Control: Implemented IGuestSession::getMountPoints. bugref:10415

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (4 diffs)
• VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -1175 +1175 @@
 /**
  * Retrieves a HOST_PATH_RENAME message.
+ *
+ * @returns VBox status code.
+ * @param   pCtx                Guest control command context to use.
+ * @param   pszSource           Where to return the source path.
+ * @param   cbSource            Size (in bytes) of \a pszSource.
+ * @param   pszDest             Where to return the destination path.
+ * @param   cbDest              Size (in bytes) of \a pszDest.
+ * @param   pfFlags             Where to return the rename flags.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlPathGetRename(PVBGLR3GUESTCTRLCMDCTX     pCtx,
@@ -1214 +1222 @@
 /**
  * Retrieves a HOST_PATH_USER_DOCUMENTS message.
+ *
+ * @param   pCtx                Guest control command context to use.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserDocuments(PVBGLR3GUESTCTRLCMDCTX pCtx)
@@ -1237 +1247 @@
 /**
  * Retrieves a HOST_PATH_USER_HOME message.
+ *
+ * @param   pCtx                Guest control command context to use.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserHome(PVBGLR3GUESTCTRLCMDCTX pCtx)
@@ -1249 +1261 @@
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_PATH_USER_HOME);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            Msg.context.GetUInt32(&pCtx->uContextID);
+    } while (rc == VERR_INTERRUPTED && g_fVbglR3GuestCtrlHavePeekGetCancel);
+    return rc;
+}
+
+
+/**
+ * Retrieves a HOST_MSG_MOUNT_POINTS message.
+ *
+ * @param   pCtx                Guest control command context to use.
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlGetMountPoints(PVBGLR3GUESTCTRLCMDCTX pCtx)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(pCtx->uNumParms == 1, VERR_INVALID_PARAMETER);
+
+    int rc;
+    do
+    {
+        HGCMMsgPathUserHome Msg;
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
+        VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_MOUNT_POINTS);
 
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1707 +1707 @@
 
 /**
+ * Structure for keeping a mount point enumeration context.
+ */
+typedef struct VGSVCMOUNTPOINTENUMCTX
+{
+    /** Mount points as strings, delimited with a string terminator ('\0').
+     *  List ends with an additional string terminator. Might get re-allocated, so don't rely on this pointer! */
+    char  *psz;
+    /** Current size of \a psz in bytes. Includes ending terminator. */
+    size_t cb;
+    /** Total allocation Size of \a psz in bytes. */
+    size_t cbAlloc;
+} VGSVCMOUNTPOINTENUMCTX;
+/** Pointer to a structure for keeping a mount point enumeration context. */
+typedef VGSVCMOUNTPOINTENUMCTX *PVGSVCMOUNTPOINTENUMCTX;
+
+/**
+ * Enumeration callback for storing the mount points.
+ *
+ * @returns VBox status code.
+ * @param   pszMountpoint       Mount point to handle.
+ * @param   pvUser              Pointer of type PVGSVCMOUNTPOINTENUMCTX.
+ */
+DECLCALLBACK(int) vgsvcGstCtrlSessionHandleMountPointsEnumCallback(const char *pszMountpoint, void *pvUser)
+{
+    PVGSVCMOUNTPOINTENUMCTX pCtx = (PVGSVCMOUNTPOINTENUMCTX)pvUser;
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    size_t const cch = strlen(pszMountpoint) + 1 /* Entry terminator */;
+    AssertReturn(cch < RTPATH_MAX, VERR_INVALID_PARAMETER); /* Paranoia. */
+    if (cch > pCtx->cbAlloc - pCtx->cb - 1 /* Ending terminator */)
+    {
+        char *pszNew;
+        int rc2 = RTStrRealloc(&pszNew, pCtx->cbAlloc + RT_MAX(_4K, cch));
+        AssertRCReturn(rc2, rc2);
+        pCtx->psz = pszNew;
+    }
+
+    memcpy(&pCtx->psz[pCtx->cb], pszMountpoint, cch);
+    pCtx->cb += cch;
+    AssertReturn(pCtx->cb <= pCtx->cbAlloc, VERR_BUFFER_OVERFLOW); /* Paranoia. */
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Handles getting the current mount points.
+ *
+ * @returns VBox status code.
+ * @param   pSession        Guest session.
+ * @param   pHostCtx        Host context.
+ */
+static int vgsvcGstCtrlSessionHandleMountPoints(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
+
+    /*
+     * Retrieve the request.
+     */
+    int rc = VbglR3GuestCtrlGetMountPoints(pHostCtx);
+    if (RT_SUCCESS(rc))
+    {
+        VGSVCMOUNTPOINTENUMCTX Ctx;
+        Ctx.cb      = 0;
+        Ctx.cbAlloc = _4K; /* Start with something sensible. */
+        Ctx.psz     = RTStrAlloc(Ctx.cbAlloc);
+        if (!Ctx.psz)
+            rc = VERR_NO_MEMORY;
+
+        if (RT_SUCCESS(rc))
+            rc = RTFsMountpointsEnum(vgsvcGstCtrlSessionHandleMountPointsEnumCallback, &Ctx);
+
+        /* Report back in any case. */
+        int rc2 = VbglR3GuestCtrlMsgReplyEx(pHostCtx, rc, 0 /* Type */, Ctx.psz,
+                                            RT_SUCCESS(rc) ? (uint32_t)Ctx.cb : 0);
+        if (RT_FAILURE(rc2))
+        {
+            VGSvcError("Failed to report mount points, rc=%Rrc\n", rc2);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
+
+        RTStrFree(Ctx.psz);
+        Ctx.psz = NULL;
+    }
+    else
+    {
+        VGSvcError("Error fetching parameters for getting mount points request: %Rrc\n", rc);
+        VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID, rc, UINT32_MAX);
+    }
+    return rc;
+}
+
+
+/**
  * Handles starting a guest processes.
  *
@@ -2450 +2545 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandlePathUserHome(pSession, pHostCtx);
+            break;
+
+        case HOST_MSG_MOUNT_POINTS:
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleMountPoints(pSession, pHostCtx);
             break;