Changeset 960

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

Location:

trunk/client/src

Files:

• debug.c (modified) (6 diffs)
• dircache.c (modified) (36 diffs)
• help/changelog.txt (modified) (2 diffs)
• ndpsmb.c (modified) (115 diffs)
• rc/rc.dlg (modified) (2 diffs)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc_ (modified) (3 diffs)
• smbwrp.c (modified) (57 diffs)
• smbwrp.h (modified) (4 diffs)

trunk/client/src/debug.c

@@ -31 +31 @@
 #include <sys/stat.h>
 #include "nversion.h"
+#include "smbwrp.h"
 
-int debuglevel = 9; // we set it to 9, so we get all messages
-char logfile[_MAX_PATH +1];
-char debugfile[_MAX_PATH +1];
-char logfilename[] = "log.ndpsmb";
-BOOL do_logging;
-BOOL firstLogLine;
-HMTX logMutex;
-char nameMutex[] = "\\SEM32\\NDPSMB";
+void debugInit(Resource *pRes, char *logfileext, int ifL)
+{
+        if (!pRes)
+           return;
 
-int debuglvl(int level)
-{
-        return (level <= debuglevel) ? 1 : 0;
-}
-
-BOOL writeLog()
-{
-        return do_logging;
-}
-
-void debugInit()
-{
-        *logfile = '\0';
-        *debugfile = '\0';
-        do_logging = FALSE;
-        firstLogLine = TRUE;
-        logMutex = NULLHANDLE;
-        struct stat filestat;
+        pRes->firstLogLine = 1;
+        pRes->ifL = ifL;
         APIRET rc = NO_ERROR;
-
-        // create the debugfile name
-        strncat(debugfile, getenv("ETC"), 2);
-        strncat(debugfile, "\\", sizeof(debugfile) - strlen(debugfile) -1);
-        strncat(debugfile, "ndpsmb.dbg", sizeof(debugfile) - strlen(debugfile) -1);
-
-        // is the file around? if not we have no debug
-        if (stat(debugfile, &filestat) !=0)
-           return;
 
         //create the logfile variable
@@ -74 +46 @@
         if (env != NULL)
         {
-           strncat(logfile, env, sizeof(logfile) -1);
-           strncat(logfile, "\\", sizeof(logfile) - strlen(logfile) -1);
-           strncat(logfile, logfilename, sizeof(logfile) - strlen(logfile) -1);  
+           snprintf(pRes->logfile, sizeof(pRes->logfile), "%s/%s.%s", env, "log.ndpsmb", logfileext);
+           snprintf(pRes->smb_logfile, sizeof(pRes->smb_logfile), "%s/%s.%s", env, "log.smbc", logfileext);
         }
         else
-           strncat(logfile, logfilename, sizeof(logfile) -1);
-        
-        // set the samba logging stuff
-        do_logging = TRUE;
-
-        // now we create a sem, so that logging from different threads works
-        rc = DosCreateMutexSem(nameMutex, &logMutex, 0, FALSE);
-        if (rc == ERROR_DUPLICATE_NAME)
-           rc = DosOpenMutexSem(nameMutex, &logMutex);
+        {
+           snprintf(pRes->logfile, sizeof(pRes->logfile), "%s.%s", "log.ndpsmb", logfileext);
+           snprintf(pRes->smb_logfile, sizeof(pRes->smb_logfile), "%s.%s", "log.smbc", logfileext);
+        }
+        pRes->logfileFH = NULL;
 
         return;
@@ -94 +61 @@
 void debugDelete()
 {
-        DosCloseMutexSem(logMutex);
         return;
 }
 
-void debuglocal(int level, const char * fmt, ...)
+void debugClose(Resource *pRes)
 {
-        FILE *f=NULL;
+        if (pRes && pRes->logfileFH)
+        {
+           fclose(pRes->logfileFH);
+           pRes->logfileFH = NULL;
+        }
+        return;
+}
 
+void debuglocal(Resource *pRes, int level, const char * fmt, ...)
+{
+        FILE *f = NULL;
         // do we have to log at all
-        if (!do_logging)
+        if (pRes && (level > pRes->loglevel))
            return;
-
-        // if the sem is created we request it
-        if (logMutex)
-           DosRequestMutexSem(logMutex, (ULONG) SEM_INDEFINITE_WAIT);
 
         do {
@@ -114 +85 @@
            char buf[80] = {0};
            va_list args;
-           if (logfile[0])
+           if (pRes)
            {
-              f = fopen(logfile, "a");
-              if (!f)
+              if (!pRes->logfileFH)
+                 pRes->logfileFH = fopen(pRes->logfile, "a");
+              if (!pRes->logfileFH)
                  break;
+              else
+                 f = pRes->logfileFH;
            }
            else
@@ -124 +98 @@
 
            // in the first log line we write our version of the client
-           if (firstLogLine)
+           if (pRes && pRes->firstLogLine)
            {
               fprintf(f, "Samba client %s build %s based on %s\n", VERSION, BUILD, smbwrp_getVersion());
               fprintf(f, "This build is maintained by %s\n", VENDOR);
-              firstLogLine = FALSE;
+              fprintf(f, "Working with %s bit fileio NDFS\n", pRes->ifL ? "64" : "32");
+
+              pRes->firstLogLine = 0;
            }
 
@@ -137 +113 @@
            vfprintf(f, fmt, args);
            va_end(args);
-           if (logfile)
-              fclose(f);
 
         } while (0);
 
-        // if the sem is created we release it
-        if (logMutex)
-           DosReleaseMutexSem(logMutex);
-
         return;
 }

trunk/client/src/dircache.c

@@ -109 +109 @@
         
 
-static int dceCreate (DirectoryCacheEntry **ppdce, DirectoryCache *pdc, const char *path, int cFiles)
+static int dceCreate (DirectoryCacheEntry **ppdce, Resource *pRes, const char *path, int cFiles)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)malloc(sizeof(DirectoryCacheEntry));
@@ -128 +128 @@
     pdce->ulHash = computehash (path);
     pdce->ulLastUpdateTime = 0;
-    pdce->pdc = pdc;
+    pdce->pdc = pRes->pdc;
     pdce->fInvalid = 0;
 
@@ -155 +155 @@
 }
 
-static void dceWriteEntry (DirectoryCacheEntry *pdce, const smbwrp_fileinfo *finfo)
+static void dceWriteEntry (Resource *pRes, DirectoryCacheEntry *pdce, const smbwrp_fileinfo *finfo)
 {
     if (pdce->cInfos >= pdce->cInfosAllocated)
@@ -165 +165 @@
                                                                 cNewAllocated * sizeof (smbwrp_fileinfo));
 
