--- tftpd/src/srv.c	2014/02/20 15:39:15	1.2.2.6
+++ tftpd/src/srv.c	2014/02/20 23:17:22	1.4
@@ -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);
@@ -117,7 +120,7 @@ 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);
@@ -129,6 +132,9 @@ 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);
@@ -139,6 +145,7 @@ getOpts(rpack_t * __restrict pkt, int rlen)
 		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)
@@ -148,26 +155,20 @@ getOpts(rpack_t * __restrict pkt, int rlen)
 		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;
-				if (rpack_resize(pkt, cli.siz + 4))
-					cli.siz = TFTP_PKT_MAX;
-			}
-		} 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);
+			cli.tout.tv_sec = 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);
+			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll);
 	return 0;
 }
 
@@ -200,9 +201,9 @@ 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);
 	}
@@ -214,7 +215,7 @@ txOack(sched_task_t *task)
 	}
 
 	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout, cli.roll);
+			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll);
 	schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
 	taskExit(task, NULL);
@@ -233,13 +234,13 @@ RQ(sched_task_t *task)
 
 	cli.siz = TFTP_LOAD_MAX;
 	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
-	len = str_getString(tftp->tftp_data, rlen, &str);
+	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;
 		rpack_rnext(pkt, len);
-		strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);
 	}
 	len = str_getString((const u_char*) str, rlen, NULL);
 	if (len == -1)
@@ -292,10 +293,22 @@ RQ(sched_task_t *task)
 
 	schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);
 
-	if (!RPACK_ISEND(pkt) && !getOpts(pkt, rlen))
+	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) {
+	} else if (cli.opc == TFTP_OPC_WRQ) {
 		/* ack */
 		tftp->tftp_opc = htons(TFTP_OPC_ACK);
 		RPACK_REWIND(pkt);
@@ -342,8 +355,13 @@ ACK(sched_task_t *task)
 	if (ntohs(code) > cli.seq || (ntohs(code) < (cli.seq - 1))) {
 		code = htole16(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;
+		else
+			cli.seq++;
+	}
 
 	EVERBOSE(3, "ACK:: seq=%hu; my new seq=%hu;", ntohs(code), cli.seq);
 
@@ -353,7 +371,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);
@@ -445,6 +463,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:
@@ -494,7 +513,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);