{
void *buf;
size_t blen;
+ off_t curpos;
if((transfer->datapipe != NULL) && (sockqueueleft(transfer->datapipe) > 0)) {
buf = sockgetinbuf(sk, &blen);
+ if((transfer->endpos >= 0) && (transfer->localpos + blen > transfer->endpos))
+ blen = transfer->endpos - transfer->localpos;
sockqueue(transfer->datapipe, buf, blen);
+ free(buf);
time(&transfer->activity);
- transfer->curpos += blen;
+ transfer->localpos += blen;
bytesupload += blen;
+ }
+ if((curpos = transfer->localpos - socktqueuesize(transfer->datapipe)) < 0)
+ curpos = 0;
+ if(curpos != transfer->curpos) {
+ transfer->curpos = curpos;
CBCHAINDOCB(transfer, trans_p, transfer);
}
}
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;
bytesdownload += blen;
CBCHAINDOCB(transfer, trans_p, transfer);
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;
}
}
void transferprepul(struct transfer *transfer, off_t size, off_t start, off_t end, struct socket *lesk)
{
transfersetsize(transfer, size);
- transfer->curpos = start;
+ transfer->curpos = transfer->localpos = start;
transfer->endpos = end;
transfersetlocalend(transfer, lesk);
}