X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=16e35719645530710be90f31d3c1cee681f54d75;hb=c3d01fa95daeee35607cdf7ddc8e688c4a49ea50;hp=b713f52e571c889190c93db79afe95057fb0d0e9;hpb=bd5d862e9745b6fb3c67ccb215c0e6aaa65bacf9;p=doldaconnect.git diff --git a/daemon/transfer.c b/daemon/transfer.c index b713f52..16e3571 100644 --- a/daemon/transfer.c +++ b/daemon/transfer.c @@ -181,15 +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); - if(transfer->localend != NULL) { - closesock(transfer->localend); - quitsock(transfer->localend); - transfer->localend = NULL; + 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 { - resettransfer(transfer); + } else if(transfer->dir == TRNSD_UP) { + transfer->close = 1; } } @@ -325,7 +329,6 @@ void transfersetlocalend(struct transfer *transfer, struct socket *sk) { if(transfer->localend != NULL) putsock(transfer->localend); - socksetdebug(sk, 2, "localend"); getsock(transfer->localend = sk); sk->data = transfer; sk->readcb = (void (*)(struct socket *, void *))localread;