Changeset 150

Timestamp:

08/20/08 14:29:02 (3 months ago)

Author:

ydario

Message:

Handle automatic reconnection, fixes for return codes.

Location:

branches/client-1.5/src

Files:

• ndpsmb.c (modified) (10 diffs)
• smbwrp.c (modified) (3 diffs)

branches/client-1.5/src/ndpsmb.c

@@ -856 +856 @@
             pfsa->cUnitAvail = 123456;
             pfsa->cbSector = 2048;
+            rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED);
             return rc;
         }
@@ -913 +914 @@
                 free(pConn);
                 pConn = NULL;
+                rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_INVALID_PARAMETER);
         }
 
@@ -944 +946 @@
 // -------------------------------------------------------------
 
+/* 
+ * NdpQueryPathInfo is the most important  function :) netdrive always calls
+ * the function before every operation to find out the path status: does it exist, is it a file, does a
+ *  parent directory exist, etc.
+ * Plugin must return one of the following error codes:
+ * NO_ERROR - path exists and the path information have been successfully retrieved.
+ * ERROR_FILE_NOT_FOUND - all but the last component of the path exist and the 
+ *    path without the last component is a directory. dir1_ok\dir2_ok\does_not_exist. 
+ *    the wildcard can not exist, so the plugin returns FILE_NOT_FOUND, if the parent 
+ *    directory exist.
+ * ERROR_PATH_NOT_FOUND - any of not last path components does not exist, or all
+ *    but the last component exist and is a file: \dir_ok\dir2_ok\file_ok\non_existing.
+ * ERROR_REM_NOT_LIST - resource is temporarily unavailable for some reasons.
+ * Any other error codes means an internal plugin error, not related to the status 
+ * of the path queried.
+ */
 int APIENTRY NdpQueryPathInfo (HCONNECTION conn, void *plist, char *szPath)
 {
@@ -954 +972 @@
         int retry = 0;
 
-        do
-          {
                 log("NdpQueryPathInfo in <%s>, retry = %d\n", szPath, retry);
+        
+                // is wildcard is specified, we suppose parent dir exist, so exit immediately
+                if (ph->fsphStrChr(szPath, '*') || ph->fsphStrChr(szPath, '?'))
+                {
+                        return ERROR_FILE_NOT_FOUND;
+                }
+
 
                 do {
-
-                        if (ph->fsphStrChr(szPath, '*') || ph->fsphStrChr(szPath, '?'))
-                        {
-                                rc = ERROR_FILE_NOT_FOUND;
-                                break;
-                        }
 
                         rc = pathparser(pRes, pConn, szPath, path);
@@ -992 +1009 @@
                         if (rc)
                         {
+                                // remote server not available for first time?
+                                if (rc == ERROR_REM_NOT_LIST && retry == 0)
+                                {
+                                    // free current cli resources
+                                    smbwrp_disconnect( pRes, pConn->cli);
+                                    // reconnect
+                                    smbwrp_connect( pRes, &pConn->cli);
+                                    // try file list again
+                                    rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
+                                    log("NdpQueryPathInfo remote connection lost, retry rc = %d\n", rc);
+                                }
                                 switch (rc)
                                 {
@@ -999 +1027 @@
                                         case ERROR_ACCESS_DENIED:
                                         case ERROR_INVALID_PARAMETER:
+                                        case ERROR_REM_NOT_LIST:
                                         break;
                                         default :
@@ -1005 +1034 @@
                                         }
                                 }
-                                rc =rc ? rc : ERROR_INVALID_PARAMETER;
                         }
                         else
@@ -1022 +1050 @@
                                         if (rc)
                                         {       
-                                                rc = rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER;
+                                            log("NdpQueryPathInfo upper path in <%s>, retry = %d\n",  finfo.fname, retry);
+                                            rc = rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER;
                                         }
                                 }
@@ -1028 +1057 @@
                 } while (0);
                 log("NdpQueryPathInfo <%s> (%s) %d\n", szPath, path, rc);
-                retry = rc && !retry;
-
-        } while (retry);
-        
+
         return rc;
 }
@@ -1096 +1122 @@
                 }
                 rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
+                // we need to handle reconnection also here, because NdpQueryPathInfo 
+                // could be called with '*' and exit then immediately (without calling libsmb) 
+                if (rc == ERROR_REM_NOT_LIST)
+                {
+                    // free current cli resources
+                    smbwrp_disconnect( pRes, pConn->cli);
+                    // reconnect
+                    smbwrp_connect( pRes, &pConn->cli);
+                    // try file list again next loop
+                    rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
+                    log("NdpFindStart remote connection lost, retry rc = %d\n", rc);
+                }
 
         log("NdpFindStart <%s> (%s) cnt %d %d\n", szPath, path, count, rc);

branches/client-1.5/src/smbwrp.c

@@ +1 @@
+
 #include "includes.h"
 
@@ -95 +96 @@
         if (cli->fd == -1)
         {
-                return ENOTCONN;
+                return maperror( ENOTCONN);
         }
         return maperror(cli_errno(cli));
@@ -495 +496 @@
 
         debuglocal(4," tconx ok. cli caps %08x\n", c->capabilities);
-
+        
         // save cli_state pointer
         *cli = c;