--- tftpd/src/srv.c	2014/02/20 01:31:50	1.2.2.3
+++ tftpd/src/srv.c	2014/02/18 12:46:39	1.3
@@ -117,91 +117,21 @@ txAck(sched_task_t *task)
 }
 
 static int
-getOpts(rpack_t * __restrict pkt)
+getOpts(const char *opts, int rlen)
 {
-	char *opt, *val;
-	int len;
+	if (!opts)
+		return -1;
 
-	do {
-		/* option */
-		len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);
-		if (len == -1)
-			return -1;
-		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;
-		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;
-		} 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));
-
-	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u", cli.siz, cli.tsiz, cli.tout);
 	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);
-	}
-
-	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();
@@ -214,7 +144,7 @@ RQ(sched_task_t *task)
 		rlen -= 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 {
@@ -233,6 +163,10 @@ 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:
@@ -247,11 +181,6 @@ RQ(sched_task_t *task)
 			EVERBOSE(2, "WRQ:: file=%s mode=%s\n", cli.file, cli.mode);
 			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)