Changeset 131

Timestamp:

04/24/08 19:31:30 (7 months ago)

Author:

ydario

Message:

Check for resource type at mount time, only for nd/ndpm, so ndpm can retry operation. ticket:58.

Files:

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

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

@@ -184 +184 @@
         return dst;
 }
+
+// -------------------------------------------------------------
 
 /* uppercased type of resource */
@@ -914 +916 @@
 }
 
+// -------------------------------------------------------------
+
+/* check if the requested resource is available */
+static int checkMountResource( Resource* pRes)
+{
+        int rc;
+        unsigned long action;
+        smb_request req = {0};
+        smb_response resp = {0};
+        Connection Conn = {0};
+
+        debug_printf("checkMountResource in tid#%d\n", _gettid());
+
+        // open the pipe
+        Conn.pRes = pRes;
+        Conn.file.fd = -1;
+        debug_printf("checkMountResource open pipe\n");
+        rc = openpipe(pRes, &Conn.pipe);
+        if (rc)
+        {
+            debug_printf("checkMountResource open pipe failed rc=%d\n", rc);
+            return rc;
+        }
+
+        // init, get client pid
+        debug_printf("checkMountResource send INIT for '%s'\n", pRes->srv.share_name);
+        req.request = SMBREQ_INIT;
+        req.param = (char *)0xFFFFFFFF;
+        rc = _DosTransactNPipe(&Conn, &req, sizeof(req), &resp, sizeof(resp), &action);
+        if (rc || action < sizeof(resp) || resp.rc)
+        {
+            debug_printf("checkMountResource INIT failed rc=%d\n", rc);
+            // close pipe
+            DosClose( Conn.pipe);
+            return rc;
+        }
+        Conn.clientpid = resp.value & 0xFFFF;
+
+        // allocate shared memory
+        rc = DosAllocSharedMem((PPVOID)&Conn.mem, NULL, pRes->memlen, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE | pRes->objany);
+        if (rc)
+        {
+            debug_printf("checkMountResource DosAllocSharedMem failed rc=%d\n", rc);
+            // close pipe
+            DosClose( Conn.pipe);
+            return rc;
+        }
+        rc = DosGiveSharedMem( Conn.mem, Conn.clientpid, PAG_READ | PAG_WRITE);
+        if (!rc)
+        {
+            // open connection with samba server, just to check share type
+            debug_printf("checkMountResource send CONNECT\n");
+            MemCpy( Conn.mem, &pRes->srv, sizeof(pRes->srv));
+            req.request = SMBREQ_CONNECT;
+            req.param = Conn.mem;
+            req.paramlen = sizeof( Conn.srv);
+            req.length = req.paramlen;
+            rc = _DosTransactNPipe( &Conn, &req, sizeof(req), &resp, sizeof(resp), &action);
+            if (rc || action < sizeof(resp) || resp.rc)
+            {
+                debug_printf("checkMountResource SMBREQ_CONNECT failed rc=%d, resp.rc=%d\n", rc, resp.rc);
+                rc = (rc == NO_ERROR ? resp.rc : rc);
+            }
+            // no more data, close connection   
+            req.request = SMBREQ_DISCONNECT;
+            req.param = Conn.mem;
+            req.length = 0;
+            req.paramlen = 0;
+            _DosTransactNPipe( &Conn, &req, sizeof(req), &resp, sizeof(resp), &action);
+        }
+
+        // free memory
+        DosFreeMem( Conn.mem);
+        // close pipe
+        DosClose( Conn.pipe);
+
+        return rc;
+}
 
 int APIENTRY NdpMountResource (HRESOURCE *presource, int type, NDPROPERTYHANDLE properties)
@@ -920 +1000 @@
         unsigned long objany = OBJ_ANY;
         Resource *pRes = NULL;
-        /* since we support only 1 type of resources we do not need */
+
+        log("NdpMountResource in\n");
+
+        /* since samba plugin support only 1 type of resources we do not need */
         /* to check what the found type really is */
         rc = DosAllocMem((void **)&pRes, sizeof(Resource), PAG_COMMIT | PAG_READ | PAG_WRITE | objany);
@@ -937 +1020 @@
                 pRes->properties = properties;
                 pRes->objany = objany;
+                // parse init string
                 rc = initResource (pRes);
-                if (rc == NO_ERROR)
-                {
+                // try to connect to resource (check type) only if thread!=1, so ndctl startup
+                // is not slowed down by network connections.
+                // ndctl does mounting on main thread (#1)
+                // nd/ndpm do not use main thread
+                if (!rc && _gettid()!=1)
+                    rc = checkMountResource( pRes);
+                if (!rc)
+                {
+                        // store resource data
                         *presource = (HRESOURCE)pRes;
                 }
@@ -947 +1038 @@
                 }
         }
-        log("NdpMountResource %d\n", rc);
-        return rc;
-}
+        log("NdpMountResource rc=%d\n", rc);
+        return rc;
+}
+
+// -------------------------------------------------------------
 
 int APIENTRY NdpCreateConnection (HRESOURCE resource, HCONNECTION *pconn)
@@ -1043 +1136 @@
 }
 
+// -------------------------------------------------------------
 
 int APIENTRY NdpFreeConnection (HCONNECTION conn)