From: VMware, Inc <>
Date: Sat, 28 May 2011 20:17:42 +0000 (-0700)
Subject: Refreshing list of shared folders.
X-Git-Tag: 2011.05.27-420096~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e82d5b8cc460e0188ab19c8a9c25916388f3f47b;p=thirdparty%2Fopen-vm-tools.git

Refreshing list of shared folders.

MacOS keeps root directory opened indefinitly. When guest enumerates
shared folders HGFS server always returns cached entries. As a result if shared folders
configuration is change this change is not reflected in the guest.

The short term solution is to refresh list of shared folders every time when
reading the first directory entry in the root directory.

In the long term we need to stop caching directory entries in HGFS server since it is
almost impossible to keep cahced entrie list consistent with underlying file system.
File systems has support to resume directory enumeration from a arbitrary point
and HGFS server should use this feature to handle searchRead requests.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index 30a0c3f2a..a291cafa8 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -285,6 +285,8 @@ static void Hgfs_NotificationCallback(HgfsSharedFolderHandle sharedFolder,
                                       char* fileName,
                                       uint32 mask,
                                       struct HgfsSessionInfo *session);
+static void HgfsFreeSearchDirents(HgfsSearch *search);
+
 
 /*
  * Opcode handlers
@@ -2346,6 +2348,38 @@ HgfsAddNewSearch(char const *utf8Dir,       // IN: UTF8 name of dir to search in
 }
 
 
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * HgfsFreeSearchDirents --
+ *
+ *    Frees all dirents and dirents pointer array.
+ *
+ *    Caller should hold the session's searchArrayLock.
+ *
+ * Results:
+ *    None
+ *
+ * Side effects:
+ *    None
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+static void
+HgfsFreeSearchDirents(HgfsSearch *search)       // IN/OUT: search
+{
+   unsigned int i;
+
+   if (search->dents) {
+      for (i = 0; i < search->numDents; i++) {
+         free(search->dents[i]);
+      }
+      free(search->dents);
+   }
+}
+
+
 /*
  *-----------------------------------------------------------------------------
  *
@@ -2374,17 +2408,7 @@ HgfsRemoveSearchInternal(HgfsSearch *search,       // IN: search
    LOG(4, ("%s: handle %u, dir %s\n", __FUNCTION__,
            HgfsSearch2SearchHandle(search), search->utf8Dir));
 
-   /* Free all of the dirents */
-   if (search->dents) {
-      unsigned int i;
-
-      for (i = 0; i < search->numDents; i++) {
-         free(search->dents[i]);
-      }
-
-      free(search->dents);
-   }
-
+   HgfsFreeSearchDirents(search);
    free(search->utf8Dir);
    free(search->utf8ShareName);
    free((char*)search->shareInfo.rootDir);
@@ -7675,6 +7699,28 @@ HgfsServerSearchRead(HgfsInputParam *input)  // IN: Input params
                              search.utf8ShareName));
                      status = HGFS_ERROR_FILE_NOT_FOUND;
                   }
+               } else if (0 == info.startIndex) {
+                  HgfsSearch *rootSearch;
+
+                  MXUser_AcquireExclLock(input->session->searchArrayLock);
+
+                  rootSearch = HgfsSearchHandle2Search(hgfsSearchHandle, input->session);
+                  ASSERT(NULL != rootSearch);
+                  HgfsFreeSearchDirents(rootSearch);
+
+                  rootSearch->numDents =
+                     HgfsServerGetDents(HgfsServerPolicy_GetShares,
+                                        HgfsServerPolicy_GetSharesInit,
+                                        HgfsServerPolicy_GetSharesCleanup,
+                                        &rootSearch->dents);
+                  if (rootSearch->numDents < 0) {
+                     ASSERT_DEVEL(0);
+                     LOG(4, ("%s: couldn't get root dents\n", __FUNCTION__));
+                     rootSearch->numDents = 0;
+                     status = HGFS_ERROR_INTERNAL;
+                  }
+
+                  MXUser_ReleaseExclLock(input->session->searchArrayLock);
                }
 
                if (HGFS_ERROR_SUCCESS == status) {