Whitespace fix.

[doldaconnect.git] / daemon / transfer.c

diff --git a/daemon/transfer.c b/daemon/transfer.c
index ee5f673..177353c 100644 (file)
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -133,6 +133,8 @@ 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);
@@ -149,6 +151,8 @@ 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;
@@ -177,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;
     }
 }