head	1.10;
access;
symbols
	RELENG_8_4:1.10.0.2
	RELENG_9_1_0_RELEASE:1.9.2.1.4.2
	RELENG_9_1:1.9.2.1.0.4
	RELENG_9_1_BP:1.9.2.1
	RELENG_8_3_0_RELEASE:1.5.36.5.4.1
	RELENG_8_3:1.5.36.5.0.4
	RELENG_8_3_BP:1.5.36.5
	RELENG_9_0_0_RELEASE:1.9.2.1.2.1
	RELENG_9_0:1.9.2.1.0.2
	RELENG_9_0_BP:1.9.2.1
	RELENG_9:1.9.0.2
	RELENG_9_BP:1.9
	RELENG_7_4_0_RELEASE:1.5.24.4.2.1
	RELENG_8_2_0_RELEASE:1.5.36.5.2.1
	RELENG_7_4:1.5.24.4.0.2
	RELENG_7_4_BP:1.5.24.4
	RELENG_8_2:1.5.36.5.0.2
	RELENG_8_2_BP:1.5.36.5
	RELENG_8_1_0_RELEASE:1.5.36.1.4.1
	RELENG_8_1:1.5.36.1.0.4
	RELENG_8_1_BP:1.5.36.1
	RELENG_7_3_0_RELEASE:1.5.38.1
	RELENG_7_3:1.5.0.38
	RELENG_7_3_BP:1.5
	RELENG_8_0_0_RELEASE:1.5.36.1.2.1
	RELENG_8_0:1.5.36.1.0.2
	RELENG_8_0_BP:1.5.36.1
	RELENG_8:1.5.0.36
	RELENG_8_BP:1.5
	RELENG_7_2_0_RELEASE:1.5.34.1
	RELENG_7_2:1.5.0.34
	RELENG_7_2_BP:1.5
	RELENG_7_1_0_RELEASE:1.5.32.1
	RELENG_6_4_0_RELEASE:1.5.30.1
	RELENG_7_1:1.5.0.32
	RELENG_7_1_BP:1.5
	RELENG_6_4:1.5.0.30
	RELENG_6_4_BP:1.5
	RELENG_7_0_0_RELEASE:1.5
	RELENG_6_3_0_RELEASE:1.5
	RELENG_7_0:1.5.0.28
	RELENG_7_0_BP:1.5
	RELENG_6_3:1.5.0.26
	RELENG_6_3_BP:1.5
	RELENG_7:1.5.0.24
	RELENG_7_BP:1.5
	RELENG_6_2_0_RELEASE:1.5
	RELENG_6_2:1.5.0.22
	RELENG_6_2_BP:1.5
	RELENG_5_5_0_RELEASE:1.5
	RELENG_5_5:1.5.0.20
	RELENG_5_5_BP:1.5
	RELENG_6_1_0_RELEASE:1.5
	RELENG_6_1:1.5.0.18
	RELENG_6_1_BP:1.5
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.16
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.14
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.12
	RELENG_5_4_BP:1.5
	RELENG_4_11_0_RELEASE:1.1.1.1
	RELENG_4_11:1.1.1.1.0.32
	RELENG_4_11_BP:1.1.1.1
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.10
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.8
	RELENG_5_BP:1.5
	RELENG_4_10_0_RELEASE:1.1.1.1
	RELENG_4_10:1.1.1.1.0.30
	RELENG_4_10_BP:1.1.1.1
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.6
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.1.1.1
	RELENG_4_9:1.1.1.1.0.28
	RELENG_4_9_BP:1.1.1.1
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.4
	RELENG_5_1_BP:1.5
	RELENG_4_8_0_RELEASE:1.1.1.1
	RELENG_4_8:1.1.1.1.0.26
	RELENG_4_8_BP:1.1.1.1
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.2
	RELENG_5_0_BP:1.5
	RELENG_4_7_0_RELEASE:1.1.1.1
	RELENG_4_7:1.1.1.1.0.24
	RELENG_4_7_BP:1.1.1.1
	RELENG_4_6_2_RELEASE:1.1.1.1
	RELENG_4_6_1_RELEASE:1.1.1.1
	RELENG_4_6_0_RELEASE:1.1.1.1
	RELENG_4_6:1.1.1.1.0.22
	RELENG_4_6_BP:1.1.1.1
	RELENG_4_5_0_RELEASE:1.1.1.1
	RELENG_4_5:1.1.1.1.0.20
	RELENG_4_5_BP:1.1.1.1
	RELENG_4_4_0_RELEASE:1.1.1.1
	RELENG_4_4:1.1.1.1.0.18
	RELENG_4_4_BP:1.1.1.1
	RELENG_4_3_0_RELEASE:1.1.1.1
	RELENG_4_3:1.1.1.1.0.16
	RELENG_4_3_BP:1.1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1
	RELENG_4_1_1_RELEASE:1.1.1.1
	PRE_SMPNG:1.1.1.1
	RELENG_4_1_0_RELEASE:1.1.1.1
	RELENG_3_5_0_RELEASE:1.1.1.1
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.14
	RELENG_4_BP:1.1.1.1
	RELENG_3_4_0_RELEASE:1.1.1.1
	RELENG_3_3_0_RELEASE:1.1.1.1
	RELENG_3_2_PAO:1.1.1.1.0.12
	RELENG_3_2_PAO_BP:1.1.1.1
	RELENG_3_2_0_RELEASE:1.1.1.1
	RELENG_3_1_0_RELEASE:1.1.1.1
	RELENG_3:1.1.1.1.0.10
	RELENG_3_BP:1.1.1.1
	RELENG_2_2_8_RELEASE:1.1.1.1
	RELENG_3_0_0_RELEASE:1.1.1.1
	RELENG_2_2_7_RELEASE:1.1.1.1
	RELENG_2_2_6_RELEASE:1.1.1.1
	RELENG_2_2_5_RELEASE:1.1.1.1
	bsd_44_lite_2:1.1.1.1
	RELENG_2_2_2_RELEASE:1.1.1.1
	RELENG_2_2_1_RELEASE:1.1.1.1
	RELENG_2_2_0_RELEASE:1.1.1.1
	RELENG_2_1_7_RELEASE:1.1.1.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1
	RELENG_2_1_6_RELEASE:1.1.1.1
	RELENG_2_2:1.1.1.1.0.8
	RELENG_2_2_BP:1.1.1.1
	RELENG_2_1_5_RELEASE:1.1.1.1
	RELENG_2_1_0_RELEASE:1.1.1.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.10
