if((transfer->datapipe != NULL) && (sockqueueleft(transfer->datapipe) > 0)) {
buf = sockgetinbuf(sk, &blen);
+ if((transfer->endpos >= 0) && (transfer->curpos + blen > transfer->endpos))
+ blen = transfer->endpos - transfer->curpos;
sockqueue(transfer->datapipe, buf, blen);
free(buf);
time(&transfer->activity);
if((transfer->localend != NULL) && (sockqueueleft(transfer->localend) > 0)) {
buf = sockgetinbuf(sk, &blen);
+ if((transfer->endpos >= 0) && (transfer->curpos + blen > transfer->endpos))
+ blen = transfer->endpos - transfer->curpos;
sockqueue(transfer->localend, buf, blen);
free(buf);
transfer->curpos += blen;
{
if(transfer->curpos >= transfer->size) {
transfersetstate(transfer, TRNS_DONE);
- closesock(transfer->localend);
- quitsock(transfer->localend);
- transfer->localend = NULL;
+ if(transfer->localend != NULL) {
+ closesock(transfer->localend);
+ quitsock(transfer->localend);
+ transfer->localend = NULL;
+ }
} else {
resettransfer(transfer);
}
{
if(transfer->localend != NULL)
putsock(transfer->localend);
+ socksetdebug(sk, 2, "localend");
getsock(transfer->localend = sk);
sk->data = transfer;
sk->readcb = (void (*)(struct socket *, void *))localread;