/*
* Dolda Connect - Modular multiuser Direct Connect-style client
- * Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ * Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
*
* 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
*/
#include <stdlib.h>
#include <stdio.h>
-#include <malloc.h>
#include <wchar.h>
#include <string.h>
#include <errno.h>
#include "log.h"
#include "utils.h"
#include "module.h"
-#include "tiger.h"
#include "net.h"
#include "sysevents.h"
+#include <tiger.h>
struct scanstate
{
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}
};
* 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);
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;
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)
{
if(!now)
{
if(hashwritetimer == NULL)
- hashwritetimer = timercallback(ntime() + 300, (void (*)(int, void *))hashtimercb, NULL);
+ hashwritetimer = timercallback(ntime() + confgetint("cli", "hashwritedelay"), (void (*)(int, void *))hashtimercb, NULL);
return;
}
if(hashwritetimer != NULL)
canceltimer(hashwritetimer);
- hcname = findhashcachefile(1);
+ 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));
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);
}
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);
}
*/
static void checkhashes(void)
{
- struct sharecache *node;
+ struct sharecache *node, *next;
struct hashcache *hc;
char *path;
node = shareroot->child;
- for(node = shareroot->child; node != NULL; node = nextscnode(node))
+ for(node = shareroot->child; node != NULL; node = next)
{
+ next = nextscnode(node);
if(node->f.b.type != FILE_REG)
continue;
if(!node->f.b.hastth)
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)
if(S_ISREG(sb.st_mode))
{
sharesize += (n->size = sb.st_size);
+ sharedfiles++;
} else {
n->size = 0;
}
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;
}
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)
}
}
+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;
}
scanshares();
if(!hup)
+ {
while(doscan(100));
+ CBREG(confgetvar("cli", "rescandelay"), conf_update, rsdelayupdate, NULL, NULL);
+ }
return(0);
}
{
if(hashjob != 0)
kill(hashjob, SIGHUP);
+ if(hashwritetimer != NULL)
+ writehashcache(1);
while(shares != NULL)
freesharepoint(shares);
freecache(shareroot);
Dolda2000 GitWeb / doldaconnect.git / blobdiff