X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=fc2776b7e599fef28654c90f8cee5096e0f68b82;hb=f5dbbe62975d51f5096e1b38c3d982e6af093d8b;hp=c304d0137b9c2e8511cd9298bfee6f7fae830f45;hpb=dfc72ce3ef0801b54a285abdd72b620a4dceb72e;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index c304d01..fc2776b 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
@@ -278,15 +280,10 @@ static char *findhashcachefile(int filldef)
     }
     if(filldef)
     {
-	if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) != NULL)
-	{
-	    strcpy(ret, hcname);
-	    return(ret);
-	} else if(getenv("HOME") != NULL) {
+	if(getenv("HOME") != NULL)
 	    snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
-	} else {
+	else
 	    snprintf(ret, sizeof(ret), "/etc/%s", hcname);
-	}
 	return(ret);
     } else {
 	return(NULL);
@@ -369,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)
     {
@@ -396,7 +408,7 @@ static void writehashcache(void)
     fclose(stream);
 }
 
-static void hashread(struct socket *sk, void *uudata)
+static int hashread(struct socket *sk, void *uudata)
 {
     static char *hashbuf;
     static size_t hashbufsize = 0, hashbufdata = 0;
@@ -410,7 +422,7 @@ static void hashread(struct socket *sk, void *uudata)
     struct hashcache *hc;
     
     if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
+	return(0);
     bufcat(hashbuf, buf, bufsize);
     free(buf);
     while((lp = memchr(hashbuf, '\n', hashbufdata)) != NULL)
@@ -448,10 +460,11 @@ 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));
     }
+    return(0);
 }
 
 static void hashexit(pid_t pid, int status, struct socket *outsock)
@@ -530,7 +543,7 @@ static int hashfile(char *path)
     close(fd);
     close(pfd[1]);
     outsock = wrapsock(pfd[0]);
-    outsock->readcb = hashread;
+    CBREG(outsock, socket_read, hashread, NULL, NULL);
     childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
     return(0);
 }
@@ -551,7 +564,7 @@ static void checkhashes(void)
 	    continue;
 	if(!node->f.b.hastth)
 	{
-	    if((hc = findhashcache(node->dev, node->inode)) != NULL)
+	    if(((hc = findhashcache(node->dev, node->inode)) != NULL) && (hc->mtime == node->mtime))
 	    {
 		memcpy(node->hashtth, hc->tth, 24);
 		node->f.b.hastth = 1;