From owner-svn-src-user@FreeBSD.ORG Fri Oct 17 22:26:38 2008 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DFE61065688; Fri, 17 Oct 2008 22:26:38 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D22D8FC18; Fri, 17 Oct 2008 22:26:38 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HMQcUJ099421; Fri, 17 Oct 2008 22:26:38 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HMQcpI099420; Fri, 17 Oct 2008 22:26:38 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810172226.m9HMQcpI099420@svn.freebsd.org> From: Edwin Groothuis <edwin@FreeBSD.org> Date: Fri, 17 Oct 2008 22:26:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183993 - user/edwin/tftpd/usr.bin/tftp X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 17 Oct 2008 22:26:38 -0000 Author: edwin Date: Fri Oct 17 22:26:38 2008 New Revision: 183993 URL: http://svn.freebsd.org/changeset/base/183993 Log: Add OP_ prefixes to packet types as defined in arpa/tftp.h. Add TFTP_ prefixes to error codes as defined in arpa/tftp.h. This all to avoid confusion (which is a good thing!) Submitted by: netchild@, rink@ and others Modified: user/edwin/tftpd/usr.bin/tftp/tftp.c Modified: user/edwin/tftpd/usr.bin/tftp/tftp.c ============================================================================== --- user/edwin/tftpd/usr.bin/tftp/tftp.c Fri Oct 17 22:19:08 2008 (r183992) +++ user/edwin/tftpd/usr.bin/tftp/tftp.c Fri Oct 17 22:26:38 2008 (r183993) @@ -134,7 +134,7 @@ xmitfile(int peer, char *port, int fd, c printf("Transfer timed out.\n"); return; } - if (rp->th_opcode == ERROR) { + if (rp->th_opcode == OP_ERROR) { printf("Got ERROR, aborted\n"); return; } @@ -143,10 +143,10 @@ xmitfile(int peer, char *port, int fd, c * If the first packet is an OACK instead of an ACK packet, * handle it different. */ - if (rp->th_opcode == OACK) { + if (rp->th_opcode == OP_OACK) { if (!options_rfc_enabled) { printf("Got OACK while options are not enabled!\n"); - send_error(peer, EBADOP); + send_error(peer, TFTP_EBADOP); return; } @@ -230,7 +230,7 @@ recvfile(int peer, char *port, int fd, c break; } - if (rp->th_opcode == ERROR) { + if (rp->th_opcode == OP_ERROR) { tftp_log(LOG_ERR, "Error code %d: %s", rp->th_code, rp->th_msg); return; } @@ -246,10 +246,10 @@ recvfile(int peer, char *port, int fd, c * If the first packet is an OACK packet instead of an DATA packet, * handle it different. */ - if (rp->th_opcode == OACK) { + if (rp->th_opcode == OP_OACK) { if (!options_rfc_enabled) { printf("Got OACK while options are not enabled!\n"); - send_error(peer, EBADOP); + send_error(peer, TFTP_EBADOP); return; }