From owner-cvs-src-old@FreeBSD.ORG Wed Sep 22 21:54:44 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A031065715 for ; Wed, 22 Sep 2010 21:54:44 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C46458FC1D for ; Wed, 22 Sep 2010 21:54:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o8MLsiWp075639 for ; Wed, 22 Sep 2010 21:54:44 GMT (envelope-from marius@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o8MLsisK075638 for cvs-src-old@freebsd.org; Wed, 22 Sep 2010 21:54:44 GMT (envelope-from marius@repoman.freebsd.org) Message-Id: <201009222154.o8MLsisK075638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to marius@repoman.freebsd.org using -f From: Marius Strobl Date: Wed, 22 Sep 2010 21:54:30 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/libexec/tftpd Makefile tftp-file.c tftp-file.h tftp-io.c tftp-io.h tftp-options.c tftp-options.h tftp-transfer.c tftp-transfer.h tftp-utils.c tftp-utils.h tftpd.8 tftpd.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2010 21:54:45 -0000 marius 2010-09-22 21:54:30 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) libexec/tftpd Makefile tftpd.8 tftpd.c Added files: (Branch: RELENG_8) libexec/tftpd tftp-file.c tftp-file.h tftp-io.c tftp-io.h tftp-options.c tftp-options.h tftp-transfer.c tftp-transfer.h tftp-utils.c tftp-utils.h Log: SVN rev 213038 on 2010-09-22 21:54:30Z by marius MFC: r207608, r207614, r212651, r212665 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 Revision Changes Path 1.10.2.2 +5 -4 src/libexec/tftpd/Makefile 1.1.2.2 +257 -0 src/libexec/tftpd/tftp-file.c (new) 1.1.2.2 +37 -0 src/libexec/tftpd/tftp-file.h (new) 1.2.2.2 +477 -0 src/libexec/tftpd/tftp-io.c (new) 1.1.2.2 +47 -0 src/libexec/tftpd/tftp-io.h (new) 1.1.2.2 +390 -0 src/libexec/tftpd/tftp-options.c (new) 1.1.2.2 +62 -0 src/libexec/tftpd/tftp-options.h (new) 1.1.2.2 +318 -0 src/libexec/tftpd/tftp-transfer.c (new) 1.1.2.2 +31 -0 src/libexec/tftpd/tftp-transfer.h (new) 1.1.2.2 +320 -0 src/libexec/tftpd/tftp-utils.c (new) 1.1.2.2 +124 -0 src/libexec/tftpd/tftp-utils.h (new) 1.23.2.3 +14 -3 src/libexec/tftpd/tftpd.8 1.38.2.2 +336 -494 src/libexec/tftpd/tftpd.c