--- tftpd/src/srv.c	2014/02/21 09:02:28	1.5
+++ tftpd/src/srv.c	2014/02/24 22:28:54	1.8
@@ -1,5 +1,51 @@
+/*************************************************************************
+* (C) 2014 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
+*  by Michael Pounov <misho@elwix.org>
+*
+* $Author: misho $
+* $Id: srv.c,v 1.8 2014/02/24 22:28:54 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004 - 2014
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include "exec.h"
+#include "buf.h"
 #include "srv.h"
 
 
@@ -10,6 +56,9 @@ timeoutSession(sched_task_t *task)
 
 	ETRACE();
 
+	if (bf)
+		flushBuffer(cli.fd);
+
 	/* drop session */
 	if (cli.fd > 2)
 		close(cli.fd);
@@ -122,6 +171,7 @@ txAck(sched_task_t *task)
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL);
 		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0);
 		EVERBOSE(2, "Finish WRQ request");
+		schedResumeby(TASK_ROOT(task), CRITERIA_ID, 0);
 	}
 	taskExit(task, NULL);
 }
@@ -169,8 +219,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;
 }
 
@@ -205,7 +255,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);
 	}
@@ -216,8 +266,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);
@@ -236,6 +286,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 = htons(2);
+		goto end;
+	}
 	len = str_getString(RPACK_NEXT(pkt), rlen, &str);
 	if (len == -1)
 		goto end;
@@ -286,6 +340,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);
@@ -422,15 +478,19 @@ 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 (len == -1) {
-		ESYSERR(0);
-		code = htons(3);
-		goto end;
-	} else {
-		rpack_rnext(pkt, len);
-		EVERBOSE(3, "Written to file %s %d bytes", cli.file, len);
+	if (len > 0) {
+		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);
+			goto end;
+		} else
+			rpack_rnext(pkt, len);
 	}
+	EVERBOSE(3, "Written to file %s %d bytes", cli.file, len);
 
 	schedEvent(TASK_ROOT(task), txAck, NULL, TASK_FD(task), TASK_DATA(task), 0);
 	taskExit(task, NULL);