From ad0c9114e00a9a30168e0c13c17d8f65571aa67f Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 10 Feb 2017 07:22:12 +0000 Subject: Merge r309649, r313048, r313083, r313104: tcpdump 4.9.0 --- usr.sbin/tcpdump/tcpdump/Makefile | 35 ++++++++++++++++++++----------- usr.sbin/tcpdump/tcpdump/config.h | 43 ++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 33 deletions(-) (limited to 'usr.sbin/tcpdump') diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index ec585f4..6967a14 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -8,7 +8,9 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump PROG= tcpdump SRCS= addrtoname.c \ + addrtostr.c \ af.c \ + ascii_strcasecmp.c \ checksum.c \ cpack.c \ gmpls.c \ @@ -17,9 +19,11 @@ SRCS= addrtoname.c \ ipproto.c \ l2vpn.c \ machdep.c \ + netdissect.c \ nlpid.c \ oui.c \ parsenfsfh.c \ + print.c \ print-802_11.c \ print-802_15_4.c \ print-ah.c \ @@ -32,6 +36,7 @@ SRCS= addrtoname.c \ print-ascii.c \ print-atalk.c \ print-atm.c \ + print-babel.c \ print-beep.c \ print-bfd.c \ print-bgp.c \ @@ -46,6 +51,7 @@ SRCS= addrtoname.c \ print-cnfp.c \ print-dccp.c \ print-decnet.c \ + print-dhcp6.c \ print-domain.c \ print-dtp.c \ print-dvmrp.c \ @@ -58,17 +64,21 @@ SRCS= addrtoname.c \ print-fddi.c \ print-forces.c \ print-fr.c \ + print-frag6.c \ print-ftp.c \ print-geneve.c \ print-geonet.c \ print-gre.c \ + print-hncp.c \ print-hsrp.c \ print-http.c \ print-icmp.c \ + print-icmp6.c \ print-igmp.c \ print-igrp.c \ print-ip.c \ print-ip6.c \ + print-ip6opts.c \ print-ipcomp.c \ print-ipfc.c \ print-ipnet.c \ @@ -80,6 +90,7 @@ SRCS= addrtoname.c \ print-l2tp.c \ print-lane.c \ print-ldp.c \ + print-lisp.c \ print-llc.c \ print-lldp.c \ print-lmp.c \ @@ -88,19 +99,23 @@ SRCS= addrtoname.c \ print-lwapp.c \ print-lwres.c \ print-m3ua.c \ + print-medsa.c \ print-mobile.c \ + print-mobility.c \ print-mpcp.c \ print-mpls.c \ print-mptcp.c \ print-msdp.c \ print-msnlb.c \ print-nfs.c \ + print-nsh.c \ print-ntp.c \ print-null.c \ print-olsr.c \ print-openflow.c \ print-openflow-1.0.c \ print-ospf.c \ + print-ospf6.c \ print-otv.c \ print-pgm.c \ print-pim.c \ @@ -111,10 +126,13 @@ SRCS= addrtoname.c \ print-pptp.c \ print-radius.c \ print-raw.c \ + print-resp.c \ print-rip.c \ + print-ripng.c \ print-rpki-rtr.c \ print-rrcp.c \ print-rsvp.c \ + print-rt6.c \ print-rtsp.c \ print-rx.c \ print-sctp.c \ @@ -144,14 +162,16 @@ SRCS= addrtoname.c \ print-vrrp.c \ print-vtp.c \ print-vxlan.c \ + print-vxlan-gpe.c \ print-wb.c \ print-zephyr.c \ print-zeromq.c \ setsignal.c \ signature.c \ smbutil.c \ + strtoaddr.c \ tcpdump.c \ - util.c \ + util-print.c \ version.c CLEANFILES+= version.c @@ -160,16 +180,7 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -D_U_="__attribute__((unused))" .if ${MK_INET6_SUPPORT} != "no" -SRCS+= print-babel.c \ - print-dhcp6.c \ - print-frag6.c \ - print-icmp6.c \ - print-ip6opts.c \ - print-mobility.c \ - print-ospf6.c \ - print-ripng.c \ - print-rt6.c -CFLAGS+= -DINET6 +CFLAGS+= -DINET6 -DHAVE_OS_IPV6_SUPPORT .endif .if ${MACHINE_CPUARCH} != "i386" CFLAGS+= -DLBL_ALIGN @@ -190,7 +201,7 @@ CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H .if ${MK_PF} != "no" SRCS+= print-pflog.c \ print-pfsync.c -CFLAGS+= -DHAVE_NET_PFVAR_H +CFLAGS+= -DHAVE_NET_PFVAR_H -DHAVE_NET_IF_PFLOG_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 79a07e7..8980b31 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -4,8 +4,8 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* define if you have the addrinfo function */ -#define HAVE_ADDRINFO 1 +/* define if you want to build the possibly-buggy SMB printer */ +#define ENABLE_SMB 1 /* Define to 1 if you have the `alarm' function. */ #define HAVE_ALARM 1 @@ -14,6 +14,9 @@ #define HAVE_BPF_DUMP 1 /* capsicum support available */ +#define HAVE_CAPSICUM 1 + +/* Casper library support available */ /* See Makefile */ /* #undef HAVE_CASPER */ @@ -39,24 +42,21 @@ /* Define to 1 if you have the `ether_ntohost' function. */ #define HAVE_ETHER_NTOHOST 1 +/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */ +#define HAVE_EVP_CIPHER_CTX_NEW 1 + /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `fork' function. */ #define HAVE_FORK 1 -/* Define to 1 if you have the `getnameinfo' function. */ -#define HAVE_GETNAMEINFO 1 - /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 /* define if you have getrpcbynumber() */ #define HAVE_GETRPCBYNUMBER 1 -/* define if you have the h_errno variable */ -#define HAVE_H_ERRNO 1 - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -85,6 +85,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_NETINET_IF_ETHER_H 1 +/* Define to 1 if you have the header file. */ +/* See Makefile */ +/* #undef HAVE_NET_IF_PFLOG_H */ + /* Define to 1 if you have the header file. */ /* See Makefile */ /* #undef HAVE_NET_PFVAR_H */ @@ -96,6 +100,10 @@ /* See Makefile */ /* #undef HAVE_OPENSSL_EVP_H 1 */ +/* define if the OS provides AF_INET6 and struct in6_addr */ +/* See Makefile */ +/* #undef HAVE_OS_IPV6_SUPPORT */ + /* if there's an os_proto.h for this platform, to use additional prototypes */ /* #undef HAVE_OS_PROTO_H */ @@ -150,6 +158,12 @@ /* Define to 1 if you have the `pcap_set_immediate_mode' function. */ #define HAVE_PCAP_SET_IMMEDIATE_MODE 1 +/* Define to 1 if you have the `pcap_set_optimizer_debug' function. */ +/* #undef HAVE_PCAP_SET_OPTIMIZER_DEBUG */ + +/* Define to 1 if you have the `pcap_set_parser_debug' function. */ +/* #undef HAVE_PCAP_SET_PARSER_DEBUG */ + /* Define to 1 if you have the `pcap_set_tstamp_precision' function. */ #define HAVE_PCAP_SET_TSTAMP_PRECISION 1 @@ -192,9 +206,6 @@ /* 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 to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -246,16 +257,9 @@ /* define if your compiler has __attribute__ */ #define HAVE___ATTRIBUTE__ 1 -/* Define if you enable IPv6 support */ -/* See Makefile */ -/* #undef INET6 */ - /* if unaligned access fails */ /* #undef LBL_ALIGN */ -/* define if you need to include missing/addrinfo.h */ -/* #undef NEED_ADDRINFO_H */ - /* Define to 1 if netinet/ether.h declares `ether_ntohost' */ /* #undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST */ @@ -301,9 +305,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* define if you want to build the possibly-buggy SMB printer */ -#define TCPDUMP_DO_SMB 1 - /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 -- cgit v1.1