Create dc-hashcache according to cli.hashcache, if it exists.

[doldaconnect.git] / daemon / client.c

diff --git a/daemon/client.c b/daemon/client.c
index f173121..c304d01 100644 (file)
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -278,10 +278,15 @@ static char *findhashcachefile(int filldef)
     }
     if(filldef)
     {
-       if(getenv("HOME") != NULL)
+       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
+       } else {
            snprintf(ret, sizeof(ret), "/etc/%s", hcname);
+       }
        return(ret);
     } else {
        return(NULL);
@@ -449,7 +454,7 @@ static void hashread(struct socket *sk, void *uudata)
     }
 }
 
-static void hashexit(pid_t pid, int status, void *uudata)
+static void hashexit(pid_t pid, int status, struct socket *outsock)
 {
     if(pid != hashjob)
        flog(LOG_ERR, "BUG: hashing process changed PID?! old: %i new %i", hashjob, pid);
@@ -457,6 +462,7 @@ static void hashexit(pid_t pid, int status, void *uudata)
        flog(LOG_WARNING, "hashing process exited with non-zero status: %i", status);
     hashjob = 0;
     checkhashes();
+    putsock(outsock);
 }
 
 static int hashfile(char *path)
@@ -525,7 +531,7 @@ static int hashfile(char *path)
     close(pfd[1]);
     outsock = wrapsock(pfd[0]);
     outsock->readcb = hashread;
-    childcallback(hashjob, hashexit, NULL);
+    childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
     return(0);
 }
 
@@ -539,13 +545,10 @@ static void checkhashes(void)
     char *path;
     
     node = shareroot->child;
-    while(1)
+    for(node = shareroot->child; node != NULL; node = nextscnode(node))
     {
-       if(node->child != NULL)
-       {
-           node = node->child;
+       if(node->f.b.type != FILE_REG)
            continue;
-       }
        if(!node->f.b.hastth)
        {
            if((hc = findhashcache(node->dev, node->inode)) != NULL)
@@ -559,19 +562,14 @@ static void checkhashes(void)
                {
                    flog(LOG_WARNING, "could not hash %s, unsharing it", path);
                    freecache(node);
+                   free(path);
+                   flog(LOG_INFO, "sharing %lli bytes", sharesize);
+                   continue;
                }
                free(path);
                return;
            }
        }
-       while(node->next == NULL)
-       {
-           if((node = node->parent) == shareroot)
-               break;
-       }
-       if(node == shareroot)
-           break;
-       node = node->next;
     }
 }