Merge tcpdump 3.5

2 files changed, 237 insertions, 13 deletions

diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 145a03c..4d00123 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,22 +1,23 @@
 # $FreeBSD$
 
 PROG=	tcpdump
-CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_NET_SLIP_H=1 -DTIME_WITH_SYS_TIME=1 \
-	-DHAVE_ETHER_NTOHOST=1 -DHAVE_SETLINEBUF=1 -DSTDC_HEADERS=1 \
-	-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SOCKADDR_SA_LEN=1 \
-	-DHAVE_TM_GMTOFF=1 -DLBL_ALIGN=1 -DPPP -DHAVE_FDDI
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
 MAN1=	tcpdump.1
 SRCS =	version.c tcpdump.c \
-	print-arp.c print-atalk.c print-atm.c print-fr.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-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-sunrpc.c print-tcp.c print-tftp.c print-udp.c \
-	print-wb.c \
 	addrtoname.c bpf_dump.c gmt2local.c machdep.c parsenfsfh.c \
-	setsignal.c savestr.c util.c print-token.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
 CLEANFILES+=	version.c
 DPADD+=	${LIBL} ${LIBPCAP}
 LDADD+=	-ll -lpcap
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
new file mode 100644
index 0000000..12eabbb
--- /dev/null
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -0,0 +1,223 @@
+/* $FreeBSD$ */
+
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically 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 <sys/time.h> and <time.h>.  */
+#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 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 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
+
+/* 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 */
+
+/* define if you have the addrinfo function. */
+#define HAVE_ADDRINFO 1
+
+/* define if you need to include missing/addrinfoh.h. */
+/* #undef NEED_ADDRINFO_H */
+
+/* define ifyou have the h_errno variable. */
+#define HAVE_H_ERRNO 1
+
+/* define if IN6ADDRSZ is defined (XXX not used!) */
+#define HAVE_IN6ADDRSZ 1
+
+/* define if INADDRSZ is defined (XXX not used!) */
+#define HAVE_INADDRSZ 1
+
+/* define if you have <net/slip.h> */
+#define HAVE_NET_SLIP_H 1
+
+/* define if this is a development version, to use additional prototypes. */
+/* #undef HAVE_OS_PROTO_H */
+
+/* define if <unistd.h> defines __P() */
+#define HAVE_PORTABLE_PROTOTYPE 1
+
+/* define if RES_USE_INET6 is defined */
+#define HAVE_RES_USE_INET6 1
+
+/* define if struct sockaddr has the sa_len member */
+#define HAVE_SOCKADDR_SA_LEN 1
+
+/* define if you have struct sockaddr_storage */
+#define HAVE_SOCKADDR_STORAGE 1
+
+/* define if unaligned memory accesses fail */
+/* #undef LBL_ALIGN */
+
+/* The successful return value from signal (?)XXX */
+#define 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.  */
+#define SIZEOF_CHAR 1
+
+/* The number of bytes in a int.  */
+#define SIZEOF_INT 4
+
+/* 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 the ether_ntohost function.  */
+#define HAVE_ETHER_NTOHOST 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 getnameinfo function.  */
+#define HAVE_GETNAMEINFO 1
+
+/* Define if you have the inet_aton function.  */
+#define HAVE_INET_ATON 1
+
+/* Define if you have the inet_ntop function.  */
+#define HAVE_INET_NTOP 1
+
+/* Define if you have the inet_pton function.  */
+#define HAVE_INET_PTON 1
+
+/* Define if you have the pfopen function.  */
+/* #undef HAVE_PFOPEN */
+
+/* Define if you have the setlinebuf function.  */
+#define HAVE_SETLINEBUF 1
+
+/* Define if you have the sigaction function.  */
+#define HAVE_SIGACTION 1
+
+/* Define if you have the sigset function.  */
+/* #undef HAVE_SIGSET */
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+
+/* Define if you have the vfprintf function.  */
+#define HAVE_VFPRINTF 1
+
+/* Define if you have the <cast.h> header file.  */
+/* #undef HAVE_CAST_H */
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <malloc.h> header file.  */
+/* #undef HAVE_MALLOC_H */
+
+/* Define if you have the <memory.h> header file.  */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the <net/slip.h> header file.  */
+#define HAVE_NET_SLIP_H 1
+
+/* 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 <smi.h> header file.  */
+/* #undef HAVE_SMI_H */
+
+/* Define if you have the <zlib.h> header file.  */
+#define HAVE_ZLIB_H 1
+
+/* 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 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 you have the z library (-lz).  */
+#define HAVE_LIBZ 1