From 34347470cf5d897446825cc4286e76240afe7f52 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Fri, 21 Jun 2002 00:52:33 +0000 Subject: [PATCH] Update for tcpdump 3.7.1 --- usr.sbin/tcpdump/tcpdump/Makefile | 38 +++++++++++++------------- usr.sbin/tcpdump/tcpdump/config.h | 45 ++++++++++++------------------- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 81498f3dbeda..788e629426cd 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -5,27 +5,27 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump PROG= tcpdump SRCS= addrtoname.c gmt2local.c machdep.c parsenfsfh.c \ - print-ah.c print-arp.c print-ascii.c print-atalk.c \ - print-atm.c print-bgp.c print-bootp.c print-bxxp.c \ - print-cdp.c print-chdlc.c print-cip.c print-cnfp.c \ - print-decnet.c print-domain.c print-dvmrp.c \ - print-egp.c print-esp.c print-ether.c print-fddi.c \ - print-gre.c print-icmp.c \ - print-igmp.c print-igrp.c print-ip.c \ - print-ipcomp.c print-ipx.c print-isakmp.c \ - print-isoclns.c print-krb.c print-l2tp.c print-lane.c \ - print-lcp.c print-llc.c print-mobile.c print-nfs.c \ - print-ntp.c print-null.c print-ospf.c \ - print-pim.c print-ppp.c print-pppoe.c print-radius.c \ - print-raw.c print-rip.c \ - print-rx.c print-sl.c print-sll.c print-smb.c print-snmp.c \ - print-stp.c print-sunrpc.c print-tcp.c print-telnet.c \ - print-tftp.c print-timed.c print-token.c print-udp.c \ - print-vjc.c print-vrrp.c print-wb.c \ - savestr.c setsignal.c smbutil.c tcpdump.c util.c version.c + print-802_11.c print-ah.c print-arcnet.c print-arp.c \ + print-ascii.c print-atalk.c print-atm.c print-bgp.c \ + print-bootp.c print-beep.c print-cdp.c print-chdlc.c \ + print-cip.c print-cnfp.c print-decnet.c print-domain.c \ + print-dvmrp.c print-egp.c print-esp.c print-ether.c \ + print-fddi.c print-gre.c print-hsrp.c print-icmp.c \ + print-igmp.c print-igrp.c print-ip.c print-ipcomp.c \ + print-ipx.c print-isakmp.c print-isoclns.c print-krb.c \ + print-l2tp.c print-lane.c print-lcp.c print-llc.c print-lwres.c \ + print-msdp.c print-mobile.c print-mpls.c print-nfs.c \ + print-ntp.c print-null.c print-ospf.c print-pim.c \ + print-ppp.c print-pppoe.c print-pptp.c print-radius.c \ + print-raw.c print-rip.c print-rx.c print-sctp.c \ + print-sl.c print-sll.c print-smb.c print-snmp.c \ + print-stp.c print-sunrpc.c print-tcp.c \ + print-telnet.c print-tftp.c print-timed.c print-token.c \ + print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \ + setsignal.c smbutil.c tcpdump.c util.c version.c CLEANFILES+= version.c -CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}/lbl +CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} -I${TCPDUMP_DISTDIR}/lbl CFLAGS+= -DHAVE_CONFIG_H .if !defined(NOINET6) diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index b0b44815a270..b84ee2cf5e54 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -18,10 +18,6 @@ /* Define if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 -/* 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 0.9.0b with the buggy cast128. */ /* #undef HAVE_BUGGY_CAST128 */ @@ -65,8 +61,8 @@ /* define if you have struct sockaddr_storage */ #define HAVE_SOCKADDR_STORAGE 1 -/* define if you have both getipnodebyname() and getipnodebyaddr() */ -#define USE_GETIPNODEBY 1 +/* define if you have ether_ntohost() and it works */ +#define USE_ETHER_NTOHOST 1 /* define if unaligned memory accesses fail */ /* #undef LBL_ALIGN */ @@ -91,6 +87,17 @@ /* #undef u_int32_t */ /* #undef u_int8_t */ +/* Whether or not to include the possibly-buggy SMB printer */ +#define TCPDUMP_DO_SMB 1 + +/* Long story short: aclocal.m4 depends on autoconf 2.13 + * implementation details wrt "const"; newer versions + * have different implementation details so for now we + * put "const" here. This may cause duplicate definitions + * in config.h but that should be OK since they're the same. + */ +/* #undef const */ + /* The number of bytes in a char. */ #define SIZEOF_CHAR 1 @@ -109,18 +116,9 @@ /* Define if you have the ether_ntohost function. */ #define HAVE_ETHER_NTOHOST 1 -/* Define if you have the freeaddrinfo function. */ -#define HAVE_FREEADDRINFO 1 - /* Define if you have the getaddrinfo function. */ #define HAVE_GETADDRINFO 1 -/* Define if you have the getipnodebyaddr function. */ -#define HAVE_GETIPNODEBYADDR 1 - -/* Define if you have the getipnodebyname function. */ -#define HAVE_GETIPNODEBYNAME 1 - /* Define if you have the getnameinfo function. */ #define HAVE_GETNAMEINFO 1 @@ -150,6 +148,9 @@ /* Define if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 + +/* Define if you have the strdup function. */ +#define HAVE_STRDUP 1 /* Define if you have the strlcat function. */ #define HAVE_STRLCAT 1 @@ -177,7 +178,7 @@ /* #undef HAVE_RC5_H */ /* Define if you have the header file. */ -/* #undef HAVE_RPC_RPCENT_H */ +#define HAVE_RPC_RPCENT_H 1 /* Define if you have the header file. */ /* #undef HAVE_SMI_H */ @@ -189,24 +190,12 @@ /* Define if you have the dnet library (-ldnet). */ /* #undef HAVE_LIBDNET */ -/* Define if you have the nsl library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* 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 smi library (-lsmi). */ /* #undef HAVE_LIBSMI */ -/* Define if you have the socket library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - -/* Define if you have the str library (-lstr). */ -/* #undef HAVE_LIBSTR */ - /* define if your compiler has __attribute__ */ #define HAVE___ATTRIBUTE__ 1