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

diff --git a/daemon/client.c b/daemon/client.c
index c304d01..5b080fb 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,12 +56,24 @@ 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[] =
 {
+    /** The default nick name to use. The nickname can also be
+     * specified for individual hubs, overriding this setting. */
     {CONF_VAR_STRING, "defnick", {.str = L"DoldaConnect user"}},
+    /** When scanning shares, this bitmask is consulted for every
+     * regular file. Unless the file's mode has the bits specified by
+     * this mask set, it will not be shared. */
     {CONF_VAR_INT, "scanfilemask", {.num = 0004}},
+    /** When scanning shares, this bitmask is consulted for every
+     * directory encountered. Unless the directory's mode has the bits
+     * specified by this mask set, it will be ignored and any files
+     * under it will not be shared. */
     {CONF_VAR_INT, "scandirmask", {.num = 0005}},
+    /** The filename to use for the hash cache (see the FILES section
+     * for more information). */
     {CONF_VAR_STRING, "hashcache", {.str = L"dc-hashcache"}},
     {CONF_VAR_END}
 };
@@ -76,6 +88,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
@@ -242,57 +255,6 @@ static void freehashcache(struct hashcache *hc)
     free(hc);
 }
 
-static char *findhashcachefile(int filldef)
-{
-    static char ret[128];
-    char *hcname;
-    
-    if(getenv("HOME") != NULL)
-    {
-	snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
-	if(!access(ret, R_OK))
-	    return(ret);
-    }
-    if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) == NULL)
-    {
-	flog(LOG_WARNING, "could not convert hash cache name into local charset: %s", strerror(errno));
-	return(NULL);
-    }
-    if(strchr(hcname, '/') != NULL)
-    {
-	if(!access(hcname, R_OK))
-	{
-	    strcpy(ret, hcname);
-	    return(ret);
-	}
-    } else {
-	snprintf(ret, sizeof(ret), "/etc/%s", hcname);
-	if(!access(ret, R_OK))
-	    return(ret);
-	snprintf(ret, sizeof(ret), "/usr/etc/%s", hcname);
-	if(!access(ret, R_OK))
-	    return(ret);
-	snprintf(ret, sizeof(ret), "/usr/local/etc/%s", hcname);
-	if(!access(ret, R_OK))
-	    return(ret);
-    }
-    if(filldef)
-    {
-	if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) != NULL)
-	{
-	    strcpy(ret, hcname);
-	    return(ret);
-	} else if(getenv("HOME") != NULL) {
-	    snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
-	} else {
-	    snprintf(ret, sizeof(ret), "/etc/%s", hcname);
-	}
-	return(ret);
-    } else {
-	return(NULL);
-    }
-}
-
 static struct hashcache *findhashcache(dev_t dev, ino_t inode)
 {
     struct hashcache *hc;
@@ -315,7 +277,7 @@ static void readhashcache(void)
     struct hashcache *hc;
     size_t len;
     
-    if((hcname = findhashcachefile(0)) == NULL)
+    if((hcname = findfile(icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL), NULL, 0)) == NULL)
 	return;
     if((stream = fopen(hcname, "r")) == NULL)
     {
@@ -369,14 +331,29 @@ 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;
     
-    hcname = findhashcachefile(1);
+    if(!now)
+    {
+	if(hashwritetimer == NULL)
+	    hashwritetimer = timercallback(ntime() + 300, (void (*)(int, void *))hashtimercb, NULL);
+	return;
+    }
+    if(hashwritetimer != NULL)
+	canceltimer(hashwritetimer);
+    hcname = findfile(icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL), NULL, 1);
     if((stream = fopen(hcname, "w")) == NULL)
     {
 	flog(LOG_WARNING, "could not write hash cache %s: %s", hcname, strerror(errno));
@@ -448,7 +425,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));
     }
@@ -551,7 +528,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;