-        debuglocal(9, "dceWriteEntry: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
+        debuglocal(pRes, 9, "dceWriteEntry: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
         if (pNewInfos)
         {
@@ -183 +183 @@
 }
 
-static void dceAdjust (DirectoryCacheEntry *pdce)
+static void dceAdjust (Resource *pRes, DirectoryCacheEntry *pdce)
 {
     /* If the entry has too many preallocated info structures, adjust the memory allocation */
@@ -196 +196 @@
                                                                 cNewAllocated * sizeof (smbwrp_fileinfo));
 
-        debuglocal(9, "dceAdjust: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
+        debuglocal(pRes, 9, "dceAdjust: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
         if (pNewInfos)
         {
@@ -209 +209 @@
 }
 
-static int dcePathEqualsTo (DirectoryCacheEntry *pdce, const char *path)
-{
-    debuglocal(9, "dcePathEqualTo: [%s] [%s]\n", path, pdce->pszPath);
+static int dcePathEqualsTo (Resource *pRes, DirectoryCacheEntry *pdce, const char *path)
+{
+    debuglocal(pRes, 9, "dcePathEqualTo: [%s] [%s]\n", path, pdce->pszPath);
     return ph->fsphStrICmp (path, pdce->pszPath) == 0; 
 }
@@ -225 +225 @@
 }
                 
-static struct DirectoryCacheEntry *dcFindDirCache (struct DirectoryCache *pdc, const char *path, int fPrefix)
+static struct DirectoryCacheEntry *dcFindDirCache (Resource *pRes, const char *path, int fPrefix)
 {
     unsigned long hash = computehash (path);
 
-    DirectoryCacheEntry *iter = pdc->pEntriesHead;
-
-    debuglocal(9, "findDirCache: [%s]\n", path);
+    DirectoryCacheEntry *iter = pRes->pdc->pEntriesHead;
+
+    debuglocal(pRes, 9, "findDirCache: [%s]\n", path);
 
     while (iter != NULL)
     {
-        debuglocal(9, "findDirCache: entry [%s]\n", iter->pszPath);
+        debuglocal(pRes, 9, "findDirCache: entry [%s]\n", iter->pszPath);
         if (fPrefix)
         {
@@ -246 +246 @@
         {
             if (    iter->ulHash == hash
-                 && dcePathEqualsTo (iter, path)
+                 && dcePathEqualsTo (pRes, iter, path)
                )
             {
@@ -255 +255 @@
     }
 
-    debuglocal(9, "findDirCache: %p\n", iter);
+    debuglocal(pRes, 9, "findDirCache: %p\n", iter);
 
     return iter;
@@ -363 +363 @@
 };
 
-static int dcExistsInCache (DirectoryCache *pdc, const char *path)
+static int dcExistsInCache (Resource *pRes, const char *path)
 {
     int rc = CacheFault;
         
-    if (pdc->fEnabled)
-    {
-        if (dcFindDirCache (pdc, path, 0) != NULL)
+    if (pRes->pdc->fEnabled)
+    {
+        if (dcFindDirCache (pRes, path, 0) != NULL)
         {
             rc = CacheOk;
         }
         
-        debuglocal(9, "ExistsInCache: [%s], %d\n", path, rc);
+        debuglocal(pRes, 9, "ExistsInCache: [%s], %d\n", path, rc);
     }
     
@@ -380 +380 @@
 }
         
-static int dcRead (DirectoryCache *pdc, const char *path,
+static int dcRead (Resource *pRes, const char *path,
                    PFNADDDIRENTRY fn,
                    filelist_state *state,
@@ -387 +387 @@
     int i;
     
+    DirectoryCache *pdc = pRes->pdc;
     int rc = CacheFault;
         
@@ -393 +394 @@
         DirectoryCacheEntry *pdce;
 
-        pdce = dcFindDirCache (pdc, path, 0);
+        pdce = dcFindDirCache (pRes, path, 0);
         
         if (pdce)
         {
-            debuglocal(9, "CacheRead: entry %p found for [%s]\n", pdce, path);
+            debuglocal(pRes, 9, "CacheRead: entry %p found for [%s]\n", pdce, path);
             
             if (fForceCache)
@@ -412 +413 @@
                 if (dceExpired (pdce, pdc->ulExpirationTime))
                 {
-                    debuglocal(9, "CacheRead: expired\n");
+                    debuglocal(pRes, 9, "CacheRead: expired\n");
                     dcRemoveEntry (pdce);
                     dceDelete (pdce);
@@ -433 +434 @@
         }
         
-        debuglocal(9, "CacheRead: [%s], %d\n", path, rc);
+        debuglocal(pRes, 9, "CacheRead: [%s], %d\n", path, rc);
     }
     
@@ -439 +440 @@
 }
 
-static DirectoryCacheEntry *dcWriteBegin (DirectoryCache *pdc, const char *path, int cFiles)
+static DirectoryCacheEntry *dcWriteBegin (Resource *pRes, const char *path, int cFiles)
 {
     DirectoryCacheEntry *pdce = NULL;
 
-    if (pdc->fEnabled)
-    {
-        pdce = dcFindDirCache (pdc, path, 0);
+    if (pRes->pdc->fEnabled)
+    {
+        pdce = dcFindDirCache (pRes, path, 0);
         
         if (!pdce)
         {
             /* Does not exist in the cache yet. */
-            dceCreate (&pdce, pdc, path, cFiles);
+            dceCreate (&pdce, pRes, path, cFiles);
         }
         else
@@ -465 +466 @@
         }
         
-        debuglocal(9, "CacheWriteBegin: %s\n", path);
+        debuglocal(pRes, 9, "CacheWriteBegin: %s\n", path);
     }
     
@@ -472 +473 @@
 
 
-static void dcInvalidate (DirectoryCache *pdc, const char *path, int fPrefix)
+static void dcInvalidate (Resource *pRes, const char *path, int fPrefix)
 {
     DirectoryCacheEntry *pdce;
     
-    debuglocal(9, "CacheInvalidate: [%s]\n", path);
-
-    pdce = dcFindDirCache (pdc, path, fPrefix);
+    debuglocal(pRes, 9, "CacheInvalidate: [%s]\n", path);
+
+    pdce = dcFindDirCache (pRes, path, fPrefix);
 
     while (pdce)
@@ -485 +486 @@
         dceDelete (pdce);
         
-        pdce = dcFindDirCache (pdc, path, fPrefix);
-    }
-}
-
-static int dcFindPath (DirectoryCache *pdc,
+        pdce = dcFindDirCache (pRes, path, fPrefix);
+    }
+}
+
+static int dcFindPath (Resource *pRes, DirectoryCache *pdc,
                        const char *path,
                        const char *parent,
@@ -500 +501 @@
     unsigned long hash = computehash (parent);
 
-    debuglocal(9, "dcFindPath: [%s][%s]\n", parent, name);
+    debuglocal(pRes, 9, "dcFindPath: [%s][%s]\n", parent, name);
 
     while (pdce != NULL)
     {
-        debuglocal(9, "dcFindPath: entry [%s]\n", pdce->pszPath);
+        debuglocal(pRes, 9, "dcFindPath: entry [%s]\n", pdce->pszPath);
 
         if (   pdce->ulHash == hash
-            && dcePathEqualsTo (pdce, parent))
+            && dcePathEqualsTo (pRes, pdce, parent))
         {
             /* This entry should contain the path. */
@@ -517 +518 @@
                     *finfo = pdce->aInfos[i];
                     *pulAge = timesec () - pdce->ulLastUpdateTime;
-                    debuglocal(9, "dircache: FindPath %s found, age %d\n", path, *pulAge);
+                    debuglocal(pRes, 9, "dircache: FindPath %s found, age %d\n", path, *pulAge);
                     return 1;
                 }
@@ -526 +527 @@
     }
 
-    debuglocal(9, "dircache: FindPath %s not found\n", path);
+    debuglocal(pRes, 9, "dircache: FindPath %s not found\n", path);
     return 0;
 }
@@ -561 +562 @@
  */
 
-int dircache_create(DirectoryCache **ppdc, unsigned long ulExpirationTime, int cMaxEntries)
-{
+int dircache_create(Resource *pRes)
+{
+    struct DirectoryCache **ppdc = &pRes->pdc;
+    unsigned long ulExpirationTime = pRes->cachetimeout;
+    int cMaxEntries = pRes->cachedepth;
     int rc;
 
-    debuglocal(9, "dircache_create: %u seconds, %d entries\n", ulExpirationTime, cMaxEntries);
+    debuglocal(pRes, 9, "dircache_create: %u seconds, %d entries\n", ulExpirationTime, cMaxEntries);
 
     rc = dcCreate(ppdc);
@@ -574 +578 @@
     }
 
-    debuglocal(9, "dircache_create: %p, rc = %d\n", *ppdc, rc);
+    debuglocal(pRes, 9, "dircache_create: %p, rc = %d\n", *ppdc, rc);
     return rc;
 }
 
-void dircache_delete(DirectoryCache *pdc)
-{
-    debuglocal(9, "dircache_delete: %p\n", pdc);
+void dircache_delete(Resource *pRes)
+{
+    DirectoryCache *pdc = pRes->pdc;
+    debuglocal(pRes, 9, "dircache_delete: %p\n", pdc);
 
     if (pdc)
@@ -603 +608 @@
     }
 
-    debuglocal(9, "dircache_list_files [%s]\n", path);
+    debuglocal(state->pConn->pRes, 9, "dircache_list_files [%s]\n", path);
 
     if (!pdc)
@@ -612 +617 @@
     lockRequest (pdc->mutex);
 
-    rc = dcRead (pdc, path, fn, state, ptotal_received, 0);
+    rc = dcRead (state->pConn->pRes, path, fn, state, ptotal_received, 0);
 
     lockRelease (pdc->mutex);
@@ -632 +637 @@
     }
 
-    debuglocal(9, "dircache_write_begin pdc %p path [%s]\n", pdc, path);
+    debuglocal(state->pConn->pRes, 9, "dircache_write_begin pdc %p path [%s]\n", pdc, path);
 
     if (!pdc)
@@ -650 +655 @@
     }
     
-    pdce = dcWriteBegin (pdc, path, cFiles);
+    pdce = dcWriteBegin (state->pConn->pRes, path, cFiles);
     
     lockRelease (pdc->mutex);
 
-    debuglocal(9, "dircache_write_begin returning ctx %p\n", pdce);
+    debuglocal(state->pConn->pRes, 9, "dircache_write_begin returning ctx %p\n", pdce);
     return (void *)pdce;
 }
 
-void dircache_write_entry(void *dircachectx, const smbwrp_fileinfo *finfo)
+void dircache_write_entry(Resource *pRes, void *dircachectx, const smbwrp_fileinfo *finfo)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)dircachectx;
 
-    debuglocal(9, "dircache_write_entry %p\n", pdce);
+    debuglocal(pRes, 9, "dircache_write_entry %p\n", pdce);
     
     if (!pdce)
@@ -671 +676 @@
     lockRequest (pdce->pdc->mutex);
     
-    dceWriteEntry (pdce, finfo);
+    dceWriteEntry (pRes, pdce, finfo);
     
     lockRelease (pdce->pdc->mutex);
 }
 
-void dircache_write_end(void *dircachectx)
+void dircache_write_end(Resource *pRes, void *dircachectx)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)dircachectx;
     DirectoryCache *pdc;
 
-    debuglocal(9, "dircache_write_end: pdce %p\n", pdce);
+    debuglocal(pRes, 9, "dircache_write_end: pdce %p\n", pdce);
 
     if (!pdce)
@@ -699 +704 @@
     else
     {
-        dceAdjust (pdce);
+        dceAdjust (pRes, pdce);
         dcInsertEntry (pdce);
     }
@@ -707 +712 @@
 
 void dircache_invalidate(const char *path,
-                         struct DirectoryCache *pdc,
+                         Resource *pRes,
                          int fParent)
 {
-    debuglocal(9, "dircache_invalidate [%s], parent %d\n", path, fParent);
+    struct DirectoryCache *pdc = pRes->pdc;
+    debuglocal(pRes, 9, "dircache_invalidate [%s], parent %d\n", path, fParent);
 
     if (!pdc)
@@ -728 +734 @@
         {
             *lastSlash = 0;
-            dcInvalidate (pdc, p, 0);
+            dcInvalidate (pRes, p, 0);
         }
         else
         {
-            dcInvalidate (pdc, "", 0);
+            dcInvalidate (pRes, "", 0);
         }
     }
     else
     {
-        dcInvalidate (pdc, path, 0);
+        dcInvalidate (pRes, path, 0);
     }
     
@@ -745 +751 @@
 }
 
-int dircache_find_path(struct DirectoryCache *pdc,
+int dircache_find_path(Resource *pRes,
                        const char *path,
                        smbwrp_fileinfo *finfo,
                        unsigned long *pulAge)
 {
+    struct DirectoryCache *pdc = pRes->pdc;
     int cb;
     char *p;
@@ -755 +762 @@
     int fFound = 0;
 
-    debuglocal(9, "dircache_find_path [%s]\n", path);
+    debuglocal(pRes, 9, "dircache_find_path [%s]\n", path);
 
     if (!pdc)
@@ -778 +785 @@
     {
         *lastSlash = 0;
-        fFound = dcFindPath (pdc, path, p, lastSlash + 1, finfo, pulAge);
+        fFound = dcFindPath (pRes, pdc, path, p, lastSlash + 1, finfo, pulAge);
     }
     else
     {
         /* Find in the root directory. p is the name. */
-        fFound = dcFindPath (pdc, path, "", p, finfo, pulAge);
+        fFound = dcFindPath (pRes, pdc, path, "", p, finfo, pulAge);
     }
     

trunk/client/src/help/changelog.txt

@@ -912 +912 @@
 :ul.
 #endif
+
  <$UL>beta1:
 #ifndef txt
@@ -930 +931 @@
 #endif
 
+ <$UL>GA:
+#ifndef txt
+:ul compact.
+#endif
+#ifdef en
+   <$LI> added the possibility to create logfiles per share
+#endif
+#ifdef fr
+   <$LI> added the possibility to create logfiles per share
+#endif
+#ifdef de
+   <$LI> M”glichkeit um Logfiles pro Freigabe zu erstellen hinzugefgt
+#endif
+
 #ifndef txt
 :eul.:eul.

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;
+}

trunk/client/src/rc/rc.dlg

@@ -6 +6 @@
 DLGTEMPLATE DLG_ID LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", DLG_ID, 24, 44, 253, 187, WS_VISIBLE, FCF_SYSMENU | 
+    DIALOG  "", DLG_ID, 24, 44, 253, 216, WS_VISIBLE, FCF_SYSMENU | 
             FCF_TITLEBAR
     BEGIN
-        CTEXT           "SMB resource properties:", LBL_PROP, 197, 151, 12, 
+        CTEXT           "SMB resource properties:", LBL_PROP, 197, 180, 12, 
                         10, DT_VCENTER | NOT WS_VISIBLE
-        LTEXT           "Workgroup:", LBL_WORKGRP, 13, 161, 52, 10, 
+        GROUPBOX        "CIFS/SMB resource properties", GB_PROPERTIES, 5, 152, 
+                        244, 58
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
+                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
+        LTEXT           "Workgroup:", LBL_WORKGRP, 13, 192, 52, 10, 
                         DT_BOTTOM
-        ENTRYFIELD      "", ENT_WORKGRP, 71, 163, 100, 8, ES_MARGIN
-        LTEXT           "Server:", LBL_SERVER, 13, 146, 52, 10, DT_BOTTOM
-        ENTRYFIELD      "", ENT_SERVER, 71, 148, 100, 8, ES_MARGIN
-        LTEXT           "Share:", LBL_SHARE, 13, 132, 52, 10, DT_BOTTOM
-        ENTRYFIELD      "", ENT_SHARE, 71, 133, 100, 8, ES_MARGIN
-        LTEXT           "User ID:", LBL_USER, 13, 100, 53, 10, DT_BOTTOM
-        ENTRYFIELD      "", ENT_USER, 71, 102, 100, 8, ES_MARGIN
-        LTEXT           "Password:", LBL_PASS, 13, 87, 53, 10, DT_BOTTOM
-        ENTRYFIELD      "", ENT_PASS, 71, 88, 100, 8, ES_MARGIN | 
+        ENTRYFIELD      "", ENT_WORKGRP, 71, 192, 100, 8, ES_MARGIN
+        LTEXT           "Server:", LBL_SERVER, 13, 177, 52, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_SERVER, 71, 177, 100, 8, ES_MARGIN
+        LTEXT           "Share:", LBL_SHARE, 13, 161, 52, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_SHARE, 71, 161, 100, 8, ES_MARGIN
+        LTEXT           "Supports EA", LBL_EASUPPORT, 195, 159, 52, 10, 
+                        DT_WORDBREAK
+        AUTOCHECKBOX    "", CHK_EASUPPORT, 180, 161, 10, 10, WS_GROUP
+        GROUPBOX        "Login as", GB_LOGIN, 5, 111, 244, 40
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
+                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
+        LTEXT           "User ID:", LBL_USER, 13, 131, 53, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_USER, 71, 131, 100, 8, ES_MARGIN
+        LTEXT           "Password:", LBL_PASS, 13, 117, 53, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_PASS, 71, 117, 100, 8, ES_MARGIN | 
                         ES_UNREADABLE
-        ENTRYFIELD      "", ENT_SPASS, 180, 88, 56, 8, ES_MARGIN | 
+        ENTRYFIELD      "", ENT_SPASS, 180, 117, 56, 8, ES_MARGIN | 
                         ES_UNREADABLE | NOT WS_TABSTOP | NOT WS_VISIBLE
-        LTEXT           "Master:", LBL_MASTER, 12, 60, 52, 10, DT_BOTTOM
-        CONTROL         "", CMB_MASTER, 69, 37, 71, 33, WC_COMBOBOX, 
+        GROUPBOX        "Browse", GB_BROWSE, 5, 82, 244, 26
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
+                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
+        LTEXT           "Master:", LBL_MASTER, 12, 89, 52, 10, DT_BOTTOM
+        CONTROL         "", CMB_MASTER, 69, 66, 71, 30, WC_COMBOBOX, 
                         CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | 
                         WS_VISIBLE
-        ENTRYFIELD      "", ENT_MASTER, 147, 60, 90, 8, ES_MARGIN
-        LTEXT           "Supports EA", LBL_EASUPPORT, 195, 130, 52, 10, 
-                        DT_WORDBREAK
-        AUTOCHECKBOX    "", CHK_EASUPPORT, 180, 132, 10, 10, WS_GROUP
+        ENTRYFIELD      "", ENT_MASTER, 147, 89, 90, 8, ES_MARGIN
+        GROUPBOX        "Cache", GB_CACHE, 5, 53, 244, 26
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
+                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
+        LTEXT           "Cache timeout:", LBL_CACHETIMEOUT, 12, 59, 55, 8, DT_BOTTOM
+        CONTROL         "", SPIN_CACHETIMEOUT, 69, 59, 32, 12, WC_SPINBUTTON
+                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP |
+                        WS_VISIBLE
+        LTEXT           "Cache listings:", LBL_CACHEDEPTH, 134, 59, 55, 8, DT_BOTTOM
+        CONTROL         "", SPIN_CACHEDEPTH, 194, 59, 39, 12, WC_SPINBUTTON
+                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP |
+                        WS_VISIBLE
+        GROUPBOX        "Logging", GB_CACHE, 5, 24, 244, 26
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
+                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
+        LTEXT           "Loglevel:", LBL_LOGLEVEL, 12, 30, 55, 8, DT_BOTTOM
+        CONTROL         "", SPIN_LOGLEVEL, 69, 30, 39, 12, WC_SPINBUTTON
+                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP |
+                        WS_VISIBLE
         PUSHBUTTON      "Cancel", DID_CANCEL, 7, 6, 56, 14
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
@@ -41 +69 @@
         PUSHBUTTON      "Help", BTN_HELP, 190, 6, 56, 14, BS_HELP
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        GROUPBOX        "CIFS/SMB resource properties", GB_PROPERTIES, 5, 125, 
-                        244, 58
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        GROUPBOX        "Login as", GB_LOGIN, 5, 82, 244, 40
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        GROUPBOX        "Cache", GB_CACHE, 5, 24, 244, 26
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        GROUPBOX        "Browse", GB_BROWSE, 5, 53, 244, 26
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        LTEXT           "Cache timeout:", LBL_CACHETIMEOUT, 12, 30, 55, 8, DT_BOTTOM
-        CONTROL         "", SPIN_CACHETIMEOUT, 69, 30, 32, 12, WC_SPINBUTTON
-                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP |
-                        WS_VISIBLE
-        LTEXT           "Cache listings:", LBL_CACHEDEPTH, 134, 30, 55, 8, DT_BOTTOM
-        CONTROL         "", SPIN_CACHEDEPTH, 194, 30, 39, 12, WC_SPINBUTTON
-                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP |
-                        WS_VISIBLE
     END
 END

trunk/client/src/rc/rc.h

@@ -21 +21 @@
 #define GB_LOGIN                    1024
 #define GB_PROPERTIES               1026
-#define GB_CACHE                     1025
+#define GB_CACHE                    1025
 #define GB_BROWSE                   1027
-#define LBL_CACHETIMEOUT        1014
-#define SPIN_CACHETIMEOUT       1015
-#define LBL_CACHEDEPTH          1017
-#define SPIN_CACHEDEPTH         1018
+#define LBL_CACHETIMEOUT            1014
+#define SPIN_CACHETIMEOUT           1015
+#define LBL_CACHEDEPTH              1017
+#define SPIN_CACHEDEPTH             1018
+#define LBL_LOGLEVEL                1019
+#define SPIN_LOGLEVEL               1020

trunk/client/src/rc/rc.rc_

@@ -38 +38 @@
    "Help for command line utility:\r\n"
    "\r\n"
-   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;easupport=...\r\n"
+   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;easupport=...;loglevel=...\r\n"
    "\r\n"
    "    workgroup - name of workgroup\r\n"
@@ -48 +48 @@
    "    mastertype - 0 if 'master' is the name of master server, 1 if 'master' is the name of master workgroup\r\n"
    "    easupport - 0 to not support EA, 1 to support\r\n"
+   "    loglevel - 0 no log, 2 standard log, 5 verbose, 10 very big log\r\n"
    "\r\n"
 }
@@ -126 +127 @@
 RCDATA (DLG_ID + 11)
 {
+    SPIN_LOGLEVEL, PARMTYPE_INT, 0L, 10L, "loglevel", "%d", 0L
+}
+
+RCDATA (DLG_ID + 12)
+{
     1
 }

trunk/client/src/smbwrp.c

@@ -40 +40 @@
 }
 
