Changeset 966

Timestamp:

Aug 19, 2016, 2:24:06 PM (9 years ago)

Author:

Yuri Dario

Message:

Samba code changes for using new dircache API. ticket#274.

Location:

trunk/client/src

Files:

• ndpsmb.c (modified) (12 diffs)
• smbwrp.c (modified) (5 diffs)
• smbwrp.h (modified) (2 diffs)

trunk/client/src/ndpsmb.c

@@ -29 +29 @@
 #define INCL_LONGLONG
 #include <ndextpl2.h>
+#include "dircache.h"
 #include "smbwrp.h"
 #include "util.h"
@@ -499 +500 @@
          * the above values come from the gui. default: timeout 10; listings: 32
         */
-        dircache_create(pRes);
+        dircache_create(&pRes->pdc, (void*) pRes,
+                        pRes->cachetimeout, pRes->cachedepth);
 
         return rc;
@@ -715 +717 @@
         Resource *pRes = (Resource *)resource;
         ENTER();
-        dircache_delete(pRes);
+
+        // free cache dir
+        dircache_delete(pRes->pdc);
+
+        // free local resources
         memset(&pRes->srv, 0, sizeof(pRes->srv));
         debuglocal(pRes, 9, "NdpFreeResource %d\n", NO_ERROR);
@@ -957 +963 @@
            // First check if there is information in the directory cache.
            unsigned long ulAge = 0;
-           if (dircache_find_path(pRes, szPath, &finfo, &ulAge))
+           if (dircache_find_path(pRes->pdc, szPath, &finfo, &ulAge))
            {
               if (ulAge <= 15) /* @todo configurable. */
@@ -1201 +1207 @@
 
         // delete the dir cache
-        dircache_invalidate(szPathName, pRes, 1);
+        dircache_invalidate(pRes->pdc, szPathName, 1);
 
         do {
@@ -1514 +1520 @@
         debuglocal(pRes, 9, "NdpForceDelete in [%p]\n", pConn);
 
-        dircache_invalidate(szFile, pRes, 1);
+        dircache_invalidate(pRes->pdc, szFile, 1);
 
         do {
@@ -1543 +1549 @@
         debuglocal(pRes, 9, "NdpCreateDir in [%p]\n", pConn);
 
-        dircache_invalidate(szDirName, pRes, 1);
+        dircache_invalidate(pRes->pdc, szDirName, 1);
 
         do {
@@ -1575 +1581 @@
         debuglocal(pRes, 9, "NdpDeleteDir in [%p]\n", pConn);
 
-        dircache_invalidate(szDir, pRes, 1);
+        dircache_invalidate(pRes->pdc, szDir, 1);
 
         do {
@@ -1605 +1611 @@
         debuglocal(pRes, 9, "NdpMove in [%p] from <%s> to <%s>\n", pConn, szSrc, szDst);
 
-        dircache_invalidate(szSrc, pRes, 1);
-        dircache_invalidate(szDst, pRes, 1);
+        dircache_invalidate(pRes->pdc, szSrc, 1);
+        dircache_invalidate(pRes->pdc, szDst, 1);
 
         do
@@ -1669 +1675 @@
 
         if (flags & O_CREAT)
-           dircache_invalidate(szFileName, pRes, 1);
+           dircache_invalidate(pRes->pdc, szFileName, 1);
 
         do {
@@ -2015 +2021 @@
 
         // delete the dir cache
-        dircache_invalidate(pConn->file.fullname, pRes, 1);
+        dircache_invalidate(pRes->pdc, pConn->file.fullname, 1);
 
         do {
@@ -2222 +2228 @@
          * a new function needs to be done to update only one file in the cache
         */
-        dircache_invalidate(pConn->file.fullname, pRes, 1);
+        dircache_invalidate(pRes->pdc, pConn->file.fullname, 1);
 
         do {

trunk/client/src/smbwrp.c

@@ -26 +26 @@
 #include "libsmb/clirap.h"
 #include "trans2.h"
+
+#include "dircache.h"
 #include "smbwrp.h"
 
@@ -806 +808 @@
 
         // Try to get the listing from cache.
-        if (dircache_list_files(fn, state, &num_finfo))
+        if (dircache_list_files(pRes->pdc, fn, state->plist,
+                                state->mask, (char*) state->fullpath, &num_finfo))
            return(num_finfo); // Got from cache
 
@@ -838 +841 @@
            goto fail;
 
-        dircachectx = dircache_write_begin(state, num_finfo);
+        dircachectx = dircache_write_begin(pRes->pdc, state->mask,
+                                           (char*) state->fullpath, num_finfo);
 
         debuglocal(pRes, 4,"list_files: got %d files\n", num_finfo);
@@ -854 +858 @@
            fn(cli->dfs_mountpoint, &wrpfinfo, mask, state);
            // Also add the entry to the cache.
-           dircache_write_entry(pRes, dircachectx, &wrpfinfo);
-        }
-
-        dircache_write_end(pRes, dircachectx);
+           dircache_write_entry(pRes->pdc, dircachectx, &wrpfinfo);
+        }
+
+        dircache_write_end(pRes->pdc, dircachectx);
+
  fail:
         TALLOC_FREE(frame);
@@ -988 +993 @@
 }
 
-
-#pragma pack(1)
-typedef struct _FEA
-{
-        unsigned char fEA;      // flags
-        unsigned char cbName;   // name length not including NULL
-        unsigned short cbValue; // value length
-} FEA;
-
-typedef struct _FEALIST
-{
-        unsigned long cbList;   // total bytes of structure including full list
-        FEA list[1];            // variable length FEA structures
-} FEALIST;
-#pragma pack()
 
 static int unilistea(Resource *pRes, cli_state * cli, char *fname, void * buffer, unsigned long size)

trunk/client/src/smbwrp.h

@@ -130 +130 @@
 } FSALLOCATE;
 #endif
-
-struct DirectoryCache;
 
 typedef struct _Resource
@@ -203 +201 @@
 int _System smbwrp_dskattr(Resource *pRes, cli_state * cli, FSALLOCATE *pfsa);
 
-/* Directory cache helpers. */
-int dircache_create(Resource *pRes);
-void dircache_delete(Resource *pRes);
-
-typedef void FNADDDIRENTRY(const char*, smbwrp_fileinfo *, const char *, void *);
-typedef FNADDDIRENTRY *PFNADDDIRENTRY;
-
-/* Note: dircache_list_files or dircache_write_begin construct the directory path
- *       using information in the filelist_state structure.
- */
-int dircache_list_files(PFNADDDIRENTRY fn,
-                        filelist_state *state,
-                        int *ptotal_received);
-
-void *dircache_write_begin(filelist_state *state,
-                           int cFiles);
-void dircache_write_entry(Resource *pRes, void *dircachectx, const smbwrp_fileinfo *finfo);
-void dircache_write_end(Resource *pRes, void *dircachectx);
-
-void dircache_invalidate(const char *path,
-                         Resource *pRes,
-                         int fParent);
-
-int dircache_find_path(Resource *pRes,
-                       const char *path,
-                       smbwrp_fileinfo *finfo,
-                       unsigned long *pulAge);
-
 /* Prototype the debug log helper. */
 void debuglocal(Resource *pRes, int level, const char * fmt, ...);