Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed debugging output from hubmgr.
[doldaconnect.git]
/
daemon
/
fnet-dc.c
diff --git
a/daemon/fnet-dc.c
b/daemon/fnet-dc.c
index
a8faf28
..
593dc92
100644
(file)
--- a/
daemon/fnet-dc.c
+++ b/
daemon/fnet-dc.c
@@
-3014,7
+3014,7
@@
static void hubread(struct socket *sk, struct fnetnode *fn)
free(newbuf);
p = hub->inbuf;
hub->inbufdata += datalen;
free(newbuf);
p = hub->inbuf;
hub->inbufdata += datalen;
- while((
datalen > 0) && ((p2 = memchr(p, '|', datalen
)) != NULL))
+ while((
p - hub->inbuf < hub->inbufdata) && ((p2 = memchr(p, '|', hub->inbufdata - (p - hub->inbuf)
)) != NULL))
{
*(p2++) = 0;
for(cmd = hubcmds; cmd->handler != NULL; cmd++)
{
*(p2++) = 0;
for(cmd = hubcmds; cmd->handler != NULL; cmd++)
@@
-3025,7
+3025,6
@@
static void hubread(struct socket *sk, struct fnetnode *fn)
}
if((cmd->limit == 0) || (hub->queue.size < cmd->limit))
newqcmd(&hub->queue, p);
}
if((cmd->limit == 0) || (hub->queue.size < cmd->limit))
newqcmd(&hub->queue, p);
- datalen -= p2 - p;
p = p2;
}
memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
p = p2;
}
memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
@@
-3140,7
+3139,6
@@
static void freedcpeer(struct dcpeer *peer)
peer->transfer->close = 1;
if(peer->transfer->dir == TRNSD_DOWN)
resettransfer(peer->transfer);
peer->transfer->close = 1;
if(peer->transfer->dir == TRNSD_DOWN)
resettransfer(peer->transfer);
- transferdetach(peer->transfer);
}
if(peer->timeout != NULL)
canceltimer(peer->timeout);
}
if(peer->timeout != NULL)
canceltimer(peer->timeout);
@@
-3222,15
+3220,6
@@
static void hubkill(struct fnetnode *fn)
hub->sk->close = 1;
}
hub->sk->close = 1;
}
-static wchar_t *dcbasename(wchar_t *filename)
-{
- wchar_t *ret;
-
- if((ret = wcsrchr(filename, L'/')) != NULL)
- return(ret + 1);
- return(filename);
-}
-
static struct transferiface dctransfer =
{
.detach = (void (*)(struct transfer *, void *))dctransdetach,
static struct transferiface dctransfer =
{
.detach = (void (*)(struct transfer *, void *))dctransdetach,
@@
-3249,7
+3238,6
@@
static struct fnet dcnet =
.reqconn = hubreqconn,
.sendchat = hubsendchat,
.search = hubsearch,
.reqconn = hubreqconn,
.sendchat = hubsendchat,
.search = hubsearch,
- .filebasename = dcbasename
};
static void peerread(struct socket *sk, struct dcpeer *peer)
};
static void peerread(struct socket *sk, struct dcpeer *peer)