Changeset 963

Timestamp:

Aug 19, 2016, 1:40:37 PM (9 years ago)

Author:

Yuri Dario

Message:

Store full path of connection in the resource data structure.
ticket#274.

File:

• trunk/client/src/ndpsmb.c (modified) (13 diffs)

trunk/client/src/ndpsmb.c

@@ -196 +196 @@
         return rc;
 }
+
+/* from ndpl2.c sample:
+ * Helper to concatenate parent path, stored as resource data in
+ * NdpQueryPathInfo and a file object name returned by NdpQueryPathInfo.
+ */
+static void buildfullpath2 (char *szFullPath, NDDATABUF *rsrcData, NDFILEINFO *pfi)
+{
+    *szFullPath = '\0';
+    if (rsrcData->ulSize > 0)
+    {
+        memcpy (szFullPath, rsrcData->pData, rsrcData->ulSize);
+    }
+    strcat( szFullPath, pfi->pszName);
+}
+
 
 int APIENTRY NdpPluginLoad (PLUGINHELPERTABLE2L *pPHT)
@@ -922 +937 @@
         int rc = 0;
         int rcCon = 0;
-        unsigned long action;
         char path[CCHMAXPATH+1] = {0};
+        NDPATHELEMENT *pel = NULL;
 
         ENTER();
@@ -1025 +1040 @@
            }
         } while (0);
+
+        // if file/path exists, store parent path in resourcedata
+        // for NdpEA* calls
+        if ((rc == NO_ERROR || rc == ERROR_FILE_NOT_FOUND)
+                && (pel = ph->fsphNameElem (0)))
+        {
+            char szFullPath[CCHMAXPATH+1] = {0};
+            // save parent full path for future use in NdpEA* calls
+            strcpy(szFullPath, szPath);
+            // strip pel name, leaving ending slash in place
+            int len = strlen(szFullPath) - pel->length;
+            szFullPath[len] = '\0';
+            int rc2 = ph->fsphSetResourceData( plist, szFullPath, strlen(szFullPath) + 1);
+            debuglocal(pRes, 9, "NdpQueryPathInfo <%s> plist %x, szFullPath (%s), rc2=%d\n",
+                       szPath, plist, szFullPath, rc2);
+        }
+
         debuglocal(pRes, 9, "NdpQueryPathInfo <%s> (%s) %d\n", szPath, path, rc);
 
@@ -1258 +1290 @@
         Resource *pRes = pConn->pRes;
         int rc = 0;
-        unsigned long action;
-        char * path = NULL;
         FEALIST * pFEASrc;
         NDDATABUF fdata = {0};
-        smbwrp_fileinfo *finfo;
         const int cbBuffer = 64*1024;
+        NDDATABUF rsrcData = {0};
+        char szFullPath[CCHMAXPATH+1];
 
         if (!pfi || !pfi->pszName || !pFEAList)
@@ -1271 +1302 @@
            return ERROR_EAS_NOT_SUPPORTED;
 