date	2012.11.17.01.54.31;	author svnexp;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2010.09.24.10.40.17;	author marius;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2010.09.23.14.06.15;	author marius;	state Exp;
branches;
next	1.7;

1.7
date	2010.09.23.10.03.03;	author marius;	state Exp;
branches;
next	1.6;

1.6
date	2010.05.04.06.13.17;	author imp;	state Exp;
branches;
next	1.5;

1.5
date	2002.02.08.23.07.35;	author markm;	state Exp;
branches
	1.5.14.1
	1.5.24.1
	1.5.30.1
	1.5.32.1
	1.5.34.1
	1.5.36.1
	1.5.38.1;
next	1.4;

1.4
date	2001.12.11.23.43.15;	author markm;	state Exp;
branches;
next	1.3;

1.3
date	2001.10.19.12.15.56;	author bde;	state Exp;
branches;
next	1.2;

1.2
date	2001.10.19.00.23.07;	author mdodd;	state Exp;
branches;
next	1.1;

1.1
date	94.05.27.12.32.50;	author rgrimes;	state Exp;
branches
	1.1.1.1;
next	;

1.10.2.1
date	2012.11.17.01.54.31;	author svnexp;	state dead;
branches;
next	1.10.2.2;

1.10.2.2
date	2013.03.28.13.06.09;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.9.2.1.2.1
	1.9.2.1.4.1;
next	1.9.2.2;

1.9.2.2
date	2012.11.17.11.37.41;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.9.2.1.2.2;

