--- tftpd/src/srv.c 2014/02/20 00:44:49 1.2.2.1 +++ tftpd/src/srv.c 2014/02/20 01:15:45 1.2.2.2 @@ -119,6 +119,37 @@ txAck(sched_task_t *task) static int getOpts(rpack_t * __restrict pkt) { + char *opt, *val; + int len; + + 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)); + return 0; }