{
char *p;
struct dchub *hub;
- struct socket *newsk;
struct sockaddr_in addr;
hub = fn->data;
addr.sin_port = htons(atoi(p));
if(!inet_aton(args, &addr.sin_addr))
return;
- newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (void (*)(struct socket *, int, void *))peerconnect, fn);
+ putsock(netcsconn((struct sockaddr *)&addr, sizeof(addr), (void (*)(struct socket *, int, void *))peerconnect, fn));
getfnetnode(fn);
hubhandleaction(sk, fn, cmd, args);
}
peer->close = 1;
return;
}
- transfer = newupload(peer->fn, &dcnet, peer->wcsname, peer->trpipe = mktrpipe(peer));
+ transfer = newupload(peer->fn, &dcnet, peer->wcsname, (peer->trpipe = mktrpipe(peer))->back);
} else {
if((transfer = finddownload(peer->wcsname)) == NULL)
{
peer->close = 1;
return;
}
- transferattach(transfer, peer->trpipe = mktrpipe(peer));
+ transferattach(transfer, (peer->trpipe = mktrpipe(peer))->back);
transfersetstate(transfer, TRNS_HS);
}
transfersetnick(transfer, peer->wcsname);
return;
}
peer->direction = TRNSD_UP;
- transfer = newupload(peer->fn, &dcnet, peer->wcsname, peer->trpipe = mktrpipe(peer));
+ transfer = newupload(peer->fn, &dcnet, peer->wcsname, (peer->trpipe = mktrpipe(peer))->back);
} else {
peer->direction = TRNSD_DOWN;
- transferattach(transfer, peer->trpipe = mktrpipe(peer));
+ transferattach(transfer, (peer->trpipe = mktrpipe(peer))->back);
transfersetstate(transfer, TRNS_HS);
}
transfersetnick(transfer, peer->wcsname);
peer->state = PEER_TRNS;
transferstartul(peer->transfer, peer->sk);
peer->sk->writecb = (void (*)(struct socket *, void *))transwrite;
+ transwrite(peer->sk, peer);
}
static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
} else if(fd >= 0) {
if((wbuf = adc2path(argv[1])) != NULL)
transfersetpath(peer->transfer, wbuf);
+ free(wbuf);
peer->transfer->flags.b.minislot = 1;
}
if(fd < 0)
};
#undef cc
-static struct socket *mktrpipe(struct dcpeer *peer)
-{
- struct socket *sk;
-
- sk = netsockpipe();
- sk->data = peer;
- return(sk);
-}
-
-static void dctransdetach(struct transfer *transfer, struct dcpeer *peer)
-{
- CBUNREG(transfer, trans_filterout, peer);
- peer->transfer = NULL;
- peer->close = 1;
-}
-
static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
{
int ret;
{
if(sockqueueleft(peer->sk) > 0)
{
- if((buf = transfergetdata(transfer, &bufsize)) != NULL)
+ if((buf = sockgetinbuf(peer->trpipe, &bufsize)) != NULL)
{
if(peer->compress == CPRS_NONE)
{
}
}
-static void dctransendofdata(struct transfer *transfer, struct dcpeer *peer)
-{
- peer->state = PEER_SYNC;
- dctransgotdata(transfer, peer);
-}
-
static void transread(struct socket *sk, struct dcpeer *peer)
{
void *buf;
size_t bufsize;
- struct transfer *transfer;
- if(transferdatasize(peer->transfer) < 0)
+ if(sockqueueleft(peer->trpipe) < 0)
return;
- if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
- return;
- if(peer->transfer == NULL)
+ if((buf = sockgetinbuf(sk, &bufsize)) != NULL)
{
+ if(peer->transfer == NULL)
+ {
+ free(buf);
+ freedcpeer(peer);
+ return;
+ }
+ sockqueue(peer->trpipe, buf, bufsize);
free(buf);
- freedcpeer(peer);
- return;
}
- transferputdata(peer->transfer, buf, bufsize);
- free(buf);
if(peer->transfer->curpos >= peer->transfer->size)
{
- transfer = peer->transfer;
- transferdetach(transfer);
- transferendofdata(transfer);
+ closesock(peer->trpipe);
+ quitsock(peer->trpipe);
+ peer->trpipe = NULL;
+ peer->transfer = NULL;
+ peer->close = 1;
return;
}
}
-static void dcwantdata(struct transfer *transfer, struct dcpeer *peer)
-{
- if(transferdatasize(transfer) > 0)
- transread(peer->sk, peer);
-}
-
static void transerr(struct socket *sk, int err, struct dcpeer *peer)
{
struct transfer *transfer;
freedcpeer(peer);
return;
}
- transferdetach(transfer);
- transferendofdata(transfer);
+ closesock(peer->trpipe);
+ quitsock(peer->trpipe);
+ peer->trpipe = NULL;
+ peer->transfer = NULL;
+ peer->close = 1;
}
static void transwrite(struct socket *sk, struct dcpeer *peer)
dctransgotdata(peer->transfer, peer);
}
+static void trpiperead(struct socket *sk, struct dcpeer *peer)
+{
+ dctransgotdata(peer->transfer, peer);
+}
+
+static void trpipewrite(struct socket *sk, struct dcpeer *peer)
+{
+ transread(peer->sk, peer);
+}
+
+static void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
+{
+ peer->state = PEER_SYNC;
+ dctransgotdata(peer->transfer, peer);
+ CBUNREG(peer->transfer, trans_filterout, peer);
+}
+
+static struct socket *mktrpipe(struct dcpeer *peer)
+{
+ struct socket *sk;
+
+ sk = netsockpipe();
+ sk->data = peer;
+ sk->readcb = (void (*)(struct socket *, void *))trpiperead;
+ sk->writecb = (void (*)(struct socket *, void *))trpipewrite;
+ sk->errcb = (void (*)(struct socket *, int, void *))trpipeerr;
+ return(sk);
+}
+
static void udpread(struct socket *sk, void *data)
{
char *buf, *p, *p2, *hashbuf;
peer->prev->next = peer->next;
if(peer->trpipe != NULL) {
closesock(peer->trpipe);
- putsock(peer->trpipe);
+ quitsock(peer->trpipe);
}
if(peer->transfer != NULL)
{
+ CBUNREG(peer->transfer, trans_filterout, peer);
if(peer->transfer->dir == TRNSD_UP)
peer->transfer->close = 1;
if(peer->transfer->dir == TRNSD_DOWN)
if(peer->state == PEER_CMD) {
if((peer->queue.size > 50) || (peer->inbufdata > 65536))
return;
+ } else if(peer->state == PEER_TTHL) {
+ } else {
+ return;
}
if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
return;
if(err != 0)
{
putfnetnode(fn);
- putsock(sk);
return;
}
hub = fn->data;
sk->errcb = (void (*)(struct socket *, int, void *))peererror;
sk->data = peer;
socksettos(sk, confgetint("fnet", "fnptos"));
- putsock(sk);
peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
sendmynick(peer);
sendpeerlock(peer);