From 495c505dca03277b7667e442f08c679be322148c Mon Sep 17 00:00:00 2001 From: bms Date: Wed, 31 Mar 2004 15:00:44 +0000 Subject: Merge of tcpdump 3.8.3 from tcpdump.org. --- usr.sbin/tcpdump/tcpdump/Makefile | 29 +++-- usr.sbin/tcpdump/tcpdump/config.h | 241 ++++++++++++++++++++++++++------------ 2 files changed, 183 insertions(+), 87 deletions(-) (limited to 'usr.sbin/tcpdump/tcpdump') diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index a5ce197..bbdb21b 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -4,22 +4,24 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump -SRCS= addrtoname.c gmt2local.c machdep.c parsenfsfh.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 \ +SRCS= addrtoname.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \ + print-802_11.c print-ah.c print-aodv.c print-ap1394.c \ + print-arcnet.c print-arp.c print-ascii.c print-atalk.c \ + print-atm.c print-bfd.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-dvmrp.c print-egp.c print-enc.c print-esp.c print-ether.c \ + print-fddi.c print-fr.c print-gre.c print-hsrp.c print-icmp.c \ + print-igmp.c print-igrp.c print-ip.c print-ipfc.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-l2tp.c print-lane.c print-ldp.c print-llc.c \ + print-lwres.c print-msdp.c print-mobile.c print-mpls.c \ + print-netbios.c print-nfs.c print-ntp.c print-null.c \ + print-ospf.c print-pflog.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-raw.c print-rip.c print-rsvp.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-stp.c print-sunatm.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 @@ -27,10 +29,11 @@ CLEANFILES+= version.c CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -D_U_="__attribute__((unused))" .if !defined(NOINET6) SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ - print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c + print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-mobility.c CFLAGS+= -DINET6 .endif .if ${MACHINE_ARCH} != "i386" @@ -43,7 +46,7 @@ LDADD= -ll -lpcap DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H +CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 3e7c885..5ab8348 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -1,39 +1,35 @@ /* $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. */ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ /* "generated automatically" means DO NOT MAKE CHANGES TO config.h.in -- * make them to acconfig.h and rerun autoheader */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - /* Define if you have SSLeay 0.9.0b with the buggy cast128. */ /* #undef HAVE_BUGGY_CAST128 */ -/* 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 */ +/* Define if you have the header file. */ +/* #undef HAVE_SMI_H */ + /* 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 contains arp_xsha */ +/* #undef ETHER_ARP_HAS_X */ + /* define if you have the addrinfo function. */ #define HAVE_ADDRINFO 1 @@ -52,6 +48,9 @@ /* define if this is a development version, to use additional prototypes. */ /* #undef HAVE_OS_PROTO_H */ +/* define if defines __P() */ +/* #undef HAVE_PORTABLE_PROTOTYPE */ + /* define if RES_USE_INET6 is defined */ #define HAVE_RES_USE_INET6 1 @@ -61,9 +60,33 @@ /* define if you have struct sockaddr_storage */ #define HAVE_SOCKADDR_STORAGE 1 +/* define if you have both getipnodebyname() and getipnodebyaddr() */ +/* #undef USE_GETIPNODEBY */ + /* define if you have ether_ntohost() and it works */ #define USE_ETHER_NTOHOST 1 +/* define if libpcap has pcap_version */ +/* #undef HAVE_PCAP_VERSION */ + +/* define if libpcap has pcap_debug */ +/* #undef HAVE_PCAP_DEBUG */ + +/* define if libpcap has yydebug */ +/* #undef HAVE_YYDEBUG */ + +/* define if libpcap has pcap_list_datalinks() */ +#define HAVE_PCAP_LIST_DATALINKS 1 + +/* define if libpcap has pcap_set_datalink() */ +#define HAVE_PCAP_SET_DATALINK 1 + +/* define if libpcap has pcap_datalink_name_to_val() */ +#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1 + +/* define if libpcap has pcap_datalink_val_to_description() */ +#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 + /* define if unaligned memory accesses fail */ /* #undef LBL_ALIGN */ @@ -81,6 +104,7 @@ /* Workaround for missing sized types */ /* XXX this should move to the more standard uint*_t */ +/* #undef int8_t */ /* #undef int16_t */ /* #undef int32_t */ /* #undef u_int16_t */ @@ -98,104 +122,173 @@ */ /* #undef const */ -/* The number of bytes in a char. */ -#define SIZEOF_CHAR 1 - -/* The number of bytes in an int. */ -#define SIZEOF_INT 4 +/* Define if you have the dnet_htoa function. */ +/* #undef HAVE_DNET_HTOA */ -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 +/* Define if you have a dnet_htoa declaration in . */ +/* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */ -/* Define if you have the bpf_dump function. */ +/* Define to 1 if you have the `bpf_dump' function. */ #define HAVE_BPF_DUMP 1 -/* Define if you have the ether_ntohost function. */ +/* Define to 1 if you have the `ether_ntohost' function. */ #define HAVE_ETHER_NTOHOST 1 -/* Define if you have the getaddrinfo function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ #define HAVE_GETADDRINFO 1 -/* Define if you have the getnameinfo function. */ +/* Define to 1 if you have the `getnameinfo' function. */ #define HAVE_GETNAMEINFO 1 -/* Define if you have the inet_aton function. */ -/* #undef HAVE_INET_ATON */ +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +/* #undef HAVE_LIBCRYPTO */ + +/* Define to 1 if you have the `rpc' library (-lrpc). */ +/* #undef HAVE_LIBRPC */ + +/* Define to 1 if you have the `smi' library (-lsmi). */ +/* #undef HAVE_LIBSMI */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETDNET_DNETDB_H */ -/* Define if you have the inet_ntop function. */ -/* #undef HAVE_INET_NTOP */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETINET_ETHER_H */ -/* Define if you have the inet_pton function. */ -/* #undef HAVE_INET_PTON */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETINET_IF_ETHER_H */ -/* Define if you have the pfopen function. */ +/* Define to 1 if you have the header file. */ +/* #define HAVE_OPENSSL_EVP_H 1 */ + +/* Define to 1 if you have the `pcap_breakloop' function. */ +#define HAVE_PCAP_BREAKLOOP 1 + +/* Define to 1 if you have the `pcap_dump_flush' function. */ +#define HAVE_PCAP_DUMP_FLUSH 1 + +/* Define to 1 if you have the `pcap_findalldevs' function. */ +#define HAVE_PCAP_FINDALLDEVS 1 + +/* Define to 1 if the system has the type `pcap_if_t'. */ +#define HAVE_PCAP_IF_T 1 + +/* Define to 1 if you have the `pcap_lib_version' function. */ +#define HAVE_PCAP_LIB_VERSION 1 + +/* Define to 1 if you have the `pfopen' function. */ /* #undef HAVE_PFOPEN */ -/* Define if you have the setlinebuf function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_RPC_RPCENT_H 1 + +/* Define to 1 if you have the `setlinebuf' function. */ #define HAVE_SETLINEBUF 1 -/* Define if you have the sigaction function. */ +/* Define to 1 if you have the `sigaction' function. */ #define HAVE_SIGACTION 1 -/* Define if you have the sigset function. */ +/* Define to 1 if you have the `sigset' function. */ /* #undef HAVE_SIGSET */ -/* Define if you have the snprintf function. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SMI_H */ + +/* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 - -/* Define if you have the strdup function. */ + +/* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 -/* Define if you have the strlcat function. */ +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ #define HAVE_STRLCAT 1 -/* Define if you have the strlcpy function. */ +/* Define to 1 if you have the `strlcpy' function. */ #define HAVE_STRLCPY 1 -/* Define if you have the vfprintf function. */ +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vfprintf' function. */ #define HAVE_VFPRINTF 1 -/* Define if you have the vsnprintf function. */ +/* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 -/* Define if you have the header file. */ -/* Handled by Makefile, to allow optional crypto */ -/* #define HAVE_CAST_H 1 */ +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* Define if you have the header file. */ -#define HAVE_NETINET_IF_ETHER_H 1 +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" -/* Define if you have the header file. */ -/* #undef HAVE_RC5_H */ +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Define if you have the header file. */ -#define HAVE_RPC_RPCENT_H 1 +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* Define if you have the header file. */ -/* #undef HAVE_SMI_H */ +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Define if you have the crypto library (-lcrypto). */ -/* Handled by Makefile, to allow optional crypto */ -/* #define HAVE_LIBCRYPTO 1 */ +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void -/* Define if you have the dnet library (-ldnet). */ -/* #undef HAVE_LIBDNET */ +/* The size of a `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 -/* Define if you have the rpc library (-lrpc). */ -/* #undef HAVE_LIBRPC */ +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 -/* Define if you have the smi library (-lsmi). */ -/* #undef HAVE_LIBSMI */ +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 -/* define if your compiler has __attribute__ */ -#define HAVE___ATTRIBUTE__ 1 +/* The size of a `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 +/* Define as token for inline if inlining supported */ +#define inline inline -- cgit v1.1