{
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->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->localend != NULL)
- closesock(transfer->localend);
+ 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 transferattach(struct transfer *transfer, struct socket *dpipe)
void transferdetach(struct transfer *transfer)
{
if(transfer->datapipe != NULL) {
- transfer->datapipe->readcb = NULL;
- transfer->datapipe->writecb = NULL;
- transfer->datapipe->errcb = NULL;
closesock(transfer->datapipe);
- putsock(transfer->datapipe);
+ quitsock(transfer->datapipe);
}
transfer->datapipe = NULL;
}
transfer->timeout = 0;
}
-static void transferputdata(struct transfer *transfer, void *buf, size_t size)
-{
- time(&transfer->activity);
- sockqueue(transfer->localend, buf, size);
- transfer->curpos += size;
- bytesdownload += size;
- CBCHAINDOCB(transfer, trans_p, transfer);
-}
-
-static void transferendofdata(struct transfer *transfer)
-{
- if(transfer->curpos >= transfer->size)
- {
- transfersetstate(transfer, TRNS_DONE);
- transfer->localend->readcb = NULL;
- transfer->localend->writecb = NULL;
- transfer->localend->errcb = NULL;
- putsock(transfer->localend);
- transfer->localend = NULL;
- } else {
- resettransfer(transfer);
- }
-}
-
-static ssize_t transferdatasize(struct transfer *transfer)
-{
- return(sockqueueleft(transfer->localend));
-}
-
-static void *transfergetdata(struct transfer *transfer, size_t *size)
-{
- void *buf;
-
- if(transfer->localend == NULL)
- return(NULL);
- time(&transfer->activity);
- if((buf = sockgetinbuf(transfer->localend, size)) == NULL)
- return(NULL);
- if((transfer->endpos >= 0) && (transfer->curpos + *size >= transfer->endpos))
- {
- if((*size = transfer->endpos - transfer->curpos) == 0) {
- free(buf);
- buf = NULL;
- } else {
- buf = srealloc(buf, *size);
- }
- }
- transfer->curpos += *size;
- bytesupload += *size;
- CBCHAINDOCB(transfer, trans_p, transfer);
- return(buf);
-}
-
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);
}