--- tftpd/src/srv.c 2014/02/21 09:47:00 1.6.2.2 +++ tftpd/src/srv.c 2014/02/24 14:38:47 1.6.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.6.2.2 2014/02/21 09:47:00 misho Exp $ +* $Id: srv.c,v 1.6.2.3 2014/02/24 14:38:47 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -45,6 +45,7 @@ SUCH DAMAGE. */ #include "global.h" #include "exec.h" +#include "buf.h" #include "srv.h" @@ -55,6 +56,9 @@ timeoutSession(sched_task_t *task) ETRACE(); + if (bf) + flushBuffer(cli.fd); + /* drop session */ if (cli.fd > 2) close(cli.fd); @@ -331,6 +335,8 @@ RQ(sched_task_t *task) code = htons(3); else if (errno == EEXIST) code = htons(6); + else if (errno == ENOENT) + code = htons(1); else code = htons(0); ESYSERR(0); @@ -467,7 +473,10 @@ DATA(sched_task_t *task) EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len); - len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); + if (!bf) + len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); + else + len = bfwrite(cli.fd, RPACK_NEXT(pkt), len); if (len == -1) { ESYSERR(0); code = htons(3);