Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add getresps.
[doldaconnect.git]
/
daemon
/
client.c
diff --git
a/daemon/client.c
b/daemon/client.c
index
4a647e8
..
1e659ab
100644
(file)
--- 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);
{
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();
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
+526,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
+540,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
+557,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
+925,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;
}