--- tftpd/src/srv.c 2014/02/21 09:01:30 1.4.2.3 +++ tftpd/src/srv.c 2014/02/21 09:47:00 1.6.2.2 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2014 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: srv.c,v 1.6.2.2 2014/02/21 09:47:00 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 "srv.h" @@ -169,8 +214,8 @@ getOpts(rpack_t * __restrict pkt, int rlen) } } while (rlen > 0); - EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", - cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1); + EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", + cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1); return 0; } @@ -205,7 +250,7 @@ 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); } @@ -216,8 +261,8 @@ txOack(sched_task_t *task) 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 - 1); + 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);