Changeset 960 for trunk/client/src/ndpsmb.c

Timestamp:

Aug 16, 2016, 5:41:49 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba client: add the possibility to have logfiles per share

File:

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

trunk/client/src/ndpsmb.c

@@ -35 +35 @@
 
 /* time conversion functions: SMB protocol sends timestamps in GMT time,
-*  os2 api uses localtime,
-*  emx/klibc uses timezone and daylight saving to convert GMT timestamps,
-*  so only the timezone must be counted in conversion.
-*/
-void fsphUnixTimeToDosDate( time_t time, FDATE* fdate, FTIME *ftime)
+ * os2 api uses localtime,
+ * emx/klibc uses timezone and daylight saving to convert GMT timestamps,
+ * so only the timezone must be counted in conversion.
+ */
+void fsphUnixTimeToDosDate(Resource *pRes, time_t time, FDATE* fdate, FTIME *ftime)
 {
         struct tm* gmt = localtime( &time);
@@ -45 +45 @@
         if (gmt->tm_isdst>0)
         {
-           debuglocal(9, "daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
+           debuglocal(pRes, 9, "daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
            time -= 3600;
            gmt = localtime( &time);
@@ -56 +56 @@
         ftime->minutes = gmt->tm_min;
         ftime->hours = gmt->tm_hour;
-}
-
-void fsphDosDateToUnixTime( FDATE fdate, FTIME ftime, ULONG* time)
+        return;
+}
+
+void fsphDosDateToUnixTime(Resource *pRes, FDATE fdate, FTIME ftime, ULONG* time)
 {
         struct tm gmtime = { 0 };
 
-        debuglocal(9, "fsphDosDateToUnixTime time %02d:%02d:%02d\n", ftime.hours, ftime.minutes, ftime.twosecs*2);
+        debuglocal(pRes, 9, "fsphDosDateToUnixTime time %02d:%02d:%02d\n", ftime.hours, ftime.minutes, ftime.twosecs*2);
         gmtime.tm_mday = fdate.day;
         gmtime.tm_mon = fdate.month-1;
@@ -72 +73 @@
 
         *time = mktime( &gmtime);
-        debuglocal(9, "fsphDosDateToUnixTime time1 %d %s", *time, ctime( (time_t*)time));
+        debuglocal(pRes, 9, "fsphDosDateToUnixTime time1 %d %s", *time, ctime( (time_t*)time));
 #if 0 // as mktime() already does dst we don't need to add something
         struct tm* gmt;
@@ -78 +79 @@
         if (gmt->tm_isdst>0)
         {
-           debuglocal(9, "fsphDosDateToUnixTime daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
+           debuglocal(pRes, 9, "fsphDosDateToUnixTime daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
            *time += 3600;
         }
-        debuglocal(9, "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
+        debuglocal(pRes, 9, "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 #endif
+        return;
 }
         
@@ -111 +113 @@
         {ND_PROP_ULONG, 0, "CLD", "32"},
         {ND_PROP_ULONG, 0, "EASUPPORT", "1"},
+        {ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -154 +157 @@
         if (rcLock != NO_ERROR)     \
            return rcLock;           \
+        smbwrp_Logging(pRes);       \
 } while (0)
 
@@ -165 +169 @@
 #endif
 
-int helperEASet (cli_state *cli, FEALIST *pFEAList, char *path)
+int helperEASet (Resource *pRes, cli_state *cli, FEALIST *pFEAList, char *path)
 {
         int rc = 0;
@@ -181 +185 @@
            while (done < pFEAList->cbList)
            {
-              rc = smbwrp_setea(cli, path, (char*)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
+              rc = smbwrp_setea(pRes, cli, path, (char*)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
               if (rc)
                  break;
@@ -201 +205 @@
 
         lockInit();
-        debugInit();
-        debuglocal(9,"Working with %s bit fileio NDFS\n", ifL ? "64" : "32");
         return NO_ERROR;
 }
@@ -234 +236 @@
         stat->attrFile = (finfo->attr & 0x37);
 
-        fsphUnixTimeToDosDate(finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
-        fsphUnixTimeToDosDate(finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
-        fsphUnixTimeToDosDate(finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
         return;
 }
@@ -259 +261 @@
         stat.attrFile = (finfo->attr & 0x37);
 
-        fsphUnixTimeToDosDate(finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
-        fsphUnixTimeToDosDate(finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
-        fsphUnixTimeToDosDate(finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
-        debuglocal(9, "fname %s\n", finfo->fname);
-        debuglocal(9, "mtime %d %s", finfo->mtime, ctime( (time_t*)&finfo->mtime));
-        debuglocal(9, "ftimeLastAccess %02d:%02d:%02d\n", stat.ftimeLastWrite.hours, stat.ftimeLastWrite.minutes, stat.ftimeLastWrite.twosecs*2);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
+        fsphUnixTimeToDosDate(pConn->pRes, finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+        debuglocal(pConn->pRes, 9, "fname %s\n", finfo->fname);
+        debuglocal(pConn->pRes, 9, "mtime %d %s", finfo->mtime, ctime( (time_t*)&finfo->mtime));
+        debuglocal(pConn->pRes, 9, "ftimeLastAccess %02d:%02d:%02d\n", stat.ftimeLastWrite.hours, stat.ftimeLastWrite.minutes, stat.ftimeLastWrite.twosecs*2);
 
         ph->fsphAddFile32L(plist, &stat, name, strlen(name), finfo, sizeof(*finfo), 0);
@@ -344 +346 @@
 #endif
         pRes->pdc = NULL;
+        pRes->loglevel = 0;
 
         t = 0, q = NULL;
@@ -451 +454 @@
         }
 
+        t = 0;
+        rc = ph->fsphQueryUlongProperty (properties, "LOGLEVEL", &t);
+        if (!rc)
+        {
+           if (t > 10)
+              rc = ERROR_INVALID_PARAMETER;
+           else
+              pRes->loglevel = t;
+        }
+
+        // figure out the used share/server/workgroup
+        char *logfileext = '\0';
+        if (pRes->srv.share_name)
+           logfileext = pRes->srv.share_name;
+        if (!logfileext && pRes->srv.server_name)
+           logfileext = pRes->srv.server_name;
+        if (!logfileext && pRes->srv.workgroup)
+           logfileext = pRes->srv.workgroup;
+
+        // init debug and write the very first message
+        debugInit(pRes, logfileext, ifL);
+        debuglocal(pRes, 9, "NdpMountResource initResource\n");
+
+        // init code
+        smbwrp_init(pRes);
+
         /*
          * Create a directory cache with expiration time and cache listings
          * the above values come from the gui. default: timeout 10; listings: 32
         */
-        dircache_create(&pRes->pdc, pRes->cachetimeout, pRes->cachedepth);
+        dircache_create(pRes);
 
         return rc;
@@ -562 +591 @@
               // reconnect to server here, first test new connection
               cli_state* tmp_cli = NULL;
-              rc = smbwrp_connect( &tmpRes, &tmp_cli);
+              rc = smbwrp_connect(&tmpRes, &tmp_cli);
               if (!rc) 
               {
                  // new connection is ok, disconnect old one
                  cli_state* cli = pConn->cli;
-                 smbwrp_disconnect( pRes, cli);
+                 smbwrp_disconnect(pRes, cli);
                  // save tmp data structure
                  memcpy( pRes, &tmpRes, sizeof( tmpRes));
@@ -582 +611 @@
 
 /* check if the requested resource is available */
-static int checkMountResource( Resource* pRes)
+static int checkMountResource(Resource* pRes)
 {
         int rc;
@@ -588 +617 @@
         cli_state* cli = NULL;
 
-        debuglocal(9, "checkMountResource in tid#%d\n", _gettid());
-        rc = smbwrp_connect( pRes, &cli);
+        debuglocal(pRes, 9, "checkMountResource in tid#%d\n", _gettid());
+        rc = smbwrp_connect(pRes, &cli);
         switch (rc)
         {
@@ -620 +649 @@
         } /* endswitch */ 
 
-        smbwrp_disconnect( pRes, cli);
+        smbwrp_disconnect(pRes, cli);
         return rc;
 }
@@ -631 +660 @@
 
         ENTER();
-
-        debuglocal(9,"NdpMountResource in\n");
-        // init code
-        smbwrp_init();
 
         /*
@@ -666 +691 @@
         }
 
-        debuglocal(9, "NdpMountResource rc=%d\n", rc);
+        debuglocal(pRes, 9, "NdpMountResource rc=%d\n", rc);
         LEAVE();
         return rc;
@@ -675 +700 @@
         Resource *pRes = (Resource *)resource;
         ENTER();
-        dircache_delete(pRes->pdc);
+        dircache_delete(pRes);
         memset(&pRes->srv, 0, sizeof(pRes->srv));
+        debuglocal(pRes, 9, "NdpFreeResource %d\n", NO_ERROR);
+        debugClose(pRes);
         free(pRes);
-        debuglocal(9, "NdpFreeResource %d\n", NO_ERROR);
         LEAVE();
         return NO_ERROR;
@@ -689 +715 @@
         int rc = ND_RSRC_DIFFERENT;
 
-        debuglocal(9, "NdpRsrcCompare in\n");
+        debuglocal(pRes, 9, "NdpRsrcCompare in\n");
         if (ph->fsphStrICmp(pRes->srv.server_name, pRes2->srv.server_name) == 0
            && ph->fsphStrICmp(pRes->srv.share_name, pRes2->srv.share_name) == 0
@@ -699 +725 @@
         }
 
-        debuglocal(9, "NdpRsrcCompare %d\n", rc);
+        debuglocal(pRes, 9, "NdpRsrcCompare %d\n", rc);
         return rc;
 }
@@ -706 +732 @@
 {
         // do nothing
-        debuglocal(9, "NdpRsrcUpdate %d\n", NO_ERROR);
+        Resource *pRes = (Resource *)resource;
+        debuglocal(pRes, 9, "NdpRsrcUpdate %d\n", NO_ERROR);
         return NO_ERROR;
 }
@@ -716 +743 @@
         char s[4096];
 
-        debuglocal(9, "NdpRsrcQueryInfo in\n");
+        debuglocal(pRes, 9, "NdpRsrcQueryInfo in\n");
 
         switch (pRes->rootlevel)
@@ -739 +766 @@
            memcpy(pdata, s, *poutlen);
 
-        debuglocal(9, "NdpRsrcQueryInfo %d\n", rc);
+        debuglocal(pRes, 9, "NdpRsrcQueryInfo %d\n", rc);
         return rc;
 }
@@ -759 +786 @@
 
         ENTER();
-        debuglocal(9, "NdpRsrcQueryFSAllocate %08x\n", pfsa);
+        debuglocal(pRes, 9, "NdpRsrcQueryFSAllocate %08x\n", pfsa);
 
         if (!pfsa)
@@ -767 +794 @@
         }
 
-        debuglocal(9, "NdpRsrcQueryFSAllocate in tid#%d\n", _gettid());
-        rc = smbwrp_connect( pRes, &cli);
+        debuglocal(pRes, 9, "NdpRsrcQueryFSAllocate in tid#%d\n", _gettid());
+        rc = smbwrp_connect(pRes, &cli);
         if (rc) 
         {
-           debuglocal(9, "NdpRsrcQueryFSAllocate smbwrp_connect failed rc=%d\n", rc);   
+           debuglocal(pRes, 9, "NdpRsrcQueryFSAllocate smbwrp_connect failed rc=%d\n", rc);     
            pfsa->cSectorUnit = 1;
            pfsa->cUnit = 123456;
@@ -781 +808 @@
         }
 
-        rc = smbwrp_dskattr( cli, &fsa);
+        rc = smbwrp_dskattr(pRes, cli, &fsa);
         if (rc)
         {
@@ -798 +825 @@
         }
 
-        smbwrp_disconnect( pRes, cli);
-        debuglocal(9, "NdpRsrcQueryFSAllocate %d/%d (cUnit = %d/cUnitAvail = %d/cbSector = %d)\n", rc, rc1, pfsa->cUnit, pfsa->cUnitAvail, pfsa->cbSector);
+        smbwrp_disconnect(pRes, cli);
+        debuglocal(pRes, 9, "NdpRsrcQueryFSAllocate %d/%d (cUnit = %d/cUnitAvail = %d/cbSector = %d)\n", rc, rc1, pfsa->cUnit, pfsa->cUnitAvail, pfsa->cbSector);
 
         LEAVE();
@@ -814 +841 @@
         ENTER();
 
-        debuglocal(9, "NdpCreateConnection in\n");
+        debuglocal(pRes, 9, "NdpCreateConnection in\n");
 
         pConn = malloc( sizeof(Connection));
@@ -822 +849 @@
         if (rc)
         {
-           debuglocal(9, "NdpCreateConnection ERROR_NOT_ENOUGH_MEMORY %d\n", rc);
+           debuglocal(pRes, 9, "NdpCreateConnection ERROR_NOT_ENOUGH_MEMORY %d\n", rc);
            LEAVE();
            return rc;
@@ -831 +858 @@
         pConn->file.fd = -1;
 
-        debuglocal(9, "NdpCreateConnection send CONNECT\n");
-        rc = smbwrp_connect( pRes, &pConn->cli);
+        debuglocal(pRes, 9, "NdpCreateConnection send CONNECT\n");
+        rc = smbwrp_connect(pRes, &pConn->cli);
         if (rc)
         {
@@ -841 +868 @@
 
         *pconn = (HCONNECTION)pConn;
-        debuglocal(9, "NdpCreateConnection [%p] %d\n", pConn, rc);
+        debuglocal(pRes, 9, "NdpCreateConnection [%p] %d\n", pConn, rc);
 
         LEAVE();
@@ -855 +882 @@
         ENTER();
 
-        debuglocal(9, "NdpFreeConnection in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFreeConnection in [%p]\n", pConn);
         if (pConn->file.fd >= 0)
         {
-           rc = smbwrp_close( pConn->cli, &pConn->file);
+           rc = smbwrp_close(pRes, pConn->cli, &pConn->file);
            pConn->file.fd = -1;
         }
 
-        smbwrp_disconnect( pRes, pConn->cli);
-
+        smbwrp_disconnect(pRes, pConn->cli);
+
+        debuglocal(pRes, 9, "NdpFreeConnection %d\n", NO_ERROR);
         free(pConn);
-        debuglocal(9, "NdpFreeConnection %d\n", NO_ERROR);
 
         LEAVE();
@@ -900 +927 @@
         ENTER();
 
-        debuglocal(9, "NdpQueryPathInfo in [%p] <%s>\n", pConn, szPath);
+        debuglocal(pRes, 9, "NdpQueryPathInfo in [%p] <%s>\n", pConn, szPath);
         
         /*
@@ -915 +942 @@
            // First check if there is information in the directory cache.
            unsigned long ulAge = 0;
-           if (dircache_find_path(pRes->pdc, szPath, &finfo, &ulAge))
+           if (dircache_find_path(pRes, szPath, &finfo, &ulAge))
            {
               if (ulAge <= 15) /* @todo configurable. */
@@ -927 +954 @@
 
            rc = pathparser(pRes, pConn, szPath, path);
-           debuglocal(9, "NdpQueryPathInfo pathparser for <%s> rc=%d\n", path, rc);
+           debuglocal(pRes, 9, "NdpQueryPathInfo pathparser for <%s> rc=%d\n", path, rc);
            switch (rc)
            {
@@ -944 +971 @@
 
            strncpy(finfo.fname, path, sizeof(finfo.fname) - 1);
-           debuglocal(9, "NdpQueryPathInfo smbwrp_getattr for <%s>\n", path);
-           rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
+           debuglocal(pRes, 9, "NdpQueryPathInfo smbwrp_getattr for <%s>\n", path);
+           rc = smbwrp_getattr(pRes, &pRes->srv, pConn->cli, &finfo);
            if (rc)
            {
@@ -952 +979 @@
               {
                  // free current cli resources
-                 smbwrp_disconnect( pRes, pConn->cli);
+                 smbwrp_disconnect(pRes, pConn->cli);
                  // reconnect
-                 rcCon = smbwrp_connect( pRes, &pConn->cli);
+                 rcCon = smbwrp_connect(pRes, &pConn->cli);
                  if (rcCon != NO_ERROR)
-                    debuglocal(9, "NdpQueryPathInfo smbwrp_connect rc = %d\n", rcCon);
+                    debuglocal(pRes, 9, "NdpQueryPathInfo smbwrp_connect rc = %d\n", rcCon);
                  // try file list again if reconnecting worked
                  if (rcCon == NO_ERROR)
-                    rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
+                    rc = smbwrp_getattr(pRes, &pRes->srv, pConn->cli, &finfo);
               }
 
-              debuglocal(9, "NdpQueryPathInfo smbwrp_getattr, rc = %d\n", rc);
+              debuglocal(pRes, 9, "NdpQueryPathInfo smbwrp_getattr, rc = %d\n", rc);
               switch (rc)
               {
@@ -989 +1016 @@
               {
                  *p = 0;
-                 rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
-                 debuglocal(9, "NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
+                 rc = smbwrp_getattr(pRes, &pRes->srv, pConn->cli, &finfo);
+                 debuglocal(pRes, 9, "NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
                  if (rc == NO_ERROR)
                     rc = (finfo.attr & FILE_DIRECTORY) !=0 ? ERROR_FILE_NOT_FOUND:ERROR_PATH_NOT_FOUND;
@@ -998 +1025 @@
            }
         } while (0);
-        debuglocal(9, "NdpQueryPathInfo <%s> (%s) %d\n", szPath, path, rc);
+        debuglocal(pRes, 9, "NdpQueryPathInfo <%s> (%s) %d\n", szPath, path, rc);
 
         LEAVE();
@@ -1020 +1047 @@
         ENTER();
 
-        debuglocal(9, "NdpFindStart in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFindStart in [%p]\n", pConn);
 
         strncpy(dir, szPath, sizeof(dir) - 1);
@@ -1076 +1103 @@
            strcpy(state.mask, "\\*");
 
-        debuglocal(9, "NdpFindStart: dir [%s], dir_mask [%s], mask [%s], szPath [%s]\n",
+        debuglocal(pRes, 9, "NdpFindStart: dir [%s], dir_mask [%s], mask [%s], szPath [%s]\n",
         state.dir, state.dir_mask, state.mask, state.fullpath);
-        rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
+        rc = smbwrp_filelist(pRes, &pRes->srv, pConn->cli, &state);
         /*
          * we need to handle reconnection also here, because NdpQueryPathInfo 
@@ -1087 +1114 @@
         {
            // free current cli resources
-           smbwrp_disconnect( pRes, pConn->cli);
+           smbwrp_disconnect(pRes, pConn->cli);
            // reconnect
-           smbwrp_connect( pRes, &pConn->cli);
+           smbwrp_connect(pRes, &pConn->cli);
            // try file list again next loop
-           rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
-           debuglocal(9, "NdpFindStart remote connection lost, rc = %d\n", rc);
-        }
-
-        debuglocal(9, "NdpFindStart <%s> (%s) cnt %d %d\n", szPath, path, count, rc);
+           rc = smbwrp_filelist(pRes, &pRes->srv, pConn->cli, &state);
+           debuglocal(pRes, 9, "NdpFindStart remote connection lost, rc = %d\n", rc);
+        }
+
+        debuglocal(pRes, 9, "NdpFindStart <%s> (%s) cnt %d %d\n", szPath, path, count, rc);
 
         LEAVE();
@@ -1103 +1130 @@
 int APIENTRY NdpDeletePathInfo (HRESOURCE resource, NDFILEINFOL *pfi)
 {
-        debuglocal(9, "NdpDeletePathInfo %d\n", 0);
+        Resource * pRes = (Resource *)resource;
+        debuglocal(pRes, 9, "NdpDeletePathInfo %d\n", 0);
         return NO_ERROR;
 }
@@ -1109 +1137 @@
 int APIENTRY NdpRefresh (HCONNECTION conn, char *path, int tree)
 {
-        debuglocal(9, "NdpRefresh <%s> %d\n", path, 0);
+        Connection *pConn = (Connection *)conn;
+        debuglocal(pConn->pRes, 9, "NdpRefresh <%s> %d\n", path, 0);
         return NO_ERROR;
 }
@@ -1121 +1150 @@
         */
 
-        debuglocal(9, "NdpDicardresourceData %d\n", 0);
+        Resource * pRes = (Resource *)resource;
+        debuglocal(pRes, 9, "NdpDicardresourceData %d\n", 0);
         return NO_ERROR;
 }
@@ -1136 +1166 @@
         ENTER();
 
-        debuglocal(9, "NdpSetPathInfo in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpSetPathInfo in [%p]\n", pConn);
 
         // delete the dir cache
-        dircache_invalidate(szPathName, pRes->pdc, 1);
+        dircache_invalidate(szPathName, pRes, 1);
 
         do {
@@ -1148 +1178 @@
            memset(&finfo, 0, sizeof(finfo));
            strncpy(finfo.fname, path, sizeof(finfo.fname) - 1);
-           fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(finfo.mtime));
+           fsphDosDateToUnixTime(pRes, pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(finfo.mtime));
            finfo.attr = pfi->stat.attrFile & 0x37;
-           rc = smbwrp_setattr(pConn->cli, &finfo);
+           rc = smbwrp_setattr(pRes, pConn->cli, &finfo);
         } while (0);
 
-        debuglocal(9, "NdpSetPathInfo <%s> (%s) %d\n", szPathName, path, rc);
-
-        LEAVE();
-        return rc;
-}
-
-int buildFEALIST(FEALIST *pFEASrc, GEALIST *pGEAList, FEALIST *pFEAList)
+        debuglocal(pRes, 9, "NdpSetPathInfo <%s> (%s) %d\n", szPathName, path, rc);
+
+        LEAVE();
+        return rc;
+}
+
+int buildFEALIST(Resource *pRes, FEALIST *pFEASrc, GEALIST *pGEAList, FEALIST *pFEAList)
 {
         int rc = 0;
@@ -1173 +1203 @@
         pfeadest = pFEAList->list;
         dsize = pFEAList->cbList;
-        //debuglocal(9,"buildFEALIST in destsize %d srcsize %d pGEAList=%08x pGEAList->cbList=%d\n", dsize, ddone, size, pGEAList, pGEAList ? pGEAList->cbList : 0);
+        //debuglocal(pRes, 9,"buildFEALIST in destsize %d srcsize %d pGEAList=%08x pGEAList->cbList=%d\n", dsize, ddone, size, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
         while (done < size)
@@ -1187 +1217 @@
               while (done < size)
               {
-                 //debuglocal(9,"comp <%s> <%s>\n", name, pgea->szName);
+                 //debuglocal(pRes, 9,"comp <%s> <%s>\n", name, pgea->szName);
                  if (!ph->fsphStrNCmp(name, pgea->szName, pgea->cbName))
                  {
@@ -1211 +1241 @@
            }
            done += sizeof(FEA) + pfea->cbName + 1 + pfea->cbValue;
-           //debuglocal(9,"buuildfea <%s> insert=%d pfea->cbName=%d pfea->cbValue=%d srcdone=%d destdone=%d pfeadest=%08x pfea=%08x\n", name, insert, pfea->cbName, pfea->cbValue, done, ddone, pfeadest, pfea);
+           //debuglocal(pRes, 9,"buuildfea <%s> insert=%d pfea->cbName=%d pfea->cbValue=%d srcdone=%d destdone=%d pfeadest=%08x pfea=%08x\n", name, insert, pfea->cbName, pfea->cbValue, done, ddone, pfeadest, pfea);
            pfea = (FEA *)((char *)pFEASrc + done);
         }
@@ -1219 +1249 @@
            rc = ERROR_BUFFER_OVERFLOW;
 
-        debuglocal(9, "buildFEALIST rc=%d destsize=%d destdone=%d srcsize=%d pGEAList=%08x\n", rc, dsize, ddone, size, pGEAList);
+        debuglocal(pRes, 9, "buildFEALIST rc=%d destsize=%d destdone=%d srcsize=%d pGEAList=%08x\n", rc, dsize, ddone, size, pGEAList);
         return rc;
 }
@@ -1244 +1274 @@
         if (rc || !fdata.ulSize || !fdata.pData)
         {
-           debuglocal(9, "NdpEAQuery: ph->fsphGetFileInfoData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
+           debuglocal(pRes, 9, "NdpEAQuery: ph->fsphGetFileInfoData = %d/%d %08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
@@ -1252 +1282 @@
         finfo = (smbwrp_fileinfo *)fdata.pData;
         path = finfo->fname;
-        debuglocal(9, "NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
+        debuglocal(pRes, 9, "NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
         char *pchBuffer = (char *)malloc(cbBuffer);
@@ -1262 +1292 @@
 
         do {
-           rc = smbwrp_listea( pConn->cli, path, pchBuffer, cbBuffer);
+           rc = smbwrp_listea(pRes, pConn->cli, path, pchBuffer, cbBuffer);
            pFEASrc = (FEALIST*) pchBuffer;
            if (rc)
@@ -1281 +1311 @@
            }
            else
-              rc = buildFEALIST((FEALIST *)pFEASrc, pGEAList, pFEAList);
+              rc = buildFEALIST(pRes, (FEALIST *)pFEASrc, pGEAList, pFEAList);
         } while (0);
 
         free(pchBuffer);
-        debuglocal(9, "NdpEAQuery <%s> %d %d %d\n", pfi->pszName, rc, pFEASrc->cbList, pFEAList->cbList);
+        debuglocal(pRes, 9, "NdpEAQuery <%s> %d %d %d\n", pfi->pszName, rc, pFEASrc->cbList, pFEAList->cbList);
 
         LEAVE();
@@ -1301 +1331 @@
         smbwrp_fileinfo *finfo;
 
-        debuglocal(9, "NdpEASet in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpEASet in [%p]\n", pConn);
 
         if (!pfi || !pfi->pszName)
@@ -1312 +1342 @@
         if (rc || !fdata.ulSize || !fdata.pData)
         {
-           debuglocal(9, "NdpEASet: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
+           debuglocal(pRes, 9, "NdpEASet: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
@@ -1319 +1349 @@
         path = finfo->fname;
 
-        rc = helperEASet(pConn->cli, pFEAList, path);
-        debuglocal(9, "NdpEASet %d\n", rc);
+        rc = helperEASet(pRes, pConn->cli, pFEAList, path);
+        debuglocal(pRes, 9, "NdpEASet %d\n", rc);
         return rc;
 }
@@ -1346 +1376 @@
         if (rc || !fdata.ulSize || !fdata.pData)
         {
-           debuglocal(9, "NdpEASize: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
+           debuglocal(pRes, 9, "NdpEASize: ph->fsphGetFileInfoData = %d/%d/%08x\n", rc, fdata.ulSize, fdata.pData);
            return ERROR_EAS_NOT_SUPPORTED;
         }
@@ -1359 +1389 @@
         {
            *pulEASize = easize;
-           debuglocal(9, "NdpEASize <%s> cached %d\n", path, easize);
+           debuglocal(pRes, 9, "NdpEASize <%s> cached %d\n", path, easize);
            LEAVE();
            return NO_ERROR;
         }
 
-        debuglocal(9, "NdpEASize in [%p] <%s> \n", pConn, path);
+        debuglocal(pRes, 9, "NdpEASize in [%p] <%s> \n", pConn, path);
 
         char *pchBuffer = (char *)malloc(cbBuffer);
@@ -1374 +1404 @@
 
         do {
-           rc = smbwrp_listea(pConn->cli, path, pchBuffer, cbBuffer);
+           rc = smbwrp_listea(pRes, pConn->cli, path, pchBuffer, cbBuffer);
            pfealist = (FEALIST*)pchBuffer;
            if (rc)
@@ -1394 +1424 @@
 
         free(pchBuffer);
-        debuglocal(9, "NdpEASize <%s> %d %d\n", pfi->pszName, *pulEASize, rc);
+        debuglocal(pRes, 9, "NdpEASize <%s> %d %d\n", pfi->pszName, *pulEASize, rc);
 
         LEAVE();
@@ -1408 +1438 @@
         char path[CCHMAXPATH+1] = {0};
         
-        debuglocal(9, "NdpSetCurrentDir in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpSetCurrentDir in [%p]\n", pConn);
 
         ENTER();
@@ -1417 +1447 @@
               break;
 
-        rc = smbwrp_chdir(&pRes->srv, pConn->cli, path);
+        rc = smbwrp_chdir(pRes, &pRes->srv, pConn->cli, path);
         } while (0);
 
-        debuglocal(9, "NdpSetCurrentDir <%s> (%s) %d\n", szPath, path, rc);
+        debuglocal(pRes, 9, "NdpSetCurrentDir <%s> (%s) %d\n", szPath, path, rc);
 
         LEAVE();
@@ -1428 +1458 @@
 int APIENTRY NdpCopy (HCONNECTION conn, NDFILEINFOL *pfiDst, char *szDst, NDFILEINFOL *pfiSrc, char *szSrc, ULONG ulOption)
 {
-        debuglocal(9, "NdpCopy <%s> -> <%s> %d\n", szSrc, szDst, ERROR_CANNOT_COPY);
+        Connection *pConn = (Connection *)conn;
+        Resource *pRes = pConn->pRes;
+        debuglocal(pRes, 9, "NdpCopy <%s> -> <%s> %d\n", szSrc, szDst, ERROR_CANNOT_COPY);
         return ERROR_CANNOT_COPY;
 }
@@ -1434 +1466 @@
 int APIENTRY NdpCopy2 (HCONNECTION conn, HRESOURCE resDst, NDFILEINFOL *pfiDst, char *szDst, NDFILEINFOL *pfiSrc, char *szSrc, ULONG ulOption)
 {
-        debuglocal(9, "NdpCopy2 <%s> -> <%s> %d\n", szSrc, szDst, ERROR_CANNOT_COPY);
+        Connection *pConn = (Connection *)conn;
+        Resource *pRes = pConn->pRes;
+        debuglocal(pRes, 9, "NdpCopy2 <%s> -> <%s> %d\n", szSrc, szDst, ERROR_CANNOT_COPY);
         return ERROR_CANNOT_COPY;
 }
@@ -1448 +1482 @@
         ENTER();
 
-        debuglocal(9, "NdpForceDelete in [%p]\n", pConn);
-
-        dircache_invalidate(szFile, pRes->pdc, 1);
+        debuglocal(pRes, 9, "NdpForceDelete in [%p]\n", pConn);
+
+        dircache_invalidate(szFile, pRes, 1);
 
         do {
@@ -1457 +1491 @@
               break;
 
-           rc = smbwrp_unlink(pConn->cli, path);
+           rc = smbwrp_unlink(pRes, pConn->cli, path);
         } while (0);
 
-        debuglocal(9, "NdpForceDelete <%s> (%s) %d\n", szFile, path, rc);
+        debuglocal(pRes, 9, "NdpForceDelete <%s> (%s) %d\n", szFile, path, rc);
 
         LEAVE();
@@ -1477 +1511 @@
         ENTER();
 
-        debuglocal(9, "NdpCreateDir in [%p]\n", pConn);
-
-        dircache_invalidate(szDirName, pRes->pdc, 1);
+        debuglocal(pRes, 9, "NdpCreateDir in [%p]\n", pConn);
+
+        dircache_invalidate(szDirName, pRes, 1);
 
         do {
@@ -1486 +1520 @@
               break;
 
-           rc = smbwrp_mkdir(pConn->cli, path);
+           rc = smbwrp_mkdir(pRes, pConn->cli, path);
         } while (0);
 
@@ -1492 +1526 @@
 
         if (path && pRes->easupport)
-           rcEASet = helperEASet(pConn->cli, pFEAList, path);
-
-        debuglocal(9, "NdpCreateDir <%s> (%s) rc=%d, EASupport=%s rc=%d\n", szDirName, path, rc, pRes->easupport?"yes":"no", rcEASet);
+           rcEASet = helperEASet(pRes, pConn->cli, pFEAList, path);
+
+        debuglocal(pRes, 9, "NdpCreateDir <%s> (%s) rc=%d, EASupport=%s rc=%d\n", szDirName, path, rc, pRes->easupport?"yes":"no", rcEASet);
 
         return rc;
@@ -1509 +1543 @@
         ENTER();
 
-        debuglocal(9, "NdpDeleteDir in [%p]\n", pConn);
-
-        dircache_invalidate(szDir, pRes->pdc, 1);
+        debuglocal(pRes, 9, "NdpDeleteDir in [%p]\n", pConn);
+
+        dircache_invalidate(szDir, pRes, 1);
 
         do {
@@ -1518 +1552 @@
               break;
 
-           rc = smbwrp_rmdir(pConn->cli, path);
+           rc = smbwrp_rmdir(pRes, pConn->cli, path);
         } while (0);
 
-        debuglocal(9, "NdpDeleteDir <%s> (%s) %d\n", szDir, path, rc);
+        debuglocal(pRes, 9, "NdpDeleteDir <%s> (%s) %d\n", szDir, path, rc);
 
         LEAVE();
@@ -1539 +1573 @@
         ENTER();
 
-        debuglocal(9, "NdpMove in [%p] from <%s> to <%s>\n", pConn, szSrc, szDst);
-
-        dircache_invalidate(szSrc, pRes->pdc, 1);
-        dircache_invalidate(szDst, pRes->pdc, 1);
+        debuglocal(pRes, 9, "NdpMove in [%p] from <%s> to <%s>\n", pConn, szSrc, szDst);
+
+        dircache_invalidate(szSrc, pRes, 1);
+        dircache_invalidate(szDst, pRes, 1);
 
         do
@@ -1565 +1599 @@
               p = szDst + l1 - l2 + 1;
            }
-           rc = smbwrp_rename(pConn->cli, src, p);
+           rc = smbwrp_rename(pRes, pConn->cli, src, p);
         } while (0);
 
-        debuglocal(9, "NdpMove <%s> -> <%s> (%s) %d\n", szSrc, szDst, src, rc);
+        debuglocal(pRes, 9, "NdpMove <%s> -> <%s> (%s) %d\n", szSrc, szDst, src, rc);
 
         LEAVE();
@@ -1576 +1610 @@
 int APIENTRY NdpMove2 (HCONNECTION conn, HRESOURCE resDst, NDFILEINFOL *pfiDst, char *szDst, NDFILEINFOL *pfiSrc, char *szSrc)
 {
-        debuglocal(9, "NdpMove2 <%s> -> <%s> %d\n", szSrc, szDst, ERROR_WRITE_PROTECT);
+        Connection *pConn = (Connection *)conn;
+        Resource *pRes = pConn->pRes;
+        debuglocal(pRes, 9, "NdpMove2 <%s> -> <%s> %d\n", szSrc, szDst, ERROR_WRITE_PROTECT);
         return ERROR_WRITE_PROTECT;
 }
@@ -1600 +1636 @@
         ENTER();
 
-        debuglocal(9, "smbopen in [%p] %d\n", pConn, pConn->file.fd);
+        debuglocal(pRes, 9, "smbopen in [%p] %d\n", pConn, pConn->file.fd);
 
         if (flags & O_CREAT)
-           dircache_invalidate(szFileName, pRes->pdc, 1);
+           dircache_invalidate(szFileName, pRes, 1);
 
         do {
@@ -1637 +1673 @@
            pConn->file.openattr = ulAttribute & 0x37;
            pConn->file.denymode = (ulOpenMode & 0x70) >> 4;
-           rc = smbwrp_open(pConn->cli, &pConn->file);
+           rc = smbwrp_open(pConn->pRes, pConn->cli, &pConn->file);
         } while (0);
 
-        debuglocal(9, "smbopen <%s> (%s) %08x %08x %08x %d. file = %d\n", szFileName, path, flags, ulOpenMode, ulAttribute, rc, pConn->file.fd);
+        debuglocal(pRes, 9, "smbopen <%s> (%s) %08x %08x %08x %d. file = %d\n", szFileName, path, flags, ulOpenMode, ulAttribute, rc, pConn->file.fd);
         if (!rc && pFEAList)
         {
            int rc1 = NdpFileEASet((HCONNECTION)pConn, (NDFILEHANDLE)0, pFEAList);
-           debuglocal(9, "smbopen NdpFileEASet %d. pFEAList->cbList %d\n", rc1, pFEAList->cbList);
+           debuglocal(pRes, 9, "smbopen NdpFileEASet %d. pFEAList->cbList %d\n", rc1, pFEAList->cbList);
         }
 
@@ -1690 +1726 @@
         ENTER();
 
-        debuglocal(9, "NdpSetFileAttribute in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpSetFileAttribute in [%p]\n", pConn);
         do {
            rc = pathparser(pRes, pConn, szFileName, path);
@@ -1699 +1735 @@
            strncpy(finfo.fname, path, sizeof(finfo.fname) - 1);
            finfo.attr = usAttr & 0x37;
-           rc = smbwrp_setattr(pConn->cli, &finfo);
+           rc = smbwrp_setattr(pRes, pConn->cli, &finfo);
         } while (0);
 
-        debuglocal(9, "NdpSetFileAttribute <%s> (%s) %04x %d\n", szFileName, path, usAttr, rc);
+        debuglocal(pRes, 9, "NdpSetFileAttribute <%s> (%s) %04x %d\n", szFileName, path, usAttr, rc);
 
         LEAVE();
@@ -1710 +1746 @@
 int APIENTRY NdpFlush (HRESOURCE resource)
 {
-        debuglocal(9, "NdpFlush %d\n", ERROR_NOT_SUPPORTED);
+        Resource *pRes = (Resource *)resource;
+        debuglocal(pRes, 9, "NdpFlush %d\n", ERROR_NOT_SUPPORTED);
         return ERROR_NOT_SUPPORTED;
 }
@@ -1722 +1759 @@
 int APIENTRY NdpIOCTL (int type, HRESOURCE resource, char *path, int function, void *in, ULONG insize, PULONG poutlen)
 {
+        Resource *pRes = (Resource *)resource;
         if (function == ND_PL_INIT_THREAD)
         {
            smbwrp_initthread();
-           debuglocal(9, "NdpIOCTL init thread\n");
+           debuglocal(pRes, 9, "NdpIOCTL init thread\n");
            return NO_ERROR;
         }
 
-        debuglocal(9, "NdpIOCTL <%s> %d\n", path, function);
+        debuglocal(pRes, 9, "NdpIOCTL <%s> %d\n", path, function);
 
         if (in && insize > 4096)
@@ -1753 +1791 @@
         ENTER();
 
-        debuglocal(9, "NdpFileQueryInfo in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileQueryInfo in [%p]\n", pConn);
         do {
            if (pConn->file.fd < 0 || !*pConn->file.fname)
@@ -1761 +1799 @@
            }
            strncpy(finfo.fname, pConn->file.fname, sizeof(finfo.fname) - 1);
-           rc = smbwrp_fgetattr(pConn->cli, &pConn->file, &finfo);
+           rc = smbwrp_fgetattr(pRes, pConn->cli, &pConn->file, &finfo);
            if (!rc)
            {
@@ -1769 +1807 @@
         } while (0);
 
-        debuglocal(9, "NdpFileQueryInfo <%s> %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, rc);
+        debuglocal(pRes, 9, "NdpFileQueryInfo <%s> %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, rc);
 
         LEAVE();
@@ -1789 +1827 @@
            return ERROR_EAS_NOT_SUPPORTED;
 
-        debuglocal(9, "NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
+        debuglocal(pRes, 9, "NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
 
         char *pchBuffer = (char *)malloc(cbBuffer);
@@ -1803 +1841 @@
               break;
            }
-           rc = smbwrp_flistea(pConn->cli, &pConn->file, pchBuffer, cbBuffer);
+           rc = smbwrp_flistea(pRes, pConn->cli, &pConn->file, pchBuffer, cbBuffer);
            pFEASrc = (FEALIST *)pchBuffer;
            if (rc)
@@ -1822 +1860 @@
            }
            else
-              rc = buildFEALIST(pFEASrc, pGEAList, pFEAList);
+              rc = buildFEALIST(pRes, pFEASrc, pGEAList, pFEAList);
 
         } while (0);
 
         free(pchBuffer);
-        debuglocal(9, "NdpFileEAQuery out <%s>/%d pFEASrc->cbList=%d pFEAList->cbList=%d rc=%d\n", pConn->file.fname, pConn->file.fd, pFEASrc->cbList, pFEAList->cbList, rc);
+        debuglocal(pRes, 9, "NdpFileEAQuery out <%s>/%d pFEASrc->cbList=%d pFEAList->cbList=%d rc=%d\n", pConn->file.fname, pConn->file.fd, pFEASrc->cbList, pFEAList->cbList, rc);
 
         LEAVE();
@@ -1840 +1878 @@
         unsigned long action;
 
-        debuglocal(9, "NdpFileEASet in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileEASet in [%p]\n", pConn);
 
         if (!pFEAList || pFEAList->cbList <= sizeof(long))
@@ -1863 +1901 @@
            while (done < pFEAList->cbList)
            {
-              rc = smbwrp_fsetea(pConn->cli, &pConn->file, (char *)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
+              rc = smbwrp_fsetea(pRes, pConn->cli, &pConn->file, (char *)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
               if (rc)
                  break;
@@ -1873 +1911 @@
         } while (0);
 
-        debuglocal(9, "NdpFileEASet %d\n", rc);
+        debuglocal(pRes, 9, "NdpFileEASet %d\n", rc);
 
         LEAVE();
@@ -1895 +1933 @@
            return ERROR_EAS_NOT_SUPPORTED;
 
-        debuglocal(9, "NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
+        debuglocal(pRes, 9, "NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
 
         char *pchBuffer = (char *)malloc(cbBuffer);
@@ -1909 +1947 @@
               break;
            }
-           rc = smbwrp_flistea(pConn->cli, &pConn->file, pchBuffer, cbBuffer);
+           rc = smbwrp_flistea(pRes, pConn->cli, &pConn->file, pchBuffer, cbBuffer);
            pFEAList = (FEALIST*)pchBuffer;
            if (rc)
@@ -1929 +1967 @@
 
         free(pchBuffer);
-        debuglocal(9, "NdpFileEASize %d %d\n", *pulEASize, rc);
+        debuglocal(pRes, 9, "NdpFileEASize %d %d\n", *pulEASize, rc);
 
         LEAVE();
@@ -1944 +1982 @@
         ENTER();
 
-        debuglocal(9, "NdpFileSetInfo in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileSetInfo in [%p]\n", pConn);
 
         // delete the dir cache
-        dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
+        dircache_invalidate(pConn->file.fullname, pRes, 1);
 
         do {
@@ -1958 +1996 @@
            // deferred setinfo - on closing the file
            pConn->file.openattr = attrFile;
-           fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(pConn->file.mtime));
-           fsphDosDateToUnixTime(pfi->stat.fdateCreation, pfi->stat.ftimeCreation, &(pConn->file.ctime));
+           fsphDosDateToUnixTime(pRes, pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(pConn->file.mtime));
+           fsphDosDateToUnixTime(pRes, pfi->stat.fdateCreation, pfi->stat.ftimeCreation, &(pConn->file.ctime));
            pConn->file.updatetime = 2;
-           debuglocal(9, "NdpFileSetInfo mtime %d\n", pConn->file.mtime);
+           debuglocal(pRes, 9, "NdpFileSetInfo mtime %d\n", pConn->file.mtime);
         } while (0);
 
-        debuglocal(9, "NdpFileSetInfo <%s> %08x %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, attrFile, rc);
+        debuglocal(pRes, 9, "NdpFileSetInfo <%s> %08x %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, attrFile, rc);
 
         LEAVE();
@@ -1979 +2017 @@
         ENTER();
 
-        debuglocal(9, "NdpFileSetFilePtrL in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileSetFilePtrL in [%p]\n", pConn);
 
         do {
@@ -1988 +2026 @@
            }
 
-           rc = smbwrp_lseek(pConn->cli, &pConn->file, ulMethod, llOffset);
+           rc = smbwrp_lseek(pRes, pConn->cli, &pConn->file, ulMethod, llOffset);
            if (!rc)
               *pllActual = pConn->file.offset;
@@ -1994 +2032 @@
         } while (0);
 
-        debuglocal(9, "NdpFileSetFilePtrL <%s> %lld %lu %lld %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, llOffset, ulMethod, *pllActual, rc);
+        debuglocal(pRes, 9, "NdpFileSetFilePtrL <%s> %lld %lu %lld %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, llOffset, ulMethod, *pllActual, rc);
 
         LEAVE();
@@ -2002 +2040 @@
 int APIENTRY NdpFileSetFilePtr (HCONNECTION conn, NDFILEHANDLE handle, LONG lOffset, ULONG ulMethod, ULONG *pulActual)
 {
+        Connection *pConn = (Connection *)conn;
         LONGLONG llActual;
         int rc = NdpFileSetFilePtrL(conn, handle, lOffset, ulMethod, &llActual);
         *pulActual = llActual & 0xFFFFFFFF;
-        debuglocal(9, "NdpFileSetFilePtr %ld %lu %ld %d\n", lOffset, ulMethod, *pulActual, rc);
+        debuglocal(pConn->pRes, 9, "NdpFileSetFilePtr %ld %lu %ld %d\n", lOffset, ulMethod, *pulActual, rc);
         return rc;
 }
@@ -2018 +2057 @@
         ENTER();
 
-        debuglocal(9, "NdpFileClose in [%p] %d <%s>\n", pConn, pConn->file.fd, pConn->file.fd < 0 ? "!null!" : pConn->file.fname);
+        debuglocal(pRes, 9, "NdpFileClose in [%p] %d <%s>\n", pConn, pConn->file.fd, pConn->file.fd < 0 ? "!null!" : pConn->file.fname);
 
         do {
@@ -2027 +2066 @@
            }
 
-           rc = smbwrp_close(pConn->cli, &pConn->file);
+           rc = smbwrp_close(pRes, pConn->cli, &pConn->file);
 
         } while (0);
 
-        debuglocal(9, "NdpFileClose %d %d\n", pConn->file.fd, rc);
+        debuglocal(pRes, 9, "NdpFileClose %d %d\n", pConn->file.fd, rc);
         pConn->file.fd = -1;
 
@@ -2040 +2079 @@
 int APIENTRY NdpFileCommit (HCONNECTION conn, NDFILEHANDLE handle)
 {
-        debuglocal(9, "NdpFileCommit %d\n", NO_ERROR);
+        Connection *pConn = (Connection *)conn;
+        debuglocal(pConn->pRes, 9, "NdpFileCommit %d\n", NO_ERROR);
         return NO_ERROR;
 }
@@ -2046 +2086 @@
 int APIENTRY NdpFileNewSize (HCONNECTION conn, NDFILEHANDLE handle, ULONG ulLen)
 {
+        Connection *pConn = (Connection *)conn;
         int rc = NdpFileNewSizeL(conn, handle, ulLen);
-        debuglocal(9, "NdpFileNewSize %ld %d\n", ulLen, rc);
+        debuglocal(pConn->pRes, 9, "NdpFileNewSize %ld %d\n", ulLen, rc);
         return rc;
 }
@@ -2060 +2101 @@
         ENTER();
 
-        debuglocal(9, "NdpFileNewSizeL in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileNewSizeL in [%p]\n", pConn);
 
         do {
@@ -2069 +2110 @@
            }
 
-           rc = smbwrp_setfilesize(pConn->cli, &pConn->file, llLen); 
+           rc = smbwrp_setfilesize(pRes, pConn->cli, &pConn->file, llLen); 
 
         } while (0);
 
-        debuglocal(9, "NdpFileNewSizeL <%s> %lld %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, llLen, rc);
+        debuglocal(pRes, 9, "NdpFileNewSizeL <%s> %lld %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, llLen, rc);
 
         LEAVE();
@@ -2093 +2134 @@
         ENTER();
 
-        debuglocal(9, "NdpFileRead in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileRead in [%p]\n", pConn);
 
         do {
@@ -2106 +2147 @@
               ULONG ulActual;
               ULONG ulToRead = ulRead - ulReadCompleted;
-              debuglocal(9, "NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
+              debuglocal(pRes, 9, "NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
 
               if (ulToRead > NDPSMB_READ_MAX_SIZE)
               ulToRead = NDPSMB_READ_MAX_SIZE;
 
-              rc = smbwrp_read(pConn->cli, &pConn->file, (char *)pBuffer + ulReadCompleted, ulToRead, &ulActual);
+              rc = smbwrp_read(pRes, pConn->cli, &pConn->file, (char *)pBuffer + ulReadCompleted, ulToRead, &ulActual);
               if (ulActual == 0 || rc != NO_ERROR)
                  break;
@@ -2125 +2166 @@
            *pulActual = ulReadCompleted;
 
-        debuglocal(9, "NdpFileRead <%s> %lu %lu %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, ulRead, *pulActual, rc);
+        debuglocal(pRes, 9, "NdpFileRead <%s> %lu %lu %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, ulRead, *pulActual, rc);
 
         LEAVE();
@@ -2142 +2183 @@
         ENTER();
 
-        debuglocal(9, "NdpFileWrite in [%p]\n", pConn);
+        debuglocal(pRes, 9, "NdpFileWrite in [%p]\n", pConn);
 
         /*
@@ -2151 +2192 @@
          * a new function needs to be done to update only one file in the cache
         */
-        dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
+        dircache_invalidate(pConn->file.fullname, pRes, 1);
 
         do {
@@ -2159 +2200 @@
               break;
            }
-           rc = smbwrp_write(pConn->cli, &pConn->file, pBuffer, ulWrite, pulActual);
+           rc = smbwrp_write(pRes, pConn->cli, &pConn->file, pBuffer, ulWrite, pulActual);
 
         } while (0);
 
-        debuglocal(9, "NdpFileWrite <%s> %lu %lu %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, ulWrite, *pulActual, rc);
-
-        LEAVE();
-        return rc;
-}
+        debuglocal(pRes, 9, "NdpFileWrite <%s> %lu %lu %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, ulWrite, *pulActual, rc);
+
+        LEAVE();
+        return rc;
+}