X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=1e659aba1a5db3f9f8a4801baa7437a05bf8f26b;hb=6e37d33d4f42ad119cafa516746b10adaa148e49;hp=50da10dea9f8ff906b6a49a527f9014922fb4c60;hpb=e194f2fdfdde54a19e3e94a63f70580b6da0854a;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index 50da10d..1e659ab 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -449,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);
@@ -457,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)
@@ -525,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);
 }
 
@@ -545,7 +546,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;