--- tftpd/src/srv.c	2014/02/24 15:23:39	1.7
+++ tftpd/src/srv.c	2017/01/22 21:00:33	1.8.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.7 2014/02/24 15:23:39 misho Exp $
+* $Id: srv.c,v 1.8.2.1 2017/01/22 21:00:33 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+Copyright 2004 - 2017
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@ txPkt(sched_task_t *task)
 	if (wlen == -1)
 		ESYSERR(0);
 	else if (wlen != TASK_DATLEN(task)) {
-		EERROR(EIO, "Sended %d bytes != packet %d bytes", 
+		EERROR(EIO, "Sended %d bytes != packet %zu bytes", 
 				wlen, TASK_DATLEN(task));
 		schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR);
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, 
@@ -171,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);
 }
@@ -219,7 +220,7 @@ getOpts(rpack_t * __restrict pkt, int rlen)
 	} while (rlen > 0);
 
 	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
-			cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
+			cli.siz, (unsigned long long) cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
 	return 0;
 }
 
@@ -248,7 +249,7 @@ txOack(sched_task_t *task)
 	}
 	if (cli.tsiz) {
 		memset(szStr, 0, sizeof szStr);
-		snprintf(szStr, sizeof szStr, "%llu", cli.tsiz);
+		snprintf(szStr, sizeof szStr, "%llu", (unsigned long long) cli.tsiz);
 		rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1);
 		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
 	}
@@ -266,7 +267,7 @@ txOack(sched_task_t *task)
 	}
 
 	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
-			cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
+			cli.siz, (unsigned long long) 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);
@@ -285,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;
@@ -473,18 +478,19 @@ DATA(sched_task_t *task)
 
 	EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len);
 
-	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);
+	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);