--- tftpd/src/srv.c	2014/02/21 09:09:15	1.6
+++ tftpd/src/srv.c	2014/02/24 14:38:47	1.6.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.6 2014/02/21 09:09:15 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);
@@ -214,8 +218,8 @@ getOpts(rpack_t * __restrict pkt, int rlen)
 		}
 	} while (rlen > 0);
 
-	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
+			cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
 	return 0;
 }
 
@@ -250,7 +254,7 @@ txOack(sched_task_t *task)
 	}
 	if (cli.tout.tv_sec) {
 		memset(szStr, 0, sizeof szStr);
-		snprintf(szStr, sizeof szStr, "%u", cli.tout.tv_sec);
+		snprintf(szStr, sizeof szStr, "%d", (int) cli.tout.tv_sec);
 		rpack_rdata(pkt, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1);
 		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
 	}
@@ -261,8 +265,8 @@ txOack(sched_task_t *task)
 		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
 	}
 
-	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
+			cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
 	schedCallOnce(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
 	taskExit(task, NULL);
@@ -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);