Changeset 521

Timestamp:

Jan 14, 2011, 12:28:08 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: another bunch of updates

Location:

trunk/client/src

Files:

• Config.km_ (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• help/ndpsmb.ipf (modified) (2 diffs)
• help/ndpsmb_de.ipf (modified) (2 diffs)
• help/ndpsmb_fr.ipf (modified) (5 diffs)
• help/readme.txt (modified) (1 diff)
• help/readme_de.txt (modified) (2 diffs)
• help/readme_fr.txt (modified) (1 diff)
• ndpsmb.c (modified) (3 diffs)
• rc/rc.rc_ (moved) (moved from trunk/client/src/rc/rc.rc ) (1 diff)
• smbwrp.c (modified) (3 diffs)
• smbwrp.h (modified) (1 diff)

trunk/client/src/Config.km_

@@ -8 +8 @@
 # edit this file to change version numbering
 # in bldlevel informations
+# adjust also the date please
 #
 VERSION = 1.6.0
-BUILD   = beta
+BUILD   = beta-date
 SAMBA   = ../../samba-33
 TOOLKIT = u:/os2tk45

trunk/client/src/Makefile.kmk

@@ -93 +93 @@
 
 # add new dependancy on build level info
-rc/rc.rc : rc/description.rc nversion.h
+rc/rc.rc : rc/description.rc nversion.h rc/rc.rc_
+        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" rc/rc.rc_ \
+                | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
+                | $(SED) "s;_BUILD_;$(BUILD);g" \
+                > rc/rc.rc
+
 
 # update bldlevel info

trunk/client/src/help/ndpsmb.ipf

@@ -246 +246 @@
 :li.codepage fix for Ticket #68
 :eul.   
-:li.GA
+:li.1.5.0 GA
 :ul.
 :li.Fix memory leak in EA code
@@ -272 +272 @@
 :ul.
 :li.added dir caching
+:eul.
+:li.beta2
+:ul.
+:li.read problem of small files fixed
+:li.delete cache of changed files
+:li.SIGPIPE crash fixed 
+:eul.
+:li.beta3
+:ul.
+:li.changed instpl.cmd to work correct with nls
+:li.added the possibility to adjust cache timeout and depth via GUI
+:li.adjustments to helpfile and readme
+:eul.
+:li.beta4
+:ul.
+:li.possible SIGPIPE crashes redone (thanks to Vitali)
+:li.touch did not delete the cache
 :eul.
 :eul.

trunk/client/src/help/ndpsmb_de.ipf

@@ -250 +250 @@
 :li.Codepage Update f&ue.r Ticket # 68
 :eul.   
-:li.GA
+:li.1.5.0 GA
 :ul.
 :li.Behebung eines Speicherloches im EA-Code
@@ -275 +275 @@
 :h2 res=013.Version 2.0   
 :ul.
-:li.2.0.0
+:li.beta1
 :ul.
 :li.Caching von Verzeichnissen
 :eul.
+:li.beta2
+:ul.
+:li.Leseproblem mit kleinen Dateien
+:li.Cache von ge&ae.nderten Dateien sofort l&oe.schen
+:li.SIGPIPE Absturz behoben
+:eul.
+:li.beta3
+:ul.
+:li.instpl.cmd ge&ae.ndert, damit Sprachen richtig installiert werden
+:li.M&oe.glichkeit zum ver„ndern des Cache timeout und Tiefe via GUI
+:li.Anassungen an Hilfedateine und readme
+:eul.
+:li.beta4
+:ul.
+:li.m&oe.gliche SIGPIPE Abst&ue.rze komplett neu gel&oe.st (Dank geht an Vitali)
+:li.Touch l&oe.schte den Cache nicht 
+:eul.
 :eul.
 :h2 res=014.Version 2.1   
 :ul.
-:li.2.1.0 alpha1
+:li.alpha1
 :li.Update auf Samba 3.3 Client-Code
 :li.neuer Merge von 1.6 code und 2.0 code

trunk/client/src/help/ndpsmb_fr.ipf

@@ -224 +224 @@
 :ul.
 :li.:link reftype=hd res=011.Version 1.0:elink.
-:li.:link reftype=hd res=012.Version 1.5.0:elink.
-:li.:link reftype=hd res=013.Version 2.0.0:elink.
-:li.:link reftype=hd res=014.Version 2.1.0:elink.
+:li.:link reftype=hd res=012.Version 1.5:elink.
+:li.:link reftype=hd res=013.Version 2.0:elink.
+:li.:link reftype=hd res=014.Version 2.1:elink.
 :eul.
 :h2 res=011.Version 1.0
@@ -319 +319 @@
 :eul.
 :eul.
-:h2 res=012.Version 1.5.0
+:h2 res=012.Version 1.5
 :ul.
 :li.alpha1
@@ -348 +348 @@
 :li.Correctif sur les pages de codes (ticket nø68). 
 :eul.
-:li.GA
+:li.1.5.0 GA
 :ul.
 :li.Correction d'une fuite de m‚moire dans le code A.
@@ -375 +375 @@
 :eul.
 :eul.
-:h2 res=013.Version 2.0.0
+:h2 res=013.Version 2.0
 :ul.
 :li.beta1
@@ -395 +395 @@
 :li.Correction des fichiers d'aide. 
 :eul.
+:li.beta4
+:ul.
+:li.Revue des possibles plantages SIGPIPE (merci 
+ Vitali).
+:li."touch" ne supprimait pas le cache.
+:eul.
 :eul.
 :h2 res=014.Version 2.1   
 :ul.
-:li.2.1.0 alpha1
+:li.alpha1
 :ul.
 :li.moved to samba 3.3 source base

trunk/client/src/help/readme.txt

@@ -254 +254 @@
    - added logging feature for samba messages
    
-v1.5.1:
+ v1.5.1:
    - Fix crashes on quadcore machines
    
-v1.5.2:
+ v1.5.2:
    - Fix help files
 
-v1.5.3:
+ v1.5.3:
    - Fix timestamp problem
 
-v2.0.0 :
+ v2.0.0 beta1:
    - added dir caching
 
-v2.1.0 alpha1 :
+ v2.0.0 beta2:
+   - read problem of small files fixed
+   - delete cache of changed files
+   - SIGPIPE crash fixed
+
+ v2.0.0 beta3:
+   - changed instpl.cmd to work correct with nls
+   - added the possibility to adjust cache timeout and depth via GUI
+   - adjustments to helpfile and readme
+
+ v2.0.0 beta4:
+   - possible SIGPIPE crashes redone (thanks to Vitali)
+   - touch did not delete the cache
+
+ v2.1.0 alpha1:
    - moved to samba 3.3 source base
    - new merge of 2.0 code and 1.6 code

trunk/client/src/help/readme_de.txt

@@ -256 +256 @@
    - Codepage Update fr Ticket # 68
    
- v1.5.0:
+ v1.5.0 GA:
    - Behebung eines Speicherloches im EA-Code
    - Ticket # 111 
@@ -266 +266 @@
    - Logging-Funktion fr Samba Meldungen hinzugefgt
 
-v1.5.1
+ v1.5.1:
    - Behebung der Abstrze auf Quadcore Maschinen
    
-v1.5.2
+ v1.5.2:
    - Korrekturen an den Hilfedateien
 
-v1.5.3
+ v1.5.3:
    - Zeitzonenproblem behoben
 
-v2.0.0
+ v2.0.0 beta1:
    - Caching von Verzeichnissen
 
-v2.1.0 alpha1:
+ v2.0.0 beta2:
+   - Leseproblem mit kleinen Dateien
+   - Cache von ge„nderten Dateien sofort l”schen
+   - SIGPIPE absturz behoben
+
+ v2.0.0 beta3:
+   - instpl.cmd ge„ndert, damit Sprachen richtig installiert werden
+   - M”glichkeit zum ver„ndern des Cache timeout und Tiefe via GUI
+   - Anassungen an Hilfedateine und readme
+
+ v2.0.0 beta4:
+   - m”gliche SIGPIPE Abstrze komplett neu gel”st (Dank geht an Vitali)
+   - Touch l”schte den Cache nicht 
+
+ v2.1.0 alpha1:
    - Update auf Samba 3.3 Client-Code
    - neuer Merge von 1.6 code und 2.0 code

trunk/client/src/help/readme_fr.txt

@@ -344 +344 @@
      Samba. 
    
- v1.5.1
+ v1.5.1 :
    - Correction du plantage sur les machines Quadcore. 
    
- v1.5.2
+ v1.5.2 :
    - Correction des fichiers d'aide. 
 
- v1.5.3
+ v1.5.3 :
    - Correction du problŠme de tampon dateur des fichiers. 
 
- v2.0.0 beta1
+ v2.0.0 beta1 :
    - Ajout de la mise en cache des r‚pertoires. 
 
- v2.0.0 beta2
+ v2.0.0 beta2 :
    - Correction du problŠme de lecture des petits fichiers. 
    - Suppression du cache sur les fichiers modifi‚s. 
    - Correction du plantage SIGPIPE. 
 
- v2.0.0 beta3
+ v2.0.0 beta3 :
    - Ajout de la possibilit‚ de r‚gler la temporisation et la
      profondeur du cache via l'interface utilisateur. 
    - Correction du script insp.pl. 
-   - Correction des fichiers d'aide. 
+   - Correction des fichiers d'aide.
+
+ v2.0.0 beta4 :
+   - Revue des possibles plantages SIGPIPE (merci 
+ Vitali).
+   - "touch" ne supprimait pas le cache. 
 
  v2.1.0 alpha1 :

trunk/client/src/ndpsmb.c

@@ -115 +115 @@
         {ND_PROP_STRING, 0, "SPASSWORD",  ""},
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
-        { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
+        {ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
         {ND_PROP_ULONG, 0, "CTO", "10"},
         {ND_PROP_ULONG, 0, "CLD", "32"},
+        {ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -1675 +1675 @@
 }
 
+// Called when a new thread will call the plugin. Allows to do per thread init, like disable signals.
+#define ND_PL_INIT_THREAD 0xFFFF0000
+
 int APIENTRY NdpIOCTL (int type, HRESOURCE resource, char *path, int function, void *in, ULONG insize, PULONG poutlen)
 {
+    if (function == ND_PL_INIT_THREAD)
+       {
+          smbwrp_initthread();
+          debuglocal(9, "NdpIOCTL init thread\n");
+          return NO_ERROR;
+       }
+
     debuglocal(9,"NdpIOCTL <%s> %d\n", path, function);
 
@@ -1886 +1896 @@
 
         debug_printf("NdpFileSetInfo in [%p]\n", pConn);
+
+        // delete the dir cache
+        dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
+
         do {
                 if (pConn->file.fd < 0 || !*pConn->file.fname)

trunk/client/src/rc/rc.rc_

@@ -14 +14 @@
 RCDATA NDRC_PLUGIN_DESC
 {
-    "Access to SAMBA resources."
+"Access to SAMBA resources.\n
+Plugin Version _VERSION_ Build _BUILD_\n
+See help for more Information.\n   
+"
 }
 

trunk/client/src/smbwrp.c

@@ -195 +195 @@
         }
 */
+        return 0;
+
+}
+
+void smbwrp_initthread(void)
+{
         /*
          * Block SIGPIPE (from lib/util_sock.c: write())
@@ -200 +206 @@
          */
         BlockSignals(True, SIGPIPE);
-
-        return 0;
-
 }
 
@@ -821 +824 @@
         }
 
-debuglocal(4,"Setting on <%s> attr %04x, time %lu/%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime));
-        if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : get_time_zone(finfo->mtime)))
+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));
+        // 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)))
+        if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime)
                 && !cli_setatr(cli, finfo->fname, finfo->attr, 0)) 
         {

trunk/client/src/smbwrp.h

@@ -223 +223 @@
 void debuglocal(int level, const char * fmt, ...);
 
+void smbwrp_initthread(void);
+
 #endif /* _SMBWRP_H */