Changeset 131 for branches/samba-3.0

Timestamp:

Apr 24, 2008, 7:31:30 PM (18 years ago)

Author:

Yuri Dario

Message:

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

File:

• 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 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 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;
+
                 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)