--- tftpd/src/srv.c	2014/02/21 09:47:00	1.6.2.2
+++ tftpd/src/srv.c	2014/02/24 21:55:35	1.7.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.6.2.2 2014/02/21 09:47:00 misho Exp $
+* $Id: srv.c,v 1.7.2.1 2014/02/24 21:55:35 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);
@@ -281,6 +285,10 @@ RQ(sched_task_t *task)
 
 	cli.siz = TFTP_LOAD_MAX;
 	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
+	if (!RW && cli.opc == TFTP_OPC_WRQ) {
+		code = 2;
+		goto end;
+	}
 	len = str_getString(RPACK_NEXT(pkt), rlen, &str);
 	if (len == -1)
 		goto end;
@@ -331,6 +339,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 +477,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);