X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=1e659aba1a5db3f9f8a4801baa7437a05bf8f26b;hb=a3a4a3a7ae1030512acfd849bb184b9d2264c24d;hp=bf7a3afb8b144f1dde54b47fe5fa98087c07372c;hpb=2eaefd316777cb97c72cf9d03df72246d44ec8be;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index bf7a3af..1e659ab 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -76,7 +76,11 @@ static struct scanstate *scanjob = NULL;
 static struct scanqueue *scanqueue = NULL;
 static struct sharepoint *shares = NULL;
 static struct hashcache *hashcache = NULL;
-static pid_t hashjob = 0;
+/* 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
+ * job. */
+static pid_t hashjob = -1;
 struct sharecache *shareroot = NULL;
 unsigned long long sharesize = 0;
 GCBCHAIN(sharechangecb, unsigned long long);
@@ -198,9 +202,21 @@ wchar_t *unparsehash(struct hash *hash)
     addtobuf(buf, ':');
     bufcat(buf, whbuf, wcslen(whbuf));
     free(whbuf);
+    addtobuf(buf, 0);
     return(buf);
 }
 
+int hashcmp(struct hash *h1, struct hash *h2)
+{
+    if(wcscmp(h1->algo, h2->algo))
+	return(0);
+    if(h1->len != h2->len)
+	return(0);
+    if(memcmp(h1->buf, h2->buf, h1->len))
+	return(0);
+    return(1);
+}
+
 static struct hashcache *newhashcache(void)
 {
     struct hashcache *new;
@@ -433,7 +449,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);
@@ -441,6 +457,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)
@@ -509,7 +526,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);
 }
 
@@ -523,16 +540,13 @@ 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)
+	    if(((hc = findhashcache(node->dev, node->inode)) != NULL) && (hc->mtime == node->mtime))
 	    {
 		memcpy(node->hashtth, hc->tth, 24);
 		node->f.b.hastth = 1;
@@ -543,19 +557,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;
     }
 }
 
@@ -916,7 +925,7 @@ int doscan(int quantum)
 	    }
 	    type = FILE_REG;
 	} else {
-	    flog(LOG_WARNING, "unhandled file type: %i", sb.st_mode);
+	    flog(LOG_WARNING, "unhandled file type: 0%o", sb.st_mode);
 	    free(wcs);
 	    continue;
 	}
@@ -1039,6 +1048,11 @@ static int init(int hup)
 
 static int run(void)
 {
+    if(hashjob == -1)
+    {
+	hashjob = 0;
+	checkhashes();
+    }
     return(doscan(10));
 }