--- tftpd/src/srv.c	2014/02/17 14:28:29	1.2
+++ tftpd/src/srv.c	2014/02/20 15:39:15	1.2.2.6
@@ -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 = 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);
@@ -116,7 +123,104 @@ txAck(sched_task_t *task)
 	taskExit(task, NULL);
 }
 
+static int
+getOpts(rpack_t * __restrict pkt, int rlen)
+{
+	char *opt, *val;
+	int len;
+
+	do {
+		/* option */
+		len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);
+		if (len == -1)
+			return -1;
+		else
+			rlen -= len;
+		opt = (char*) rpack_rnext(pkt, len);
+		if (!opt)
+			return -1;
+		/* value */
+		len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);
+		if (len == -1)
+			return -1;
+		else
+			rlen -= len;
+		val = (char*) rpack_rnext(pkt, len);
+		if (!val)
+			return -1;
+
+		if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) {
+			len = strtol(val, NULL, 10);
+			if (len > TFTP_LOAD_MAX) {
+				cli.siz = len;
+				if (rpack_resize(pkt, cli.siz + 4))
+					cli.siz = TFTP_PKT_MAX;
+			}
+		} else if (!strcasecmp(opt, TFTP_OPT_TSIZE))
+			cli.tsiz = strtoll(val, NULL, 10);
+		else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT))
+			cli.tout = strtol(val, NULL, 10);
+		else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER))
+			cli.roll = strtol(val, NULL, 10);
+		else
+			return -1;
+	} while (rlen > 0);
+
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
+			cli.siz, cli.tsiz, cli.tout, cli.roll);
+	return 0;
+}
+
 static void *
+txOack(sched_task_t *task)
+{
+	rpack_t *pkt = TASK_DATA(task);
+	u_short n = htons(TFTP_OPC_OACK);
+	struct stat sb;
+	char szStr[STRSIZ];
+
+	ETRACE();
+
+	RPACK_REWIND(pkt);
+	rpack_uint16(pkt, &n, 0);
+
+	/* if opcode is RRQ and tsize is 0 then we must return file size to client */
+	if (cli.opc == TFTP_OPC_RRQ && !cli.tsiz && stat(cli.file, &sb) != -1)
+		cli.tsiz = sb.st_size;
+
+	if (cli.siz > TFTP_LOAD_MAX) {
+		memset(szStr, 0, sizeof szStr);
+		snprintf(szStr, sizeof szStr, "%u", cli.siz);
+		rpack_rdata(pkt, TFTP_OPT_BLKSIZE, strlen(TFTP_OPT_BLKSIZE) + 1);
+		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
+	}
+	if (cli.tsiz) {
+		memset(szStr, 0, sizeof szStr);
+		snprintf(szStr, sizeof szStr, "%llu", cli.tsiz);
+		rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1);
+		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
+	}
+	if (cli.tout) {
+		memset(szStr, 0, sizeof szStr);
+		snprintf(szStr, sizeof szStr, "%u", cli.tout);
+		rpack_rdata(pkt, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1);
+		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
+	}
+	if (cli.roll) {
+		memset(szStr, 0, sizeof szStr);
+		snprintf(szStr, sizeof szStr, "%u", cli.roll);
+		rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1);
+		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
+	}
+
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
+			cli.siz, cli.tsiz, cli.tout, cli.roll);
+	schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
+			TASK_DATA(task), RPACK_OFF(pkt));
+	taskExit(task, NULL);
+}
+
+static void *
 RQ(sched_task_t *task)
 {
 	rpack_t *pkt = TASK_DATA(task);
@@ -128,11 +232,13 @@ RQ(sched_task_t *task)
 	ETRACE();
 
 	cli.siz = TFTP_LOAD_MAX;
+	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
 	len = str_getString(tftp->tftp_data, rlen, &str);
 	if (len == -1)
 		goto end;
 	else {
 		rlen -= len;
+		rpack_rnext(pkt, len);
 		strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);
 	}
 	len = str_getString((const u_char*) str, rlen, NULL);
@@ -140,6 +246,7 @@ RQ(sched_task_t *task)
 		goto end;
 	else {
 		rlen -= len;
+		rpack_rnext(pkt, len);
 		if (!strcasecmp(str, TFTP_MODE_ASCII))
 			strlcpy(cli.mode, TFTP_MODE_ASCII, sizeof cli.mode);
 		else if (!strcasecmp(str, TFTP_MODE_OCTET))
@@ -154,7 +261,6 @@ RQ(sched_task_t *task)
 		}
 	}
 
-	cli.opc = ntohs(tftp->tftp_opc);
 	switch (cli.opc) {
 		case TFTP_OPC_RRQ:
 			code = O_RDONLY;
@@ -168,6 +274,7 @@ RQ(sched_task_t *task)
 			EVERBOSE(2, "WRQ:: file=%s mode=%s\n", cli.file, cli.mode);
 			break;
 	}
+
 	cli.fd = open(cli.file, code, 0644);
 	if (cli.fd == -1) {
 		if (errno == EACCES)
@@ -185,7 +292,10 @@ RQ(sched_task_t *task)
 
 	schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);
 
-	if (cli.opc == TFTP_OPC_WRQ) {
+	if (!RPACK_ISEND(pkt) && !getOpts(pkt, rlen))
+		schedEvent(TASK_ROOT(task), txOack, NULL, TASK_FD(task), 
+				TASK_DATA(task), 0);
+	else if (cli.opc == TFTP_OPC_WRQ) {
 		/* ack */
 		tftp->tftp_opc = htons(TFTP_OPC_ACK);
 		RPACK_REWIND(pkt);
@@ -283,7 +393,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! */
 
@@ -366,12 +479,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);