From 6c9745e5cbb396895a337d937b1f095f6d7426ac Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 23 Aug 2010 03:22:25 -0700 Subject: [PATCH] Clean up handling of tftp.h. Don't include the win32/Include/Arpa copy in print-udp.c; don't put that copy into the release tarball; and don't talk about , or work around its deficiencies in some OSes, as we no longer include it, we include our own tftp.h, which has a th_stuff array in its structure definition. --- Makefile.in | 1 - print-tftp.c | 8 ---- print-udp.c | 1 - win32/Include/Arpa/tftp.h | 84 --------------------------------------- 4 files changed, 94 deletions(-) delete mode 100644 win32/Include/Arpa/tftp.h diff --git a/Makefile.in b/Makefile.in index ba6a97d4..06f91271 100644 --- a/Makefile.in +++ b/Makefile.in @@ -339,7 +339,6 @@ EXTRA_DIST = \ tests/print-xx.out \ tests/rsvp-infinite-loop.pcap \ vfprintf.c \ - win32/Include/Arpa/tftp.h \ win32/Include/bittypes.h \ win32/Include/errno.h \ win32/Include/getopt.h \ diff --git a/print-tftp.c b/print-tftp.c index 0caff428..84cde396 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -99,15 +99,7 @@ tftp_print(register const u_char *bp, u_int length) case RRQ: case WRQ: case OACK: - /* - * XXX Not all arpa/tftp.h's specify th_stuff as any - * array; use address of th_block instead - */ -#ifdef notdef p = (u_char *)tp->th_stuff; -#else - p = (u_char *)&tp->th_block; -#endif putchar(' '); /* Print filename or first option */ if (opcode != OACK) diff --git a/print-udp.c b/print-udp.c index 0f1528e0..d71e4d3a 100644 --- a/print-udp.c +++ b/print-udp.c @@ -33,7 +33,6 @@ static const char rcsid[] _U_ = #ifdef SEGSIZE #undef SEGSIZE #endif -#include #include #include diff --git a/win32/Include/Arpa/tftp.h b/win32/Include/Arpa/tftp.h deleted file mode 100644 index 6f21045b..00000000 --- a/win32/Include/Arpa/tftp.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 THE REGENTS 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. - * - * @(#)tftp.h 8.1 (Berkeley) 6/2/93 - */ - -#ifndef _ARPA_TFTP_H -#define _ARPA_TFTP_H - -/* - * Trivial File Transfer Protocol (IEN-133) - */ -#define SEGSIZE 512 /* data segment size */ - -/* - * Packet types. - */ -#define RRQ 01 /* read request */ -#define WRQ 02 /* write request */ -#define DATA 03 /* data packet */ -#define ACK 04 /* acknowledgement */ - -#ifdef ERROR -#undef ERROR -#define ERROR 05 /* error code */ -#endif - -struct tftphdr { - short th_opcode; /* packet type */ - union { - short tu_block; /* block # */ - short tu_code; /* error code */ - char tu_stuff[1]; /* request packet stuff */ - } th_u; - char th_data[1]; /* data or error string */ -}; - -#define th_block th_u.tu_block -#define th_code th_u.tu_code -#define th_stuff th_u.tu_stuff -#define th_msg th_data - -/* - * Error codes. - */ -#define EUNDEF 0 /* not defined */ -#define ENOTFOUND 1 /* file not found */ -#define EACCESS 2 /* access violation */ -#define ENOSPACE 3 /* disk full or allocation exceeded */ -#define EBADOP 4 /* illegal TFTP operation */ -#define EBADID 5 /* unknown transfer ID */ -#define EEXISTS 6 /* file already exists */ -#define ENOUSER 7 /* no such user */ - -#endif /* _ARPA_TFTP_H */