Changeset 966 for trunk/client/src/ndpsmb.c

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.

File:

• trunk/client/src/ndpsmb.c (modified) (12 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 {