tftpd/inc/defs.h - diff

Return to defs.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / tftpd / inc

Diff for /tftpd/inc/defs.h between versions 1.1.1.1.4.3 and 1.7

-version 1.1.1.1.4.3, 2014/02/20 15:39:15
+version 1.7, 2014/02/24 22:28:54
  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:
+. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+. 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.
+. 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.
+. 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.
+ */
  #ifndef __DEFS_H
  #define __DEFS_H
- Line 13
+ Line 58
  #define TFTP_OPT_TSIZE          "tsize"
  #define TFTP_OPT_BLKSIZE        "blksize"
+ #define TFTP_OPT_BLKSIZE2       "blksize2"
  #define TFTP_OPT_TIMEOUT        "timeout"
  #define TFTP_OPT_ROLLOVER       "rollover"
- Line 20
+ Line 66
  struct tagCli {
          int             opc;
          u_short         seq;
-        int             tout;
+        struct timespec        tout;
-        int             roll;
+        u_short               roll;
          int             siz;
          off_t           tsiz;
          sockaddr_t      addr;
- Line 29  struct tagCli {
+ Line 75  struct tagCli {
          char            file[PATH_MAX];
          char            mode[10];
          short           close;
+         int             tmp;
  };
  extern struct timespec timeout;
  extern struct tagCli cli;
  extern cfg_root_t cfg;
+ extern rpack_t *bf;
+ extern char RW;
  #endif

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

Removed from v.1.1.1.1.4.3
changed lines
	Added in v.1.7