static void updatexmlbz2list(void);
static void requestfile(struct dcpeer *peer);
static void updatelists(int now);
+static int trdestroycb(struct transfer *transfer, struct dcpeer *peer);
static int reservedchar(unsigned char c)
{
peer->close = 1;
return;
}
- CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
return;
}
if(supports(peer, "adcget"))
struct dchub *hub;
hub = fn->data;
- if(hub->nativename == NULL)
+ if(hub->nativename != NULL)
free(hub->nativename);
hub->nativename = sstrdup(args);
buf = icmbstowcs(args, hub->charset);
}
}
+static void peerattach(struct dcpeer *peer, struct transfer *transfer)
+{
+ peer->transfer = transfer;
+ CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
+ CBREG(peer->transfer, trans_destroy, (int (*)(struct transfer *, void *))trdestroycb, NULL, peer);
+}
+
static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
{
char *p;
transfersetstate(transfer, TRNS_HS);
}
transfersetnick(transfer, peer->wcsname);
- peer->transfer = transfer;
+ peerattach(peer, transfer);
if(peer->extended)
sendsupports(peer);
qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
transfersetstate(transfer, TRNS_HS);
}
transfersetnick(transfer, peer->wcsname);
- peer->transfer = transfer;
+ peerattach(peer, transfer);
qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
qstrf(sk, "$Key %s|", key);
free(key);
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)
{
if((buf = sockgetinbuf(peer->trpipe, &bufsize)) != NULL)
{
- if((transfer->endpos >= 0) && (transfer->curpos + bufsize >= transfer->endpos))
- bufsize = transfer->endpos - transfer->curpos;
- if(bufsize > 0) {
- if(peer->compress == CPRS_NONE)
+ if(peer->compress == CPRS_NONE)
+ {
+ sockqueue(peer->sk, buf, bufsize);
+ } else if(peer->compress == CPRS_ZLIB) {
+ cstr = peer->cprsdata;
+ cstr->next_in = buf;
+ cstr->avail_in = bufsize;
+ while(cstr->avail_in > 0)
{
- sockqueue(peer->sk, buf, bufsize);
- } else if(peer->compress == CPRS_ZLIB) {
- cstr = peer->cprsdata;
- cstr->next_in = buf;
- cstr->avail_in = bufsize;
- while(cstr->avail_in > 0)
+ cstr->next_out = outbuf;
+ cstr->avail_out = sizeof(outbuf);
+ if((ret = deflate(cstr, 0)) != Z_OK)
{
- cstr->next_out = outbuf;
- cstr->avail_out = sizeof(outbuf);
- if((ret = deflate(cstr, 0)) != Z_OK)
- {
- flog(LOG_WARNING, "bug? deflate() did not return Z_OK (but rather %i)", ret);
- freedcpeer(peer);
- return;
- }
- sockqueue(peer->sk, outbuf, sizeof(outbuf) - cstr->avail_out);
+ flog(LOG_WARNING, "bug? deflate() did not return Z_OK (but rather %i)", ret);
+ freedcpeer(peer);
+ return;
}
+ sockqueue(peer->sk, outbuf, sizeof(outbuf) - cstr->avail_out);
}
}
free(buf);
}
if(peer->ptclose)
{
- freedcpeer(peer);
+ peer->close = 1;
} else {
if(peer->timeout == NULL)
peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
}
}
-void trpiperead(struct socket *sk, struct dcpeer *peer)
-{
- dctransgotdata(peer->transfer, peer);
-}
-
-void trpipewrite(struct socket *sk, struct dcpeer *peer)
+static void peerdetach(struct dcpeer *peer)
{
-}
-
-void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
-{
- peer->state = PEER_SYNC;
- dctransgotdata(peer->transfer, peer);
CBUNREG(peer->transfer, trans_filterout, peer);
+ CBUNREG(peer->transfer, trans_destroy, peer);
+ closesock(peer->trpipe);
+ quitsock(peer->trpipe);
+ peer->trpipe = NULL;
+ peer->transfer = NULL;
}
-static struct socket *mktrpipe(struct dcpeer *peer)
+static int trdestroycb(struct transfer *transfer, 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);
+ peerdetach(peer);
+ peer->close = 1;
+ return(0);
}
static void transread(struct socket *sk, struct dcpeer *peer)
void *buf;
size_t bufsize;
- if(sockqueueleft(peer->trpipe) < 0)
+ if(peer->transfer == NULL) {
+ freedcpeer(peer);
return;
- if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
+ }
+ if(sockqueueleft(peer->trpipe) < 0)
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;
}
- sockqueue(peer->trpipe, buf, bufsize);
- free(buf);
if(peer->transfer->curpos >= peer->transfer->size)
{
- closesock(peer->trpipe);
- quitsock(peer->trpipe);
+ peerdetach(peer);
peer->close = 1;
return;
}
freedcpeer(peer);
return;
}
- closesock(peer->trpipe);
- quitsock(peer->trpipe);
+ peerdetach(peer);
peer->close = 1;
}
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);
+ peerdetach(peer);
+ if(peer->state != PEER_CMD)
+ peer->close = 1;
+}
+
+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;
new = smalloc(sizeof(*new));
memset(new, 0, sizeof(*new));
- new->transfer = NULL;
getsock(sk);
new->sk = sk;
if(confgetint("dc", "dcppemu"))
peer->next->prev = peer->prev;
if(peer->prev != NULL)
peer->prev->next = peer->next;
- if(peer->trpipe != NULL) {
- closesock(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)
- resettransfer(peer->transfer);
- }
+ peerdetach(peer);
if(peer->timeout != NULL)
canceltimer(peer->timeout);
if(peer->sk->data == peer)
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;