Date: Wed, 7 Jan 2015 19:55:19 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump Message-ID: <201501071955.t07JtJve076116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Jan 7 19:55:18 2015 New Revision: 276788 URL: https://svnweb.freebsd.org/changeset/base/276788 Log: MFV r276761: tcpdump 4.6.2. MFC after: 1 month Added: head/contrib/tcpdump/README.md - copied unchanged from r276761, vendor/tcpdump/dist/README.md head/contrib/tcpdump/getopt_long.h - copied unchanged from r276761, vendor/tcpdump/dist/getopt_long.h head/contrib/tcpdump/missing/getopt_long.c - copied unchanged from r276761, vendor/tcpdump/dist/missing/getopt_long.c head/contrib/tcpdump/openflow.h - copied unchanged from r276761, vendor/tcpdump/dist/openflow.h head/contrib/tcpdump/print-ahcp.c - copied unchanged from r276761, vendor/tcpdump/dist/print-ahcp.c head/contrib/tcpdump/print-aoe.c - copied unchanged from r276761, vendor/tcpdump/dist/print-aoe.c head/contrib/tcpdump/print-calm-fast.c - copied unchanged from r276761, vendor/tcpdump/dist/print-calm-fast.c head/contrib/tcpdump/print-geonet.c - copied unchanged from r276761, vendor/tcpdump/dist/print-geonet.c head/contrib/tcpdump/print-loopback.c - copied unchanged from r276761, vendor/tcpdump/dist/print-loopback.c head/contrib/tcpdump/print-m3ua.c - copied unchanged from r276761, vendor/tcpdump/dist/print-m3ua.c head/contrib/tcpdump/print-mptcp.c - copied unchanged from r276761, vendor/tcpdump/dist/print-mptcp.c head/contrib/tcpdump/print-nflog.c - copied unchanged from r276761, vendor/tcpdump/dist/print-nflog.c head/contrib/tcpdump/print-openflow-1.0.c - copied unchanged from r276761, vendor/tcpdump/dist/print-openflow-1.0.c head/contrib/tcpdump/print-openflow.c - copied unchanged from r276761, vendor/tcpdump/dist/print-openflow.c head/contrib/tcpdump/print-pktap.c - copied unchanged from r276761, vendor/tcpdump/dist/print-pktap.c head/contrib/tcpdump/rpl.h - copied unchanged from r276761, vendor/tcpdump/dist/rpl.h Deleted: head/contrib/tcpdump/README head/contrib/tcpdump/acconfig.h head/contrib/tcpdump/aodv.h head/contrib/tcpdump/arcnet.h head/contrib/tcpdump/bgp.h head/contrib/tcpdump/dccp.h head/contrib/tcpdump/decnet.h head/contrib/tcpdump/decode_prefix.h head/contrib/tcpdump/enc.h head/contrib/tcpdump/esp.h head/contrib/tcpdump/fddi.h head/contrib/tcpdump/forces.h head/contrib/tcpdump/icmp6.h head/contrib/tcpdump/ieee802_11.h head/contrib/tcpdump/ieee802_11_radio.h head/contrib/tcpdump/igrp.h head/contrib/tcpdump/ipfc.h head/contrib/tcpdump/ipnet.h head/contrib/tcpdump/ipsec_doi.h head/contrib/tcpdump/ipx.h head/contrib/tcpdump/isakmp.h head/contrib/tcpdump/l2tp.h head/contrib/tcpdump/lane.h head/contrib/tcpdump/missing/sockstorage.h head/contrib/tcpdump/netbios.h head/contrib/tcpdump/ntp.h head/contrib/tcpdump/oakley.h head/contrib/tcpdump/ospf6.h head/contrib/tcpdump/pmap_prot.h head/contrib/tcpdump/ppi.h head/contrib/tcpdump/print-netbios.c head/contrib/tcpdump/route6d.h head/contrib/tcpdump/rx.h head/contrib/tcpdump/sctpConstants.h head/contrib/tcpdump/sctpHeader.h head/contrib/tcpdump/slip.h head/contrib/tcpdump/sll.h head/contrib/tcpdump/telnet.h head/contrib/tcpdump/tftp.h head/contrib/tcpdump/timed.h head/contrib/tcpdump/token.h Modified: head/contrib/tcpdump/CHANGES head/contrib/tcpdump/CREDITS head/contrib/tcpdump/INSTALL.txt head/contrib/tcpdump/Makefile-devel-adds head/contrib/tcpdump/Makefile.in head/contrib/tcpdump/VERSION head/contrib/tcpdump/addrtoname.c head/contrib/tcpdump/addrtoname.h head/contrib/tcpdump/af.c head/contrib/tcpdump/af.h head/contrib/tcpdump/ah.h head/contrib/tcpdump/appletalk.h head/contrib/tcpdump/atm.h head/contrib/tcpdump/atmuni31.h head/contrib/tcpdump/bootp.h head/contrib/tcpdump/bpf_dump.c head/contrib/tcpdump/chdlc.h head/contrib/tcpdump/checksum.c head/contrib/tcpdump/config.guess head/contrib/tcpdump/config.h.in head/contrib/tcpdump/config.sub head/contrib/tcpdump/configure head/contrib/tcpdump/configure.in head/contrib/tcpdump/cpack.c head/contrib/tcpdump/cpack.h head/contrib/tcpdump/ether.h head/contrib/tcpdump/ethertype.h head/contrib/tcpdump/extract.h head/contrib/tcpdump/gmpls.c head/contrib/tcpdump/gmpls.h head/contrib/tcpdump/gmt2local.c head/contrib/tcpdump/gmt2local.h head/contrib/tcpdump/in_cksum.c head/contrib/tcpdump/install-sh head/contrib/tcpdump/interface.h head/contrib/tcpdump/ip.h head/contrib/tcpdump/ip6.h head/contrib/tcpdump/ipproto.c head/contrib/tcpdump/ipproto.h head/contrib/tcpdump/l2vpn.c head/contrib/tcpdump/l2vpn.h head/contrib/tcpdump/lbl/os-osf4.h head/contrib/tcpdump/lbl/os-solaris2.h head/contrib/tcpdump/lbl/os-sunos4.h head/contrib/tcpdump/lbl/os-ultrix4.h head/contrib/tcpdump/llc.h head/contrib/tcpdump/machdep.c head/contrib/tcpdump/machdep.h head/contrib/tcpdump/makemib head/contrib/tcpdump/missing/addrinfo.h head/contrib/tcpdump/missing/datalinks.c head/contrib/tcpdump/missing/dlnames.c head/contrib/tcpdump/missing/getnameinfo.c head/contrib/tcpdump/missing/inet_aton.c head/contrib/tcpdump/missing/inet_ntop.c head/contrib/tcpdump/missing/inet_pton.c head/contrib/tcpdump/missing/snprintf.c head/contrib/tcpdump/missing/strdup.c head/contrib/tcpdump/missing/strlcat.c head/contrib/tcpdump/missing/strlcpy.c head/contrib/tcpdump/missing/strsep.c head/contrib/tcpdump/mkdep head/contrib/tcpdump/mpls.h head/contrib/tcpdump/nameser.h head/contrib/tcpdump/netdissect.h head/contrib/tcpdump/nfs.h head/contrib/tcpdump/nfsfh.h head/contrib/tcpdump/nlpid.c head/contrib/tcpdump/nlpid.h head/contrib/tcpdump/ospf.h head/contrib/tcpdump/oui.c head/contrib/tcpdump/oui.h head/contrib/tcpdump/parsenfsfh.c head/contrib/tcpdump/pcap-missing.h head/contrib/tcpdump/pcap_dump_ftell.c head/contrib/tcpdump/ppp.h head/contrib/tcpdump/print-802_11.c head/contrib/tcpdump/print-802_15_4.c head/contrib/tcpdump/print-ah.c head/contrib/tcpdump/print-aodv.c head/contrib/tcpdump/print-ap1394.c head/contrib/tcpdump/print-arcnet.c head/contrib/tcpdump/print-arp.c head/contrib/tcpdump/print-ascii.c head/contrib/tcpdump/print-atalk.c head/contrib/tcpdump/print-atm.c head/contrib/tcpdump/print-babel.c head/contrib/tcpdump/print-beep.c head/contrib/tcpdump/print-bfd.c head/contrib/tcpdump/print-bgp.c head/contrib/tcpdump/print-bootp.c head/contrib/tcpdump/print-bt.c head/contrib/tcpdump/print-carp.c head/contrib/tcpdump/print-cdp.c head/contrib/tcpdump/print-cfm.c head/contrib/tcpdump/print-chdlc.c head/contrib/tcpdump/print-cip.c head/contrib/tcpdump/print-cnfp.c head/contrib/tcpdump/print-dccp.c head/contrib/tcpdump/print-decnet.c head/contrib/tcpdump/print-dhcp6.c head/contrib/tcpdump/print-domain.c head/contrib/tcpdump/print-dtp.c head/contrib/tcpdump/print-dvmrp.c head/contrib/tcpdump/print-eap.c head/contrib/tcpdump/print-egp.c head/contrib/tcpdump/print-eigrp.c head/contrib/tcpdump/print-enc.c head/contrib/tcpdump/print-esp.c head/contrib/tcpdump/print-ether.c head/contrib/tcpdump/print-fddi.c head/contrib/tcpdump/print-forces.c head/contrib/tcpdump/print-fr.c head/contrib/tcpdump/print-frag6.c head/contrib/tcpdump/print-gre.c head/contrib/tcpdump/print-hsrp.c head/contrib/tcpdump/print-icmp.c head/contrib/tcpdump/print-icmp6.c head/contrib/tcpdump/print-igmp.c head/contrib/tcpdump/print-igrp.c head/contrib/tcpdump/print-ip.c head/contrib/tcpdump/print-ip6.c head/contrib/tcpdump/print-ip6opts.c head/contrib/tcpdump/print-ipcomp.c head/contrib/tcpdump/print-ipfc.c head/contrib/tcpdump/print-ipnet.c head/contrib/tcpdump/print-ipx.c head/contrib/tcpdump/print-isakmp.c head/contrib/tcpdump/print-isoclns.c head/contrib/tcpdump/print-juniper.c head/contrib/tcpdump/print-krb.c head/contrib/tcpdump/print-l2tp.c head/contrib/tcpdump/print-lane.c head/contrib/tcpdump/print-ldp.c head/contrib/tcpdump/print-llc.c head/contrib/tcpdump/print-lldp.c head/contrib/tcpdump/print-lmp.c head/contrib/tcpdump/print-lspping.c head/contrib/tcpdump/print-lwapp.c head/contrib/tcpdump/print-lwres.c head/contrib/tcpdump/print-mobile.c head/contrib/tcpdump/print-mobility.c head/contrib/tcpdump/print-mpcp.c head/contrib/tcpdump/print-mpls.c head/contrib/tcpdump/print-msdp.c head/contrib/tcpdump/print-msnlb.c head/contrib/tcpdump/print-nfs.c head/contrib/tcpdump/print-ntp.c head/contrib/tcpdump/print-null.c head/contrib/tcpdump/print-olsr.c head/contrib/tcpdump/print-ospf.c head/contrib/tcpdump/print-ospf6.c head/contrib/tcpdump/print-otv.c head/contrib/tcpdump/print-pflog.c head/contrib/tcpdump/print-pfsync.c head/contrib/tcpdump/print-pgm.c head/contrib/tcpdump/print-pim.c head/contrib/tcpdump/print-ppi.c head/contrib/tcpdump/print-ppp.c head/contrib/tcpdump/print-pppoe.c head/contrib/tcpdump/print-pptp.c head/contrib/tcpdump/print-radius.c head/contrib/tcpdump/print-raw.c head/contrib/tcpdump/print-rip.c head/contrib/tcpdump/print-ripng.c head/contrib/tcpdump/print-rpki-rtr.c head/contrib/tcpdump/print-rrcp.c head/contrib/tcpdump/print-rsvp.c head/contrib/tcpdump/print-rt6.c head/contrib/tcpdump/print-rx.c head/contrib/tcpdump/print-sctp.c head/contrib/tcpdump/print-sflow.c head/contrib/tcpdump/print-sip.c head/contrib/tcpdump/print-sl.c head/contrib/tcpdump/print-sll.c head/contrib/tcpdump/print-slow.c head/contrib/tcpdump/print-smb.c head/contrib/tcpdump/print-snmp.c head/contrib/tcpdump/print-stp.c head/contrib/tcpdump/print-sunatm.c head/contrib/tcpdump/print-sunrpc.c head/contrib/tcpdump/print-symantec.c head/contrib/tcpdump/print-syslog.c head/contrib/tcpdump/print-tcp.c head/contrib/tcpdump/print-telnet.c head/contrib/tcpdump/print-tftp.c head/contrib/tcpdump/print-timed.c head/contrib/tcpdump/print-tipc.c head/contrib/tcpdump/print-token.c head/contrib/tcpdump/print-udld.c head/contrib/tcpdump/print-udp.c head/contrib/tcpdump/print-usb.c head/contrib/tcpdump/print-vjc.c head/contrib/tcpdump/print-vqp.c head/contrib/tcpdump/print-vrrp.c head/contrib/tcpdump/print-vtp.c head/contrib/tcpdump/print-vxlan.c head/contrib/tcpdump/print-wb.c head/contrib/tcpdump/print-zephyr.c head/contrib/tcpdump/print-zeromq.c head/contrib/tcpdump/rpc_auth.h head/contrib/tcpdump/rpc_msg.h head/contrib/tcpdump/setsignal.c head/contrib/tcpdump/setsignal.h head/contrib/tcpdump/signature.c head/contrib/tcpdump/signature.h head/contrib/tcpdump/slcompress.h head/contrib/tcpdump/smb.h head/contrib/tcpdump/smbutil.c head/contrib/tcpdump/strcasecmp.c head/contrib/tcpdump/tcp.h head/contrib/tcpdump/tcpdump-stdinc.h head/contrib/tcpdump/tcpdump.1.in head/contrib/tcpdump/tcpdump.c head/contrib/tcpdump/udp.h head/contrib/tcpdump/util.c head/contrib/tcpdump/vfprintf.c head/usr.sbin/tcpdump/tcpdump/Makefile head/usr.sbin/tcpdump/tcpdump/config.h head/usr.sbin/tcpdump/tcpdump/tcpdump.1 Directory Properties: head/contrib/tcpdump/ (props changed) Modified: head/contrib/tcpdump/CHANGES ============================================================================== --- head/contrib/tcpdump/CHANGES Wed Jan 7 19:38:52 2015 (r276787) +++ head/contrib/tcpdump/CHANGES Wed Jan 7 19:55:18 2015 (r276788) @@ -1,4 +1,61 @@ -Thursday February 19, 2013 guy@alum.mit.edu. +Tuesday Sep. 2, 2014 mcr@sandelman.ca + fix out-of-source-tree builds: find libpcap that is out of source + better configure check for libsmi + +Saturday Jul. 19, 2014 mcr@sandelman.ca + Summary for 4.6.1 tcpdump release + added FreeBSD capsicum + add a short option '#', same as long option '--number' + +Wednesday Jul. 2, 2014 mcr@sandelman.ca + Summary for 4.6.0 tcpdump release + all of tcpdump is now using the new "NDO" code base (Thanks Denis!) + nflog, mobile, forces, pptp, AODV, AHCP, IPv6, OSPFv4, RPL, DHCPv6 enhancements/fixes + M3UA decode added. + many new test cases: 82 in 4.5.1 to 133 in 4.6.0 + many improvements to travis continuous integration system: OSX, and Coverity options + cleaned up some unnecessary header files + Added bittok2str(). + a number of unaligned access faults fixed + -A flag does not consider CR to be printable anymore + fx.lebail took over coverity baby sitting + default snapshot size increased to 256K for accomodate USB captures + WARNING: this release contains a lot of very worthwhile code churn. + +Wednesday Jan. 15, 2014 guy@alum.mit.edu + Summary for 4.5.2 tcpdump release + Man page fix + Fix crashes on SPARC + +Monday Nov. 11, 2013 mcr@sandelman.ca + Summary for 4.5.1 tcpdump release + CREDITS file fixes + +Thursday Nov. 7, 2013 mcr@sandelman.ca and guy@alum.mit.edu. + Summary for 4.5.0 tcpdump release + some NFSv4 fixes for printing + fix printing of unknown TCP options, and tcp fast-open + fixes for syslog parser + some gcc-version-specific flag tuning + adopt MacOS deprecation workarounds for openssl + improvements to babel printing + add OpenFlow 1.0 (no SSL) and test cases + GeoNet printer. + added STBC Rx support + improvements to DHCPv6 decoder + clarify which autoconf is needed + Point users to the the-tcpdump-group repository on GitHub rather + than the mcr repository + Add MSDP printer. + Fixed IPv6 check on Solaris and other OSes requiring extra + networking libraries. + Add support for VXLAN (draft-mahalingam-dutt-dcops-vxlan-03), + and add "vxlan" as an option for -T. + Add support for OTV (draft-hasmit-otv-04). + fixes for DLT_IEEE802_11_RADIO datalink types + added MPTCP decoder + +Saturday April 6, 2013 guy@alum.mit.edu. Summary for 4.4.0 tcpdump release RPKI-RTR (RFC6810) is now official (TCP Port 323) Fix detection of OpenSSL libcrypto. @@ -16,6 +73,8 @@ Thursday February 19, 2013 guy@alum.mit On Linux systems with cap-ng.h, drop root privileges using Linux Capabilities. Add support for reading multiple files. + Add MS NLB heartbeat printer. + Separate multiple nexthops in BGP. Wednesday November 28, 2012 guy@alum.mit.edu. Summary for 4.3.1 tcpdump release @@ -32,7 +91,7 @@ Wednesday November 28, 2012 guy@alum.mi Use the right maximum path length Don't treat 192_1_2, when passed to -i, as an interface number -Friday April 3, 2011. mcr@sandelman.ca. +Friday April 3, 2012. mcr@sandelman.ca. Summary for 4.3.0 tcpdump release fixes for forces: SPARSE data (per RFC 5810) some more test cases added @@ -113,7 +172,7 @@ Thu. April 1, 2010. guy@alum.mit.edu. Summary for 4.1.1 tcpdump release Fix build on systems with PF, such as FreeBSD and OpenBSD. Don't blow up if a zero-length link-layer address is passed to - linkaddr_string(). + linkaddr_string(). Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. Summary for 4.1.0 tcpdump release @@ -142,7 +201,7 @@ Thu. March 11, 2010. ken@netfunctional. Add printer for ForCES Handle frames with an FCS Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames - Fix TCP sequence number printing + Fix TCP sequence number printing Report 802.2 packets as 802.2 instead of 802.3 Don't include -L/usr/lib in LDFLAGS On x86_64 Linux, look in lib64 directory too @@ -178,13 +237,13 @@ Mon. September 10, 2007. ken@xeleran Converted print-isakmp.c to NETDISSECT Moved AF specific stuff into af.h Test subsystem now table driven, and saves outputs and diffs to one place - Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted + Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted libpcap files on an OS other than where the file was generated Wed. July 23, 2007. mcr@xelerance.com. Summary for 3.9.7 libpcap release - NFS: Print unsigned values as such. + NFS: Print unsigned values as such. RX: parse safely. BGP: fixes for IPv6-less builds. 801.1ag: use standard codepoint. @@ -194,7 +253,7 @@ Wed. July 23, 2007. mcr@xelerance.com. smb: squelch an uninitialized complaint from coverity. NFS: from NetBSD; don't interpret the reply as a possible NFS reply if it got MSG_DENIED. - BGP: don't print TLV values that didn't fit, from www.digit-labs.org. + BGP: don't print TLV values that didn't fit, from www.digit-labs.org. revised INSTALL.txt about libpcap dependancy. Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump release @@ -212,11 +271,11 @@ Wed. April 25, 2007. ken@xelerance.com. Add support for 802.3ah loopback ctrl msg Add support for Multiple-STP as per 802.1s Add support for rapid-SPT as per 802.1w - Add support for CFM Link-trace msg, Link-trace-Reply msg, + Add support for CFM Link-trace msg, Link-trace-Reply msg, Sender-ID tlv, private tlv, port, interface status Add support for unidirectional link detection as per http://www.ietf.org/internet-drafts/draft-foschiano-udld-02.txt - Add support for the olsr protocol as per RFC 3626 plus the LQ + Add support for the olsr protocol as per RFC 3626 plus the LQ extensions from olsr.org Add support for variable-length checksum in DCCP, as per section 9 of RFC 4340. @@ -228,7 +287,7 @@ Wed. April 25, 2007. ken@xelerance.com. Tue. September 19, 2006. ken@xelerance.com. Summary for 3.9.5 tcpdump release - + Fix compiling on AIX (, at end of ENUM) Updated list of DNS RR typecodes Use local Ethernet defs on WIN32 @@ -243,7 +302,7 @@ Tue. September 19, 2006. ken@xelerance.c Add support for BGP signaled VPLS Cleanup the bootp printer Add support for PPP over Frame-Relay - Add some bounds checking to the IP options code, and clean up + Add some bounds checking to the IP options code, and clean up the options output a bit. Add additional modp groups to ISAKMP printer Add support for Address-Withdraw and Label-Withdraw Msgs Modified: head/contrib/tcpdump/CREDITS ============================================================================== --- head/contrib/tcpdump/CREDITS Wed Jan 7 19:38:52 2015 (r276787) +++ head/contrib/tcpdump/CREDITS Wed Jan 7 19:55:18 2015 (r276788) @@ -2,18 +2,20 @@ This file lists people who have contribu The current maintainers: Bill Fenner <fenner at research dot att dot com> - David Young <dyoung at pobox dot com> + Denis Ovsienko <infrastation at yandex dot ru> Fulvio Risso <risso at polito dot it> Guy Harris <guy at alum dot mit dot edu> Hannes Gredler <hannes at juniper dot net> Michael Richardson <mcr at sandelman dot ottawa dot on dot ca> + Francois-Xavier Le Bail <fx dot lebail at yahoo dot com> Additional people who have contributed patches: - A Costa <agcosta at gis dot net> Aaron Campbell <aaron at arbor dot net> - Alfredo Andres <aandres at s21sec dot com> + A Costa <agcosta at gis dot net> Albert Chin <china at thewrittenword dot com> + Alexandra Kossovsky <alexandra1975 at sourceforge dot net> + Alfredo Andres <aandres at s21sec dot com> Ananth Suryanarayana <anantha at juniper dot net> Andrea Bittau <a dot bittau at cs dot ucl dot ac dot uk> Andrew Brown <atatat at atatdot dot net> @@ -26,17 +28,19 @@ Additional people who have contributed p Arkadiusz Miskiewicz <misiek at pld dot org dot pl> Armando L. Caro Jr. <acaro at mail dot eecis dot udel dot edu> Arnaldo Carvalho de Melo <acme at ghostprotocols dot net> - Ben Byer <bushing at sourceforge dot net> Atsushi Onoe <onoe at netbsd dot org> + Baptiste Jonglez <baptiste dot jonglez at ens-lyon dot org> + Ben Byer <bushing at sourceforge dot net> Ben Smithurst <ben at scientia dot demon dot co dot uk> Bert Vermeulen <bert at biot dot com> Bjoern A. Zeeb <bzeeb at Zabbadoz dot NeT> + Bram <tcpdump at mail dot wizbit dot be> Brent L. Bates <blbates at vigyan dot com> Brian Ginsbach <ginsbach at cray dot com> Bruce M. Simpson <bms at spc dot org> Carles Kishimoto Bisbe <ckishimo at ac dot upc dot es> - Charlie Lenahan <clenahan at fortresstech dot com> Charles M. Hannum <mycroft at netbsd dot org> + Charlie Lenahan <clenahan at fortresstech dot com> Chris Cogdon <chris at cogdon dot org> Chris G. Demetriou <cgd at netbsd dot org> Chris Jepeway <jepeway at blasted-heath dot com> @@ -52,7 +56,7 @@ Additional people who have contributed p David Horn <dhorn2000 at gmail dot com> David Smith <dsmith at redhat dot com> David Young <dyoung at ojctech dot com> - Denis Ovsienko <infrastation at yandex dot ru> + Dmitrij Tejblum <tejblum at yandex-team dot ru> Dmitry Eremin-Solenikov <dbaryshkov at gmail dot com> Don Ebright <Don dot Ebright at compuware dot com> Eddie Kohler <xexd at sourceforge dot net> @@ -60,22 +64,24 @@ Additional people who have contributed p Fang Wang <fangwang at sourceforge dot net> Florent Drouin <Florent dot Drouin at alcatel-lucent dot fr> Florian Forster <octo at verplant dot org> - Francis Dupont <Francis dot Dupont at enst-bretagne dot fr> + fra <foo at bar dot baz> + Francesco Fondelli <francesco dot fondelli at gmail dot com> Francisco Matias Cuenca-Acuna <mcuenca at george dot rutgers dot edu> - Francois-Xavier Le Bail <fx dot lebail at yahoo dot com> + Francis Dupont <Francis dot Dupont at enst-bretagne dot fr> Frank Volf <volf at oasis dot IAEhv dot nl> Fulvio Risso <risso at polito dot it> George Bakos <gbakos at ists dot dartmouth dot edu> Gerald Combs <gerald at ethereal dot com> Gerrit Renker <gerrit at erg dot abdn dot ac dot uk> Gert Doering <gert at greenie dot muc dot de> + Gilbert Ramirez Jr. <gram at xiexie dot org> + Gisle Vanem <gvanem at yahoo dot no> Greg Minshall <minshall at acm dot org> + Grégoire Henry <henry at pps dot jussieu dot fr> + Gregory Detal <gregory dot detal at uclouvain dot be> Greg Stark <gsstark at mit dot edu> - Grégoire Henry <henry@pps.jussieu.fr> - Gilbert Ramirez Jr. <gram at xiexie dot org> - Gisle Vanem <gvanem at broadpark dot no> - Hannes Viertel <hviertel at juniper dot net> Hank Leininger <tcpdump-workers at progressive-comp dot com> + Hannes Viertel <hviertel at juniper dot net> Harry Raaymakers <harryr at connect dot com dot au> Heinz-Ado Arnolds <Ado dot Arnolds at dhm-systems dot de> Hendrik Scholz <hendrik at scholz dot net> @@ -90,34 +96,37 @@ Additional people who have contributed p Jeffrey Hutzelman <jhutz at cmu dot edu> Jesper Peterson <jesper at endace dot com> Jim Hutchins <jim at ca dot sandia dot gov> - Jonathan Heusser <jonny at drugphish dot ch> - Tatuya Jinmei <jinmei at kame dot net> João Medeiros <ignotus21 at sourceforge dot net> - Joerg Mayer <jmayer@loplof.de> - Jørgen Thomsen <jth at jth dot net> + Joerg Mayer <jmayer at loplof dot de> + Jonathan Heusser <jonny at drugphish dot ch> + Jorge Boncompte [DTI2] <jorge at dti2 dot net> + Jørgen Thomsen <jth at jth dot net> Julian Cowley <julian at lava dot net> - Juliusz Chroboczek <jch@pps.jussieu.fr> + Juliusz Chroboczek <jch at pps dot jussieu dot fr> Kaarthik Sivakumar <kaarthik at torrentnet dot com> Kaladhar Musunuru <kaladharm at sourceforge dot net> Karl Norby <karl-norby at sourceforge dot net> Kazushi Sugyo <sugyo at pb dot jp dot nec dot com> Kelly Carmichael <kcarmich at ipapp dot com> Ken Hornstein <kenh at cmf dot nrl dot navy dot mil> - Kevin Steves <stevesk at pobox dot com> Kenichi Maehashi <webmaster at kenichimaehashi dot com> + Kevin Steves <stevesk at pobox dot com> Klaus Klein <kleink at reziprozitaet dot de> Kris Kennaway <kris at freebsd dot org> Krzysztof Halasa <khc at pm dot waw dot pl> Larry Lile <lile at stdio dot com> Lennert Buytenhek <buytenh at gnu dot org> + Loganaden Velvindron <logan at elandsys dot com> + Longinus00 <Longinus00 at gmail dot com> Loris Degioanni <loris at netgroup-serv dot polito dot it> Love Hörnquist-Åstrand <lha at stacken dot kth dot se> Lucas C. Villa Real <lucasvr at us dot ibm dot com> Luis MartinGarcia <luis dot mgarc at gmail dot com> Maciej W. Rozycki <macro at ds2 dot pg dot gda dot pl> Manu Pathak <mapathak at cisco dot com> - Marc Binderberger <mbind at sourceforge dot net> + Marc Abramowitz <marc at marc-abramowitz dot com> Marc A. Lehmann <pcg at goof dot com> + Marc Binderberger <mbind at sourceforge dot net> Mark Ellzey Thomas <mark at ackers dot net> Marko Kiiskila <carnil at cs dot tut dot fi> Markus Schöpflin <schoepflin at sourceforge dot net> @@ -136,14 +145,16 @@ Additional people who have contributed p Minto Jeyananth <minto at juniper dot net> Monroe Williams <monroe at pobox dot com> Motonori Shindo <mshindo at mshindo dot net> - Nathan J. Williams <nathanw at MIT dot EDU> Nathaniel Couper-Noles <Nathaniel at isi1 dot tccisi dot com> + Nathan J. Williams <nathanw at MIT dot EDU> Neil T. Spring <bluehal at users dot sourceforge dot net> - Niels Provos <provos at openbsd dot org> Nickolai Zeldovich <kolya at MIT dot EDU> Nicolas Ferrero <toorop at babylo dot net> + Niels Provos <provos at openbsd dot org> Noritoshi Demizu <demizu at users dot sourceforge dot net> Olaf Kirch <okir at caldera dot de> + Ola Martin Lykkja <ola dot lykkja at q-free dot com> + Oleksij Rempel <linux at rempel-privat dot de> Onno van der Linden <onno at simplex dot nl> Paolo Abeni <paolo dot abeni at email dot it> Pascal Hennequin <pascal dot hennequin at int-evry dot fr> @@ -153,11 +164,12 @@ Additional people who have contributed p Paul S. Traina <pst at freebsd dot org> Pavlin Radoslavov <pavlin at icir dot org> Pawel Worach <pawel dot worach at gmail dot com> - Pekka Savola <pekkas at netcore dot fi> + Pekka Savola <pekkas at netcore dot fi> + Petar Alilovic <petar dot alilovic at gmail dot com> Peter Fales <peter at fales-lorenz dot net> Peter Jeremy <peter dot jeremy at alcatel dot com dot au> - <pfhunt at users dot sourceforge dot net> Peter Volkov <pva at gentoo dot org> + <pfhunt at users dot sourceforge dot net> Phil Wood <cpw at lanl dot gov> Rafal Maszkowski <rzm at icm dot edu dot pl> Randy Sofia <rsofia at users dot sourceforge dot net> @@ -169,9 +181,10 @@ Additional people who have contributed p Robert Edmonds <stu-42 at sourceforge dot net> Roderick Schertler <roderick at argon dot org> Romain Francoise <rfrancoise at debian dot org> + Ruben Kerkhof <ruben at rubenkerkhof dot com> Sagun Shakya <sagun dot shakya at sun dot com> Sami Farin <safari at iki dot fi> - Scott Mcmillan <scott.a.mcmillan at intel dot com> + Scott Mcmillan <scott dot a dot mcmillan at intel dot com> Scott Rose <syberpunk at users dot sourceforge dot net> Sebastian Krahmer <krahmer at cs dot uni-potsdam dot de> Sebastien Raveau <sebastien dot raveau at epita dot fr> @@ -181,20 +194,27 @@ Additional people who have contributed p Shinsuke Suzuki <suz at kame dot net> Simon Ruderich <simon at ruderich dot org> Steinar Haug <sthaug at nethelp dot no> + Stephane Bortzmeyer <stephane+github at bortzmeyer dot org> Swaminathan Chandrasekaran <chander at juniper dot net> + Swaathi Vetrivel <swaathiv at juniper dot net> Takashi Yamamoto <yamt at mwd dot biglobe dot ne dot jp> + Tatuya Jinmei <jinmei at kame dot net> Terry Kennedy <terry at tmk dot com> + Thomas Jacob <jacob at internet24 dot de> Timo Koskiahde Tony Li <tli at procket dot com> Toshihiro Kanda <candy at fct dot kgc dot co dot jp> + Udayakumar <udaya011 at gmail dot com> Uns Lider <unslider at miranda dot org> Victor Oppleman <oppleman at users dot sourceforge dot net> + Vyacheslav Trushkin <dogonthesun at gmail dot com> Weesan Lee <weesan at juniper dot net> Wesley Griffin <wgriffin at users dot sourceforge dot net> Wesley Shields <wxs at FreeBSD dot org> Wilbert de Graaf <wilbertdg at hetnet dot nl> Will Drewry <will at alum dot bu dot edu> William J. Hulley <bill dot hulley at gmail dot com> + Wim Torfs <wtorfs at gmail dot com> Yen Yen Lim Yoshifumi Nishida @@ -204,4 +224,4 @@ The original LBL crew: Van Jacobson Past maintainers: - Jun-ichiro itojun Hagino <itojun at iijlab dot net> + Jun-ichiro itojun Hagino <itojun at iijlab dot net> Also see: http://www.wide.ad.jp/itojun-award/ Modified: head/contrib/tcpdump/INSTALL.txt ============================================================================== --- head/contrib/tcpdump/INSTALL.txt Wed Jan 7 19:38:52 2015 (r276787) +++ head/contrib/tcpdump/INSTALL.txt Wed Jan 7 19:55:18 2015 (r276788) @@ -1,5 +1,3 @@ -@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47:53 guy Exp $ (LBL) - If you have not built libpcap, and your system does not have libpcap installed, install libpcap first. Your system might provide a version of libpcap that can be installed; if so, to compile tcpdump you might @@ -9,9 +7,7 @@ libpcap; see the README file in this dir You will need an ANSI C compiler to build tcpdump. The configure script will abort if your compiler is not ANSI compliant. If this happens, use -the GNU C compiler, available via anonymous ftp: - - ftp://ftp.gnu.org/pub/gnu/gcc/ +the generally available GNU C compiler (GCC). After libpcap has been built (either install it with "make install" or make sure both the libpcap and tcpdump source trees are in the same @@ -42,25 +38,20 @@ FILES ----- CHANGES - description of differences between releases CREDITS - people that have helped tcpdump along -FILES - list of files exported as part of the distribution INSTALL.txt - this file LICENSE - the license under which tcpdump is distributed Makefile.in - compilation rules (input to the configure script) README - description of distribution Readme.Win32 - notes on building tcpdump on Win32 systems (with WinPcap) VERSION - version of this release -acconfig.h - autoconf input aclocal.m4 - autoconf macros addrtoname.c - address to hostname routines addrtoname.h - address to hostname definitions ah.h - IPSEC Authentication Header definitions -aodv.h - AODV definitions appletalk.h - AppleTalk definitions -arcnet.h - ARCNET definitions atime.awk - TCP ack awk script atm.h - ATM traffic type definitions atmuni31.h - ATM Q.2931 definitions -bgp.h - BGP declarations bootp.h - BOOTP definitions bpf_dump.c - BPF program printing routines, in case libpcap doesn't have them @@ -72,37 +63,21 @@ config.h.in - autoconf input config.sub - autoconf support configure - configure script (run this first) configure.in - configure script source -dccp.h - DCCP definitions -decnet.h - DECnet definitions -decode_prefix.h - Declarations of "decode_prefix{4,6}()" -enc.h - OpenBSD IPsec encapsulation BPF layer definitions -esp.h - IPSEC Encapsulating Security Payload definitions ether.h - Ethernet definitions ethertype.h - Ethernet type value definitions extract.h - alignment definitions -fddi.h - Fiber Distributed Data Interface definitions gmpls.c - GMPLS definitions gmpls.h - GMPLS declarations gmt2local.c - time conversion routines gmt2local.h - time conversion prototypes -icmp6.h - ICMPv6 definitiions -ieee802_11.h - IEEE 802.11 definitions -ieee802_11_radio.h - radiotap header definitions -igrp.h - Interior Gateway Routing Protocol definitions install-sh - BSD style install script interface.h - globals, prototypes and definitions ip.h - IP definitions ip6.h - IPv6 definitions -ipfc.h - IP-over-Fibre Channel definitions ipproto.c - IP protocol type value-to-name table ipproto.h - IP protocol type value definitions -ipsec_doi.h - ISAKMP packet definitions - RFC2407 -ipx.h - IPX definitions -isakmp.h - ISAKMP packet definitions - RFC2408 l2vpn.c - L2VPN encapsulation value-to-name table l2vpn.h - L2VPN encapsulation definitions -l2tp.h - Layer Two Tunneling Protocol definitions -lane.h - ATM LANE definitions lbl/os-*.h - OS-dependent defines and prototypes llc.h - LLC definitions machdep.c - machine dependent routines @@ -113,23 +88,18 @@ missing/* - replacements for missing lib mkdep - construct Makefile dependency list mpls.h - MPLS definitions nameser.h - DNS definitions -netbios.h - NETBIOS definitions netdissect.h - definitions and declarations for tcpdump-as-library (under development) nfs.h - Network File System V2 definitions nfsfh.h - Network File System file handle definitions nlpid.c - OSI NLPID value-to-name table nlpid.h - OSI NLPID definitions -ntp.h - Network Time Protocol definitions -oakley.h - ISAKMP packet definitions - RFC2409 ospf.h - Open Shortest Path First definitions -ospf6.h - IPv6 Open Shortest Path First definitions packetdat.awk - TCP chunk summary awk script parsenfsfh.c - Network File System file parser routines pcap_dump_ftell.c - pcap_dump_ftell() implementation, in case libpcap doesn't have it pcap-missing.h - declarations of functions possibly missing from libpcap -pmap_prot.h - definitions for ONC RPC portmapper protocol ppp.h - Point to Point Protocol definitions print-802_11.c - IEEE 802.11 printer routines print-ap1394.c - Apple IP-over-IEEE 1394 printer routines @@ -184,7 +154,6 @@ print-mobile.c - IPv4 mobility printer r print-mobility.c - IPv6 mobility printer routines print-mpls.c - Multi-Protocol Label Switching printer routines print-msdp.c - Multicast Source Discovery Protocol printer routines -print-netbios.c - NetBIOS frame protocol printer routines print-nfs.c - Network File System printer routines print-ntp.c - Network Time Protocol printer routines print-null.c - BSD loopback device printer routines @@ -226,18 +195,12 @@ print-vjc.c - PPP Van Jacobson compressi print-vrrp.c - Virtual Router Redundancy Protocol print-wb.c - White Board printer routines print-zephyr.c - Zephyr printer routines -route6d.h - packet definition for IPv6 Routing Information Protocol rpc_auth.h - definitions for ONC RPC authentication rpc_msg.h - definitions for ONC RPC messages -rx.h - AFS RX definitions -sctpConstants.h - Stream Control Transmission Protocol constant definitions -sctpHeader.h - Stream Control Transmission Protocol packet definitions send-ack.awk - unidirectional tcp send/ack awk script setsignal.c - OS-independent signal routines setsignal.h - OS-independent signal prototypes slcompress.h - SLIP/PPP Van Jacobson compression (RFC1144) definitions -slip.h - SLIP definitions -sll.h - Linux "cooked" capture definitions smb.h - SMB/CIFS definitions smbutil.c - SMB/CIFS utility routines stime.awk - TCP send awk script @@ -245,10 +208,6 @@ strcasecmp.c - missing routine tcp.h - TCP definitions tcpdump.1 - manual entry tcpdump.c - main program -telnet.h - Telnet definitions -tftp.h - TFTP definitions -timed.h - BSD time daemon protocol definitions -token.h - Token Ring definitions udp.h - UDP definitions util.c - utility routines vfprintf.c - emulation routine Modified: head/contrib/tcpdump/Makefile-devel-adds ============================================================================== --- head/contrib/tcpdump/Makefile-devel-adds Wed Jan 7 19:38:52 2015 (r276787) +++ head/contrib/tcpdump/Makefile-devel-adds Wed Jan 7 19:55:18 2015 (r276788) @@ -2,12 +2,12 @@ # Auto-regenerate configure script or Makefile when things change. # From autoconf.info . Works best with GNU Make. # -${srcdir}/configure: configure.in +${srcdir}/configure: configure.in aclocal.m4 cd ${srcdir} && autoconf # autoheader might not change config.h.in, so touch a stamp file. ${srcdir}/config.h.in: ${srcdir}/stamp-h.in -${srcdir}/stamp-h.in: configure.in acconfig.h +${srcdir}/stamp-h.in: configure.in aclocal.m4 cd ${srcdir} && autoheader echo timestamp > ${srcdir}/stamp-h.in Modified: head/contrib/tcpdump/Makefile.in ============================================================================== --- head/contrib/tcpdump/Makefile.in Wed Jan 7 19:38:52 2015 (r276787) +++ head/contrib/tcpdump/Makefile.in Wed Jan 7 19:55:18 2015 (r276788) @@ -16,8 +16,6 @@ # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 23:17:26 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -41,6 +39,8 @@ VPATH = @srcdir@ # CC = @CC@ +AR = @AR@ +MKDEP = @MKDEP@ PROG = tcpdump CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ @@ -61,6 +61,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ RANLIB = @RANLIB@ +DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ + # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. # Also, gcc does not remove the .o before forking 'as', which can be a # problem if you don't own the file but can write to the directory. @@ -68,126 +70,205 @@ RANLIB = @RANLIB@ @rm -f $@ $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c -CSRC = addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \ - nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \ - print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \ - print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \ - print-atm.c print-beep.c print-bfd.c print-bgp.c \ - print-bootp.c print-bt.c print-carp.c print-cdp.c print-cfm.c \ - print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \ - print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \ - print-eap.c print-eigrp.c\ - print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \ - print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ - print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ - print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ - print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ - print-lmp.c print-lspping.c print-lwapp.c \ - print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-msdp.c \ - print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \ - print-pgm.c print-pim.c \ - print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \ - print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \ - print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \ - print-slow.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-tipc.c print-token.c print-udld.c print-udp.c \ - print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \ - print-wb.c print-zephyr.c print-zeromq.c print-vxlan.c print-otv.c signature.c setsignal.c tcpdump.c util.c +CSRC = setsignal.c tcpdump.c -LIBNETDISSECT_SRC=print-isakmp.c -LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) -LIBNETDISSECT=libnetdissect.a +LIBNETDISSECT_SRC=\ + addrtoname.c \ + af.c \ + checksum.c \ + cpack.c \ + gmpls.c \ + gmt2local.c \ + in_cksum.c \ + ipproto.c \ + l2vpn.c \ + machdep.c \ + nlpid.c \ + oui.c \ + parsenfsfh.c \ + print-802_11.c \ + print-802_15_4.c \ + print-ah.c \ + print-ahcp.c \ + print-aodv.c \ + print-aoe.c \ + print-ap1394.c \ + print-arcnet.c \ + print-arp.c \ + print-ascii.c \ + print-atalk.c \ + print-atm.c \ + print-beep.c \ + print-bfd.c \ + print-bgp.c \ + print-bootp.c \ + print-bt.c \ + print-calm-fast.c \ + print-carp.c \ + print-cdp.c \ + print-cfm.c \ + print-chdlc.c \ + print-cip.c \ + print-cnfp.c \ + print-dccp.c \ + print-decnet.c \ + print-domain.c \ + print-dtp.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-forces.c \ + print-fr.c \ + print-geonet.c \ + print-gre.c \ + print-hsrp.c \ + print-icmp.c \ + print-igmp.c \ + print-igrp.c \ + print-ip.c \ + print-ipcomp.c \ + print-ipfc.c \ + print-ipnet.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-lldp.c \ + print-lmp.c \ + print-loopback.c \ + print-lspping.c \ + print-lwapp.c \ + print-lwres.c \ + print-m3ua.c \ + print-mobile.c \ + print-mpcp.c \ + print-mpls.c \ + print-mptcp.c \ + print-msdp.c \ + print-msnlb.c \ + print-nflog.c \ + print-nfs.c \ + print-ntp.c \ + print-null.c \ + print-olsr.c \ + print-openflow-1.0.c \ + print-openflow.c \ + print-ospf.c \ + print-otv.c \ + print-pgm.c \ + print-pim.c \ + print-pktap.c \ + print-ppi.c \ + print-ppp.c \ + print-pppoe.c \ + print-pptp.c \ + print-radius.c \ + print-raw.c \ + print-rip.c \ + print-rpki-rtr.c \ + print-rrcp.c \ + print-rsvp.c \ + print-rx.c \ + print-sctp.c \ + print-sflow.c \ + print-sip.c \ + print-sl.c \ + print-sll.c \ + print-slow.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-tipc.c \ + print-token.c \ + print-udld.c \ + print-udp.c \ + print-usb.c \ + print-vjc.c \ + print-vqp.c \ + print-vrrp.c \ + print-vtp.c \ + print-vxlan.c \ + print-wb.c \ + print-zephyr.c \ + print-zeromq.c \ + signature.c \ + util.c LOCALSRC = @LOCALSRC@ GENSRC = version.c LIBOBJS = @LIBOBJS@ +LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS} +LIBNETDISSECT=libnetdissect.a + + SRC = $(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC) # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection -OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) $(LOCALSRC:.c=.o) $(LIBOBJS) $(LIBNETDISSECT_OBJ) +OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) $(LIBNETDISSECT_OBJ) HDR = \ - acconfig.h \ addrtoname.h \ af.h \ ah.h \ - aodv.h \ appletalk.h \ - arcnet.h \ atm.h \ atmuni31.h \ bootp.h \ - bgp.h \ chdlc.h \ cpack.h \ - dccp.h \ - decnet.h \ - decode_prefix.h \ - enc.h \ - esp.h \ ether.h \ ethertype.h \ extract.h \ - fddi.h \ - forces.h \ + getopt_long.h \ gmpls.h \ gmt2local.h \ - icmp6.h \ - ieee802_11.h \ - ieee802_11_radio.h \ - igrp.h \ interface.h \ interface.h \ ip.h \ ip6.h \ - ipfc.h \ - ipnet.h \ ipproto.h \ - ipsec_doi.h \ - ipx.h \ - isakmp.h \ - l2tp.h \ l2vpn.h \ - lane.h \ llc.h \ machdep.h \ mib.h \ mpls.h \ nameser.h \ - netbios.h \ netdissect.h \ nfs.h \ nfsfh.h \ nlpid.h \ - ntp.h \ - oakley.h \ + openflow.h \ ospf.h \ - ospf6.h \ oui.h \ pcap-missing.h \ - pmap_prot.h \ - ppi.h \ ppp.h \ - route6d.h \ rpc_auth.h \ rpc_msg.h \ - rx.h \ - sctpConstants.h \ - sctpHeader.h \ + rpl.h \ setsignal.h \ signature.h \ slcompress.h \ - slip.h \ - sll.h \ smb.h \ tcp.h \ tcpdump-stdinc.h \ - telnet.h \ - tftp.h \ - timed.h \ - token.h \ udp.h TAGHDR = \ @@ -212,7 +293,7 @@ EXTRA_DIST = \ LICENSE \ Makefile.in \ Makefile-devel-adds \ - README \ + README.md \ Readme.Win32 \ VERSION \ aclocal.m4 \ @@ -233,11 +314,11 @@ EXTRA_DIST = \ missing/dlnames.c \ missing/datalinks.c \ missing/getnameinfo.c \ + missing/getopt_long.c \ missing/inet_aton.c \ missing/inet_ntop.c \ missing/inet_pton.c \ missing/snprintf.c \ - missing/sockstorage.h \ missing/strdup.c \ missing/strlcat.c \ missing/strlcpy.c \ @@ -252,7 +333,6 @@ EXTRA_DIST = \ print-ip6.c \ print-ip6opts.c \ print-mobility.c \ - print-netbios.c \ print-ospf6.c \ print-pflog.c \ print-ripng.c \ @@ -264,18 +344,14 @@ EXTRA_DIST = \ strcasecmp.c \ tcpdump.1.in \ vfprintf.c \ - win32/Include/bittypes.h \ - win32/Include/errno.h \ - win32/Include/getopt.h \ win32/Include/w32_fzs.h \ - win32/Src/getopt.c \ win32/prj/GNUmakefile \ win32/prj/WinDump.dsp \ win32/prj/WinDump.dsw TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -type f \! -name '.*' \! -name '*~' -print` -all: $(PROG) +all: $(PROG) $(LIBNETDISSECT) $(PROG): $(OBJ) @V_PCAPDEP@ @rm -f $@ @@ -283,7 +359,7 @@ $(PROG): $(OBJ) @V_PCAPDEP@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ - $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) + $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) $(RANLIB) $@ datalinks.o: $(srcdir)/missing/datalinks.c @@ -292,8 +368,8 @@ dlnames.o: $(srcdir)/missing/dlnames.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c getnameinfo.o: $(srcdir)/missing/getnameinfo.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c -getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c - $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c +getopt_long.o: $(srcdir)/missing/getopt_long.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c inet_pton.o: $(srcdir)/missing/inet_pton.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c inet_ntop.o: $(srcdir)/missing/inet_ntop.c @@ -302,6 +378,8 @@ inet_aton.o: $(srcdir)/missing/inet_aton $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c snprintf.o: $(srcdir)/missing/snprintf.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c +strdup.o: $(srcdir)/missing/strdup.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strdup.c strlcat.o: $(srcdir)/missing/strlcat.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c strlcpy.o: $(srcdir)/missing/strlcpy.c @@ -345,8 +423,10 @@ clean: distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 - rm -rf autom4te.cache + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 \ + libnetdissect.a tests/.failed tests/.passed \ + tests/failure-outputs.txt + rm -rf autom4te.cache tests/DIFF tests/NEW check: tcpdump (cd tests && ./TESTrun.sh) @@ -368,4 +448,4 @@ testlist: echo $(TEST_DIST) depend: $(GENSRC) - ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) + $(MKDEP) -c $(CC) -m $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC) Copied: head/contrib/tcpdump/README.md (from r276761, vendor/tcpdump/dist/README.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/tcpdump/README.md Wed Jan 7 19:55:18 2015 (r276788, copy of r276761, vendor/tcpdump/dist/README.md) @@ -0,0 +1,243 @@ +# tcpdump + +[](https://travis-ci.org/the-tcpdump-group/tcpdump) + +TCPDUMP 4.x.y +Now maintained by "The Tcpdump Group" +See www.tcpdump.org + +Please send inquiries/comments/reports to: + +* tcpdump-workers@lists.tcpdump.org + +Anonymous Git is available via: + + git clone git://bpf.tcpdump.org/tcpdump + +Please submit patches by forking the branch on GitHub at: + +* http://github.com/the-tcpdump-group/tcpdump/tree/master + +and issuing a pull request. + +formerly from Lawrence Berkeley National Laboratory + Network Research Group <tcpdump@ee.lbl.gov> + ftp://ftp.ee.lbl.gov/old/tcpdump.tar.Z (3.4) + +This directory contains source code for tcpdump, a tool for network +monitoring and data acquisition. This software was originally +developed by the Network Research Group at the Lawrence Berkeley +National Laboratory. The original distribution is available via +anonymous ftp to `ftp.ee.lbl.gov`, in `tcpdump.tar.Z`. More recent +development is performed at tcpdump.org, http://www.tcpdump.org/ + +Tcpdump uses libpcap, a system-independent interface for user-level +packet capture. Before building tcpdump, you must first retrieve and +build libpcap, also originally from LBL and now being maintained by +tcpdump.org; see http://www.tcpdump.org/ . + +Once libpcap is built (either install it or make sure it's in +`../libpcap`), you can build tcpdump using the procedure in the `INSTALL.txt` +file. + +The program is loosely based on SMI's "etherfind" although none of the +etherfind code remains. It was originally written by Van Jacobson as +part of an ongoing research project to investigate and improve tcp and +internet gateway performance. The parts of the program originally +taken from Sun's etherfind were later re-written by Steven McCanne of +LBL. To insure that there would be no vestige of proprietary code in +tcpdump, Steve wrote these pieces from the specification given by the +manual entry, with no access to the source of tcpdump or etherfind. + +Over the past few years, tcpdump has been steadily improved by the +excellent contributions from the Internet community (just browse +through the `CHANGES` file). We are grateful for all the input. + +Richard Stevens gives an excellent treatment of the Internet protocols +in his book *"TCP/IP Illustrated, Volume 1"*. If you want to learn more +about tcpdump and how to interpret its output, pick up this book. + +Some tools for viewing and analyzing tcpdump trace files are available +from the Internet Traffic Archive: + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
](https://travis-ci.org/the-tcpdump-group/tcpdump){kind=link}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501071955.t07JtJve076116>