X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=177353cae655a1881ccddede583e96b7c76fc3c5;hb=f63305cce846ed60e079397fa9fc06a35d5ce365;hp=f23a3ed50f6b05c496a1536e7f0439f36d13b746;hpb=1ff9e8ea002024dee061378ae5871619d6b979dd;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index f23a3ed..177353c 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -133,7 +133,10 @@ static void localread(struct socket *sk, struct transfer *transfer)
     
     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);
 	transfer->curpos += blen;
 	bytesupload += blen;
@@ -148,7 +151,10 @@ static void dataread(struct socket *sk, struct transfer *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);
@@ -175,13 +181,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);
-	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;
     }
 }