--- tftpd/src/srv.c	2014/02/20 14:20:42	1.2.2.5
+++ tftpd/src/srv.c	2014/02/20 15:39:15	1.2.2.6
@@ -64,8 +64,8 @@ txData(sched_task_t *task)
 	rpack_uint16(pkt, &n, 0);
 
 	/* max file size check */
-	if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz) {
-		len = MAX(0, cli.tsiz - (cli.seq - 1) * cli.siz);
+	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;
@@ -124,7 +124,7 @@ txAck(sched_task_t *task)
 }
 
 static int
-getOpts(rpack_t * __restrict pkt)
+getOpts(rpack_t * __restrict pkt, int rlen)
 {
 	char *opt, *val;
 	int len;
@@ -134,6 +134,8 @@ getOpts(rpack_t * __restrict pkt)
 		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;
@@ -141,23 +143,31 @@ getOpts(rpack_t * __restrict pkt)
 		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)
+			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 (!RPACK_ISEND(pkt));
+	} while (rlen > 0);
 
-	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u", cli.siz, cli.tsiz, cli.tout);
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
+			cli.siz, cli.tsiz, cli.tout, cli.roll);
 	return 0;
 }
 
@@ -196,7 +206,15 @@ txOack(sched_task_t *task)
 		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);
@@ -214,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);
@@ -226,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))
@@ -240,7 +261,6 @@ RQ(sched_task_t *task)
 		}
 	}
 
-	cli.opc = ntohs(tftp->tftp_opc);
 	switch (cli.opc) {
 		case TFTP_OPC_RRQ:
 			code = O_RDONLY;
@@ -255,10 +275,6 @@ RQ(sched_task_t *task)
 			break;
 	}
 
-	if (!RPACK_ISEND(pkt) && !getOpts(pkt))
-		schedEvent(TASK_ROOT(task), txOack, NULL, TASK_FD(task), 
-				TASK_DATA(task), 0);
-
 	cli.fd = open(cli.file, code, 0644);
 	if (cli.fd == -1) {
 		if (errno == EACCES)
@@ -276,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);
@@ -376,7 +395,7 @@ DATA(sched_task_t *task)
 
 	/* max file size check */
 	len = TASK_DATLEN(task) - RPACK_OFF(pkt);
-	if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz)
+	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! */