Changeset 520

Timestamp:

Jan 14, 2011, 11:58:49 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.0: another bunch of updates

Location:

branches/client-2.0/src

Files:

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

branches/client-2.0/src/Config.km_

@@ -8 +8 @@
 # edit this file to change version numbering
 # in bldlevel informations
+# adjust also the date please
 #
 VERSION = 1.5.0
-BUILD   = beta1
+BUILD   = beta1-date
 SAMBA   = ../../samba-3.0
 TOOLKIT = f:/dev/toolkit452

branches/client-2.0/src/Makefile.kmk

@@ -95 +95 @@
 
 # add new dependancy on build level info
-rc/rc.rc : rc/description.rc
+rc/rc.rc : rc/description.rc rc/rc.rc_
+        $(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

branches/client-2.0/src/help/ndpsmb.ipf

@@ -281 +281 @@
 :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.

branches/client-2.0/src/help/ndpsmb_de.ipf

@@ -281 +281 @@
 :ul.
 :li.Leseproblem mit kleinen Dateien
-:li.Cache von ge„nderten Dateien sofort l”schen
-:li.SIGPIPE absturz behoben
+:li.Cache von ge&ae.nderten Dateien sofort l&oe.schen
+:li.SIGPIPE Absturz behoben
 :eul.
 :li.beta3
 :ul.
-:li.instpl.cmd ge„ndert, damit Sprachen richtig installiert werden
-:li.M”glichkeit zum ver„ndern des Cache timeout und Tiefe via GUI
+: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.

branches/client-2.0/src/help/ndpsmb_fr.ipf

@@ -394 +394 @@
 :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.
 :p.

branches/client-2.0/src/help/readme.txt

@@ -274 +274 @@
    - adjustments to helpfile and readme
 
+v2.0.0 beta4
+   - possible SIGPIPE crashes redone (thanks to Vitali)
+   - touch did not delete the cache
+

branches/client-2.0/src/help/readme_de.txt

@@ -286 +286 @@
    - 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 
+

branches/client-2.0/src/help/readme_fr.txt

@@ -367 +367 @@
    - Correction des fichiers d'aide. 
 
+ v2.0.0 beta4
+   - Revue des possibles plantages SIGPIPE (merci 
+ Vitali).
+   - "touch" ne supprimait pas le cache.
+
 
 Traduction fran‡aise : Guillaume Gay <guillaume.gay@bigfoot.com>

branches/client-2.0/src/ndpsmb.c

@@ -212 +212 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         {ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        {ND_PROP_ULONG, 0, "EASUPPORT", "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}
 };
@@ -1775 +1775 @@
 }
 
+// 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);
 
@@ -1986 +1996 @@
 
         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)

branches/client-2.0/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   
+"
+
 }
 

branches/client-2.0/src/smbwrp.c

@@ -178 +178 @@
         }
 */
+        return 0;
+
+}
+
+void smbwrp_initthread(void)
+{
         /*
          * Block SIGPIPE (from lib/util_sock.c: write())
@@ -183 +189 @@
          */
         BlockSignals(True, SIGPIPE);
-
-        return 0;
-
 }
 
@@ -794 +797 @@
         }
 
-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, 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)) 
         {

branches/client-2.0/src/smbwrp.h

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