Major rework to use cbchains on sockets.

[doldaconnect.git] / daemon / client.c

diff --git a/daemon/client.c b/daemon/client.c
index 4a647e8..fc2776b 100644 (file)
--- 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
@@ -364,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)
     {
@@ -391,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;
@@ -405,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)
@@ -443,13 +460,14 @@ 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, 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 +475,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)
@@ -524,8 +543,8 @@ static int hashfile(char *path)
     close(fd);
     close(pfd[1]);
     outsock = wrapsock(pfd[0]);
-    outsock->readcb = hashread;
-    childcallback(hashjob, hashexit, NULL);
+    CBREG(outsock, socket_read, hashread, NULL, NULL);
+    childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
     return(0);
 }
 
@@ -539,16 +558,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;
@@ -559,19 +575,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;
     }
 }
 
@@ -932,7 +943,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;
        }