-        rc = ph->fsphGetFileInfoData(pfi, &fdata, 0);
-        if (rc || !fdata.ulSize || !fdata.pData)
-        {
-           debuglocal(pRes, 9, "NdpEAQuery: ph->fsphGetFileInfoData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
+        // get full path stored in resource data
+        rc = ph->fsphGetResourceData(pfi, &rsrcData, 0);
+        if (rc != NO_ERROR || rsrcData.ulSize == 0 || rsrcData.pData == NULL)
+        {
+           debuglocal(pRes, 9, "NdpEAQuery: ph->fsphGetResourceData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
@@ -1280 +1312 @@
         ENTER();
 
-        finfo = (smbwrp_fileinfo *)fdata.pData;
-        path = finfo->fname;
+        // build full path for file
+        buildfullpath2(szFullPath, &rsrcData, pfi);
+        debuglocal(pRes, 1, "NdpEAQuery szFullPath '%s', pfi->name '%s'\n",
+                   szFullPath, pfi->pszName);
+
         debuglocal(pRes, 9, "NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
@@ -1292 +1327 @@
 
         do {
-           rc = smbwrp_listea(pRes, pConn->cli, path, pchBuffer, cbBuffer);
+           rc = smbwrp_listea(pRes, pConn->cli, szFullPath, pchBuffer, cbBuffer);
            pFEASrc = (FEALIST*) pchBuffer;
            if (rc)
@@ -1326 +1361 @@
         Resource *pRes = pConn->pRes;
         int rc = 0;
-        char * path;
-        unsigned long action;
         NDDATABUF fdata = {0};
-        smbwrp_fileinfo *finfo;
+        NDDATABUF rsrcData = {0};
+        char szFullPath[CCHMAXPATH+1];
 
         debuglocal(pRes, 9, "NdpEASet in [%p]\n", pConn);
@@ -1339 +1373 @@
            return ERROR_EAS_NOT_SUPPORTED;
 
-        rc = ph->fsphGetFileInfoData(pfi, &fdata, 0);
-        if (rc || !fdata.ulSize || !fdata.pData)
-        {
-           debuglocal(pRes, 9, "NdpEASet: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
+        // get full path stored in resource data
+        rc = ph->fsphGetResourceData(pfi, &rsrcData, 0);
+        if (rc != NO_ERROR || rsrcData.ulSize == 0 || rsrcData.pData == NULL)
+        {
+           debuglocal(pRes, 9, "NdpEASet: ph->fsphGetResourceData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
-
-        finfo = (smbwrp_fileinfo *)fdata.pData;
-        path = finfo->fname;
-
-        rc = helperEASet(pRes, pConn->cli, pFEAList, path);
+        // build full path for file
+        buildfullpath2(szFullPath, &rsrcData, pfi);
+        debuglocal(pRes, 9, "NdpEASet szFullPath '%s', pfi->name '%s'\n",
+                   szFullPath, pfi->pszName);
+
+        rc = helperEASet(pRes, pConn->cli, pFEAList, szFullPath);
         debuglocal(pRes, 9, "NdpEASet %d\n", rc);
         return rc;
@@ -1359 +1395 @@
         Resource *pRes = pConn->pRes;
         int rc = 0;
-        unsigned long action;
-        char * path = NULL;
         FEALIST * pfealist;
         NDDATABUF fdata = {0};
-        smbwrp_fileinfo *finfo;
         const int cbBuffer = 64*1024;
-        int easize;
+        NDDATABUF rsrcData = {0};
+        char szFullPath[CCHMAXPATH+1];
 
         if (!pfi || !pulEASize)
@@ -1373 +1407 @@
            return ERROR_EAS_NOT_SUPPORTED;
 
-        rc = ph->fsphGetFileInfoData(pfi, &fdata, 0);
-        if (rc || !fdata.ulSize || !fdata.pData)
-        {
-           debuglocal(pRes, 9, "NdpEASize: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
+        // get full path stored in resource data
+        rc = ph->fsphGetResourceData(pfi, &rsrcData, 0);
+        if (rc != NO_ERROR || rsrcData.ulSize == 0 || rsrcData.pData == NULL)
+        {
+           debuglocal(pRes, 9, "NdpEASize: ph->fsphGetResourceData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
@@ -1382 +1417 @@
         ENTER();
 
-        finfo = (smbwrp_fileinfo *)fdata.pData;
-        easize = finfo->easize;
-        finfo->easize = -1;
-        path = finfo->fname;
-        if (easize >= 0)
-        {
-           *pulEASize = easize;
-           debuglocal(pRes, 9, "NdpEASize <%s> cached %d\n", path, easize);
-           LEAVE();
-           return NO_ERROR;
-        }
-
-        debuglocal(pRes, 9, "NdpEASize in [%p] <%s> \n", pConn, path);
+        // build full path for file
+        buildfullpath2(szFullPath, &rsrcData, pfi);
+        debuglocal(pRes, 1, "NdpEASize szFullPath '%s', pfi->name '%s'\n",
+                   szFullPath, pfi->pszName);
+
+        // @todo restore use of easize from cache
+
+        debuglocal(pRes, 9, "NdpEASize in [%p] <%s> \n", pConn, szFullPath);
 
         char *pchBuffer = (char *)malloc(cbBuffer);
@@ -1404 +1434 @@
 
         do {
-           rc = smbwrp_listea(pRes, pConn->cli, path, pchBuffer, cbBuffer);
+           rc = smbwrp_listea(pRes, pConn->cli, szFullPath, pchBuffer, cbBuffer);
            pfealist = (FEALIST*)pchBuffer;
            if (rc)