--- tftpd/src/srv.c	2014/02/20 23:11:18	1.2.2.10
+++ tftpd/src/srv.c	2014/02/18 12:46:39	1.3
@@ -6,14 +6,11 @@
 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);
@@ -38,7 +35,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, TASK_DATA(task), 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
 	} else
 		EVERBOSE(2, "Sended %d bytes", wlen);
 	/* on error or argument, drop session */
@@ -46,7 +43,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, TASK_DATA(task), 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
 	}
 
 	taskExit(task, NULL);
@@ -66,14 +63,7 @@ txData(sched_task_t *task)
 	n = htons(cli.seq);
 	rpack_uint16(pkt, &n, 0);
 
-	/* 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);
+	len = pread(cli.fd, RPACK_NEXT(pkt), cli.siz, (cli.seq - 1) * cli.siz);
 	if (len == -1) {
 		ESYSERR(0);
 		code = htole16(3);
@@ -120,134 +110,45 @@ 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, TASK_DATA(task), 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
 		EVERBOSE(2, "Finish WRQ request");
 	}
 	taskExit(task, NULL);
 }
 
 static int
-getOpts(rpack_t * __restrict pkt, int rlen)
+getOpts(const char *opts, int rlen)
 {
-	char *opt, *val;
-	int len;
-
-	if (!rlen)
+	if (!opts)
 		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))
-			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.tv_sec = strtol(val, NULL, 10);
-		else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER))
-			cli.roll = strtol(val, NULL, 10);
-	} while (rlen > 0);
-
-	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout.tv_sec, 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.tv_sec) {
-		memset(szStr, 0, sizeof szStr);
-		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);
-		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.tv_sec, 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);
 	struct tftp_hdr *tftp = (struct tftp_hdr*) RPACK_BUF(pkt);
 	int len, rlen = TASK_DATLEN(task) - 2;
-	char *str;
+	char *str, *opts;
 	u_short code = 0;
 
 	ETRACE();
 
 	cli.siz = TFTP_LOAD_MAX;
-	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
-	len = str_getString(RPACK_NEXT(pkt), rlen, &str);
+	len = str_getString(tftp->tftp_data, 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);
+	len = str_getString((const u_char*) str, rlen, &opts);
 	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))
@@ -262,6 +163,11 @@ RQ(sched_task_t *task)
 		}
 	}
 
+	/* tftp extended options */
+	if (!RPACK_ISEND(pkt) && !getOpts(opts, rlen))
+		cli.opts = 42;	/* we have options */
+
+	cli.opc = ntohs(tftp->tftp_opc);
 	switch (cli.opc) {
 		case TFTP_OPC_RRQ:
 			code = O_RDONLY;
@@ -275,7 +181,6 @@ 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)
@@ -293,22 +198,7 @@ RQ(sched_task_t *task)
 
 	schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);
 
-	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) {
+	if (cli.opc == TFTP_OPC_WRQ) {
 		/* ack */
 		tftp->tftp_opc = htons(TFTP_OPC_ACK);
 		RPACK_REWIND(pkt);
@@ -355,13 +245,8 @@ 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) {
-		/* check for rollover seq id */
-		if (cli.roll && cli.seq == USHRT_MAX)
-			cli.seq = cli.roll;
-		else
-			cli.seq++;
-	}
+	} else if (ntohs(code) == cli.seq)
+		cli.seq++;
 
 	EVERBOSE(3, "ACK:: seq=%hu; my new seq=%hu;", ntohs(code), cli.seq);
 
@@ -371,7 +256,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, TASK_DATA(task), 0);
+		schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0);
 		EVERBOSE(2, "Finish RRQ request");
 	}
 	taskExit(task, NULL);
@@ -411,10 +296,7 @@ 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! */
 
@@ -463,7 +345,6 @@ 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:
@@ -498,6 +379,12 @@ 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);
@@ -513,8 +400,7 @@ rxPkt(sched_task_t *task)
 		}
 
 	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL);
-	schedTimer(TASK_ROOT(task), timeoutSession, NULL, 
-			cli.tout.tv_sec ? cli.tout : timeout, TASK_DATA(task), 0);
+	schedTimer(TASK_ROOT(task), timeoutSession, NULL, timeout, NULL, 0);
 end:
 	schedReadSelf(task);
 	taskExit(task, NULL);