Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update svn:ignore.
[doldaconnect.git]
/
daemon
/
client.c
diff --git
a/daemon/client.c
b/daemon/client.c
index
4a647e8
..
fa51d95
100644
(file)
--- a/
daemon/client.c
+++ b/
daemon/client.c
@@
-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 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[] =
{
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 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
/* 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);
}
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;
{
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)
{
hcname = findhashcachefile(1);
if((stream = fopen(hcname, "w")) == NULL)
{
@@
-443,13
+460,13
@@
static void hashread(struct socket *sk, void *uudata)
buf = base64decode(wv[3], NULL);
memcpy(hc->tth, buf, 24);
free(buf);
buf = base64decode(wv[3], NULL);
memcpy(hc->tth, buf, 24);
free(buf);
- writehashcache();
+ writehashcache(
0
);
}
memmove(hashbuf, lp, hashbufdata -= (lp - hashbuf));
}
}
}
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);
{
if(pid != hashjob)
flog(LOG_ERR, "BUG: hashing process changed PID?! old: %i new %i", hashjob, pid);
@@
-457,6
+474,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();
flog(LOG_WARNING, "hashing process exited with non-zero status: %i", status);
hashjob = 0;
checkhashes();
+ putsock(outsock);
}
static int hashfile(char *path)
}
static int hashfile(char *path)
@@
-525,7
+543,7
@@
static int hashfile(char *path)
close(pfd[1]);
outsock = wrapsock(pfd[0]);
outsock->readcb = hashread;
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);
}
return(0);
}
@@
-539,16
+557,13
@@
static void checkhashes(void)
char *path;
node = shareroot->child;
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;
continue;
- }
if(!node->f.b.hastth)
{
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;
{
memcpy(node->hashtth, hc->tth, 24);
node->f.b.hastth = 1;
@@
-559,19
+574,14
@@
static void checkhashes(void)
{
flog(LOG_WARNING, "could not hash %s, unsharing it", path);
freecache(node);
{
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;
}
}
}
free(path);
return;
}
}
- while(node->next == NULL)
- {
- if((node = node->parent) == shareroot)
- break;
- }
- if(node == shareroot)
- break;
- node = node->next;
}
}
}
}
@@
-932,7
+942,7
@@
int doscan(int quantum)
}
type = FILE_REG;
} else {
}
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;
}
free(wcs);
continue;
}