[BACK]Return to srv.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / tftpd / src

Diff for /tftpd/src/srv.c between versions 1.5 and 1.7.2.1

version 1.5, 2014/02/21 09:02:28 version 1.7.2.1, 2014/02/24 21:55:35
Line 1 Line 1
   /*************************************************************************
   * (C) 2014 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
   *  by Michael Pounov <misho@elwix.org>
   *
   * $Author$
   * $Id$
   *
   **************************************************************************
   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 <info@elwix.org>
   
   Copyright 2004 - 2014
           by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
   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 "global.h"
 #include "exec.h"  #include "exec.h"
   #include "buf.h"
 #include "srv.h"  #include "srv.h"
   
   
Line 10  timeoutSession(sched_task_t *task) Line 56  timeoutSession(sched_task_t *task)
   
         ETRACE();          ETRACE();
   
           if (bf)
                   flushBuffer(cli.fd);
   
         /* drop session */          /* drop session */
         if (cli.fd > 2)          if (cli.fd > 2)
                 close(cli.fd);                  close(cli.fd);
Line 169  getOpts(rpack_t * __restrict pkt, int rlen) Line 218  getOpts(rpack_t * __restrict pkt, int rlen)
                 }                  }
         } while (rlen > 0);          } while (rlen > 0);
   
        EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u",         EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
                        cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);                        cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
         return 0;          return 0;
 }  }
   
Line 205  txOack(sched_task_t *task) Line 254  txOack(sched_task_t *task)
         }          }
         if (cli.tout.tv_sec) {          if (cli.tout.tv_sec) {
                 memset(szStr, 0, sizeof szStr);                  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, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1);
                 rpack_rdata(pkt, szStr, strlen(szStr) + 1);                  rpack_rdata(pkt, szStr, strlen(szStr) + 1);
         }          }
Line 216  txOack(sched_task_t *task) Line 265  txOack(sched_task_t *task)
                 rpack_rdata(pkt, szStr, strlen(szStr) + 1);                  rpack_rdata(pkt, szStr, strlen(szStr) + 1);
         }          }
   
        EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u",         EVERBOSE(4, "blksize=%u tsize=%llu timeout=%d rollover=%u", 
                        cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);                        cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
         schedCallOnce(TASK_ROOT(task), txPkt, NULL, TASK_FD(task),           schedCallOnce(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
                         TASK_DATA(task), RPACK_OFF(pkt));                          TASK_DATA(task), RPACK_OFF(pkt));
         taskExit(task, NULL);          taskExit(task, NULL);
Line 236  RQ(sched_task_t *task) Line 285  RQ(sched_task_t *task)
   
         cli.siz = TFTP_LOAD_MAX;          cli.siz = TFTP_LOAD_MAX;
         cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));          cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
           if (!RW && cli.opc == TFTP_OPC_WRQ) {
                   code = 2;
                   goto end;
           }
         len = str_getString(RPACK_NEXT(pkt), rlen, &str);          len = str_getString(RPACK_NEXT(pkt), rlen, &str);
         if (len == -1)          if (len == -1)
                 goto end;                  goto end;
Line 286  RQ(sched_task_t *task) Line 339  RQ(sched_task_t *task)
                         code = htons(3);                          code = htons(3);
                 else if (errno == EEXIST)                  else if (errno == EEXIST)
                         code = htons(6);                          code = htons(6);
                   else if (errno == ENOENT)
                           code = htons(1);
                 else                  else
                         code = htons(0);                          code = htons(0);
                 ESYSERR(0);                  ESYSERR(0);
Line 422  DATA(sched_task_t *task) Line 477  DATA(sched_task_t *task)
   
         EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len);          EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len);
   
        len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);        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) {          if (len == -1) {
                 ESYSERR(0);                  ESYSERR(0);
                 code = htons(3);                  code = htons(3);
Removed from v.1.5  
changed lines
  Added in v.1.7.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>