diff options
| author | guy <guy> | 2003-11-16 09:36:07 +0000 |
|---|---|---|
| committer | guy <guy> | 2003-11-16 09:36:07 +0000 |
| commit | bbc1cfa669a5f51ed26bae3784447076e3fbc80f (patch) | |
| tree | fdeeb32833758e397bf3a06c41b99e09b22dbefb | |
| parent | 7d83ad1ef841c59ec7138413ea5b925de396950b (diff) | |
| download | tcpdump-bbc1cfa669a5f51ed26bae3784447076e3fbc80f.tar.gz | |
Have the configure script arrange that the Makefile define _U_
appropriately, and that GNUmakefile and the MSVC++ project file define
it apppriately, as we do with libpcap, rather than defining it in
"interface.h".
Undo the rcsid-shuffling and addition of extra #includes, as we no
longer need to arrange that "interface.h" be included before using _U_
in an RCS ID or copyright.
116 files changed, 454 insertions, 509 deletions
diff --git a/Makefile.in b/Makefile.in index 1a582d5d..13900d6e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.276 2003-10-27 10:13:45 hannes Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.277 2003-11-16 09:36:07 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -43,7 +43,7 @@ CC = @CC@ PROG = tcpdump CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ -DEFS = @DEFS@ +DEFS = @DEFS@ @V_DEFS@ # Standard CFLAGS CFLAGS = $(CCOPT) $(DEFS) $(INCLS) @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.98 2003-11-04 07:29:15 guy Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.99 2003-11-16 09:36:08 guy Exp $ (LBL) dnl dnl Copyright (c) 1995, 1996, 1997, 1998 dnl The Regents of the University of California. All rights reserved. @@ -1193,6 +1193,9 @@ ac_cv___attribute__=yes, ac_cv___attribute__=no)]) if test "$ac_cv___attribute__" = "yes"; then AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__]) + V_DEFS="$V_DEFS -D_U_=\"__attribute__((unused))\"" +else + V_DEFS="$V_DEFS -D_U_=\"\"" fi AC_MSG_RESULT($ac_cv___attribute__) ]) diff --git a/addrtoname.c b/addrtoname.c index 797dcd0c..d7f1a84a 100644 --- a/addrtoname.c +++ b/addrtoname.c @@ -21,6 +21,10 @@ * Internet, ethernet, port, and protocol string to address * and address to string conversion routines */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.98 2003-11-16 09:36:08 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,10 +56,6 @@ struct rtentry; /* declarations in <net/if.h> */ #include "llc.h" #include "setsignal.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.97 2003-11-15 00:39:12 guy Exp $ (LBL)"; -#endif /* * hash tables for whatever-to-name translations * @@ -18,6 +18,10 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.16 2003-11-16 09:36:08 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,10 +34,6 @@ #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.15 2003-11-15 00:39:12 guy Exp $ (LBL)"; -#endif void bpf_dump(struct bpf_program *p, int option) { diff --git a/configure.in b/configure.in index 0532c1c2..99b3e525 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.169 2003-08-01 01:18:24 fenner Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.170 2003-11-16 09:36:09 guy Exp $ (LBL) dnl dnl Copyright (c) 1994, 1995, 1996, 1997 dnl The Regents of the University of California. All rights reserved. @@ -6,7 +6,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.169 $) +AC_REVISION($Revision: 1.170 $) AC_PREREQ(2.13) AC_INIT(tcpdump.c) @@ -732,6 +732,7 @@ fi ]) AC_SUBST(V_CCOPT) +AC_SUBST(V_DEFS) AC_SUBST(V_GROUP) AC_SUBST(V_INCLS) AC_SUBST(V_PCAPDEP) @@ -13,6 +13,10 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.4 2003-11-16 09:36:09 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -22,10 +26,6 @@ #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.3 2003-11-15 00:39:13 guy Exp $ (LBL)"; -#endif /* rfc3471 */ struct tok gmpls_link_prot_values[] = { { 0x01, "Extra Traffic"}, diff --git a/gmt2local.c b/gmt2local.c index 067812a1..1fe0e8a9 100644 --- a/gmt2local.c +++ b/gmt2local.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.9 2003-11-16 09:36:09 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -26,14 +30,6 @@ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.8 2003-11-15 00:39:13 guy Exp $ (LBL)"; -#endif - #include <stdio.h> #ifdef HAVE_OS_PROTO_H diff --git a/interface.h b/interface.h index 2c282126..c479a756 100644 --- a/interface.h +++ b/interface.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217 2003-11-05 06:02:58 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.218 2003-11-16 09:36:10 guy Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -32,8 +32,6 @@ #define __attribute__(x) #endif -#define _U_ __attribute__((unused)) - /* snprintf et al */ #include <stdarg.h> @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.12 2003-11-16 09:36:10 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,14 +36,6 @@ */ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.11 2003-11-15 00:39:13 guy Exp $ (LBL)"; -#endif - #ifndef HAVE___ATTRIBUTE__ #define __attribute__(x) #endif /* HAVE___ATTRIBUTE__ */ diff --git a/missing/datalinks.c b/missing/datalinks.c index 36eb1c46..1bd86448 100644 --- a/missing/datalinks.c +++ b/missing/datalinks.c @@ -31,19 +31,17 @@ * SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.3 2003-11-16 09:36:47 guy Exp $ (LBL)"; +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif #include <tcpdump-stdinc.h> -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.2 2003-11-15 00:39:46 guy Exp $ (LBL)"; -#endif - #include <pcap.h> #include <stdlib.h> #include <stdio.h> diff --git a/missing/dlnames.c b/missing/dlnames.c index 9dececf6..e2623b04 100644 --- a/missing/dlnames.c +++ b/missing/dlnames.c @@ -31,6 +31,10 @@ * SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.4 2003-11-16 09:36:47 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,14 +42,6 @@ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.3 2003-11-15 00:39:47 guy Exp $ (LBL)"; -#endif - #include <pcap.h> #include <string.h> diff --git a/missing/getaddrinfo.c b/missing/getaddrinfo.c index e37f9363..f59b2c4e 100644 --- a/missing/getaddrinfo.c +++ b/missing/getaddrinfo.c @@ -49,14 +49,9 @@ #include <config.h> #endif -#include "tcpdump-stdinc.h" - -#include "interface.h" - - #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.12 2003-11-15 00:39:47 guy Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.13 2003-11-16 09:36:48 guy Exp $"; #endif #include <sys/types.h> diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c index f37e6b13..c287221c 100644 --- a/missing/getnameinfo.c +++ b/missing/getnameinfo.c @@ -41,14 +41,9 @@ #include <config.h> #endif -#include "tcpdump-stdinc.h" - -#include "interface.h" - - #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.10 2003-11-15 00:39:47 guy Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.11 2003-11-16 09:36:49 guy Exp $"; #endif #include <sys/types.h> diff --git a/missing/inet_aton.c b/missing/inet_aton.c index a35312a8..bc1461aa 100644 --- a/missing/inet_aton.c +++ b/missing/inet_aton.c @@ -36,19 +36,15 @@ * SUCH DAMAGE. */ -/* $Id: inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $ */ - - -#include <tcpdump-stdinc.h> - - -#include "interface.h" +/* $Id: inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $"; #endif +#include <tcpdump-stdinc.h> + /* Minimal implementation of inet_aton. * Cannot distinguish between failure and a local broadcast address. */ diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c index 0c2a4877..30dff51e 100644 --- a/missing/inet_ntop.c +++ b/missing/inet_ntop.c @@ -36,19 +36,15 @@ * SUCH DAMAGE. */ -/* $Id: inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $ */ - - -#include <tcpdump-stdinc.h> - - -#include "interface.h" +/* $Id: inet_ntop.c,v 1.7 2003-11-16 09:36:50 guy Exp $ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.7 2003-11-16 09:36:50 guy Exp $"; #endif +#include <tcpdump-stdinc.h> + #include <stdio.h> #include <errno.h> diff --git a/missing/inet_pton.c b/missing/inet_pton.c index 5d35bc80..83f67e1e 100644 --- a/missing/inet_pton.c +++ b/missing/inet_pton.c @@ -36,19 +36,15 @@ * SUCH DAMAGE. */ -/* $Id: inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $ */ - - -#include <tcpdump-stdinc.h> - - -#include "interface.h" +/* $Id: inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $"; #endif +#include <tcpdump-stdinc.h> + #include <errno.h> int diff --git a/missing/snprintf.c b/missing/snprintf.c index 4a6bf11d..79329977 100644 --- a/missing/snprintf.c +++ b/missing/snprintf.c @@ -31,12 +31,16 @@ * SUCH DAMAGE. */ -/* $Id: snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $ */ +/* $Id: snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $"; +#endif #include <stdio.h> #include <stdarg.h> @@ -47,10 +51,6 @@ #include <interface.h> -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $"; -#endif enum format_flags { minus_flag = 1, plus_flag = 2, diff --git a/missing/strlcat.c b/missing/strlcat.c index 1497883e..a3d3face 100644 --- a/missing/strlcat.c +++ b/missing/strlcat.c @@ -28,6 +28,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.5 2003-11-16 09:36:51 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include <config.h> @@ -35,14 +39,6 @@ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)"; -#endif - #include <string.h> /* diff --git a/missing/strlcpy.c b/missing/strlcpy.c index dec09fe7..a92e4d13 100644 --- a/missing/strlcpy.c +++ b/missing/strlcpy.c @@ -28,6 +28,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.5 2003-11-16 09:36:52 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include <config.h> @@ -35,14 +39,6 @@ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)"; -#endif - #include <string.h> /* diff --git a/parsenfsfh.c b/parsenfsfh.c index 7f2e4471..d8f42893 100644 --- a/parsenfsfh.c +++ b/parsenfsfh.c @@ -40,6 +40,10 @@ * Western Research Laboratory */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.27 2003-11-16 09:36:11 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -53,10 +57,6 @@ #include "interface.h" #include "nfsfh.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.26 2003-11-15 00:39:13 guy Exp $ (LBL)"; -#endif /* * This routine attempts to parse a file handle (in network byte order), * using heuristics to guess what kind of format it is in. See the diff --git a/print-802_11.c b/print-802_11.c index 0d0865a9..7d3438c8 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -20,6 +20,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.24 2003-11-16 09:36:11 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.23 2003-11-15 00:39:14 guy Exp $ (LBL)"; -#endif #include "extract.h" #include "ieee802_11.h" @@ -21,6 +21,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.21 2003-11-16 09:36:11 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.20 2003-11-15 00:39:14 guy Exp $ (LBL)"; -#endif int ah_print(register const u_char *bp) { diff --git a/print-aodv.c b/print-aodv.c index fa4a6ed4..b1539a9a 100644 --- a/print-aodv.c +++ b/print-aodv.c @@ -30,6 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.10 2003-11-16 09:36:12 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,10 +50,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.9 2003-11-15 00:39:14 guy Exp $ (LBL)"; -#endif #include "aodv.h" static void diff --git a/print-arcnet.c b/print-arcnet.c index d404e8d2..2c9d4e8e 100644 --- a/print-arcnet.c +++ b/print-arcnet.c @@ -20,6 +20,10 @@ * * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.17 2003-11-16 09:36:12 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "interface.h" #include "arcnet.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.16 2003-11-15 00:39:15 guy Exp $ (LBL)"; -#endif static int arcnet_encap_print(u_char arctype, const u_char *p, u_int length, u_int caplen); diff --git a/print-arp.c b/print-arp.c index 31926654..3393c716 100644 --- a/print-arp.c +++ b/print-arp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.63 2003-11-16 09:36:12 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "ethertype.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.62 2003-11-15 00:39:15 guy Exp $ (LBL)"; -#endif /* * Address Resolution Protocol. * diff --git a/print-ascii.c b/print-ascii.c index f6d32c3f..fc6c6361 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -40,15 +40,15 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.12 2003-11-16 09:36:12 guy Exp $"; +#endif #include <tcpdump-stdinc.h> #include <stdio.h> #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.11 2003-11-15 00:39:15 guy Exp $"; -#endif #define ASCII_LINELENGTH 300 #define HEXDUMP_BYTES_PER_LINE 16 #define HEXDUMP_SHORTS_PER_LINE (HEXDUMP_BYTES_PER_LINE / 2) diff --git a/print-atalk.c b/print-atalk.c index 09518dd7..68295931 100644 --- a/print-atalk.c +++ b/print-atalk.c @@ -21,6 +21,10 @@ * Format and print AppleTalk packets. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.80 2003-11-16 09:36:13 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -39,10 +43,6 @@ #include "extract.h" /* must come after interface.h */ #include "appletalk.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.79 2003-11-15 00:39:16 guy Exp $ (LBL)"; -#endif static struct tok type2str[] = { { ddpRTMP, "rtmp" }, { ddpRTMPrequest, "rtmpReq" }, diff --git a/print-atm.c b/print-atm.c index f9731c54..aecc58b6 100644 --- a/print-atm.c +++ b/print-atm.c @@ -18,6 +18,10 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.35 2003-11-16 09:36:13 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,10 +41,6 @@ #include "atmuni31.h" #include "llc.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.34 2003-11-15 00:39:16 guy Exp $ (LBL)"; -#endif #include "ether.h" /* diff --git a/print-beep.c b/print-beep.c index edfad54f..b476dbf9 100644 --- a/print-beep.c +++ b/print-beep.c @@ -9,6 +9,10 @@ * */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.6 2003-11-16 09:36:13 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -26,10 +30,6 @@ #include "interface.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.5 2003-11-15 00:39:16 guy Exp $"; -#endif /* Check for a string but not go beyond length * Return TRUE on match, FALSE otherwise * diff --git a/print-bfd.c b/print-bfd.c index 0d5b8d90..0f8ae3b1 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -13,6 +13,10 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.5 2003-11-16 09:36:14 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,10 +31,6 @@ #include "extract.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.4 2003-11-15 00:39:16 guy Exp $"; -#endif #include "udp.h" /* diff --git a/print-bgp.c b/print-bgp.c index 90de8b08..e4b83306 100644 --- a/print-bgp.c +++ b/print-bgp.c @@ -34,6 +34,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.74 2003-11-16 09:36:15 guy Exp $"; +#endif #include <tcpdump-stdinc.h> @@ -44,10 +48,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.73 2003-11-15 00:39:17 guy Exp $"; -#endif struct bgp { u_int8_t bgp_marker[16]; u_int16_t bgp_len; diff --git a/print-bootp.c b/print-bootp.c index dbb9f370..410bde37 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -20,6 +20,10 @@ * * Format and print bootp packets. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.77 2003-11-16 09:36:15 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "ether.h" #include "bootp.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.76 2003-11-15 00:39:17 guy Exp $ (LBL)"; -#endif static void rfc1048_print(const u_char *); static void cmu_print(const u_char *); diff --git a/print-cdp.c b/print-cdp.c index 2e605fd3..fdc62e89 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -24,6 +24,10 @@ * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.21 2003-11-16 09:36:15 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,10 +42,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.20 2003-11-15 00:39:17 guy Exp $"; -#endif #define CDP_HEADER_LEN 4 static struct tok cdp_tlv_values[] = { diff --git a/print-chdlc.c b/print-chdlc.c index 786aec36..324cbffd 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.30 2003-11-16 09:36:16 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "ppp.h" #include "chdlc.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.29 2003-11-15 00:39:18 guy Exp $ (LBL)"; -#endif static void chdlc_slarp_print(const u_char *, u_int); /* Standard CHDLC printer */ diff --git a/print-cip.c b/print-cip.c index f889acf2..71889f3e 100644 --- a/print-cip.c +++ b/print-cip.c @@ -20,6 +20,10 @@ * */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.23 2003-11-16 09:36:16 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,10 +41,6 @@ #include "ethertype.h" #include "ether.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.22 2003-11-15 00:39:18 guy Exp $ (LBL)"; -#endif #define RFC1483LLC_LEN 8 static unsigned char rfcllc[] = { diff --git a/print-cnfp.c b/print-cnfp.c index 8d47e584..79552e00 100644 --- a/print-cnfp.c +++ b/print-cnfp.c @@ -32,6 +32,10 @@ /* Cisco NetFlow protocol */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.16 2003-11-16 09:36:16 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,10 +50,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.15 2003-11-15 00:39:18 guy Exp $"; -#endif #include "tcp.h" #include "ipproto.h" diff --git a/print-decnet.c b/print-decnet.c index 5a3f29fa..92feb6ac 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.38 2003-11-16 09:36:17 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,10 +46,6 @@ struct rtentry; #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.37 2003-11-15 00:39:19 guy Exp $ (LBL)"; -#endif /* Forwards */ static void print_decnet_ctlmsg(const union routehdr *, u_int); static void print_t_info(int); diff --git a/print-dhcp6.c b/print-dhcp6.c index f69a0f2a..20c50375 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -35,6 +35,10 @@ * draft-ietf-dhc-dhcpv6-opt-timeconfig-02.txt, */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.30 2003-11-16 09:36:17 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -49,10 +53,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.29 2003-11-15 01:08:37 guy Exp $"; -#endif /* lease duration */ #define DHCP6_DURATITION_INFINITE 0xffffffff diff --git a/print-domain.c b/print-domain.c index ff16d737..5a67d214 100644 --- a/print-domain.c +++ b/print-domain.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.88 2003-11-16 09:36:18 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.87 2003-11-15 00:39:19 guy Exp $ (LBL)"; -#endif static const char *ns_ops[] = { "", " inv_q", " stat", " op3", " notify", " update", " op6", " op7", " op8", " updataA", " updateD", " updateDA", diff --git a/print-dvmrp.c b/print-dvmrp.c index 3f07a26e..4b153a66 100644 --- a/print-dvmrp.c +++ b/print-dvmrp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.26 2003-11-16 09:36:19 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "extract.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.25 2003-11-15 00:39:20 guy Exp $ (LBL)"; -#endif /* * DVMRP message types and flag values shamelessly stolen from * mrouted/dvmrp.h. diff --git a/print-egp.c b/print-egp.c index f75f3d55..6dd98ffc 100644 --- a/print-egp.c +++ b/print-egp.c @@ -18,6 +18,10 @@ * Initial contribution from Jeff Honig (jch@MITCHELL.CIT.CORNELL.EDU). */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.36 2003-11-16 09:36:20 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,10 +35,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.35 2003-11-15 00:39:20 guy Exp $ (LBL)"; -#endif #include "ip.h" struct egp_packet { diff --git a/print-enc.c b/print-enc.c index 14b08f1c..e3c2ad73 100644 --- a/print-enc.c +++ b/print-enc.c @@ -21,6 +21,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.3 2003-11-16 09:36:20 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.2 2003-11-15 00:39:21 guy Exp $ (LBL)"; -#endif #include "enc.h" #define ENC_PRINT_TYPE(wh, xf, nam) \ diff --git a/print-esp.c b/print-esp.c index 7894fd48..6741e48a 100644 --- a/print-esp.c +++ b/print-esp.c @@ -21,6 +21,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.46 2003-11-16 09:36:20 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -54,10 +58,6 @@ extern char *strsep(char **stringp, const char *delim); /* Missing/strsep.c */ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.45 2003-11-15 00:39:22 guy Exp $ (LBL)"; -#endif #ifndef HAVE_SOCKADDR_STORAGE #ifdef INET6 struct sockaddr_storage { diff --git a/print-ether.c b/print-ether.c index d1a490bf..f94b608e 100644 --- a/print-ether.c +++ b/print-ether.c @@ -18,6 +18,10 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.84 2003-11-16 09:36:20 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,10 +36,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.83 2003-11-15 00:39:22 guy Exp $ (LBL)"; -#endif #include "ether.h" const u_char *snapend; diff --git a/print-fddi.c b/print-fddi.c index 3b19c3a8..164b9abe 100644 --- a/print-fddi.c +++ b/print-fddi.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.63 2003-11-16 09:36:21 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.62 2003-11-15 00:39:22 guy Exp $ (LBL)"; -#endif #include "ether.h" #include "fddi.h" @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.19 2003-11-16 09:36:21 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "ethertype.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.18 2003-11-15 00:39:22 guy Exp $ (LBL)"; -#endif static void lmi_print(const u_char *, u_int); #define NLPID_LMI 0x08 /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */ diff --git a/print-frag6.c b/print-frag6.c index 43509510..9153a9b1 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.18 2003-11-16 09:36:21 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.17 2003-11-15 00:39:23 guy Exp $"; -#endif int frag6_print(register const u_char *bp, register const u_char *bp2) { diff --git a/print-gre.c b/print-gre.c index d95e69a5..4a03dd39 100644 --- a/print-gre.c +++ b/print-gre.c @@ -36,6 +36,10 @@ * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.24 2003-11-16 09:36:21 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,10 +54,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.23 2003-11-15 00:39:23 guy Exp $ (LBL)"; -#endif #include "ip.h" #define GRE_CP 0x8000 /* checksum present */ diff --git a/print-hsrp.c b/print-hsrp.c index 199e32ac..fe49538e 100644 --- a/print-hsrp.c +++ b/print-hsrp.c @@ -29,6 +29,10 @@ /* Cisco Hot Standby Router Protocol (HSRP). */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.9 2003-11-16 09:36:22 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,10 +45,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.8 2003-11-15 00:39:24 guy Exp $"; -#endif /* HSRP op code types. */ static const char *op_code_str[] = { "hello", diff --git a/print-icmp.c b/print-icmp.c index a2b721ab..083276eb 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.75 2003-11-16 09:36:22 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.74 2003-11-15 00:39:24 guy Exp $ (LBL)"; -#endif #include "ip.h" #include "udp.h" #include "ipproto.h" diff --git a/print-icmp6.c b/print-icmp6.c index 3e565304..0585e149 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.74 2003-11-16 09:36:22 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -39,10 +43,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.73 2003-11-15 00:39:26 guy Exp $"; -#endif #include "udp.h" #include "ah.h" diff --git a/print-igmp.c b/print-igmp.c index 156780aa..37663590 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.13 2003-11-16 09:36:23 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.12 2003-11-15 00:39:26 guy Exp $ (LBL)"; -#endif #ifndef IN_CLASSD #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000) #endif diff --git a/print-igrp.c b/print-igrp.c index 53a07c52..25e33fce 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -21,6 +21,10 @@ * Initial contribution from Francis Dupont (francis.dupont@inria.fr) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.20 2003-11-16 09:36:23 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "ip.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.19 2003-11-15 00:39:26 guy Exp $ (LBL)"; -#endif static void igrp_entry_print(register struct igrprte *igr, register int is_interior, register int is_exterior) @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.130 2003-11-16 09:36:23 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "interface.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.129 2003-11-15 00:39:27 guy Exp $ (LBL)"; -#endif #include "ip.h" #include "ipproto.h" diff --git a/print-ip6.c b/print-ip6.c index e3aa0195..617ddeae 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.34 2003-11-16 09:36:24 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.33 2003-11-15 00:39:27 guy Exp $"; -#endif #include "ip6.h" #include "ipproto.h" diff --git a/print-ip6opts.c b/print-ip6opts.c index 9d80f196..759ff429 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -31,6 +31,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.16 2003-11-16 09:36:24 guy Exp $"; +#endif #ifdef INET6 #include <tcpdump-stdinc.h> @@ -43,10 +47,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.15 2003-11-15 00:39:27 guy Exp $"; -#endif /* items outside of rfc2292bis */ #ifndef IP6OPT_MINLEN #define IP6OPT_MINLEN 2 diff --git a/print-ipcomp.c b/print-ipcomp.c index 53c913c0..89bcac70 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.19 2003-11-16 09:36:24 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -43,10 +47,6 @@ struct ipcomp { #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.18 2003-11-15 00:39:28 guy Exp $"; -#endif int ipcomp_print(register const u_char *bp, int *nhdr) { diff --git a/print-ipfc.c b/print-ipfc.c index 4ed69e9a..3451b4b2 100644 --- a/print-ipfc.c +++ b/print-ipfc.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.6 2003-11-16 09:36:24 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.5 2003-11-15 00:39:28 guy Exp $ (LBL)"; -#endif #include "ether.h" #include "ipfc.h" diff --git a/print-ipx.c b/print-ipx.c index 18a91b14..94f17ddf 100644 --- a/print-ipx.c +++ b/print-ipx.c @@ -22,6 +22,10 @@ * Contributed by Brad Parker (brad@fcr.com). */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.36 2003-11-16 09:36:25 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,10 +42,6 @@ #include "ipx.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.35 2003-11-15 00:39:28 guy Exp $"; -#endif static const char *ipxaddr_string(u_int32_t, const u_char *); void ipx_decode(const struct ipxHdr *, const u_char *, u_int); diff --git a/print-isakmp.c b/print-isakmp.c index 19107311..f1f53eeb 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -28,6 +28,10 @@ * */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.38 2003-11-16 09:36:25 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,10 +50,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.37 2003-11-15 00:39:28 guy Exp $ (LBL)"; -#endif #include "ip.h" #ifdef INET6 #include "ip6.h" diff --git a/print-isoclns.c b/print-isoclns.c index 6b7a4183..16cedfc4 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -24,6 +24,10 @@ * complete IS-IS support. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.108 2003-11-16 09:36:25 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,10 +45,6 @@ #include "extract.h" #include "gmpls.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.107 2003-11-15 00:39:29 guy Exp $ (LBL)"; -#endif #define NLPID_CLNS 129 /* 0x81 */ #define NLPID_ESIS 130 /* 0x82 */ #define NLPID_ISIS 131 /* 0x83 */ diff --git a/print-krb.c b/print-krb.c index 2b196a5b..213db642 100644 --- a/print-krb.c +++ b/print-krb.c @@ -21,6 +21,10 @@ * Initial contribution from John Hawkinson (jhawk@mit.edu). */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.23 2003-11-16 09:36:26 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.22 2003-11-15 00:39:29 guy Exp $"; -#endif static const u_char *c_print(register const u_char *, register const u_char *); static const u_char *krb4_print_hdr(const u_char *); static void krb4_print(const u_char *); diff --git a/print-l2tp.c b/print-l2tp.c index b94036d2..2cdf4025 100644 --- a/print-l2tp.c +++ b/print-l2tp.c @@ -21,6 +21,10 @@ * L2TP support contributed by Motonori Shindo (mshindo@mshindo.net) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.16 2003-11-16 09:36:26 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "interface.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.15 2003-11-15 00:39:30 guy Exp $"; -#endif static char tstr[] = " [|l2tp]"; #ifndef TRUE diff --git a/print-lane.c b/print-lane.c index 363caa5b..37aa16e6 100644 --- a/print-lane.c +++ b/print-lane.c @@ -20,6 +20,10 @@ * */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.22 2003-11-16 09:36:27 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "ether.h" #include "lane.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.21 2003-11-15 00:39:30 guy Exp $ (LBL)"; -#endif static const struct tok lecop2str[] = { { 0x0001, "configure request" }, { 0x0101, "configure response" }, diff --git a/print-ldp.c b/print-ldp.c index 63f46556..0fcd9f41 100644 --- a/print-ldp.c +++ b/print-ldp.c @@ -13,6 +13,10 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.6 2003-11-16 09:36:27 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,10 +32,6 @@ #include "extract.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.5 2003-11-15 00:39:30 guy Exp $"; -#endif /* * ldp common header * diff --git a/print-llc.c b/print-llc.c index df7e2953..311a4739 100644 --- a/print-llc.c +++ b/print-llc.c @@ -22,6 +22,10 @@ * with an awful lot of hacking by Jeffrey Mogul, DECWRL */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.55 2003-11-16 09:36:27 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.54 2003-11-15 00:39:30 guy Exp $"; -#endif #include "llc.h" #include "ethertype.h" diff --git a/print-lwres.c b/print-lwres.c index de3ebfdd..972fbcfb 100644 --- a/print-lwres.c +++ b/print-lwres.c @@ -27,6 +27,10 @@ * SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.12 2003-11-16 09:36:27 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -43,10 +47,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.11 2003-11-15 00:39:31 guy Exp $ (LBL)"; -#endif /* BIND9 lib/lwres/include/lwres */ typedef u_int32_t lwres_uint32_t; typedef u_int16_t lwres_uint16_t; diff --git a/print-mobile.c b/print-mobile.c index 31a98cdb..e7de19dc 100644 --- a/print-mobile.c +++ b/print-mobile.c @@ -40,6 +40,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.14 2003-11-16 09:36:28 guy Exp $"; +#endif #include <tcpdump-stdinc.h> @@ -49,10 +53,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.13 2003-11-15 00:39:31 guy Exp $"; -#endif #define MOBILE_SIZE (8) struct mobile_ip { diff --git a/print-mobility.c b/print-mobility.c index 8311a03a..92436159 100644 --- a/print-mobility.c +++ b/print-mobility.c @@ -31,6 +31,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.11 2003-11-16 09:36:28 guy Exp $"; +#endif #ifdef INET6 #include <tcpdump-stdinc.h> @@ -43,10 +47,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.10 2003-11-15 00:39:31 guy Exp $"; -#endif /* Mobility header */ struct ip6_mobility { u_int8_t ip6m_pproto; /* following payload protocol (for PG) */ diff --git a/print-mpls.c b/print-mpls.c index 04712fc0..319e8b21 100644 --- a/print-mpls.c +++ b/print-mpls.c @@ -26,6 +26,10 @@ * SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.10 2003-11-16 09:36:29 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,10 +45,6 @@ #include "interface.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.9 2003-11-15 00:39:32 guy Exp $ (LBL)"; -#endif #define LABEL_MASK 0xfffff000 #define LABEL_SHIFT 12 #define EXP_MASK 0x00000e00 diff --git a/print-msdp.c b/print-msdp.c index b7025452..50d445e5 100644 --- a/print-msdp.c +++ b/print-msdp.c @@ -15,6 +15,10 @@ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.6 2003-11-16 09:36:29 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,10 +33,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.5 2003-11-15 00:39:32 guy Exp $"; -#endif #define MSDP_TYPE_MAX 7 void diff --git a/print-netbios.c b/print-netbios.c index 14ac0c84..c92eb9e6 100644 --- a/print-netbios.c +++ b/print-netbios.c @@ -22,6 +22,10 @@ * Contributed by Brad Parker (brad@fcr.com). */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.20 2003-11-16 09:36:29 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,10 +42,6 @@ #include "netbios.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.19 2003-11-15 00:39:33 guy Exp $"; -#endif /* * Print NETBIOS packets. */ diff --git a/print-nfs.c b/print-nfs.c index 74082ad4..0e7bdb5a 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.101 2003-11-16 09:36:30 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.100 2003-11-15 00:39:33 guy Exp $ (LBL)"; -#endif #include "nfs.h" #include "nfsfh.h" diff --git a/print-ntp.c b/print-ntp.c index 5de5a875..b4ab2ffe 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -23,6 +23,10 @@ * loosely based on print-bootp.c */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.39 2003-11-16 09:36:30 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,10 +44,6 @@ #include "addrtoname.h" #include "extract.h" #ifdef MODEMASK -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.38 2003-11-15 00:39:33 guy Exp $ (LBL)"; -#endif #undef MODEMASK /* Solaris sucks */ #endif #include "ntp.h" diff --git a/print-null.c b/print-null.c index 831f79c6..e8af2196 100644 --- a/print-null.c +++ b/print-null.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.51 2003-11-16 09:36:30 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.50 2003-11-15 00:39:34 guy Exp $ (LBL)"; -#endif #include "ip.h" #ifdef INET6 #include "ip6.h" diff --git a/print-ospf.c b/print-ospf.c index fe20bcc9..42669895 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -21,6 +21,10 @@ * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.47 2003-11-16 09:36:31 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "extract.h" #include "gmpls.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.46 2003-11-15 00:39:34 guy Exp $ (LBL)"; -#endif #include "ospf.h" #include "ip.h" diff --git a/print-ospf6.c b/print-ospf6.c index eeefb9ce..1104799c 100644 --- a/print-ospf6.c +++ b/print-ospf6.c @@ -21,6 +21,10 @@ * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.13 2003-11-16 09:36:31 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,10 +39,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.12 2003-11-15 00:39:35 guy Exp $ (LBL)"; -#endif #include "ospf6.h" struct bits { diff --git a/print-pflog.c b/print-pflog.c index e4e30a28..3623e303 100644 --- a/print-pflog.c +++ b/print-pflog.c @@ -21,6 +21,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.9 2003-11-16 09:36:32 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.8 2003-11-15 00:39:35 guy Exp $ (LBL)"; -#endif /* The header in OpenBSD pflog files. */ struct pfloghdr { diff --git a/print-pim.c b/print-pim.c index 59e32459..57d8f9f8 100644 --- a/print-pim.c +++ b/print-pim.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.39 2003-11-16 09:36:32 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -53,10 +57,6 @@ struct pim { #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.38 2003-11-15 00:39:35 guy Exp $ (LBL)"; -#endif #include "ip.h" static void pimv2_print(register const u_char *bp, register u_int len); diff --git a/print-ppp.c b/print-ppp.c index 60ad12dc..94943f0f 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -29,6 +29,10 @@ * o BAP support */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.91 2003-11-16 09:36:32 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,10 +55,6 @@ #include "chdlc.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.90 2003-11-15 00:39:36 guy Exp $ (LBL)"; -#endif /* * The following constatns are defined by IANA. Please refer to * http://www.isi.edu/in-notes/iana/assignments/ppp-numbers diff --git a/print-pppoe.c b/print-pppoe.c index e69eff75..e5836126 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -21,6 +21,10 @@ * Original code by Greg Stark <gsstark@mit.edu> */ +#ifndef lint +static const char rcsid[] _U_ = +"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.27 2003-11-16 09:36:33 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,10 +42,6 @@ #include "ether.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = -"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.26 2003-11-15 01:02:02 guy Exp $ (LBL)"; -#endif /* Codes */ enum { PPPOE_PADI = 0x09, diff --git a/print-pptp.c b/print-pptp.c index a18703a6..9c1db294 100644 --- a/print-pptp.c +++ b/print-pptp.c @@ -22,6 +22,10 @@ */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.11 2003-11-16 09:36:33 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,10 +38,6 @@ #include "interface.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.10 2003-11-15 00:39:36 guy Exp $"; -#endif static char tstr[] = " [|pptp]"; #ifndef TRUE diff --git a/print-radius.c b/print-radius.c index 232c8968..99ae285f 100644 --- a/print-radius.c +++ b/print-radius.c @@ -42,6 +42,10 @@ * TODO: Among other things to print ok MacIntosh and Vendor values */ +#ifndef lint +static const char rcsid[] _U_ = + "$Id: print-radius.c,v 1.21 2003-11-16 09:36:33 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,10 +61,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "$Id: print-radius.c,v 1.20 2003-11-15 00:39:37 guy Exp $"; -#endif #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) ) #define PRINT_HEX(bytes_len, ptr_data) \ diff --git a/print-raw.c b/print-raw.c index 43dbff48..8e376ce5 100644 --- a/print-raw.c +++ b/print-raw.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.41 2003-11-16 09:36:34 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.40 2003-11-15 00:39:37 guy Exp $ (LBL)"; -#endif /* * The DLT_RAW packet has no header. It contains a raw IP packet. */ diff --git a/print-rip.c b/print-rip.c index 58cb8803..3369885a 100644 --- a/print-rip.c +++ b/print-rip.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.57 2003-11-16 09:36:34 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.56 2003-11-15 00:39:37 guy Exp $ (LBL)"; -#endif struct rip { u_int8_t rip_cmd; /* request/response */ u_int8_t rip_vers; /* protocol version # */ diff --git a/print-ripng.c b/print-ripng.c index 5f231d0f..54a89d3d 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.17 2003-11-16 09:36:34 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,10 +54,6 @@ IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b) #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.16 2003-11-15 00:39:37 guy Exp $"; -#endif static int rip6_entry_print(register const struct netinfo6 *ni, int metric) { diff --git a/print-rsvp.c b/print-rsvp.c index 14ad1c36..5592421b 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -13,6 +13,10 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.26 2003-11-16 09:36:35 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,10 +34,6 @@ #include "ethertype.h" #include "gmpls.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.25 2003-11-15 00:39:38 guy Exp $"; -#endif /* * RFC 2205 common header * diff --git a/print-rt6.c b/print-rt6.c index 994a717b..063d5cd6 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.25 2003-11-16 09:36:35 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.24 2003-11-15 00:39:38 guy Exp $"; -#endif int rt6_print(register const u_char *bp, register const u_char *bp2) { @@ -32,6 +32,10 @@ * Ken Hornstein <kenh@cmf.nrl.navy.mil> */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.37 2003-11-16 09:36:36 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,10 +50,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.36 2003-11-15 00:39:38 guy Exp $"; -#endif #include "rx.h" #include "ip.h" diff --git a/print-sctp.c b/print-sctp.c index 37a9cc5a..2d03a579 100644 --- a/print-sctp.c +++ b/print-sctp.c @@ -33,6 +33,10 @@ * SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = +"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.15 2003-11-16 09:36:36 guy Exp $ (NETLAB/PEL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,10 +56,6 @@ #include "extract.h" /* must come after interface.h */ #include "ip.h" #ifdef INET6 -#ifndef lint -static const char rcsid[] _U_ = -"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.14 2003-11-15 00:39:39 guy Exp $ (NETLAB/PEL)"; -#endif #include "ip6.h" #endif @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.64 2003-11-16 09:36:36 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.63 2003-11-15 00:39:39 guy Exp $ (LBL)"; -#endif #include "ip.h" #include "tcp.h" #include "slip.h" diff --git a/print-sll.c b/print-sll.c index b3ac18d2..d3ae6ec6 100644 --- a/print-sll.c +++ b/print-sll.c @@ -18,6 +18,10 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.14 2003-11-16 09:36:37 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.13 2003-11-15 00:39:39 guy Exp $ (LBL)"; -#endif #include "ether.h" #include "sll.h" diff --git a/print-smb.c b/print-smb.c index 00d3b47d..1f4456a2 100644 --- a/print-smb.c +++ b/print-smb.c @@ -10,6 +10,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.29 2003-11-16 09:36:37 guy Exp $"; +#endif #include <tcpdump-stdinc.h> @@ -20,10 +24,6 @@ #include "extract.h" #include "smb.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.28 2003-11-15 00:39:40 guy Exp $"; -#endif static int request = 0; const u_char *startbuf = NULL; diff --git a/print-snmp.c b/print-snmp.c index b3c3f6a5..d7c72d91 100644 --- a/print-snmp.c +++ b/print-snmp.c @@ -56,6 +56,10 @@ # @(#)snmp.awk.x 1.1 (LANL) 1/15/90 */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.58 2003-11-16 09:36:38 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -73,10 +77,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.57 2003-11-15 00:39:40 guy Exp $ (LBL)"; -#endif /* * Universal ASN.1 types * (we only care about the tag values for those allowed in the Internet SMI) diff --git a/print-stp.c b/print-stp.c index 19e5c82d..11df16ca 100644 --- a/print-stp.c +++ b/print-stp.c @@ -9,6 +9,10 @@ * Contributed by Lennert Buytenhek <buytenh@gnu.org> */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13 2003-11-16 09:36:38 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -24,10 +28,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.12 2003-11-15 00:39:41 guy Exp $"; -#endif static void stp_print_bridge_id(const u_char *p) { diff --git a/print-sunatm.c b/print-sunatm.c index 18516cb7..02f15c38 100644 --- a/print-sunatm.c +++ b/print-sunatm.c @@ -29,6 +29,10 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.7 2003-11-16 09:36:39 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,10 +50,6 @@ struct rtentry; #include "extract.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.6 2003-11-15 00:39:41 guy Exp $ (LBL)"; -#endif #include "atm.h" #include "atmuni31.h" diff --git a/print-sunrpc.c b/print-sunrpc.c index f02862e3..b0a3a2d0 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.45 2003-11-16 09:36:39 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,10 +45,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.44 2003-11-15 00:39:41 guy Exp $ (LBL)"; -#endif #include "ip.h" #ifdef INET6 #include "ip6.h" diff --git a/print-tcp.c b/print-tcp.c index 1528b3b9..44279215 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.109 2003-11-16 09:36:39 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +40,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.108 2003-11-15 00:39:41 guy Exp $ (LBL)"; -#endif #include "tcp.h" #include "ip.h" diff --git a/print-telnet.c b/print-telnet.c index ffb10c41..bf2f1719 100644 --- a/print-telnet.c +++ b/print-telnet.c @@ -49,6 +49,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.23 2003-11-16 09:36:39 guy Exp $"; +#endif #include <tcpdump-stdinc.h> @@ -59,10 +63,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.22 2003-11-15 00:39:42 guy Exp $"; -#endif #define TELCMDS #define TELOPTS #include "telnet.h" diff --git a/print-tftp.c b/print-tftp.c index 31f24e8a..3ab61bc6 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -21,6 +21,10 @@ * Format and print trivial file transfer protocol packets. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.37 2003-11-16 09:36:40 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,10 +44,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.36 2003-11-15 00:39:42 guy Exp $ (LBL)"; -#endif /* op code to string mapping */ static struct tok op2str[] = { { RRQ, "RRQ" }, /* read request */ diff --git a/print-timed.c b/print-timed.c index 8ea6aeac..55fbb39e 100644 --- a/print-timed.c +++ b/print-timed.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.9 2003-11-16 09:36:40 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "interface.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.8 2003-11-15 00:39:42 guy Exp $"; -#endif static const char *tsptype[TSPTYPENUMBER] = { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP", "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT", diff --git a/print-token.c b/print-token.c index 37fa2c28..5f70c6f5 100644 --- a/print-token.c +++ b/print-token.c @@ -23,6 +23,10 @@ * Further tweaked to more closely resemble print-fddi.c * Guy Harris <guy@alum.mit.edu> */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.24 2003-11-16 09:36:40 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,10 +42,6 @@ #include "addrtoname.h" #include "ethertype.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.23 2003-11-15 00:39:42 guy Exp $"; -#endif #include "ether.h" #include "token.h" diff --git a/print-udp.c b/print-udp.c index 7c303d63..69ef39d5 100644 --- a/print-udp.c +++ b/print-udp.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.126 2003-11-16 09:36:41 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,10 +45,6 @@ #include "extract.h" #include "appletalk.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.125 2003-11-15 00:39:43 guy Exp $ (LBL)"; -#endif #include "udp.h" #include "ip.h" diff --git a/print-vjc.c b/print-vjc.c index f85e2de7..c9dcc6db 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -23,6 +23,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.13 2003-11-16 09:36:41 guy Exp $ (LBL)"; +#endif #include <tcpdump-stdinc.h> @@ -32,10 +36,6 @@ #include "interface.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.12 2003-11-15 00:39:43 guy Exp $ (LBL)"; -#endif #include "slcompress.h" #include "ppp.h" diff --git a/print-vrrp.c b/print-vrrp.c index a93caa27..12fbe7b3 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -23,6 +23,10 @@ * FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.9 2003-11-16 09:36:41 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,10 +41,6 @@ #include "extract.h" #include "addrtoname.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.8 2003-11-15 00:39:44 guy Exp $"; -#endif /* * RFC 2338: * 0 1 2 3 @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.32 2003-11-16 09:36:42 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,10 +36,6 @@ #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.31 2003-11-15 00:39:44 guy Exp $ (LBL)"; -#endif /* XXX need to add byte-swapping macros! */ /* XXX - you mean like the ones in "extract.h"? */ diff --git a/print-zephyr.c b/print-zephyr.c index a9833785..89314c9a 100644 --- a/print-zephyr.c +++ b/print-zephyr.c @@ -18,6 +18,10 @@ * PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.8 2003-11-16 09:36:42 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,10 +35,6 @@ #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.7 2003-11-15 00:39:44 guy Exp $"; -#endif struct z_packet { char *version; int numfields; diff --git a/setsignal.c b/setsignal.c index a8d89325..a4b59cef 100644 --- a/setsignal.c +++ b/setsignal.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.11 2003-11-16 09:36:42 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -26,14 +30,6 @@ #include <tcpdump-stdinc.h> - -#include "interface.h" - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.10 2003-11-15 00:39:45 guy Exp $ (LBL)"; -#endif - #include <signal.h> #ifdef HAVE_SIGACTION #include <string.h> @@ -10,6 +10,10 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.28 2003-11-16 09:36:43 guy Exp $"; +#endif #include <tcpdump-stdinc.h> @@ -21,10 +25,6 @@ #include "extract.h" #include "smb.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.27 2003-11-15 00:39:45 guy Exp $"; -#endif extern const u_char *startbuf; /* diff --git a/strcasecmp.c b/strcasecmp.c index 7fb721ec..f19ccf54 100644 --- a/strcasecmp.c +++ b/strcasecmp.c @@ -14,15 +14,15 @@ #include "config.h" #endif +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.6 2003-11-16 09:36:43 guy Exp $"; +#endif #include <tcpdump-stdinc.h> #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.5 2003-11-15 00:39:45 guy Exp $"; -#endif /* * This array is designed for mapping upper and lower case letter * together for a case independent comparison. The mappings are @@ -118,23 +118,14 @@ When .I tcpdump finishes capturing packets, it will report counts of: .IP -packets ``captured'' (this is the number of packets that -.I tcpdump -has received and processed); -.IP packets ``received by filter'' (the meaning of this depends on the OS on which you're running .IR tcpdump , and possibly on the way the OS was configured - if a filter was specified on the command line, on some OSes it counts packets regardless -of whether they were matched by the filter expression and, even if they -were matched by the filter expression, regardless of whether -.I tcpdump -has read and processed them yet, on other OSes it counts only packets that were -matched by the filter expression regardless of whether -.I tcpdump -has read and processed them yet, and on other OSes it counts only -packets that were matched by the filter expression and were processed by +of whether they were matched by the filter expression, and on other OSes +it counts only packets that were matched by the filter expression and +were processed by .IR tcpdump ); .IP packets ``dropped by kernel'' (this is the number of packets that were @@ -435,7 +426,6 @@ Setting Force packets selected by "\fIexpression\fP" to be interpreted the specified \fItype\fR. Currently known types are -\fBaodv\fR (Ad-hoc On-demand Distance Vector protocol), \fBcnfp\fR (Cisco NetFlow protocol), \fBrpc\fR (Remote Procedure Call), \fBrtp\fR (Real-Time Applications protocol), @@ -25,6 +25,13 @@ * Seth Webster <swebster@sst.ll.mit.edu> */ +#ifndef lint +static const char copyright[] _U_ = + "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\ +The Regents of the University of California. All rights reserved.\n"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.218 2003-11-16 09:36:44 guy Exp $ (LBL)"; +#endif /* * tcpdump - monitor tcp/ip traffic on an ethernet. @@ -62,13 +69,6 @@ extern int SIZE_BUF; #include "gmt2local.h" #include "pcap-missing.h" -#ifndef lint -static const char copyright[] _U_ = - "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\ -The Regents of the University of California. All rights reserved.\n"; -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.217 2003-11-15 00:39:45 guy Exp $ (LBL)"; -#endif int dflag; /* print filter code */ int eflag; /* print ethernet header */ int fflag; /* don't translate "foreign" IP address */ @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.89 2003-11-16 09:36:44 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,10 +44,6 @@ #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.88 2003-11-15 00:39:46 guy Exp $ (LBL)"; -#endif /* * Print out a filename (or other ascii string). * If ep is NULL, assume no truncation check is needed. @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.6 2003-11-16 09:36:45 guy Exp $ (LBL)"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,10 +37,6 @@ #include "interface.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.5 2003-11-15 00:39:46 guy Exp $ (LBL)"; -#endif /* * Stock 4.3 doesn't have vfprintf. * This routine is due to Chris Torek. diff --git a/win32/prj/GNUmakefile b/win32/prj/GNUmakefile index f0955a95..46605641 100644 --- a/win32/prj/GNUmakefile +++ b/win32/prj/GNUmakefile @@ -16,7 +16,8 @@ CFLAGS = -I ${PCAP_DIR}/wpcap/libpcap/bpf \ -I ../../lbl -I../.. \ -DWIN32 -DHAVE_ADDRINFO_H -DHAVE_PCAP_FINDALLDEVS \ -DINET6 -DSIZEOF_CHAR=1 -DHAVE_SOCKADDR_STORAGE -DHAVE_PCAP_DUMP_FLUSH\ - -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -mno-cygwin ${OPTFLAGS} + -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -D_U_="__attribute__((unused))" \ + -mno-cygwin ${OPTFLAGS} LDFLAGS = LIBS = -L ${PCAP_DIR}/WPCAP/LIB -lwpcap -lwsock32 OBJS = \ diff --git a/win32/prj/WinDump.dsp b/win32/prj/WinDump.dsp index cdccb0dc..bbada424 100644 --- a/win32/prj/WinDump.dsp +++ b/win32/prj/WinDump.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../winpcap/wpcap/libpcap/bpf" /I "../../../winpcap/wpcap/libpcap" /I "../../../winpcap/wpcap/libpcap/Win32/Include" /I "../../../winpcap/wpcap/libpcap/Win32/Include/net" /I "../../Win32/Include" /I "../../linux-Include" /I "../../lbl" /I "../../" /I "../../../winpcap/wpcap/win32-extensions" /D "NDEBUG" /D HAVE_ADDRINFO=1 /D HAVE_PCAP_DUMP_FLUSH=1 /D HAVE_PCAP_FINDALLDEVS=1 /D "_CONSOLE" /D "__STDC__" /D "INET6" /D "WIN32" /D "_MBCS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SOCKADDR_STORAGE" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../../winpcap/wpcap/libpcap/bpf" /I "../../../winpcap/wpcap/libpcap" /I "../../../winpcap/wpcap/libpcap/Win32/Include" /I "../../../winpcap/wpcap/libpcap/Win32/Include/net" /I "../../Win32/Include" /I "../../linux-Include" /I "../../lbl" /I "../../" /I "../../../winpcap/wpcap/win32-extensions" /D "NDEBUG" /D HAVE_ADDRINFO=1 /D HAVE_PCAP_DUMP_FLUSH=1 /D HAVE_PCAP_FINDALLDEVS=1 /D "_CONSOLE" /D "__STDC__" /D "INET6" /D "WIN32" /D "_MBCS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SOCKADDR_STORAGE" /D _U_= /YX /FD /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /Gi /GX /ZI /I "../../../winpcap/wpcap/libpcap/bpf" /I "../../../winpcap/wpcap/libpcap" /I "../../../winpcap/wpcap/libpcap/Win32/Include" /I "../../../winpcap/wpcap/libpcap/Win32/Include/net" /I "../../Win32/Include" /I "../../linux-Include" /I "../../lbl" /I "../../" /I "../../../winpcap/wpcap/win32-extensions" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_ADDRINFO" /D HAVE_PCAP_FINDALLDEVS=1 /D "_CONSOLE" /D "__STDC__" /D "INET6" /D "WIN32" /D "_MBCS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SOCKADDR_STORAGE" /D HAVE_PCAP_DUMP_FLUSH=1 /FR /YX /FD /c +# ADD CPP /nologo /W3 /Gm /Gi /GX /ZI /I "../../../winpcap/wpcap/libpcap/bpf" /I "../../../winpcap/wpcap/libpcap" /I "../../../winpcap/wpcap/libpcap/Win32/Include" /I "../../../winpcap/wpcap/libpcap/Win32/Include/net" /I "../../Win32/Include" /I "../../linux-Include" /I "../../lbl" /I "../../" /I "../../../winpcap/wpcap/win32-extensions" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_ADDRINFO" /D HAVE_PCAP_FINDALLDEVS=1 /D "_CONSOLE" /D "__STDC__" /D "INET6" /D "WIN32" /D "_MBCS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SOCKADDR_STORAGE" /D HAVE_PCAP_DUMP_FLUSH=1 /D _U_= /FR /YX /FD /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe |