Changeset 1003 for branches/client-3.0/src/smbwrp.c

Timestamp:

Dec 30, 2016, 9:42:50 AM (9 years ago)

Author:

Paul Smedley

Message:

client-3.0: revert mistaken commit of dircache.c, add cache support to list_files_smb2

File:

• branches/client-3.0/src/smbwrp.c (modified) (4 diffs)

branches/client-3.0/src/smbwrp.c

@@ -957 +957 @@
         smbwrp_fileinfo wrpfinfo;
 
+        //Init cache - don't know number of files so init with 128
+        dircachectx = dircache_write_begin(state, 128);
+
         if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
@@ -1075 +1078 @@
                                         pathname,
                                         state);
+                                // Also add the entry to the cache.
+                                dircache_write_entry(dircachectx, &wrpfinfo);
 
                                 if (!NT_STATUS_IS_OK(status)) {
@@ -1118 +1123 @@
                 status = NT_STATUS_NO_SUCH_FILE;
         }
-
+        dircache_write_end(dircachectx);
   fail:
 
@@ -1148 +1153 @@
         smbwrp_fileinfo wrpfinfo;
 
+        /* Try to get the listing from cache. */
+        if (dircache_list_files(fn, state, &num_finfo))
+        {
+                /* Got from cache. */
+                return(num_finfo);
+        }
+
         if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
         debuglocal(4,"SMB2 detected, calling list_files_smb2()\n");
                 return list_files_smb2(cli, mask, attribute, fn, state);
-        }
-
-        /* Try to get the listing from cache. */
-        if (dircache_list_files(fn, state, &num_finfo))
-        {
-                /* Got from cache. */
-                return(num_finfo);
         }