--- tftpd/src/srv.c	2014/02/20 01:15:45	1.2.2.2
+++ tftpd/src/srv.c	2014/02/20 14:20:42	1.2.2.5
@@ -63,7 +63,14 @@ txData(sched_task_t *task)
 	n = htons(cli.seq);
 	rpack_uint16(pkt, &n, 0);
 
-	len = pread(cli.fd, RPACK_NEXT(pkt), cli.siz, (cli.seq - 1) * cli.siz);
+	/* max file size check */
+	if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz) {
+		len = MAX(0, cli.tsiz - (cli.seq - 1) * cli.siz);
+		cli.close = 42;	/* last sended packet, should be close! */
+	} else
+		len = cli.siz;
+
+	len = pread(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);
 	if (len == -1) {
 		ESYSERR(0);
 		code = htole16(3);
@@ -150,6 +157,7 @@ getOpts(rpack_t * __restrict pkt)
 			return -1;
 	} while (!RPACK_ISEND(pkt));
 
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u", cli.siz, cli.tsiz, cli.tout);
 	return 0;
 }
 
@@ -366,7 +374,10 @@ DATA(sched_task_t *task)
 	} else
 		cli.seq = ntohs(code);
 
+	/* max file size check */
 	len = TASK_DATLEN(task) - RPACK_OFF(pkt);
+	if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz)
+		len = MIN(len, cli.tsiz - (cli.seq - 1) * cli.siz);
 	if (len < cli.siz)
 		cli.close = 42;	/* last received packet, should be close! */
 
@@ -449,12 +460,6 @@ rxPkt(sched_task_t *task)
 						TASK_DATA(task), rlen);
 				break;
 			case TFTP_OPC_OACK:
-				ELOGGER(LOG_WARNING, "oack");
-				/*
-				schedEvent(TASK_ROOT(task), OACK, NULL, TASK_FD(task), 
-						TASK_DATA(task), rlen);
-						*/
-				break;
 			case TFTP_OPC_ERROR:
 			default:
 				RPACK_REWIND(pkt);