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;
static void dataerr(struct socket *sk, int errno, struct transfer *transfer)
{
- if(transfer->curpos >= transfer->size) {
- transfersetstate(transfer, TRNS_DONE);
- closesock(transfer->localend);
- quitsock(transfer->localend);
- transfer->localend = NULL;
- } else {
- resettransfer(transfer);
+ if(transfer->dir == TRNSD_DOWN) {
+ if(transfer->curpos >= transfer->size) {
+ transfersetstate(transfer, TRNS_DONE);
+ if(transfer->localend != NULL) {
+ closesock(transfer->localend);
+ quitsock(transfer->localend);
+ transfer->localend = NULL;
+ }
+ } else {
+ resettransfer(transfer);
+ }
+ } else if(transfer->dir == TRNSD_UP) {
+ transfer->close = 1;
}
}