--- tftpd/src/srv.c	2014/02/20 14:20:42	1.2.2.5
+++ tftpd/src/srv.c	2014/02/21 09:02:28	1.5
@@ -6,11 +6,14 @@
 static void *
 timeoutSession(sched_task_t *task)
 {
+	rpack_t *pkt = TASK_DATA(task);
+
 	ETRACE();
 
 	/* drop session */
 	if (cli.fd > 2)
 		close(cli.fd);
+	rpack_resize(pkt, TFTP_PKT_MAX);
 	memset(&cli, 0, sizeof cli);
 
 	taskExit(task, NULL);
@@ -35,7 +38,7 @@ txPkt(sched_task_t *task)
 		schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR);
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, 
 				timeoutSession, NULL);
-		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0);
 	} else
 		EVERBOSE(2, "Sended %d bytes", wlen);
 	/* on error or argument, drop session */
@@ -43,7 +46,7 @@ txPkt(sched_task_t *task)
 		schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR);
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, 
 				timeoutSession, NULL);
-		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0);
 	}
 
 	taskExit(task, NULL);
@@ -64,8 +67,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;
@@ -73,7 +76,7 @@ txData(sched_task_t *task)
 	len = pread(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);
 	if (len == -1) {
 		ESYSERR(0);
-		code = htole16(3);
+		code = htons(3);
 		goto end;
 	} else {
 		rpack_rnext(pkt, len);
@@ -91,7 +94,7 @@ end:
 	n = htons(TFTP_OPC_ERROR);
 	rpack_uint16(pkt, &n, 0);
 	rpack_uint16(pkt, &code, 0);
-	rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1);
+	rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1);
 
 	schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
@@ -117,47 +120,57 @@ txAck(sched_task_t *task)
 	if (cli.close) {
 		schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_WRQ);
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL);
-		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0);
 		EVERBOSE(2, "Finish WRQ request");
 	}
 	taskExit(task, NULL);
 }
 
 static int
-getOpts(rpack_t * __restrict pkt)
+getOpts(rpack_t * __restrict pkt, int rlen)
 {
 	char *opt, *val;
 	int len;
 
+	if (!rlen)
+		return -1;
+
 	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;
+		EVERBOSE(7, "opt=%s rlen=%d", opt, rlen);
 		/* 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;
+		EVERBOSE(7, "val=%s rlen=%d", val, rlen);
 
-		if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) {
-			len = strtol(val, NULL, 10);
-			if (len > TFTP_LOAD_MAX)
-				cli.siz = len;
-		} else if (!strcasecmp(opt, TFTP_OPT_TSIZE))
+		if (!strcasecmp(opt, TFTP_OPT_BLKSIZE))
+			cli.tmp = strtol(val, NULL, 10);
+		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
-			return -1;
-	} while (!RPACK_ISEND(pkt));
+			cli.tout.tv_sec = strtol(val, NULL, 10);
+		else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) {
+			cli.roll = strtol(val, NULL, 10);
+			cli.roll++;
+		}
+	} 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.tv_sec, cli.roll - 1);
 	return 0;
 }
 
@@ -190,14 +203,22 @@ txOack(sched_task_t *task)
 		rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1);
 		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
 	}
-	if (cli.tout) {
+	if (cli.tout.tv_sec) {
 		memset(szStr, 0, sizeof szStr);
-		snprintf(szStr, sizeof szStr, "%u", cli.tout);
+		snprintf(szStr, sizeof szStr, "%u", cli.tout.tv_sec);
 		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 - 1);
+		rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1);
+		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
+	}
 
-	schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
+	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
+			cli.siz, cli.tsiz, 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);
 }
@@ -214,33 +235,35 @@ RQ(sched_task_t *task)
 	ETRACE();
 
 	cli.siz = TFTP_LOAD_MAX;
-	len = str_getString(tftp->tftp_data, rlen, &str);
+	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
+	len = str_getString(RPACK_NEXT(pkt), rlen, &str);
 	if (len == -1)
 		goto end;
 	else {
+		strlcpy(cli.file, (char*) RPACK_NEXT(pkt), sizeof cli.file);
 		rlen -= len;
-		strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);
+		rpack_rnext(pkt, len);
 	}
 	len = str_getString((const u_char*) str, rlen, NULL);
 	if (len == -1)
 		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))
 			strlcpy(cli.mode, TFTP_MODE_OCTET, sizeof cli.mode);
 		else if (!strcasecmp(str, TFTP_MODE_MAIL)) {
 			strlcpy(cli.mode, TFTP_MODE_MAIL, sizeof cli.mode);
-			code = htole16(4);
+			code = htons(4);
 			goto end;
 		} else {
-			code = htole16(1);
+			code = htons(1);
 			goto end;
 		}
 	}
 
-	cli.opc = ntohs(tftp->tftp_opc);
 	switch (cli.opc) {
 		case TFTP_OPC_RRQ:
 			code = O_RDONLY;
@@ -255,20 +278,16 @@ 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)
-			code = htole16(2);
+			code = htons(2);
 		else if (errno == ENFILE)
-			code = htole16(3);
+			code = htons(3);
 		else if (errno == EEXIST)
-			code = htole16(6);
+			code = htons(6);
 		else
-			code = htole16(0);
+			code = htons(0);
 		ESYSERR(0);
 		goto end;
 	} else
@@ -276,7 +295,22 @@ RQ(sched_task_t *task)
 
 	schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);
 
-	if (cli.opc == TFTP_OPC_WRQ) {
+	if (!getOpts(pkt, rlen)) {
+		if (cli.tmp > TFTP_LOAD_MAX) {
+			if (rpack_resize(pkt, cli.tmp + 4))
+				ELIBERR(elwix);
+			else
+				cli.siz = cli.tmp;
+		}
+		if (cli.tout.tv_sec) {
+			schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, 
+					timeoutSession, NULL);
+			schedTimer(TASK_ROOT(task), timeoutSession, NULL, 
+					cli.tout, TASK_DATA(task), 0);
+		}
+		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);
@@ -296,7 +330,7 @@ end:
 	RPACK_REWIND(pkt);
 	rpack_uint16(pkt, NULL, 0);
 	rpack_uint16(pkt, &code, 0);
-	rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1);
+	rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1);
 
 	schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
@@ -315,16 +349,21 @@ ACK(sched_task_t *task)
 	RPACK_REWIND(pkt);
 	code = rpack_uint16(pkt, NULL, 0);
 	if (ntohs(code) != TFTP_OPC_ACK) {
-		code = htole16(5);
+		code = htons(5);
 		goto end;
 	}
 
 	code = rpack_uint16(pkt, NULL, 0);
 	if (ntohs(code) > cli.seq || (ntohs(code) < (cli.seq - 1))) {
-		code = htole16(5);
+		code = htons(5);
 		goto end;
-	} else if (ntohs(code) == cli.seq)
-		cli.seq++;
+	} else if (ntohs(code) == cli.seq) {
+		/* check for rollover seq id */
+		if (cli.roll && cli.seq == USHRT_MAX)
+			cli.seq = cli.roll - 1;
+		else
+			cli.seq++;
+	}
 
 	EVERBOSE(3, "ACK:: seq=%hu; my new seq=%hu;", ntohs(code), cli.seq);
 
