From db5bc54c03cb7195e3983a1bfc9200095065aaa2 Mon Sep 17 00:00:00 2001 From: sam Date: Sun, 29 May 2005 19:11:21 +0000 Subject: update after import of v3.9.1-096 Reviewed by: bms --- usr.sbin/tcpdump/tcpdump/Makefile | 14 ++++++++----- usr.sbin/tcpdump/tcpdump/config.h | 44 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 8 deletions(-) (limited to 'usr.sbin/tcpdump') diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 0526ced..82cb851 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -4,24 +4,28 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump -SRCS= addrtoname.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \ +SRCS= addrtoname.c cpack.c gmpls.c gmt2local.c ipproto.c \ + machdep.c nlpid.c l2vpn.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-enc.c print-esp.c print-ether.c \ + print-dvmrp.c print-eap.c print-egp.c print-eigrp.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-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c \ print-l2tp.c print-lane.c print-ldp.c print-llc.c \ + print-lmp.c print-lspping.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-rsvp.c print-rx.c print-sctp.c \ - print-sl.c print-sll.c print-smb.c print-snmp.c \ - print-stp.c print-sunatm.c print-sunrpc.c print-tcp.c \ + print-sip.c print-sl.c print-sll.c print-smb.c print-snmp.c \ + print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c \ + print-syslog.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 diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 5ab8348..e860255 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -9,6 +9,9 @@ /* Define if you have SSLeay 0.9.0b with the buggy cast128. */ /* #undef HAVE_BUGGY_CAST128 */ +/* Define if you enable IPv6 support */ +/* #undef INET6 */ + /* Define if you enable support for the libsmi. */ /* #undef LIBSMI */ @@ -21,6 +24,8 @@ /* define if your struct __res_state has the nsort member */ /* #undef HAVE_NEW_RES_STATE */ +/* define if defines PRI[doxu]64 macros */ +#define INTTYPES_H_DEFINES_FORMATS 1 /* * define if struct ether_header.ether_dhost is a struct with ether_addr_octet @@ -87,6 +92,9 @@ /* define if libpcap has pcap_datalink_val_to_description() */ #define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 +/* define if you have getrpcbynumber() */ +#define HAVE_GETRPCBYNUMBER 1 + /* define if unaligned memory accesses fail */ /* #undef LBL_ALIGN */ @@ -107,9 +115,17 @@ /* #undef int8_t */ /* #undef int16_t */ /* #undef int32_t */ +/* #undef int64_t */ +/* #undef u_int8_t */ /* #undef u_int16_t */ /* #undef u_int32_t */ -/* #undef u_int8_t */ +/* #undef u_int64_t */ + +/* Workaround for missing 64-bit formats */ +/* #undef PRId64 */ +/* #undef PRIo64 */ +/* #undef PRIx64 */ +/* #undef PRIu64 */ /* Whether or not to include the possibly-buggy SMB printer */ #define TCPDUMP_DO_SMB 1 @@ -128,9 +144,22 @@ /* Define if you have a dnet_htoa declaration in . */ /* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */ +/* define if should drop privileges by default */ +/* #undef WITH_USER */ + +/* define if should chroot when dropping privileges */ +/* #undef WITH_CHROOT */ + +/* Define to 1 if you have the `alarm' function. */ +#define HAVE_ALARM 1 + /* Define to 1 if you have the `bpf_dump' function. */ #define HAVE_BPF_DUMP 1 +/* Define to 1 if you have the declaration of `ether_ntohost', and to 0 if you + don't. */ +#define HAVE_DECL_ETHER_NTOHOST 1 + /* Define to 1 if you have the `ether_ntohost' function. */ #define HAVE_ETHER_NTOHOST 1 @@ -165,10 +194,10 @@ /* #undef HAVE_NETINET_ETHER_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_NETINET_IF_ETHER_H */ +#define HAVE_NETINET_IF_ETHER_H 1 /* Define to 1 if you have the header file. */ -/* #define HAVE_OPENSSL_EVP_H 1 */ +/* #undef HAVE_OPENSSL_EVP_H 1 */ /* Define to 1 if you have the `pcap_breakloop' function. */ #define HAVE_PCAP_BREAKLOOP 1 @@ -254,6 +283,12 @@ /* define if your compiler has __attribute__ */ #define HAVE___ATTRIBUTE__ 1 +/* Define to 1 if netinet/ether.h declares `ether_ntohost' */ +/* #undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST */ + +/* Define to 1 if netinet/if_ether.h declares `ether_ntohost' */ +#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -281,6 +316,9 @@ /* The size of a `long', as computed by sizeof. */ #define SIZEOF_LONG 4 +/* The size of a `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + /* The size of a `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -- cgit v1.1