1.9.2.1.2.2
date	2012.11.17.08.37.37;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.9.2.1.4.2;

1.9.2.1.4.2
date	2012.11.17.08.48.29;	author svnexp;	state Exp;
branches;
next	;

1.5.14.1
date	2012.11.17.07.45.57;	author svnexp;	state Exp;
branches;
next	;

1.5.24.1
date	2010.09.22.21.54.16;	author marius;	state Exp;
branches;
next	1.5.24.2;

1.5.24.2
date	2010.10.04.19.40.01;	author marius;	state Exp;
branches;
next	1.5.24.3;

1.5.24.3
date	2010.10.04.19.51.16;	author marius;	state Exp;
branches;
next	1.5.24.4;

1.5.24.4
date	2010.10.04.19.59.11;	author marius;	state Exp;
branches
	1.5.24.4.2.1;
next	1.5.24.5;

1.5.24.5
date	2012.11.17.08.08.44;	author svnexp;	state Exp;
branches;
next	;

1.5.24.4.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.5.24.4.2.2;

1.5.24.4.2.2
date	2012.11.17.08.17.44;	author svnexp;	state Exp;
branches;
next	;

1.5.30.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.5.32.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.5.34.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.5.36.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.5.36.1.2.1
	1.5.36.1.4.1;
next	1.5.36.2;

1.5.36.2
date	2010.09.22.21.54.13;	author marius;	state Exp;
branches;
next	1.5.36.3;

1.5.36.3
date	2010.10.04.19.39.51;	author marius;	state Exp;
branches;
next	1.5.36.4;

1.5.36.4
date	2010.10.04.19.51.15;	author marius;	state Exp;
branches;
next	1.5.36.5;

1.5.36.5
date	2010.10.04.19.59.08;	author marius;	state Exp;
branches
	1.5.36.5.2.1
	1.5.36.5.4.1;
next	1.5.36.6;

1.5.36.6
date	2012.11.17.10.37.19;	author svnexp;	state Exp;
branches;
next	;

1.5.36.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.5.36.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.5.36.5.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.5.36.5.4.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.5.36.5.4.2;

1.5.36.5.4.2
date	2012.11.17.08.25.52;	author svnexp;	state Exp;
branches;
next	;

1.5.38.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.1.1
date	94.05.27.12.32.51;	author rgrimes;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Switching exporter and resync
@
text
@#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
# $FreeBSD: head/usr.bin/tftp/Makefile 213099 2010-09-24 10:40:17Z marius $

.PATH: ${.CURDIR}/../../libexec/tftpd

PROG=	tftp
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+=	tftp-utils.c tftp.c
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
DPADD=	${LIBEDIT} ${LIBTERMCAP}
LDADD=	-ledit -ltermcap

.include <bsd.prog.mk>
@


1.10.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:09 +0000
@
text
@d1 13
@


1.10.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
# $FreeBSD: releng/8.4/usr.bin/tftp/Makefile 213417 2010-10-04 19:59:08Z marius $

.PATH: ${.CURDIR}/../../libexec/tftpd

PROG=	tftp
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+=	tftp-utils.c tftp.c
WARNS=	6
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
DPADD=	${LIBEDIT} ${LIBTERMCAP}
LDADD=	-ledit -ltermcap

.include <bsd.prog.mk>
@


1.9
log
@SVN rev 213099 on 2010-09-24 10:40:17Z by marius

Make WARNS=6 clean.

MFC after:	1 week
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.9.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.9.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/usr.bin/tftp/Makefile 213099 2010-09-24 10:40:17Z marius $
@


1.9.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.9.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/usr.bin/tftp/Makefile 213099 2010-09-24 10:40:17Z marius $
@


1.9.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.9.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/usr.bin/tftp/Makefile 213099 2010-09-24 10:40:17Z marius $
@


1.8
log
@SVN rev 213075 on 2010-09-23 14:06:15Z by marius

Try to adhere to style.Makefile(5).

