X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=62e81d64244f7263b10197c0d881caf4bfedbf77;hb=284e199aabf3b1149ec24f1aa16e9bed06ec7e91;hp=32f3e2814cccf98c8171674c59315e1049c00ac9;hpb=b38037ff5b7c2779469cffed81da6774114807ef;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 32f3e28..62e81d6 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -130,16 +130,21 @@ static void localread(struct socket *sk, struct transfer *transfer)
 {
     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->curpos + blen > transfer->endpos))
-	    blen = transfer->endpos - transfer->curpos;
+	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;
+    }
+    curpos = transfer->localpos - socktqueuesize(transfer->datapipe);
+    if(curpos != transfer->curpos) {
+	transfer->curpos = curpos;
 	CBCHAINDOCB(transfer, trans_p, transfer);
     }
 }
@@ -181,18 +186,19 @@ static void localerr(struct socket *sk, int errno, struct transfer *transfer)
 
 static void dataerr(struct socket *sk, int errno, struct transfer *transfer)
 {
-    if(transfer->curpos >= transfer->size) {
-	transfersetstate(transfer, TRNS_DONE);
-	if(transfer->localend != NULL) {
-	    closesock(transfer->localend);
-	    quitsock(transfer->localend);
-	    transfer->localend = NULL;
-	}
-    } else {
-	if(transfer->dir == TRNSD_DOWN)
+    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;
+	}
+    } else if(transfer->dir == TRNSD_UP) {
+	transfer->close = 1;
     }
 }
 
@@ -305,7 +311,7 @@ static void transexpire(int cancelled, struct transfer *transfer)
 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);
 }