X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=e493a884ce47f449b80ea86ad3e1901dffce9c54;hb=HEAD;hp=6f393272ed21555f51dc39c1a5a4f841866210b4;hpb=4f8fc795dd4bae877bfef8ac1e8df062c023fca2;p=doldaconnect.git diff --git a/daemon/client.c b/daemon/client.c index 6f39327..e493a88 100644 --- a/daemon/client.c +++ b/daemon/client.c @@ -1,6 +1,6 @@ /* * Dolda Connect - Modular multiuser Direct Connect-style client - * Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com) + * Copyright (C) 2004 Fredrik Tolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ */ #include #include -#include #include #include #include @@ -36,9 +35,9 @@ #include "log.h" #include "utils.h" #include "module.h" -#include "tiger.h" #include "net.h" #include "sysevents.h" +#include struct scanstate { @@ -56,13 +55,36 @@ 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"}}, + /** Writes of the hash cache and file lists are delayed for an + * amount of time, in order to minimize the time spent on I/O wait + * while hashing many small files. This variable sets the amount + * of time, in seconds. */ + {CONF_VAR_INT, "hashwritedelay", {.num = 300}}, + /** The amount of time, in seconds, to wait before automatically + * rescanning the shared directories for changes. Set to zero (the + * default) to disable automatic rescanning. (Broken shares are + * always rescanned upon detection, regardless of this + * setting.) */ + {CONF_VAR_INT, "rescandelay", {.num = 0}}, {CONF_VAR_END} }; @@ -76,8 +98,15 @@ 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; +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 + * job. */ +static pid_t hashjob = -1; struct sharecache *shareroot = NULL; +static struct timer *scantimer = NULL; +int sharedfiles = 0; unsigned long long sharesize = 0; GCBCHAIN(sharechangecb, unsigned long long); @@ -198,6 +227,7 @@ wchar_t *unparsehash(struct hash *hash) addtobuf(buf, ':'); bufcat(buf, whbuf, wcslen(whbuf)); free(whbuf); + addtobuf(buf, 0); return(buf); } @@ -237,52 +267,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(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; @@ -305,13 +289,15 @@ 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) { flog(LOG_WARNING, "could not open hash cache %s: %s", hcname, strerror(errno)); + free(hcname); return; } + free(hcname); while(hashcache != NULL) freehashcache(hashcache); line = 0; @@ -359,19 +345,36 @@ 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() + confgetint("cli", "hashwritedelay"), (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)); + free(hcname); return; } + free(hcname); fprintf(stream, "# Dolda Connect hash cache file\n"); fprintf(stream, "# Generated automatically, do not edit\n"); fprintf(stream, "# Format: DEVICE INODE MTIME [HASH...]\n"); @@ -380,7 +383,7 @@ static void writehashcache(void) for(hc = hashcache; hc != NULL; hc = hc->next) { buf = base64encode(hc->tth, 24); - fprintf(stream, "%lli %lli %li tth %s\n", hc->dev, (long long)hc->inode, hc->mtime, buf); + fprintf(stream, "%lli %lli %li tth %s\n", (long long)hc->dev, (long long)hc->inode, hc->mtime, buf); free(buf); } fclose(stream); @@ -438,13 +441,13 @@ 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)); } } -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); @@ -452,6 +455,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) @@ -512,7 +516,7 @@ static int hashfile(char *path) } synctigertree(&tth); restigertree(&tth, digest); - ret = snprintf(buf, sizeof(buf), "%lli %lli %li %s\n", sb.st_dev, (long long)sb.st_ino, sb.st_mtime, base64encode(digest, 24)); + ret = snprintf(buf, sizeof(buf), "%lli %lli %li %s\n", (long long)sb.st_dev, (long long)sb.st_ino, sb.st_mtime, base64encode(digest, 24)); write(1, buf, ret); exit(0); } @@ -520,7 +524,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); } @@ -529,21 +533,19 @@ static int hashfile(char *path) */ static void checkhashes(void) { - struct sharecache *node; + struct sharecache *node, *next; struct hashcache *hc; char *path; node = shareroot->child; - while(1) + for(node = shareroot->child; node != NULL; node = next) { - if(node->child != NULL) - { - node = node->child; + next = nextscnode(node); + 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; @@ -554,19 +556,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; } } @@ -656,6 +653,8 @@ static void freecache(struct sharecache *node) CBCHAINDOCB(node, share_delete, node); CBCHAINFREE(node, share_delete); sharesize -= node->size; + if(node->f.b.type == FILE_REG) + sharedfiles--; if(node->path != NULL) free(node->path); if(node->name != NULL) @@ -927,7 +926,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; } @@ -946,6 +945,7 @@ int doscan(int quantum) if(S_ISREG(sb.st_mode)) { sharesize += (n->size = sb.st_size); + sharedfiles++; } else { n->size = 0; } @@ -984,6 +984,18 @@ int doscan(int quantum) return(1); } +static void rescancb(int cancelled, void *uudata) +{ + scantimer = NULL; + if(!cancelled) + { + if(scanqueue == NULL) + scanshares(); + else if(confgetint("cli", "rescandelay") > 0) + scantimer = timercallback(ntime() + confgetint("cli", "rescandelay"), (void (*)(int, void *))rescancb, NULL); + } +} + void scanshares(void) { struct sharepoint *cur; @@ -1014,6 +1026,10 @@ void scanshares(void) } queuescan(node); } + if(scantimer != NULL) + canceltimer(scantimer); + if(confgetint("cli", "rescandelay") > 0) + scantimer = timercallback(ntime() + confgetint("cli", "rescandelay"), (void (*)(int, void *))rescancb, NULL); } static void preinit(int hup) @@ -1031,6 +1047,15 @@ static void preinit(int hup) } } +static int rsdelayupdate(struct configvar *var, void *uudata) +{ + if(scantimer != NULL) + canceltimer(scantimer); + if(confgetint("cli", "rescandelay") > 0) + scantimer = timercallback(ntime() + var->val.num, (void (*)(int, void *))rescancb, NULL); + return(0); +} + static int init(int hup) { struct sharepoint *cur, *next; @@ -1044,12 +1069,20 @@ static int init(int hup) } scanshares(); if(!hup) + { while(doscan(100)); + CBREG(confgetvar("cli", "rescandelay"), conf_update, rsdelayupdate, NULL, NULL); + } return(0); } static int run(void) { + if(hashjob == -1) + { + hashjob = 0; + checkhashes(); + } return(doscan(10)); } @@ -1057,6 +1090,8 @@ static void terminate(void) { if(hashjob != 0) kill(hashjob, SIGHUP); + if(hashwritetimer != NULL) + writehashcache(1); while(shares != NULL) freesharepoint(shares); freecache(shareroot);