diff -cNr etftp-1.1.2/INSTALL etftp-1.1.3/INSTALL *** etftp-1.1.2/INSTALL Tue Aug 25 16:46:27 1998 --- etftp-1.1.3/INSTALL Wed Oct 14 14:03:01 1998 *************** *** 5,11 **** Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.2. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 5,11 ---- Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.3. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 23,29 **** ! ETFTP version 1.1.2 was implemented in ANSI C for UNIX using Linux RedHat 5.1. This implementation could work on other UNIX systems. --- 23,29 ---- ! ETFTP version 1.1.3 was implemented in ANSI C for UNIX using Linux RedHat 5.1. This implementation could work on other UNIX systems. diff -cNr etftp-1.1.2/Makefile.in etftp-1.1.3/Makefile.in *** etftp-1.1.2/Makefile.in Tue Aug 25 16:44:43 1998 --- etftp-1.1.3/Makefile.in Wed Oct 14 14:03:17 1998 *************** *** 4,10 **** # Currently maintained by Christian Jönsson FOA 72 and # Torbjörn Frosteamrk FOA 72 . ! # This file is part of ETFTP version 1.1.2. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 4,10 ---- # Currently maintained by Christian Jönsson FOA 72 and # Torbjörn Frosteamrk FOA 72 . ! # This file is part of ETFTP version 1.1.3. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/README etftp-1.1.3/README *** etftp-1.1.2/README Tue Aug 25 17:23:16 1998 --- etftp-1.1.3/README Wed Oct 14 14:02:38 1998 *************** *** 31,37 **** *** If you do use etftp in research and/or development project, please drop the maintainers an e-mail letting them know it. *** ! ETFTP version 1.1.2 is: etftp - client program etftpd - server daemon --- 31,37 ---- *** If you do use etftp in research and/or development project, please drop the maintainers an e-mail letting them know it. *** ! ETFTP version 1.1.3 is: etftp - client program etftpd - server daemon diff -cNr etftp-1.1.2/TODO etftp-1.1.3/TODO *** etftp-1.1.2/TODO Tue Aug 25 16:45:51 1998 --- etftp-1.1.3/TODO Wed Oct 14 17:11:21 1998 *************** *** 1,4 **** ! Two options provided by NETBLT was not implemented in ETFTP version 1.1.2: * multiple buffering * KEEPALIVE packets --- 1,4 ---- ! Two options provided by NETBLT was not implemented in ETFTP version 1.1.3: * multiple buffering * KEEPALIVE packets *************** *** 8,14 **** for confirmation from the receiving NETBLT. Multiple buffering makes packets flow essentially continuous and markedly improves performance. ! Multiple buffering requires a duplex channel, and ETFTP version 1.1.2 was designed for a half duplex channel, thus multiple buffering was not an option. However, since two simplex channels can serve as a duplex channel, later versions of ETFTP should have this option. --- 8,14 ---- for confirmation from the receiving NETBLT. Multiple buffering makes packets flow essentially continuous and markedly improves performance. ! Multiple buffering requires a duplex channel, and ETFTP version 1.1.3 was designed for a half duplex channel, thus multiple buffering was not an option. However, since two simplex channels can serve as a duplex channel, later versions of ETFTP should have this option. *************** *** 20,33 **** packets. If the channel is in a bad state no packets are likely to be transmitted, ! including KEEPALIVE packets. For this reason ETFTP version 1.1.2 does not include this option. ! The versions implemented up to 1.1.2 uses doubling of the packetsize to renegotiate upwards. RFC 1986 does not explicitly state any algorithm, so trippling the packetsize when at least 99% of the packets has been transmitted correctly could be one alterative method. ! The RedHat 5.1 distribution of Linux (i386) tends to have problem with ! multiple file transfers in one session. It seems to have problems to ! reastablish a connection to the host (server). \ No newline at end of file --- 20,35 ---- packets. If the channel is in a bad state no packets are likely to be transmitted, ! including KEEPALIVE packets. For this reason ETFTP version 1.1.3 does not include this option. ! The versions implemented up to 1.1.3 uses doubling of the packetsize to renegotiate upwards. RFC 1986 does not explicitly state any algorithm, so trippling the packetsize when at least 99% of the packets has been transmitted correctly could be one alterative method. ! The RedHat 5.1 distribution of Linux (i386/sparc) tends to have ! problem with multiple file transfers in one session. It seems to have ! problems to reastablish a connection to the host (server). This seems ! to be connected to glibc-2.0.7->13. The problem was not present when ! glibc-2.0.7-13. diff -cNr etftp-1.1.2/USAGE etftp-1.1.3/USAGE *** etftp-1.1.2/USAGE Tue Aug 25 16:17:35 1998 --- etftp-1.1.3/USAGE Wed Oct 14 14:03:50 1998 *************** *** 5,11 **** Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.2. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 5,11 ---- Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.3. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/WhatsNew etftp-1.1.3/WhatsNew *** etftp-1.1.2/WhatsNew Tue Aug 25 16:12:43 1998 --- etftp-1.1.3/WhatsNew Wed Oct 14 17:07:17 1998 *************** *** 5,11 **** Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 5,11 ---- Currently maintained by Christian Jönsson FOA 72 and Torbjörn Frostemark FOA 72 . ! This file is part of ETFTP version 1.1.3 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 21,26 **** --- 21,32 ---- along with this program; see the file GPL. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + ********************************************************************* + *** Things that have been done between version 1.1.2 and 1.1.3. + ********************************************************************* + + Fixed bug with integer divisions in timers; lDATAsleep, alarmTimeout. ********************************************************************* *** Things that have been done between version 1.1.1 and 1.1.2. diff -cNr etftp-1.1.2/configure etftp-1.1.3/configure *** etftp-1.1.2/configure Tue Aug 25 16:57:14 1998 --- etftp-1.1.3/configure Wed Oct 14 14:10:20 1998 *************** *** 837,843 **** PRODUCT=etftp ! VERSION=1.1.2 cat >> confdefs.h <> confdefs.h < and dnl Torbjörn Frostemark FOA 72 . dnl ! dnl This file is part of ETFTP version 1.1.2. dnl dnl ETFTP is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by --- 5,11 ---- dnl Currently maintained by Christian Jönsson FOA 72 and dnl Torbjörn Frostemark FOA 72 . dnl ! dnl This file is part of ETFTP version 1.1.3. dnl dnl ETFTP is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by *************** *** 33,39 **** AC_PROG_MAKE_SET PRODUCT=etftp ! VERSION=1.1.2 AC_DEFINE_UNQUOTED(PRODUCT, "$PRODUCT") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PRODUCT) --- 33,39 ---- AC_PROG_MAKE_SET PRODUCT=etftp ! VERSION=1.1.3 AC_DEFINE_UNQUOTED(PRODUCT, "$PRODUCT") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PRODUCT) diff -cNr etftp-1.1.2/src/Makefile.in etftp-1.1.3/src/Makefile.in *** etftp-1.1.2/src/Makefile.in Tue Aug 25 16:47:57 1998 --- etftp-1.1.3/src/Makefile.in Wed Oct 14 14:05:31 1998 *************** *** 3,9 **** # Systems, FOA 72, Sweden. # Currently maintained by Christian Jönsson FOA 72 . # ! # This file is part of ETFTP version 1.1.2. # # ETFTP is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 3,9 ---- # Systems, FOA 72, Sweden. # Currently maintained by Christian Jönsson FOA 72 . # ! # This file is part of ETFTP version 1.1.3. # # ETFTP is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cli.c etftp-1.1.3/src/cli.c *** etftp-1.1.2/src/cli.c Tue Aug 25 16:49:39 1998 --- etftp-1.1.3/src/cli.c Wed Oct 14 14:07:31 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cli.h etftp-1.1.3/src/cli.h *** etftp-1.1.2/src/cli.h Tue Aug 25 16:49:47 1998 --- etftp-1.1.3/src/cli.h Wed Oct 14 14:07:38 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/clu.c etftp-1.1.3/src/clu.c *** etftp-1.1.2/src/clu.c Tue Aug 25 16:49:54 1998 --- etftp-1.1.3/src/clu.c Wed Oct 14 14:07:56 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/clu.h etftp-1.1.3/src/clu.h *** etftp-1.1.2/src/clu.h Tue Aug 25 16:50:01 1998 --- etftp-1.1.3/src/clu.h Wed Oct 14 14:07:49 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cmd.c etftp-1.1.3/src/cmd.c *** etftp-1.1.2/src/cmd.c Tue Aug 25 17:43:02 1998 --- etftp-1.1.3/src/cmd.c Wed Oct 14 14:08:09 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cmd.h etftp-1.1.3/src/cmd.h *** etftp-1.1.2/src/cmd.h Tue Aug 25 16:50:12 1998 --- etftp-1.1.3/src/cmd.h Wed Oct 14 14:08:15 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cmdsubr.c etftp-1.1.3/src/cmdsubr.c *** etftp-1.1.2/src/cmdsubr.c Tue Aug 25 16:50:17 1998 --- etftp-1.1.3/src/cmdsubr.c Wed Oct 14 14:08:32 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/cmdsubr.h etftp-1.1.3/src/cmdsubr.h *** etftp-1.1.2/src/cmdsubr.h Tue Aug 25 16:50:22 1998 --- etftp-1.1.3/src/cmdsubr.h Wed Oct 14 14:08:39 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/defs.h etftp-1.1.3/src/defs.h *** etftp-1.1.2/src/defs.h Tue Aug 25 17:25:40 1998 --- etftp-1.1.3/src/defs.h Wed Oct 14 14:08:53 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by *************** *** 49,55 **** * ETFTP client and server stuff */ ! #define ETFTP_VERSION "1.1.2" /* max size of data per packet to send or rcv 512 is specified by the RFC */ #define MAXDATA 512 --- 49,55 ---- * ETFTP client and server stuff */ ! #define ETFTP_VERSION "1.1.3" /* max size of data per packet to send or rcv 512 is specified by the RFC */ #define MAXDATA 512 diff -cNr etftp-1.1.2/src/etftp.h etftp-1.1.3/src/etftp.h *** etftp-1.1.2/src/etftp.h Tue Aug 25 16:50:35 1998 --- etftp-1.1.3/src/etftp.h Wed Oct 14 14:09:06 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/etftptime.c etftp-1.1.3/src/etftptime.c *** etftp-1.1.2/src/etftptime.c Tue Aug 25 16:50:41 1998 --- etftp-1.1.3/src/etftptime.c Wed Oct 14 14:09:15 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/etftptime.h etftp-1.1.3/src/etftptime.h *** etftp-1.1.2/src/etftptime.h Tue Aug 25 16:50:46 1998 --- etftp-1.1.3/src/etftptime.h Wed Oct 14 14:09:23 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/file.c etftp-1.1.3/src/file.c *** etftp-1.1.2/src/file.c Tue Aug 25 16:50:52 1998 --- etftp-1.1.3/src/file.c Wed Oct 14 14:09:31 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/file.h etftp-1.1.3/src/file.h *** etftp-1.1.2/src/file.h Tue Aug 25 16:50:57 1998 --- etftp-1.1.3/src/file.h Wed Oct 14 14:09:36 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/fsm.c etftp-1.1.3/src/fsm.c *** etftp-1.1.2/src/fsm.c Tue Aug 25 16:51:03 1998 --- etftp-1.1.3/src/fsm.c Wed Oct 14 14:09:45 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/fsm.h etftp-1.1.3/src/fsm.h *** etftp-1.1.2/src/fsm.h Tue Aug 25 16:51:08 1998 --- etftp-1.1.3/src/fsm.h Wed Oct 14 14:10:54 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/getput.c etftp-1.1.3/src/getput.c *** etftp-1.1.2/src/getput.c Tue Aug 25 16:51:13 1998 --- etftp-1.1.3/src/getput.c Wed Oct 14 14:11:02 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/getput.h etftp-1.1.3/src/getput.h *** etftp-1.1.2/src/getput.h Tue Aug 25 16:51:21 1998 --- etftp-1.1.3/src/getput.h Wed Oct 14 14:11:06 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/init.c etftp-1.1.3/src/init.c *** etftp-1.1.2/src/init.c Tue Aug 25 16:51:27 1998 --- etftp-1.1.3/src/init.c Wed Oct 14 14:11:13 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/init.h etftp-1.1.3/src/init.h *** etftp-1.1.2/src/init.h Tue Aug 25 16:51:34 1998 --- etftp-1.1.3/src/init.h Wed Oct 14 14:11:18 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/net.c etftp-1.1.3/src/net.c *** etftp-1.1.2/src/net.c Tue Aug 25 16:56:45 1998 --- etftp-1.1.3/src/net.c Wed Oct 14 14:11:25 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/net.h etftp-1.1.3/src/net.h *** etftp-1.1.2/src/net.h Tue Aug 25 16:51:48 1998 --- etftp-1.1.3/src/net.h Wed Oct 14 14:11:30 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/rtt.c etftp-1.1.3/src/rtt.c *** etftp-1.1.2/src/rtt.c Tue Aug 25 16:51:54 1998 --- etftp-1.1.3/src/rtt.c Wed Oct 14 16:44:15 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by *************** *** 111,117 **** /* printf("RTTNewPack: bufferSize = %d, packnum = %d, burstRate = %d, burstSize = %d\n", bufferSize, packNum, burstRate, burstSize);*/ /* ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize/1000 + ptr->wait; */ ! ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize + ptr->wait; /* printf("RTTNewPack(recv): Setting alarmTimeout = %d (wait = %d)\n", ptr->alarmTimeout, ptr->wait);*/ } else { --- 111,119 ---- /* printf("RTTNewPack: bufferSize = %d, packnum = %d, burstRate = %d, burstSize = %d\n", bufferSize, packNum, burstRate, burstSize);*/ /* ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize/1000 + ptr->wait; */ ! ptr->alarmTimeout = (int) /* Timer fixed by ChJ */ ! ((float)(bufferSize - packNum) /* Timer fixed by ChJ */ ! * burstRate/burstSize + ptr->wait); /* printf("RTTNewPack(recv): Setting alarmTimeout = %d (wait = %d)\n", ptr->alarmTimeout, ptr->wait);*/ } else { *************** *** 174,180 **** /* printf("RTTUpdate: bufferSize = %d, packnum = %d, burstRate = %d, burstSize = %d\n", bufferSize, packNum, burstRate, burstSize);*/ /* ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize/1000 + ptr->wait; */ ! ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize + ptr->wait; /* printf("RTTUpdate(recv): Setting alarmTimeout = %d (wait = %d)\n", ptr->alarmTimeout, ptr->wait);*/ } else { --- 176,184 ---- /* printf("RTTUpdate: bufferSize = %d, packnum = %d, burstRate = %d, burstSize = %d\n", bufferSize, packNum, burstRate, burstSize);*/ /* ptr->alarmTimeout = (bufferSize - packNum)*burstRate/burstSize/1000 + ptr->wait; */ ! ptr->alarmTimeout = (int) /* Timer fixed by ChJ */ ! ((float)(bufferSize - packNum) /* Timer fixed by ChJ */ ! * burstRate/burstSize + ptr->wait); /* printf("RTTUpdate(recv): Setting alarmTimeout = %d (wait = %d)\n", ptr->alarmTimeout, ptr->wait);*/ } else { diff -cNr etftp-1.1.2/src/rtt.h etftp-1.1.3/src/rtt.h *** etftp-1.1.2/src/rtt.h Tue Aug 25 16:51:58 1998 --- etftp-1.1.3/src/rtt.h Wed Oct 14 14:11:43 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/sendrecv.c etftp-1.1.3/src/sendrecv.c *** etftp-1.1.2/src/sendrecv.c Tue Aug 25 16:52:04 1998 --- etftp-1.1.3/src/sendrecv.c Wed Oct 14 15:37:45 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by *************** *** 805,811 **** { unsigned int pos; int i, j, startByte, checkSum, stopByte, burstNum = 0; /* Counters */ ! int firstDataNum, lDATASleep; char MBZ; --- 805,812 ---- { unsigned int pos; int i, j, startByte, checkSum, stopByte, burstNum = 0; /* Counters */ ! int firstDataNum; ! unsigned int lDATASleep; /* Timer fixed by ChJ */ char MBZ; *************** *** 888,895 **** NetSend(sendPack,sendLen); ! lDATASleep = burstRate * ((nextBlkNum - firstDataNum) / burstSize); ! DEBUG1("SendBuffer: LDATA-sleeping %d s...", lDATASleep); sleep(lDATASleep); return; --- 889,897 ---- NetSend(sendPack,sendLen); ! lDATASleep = (unsigned int) /* Timer fixed by ChJ */ ! ( burstRate * ((float)(nextBlkNum - firstDataNum) / burstSize)); ! DEBUG1("SendBuffer: LDATA-sleeping %d s...", lDATASleep); sleep(lDATASleep); return; diff -cNr etftp-1.1.2/src/sendrecv.h etftp-1.1.3/src/sendrecv.h *** etftp-1.1.2/src/sendrecv.h Tue Aug 25 16:52:08 1998 --- etftp-1.1.3/src/sendrecv.h Wed Oct 14 14:44:09 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/servmain.c etftp-1.1.3/src/servmain.c *** etftp-1.1.2/src/servmain.c Tue Aug 25 16:53:33 1998 --- etftp-1.1.3/src/servmain.c Wed Oct 14 14:44:18 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/servmain.h etftp-1.1.3/src/servmain.h *** etftp-1.1.2/src/servmain.h Tue Aug 25 16:53:40 1998 --- etftp-1.1.3/src/servmain.h Wed Oct 14 14:44:24 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by diff -cNr etftp-1.1.2/src/tron.c etftp-1.1.3/src/tron.c *** etftp-1.1.2/src/tron.c Tue Aug 25 16:53:46 1998 --- etftp-1.1.3/src/tron.c Wed Oct 14 16:53:19 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by *************** *** 82,88 **** void TRONStart(unsigned short burstSize, unsigned short burstRate, unsigned short blockSize) { tRONBurstSize = burstSize; ! tRONBurstRate = burstRate; tRONBlockSize = blockSize; tRONBytesSoFar = 0; tRONStartTime = TimeGet(); /* For averageing transfer rate */ --- 82,88 ---- void TRONStart(unsigned short burstSize, unsigned short burstRate, unsigned short blockSize) { tRONBurstSize = burstSize; ! tRONBurstRate = (int) burstRate; tRONBlockSize = blockSize; tRONBytesSoFar = 0; tRONStartTime = TimeGet(); /* For averageing transfer rate */ *************** *** 239,251 **** burstRate[0] = (unsigned short) ceil(tmpBurstRate); /* decrease burstRate */ } ! tRONBurstRate = burstRate[0]; return 1; ! } else { ! burstRate[0] = tightTimer; /* last attempt to stabilize thruput */ } ! tRONBurstRate = burstRate[0]; return 1; } --- 239,251 ---- burstRate[0] = (unsigned short) ceil(tmpBurstRate); /* decrease burstRate */ } ! tRONBurstRate = (int) burstRate[0]; return 1; ! } else { /* last attempt to stabilize thruput */ ! burstRate[0] = (unsigned short) tightTimer; /* Timer fixed by ChJ */ } ! tRONBurstRate = (int) burstRate[0]; return 1; } *************** *** 271,277 **** burstRate[0] = (unsigned short)tmpBurstRate + 1; /* increase burstRate */ } ! tRONBurstRate = burstRate[0]; return 1; /* blockSize has been doubled */ } --- 271,277 ---- burstRate[0] = (unsigned short)tmpBurstRate + 1; /* increase burstRate */ } ! tRONBurstRate = (int) burstRate[0]; return 1; /* blockSize has been doubled */ } *************** *** 287,293 **** burstRate[0] = (unsigned short)tmpBurstRate; /* increase burstRate */ } ! tRONBurstRate = burstRate[0]; return 1; /* burstRate has been increased by one */ } --- 287,293 ---- burstRate[0] = (unsigned short)tmpBurstRate; /* increase burstRate */ } ! tRONBurstRate = (int) burstRate[0]; return 1; /* burstRate has been increased by one */ } diff -cNr etftp-1.1.2/src/tron.h etftp-1.1.3/src/tron.h *** etftp-1.1.2/src/tron.h Tue Aug 25 16:53:50 1998 --- etftp-1.1.3/src/tron.h Wed Oct 14 14:44:36 1998 *************** *** 3,9 **** * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.2. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by --- 3,9 ---- * Systems, FOA 72, Sweden. * Currently maintained by Christian Jönsson FOA 72 . * ! * This file is part of ETFTP version 1.1.3. * * ETFTP is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by