Changeset 75411 in vbox

Timestamp:

Nov 12, 2018 8:31:05 PM (6 years ago)

Author:

vboxsync

Message:

VBoxSharedFolders,VBoxService,VBoxTray: New go at auto mounting shared folders, now also at runtime. bugref:3544 [build fix]

• Added three new functions to the shared folders service:
  1. query mountpoint and everything else about a shared folder.
  2. wait for folder (mappings) config changes.
  3. cancel such waits.
• Relaxed some of the check wrt placeholder folders so that the GUI can succesfully make changes to a folder while it is being used. The old code would end up failing if the guest was using the folder because of a (placeholder) duplicate.
• Ran into some weird weird flag passing between service.cpp and vbsfMappingsQuery via pClient->fu32Flags. Didn't make sense to me and clashed with a new flag I added for the wait cancellation, so I changed it to use a parameter (fOnlyAutoMounts) for the purpose.
• Pointed out that vbsfMappingsQuery is weird in a the way it doesn't return an overflow indicator, meaning that the guest library wrapper's checks for VINF_BUFFER_OVERFLOW is pointless.
• In VBoxService I've reimplemented the automounter subservice. Only tested with a windows 7 guest so far. Highlights:
  • Use host specified mount points / drive letters.
  • Adjust to changes in mapping configuration.
  • Mappings should be global on windows guests, given that VBoxService runs under the System user (only verified on Win7).
• One TODO is that I would like to try relocate a mapping that's not on the specified mount point once the mount point is freed up.
• VBoxTray no longer maps shared folder on startup.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (3 diffs)

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

@@ -60 +60 @@
 #  include <sys/mnttab.h>
 #  include <sys/vfs.h>
+RT_C_DECLS_BEGIN /* Only needed for old code.*/
+#  include "../../linux/sharedfolders/vbsfmount.h"
+RT_C_DECLS_END
 # elif defined(RT_OS_LINUX)
 #  include <mntent.h>
@@ -1000 +1003 @@
             {
                 /* Look for the dummy automounter option. */
-                if (   Entry.mnt_opts != NULL
-                    && strstr(Entry.mnt_opts, g_szTag) != NULL)
+                if (   Entry.mnt_mntopts != NULL
+                    && strstr(Entry.mnt_mntopts, g_szTag) != NULL)
                 {
                     rc = vbsvcAutomounterAddEntry(pMountTable, Entry.mnt_special, Entry.mnt_mountp);
@@ -1523 +1526 @@
 
     rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, MS_OPTIONSTR, "vboxfs",
-               NULL /*dataptr*/, 0 /* datalen */, szOptBuf, cchOpts + 1);
+               NULL /*dataptr*/, 0 /* datalen */, szOpts, cchOpts + 1);
     if (rc == 0)
     {
-        VGSvcVerbose(0, "vbsvcAutomounterMountIt: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+        VGSvcVerbose(0, "vbsvcAutomounterMountIt: Successfully mounted '%s' on '%s'\n",
+                     pEntry->pszName, pEntry->pszActualMountPoint);
         return VINF_SUCCESS;
     }
 
     rc = errno;
-    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' at '%s': %s (%d)\n",
-               pEntry->pszName, pEntry->pszActualMountPoint, strerror(rc), rc);
+    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' on '%s' (szOpts=%s): %s (%d)\n",
+               pEntry->pszName, pEntry->pszActualMountPoint, szOpts, strerror(rc), rc);
     return VERR_OPEN_FAILED;