@@ -334,7 +373,7 @@ ACK(sched_task_t *task)
 	else {
 		schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_RRQ);
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL);
-		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0);
 		EVERBOSE(2, "Finish RRQ request");
 	}
 	taskExit(task, NULL);
@@ -343,7 +382,7 @@ end:
 	RPACK_REWIND(pkt);
 	rpack_uint16(pkt, NULL, 0);
 	rpack_uint16(pkt, &code, 0);
-	rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1);
+	rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1);
 
 	schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
@@ -363,20 +402,20 @@ DATA(sched_task_t *task)
 	RPACK_REWIND(pkt);
 	code = rpack_uint16(pkt, NULL, 0);
 	if (ntohs(code) != TFTP_OPC_DATA) {
-		code = htole16(5);
+		code = htons(5);
 		goto end;
 	}
 
 	code = rpack_uint16(pkt, NULL, 0);
 	if (ntohs(code) < cli.seq || ntohs(code) > cli.seq + 1) {
-		code = htole16(5);
+		code = htons(5);
 		goto end;
 	} 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)
+	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! */
@@ -386,7 +425,7 @@ DATA(sched_task_t *task)
 	len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);
 	if (len == -1) {
 		ESYSERR(0);
-		code = htole16(3);
+		code = htons(3);
 		goto end;
 	} else {
 		rpack_rnext(pkt, len);
@@ -400,7 +439,7 @@ end:
 	RPACK_REWIND(pkt);
 	rpack_uint16(pkt, NULL, 0);
 	rpack_uint16(pkt, &code, 0);
-	rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1);
+	rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1);
 
 	schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
@@ -426,6 +465,7 @@ rxPkt(sched_task_t *task)
 		goto end;
 	} else if (!cli.addr.sa.sa_len) {
 		cli.addr = sa;
+		RPACK_REWIND(pkt);
 		switch (ntohs(tftp->tftp_opc)) {
 			case TFTP_OPC_RRQ:
 			case TFTP_OPC_WRQ:
@@ -437,7 +477,7 @@ rxPkt(sched_task_t *task)
 				RPACK_REWIND(pkt);
 				code = htons(TFTP_OPC_ERROR);
 				rpack_uint16(pkt, &code, 0);
-				code = htole16(4);
+				code = htons(4);
 				rpack_uint16(pkt, &code, 0);
 				rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1);
 
@@ -465,7 +505,7 @@ rxPkt(sched_task_t *task)
 				RPACK_REWIND(pkt);
 				code = htons(TFTP_OPC_ERROR);
 				rpack_uint16(pkt, &code, 0);
-				code = htole16(4);
+				code = htons(4);
 				rpack_uint16(pkt, &code, 0);
 				rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1);
 
@@ -475,7 +515,8 @@ rxPkt(sched_task_t *task)
 		}
 
 	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL);
-	schedTimer(TASK_ROOT(task), timeoutSession, NULL, timeout, NULL, 0);
+	schedTimer(TASK_ROOT(task), timeoutSession, NULL, 
+			cli.tout.tv_sec ? cli.tout : timeout, TASK_DATA(task), 0);
 end:
 	schedReadSelf(task);
 	taskExit(task, NULL);