X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=7cdfbe33b43971dfc51df123766e5f619cca9c60;hb=c26de38e9fc0ceb4f51af1085da37db42f4c4411;hp=1e659aba1a5db3f9f8a4801baa7437a05bf8f26b;hpb=72a06ab4f33ca6ea84ff2737098f810adbbe6f38;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index 1e659ab..7cdfbe3 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -36,9 +36,9 @@
 #include "log.h"
 #include "utils.h"
 #include "module.h"
-#include "tiger.h"
 #include "net.h"
 #include "sysevents.h"
+#include <tiger.h>
 
 struct scanstate
 {
@@ -56,6 +56,7 @@ struct scanqueue
 static int conf_share(int argc, wchar_t **argv);
 static void freecache(struct sharecache *node);
 static void checkhashes(void);
+static void writehashcache(int now);
 
 static struct configvar myvars[] =
 {
@@ -76,6 +77,7 @@ static struct scanstate *scanjob = NULL;
 static struct scanqueue *scanqueue = NULL;
 static struct sharepoint *shares = NULL;
 static struct hashcache *hashcache = NULL;
+static struct timer *hashwritetimer = NULL;
 /* Set initially to -1, but changed to 0 the first time run() is
  * called. This is to avoid forking a hash job before daemonizing,
  * since that would make the daemon unable to wait() for the hash
@@ -364,13 +366,28 @@ static void readhashcache(void)
     fclose(stream);
 }
 
-static void writehashcache(void)
+static void hashtimercb(int cancelled, void *uudata)
+{
+    hashwritetimer = NULL;
+    if(!cancelled)
+	writehashcache(1);
+}
+
+static void writehashcache(int now)
 {
     char *buf;
     char *hcname;
     FILE *stream;
     struct hashcache *hc;
     
+    if(!now)
+    {
+	if(hashwritetimer == NULL)
+	    hashwritetimer = timercallback(ntime() + 300, (void (*)(int, void *))hashtimercb, NULL);
+	return;
+    }
+    if(hashwritetimer != NULL)
+	canceltimer(hashwritetimer);
     hcname = findhashcachefile(1);
     if((stream = fopen(hcname, "w")) == NULL)
     {
@@ -443,7 +460,7 @@ static void hashread(struct socket *sk, void *uudata)
 	    buf = base64decode(wv[3], NULL);
 	    memcpy(hc->tth, buf, 24);
 	    free(buf);
-	    writehashcache();
+	    writehashcache(0);
 	}
 	memmove(hashbuf, lp, hashbufdata -= (lp - hashbuf));
     }