--- tftpd/src/srv.c 2014/02/20 15:39:15 1.2.2.6 +++ tftpd/src/srv.c 2017/01/22 21:00:33 1.8.2.1 @@ -1,16 +1,68 @@ +/************************************************************************* +* (C) 2014 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: srv.c,v 1.8.2.1 2017/01/22 21:00:33 misho Exp $ +* +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004 - 2017 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "exec.h" +#include "buf.h" #include "srv.h" static void * timeoutSession(sched_task_t *task) { + rpack_t *pkt = TASK_DATA(task); + ETRACE(); + if (bf) + flushBuffer(cli.fd); + /* drop session */ if (cli.fd > 2) close(cli.fd); + rpack_resize(pkt, TFTP_PKT_MAX); memset(&cli, 0, sizeof cli); taskExit(task, NULL); @@ -30,12 +82,12 @@ txPkt(sched_task_t *task) if (wlen == -1) ESYSERR(0); else if (wlen != TASK_DATLEN(task)) { - EERROR(EIO, "Sended %d bytes != packet %d bytes", + EERROR(EIO, "Sended %d bytes != packet %zu bytes", wlen, TASK_DATLEN(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 +95,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); @@ -73,7 +125,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 +143,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,8 +169,9 @@ 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"); + schedResumeby(TASK_ROOT(task), CRITERIA_ID, 0); } taskExit(task, NULL); } @@ -129,6 +182,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 +195,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 +205,22 @@ 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); - else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) + cli.tout.tv_sec = strtol(val, NULL, 10); + else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) { cli.roll = strtol(val, NULL, 10); - else - return -1; + cli.roll++; + } } while (rlen > 0); - EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", - cli.siz, cli.tsiz, cli.tout, cli.roll); + EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", + cli.siz, (unsigned long long) cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1); return 0; } @@ -196,26 +249,26 @@ txOack(sched_task_t *task) } if (cli.tsiz) { memset(szStr, 0, sizeof szStr); - snprintf(szStr, sizeof szStr, "%llu", cli.tsiz); + snprintf(szStr, sizeof szStr, "%llu", (unsigned long long) cli.tsiz); 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, "%d", (int) 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); + 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); } - EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", - cli.siz, cli.tsiz, cli.tout, cli.roll); - schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), + EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", + cli.siz, (unsigned long long) cli.tsiz, (int) 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); } @@ -233,13 +286,17 @@ 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); + if (!RW && cli.opc == TFTP_OPC_WRQ) { + code = htons(2); + goto end; + } + 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) @@ -253,10 +310,10 @@ RQ(sched_task_t *task) 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; } } @@ -278,13 +335,15 @@ RQ(sched_task_t *task) 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 if (errno == ENOENT) + code = htons(1); else - code = htole16(0); + code = htons(0); ESYSERR(0); goto end; } else @@ -292,10 +351,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); @@ -315,7 +386,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)); @@ -334,16 +405,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); @@ -353,7 +429,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); @@ -362,7 +438,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)); @@ -382,13 +458,13 @@ 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); @@ -402,15 +478,19 @@ DATA(sched_task_t *task) EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len); - len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); - if (len == -1) { - ESYSERR(0); - code = htole16(3); - goto end; - } else { - rpack_rnext(pkt, len); - EVERBOSE(3, "Written to file %s %d bytes", cli.file, len); + if (len > 0) { + if (!bf) + len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); + else + len = bfwrite(cli.fd, RPACK_NEXT(pkt), len); + if (len == -1) { + ESYSERR(0); + code = htons(3); + goto end; + } else + rpack_rnext(pkt, len); } + EVERBOSE(3, "Written to file %s %d bytes", cli.file, len); schedEvent(TASK_ROOT(task), txAck, NULL, TASK_FD(task), TASK_DATA(task), 0); taskExit(task, NULL); @@ -419,7 +499,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)); @@ -445,6 +525,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: @@ -456,7 +537,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); @@ -484,7 +565,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); @@ -494,7 +575,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);