diff options
| -rw-r--r-- | .cvsignore | 3 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | acconfig.h | 93 | ||||
| -rw-r--r-- | addrtoname.c | 6 | ||||
| -rw-r--r-- | bpf_dump.c | 6 | ||||
| -rw-r--r-- | config.h.in | 206 | ||||
| -rwxr-xr-x | configure | 184 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | gmt2local.c | 6 | ||||
| -rw-r--r-- | machdep.c | 6 | ||||
| -rw-r--r-- | parsenfsfh.c | 6 | ||||
| -rw-r--r-- | print-ah.c | 4 | ||||
| -rw-r--r-- | print-arp.c | 6 | ||||
| -rw-r--r-- | print-atalk.c | 6 | ||||
| -rw-r--r-- | print-atm.c | 6 | ||||
| -rw-r--r-- | print-bgp.c | 4 | ||||
| -rw-r--r-- | print-bootp.c | 6 | ||||
| -rw-r--r-- | print-chdlc.c | 6 | ||||
| -rw-r--r-- | print-cip.c | 6 | ||||
| -rw-r--r-- | print-decnet.c | 6 | ||||
| -rw-r--r-- | print-dhcp6.c | 6 | ||||
| -rw-r--r-- | print-domain.c | 6 | ||||
| -rw-r--r-- | print-dvmrp.c | 6 | ||||
| -rw-r--r-- | print-egp.c | 6 | ||||
| -rw-r--r-- | print-esp.c | 4 | ||||
| -rw-r--r-- | print-ether.c | 6 | ||||
| -rw-r--r-- | print-fddi.c | 6 | ||||
| -rw-r--r-- | print-frag6.c | 4 | ||||
| -rw-r--r-- | print-gre.c | 6 | ||||
| -rw-r--r-- | print-icmp.c | 6 | ||||
| -rw-r--r-- | print-icmp6.c | 4 | ||||
| -rw-r--r-- | print-igrp.c | 6 | ||||
| -rw-r--r-- | print-ip.c | 6 | ||||
| -rw-r--r-- | print-ip6.c | 4 | ||||
| -rw-r--r-- | print-ip6opts.c | 4 | ||||
| -rw-r--r-- | print-ipcomp.c | 4 | ||||
| -rw-r--r-- | print-ipx.c | 6 | ||||
| -rw-r--r-- | print-isakmp.c | 6 | ||||
| -rw-r--r-- | print-isoclns.c | 6 | ||||
| -rw-r--r-- | print-krb.c | 6 | ||||
| -rw-r--r-- | print-l2tp.c | 6 | ||||
| -rw-r--r-- | print-lane.c | 6 | ||||
| -rw-r--r-- | print-lcp.c | 6 | ||||
| -rw-r--r-- | print-llc.c | 6 | ||||
| -rw-r--r-- | print-mobile.c | 4 | ||||
| -rw-r--r-- | print-netbios.c | 6 | ||||
| -rw-r--r-- | print-nfs.c | 6 | ||||
| -rw-r--r-- | print-ntp.c | 6 | ||||
| -rw-r--r-- | print-null.c | 6 | ||||
| -rw-r--r-- | print-ospf.c | 6 | ||||
| -rw-r--r-- | print-ospf6.c | 6 | ||||
| -rw-r--r-- | print-pim.c | 6 | ||||
| -rw-r--r-- | print-ppp.c | 6 | ||||
| -rw-r--r-- | print-pppoe.c | 6 | ||||
| -rw-r--r-- | print-raw.c | 6 | ||||
| -rw-r--r-- | print-rip.c | 6 | ||||
| -rw-r--r-- | print-ripng.c | 4 | ||||
| -rw-r--r-- | print-rt6.c | 4 | ||||
| -rw-r--r-- | print-rx.c | 6 | ||||
| -rw-r--r-- | print-sl.c | 6 | ||||
| -rw-r--r-- | print-snmp.c | 6 | ||||
| -rw-r--r-- | print-sunrpc.c | 6 | ||||
| -rw-r--r-- | print-tcp.c | 6 | ||||
| -rw-r--r-- | print-tftp.c | 6 | ||||
| -rw-r--r-- | print-udp.c | 6 | ||||
| -rw-r--r-- | print-vjc.c | 4 | ||||
| -rw-r--r-- | print-wb.c | 6 | ||||
| -rw-r--r-- | savestr.c | 6 | ||||
| -rw-r--r-- | setsignal.c | 6 | ||||
| -rw-r--r-- | strcasecmp.c | 4 | ||||
| -rw-r--r-- | tcpdump.c | 6 | ||||
| -rw-r--r-- | util.c | 6 | ||||
| -rw-r--r-- | vfprintf.c | 6 |
73 files changed, 788 insertions, 82 deletions
@@ -3,3 +3,6 @@ Makefile config.status config.log config.cache +config.h +.devel +tcpdump diff --git a/Makefile.in b/Makefile.in index 4332f195..fb6e380d 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.214 1999-11-21 03:54:50 assar Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.215 1999-11-21 09:36:43 fenner Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -149,7 +149,7 @@ clean: distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - gnuc.h os-proto.h + config.h gnuc.h os-proto.h tags: $(TAGFILES) ctags -wtd $(TAGFILES) diff --git a/acconfig.h b/acconfig.h new file mode 100644 index 00000000..144d686e --- /dev/null +++ b/acconfig.h @@ -0,0 +1,93 @@ +/* Define if you have SSLeay XXX why isn't this HAVE_LIBCRYPTO? */ +#undef CRYPTO + +/* Define if you have SSLeay 0.9.0b with the buggy cast128. */ +#undef HAVE_BUGGY_CAST128 + +/* Define both to enable IPv6 support XXX why 2? ENABLE_IPV6 is not used. */ +#undef ENABLE_IPV6 +#undef INET6 + +/* Is T_AAAA predefined? */ +#undef HAVE_AAAA + +/* Fallback definition if not in headers */ +/* XXX why is this not #ifndef HAVE_AAA #define T_AAAA ... ? */ +/* XXX or even #ifndef T_AAAA ... */ +#undef T_AAAA + +/* define if you have struct __res_state_ext */ +#undef HAVE_RES_STATE_EXT + +/* define if your struct __res_state has the nsort member */ +#undef HAVE_NEW_RES_STATE + + +/* + * define if struct ether_header.ether_dhost is a struct with ether_addr_octet + */ +#undef ETHER_HEADER_HAS_EA + +/* + * define if struct ether_arp.arp_sha is a struct with ether_addr_octet + */ +#undef ETHER_ARP_HAS_EA + +/* define if struct ether_arp contains arp_xsha */ +#undef ETHER_ARP_HAS_X + +/* define if you have the addrinfo function. */ +#undef HAVE_ADDRINFO + +/* define ifyou have the h_errno variable. */ +#undef HAVE_H_ERRNO + +/* define if IN6ADDRSZ is defined (XXX not used!) */ +#undef HAVE_IN6ADDRSZ + +/* define if INADDRSZ is defined (XXX not used!) */ +#undef HAVE_INADDRSZ + +/* define if you have <net/slip.h> */ +#undef HAVE_NET_SLIP_H + +/* define if this is a development version, to use additional prototypes. */ +#undef HAVE_OS_PROTO_H + +/* define if <unistd.h> defines __P() */ +#undef HAVE_PORTABLE_PROTOTYPE + +/* define if RES_USE_INET6 is defined */ +#undef HAVE_RES_USE_INET6 + +/* define if struct sockaddr has the sa_len member */ +#undef HAVE_SOCKADDR_SA_LEN + +/* define if you have struct sockaddr_storage */ +#undef HAVE_SOCKADDR_STORAGE + +/* define if unaligned memory accesses fail */ +#undef LBL_ALIGN + +/* The successful return value from signal (?)XXX */ +#undef RETSIGVAL + +/* Define this on IRIX */ +#undef _BSD_SIGNALS + +/* For HP/UX ANSI compiler? */ +#undef _HPUX_SOURCE + +/* AIX hack. */ +#undef _SUN + +/* OSF hack: "Workaround around ip_hl vs. ip_vhl problem in netinet/ip.h" */ +#undef __STDC__ + +/* Workaround for missing sized types */ +/* XXX this should move to the more standard uint*_t */ +#undef int16_t +#undef int32_t +#undef u_int16_t +#undef u_int32_t +#undef u_int8_t diff --git a/addrtoname.c b/addrtoname.c index 8f114cdb..0eba7737 100644 --- a/addrtoname.c +++ b/addrtoname.c @@ -23,7 +23,11 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.63 1999-11-20 15:34:39 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.64 1999-11-21 09:36:44 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> @@ -20,7 +20,11 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.9 1999-10-07 23:47:09 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.10 1999-11-21 09:36:44 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/config.h.in b/config.h.in new file mode 100644 index 00000000..dbe589bc --- /dev/null +++ b/config.h.in @@ -0,0 +1,206 @@ +/* config.h.in. Generated automatically from configure.in by autoheader. */ + +/* Define to empty if the keyword does not work. */ +#undef const + +/* Define as the return type of signal handlers (int or void). */ +#undef RETSIGTYPE + +/* Define if you can safely include both <sys/time.h> and <time.h>. */ +#undef TIME_WITH_SYS_TIME + +/* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define if you have SSLeay XXX why isn't this HAVE_LIBCRYPTO? */ +#undef CRYPTO + +/* Define if you have SSLeay 0.9.0b with the buggy cast128. */ +#undef HAVE_BUGGY_CAST128 + +/* Define both to enable IPv6 support XXX why 2? ENABLE_IPV6 is not used. */ +#undef ENABLE_IPV6 +#undef INET6 + +/* Is T_AAAA predefined? */ +#undef HAVE_AAAA + +/* Fallback definition if not in headers */ +/* XXX why is this not #ifndef HAVE_AAA #define T_AAAA ... ? */ +/* XXX or even #ifndef T_AAAA ... */ +#undef T_AAAA + +/* define if you have struct __res_state_ext */ +#undef HAVE_RES_STATE_EXT + +/* define if your struct __res_state has the nsort member */ +#undef HAVE_NEW_RES_STATE + +/* + * define if struct ether_header.ether_dhost is a struct with ether_addr_octet + */ +#undef ETHER_HEADER_HAS_EA + +/* + * define if struct ether_arp.arp_sha is a struct with ether_addr_octet + */ +#undef ETHER_ARP_HAS_EA + +/* define if struct ether_arp contains arp_xsha */ +#undef ETHER_ARP_HAS_X + +/* define if you have the addrinfo function. */ +#undef HAVE_ADDRINFO + +/* define ifyou have the h_errno variable. */ +#undef HAVE_H_ERRNO + +/* define if IN6ADDRSZ is defined (XXX not used!) */ +#undef HAVE_IN6ADDRSZ + +/* define if INADDRSZ is defined (XXX not used!) */ +#undef HAVE_INADDRSZ + +/* define if you have <net/slip.h> */ +#undef HAVE_NET_SLIP_H + +/* define if this is a development version, to use additional prototypes. */ +#undef HAVE_OS_PROTO_H + +/* define if <unistd.h> defines __P() */ +#undef HAVE_PORTABLE_PROTOTYPE + +/* define if RES_USE_INET6 is defined */ +#undef HAVE_RES_USE_INET6 + +/* define if struct sockaddr has the sa_len member */ +#undef HAVE_SOCKADDR_SA_LEN + +/* define if you have struct sockaddr_storage */ +#undef HAVE_SOCKADDR_STORAGE + +/* define if unaligned memory accesses fail */ +#undef LBL_ALIGN + +/* The successful return value from signal (?)XXX */ +#undef RETSIGVAL + +/* Define this on IRIX */ +#undef _BSD_SIGNALS + +/* For HP/UX ANSI compiler? */ +#undef _HPUX_SOURCE + +/* AIX hack. */ +#undef _SUN + +/* OSF hack: "Workaround around ip_hl vs. ip_vhl problem in netinet/ip.h" */ +#undef __STDC__ + +/* Workaround for missing sized types */ +/* XXX this should move to the more standard uint*_t */ +#undef int16_t +#undef int32_t +#undef u_int16_t +#undef u_int32_t +#undef u_int8_t + +/* The number of bytes in a char. */ +#undef SIZEOF_CHAR + +/* The number of bytes in a int. */ +#undef SIZEOF_INT + +/* The number of bytes in a long. */ +#undef SIZEOF_LONG + +/* The number of bytes in a short. */ +#undef SIZEOF_SHORT + +/* Define if you have the ether_ntoa function. */ +#undef HAVE_ETHER_NTOA + +/* Define if you have the getaddrinfo function. */ +#undef HAVE_GETADDRINFO + +/* Define if you have the gethostbyname2 function. */ +#undef HAVE_GETHOSTBYNAME2 + +/* Define if you have the getnameinfo function. */ +#undef HAVE_GETNAMEINFO + +/* Define if you have the inet_aton function. */ +#undef HAVE_INET_ATON + +/* Define if you have the inet_ntop function. */ +#undef HAVE_INET_NTOP + +/* Define if you have the inet_pton function. */ +#undef HAVE_INET_PTON + +/* Define if you have the pfopen function. */ +#undef HAVE_PFOPEN + +/* Define if you have the setlinebuf function. */ +#undef HAVE_SETLINEBUF + +/* Define if you have the sigaction function. */ +#undef HAVE_SIGACTION + +/* Define if you have the sigset function. */ +#undef HAVE_SIGSET + +/* Define if you have the strcasecmp function. */ +#undef HAVE_STRCASECMP + +/* Define if you have the vfprintf function. */ +#undef HAVE_VFPRINTF + +/* Define if you have the <cast.h> header file. */ +#undef HAVE_CAST_H + +/* Define if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H + +/* Define if you have the <malloc.h> header file. */ +#undef HAVE_MALLOC_H + +/* Define if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define if you have the <net/slip.h> header file. */ +#undef HAVE_NET_SLIP_H + +/* Define if you have the <netinet6/ipcomp.h> header file. */ +#undef HAVE_NETINET6_IPCOMP_H + +/* Define if you have the <rc5.h> header file. */ +#undef HAVE_RC5_H + +/* Define if you have the <rpc/rpcent.h> header file. */ +#undef HAVE_RPC_RPCENT_H + +/* Define if you have the <zlib.h> header file. */ +#undef HAVE_ZLIB_H + +/* Define if you have the crypto library (-lcrypto). */ +#undef HAVE_LIBCRYPTO + +/* Define if you have the dnet library (-ldnet). */ +#undef HAVE_LIBDNET + +/* Define if you have the resolv library (-lresolv). */ +#undef HAVE_LIBRESOLV + +/* Define if you have the rpc library (-lrpc). */ +#undef HAVE_LIBRPC + +/* Define if you have the socket library (-lsocket). */ +#undef HAVE_LIBSOCKET + +/* Define if you have the str library (-lstr). */ +#undef HAVE_LIBSTR + +/* Define if you have the z library (-lz). */ +#undef HAVE_LIBZ @@ -3914,8 +3914,45 @@ EOF fi + + echo $ac_n "checking for h_errno""... $ac_c" 1>&6 +echo "configure:3920: checking for h_errno" >&5 + if eval "test \"`echo '$''{'ac_cv_var_h_errno'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3925 "configure" +#include "confdefs.h" + +# include <sys/types.h> +# include <netdb.h> +int main() { +int foo = h_errno; +; return 0; } +EOF +if { (eval echo configure:3934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_var_h_errno=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_var_h_errno=no +fi +rm -f conftest* +fi + + echo "$ac_t""$ac_cv_var_h_errno" 1>&6 + if test "$ac_cv_var_h_errno" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_H_ERRNO 1 +EOF + + fi + + echo $ac_n "checking for SSLeay""... $ac_c" 1>&6 -echo "configure:3919: checking for SSLeay" >&5 +echo "configure:3956: checking for SSLeay" >&5 ac_cv_ssleay_path=no incdir=no for dir in /usr/local /usr/local/ssl /usr/pkg; do @@ -3943,7 +3980,7 @@ if test "$ac_cv_ssleay_path" != no; then V_INCLS="$V_INCLS $incdir" LIBS="$LIBS -L$dir/lib" echo $ac_n "checking for des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:3947: checking for des_cbc_encrypt in -lcrypto" >&5 +echo "configure:3984: checking for des_cbc_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3951,7 +3988,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 3955 "configure" +#line 3992 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3962,7 +3999,7 @@ int main() { des_cbc_encrypt() ; return 0; } EOF -if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4000,17 +4037,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4004: checking for $ac_hdr" >&5 +echo "configure:4041: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4009 "configure" +#line 4046 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4039,12 +4076,12 @@ done if test "$ac_cv_header_cast_h" = "yes"; then echo $ac_n "checking for buggy CAST128""... $ac_c" 1>&6 -echo "configure:4043: checking for buggy CAST128" >&5 +echo "configure:4080: checking for buggy CAST128" >&5 if test "$cross_compiling" = yes; then buggy_cast128="cross-compiling, assume yes" else cat > conftest.$ac_ext <<EOF -#line 4048 "configure" +#line 4085 "configure" #include "confdefs.h" #include <cast.h> @@ -4063,7 +4100,7 @@ main() return 1; } EOF -if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then buggy_cast128=yes else @@ -4112,7 +4149,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:4116: checking for a BSD compatible install" >&5 +echo "configure:4153: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4165,6 +4202,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -4228,19 +4267,7 @@ fi trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - +DEFS=-DHAVE_CONFIG_H # Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} @@ -4278,7 +4305,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -4437,6 +4464,113 @@ s%@INSTALL@%$INSTALL%g fi; done rm -f conftest.s* +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' +ac_uC=' ' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' + +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <<EOF + CONFIG_HEADERS="config.h" +EOF +cat >> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + +rm -f conftest.tail +while : +do + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + echo 'CEOF + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h + else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file + fi +fi; done + EOF cat >> $CONFIG_STATUS <<EOF diff --git a/configure.in b/configure.in index e72d75a1..03e25494 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.81 1999-11-21 03:42:19 assar Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.82 1999-11-21 09:36:46 fenner Exp $ (LBL) dnl dnl Copyright (c) 1994, 1995, 1996, 1997 dnl The Regents of the University of California. All rights reserved. @@ -602,6 +602,8 @@ AC_SUBST(LOCALSRC) AC_PROG_INSTALL +AC_CONFIG_HEADER(config.h) + AC_OUTPUT(Makefile) if test -f .devel ; then diff --git a/gmt2local.c b/gmt2local.c index 68495741..56264653 100644 --- a/gmt2local.c +++ b/gmt2local.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.2 1999-10-07 23:47:10 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.3 1999-11-21 09:36:47 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.4 1999-10-07 23:47:10 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.5 1999-11-21 09:36:47 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/parsenfsfh.c b/parsenfsfh.c index d709e8fe..1759b3a0 100644 --- a/parsenfsfh.c +++ b/parsenfsfh.c @@ -9,7 +9,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.15 1999-11-21 05:43:50 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.16 1999-11-21 09:36:47 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> @@ -26,6 +26,10 @@ static char rcsid[] = "@(#) Header: print-ah.c,v 1.37 94/06/10 17:01:42 mccanne Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/param.h> #include <sys/time.h> #include <sys/types.h> diff --git a/print-arp.c b/print-arp.c index e7d5a635..4760f817 100644 --- a/print-arp.c +++ b/print-arp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.43 1999-10-07 23:47:11 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.44 1999-11-21 09:36:48 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-atalk.c b/print-atalk.c index 0a5a3f67..5134ebc1 100644 --- a/print-atalk.c +++ b/print-atalk.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.50 1999-10-30 05:11:10 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.51 1999-11-21 09:36:48 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-atm.c b/print-atm.c index 74dc4c74..96bff48f 100644 --- a/print-atm.c +++ b/print-atm.c @@ -20,7 +20,11 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.11 1999-10-30 05:11:11 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.12 1999-11-21 09:36:48 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-bgp.c b/print-bgp.c index 06d10c77..6439132d 100644 --- a/print-bgp.c +++ b/print-bgp.c @@ -27,6 +27,10 @@ * SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/param.h> #include <sys/time.h> #include <sys/types.h> diff --git a/print-bootp.c b/print-bootp.c index fb1329e2..bdd4b3a6 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -22,7 +22,11 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.47 1999-10-17 23:35:47 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.48 1999-11-21 09:36:49 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-chdlc.c b/print-chdlc.c index 88903a50..d9e7db1d 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -22,7 +22,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.1 1999-10-30 05:11:11 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.2 1999-11-21 09:36:49 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-cip.c b/print-cip.c index aeeae2d6..18dab094 100644 --- a/print-cip.c +++ b/print-cip.c @@ -22,7 +22,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.1 1999-11-21 03:52:22 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.2 1999-11-21 09:36:49 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-decnet.c b/print-decnet.c index 6188bf75..aefca10a 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.26 1999-10-07 23:47:11 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.27 1999-11-21 09:36:50 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-dhcp6.c b/print-dhcp6.c index c5268a90..0885771c 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -29,7 +29,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.1 1999-10-30 05:11:12 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.2 1999-11-21 09:36:50 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-domain.c b/print-domain.c index e251df88..22717977 100644 --- a/print-domain.c +++ b/print-domain.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.41 1999-10-30 05:11:12 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.42 1999-11-21 09:36:50 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-dvmrp.c b/print-dvmrp.c index 41c5183b..a6350c74 100644 --- a/print-dvmrp.c +++ b/print-dvmrp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.15 1999-10-30 05:11:12 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.16 1999-11-21 09:36:51 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-egp.c b/print-egp.c index 68f7a965..0c2ba934 100644 --- a/print-egp.c +++ b/print-egp.c @@ -20,7 +20,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.23 1999-10-07 23:47:11 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.24 1999-11-21 09:36:51 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-esp.c b/print-esp.c index 2be2fdc7..68d987b6 100644 --- a/print-esp.c +++ b/print-esp.c @@ -26,6 +26,10 @@ static char rcsid[] = "@(#) Header: print-ah.c,v 1.37 94/06/10 17:01:42 mccanne Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <string.h> #include <sys/param.h> #include <sys/time.h> diff --git a/print-ether.c b/print-ether.c index e422b974..1ef7e47b 100644 --- a/print-ether.c +++ b/print-ether.c @@ -20,7 +20,11 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.47 1999-11-21 03:53:34 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.48 1999-11-21 09:36:51 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-fddi.c b/print-fddi.c index f26a7d15..30da1c26 100644 --- a/print-fddi.c +++ b/print-fddi.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.38 1999-11-21 06:04:00 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.39 1999-11-21 09:36:52 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #ifdef HAVE_FDDI diff --git a/print-frag6.c b/print-frag6.c index 6a85cfe2..ddfc3b49 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <sys/param.h> diff --git a/print-gre.c b/print-gre.c index 6963cf08..bdd02ecc 100644 --- a/print-gre.c +++ b/print-gre.c @@ -24,7 +24,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.5 1999-11-21 03:46:03 assar Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.6 1999-11-21 09:36:52 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-icmp.c b/print-icmp.c index ce674b33..22f03baf 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.41 1999-11-21 03:46:38 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.42 1999-11-21 09:36:52 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-icmp6.c b/print-icmp6.c index b2ddfe80..6f0015cb 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <ctype.h> diff --git a/print-igrp.c b/print-igrp.c index 16dfc801..4232d7b8 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.10 1999-10-30 05:11:14 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.11 1999-11-21 09:36:53 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.73 1999-11-21 03:47:35 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.74 1999-11-21 09:36:53 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ip6.c b/print-ip6.c index 0ace74ef..5350153c 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-ip.c,v 2.1 1995/02/03 18:14:45 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <sys/param.h> diff --git a/print-ip6opts.c b/print-ip6opts.c index fe715b79..1fb6b66c 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -27,6 +27,10 @@ * SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <sys/param.h> #include <sys/time.h> diff --git a/print-ipcomp.c b/print-ipcomp.c index ed2f49d0..ba2987ae 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <string.h> #include <sys/param.h> #include <sys/time.h> diff --git a/print-ipx.c b/print-ipx.c index 4e9c3e14..83b8330a 100644 --- a/print-ipx.c +++ b/print-ipx.c @@ -24,7 +24,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.21 1999-10-30 05:11:15 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.22 1999-11-21 09:36:54 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-isakmp.c b/print-isakmp.c index f0977cc0..02b7ca48 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -30,7 +30,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.7 1999-10-30 23:45:51 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.8 1999-11-21 09:36:54 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <string.h> diff --git a/print-isoclns.c b/print-isoclns.c index bdb39752..300228ec 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.15 1999-10-07 23:47:11 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.16 1999-11-21 09:36:55 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/print-krb.c b/print-krb.c index 63bfc863..d636c1f4 100644 --- a/print-krb.c +++ b/print-krb.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.11 1999-10-30 05:11:17 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.12 1999-11-21 09:36:55 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-l2tp.c b/print-l2tp.c index 619aed5f..eff002de 100644 --- a/print-l2tp.c +++ b/print-l2tp.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.3 1999-11-17 04:14:50 assar Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.4 1999-11-21 09:36:55 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/print-lane.c b/print-lane.c index cdab8dc5..7ff6fe8d 100644 --- a/print-lane.c +++ b/print-lane.c @@ -22,7 +22,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.1 1999-11-21 03:52:11 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.2 1999-11-21 09:36:56 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-lcp.c b/print-lcp.c index 95c4696a..542bd893 100644 --- a/print-lcp.c +++ b/print-lcp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = -"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.1 1999-11-21 03:54:24 assar Exp $ (LBL)"; +"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.2 1999-11-21 09:36:56 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-llc.c b/print-llc.c index 1a90b078..5515dc5e 100644 --- a/print-llc.c +++ b/print-llc.c @@ -24,7 +24,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.24 1999-10-07 23:47:11 mcr Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.25 1999-11-21 09:36:56 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-mobile.c b/print-mobile.c index 4cbbc918..b6c414c8 100644 --- a/print-mobile.c +++ b/print-mobile.c @@ -43,6 +43,10 @@ __RCSID("$NetBSD: print-mobile.c,v 1.2 1998/09/30 08:57:01 hwr Exp $"); #endif #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/param.h> #include <sys/time.h> #include <sys/uio.h> diff --git a/print-netbios.c b/print-netbios.c index b2fd6223..98331d99 100644 --- a/print-netbios.c +++ b/print-netbios.c @@ -24,7 +24,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.12 1999-10-30 05:11:18 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.13 1999-11-21 09:36:57 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-nfs.c b/print-nfs.c index 41c177eb..d1cd0286 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.67 1999-11-21 05:43:50 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.68 1999-11-21 09:36:57 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ntp.c b/print-ntp.c index 97419790..661ed30f 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -25,7 +25,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.26 1999-10-07 23:47:12 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.27 1999-11-21 09:36:57 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-null.c b/print-null.c index 96d83cdc..b0cafe12 100644 --- a/print-null.c +++ b/print-null.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.27 1999-11-21 03:48:05 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.28 1999-11-21 09:36:58 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ospf.c b/print-ospf.c index 4d247556..094977ed 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.26 1999-10-30 05:11:19 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.27 1999-11-21 09:36:58 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ospf6.c b/print-ospf6.c index 61ab381e..42b7a318 100644 --- a/print-ospf6.c +++ b/print-ospf6.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.1 1999-10-30 05:11:19 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.2 1999-11-21 09:36:58 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-pim.c b/print-pim.c index 7877998d..709d48d1 100644 --- a/print-pim.c +++ b/print-pim.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.12 1999-11-17 14:58:13 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.13 1999-11-21 09:36:59 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ppp.c b/print-ppp.c index 763e03f2..92fa03b5 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.30 1999-11-21 03:48:53 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.31 1999-11-21 09:36:59 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-pppoe.c b/print-pppoe.c index 78cfb99a..88dac89f 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = -"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.1 1999-11-21 03:54:24 assar Exp $ (LBL)"; +"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.2 1999-11-21 09:36:59 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-raw.c b/print-raw.c index 91dc575b..c7504902 100644 --- a/print-raw.c +++ b/print-raw.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.24 1999-10-30 05:11:20 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.25 1999-11-21 09:37:00 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-rip.c b/print-rip.c index be601712..719e119f 100644 --- a/print-rip.c +++ b/print-rip.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.38 1999-10-30 05:11:20 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.39 1999-11-21 09:37:00 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-ripng.c b/print-ripng.c index 69864b3a..3288a29a 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-rip.c,v 2.1 1995/02/03 18:15:05 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <sys/param.h> diff --git a/print-rt6.c b/print-rt6.c index 39c09b3d..b8e16d59 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -24,6 +24,10 @@ static const char rcsid[] = "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)"; #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef INET6 #include <sys/param.h> @@ -13,7 +13,11 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: print-rx.c,v 1.3 1999-11-17 22:19:41 assar Exp $"; + "@(#) $Id: print-rx.c,v 1.4 1999-11-21 09:37:00 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <stdio.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.44 1999-11-21 03:49:30 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.45 1999-11-21 09:37:01 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #ifdef HAVE_NET_SLIP_H diff --git a/print-snmp.c b/print-snmp.c index 5c417e7b..15a0892b 100644 --- a/print-snmp.c +++ b/print-snmp.c @@ -42,7 +42,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.36 1999-10-17 22:18:02 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.37 1999-11-21 09:37:01 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-sunrpc.c b/print-sunrpc.c index adb1fa6d..bc4dc5c5 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.28 1999-10-30 05:11:21 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.29 1999-11-21 09:37:02 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-tcp.c b/print-tcp.c index 532d7bd8..3a2af9c6 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.58 1999-11-21 03:50:02 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.59 1999-11-21 09:37:02 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-tftp.c b/print-tftp.c index d0554b0c..17b34b57 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -23,7 +23,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.30 1999-10-07 23:47:12 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.31 1999-11-21 09:37:03 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-udp.c b/print-udp.c index d1e734b8..c200951f 100644 --- a/print-udp.c +++ b/print-udp.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.64 1999-11-17 05:45:58 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.65 1999-11-21 09:37:03 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> diff --git a/print-vjc.c b/print-vjc.c index 31ee13fa..68fd869f 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if defined(__bsdi__) #ifndef lint @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.24 1999-10-07 23:47:12 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.25 1999-11-21 09:37:03 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.3 1999-10-30 05:11:22 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.4 1999-11-21 09:37:04 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/setsignal.c b/setsignal.c index f89db0c5..058fb152 100644 --- a/setsignal.c +++ b/setsignal.c @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.4 1999-10-07 23:47:12 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.5 1999-11-21 09:37:04 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> diff --git a/strcasecmp.c b/strcasecmp.c index f2ac0771..8f9bcf2a 100644 --- a/strcasecmp.c +++ b/strcasecmp.c @@ -14,6 +14,10 @@ static const char sccsid[] = "@(#)strcasecmp.c 5.5 (Berkeley) 11/24/87"; #endif /* LIBC_SCCS and not lint */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/types.h> #include "interface.h" @@ -24,7 +24,7 @@ static const char copyright[] = "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.134 1999-11-21 03:50:26 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.135 1999-11-21 09:37:04 fenner Exp $ (LBL)"; #endif /* @@ -35,6 +35,10 @@ static const char rcsid[] = * combined efforts of Van, Steve McCanne and Craig Leres of LBL. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/types.h> #include <sys/time.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.59 1999-11-21 03:51:05 assar Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.60 1999-11-21 09:37:05 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> @@ -21,7 +21,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.2 1999-10-07 23:47:13 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.3 1999-11-21 09:37:05 fenner Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/types.h> |