MFC after:	3 days
@
text
@d4 1
a4 1
.PATH:  ${.CURDIR}/../../libexec/tftpd
a8 1
WARNS=	3
@


1.7
log
@SVN rev 213053 on 2010-09-23 10:03:03Z by marius

Remove an explicit assignment of the CFLAGS variable intended for
debugging purposes only.

MFC after:	3 days
@
text
@d4 5
d10 1
a10 2
PROG=	tftp
SRCS=	main.c tftp.c tftp-utils.c tftp-io.c tftp-file.c tftp-transfer.c tftp-options.c
a12 2
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -I${.CURDIR}/../../usr.bin/tftp
.PATH:  ${.CURDIR}/../../libexec/tftpd
@


1.6
log
@SVN rev 207607 on 2010-05-04 06:13:17Z by imp

Go ahead and merge the work edwin@@ on tftpd into the tree.  It is a
lot better than what's in the tree now.  Edwin tested it at a prior
employer, but can't test it today.  I've found that it works a lot
better with the various uboot versions that I've used in my embedded
work.  Here's the pkg-descr from the port that describes the changes:

It all started when we got some new routers, which told me the
following when trying to upload configuration or download images
from it: The TFTP server doesn't support the blocksize option.

My curiousity was triggered, it took me some reading of RFCs and
other documentation to find out what was possible and what could
be done. Was plain TFTP very simple in its handshake, TFTP with
options was kind of messy because of its backwards capability: The
first packet returned could either be an acknowledgement of options,
or the first data packet.

Going through the source code of src/libexec/tftpd and going through
the code of src/usr.bin/tftp showed that there was a lot of duplicate
code, and the addition of options would only increase the amount
of duplicate code. After all, both the client and the server can
act as a sender and receiver.

At the end, it ended up with a nearly complete rewrite of the tftp
client and server. It has been tested against the following TFTP
clients and servers:

- Itself (yay!)
- The standard FreeBSD tftp client and server
- The Fedora Core 6 tftp client and server
- Cisco router tftp client
- Extreme Networks tftp client

It supports the following RFCs:

RFC1350 - THE TFTP PROTOCOL (REVISION 2)
RFC2347 - TFTP Option Extension
RFC2348 - TFTP Blocksize Option
RFC2349 - TFTP Timeout Interval and Transfer Size Options
RFC3617 - Uniform Resource Identifier (URI) Scheme and Applicability
          Statement for the Trivial File Transfer Protocol (TFTP)

It supports the following unofficial TFTP Options as described at
http://www.compuphase.com/tftp.htm:

blksize2 - Block size restricted to powers of 2, excluding protocol headers
rollover - Block counter roll-over (roll back to zero or to one)

From the tftp program point of view the following things are changed:

- New commands: "blocksize", "blocksize2", "rollover" and "options"
- Development features: "debug" and "packetdrop"

