Changeset 121 for branches/samba-3.0/source/ndpsmb/ndpsmb.c

Timestamp:

Feb 18, 2008, 9:28:27 AM (17 years ago)

Author:

Paul Smedley

Message:

Relaunch smbcd when it crashes whilst accessing a file

File:

• branches/samba-3.0/source/ndpsmb/ndpsmb.c (modified) (2 diffs)

branches/samba-3.0/source/ndpsmb/ndpsmb.c

@@ -1278 +1278 @@
         smbwrp_fileinfo * finfo = (smbwrp_fileinfo *)pConn->mem;
         char path[CCHMAXPATH+1] = {0};
-
-        log("NdpQueryInfo in <%s>\n", szPath);
-
-        do {
-                if (ph->fsphStrChr(szPath, '*') || ph->fsphStrChr(szPath, '?'))
-                {
-                        rc = ERROR_FILE_NOT_FOUND;
-                        break;
-                }
-
-                rc = checkconnection(pConn);
-                if (rc)
-                {
-                        break;
-                }
-
-                rc = pathparser(pRes, pConn, szPath, path);
-                switch (rc)
-                {
-                        case NO_ERROR :
-                        case ERROR_FILE_NOT_FOUND:
-                        case ERROR_PATH_NOT_FOUND:
-                        case ERROR_ACCESS_DENIED:
-                        case ERROR_INVALID_PARAMETER:
-                        {
+        int retry = 0;
+
+        do
+          {
+                log("NdpQueryInfo in <%s>, retry = %d\n", szPath, retry);
+
+                do {
+
+                        if (ph->fsphStrChr(szPath, '*') || ph->fsphStrChr(szPath, '?'))
+                        {
+                                rc = ERROR_FILE_NOT_FOUND;
                                 break;
                         }
-                        default :
-                        {       
-                                rc = ERROR_PATH_NOT_FOUND;
-                        }
-                }
-                if (rc)
-                {
-                        break;
-                }
-                StrNCpy(finfo->fname, path, sizeof(finfo->fname) - 1);
-                req.request = SMBREQ_GETINFO;
-                req.param = pConn->mem;
-                req.paramlen = sizeof(*finfo);
-                req.length = req.paramlen;
-                pConn->rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
-                if (pConn->rc || action < sizeof(resp) || resp.rc)
-                {
-                        switch (resp.rc)
+
+                        rc = checkconnection(pConn);
+                        if (rc)
+                        {
+                                break;
+                        }
+
+                        rc = pathparser(pRes, pConn, szPath, path);
+                        switch (rc)
                         {
                                 case NO_ERROR :
@@ -1329 +1306 @@
                                 case ERROR_ACCESS_DENIED:
                                 case ERROR_INVALID_PARAMETER:
+                                {
                                         break;
+                                }
                                 default :
+                                {       
+                                        rc = ERROR_PATH_NOT_FOUND;
+                                }
+                        }
+                        if (rc)
+                        {
+                                break;
+                        }
+                        StrNCpy(finfo->fname, path, sizeof(finfo->fname) - 1);
+                        req.request = SMBREQ_GETINFO;
+                        req.param = pConn->mem;
+                        req.paramlen = sizeof(*finfo);
+                        req.length = req.paramlen;
+                        pConn->rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
+                        if (pConn->rc || action < sizeof(resp) || resp.rc)
+                        {
+                                switch (resp.rc)
                                 {
-                                        resp.rc = ERROR_PATH_NOT_FOUND;
+                                        case NO_ERROR :
+                                        case ERROR_FILE_NOT_FOUND:
+                                        case ERROR_PATH_NOT_FOUND:
+                                        case ERROR_ACCESS_DENIED:
+                                        case ERROR_INVALID_PARAMETER:
+                                        break;
+                                        default :
+                                        {
+                                                resp.rc = ERROR_PATH_NOT_FOUND;
+                                        }
                                 }
-                        }
-                        rc = pConn->rc ? pConn->rc : (resp.rc ? resp.rc : ERROR_INVALID_PARAMETER);
-                }
-                else
-                {
-                        finfo->easize = -1;
-                        if (ifL)
-                        {
-                                getfindinfoL(pConn, plist, finfo, 0, NULL);
+                                rc = pConn->rc ? pConn->rc : (resp.rc ? resp.rc : ERROR_INVALID_PARAMETER);
                         }
                         else
                         {
-                                int trc;
-                                FILEFINDBUF3 buf = {0};
-                                getfindinfo(pConn, &buf, finfo);
-                                trc = ph->fsphAddFileFind32(plist, &buf, finfo, sizeof(*finfo), 0);
-                                log("NdpQueryInfo got info <%s> attr %08x size %d namelen %d date %lu %lu. Plist 0x%08x rc = %d\n", buf.achName, buf.attrFile, buf.cbFile, buf.cchName, buf.fdateLastWrite, buf.ftimeLastWrite, plist, trc);
-                        }
-                }
-                if (rc == ERROR_FILE_NOT_FOUND)
-                {
-                        // now try the upper path
-                        char * p = ph->fsphStrChr(finfo->fname, '\\');
-                        if (p && p > finfo->fname)
-                        {
-                                *p = 0;
-                                rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
-                                if (pConn->rc || action < sizeof(resp) || resp.rc)
-                                {       
-                                        rc = pConn->rc ? pConn->rc : (resp.rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER);
+                                finfo->easize = -1;
+                                if (ifL)
+                                {
+                                        getfindinfoL(pConn, plist, finfo, 0, NULL);
                                 }
-                        }
-                }
-        } while (0);
-
-        log("NdpQueryInfo <%s> (%s) %d %d\n", szPath, path, rc, pConn->rc);
+                                else
+                                {
+                                        int trc;
+                                        FILEFINDBUF3 buf = {0};
+                                        getfindinfo(pConn, &buf, finfo);
+                                        trc = ph->fsphAddFileFind32(plist, &buf, finfo, sizeof(*finfo), 0);
+                                        log("NdpQueryInfo got info <%s> attr %08x size %d namelen %d date %lu %lu. Plist 0x%08x rc = %d\n", buf.achName, buf.attrFile, buf.cbFile, buf.cchName, buf.fdateLastWrite, buf.ftimeLastWrite, plist, trc);
+                                }
+                        }
+                        if (rc == ERROR_FILE_NOT_FOUND)
+                        {
+                                // now try the upper path
+                                char * p = ph->fsphStrChr(finfo->fname, '\\');
+                                if (p && p > finfo->fname)
+                                {
+                                        *p = 0;
+                                        rc = _DosTransactNPipe(pConn, &req, sizeof(req), &resp, sizeof(resp), &action);
+                                        if (pConn->rc || action < sizeof(resp) || resp.rc)
+                                        {       
+                                                rc = pConn->rc ? pConn->rc : (resp.rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER);
+                                        }
+                                }
+                        }
+                } while (0);
+                log("NdpQueryInfo <%s> (%s) %d %d\n", szPath, path, rc, pConn->rc);
+                retry = rc && !retry;
+        } while (retyr);
+        
         return rc;
 }