--- tftpd/src/srv.c 2014/02/20 23:05:58 1.2.2.9 +++ tftpd/src/srv.c 2014/02/24 22:28:54 1.8 @@ -1,5 +1,51 @@ +/************************************************************************* +* (C) 2014 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: srv.c,v 1.8 2014/02/24 22:28:54 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 - 2014 + 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" @@ -10,6 +56,9 @@ timeoutSession(sched_task_t *task) ETRACE(); + if (bf) + flushBuffer(cli.fd); + /* drop session */ if (cli.fd > 2) close(cli.fd); @@ -76,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); @@ -94,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)); @@ -122,6 +171,7 @@ txAck(sched_task_t *task) schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); 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); } @@ -163,12 +213,14 @@ getOpts(rpack_t * __restrict pkt, int rlen) 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)) + else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) { cli.roll = strtol(val, NULL, 10); + cli.roll++; + } } while (rlen > 0); - EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", - cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll); + EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", + cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1); return 0; } @@ -203,20 +255,20 @@ txOack(sched_task_t *task) } if (cli.tout.tv_sec) { memset(szStr, 0, sizeof szStr); - snprintf(szStr, sizeof szStr, "%u", cli.tout.tv_sec); + 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.tv_sec, cli.roll); - schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), + EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", + cli.siz, 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); } @@ -234,6 +286,10 @@ RQ(sched_task_t *task) cli.siz = TFTP_LOAD_MAX; cli.opc = ntohs(rpack_uint16(pkt, NULL, 0)); + 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; @@ -254,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; } } @@ -279,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 @@ -328,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)); @@ -347,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); @@ -375,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)); @@ -395,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); @@ -415,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); @@ -432,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)); @@ -470,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); @@ -498,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);