diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index a7d77c1d5b00..132422aef0f6 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -3,29 +3,35 @@ PROG= tcpdump CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} SRCS = version.c tcpdump.c \ - addrtoname.c bpf_dump.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-chdlc.c print-cip.c print-decnet.c \ - print-dhcp6.c print-domain.c print-dvmrp.c print-egp.c print-esp.c \ - print-ether.c print-fddi.c print-frag6.c print-gre.c print-icmp.c \ - print-icmp6.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.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-ospf6.c \ - print-pim.c print-ppp.c print-pppoe.c print-raw.c print-rip.c \ - print-ripng.c print-rt6.c print-rx.c print-sl.c print-smb.c \ - print-snmp.c print-sunrpc.c print-tcp.c print-telnet.c print-tftp.c \ - print-token.c print-udp.c print-vjc.c print-wb.c \ - savestr.c setsignal.c smbutil.c util.c + print-arp.c print-atalk.c print-atm.c print-bootp.c \ + print-decnet.c print-domain.c print-dvmrp.c print-egp.c \ + print-ether.c print-fddi.c print-gre.c print-icmp.c print-igmp.c \ + print-igrp.c print-ip.c print-ipx.c print-isoclns.c print-krb.c \ + print-llc.c print-nfs.c print-ntp.c print-null.c print-ospf.c \ + print-pim.c print-ppp.c print-raw.c print-rip.c print-sl.c \ + print-snmp.c print-stp.c print-sunrpc.c print-tcp.c print-tftp.c \ + print-udp.c print-wb.c addrtoname.c gmt2local.c machdep.c \ + parsenfsfh.c util.c savestr.c setsignal.c \ + print-esp.c print-ah.c print-vjc.c print-isakmp.c print-chdlc.c \ + print-ipcomp.c print-mobile.c print-l2tp.c print-bgp.c print-rx.c \ + print-lane.c print-cip.c print-pppoe.c print-lcp.c \ + print-smb.c smbutil.c print-ascii.c print-telnet.c print-cnfp.c \ + print-vrrp.c print-cdp.c print-token.c print-bxxp.c print-timed.c \ + print-radius.c print-sll.c \ + print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ + print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c CLEANFILES+= version.c DPADD+= ${LIBL} ${LIBPCAP} LDADD+= -ll -lpcap +.if !defined(NOINET6) +CFLAGS+= -DINET6 +.endif .if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -CFLAGS+= -I${DESTDIR}/usr/include/openssl -DCRYPTO -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H +CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H .endif TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 12eabbb04c35..b0b44815a270 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -1,4 +1,5 @@ /* $FreeBSD$ */ +/* This is an edited copy of the config.h generated by configure. */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -21,45 +22,21 @@ 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. */ -#define ENABLE_IPV6 1 -#define INET6 1 +/* Define if you enable IPv6 support */ +/* Handled by Makefile, to allow NOINET6 */ +/* #define INET6 1 */ /* Define if you enable support for the libsmi. */ /* #undef LIBSMI */ -/* Is T_AAAA predefined? */ -#define HAVE_AAAA 1 - -/* 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 */ -#define HAVE_RES_STATE_EXT 1 +/* #undef HAVE_RES_STATE_EXT */ /* define if your struct __res_state has the nsort member */ -#define HAVE_NEW_RES_STATE 1 - -/* - * 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 */ +/* #undef HAVE_NEW_RES_STATE */ /* define if you have the addrinfo function. */ #define HAVE_ADDRINFO 1 @@ -76,15 +53,9 @@ /* define if INADDRSZ is defined (XXX not used!) */ #define HAVE_INADDRSZ 1 -/* define if you have */ -#define HAVE_NET_SLIP_H 1 - /* define if this is a development version, to use additional prototypes. */ /* #undef HAVE_OS_PROTO_H */ -/* define if defines __P() */ -#define HAVE_PORTABLE_PROTOTYPE 1 - /* define if RES_USE_INET6 is defined */ #define HAVE_RES_USE_INET6 1 @@ -94,6 +65,9 @@ /* 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 unaligned memory accesses fail */ /* #undef LBL_ALIGN */ @@ -109,9 +83,6 @@ /* 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 */ @@ -132,26 +103,35 @@ /* The number of bytes in a short. */ #define SIZEOF_SHORT 2 +/* Define if you have the bpf_dump function. */ +#define HAVE_BPF_DUMP 1 + /* 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 gethostbyname2 function. */ -#define HAVE_GETHOSTBYNAME2 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 /* Define if you have the inet_aton function. */ -#define HAVE_INET_ATON 1 +/* #undef HAVE_INET_ATON */ /* Define if you have the inet_ntop function. */ -#define HAVE_INET_NTOP 1 +/* #undef HAVE_INET_NTOP */ /* Define if you have the inet_pton function. */ -#define HAVE_INET_PTON 1 +/* #undef HAVE_INET_PTON */ /* Define if you have the pfopen function. */ /* #undef HAVE_PFOPEN */ @@ -165,26 +145,33 @@ /* Define if you have the sigset function. */ /* #undef HAVE_SIGSET */ +/* Define if you have the snprintf function. */ +#define HAVE_SNPRINTF 1 + /* Define if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 +/* Define if you have the strlcat function. */ +#define HAVE_STRLCAT 1 + +/* Define if you have the strlcpy function. */ +#define HAVE_STRLCPY 1 + /* Define if you have the vfprintf function. */ #define HAVE_VFPRINTF 1 +/* Define if you have the vsnprintf function. */ +#define HAVE_VSNPRINTF 1 + /* Define if you have the header file. */ -/* #undef HAVE_CAST_H */ +/* Handled by Makefile, to allow optional crypto */ +/* #define HAVE_CAST_H 1 */ /* Define if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the header file. */ -#define HAVE_NET_SLIP_H 1 +/* Define if you have the header file. */ +#define HAVE_NETINET_IF_ETHER_H 1 /* Define if you have the header file. */ /* #undef HAVE_RC5_H */ @@ -195,15 +182,16 @@ /* Define if you have the header file. */ /* #undef HAVE_SMI_H */ -/* Define if you have the header file. */ -#define HAVE_ZLIB_H 1 - /* Define if you have the crypto library (-lcrypto). */ -/* #undef HAVE_LIBCRYPTO */ +/* Handled by Makefile, to allow optional crypto */ +/* #define HAVE_LIBCRYPTO 1 */ /* 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 */ @@ -219,5 +207,6 @@ /* Define if you have the str library (-lstr). */ /* #undef HAVE_LIBSTR */ -/* Define if you have the z library (-lz). */ -#define HAVE_LIBZ 1 +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 +