If you try this tftp/tftpd implementation, please let me know if
it works (or doesn't work) and against which implementaion so I can
get a list of confirmed working systems.

Author: Edwin Groothuis <edwin@@FreeBSD.org>
@
text
@a3 1
CFLAGS=-g -Wall
@


1.5
log
@Remove NO_WERRORs and WARNS=n's. To be revisited after GCC3.
@
text
@d4 2
d7 1
a7 1
SRCS=	main.c tftp.c tftpsubs.c
d10 2
@


1.5.14.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/usr.bin/tftp/Makefile 90416 2002-02-08 23:07:37Z markm $
@


1.5.24.1
log
@SVN rev 213037 on 2010-09-22 21:54:16Z by marius

MFC: r207607, r207621, r209112, r209550, r209551

Go ahead and merge the work edwin@@ on tftpd into the tree.  It is a
lot better than what's in the tree now.  Edwin tested it at a prior
employer, but can't test it today.  I've found that it works a lot
better with the various uboot versions that I've used in my embedded
work.  Here's the pkg-descr from the port that describes the changes:

It all started when we got some new routers, which told me the
following when trying to upload configuration or download images
from it: The TFTP server doesn't support the blocksize option.

My curiousity was triggered, it took me some reading of RFCs and
other documentation to find out what was possible and what could
be done. Was plain TFTP very simple in its handshake, TFTP with
options was kind of messy because of its backwards capability: The
first packet returned could either be an acknowledgement of options,
or the first data packet.

Going through the source code of src/libexec/tftpd and going through
the code of src/usr.bin/tftp showed that there was a lot of duplicate
code, and the addition of options would only increase the amount
of duplicate code. After all, both the client and the server can
act as a sender and receiver.

At the end, it ended up with a nearly complete rewrite of the tftp
client and server. It has been tested against the following TFTP
clients and servers:

- Itself (yay!)
- The standard FreeBSD tftp client and server
- The Fedora Core 6 tftp client and server
- Cisco router tftp client
- Extreme Networks tftp client

It supports the following RFCs:

RFC1350 - THE TFTP PROTOCOL (REVISION 2)
RFC2347 - TFTP Option Extension
RFC2348 - TFTP Blocksize Option
RFC2349 - TFTP Timeout Interval and Transfer Size Options
RFC3617 - Uniform Resource Identifier (URI) Scheme and Applicability
          Statement for the Trivial File Transfer Protocol (TFTP)

It supports the following unofficial TFTP Options as described at
http://www.compuphase.com/tftp.htm:

blksize2 - Block size restricted to powers of 2, excluding protocol headers
rollover - Block counter roll-over (roll back to zero or to one)

From the tftp program point of view the following things are changed:

- New commands: "blocksize", "blocksize2", "rollover" and "options"
- Development features: "debug" and "packetdrop"

If you try this tftp/tftpd implementation, please let me know if
it works (or doesn't work) and against which implementaion so I can
get a list of confirmed working systems.

Author: Edwin Groothuis <edwin@@FreeBSD.org>
@
text
@a3 2
CFLAGS=-g -Wall
WARNS=	3
d5 1
a5 1
SRCS=	main.c tftp.c tftp-utils.c tftp-io.c tftp-file.c tftp-transfer.c tftp-options.c
a7 2
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -I${.CURDIR}/../../usr.bin/tftp
.PATH:  ${.CURDIR}/../../libexec/tftpd
@


1.5.24.2
log
@SVN rev 213414 on 2010-10-04 19:40:01Z by marius

MFC: r213053

Remove an explicit assignment of the CFLAGS variable intended for
debugging purposes only.
@
text
@d4 1
@


1.5.24.3
log
@SVN rev 213416 on 2010-10-04 19:51:16Z by marius

MFC: r213075

Try to adhere to style.Makefile(5).
@
text
@d4 1
a4 2
.PATH:  ${.CURDIR}/../../libexec/tftpd

d6 1
a6 4
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+=	tftp-utils.c tftp.c
WARNS=	3
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
d9 2
@


1.5.24.4
log
@SVN rev 213418 on 2010-10-04 19:59:11Z by marius

MFC: r213099

Make WARNS=6 clean.
@
text
@d4 1
a4 1
.PATH: ${.CURDIR}/../../libexec/tftpd
d9 1
a9 1
WARNS=	6
@


1.5.24.5
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/usr.bin/tftp/Makefile 213418 2010-10-04 19:59:11Z marius $
@


1.5.24.4.2.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.5.24.4.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/usr.bin/tftp/Makefile 213418 2010-10-04 19:59:11Z marius $
@


1.5.38.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.5.36.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.5.36.2
log
@SVN rev 213036 on 2010-09-22 21:54:13Z by marius

MFC: r207607, r207621, r209112, r209550, r209551

Go ahead and merge the work edwin@@ on tftpd into the tree.  It is a
lot better than what's in the tree now.  Edwin tested it at a prior
employer, but can't test it today.  I've found that it works a lot
better with the various uboot versions that I've used in my embedded
work.  Here's the pkg-descr from the port that describes the changes:

It all started when we got some new routers, which told me the
following when trying to upload configuration or download images
from it: The TFTP server doesn't support the blocksize option.

My curiousity was triggered, it took me some reading of RFCs and
other documentation to find out what was possible and what could
be done. Was plain TFTP very simple in its handshake, TFTP with
options was kind of messy because of its backwards capability: The
first packet returned could either be an acknowledgement of options,
or the first data packet.

Going through the source code of src/libexec/tftpd and going through
the code of src/usr.bin/tftp showed that there was a lot of duplicate
code, and the addition of options would only increase the amount
of duplicate code. After all, both the client and the server can
act as a sender and receiver.

At the end, it ended up with a nearly complete rewrite of the tftp
client and server. It has been tested against the following TFTP
clients and servers:

- Itself (yay!)
- The standard FreeBSD tftp client and server
- The Fedora Core 6 tftp client and server
- Cisco router tftp client
- Extreme Networks tftp client

It supports the following RFCs:

RFC1350 - THE TFTP PROTOCOL (REVISION 2)
RFC2347 - TFTP Option Extension
RFC2348 - TFTP Blocksize Option
RFC2349 - TFTP Timeout Interval and Transfer Size Options
RFC3617 - Uniform Resource Identifier (URI) Scheme and Applicability
          Statement for the Trivial File Transfer Protocol (TFTP)

It supports the following unofficial TFTP Options as described at
http://www.compuphase.com/tftp.htm:

blksize2 - Block size restricted to powers of 2, excluding protocol headers
rollover - Block counter roll-over (roll back to zero or to one)

From the tftp program point of view the following things are changed:

- New commands: "blocksize", "blocksize2", "rollover" and "options"
- Development features: "debug" and "packetdrop"

If you try this tftp/tftpd implementation, please let me know if
it works (or doesn't work) and against which implementaion so I can
get a list of confirmed working systems.

Author: Edwin Groothuis <edwin@@FreeBSD.org>
@
text
@a3 2
CFLAGS=-g -Wall
WARNS=	3
d5 1
a5 1
SRCS=	main.c tftp.c tftp-utils.c tftp-io.c tftp-file.c tftp-transfer.c tftp-options.c
a7 2
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -I${.CURDIR}/../../usr.bin/tftp
.PATH:  ${.CURDIR}/../../libexec/tftpd
@


1.5.36.3
log
@SVN rev 213413 on 2010-10-04 19:39:51Z by marius

MFC: r213053

Remove an explicit assignment of the CFLAGS variable intended for
debugging purposes only.
@
text
@d4 1
@


1.5.36.4
log
@SVN rev 213415 on 2010-10-04 19:51:15Z by marius

MFC: 213075

Try to adhere to style.Makefile(5).
@
text
@d4 1
a4 2
.PATH:  ${.CURDIR}/../../libexec/tftpd

d6 1
a6 4
SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+=	tftp-utils.c tftp.c
WARNS=	3
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
d9 2
@


1.5.36.5
log
@SVN rev 213417 on 2010-10-04 19:59:08Z by marius

MFC: r213099

Make WARNS=6 clean.
@
text
@d4 1
a4 1
.PATH: ${.CURDIR}/../../libexec/tftpd
d9 1
a9 1
WARNS=	6
@


1.5.36.6
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.bin/tftp/Makefile 213417 2010-10-04 19:59:08Z marius $
@


1.5.36.5.4.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.36.5.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/usr.bin/tftp/Makefile 213417 2010-10-04 19:59:08Z marius $
@


1.5.36.5.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.5.36.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.5.36.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.5.34.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.5.32.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.30.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.4
log
@WARNS=2 fixes. NO_WERROR set as there are some hard-to-fix
signed/unsigned comparisons. Use __FBSDID().
@
text
@a5 1
NO_WERROR=yes
@


1.3
log
@Fixed missing DPADD and misplaced $FreeBSD$ in previous commit.
@
text
@d6 1
@


1.2
log
@Add libedit support to tftp.
@
text
@d1 1
a2 1
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
d6 1
@


1.1
log
@Initial revision
@
text
@d1 1
d6 1
@


1.1.1.1
log
@BSD 4.4 Lite Usr.bin Sources
@
text
@@