-void smbwrp_Logging()
-{
-        char slogfile[_MAX_PATH +1] = {0};
-        char slogfilename[] = "log.smbc";
-        char *env = getenv("LOGFILES");
-        if (env != NULL)
-        {
-           strncpy(slogfile, env, sizeof(slogfile) -1);
-           strncat(slogfile, "\\", sizeof(slogfile) - strlen(slogfile) -1);
-           strncat(slogfile, slogfilename, sizeof(slogfile) - strlen(slogfile) -1);
-        }
-        else
-           strncpy(slogfile, slogfilename, sizeof(slogfile) -1);
-
-        // init samba for debug messages
-        setup_logging("ndpsmb", DEBUG_FILE);
-        lp_set_logfile(slogfile);
-        lp_set_cmdline("log level", "10");
-        reopen_logs();
+void smbwrp_Logging(Resource *pRes)
+{
+        if (pRes && pRes->loglevel > 0)
+        {
+           // init samba for debug messages
+           setup_logging("ndpsmb", DEBUG_FILE);
+
+           char smblevel[3];
+           itoa(pRes->loglevel, smblevel, 10);
+           lp_set_logfile(pRes->smb_logfile);
+           lp_set_cmdline("log level", smblevel);
+           reopen_logs();
+        }
 
         return;
@@ -76 +70 @@
  * initialise structures
  */
-int _System smbwrp_init(void)
-{
-        static int initialised = 0;
+int _System smbwrp_init(Resource *pRes)
+{
         char *p;
 
-        if (initialised) 
+        if (pRes->smb_initialised) 
            return 0;
 
-        initialised = 1;
+        pRes->smb_initialised = 1;
 
         lp_set_in_client(true); // Make sure that we tell lp_load we are client
@@ -91 +84 @@
 
         if (!lp_load(get_dyn_CONFIGFILE(),true,false,false,true))
-           debuglocal(0,("The initial smb.conf is missing, defaults are used!\n"));
+           debuglocal(pRes, 0,("The initial smb.conf is missing, defaults are used!\n"));
 
         load_interfaces();
@@ -98 +91 @@
            return 1;
 
-        if (writeLog())
-           smbwrp_Logging();
-
+        smbwrp_Logging(pRes);
+
+        debuglocal(pRes, 5,("smbwrp_init done\n"));
         /*
         if ((p=smbw_getshared("RESOLVE_ORDER")))
@@ -116 +109 @@
         */
         BlockSignals(True, SIGPIPE);
+        return;
 }
 
@@ -214 +208 @@
  * return a connection to a server
  */
-int _System smbwrp_connect( Resource* pRes, cli_state ** cli)
+int _System smbwrp_connect(Resource* pRes, cli_state ** cli)
 {
         smbwrp_server * srv = &pRes->srv;
@@ -231 +225 @@
         zero_sockaddr(&ss);
 
-        debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
+        debuglocal(pRes, 1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
 
         if (!*server) {
@@ -273 +267 @@
         if (pRes->krb5support == 1)
         {
-           debuglocal(1,"Kerberos support enabled\n");
+           debuglocal(pRes, 1,"Kerberos support enabled\n");
            c->use_kerberos = True;
         }
@@ -289 +283 @@
         }
 
-        debuglocal(4," session request ok\n");
+        debuglocal(pRes, 4,"session request ok\n");
 
         if (!NT_STATUS_IS_OK(cli_negprot(c))) {
@@ -296 +290 @@
         }
 
-        debuglocal(4," session setuping for <%s>/<********> in <%s> %08x %08x %08x\n", srv->username,  workgroup, c->protocol, c->sec_mode, c->capabilities);
+        debuglocal(pRes, 4,"session setuping for <%s>/<********> in <%s> %08x %08x %08x\n", srv->username,  workgroup, c->protocol, c->sec_mode, c->capabilities);
 
         if (!NT_STATUS_IS_OK(cli_session_setup(c, srv->username, 
@@ -303 +297 @@
               workgroup)))
         {
-           debuglocal(4,"%s/******** login failed\n", srv->username);
+           debuglocal(pRes, 4,"%s/******** login failed\n", srv->username);
            loginerror = 1; // save the login error
 
            // try an anonymous login if it failed
            if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 0,"", 0, workgroup))) {
-              debuglocal(4,"Anonymous login failed\n");
+              debuglocal(pRes, 4,"Anonymous login failed\n");
               cli_shutdown(c);
               return 6;
            }
-           debuglocal(4,"Anonymous login successful\n");
+           debuglocal(pRes, 4,"Anonymous login successful\n");
            status = cli_init_creds(c, "", lp_workgroup(), "");
         } else {
@@ -319 +313 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-           debuglocal(4,"cli_init_creds() failed\n");
+           debuglocal(pRes, 4,"cli_init_creds() failed\n");
            cli_shutdown(c);
            // if loginerror is != 0 means normal login failed, but anonymous login worked
@@ -328 +322 @@
         }
 
-        debuglocal(4," session setup ok. Sending tconx <%s> <********>\n", share);
+        debuglocal(pRes, 4,"session setup ok. Sending tconx <%s> <********>\n", share);
 
         // YD ticket:58 we need to check resource type to avoid connecting to printers.
@@ -348 +342 @@
         }
 
-        debuglocal(4," tconx ok. cli caps %08x\n", c->capabilities);
+        debuglocal(pRes, 4,"tconx ok. cli caps %08x\n", c->capabilities);
         
         // save cli_state pointer
@@ -359 +353 @@
  * close a connection to a server
  */
-void _System smbwrp_disconnect( Resource* pRes, cli_state * cli)
+void _System smbwrp_disconnect(Resource* pRes, cli_state * cli)
 {
         // this call will free all buffers, close handles and free cli mem
@@ -369 +363 @@
  * a wrapper for open()
  */
-int _System smbwrp_open(cli_state * cli, smbwrp_file * file)
+int _System smbwrp_open(Resource *pRes, cli_state * cli, smbwrp_file * file)
 {
         uint16_t fd = 0;
@@ -379 +373 @@
            file->denymode = DENY_NONE;
 
-        debuglocal(4,"cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
+        debuglocal(pRes, 4,"cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
         if (!NT_STATUS_IS_OK(cli_open(cli, file->fname, file->openmode, file->denymode, &fd)))
            return os2cli_errno(cli);
@@ -392 +386 @@
  * a wrapper for read()
  */
-int _System smbwrp_read(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result)
+int _System smbwrp_read(Resource *pRes, cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result)
 {
         int ret;
@@ -412 +406 @@
  * a wrapper for write()
  */
-int _System smbwrp_write(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result)
+int _System smbwrp_write(Resource *pRes, cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result)
 {
         NTSTATUS status;
@@ -421 +415 @@
         
         *result = 0;
-        //debuglocal(1,("Write %x %d %lld %d", cli, file->fd, file->offset, count));
+        debuglocal(pRes, 10, "Write %x %d %lld %d\n", cli, file->fd, file->offset, count);
         status = cli_writeall(cli, file->fd, 0, buf, file->offset, count, &ret);
         if (!NT_STATUS_IS_OK(status))
@@ -435 +429 @@
  * a wrapper for close()
  */
-int _System smbwrp_close(cli_state * cli, smbwrp_file * file)
+int _System smbwrp_close(Resource *pRes, cli_state * cli, smbwrp_file * file)
 {
         int rc = 0;
@@ -441 +435 @@
            return maperror(EINVAL);
 
-        debuglocal(4,"smpwrp_close updatetime: %d\n", file->updatetime);
+        debuglocal(pRes, 4,"smpwrp_close updatetime: %d\n", file->updatetime);
 
         if (file->updatetime == 1)
         {
            file->mtime = time(NULL);
-           debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
+           debuglocal(pRes, 4,"cli_close new mtime %lu\n", file->mtime);
         }
         
@@ -454 +448 @@
         if (!rc && (file->openattr || file->mtime || file->ctime))
         {
-           debuglocal(4,"Set pathinfo on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->ctime);
-           if (!NT_STATUS_IS_OK(cli_setpathinfo_basic(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr))) 
-              debuglocal(4,"Set pathinfo on close failed %d\n", os2cli_errno(cli));
+           debuglocal(pRes, 4,"Set pathinfo on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->ctime);
+           if (!NT_STATUS_IS_OK(cli_setpathinfo_basic(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr)))
+           {
+              debuglocal(pRes, 4,"Set pathinfo on close failed %d\n", os2cli_errno(cli));
+           }
         }
 
@@ -469 +465 @@
 }
 
-int _System smbwrp_setfilesize(cli_state * cli, smbwrp_file * file, long long newsize)
+int _System smbwrp_setfilesize(Resource *pRes, cli_state * cli, smbwrp_file * file, long long newsize)
 {
         int rc = 0;
@@ -475 +471 @@
            return maperror(EINVAL);
 
-        debuglocal(4,"cli_setnewfilesize(%s) %lld\n", file->fname, newsize);
+        debuglocal(pRes, 4,"cli_setnewfilesize(%s) %lld\n", file->fname, newsize);
         if (!NT_STATUS_IS_OK(cli_ftruncate(cli, file->fd, newsize)))
         {
@@ -489 +485 @@
            file->openmode &= ~(O_CREAT | O_EXCL);
            file->openmode |= O_TRUNC;
-           debuglocal(4,"cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
+           debuglocal(pRes, 4,"cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
            if (!NT_STATUS_IS_OK(cli_open(cli, file->fname, file->openmode, file->denymode, &fd)))
               return os2cli_errno(cli);
@@ -501 +497 @@
  * a wrapper for rename()
  */
-int _System smbwrp_rename(cli_state * cli, char *oldname, char *newname)
+int _System smbwrp_rename(Resource *pRes, cli_state * cli, char *oldname, char *newname)
 {
         if (!cli || !oldname || !newname)
            return maperror(EINVAL);
 
-        debuglocal(1,"Rename <%s> -> <%s>\n", oldname, newname);
+        debuglocal(pRes, 4,"Rename <%s> -> <%s>\n", oldname, newname);
         if (!NT_STATUS_IS_OK(cli_rename(cli, oldname, newname)))
            return os2cli_errno(cli);
@@ -517 +513 @@
  * a wrapper for chmod()
  */
-int _System smbwrp_setattr(cli_state * cli, smbwrp_fileinfo *finfo)
+int _System smbwrp_setattr(Resource *pRes, cli_state * cli, smbwrp_fileinfo *finfo)
 {
         if (!cli || !finfo || !*finfo->fname) 
            return maperror(EINVAL);
 
-        debuglocal(4,"Setting on <%s> attr %04x, time %lu (timezone /%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime));
+        debuglocal(pRes, 4,"Setting on <%s> attr %04x, time %lu (timezone /%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime));
         // we already have gmt time, so no need to add timezone
         // if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : get_time_zone(finfo->mtime)))
@@ -535 +531 @@
  * a wrapper for unlink()
  */
-int _System smbwrp_unlink(cli_state * cli, const char *fname)
+int _System smbwrp_unlink(Resource *pRes, cli_state * cli, const char *fname)
 {
         if (!cli || !fname) 
@@ -561 +557 @@
  * a wrapper for lseek()
  */
-int _System smbwrp_lseek(cli_state * cli, smbwrp_file * file, int whence, long long offset)
+int _System smbwrp_lseek(Resource *pRes, cli_state * cli, smbwrp_file * file, int whence, long long offset)
 {
         off_t size;
@@ -567 +563 @@
            return maperror(EINVAL);
 
-        debuglocal(4,"lseek %d %lld %lld\n", whence, offset, file->offset);
+        debuglocal(pRes, 4,"lseek %d %lld %lld\n", whence, offset, file->offset);
 
         switch (whence) {
@@ -599 +595 @@
  * this is needed because win95 sometimes refuses the qpathinfo
  */
-int _System smbwrp_getattr(smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo)
+int _System smbwrp_getattr(Resource *pRes, smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo)
 {
         SMB_INO_T ino = 0;
@@ -609 +605 @@
            return maperror(EINVAL);
 
-        debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
+        debuglocal(pRes, 4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
         if (!(cli->capabilities & CAP_NOPATHINFO2) &&
             NT_STATUS_IS_OK(cli_qpathinfo2(cli, finfo->fname, &ctime, &atime,
@@ -636 +632 @@
             || (strncmp(cli->dev,"LPT",3) == 0)) 
         {
-           debuglocal(4,"getattr not a share.\n");
+           debuglocal(pRes, 4,"getattr not a share.\n");
            *(time_t *)&finfo->ctime = time (NULL);
            *(time_t *)&finfo->atime = time (NULL);
@@ -663 +659 @@
         if (NT_STATUS_IS_OK(cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, &finfo->size, (time_t *)&finfo->mtime)))
         {
-           //debuglocal(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
+           debuglocal(pRes, 10,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
            finfo->mtime -= get_time_zone(finfo->mtime);
            finfo->atime = finfo->atime;  //was mtime
@@ -678 +674 @@
  * this is needed because win95 sometimes refuses the qpathinfo
  */
-int _System smbwrp_fgetattr(cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo)
+int _System smbwrp_fgetattr(Resource *pRes, cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo)
 {
         struct timespec ctime;
@@ -725 +721 @@
         if (state && finfo)
         {
-           filelist_state * st  = (filelist_state *)state;
+           filelist_state *st  = (filelist_state *)state;
            char fullname[ _MAX_PATH] = {0};
-           debuglocal(8,"adding <%s> %d %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen, sizeof(st->finfo.fname));
+           debuglocal(st->pConn->pRes, 8,"adding <%s> %d %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen, sizeof(st->finfo.fname));
            memcpy(&st->finfo, finfo, sizeof(st->finfo));
            strncpy(fullname, st->dir, strlen(st->dir));
            strncat(fullname, finfo->fname, sizeof(fullname) - strlen(fullname) -1);
            strncpy(st->finfo.fname, fullname, sizeof(st->finfo.fname));
-           getfindinfoL( st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
+           getfindinfoL(st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
         }
         return;
@@ -796 +792 @@
 static int list_files(struct cli_state *cli, const char *mask, uint16 attribute,
                   void (*fn)(const char *, smbwrp_fileinfo *, const char *,
-                             void *), void *state)
+                             void *), filelist_state *state)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -807 +803 @@
         void *dircachectx = NULL;
         smbwrp_fileinfo wrpfinfo;
+        Resource *pRes = state->pConn->pRes;
 
         // Try to get the listing from cache.
@@ -826 +823 @@
         ? SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_EA_SIZE;
 
-        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
+        debuglocal(pRes, 4,"list_files level %d. mask <%s>\n", info_level, mask);
 
         req = cli_list_send(frame, ev, cli, mask, attribute, info_level);
@@ -843 +840 @@
         dircachectx = dircache_write_begin(state, num_finfo);
 
-        debuglocal(4,"list_files: got %d files\n", num_finfo);
+        debuglocal(pRes, 4,"list_files: got %d files\n", num_finfo);
 
         for (i=0; i<num_finfo; i++) {
@@ -857 +854 @@
            fn(cli->dfs_mountpoint, &wrpfinfo, mask, state);
            // Also add the entry to the cache.
-           dircache_write_entry(dircachectx, &wrpfinfo);
-        }
-
-        dircache_write_end(dircachectx);
+           dircache_write_entry(pRes, dircachectx, &wrpfinfo);
+        }
+
+        dircache_write_end(pRes, dircachectx);
  fail:
         TALLOC_FREE(frame);
@@ -869 +866 @@
  * open a directory on the server
  */
-int _System smbwrp_filelist(smbwrp_server *srv, cli_state * cli, filelist_state * state)
+int _System smbwrp_filelist(Resource *pRes, smbwrp_server *srv, cli_state * cli, filelist_state * state)
 {
         if (!srv || !cli || !state || !*state->mask)
            return maperror(EINVAL);
 
-        debuglocal(1,"Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
+        debuglocal(pRes, 1,"Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
         if (*srv->workgroup == 0 && *srv->server_name == 0) 
         {
@@ -915 +912 @@
  * a wrapper for chdir()
  */
-int _System smbwrp_chdir(smbwrp_server *srv, cli_state * cli, char *fname)
+int _System smbwrp_chdir(Resource *pRes, smbwrp_server *srv, cli_state * cli, char *fname)
 {
         unsigned short mode = aDIR;
@@ -923 +920 @@
 
         strncpy(finfo.fname, fname, sizeof(finfo.fname) - 1);
-        if (smbwrp_getattr(srv, cli, &finfo)) 
+        if (smbwrp_getattr(pRes, srv, cli, &finfo)) 
            return os2cli_errno(cli);
 
@@ -938 +935 @@
  * a wrapper for mkdir()
  */
-int _System smbwrp_mkdir(cli_state * cli, char *fname)
+int _System smbwrp_mkdir(Resource *pRes, cli_state * cli, char *fname)
 {
         if (!cli || !fname) 
@@ -952 +949 @@
  * a wrapper for rmdir()
  */
-int _System smbwrp_rmdir(cli_state * cli, char *fname)
+int _System smbwrp_rmdir(Resource *pRes, cli_state * cli, char *fname)
 {
         if (!cli || !fname) 
@@ -966 +963 @@
  * set EA for a path
  */
-int _System smbwrp_setea(cli_state * cli, char *fname, char * name, unsigned char * value, int size)
+int _System smbwrp_setea(Resource *pRes, cli_state * cli, char *fname, char * name, unsigned char * value, int size)
 {
         if (!cli || !fname || !name) 
@@ -980 +977 @@
  * set EA for a file
  */
-int _System smbwrp_fsetea(cli_state * cli, smbwrp_file *file, char * name, unsigned char * value, int size)
+int _System smbwrp_fsetea(Resource *pRes, cli_state * cli, smbwrp_file *file, char * name, unsigned char * value, int size)
 {
         if (!cli || !file || !name) 
@@ -1007 +1004 @@
 #pragma pack()
 
-static int unilistea(cli_state * cli, char *fname, void * buffer, unsigned long size)
+static int unilistea(Resource *pRes, cli_state * cli, char *fname, void * buffer, unsigned long size)
 {
         int fnum, i;
@@ -1024 +1021 @@
         if (!NT_STATUS_IS_OK(cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)))
         {
-           debuglocal(4,"ea_get_file list failed - %s\n", cli_errstr(cli));
+           debuglocal(pRes, 4,"ea_get_file list failed - %s\n", cli_errstr(cli));
            talloc_destroy(mem_ctx);
            return os2cli_errno(cli);
         }
 
-        debuglocal(4,"num_eas = %d\n", num_eas);
+        debuglocal(pRes, 4,"num_eas = %d\n", num_eas);
 
         // we will count that os/2 max EA size for file is 64kb
@@ -1036 +1033 @@
         {
            int namelen = strlen(ea_list[i].name);
-           debuglocal(4, "%d Got EA <%s> with namelen %d, size %d. Gross %d. Buf %d\n", i, ea_list[i].name, namelen, ea_list[i].value.length, gotsize, size);
+           debuglocal(pRes, 4, "%d Got EA <%s> with namelen %d, size %d. Gross %d. Buf %d\n", i, ea_list[i].name, namelen, ea_list[i].value.length, gotsize, size);
            if (namelen > 0xFF || ea_list[i].value.length > 0xFFFF)
            {
-              debuglocal(4, "Skip EA <%s> with namelen %d, size %d\n", ea_list[i].name, namelen, ea_list[i].value.length);
+              debuglocal(pRes, 4, "Skip EA <%s> with namelen %d, size %d\n", ea_list[i].name, namelen, ea_list[i].value.length);
               continue;
            }
@@ -1056 +1053 @@
         }
         pfealist->cbList = gotsize;
-        debuglocal(4,"ret size = %d\n", gotsize);
+        debuglocal(pRes, 4,"ret size = %d\n", gotsize);
 
         talloc_destroy(mem_ctx);
@@ -1065 +1062 @@
  * lists EA of a path
  */
-int _System smbwrp_listea(cli_state * cli, char *fname, void * buffer, unsigned long size)
+int _System smbwrp_listea(Resource *pRes, cli_state * cli, char *fname, void * buffer, unsigned long size)
 {
         if (!cli || !fname || !buffer)
            return maperror(EINVAL);
 
-        debuglocal(4,"EALIst for <%s>\n", fname);
-        return unilistea(cli, fname, buffer, size);
+        debuglocal(pRes, 4,"EALIst for <%s>\n", fname);
+        return unilistea(pRes, cli, fname, buffer, size);
 }
 
@@ -1077 +1074 @@
  * lists EA of a file
  */
-int _System smbwrp_flistea(cli_state * cli, smbwrp_file *file, void * buffer, unsigned long size)
+int _System smbwrp_flistea(Resource *pRes, cli_state * cli, smbwrp_file *file, void * buffer, unsigned long size)
 {
         if (!cli || !file || !buffer)
            return maperror(EINVAL);
 
-        debuglocal(4,"FEALIst for <%s>\n", file->fname);
-        return unilistea(cli, file->fname, buffer, size);
+        debuglocal(pRes, 4,"FEALIst for <%s>\n", file->fname);
+        return unilistea(pRes, cli, file->fname, buffer, size);
 }
 
@@ -1089 +1086 @@
  * Check the space on a device.
  */
-int _System smbwrp_dskattr(cli_state * cli, FSALLOCATE *pfsa)
+int _System smbwrp_dskattr(Resource *pRes, cli_state * cli, FSALLOCATE *pfsa)
 {
         int total, bsize, avail;
@@ -1098 +1095 @@
         if (!NT_STATUS_IS_OK(cli_dskattr(cli, &bsize, &total, &avail))) 
         {
-           debuglocal(4,"Error in dskattr: %s\n",cli_errstr(cli));
-           return os2cli_errno(cli);
-        }
-
-        debuglocal(4,"\n\t\t%d blocks of size %d. %d blocks available\n",
+           debuglocal(pRes, 4,"Error in dskattr: %s\n",cli_errstr(cli));
+           return os2cli_errno(cli);
+        }
+
+        debuglocal(pRes, 4,"\n\t\t%d blocks of size %d. %d blocks available\n",
                    total, bsize, avail);
 

trunk/client/src/smbwrp.h

@@ -142 +142 @@
         int cachedepth;
         int loglevel;
+        char logfile[_MAX_PATH +1];
+        FILE *logfileFH;
+        char smb_logfile[_MAX_PATH +1];
+        int ifL;
+        int firstLogLine;
+        int smb_initialised;
         struct DirectoryCache *pdc;
 } Resource;
@@ -173 +179 @@
 
 int _System smbwrp_getclisize(void);
-int _System smbwrp_init(void);
+int _System smbwrp_init(Resource *pRes);
 int _System smbwrp_connect(Resource * pRes, cli_state **);
 void _System smbwrp_disconnect(Resource * pRes, cli_state *);
-int _System smbwrp_open(cli_state * cli, smbwrp_file * file);
-int _System smbwrp_read(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result);
-int _System smbwrp_write(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result);
-int _System smbwrp_lseek(cli_state * cli, smbwrp_file * file, int whence, long long offset);
-int _System smbwrp_close(cli_state * cli, smbwrp_file * file);
-int _System smbwrp_setattr(cli_state * cli, smbwrp_fileinfo *finfo);
-int _System smbwrp_getattr(smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo);
-int _System smbwrp_fgetattr(cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo);
-int _System smbwrp_filelist(smbwrp_server *srv, cli_state * cli, filelist_state * state);
-int _System smbwrp_rename(cli_state * cli, char *oldname, char *newname);
-int _System smbwrp_chdir(smbwrp_server *srv, cli_state * cli, char *fname);
-int _System smbwrp_mkdir(cli_state * cli, char *fname);
-int _System smbwrp_rmdir(cli_state * cli, char *fname);
-int _System smbwrp_unlink(cli_state * cli, const char *fname);
-int _System smbwrp_setfilesize(cli_state * cli, smbwrp_file * file, long long newsize);
-int _System smbwrp_setea(cli_state * cli, char *fname, char * name, unsigned char * value, int size);
-int _System smbwrp_fsetea(cli_state * cli, smbwrp_file *file, char * name, unsigned char * value, int size);
-int _System smbwrp_listea(cli_state * cli, char *fname, void * buffer, unsigned long size);
-int _System smbwrp_flistea(cli_state * cli, smbwrp_file *file, void * buffer, unsigned long size);
-int _System smbwrp_dskattr(cli_state * cli, FSALLOCATE *pfsa);
+int _System smbwrp_open(Resource *pRes, cli_state * cli, smbwrp_file * file);
+int _System smbwrp_read(Resource *pRes, cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result);
+int _System smbwrp_write(Resource *pRes, cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result);
+int _System smbwrp_lseek(Resource *pRes, cli_state * cli, smbwrp_file * file, int whence, long long offset);
+int _System smbwrp_close(Resource *pRes, cli_state * cli, smbwrp_file * file);
+int _System smbwrp_setattr(Resource *pRes, cli_state * cli, smbwrp_fileinfo *finfo);
+int _System smbwrp_getattr(Resource *pRes, smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo);
+int _System smbwrp_fgetattr(Resource *pRes, cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo);
+int _System smbwrp_filelist(Resource *pRes, smbwrp_server *srv, cli_state * cli, filelist_state * state);
+int _System smbwrp_rename(Resource *pRes, cli_state * cli, char *oldname, char *newname);
+int _System smbwrp_chdir(Resource *pRes, smbwrp_server *srv, cli_state * cli, char *fname);
+int _System smbwrp_mkdir(Resource *pRes, cli_state * cli, char *fname);
+int _System smbwrp_rmdir(Resource *pRes, cli_state * cli, char *fname);
+int _System smbwrp_unlink(Resource *pRes, cli_state * cli, const char *fname);
+int _System smbwrp_setfilesize(Resource *pRes, cli_state * cli, smbwrp_file * file, long long newsize);
+int _System smbwrp_setea(Resource *pRes, cli_state * cli, char *fname, char * name, unsigned char * value, int size);
+int _System smbwrp_fsetea(Resource *pRes, cli_state * cli, smbwrp_file *file, char * name, unsigned char * value, int size);
+int _System smbwrp_listea(Resource *pRes, cli_state * cli, char *fname, void * buffer, unsigned long size);
+int _System smbwrp_flistea(Resource *pRes, cli_state * cli, smbwrp_file *file, void * buffer, unsigned long size);
+int _System smbwrp_dskattr(Resource *pRes, cli_state * cli, FSALLOCATE *pfsa);
 
 /* Directory cache helpers. */
-int dircache_create(struct DirectoryCache **ppdc, unsigned long ulExpirationTime, int cMaxEntries);
-void dircache_delete(struct DirectoryCache *pdc);
+int dircache_create(Resource *pRes);
+void dircache_delete(Resource *pRes);
 
 typedef void FNADDDIRENTRY(const char*, smbwrp_fileinfo *, const char *, void *);
@@ -213 +219 @@
 void *dircache_write_begin(filelist_state *state,
                            int cFiles);
-void dircache_write_entry(void *dircachectx, const smbwrp_fileinfo *finfo);
-void dircache_write_end(void *dircachectx);
+void dircache_write_entry(Resource *pRes, void *dircachectx, const smbwrp_fileinfo *finfo);
+void dircache_write_end(Resource *pRes, void *dircachectx);
 
 void dircache_invalidate(const char *path,
-                         struct DirectoryCache *pdc,
+                         Resource *pRes,
                          int fParent);
 
-int dircache_find_path(struct DirectoryCache *pdc,
+int dircache_find_path(Resource *pRes,
                        const char *path,
                        smbwrp_fileinfo *finfo,
@@ -226 +232 @@
 
 /* Prototype the debug log helper. */
-void debuglocal(int level, const char * fmt, ...);
+void debuglocal(Resource *pRes, int level, const char * fmt, ...);
 
 void smbwrp_initthread(void);