Date: Sat, 21 Mar 2009 18:30:25 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190207 - in head/contrib/tcpdump: . lbl missing tests Message-ID: <200903211830.n2LIUPXJ043439@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Sat Mar 21 18:30:25 2009 New Revision: 190207 URL: http://svn.freebsd.org/changeset/base/190207 Log: Merge tcpdump 4.0.0 from the vendor branch. Added: head/contrib/tcpdump/INSTALL.txt - copied unchanged from r190206, vendor/tcpdump/dist/INSTALL.txt head/contrib/tcpdump/checksum.c - copied unchanged from r190206, vendor/tcpdump/dist/checksum.c head/contrib/tcpdump/print-bt.c - copied unchanged from r190206, vendor/tcpdump/dist/print-bt.c head/contrib/tcpdump/print-cfm.c - copied unchanged from r190206, vendor/tcpdump/dist/print-cfm.c head/contrib/tcpdump/print-dtp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-dtp.c head/contrib/tcpdump/print-lldp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-lldp.c head/contrib/tcpdump/print-lwapp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-lwapp.c head/contrib/tcpdump/print-mpcp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-mpcp.c head/contrib/tcpdump/print-rrcp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-rrcp.c head/contrib/tcpdump/print-sflow.c - copied unchanged from r190206, vendor/tcpdump/dist/print-sflow.c head/contrib/tcpdump/print-udld.c - copied unchanged from r190206, vendor/tcpdump/dist/print-udld.c head/contrib/tcpdump/print-vqp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-vqp.c head/contrib/tcpdump/print-vtp.c - copied unchanged from r190206, vendor/tcpdump/dist/print-vtp.c Deleted: head/contrib/tcpdump/FILES head/contrib/tcpdump/INSTALL head/contrib/tcpdump/Makefile-devel-adds head/contrib/tcpdump/PLATFORMS head/contrib/tcpdump/Readme.Win32 head/contrib/tcpdump/TODO head/contrib/tcpdump/tests/ Modified: head/contrib/tcpdump/ (props changed) head/contrib/tcpdump/CHANGES head/contrib/tcpdump/CREDITS head/contrib/tcpdump/Makefile.in head/contrib/tcpdump/README 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/aodv.h head/contrib/tcpdump/appletalk.h head/contrib/tcpdump/arcnet.h head/contrib/tcpdump/atm.h head/contrib/tcpdump/atmuni31.h head/contrib/tcpdump/bgp.h head/contrib/tcpdump/bootp.h head/contrib/tcpdump/bpf_dump.c head/contrib/tcpdump/chdlc.h head/contrib/tcpdump/config.h.in head/contrib/tcpdump/configure head/contrib/tcpdump/configure.in head/contrib/tcpdump/dccp.h head/contrib/tcpdump/decnet.h head/contrib/tcpdump/enc.h head/contrib/tcpdump/ether.h head/contrib/tcpdump/ethertype.h head/contrib/tcpdump/extract.h head/contrib/tcpdump/fddi.h head/contrib/tcpdump/gmpls.c head/contrib/tcpdump/gmpls.h head/contrib/tcpdump/gmt2local.c head/contrib/tcpdump/gmt2local.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/interface.h head/contrib/tcpdump/ip.h head/contrib/tcpdump/ip6.h head/contrib/tcpdump/ipfc.h head/contrib/tcpdump/ipproto.c head/contrib/tcpdump/ipproto.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/l2vpn.c head/contrib/tcpdump/l2vpn.h head/contrib/tcpdump/lane.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/getaddrinfo.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/mpls.h head/contrib/tcpdump/nameser.h head/contrib/tcpdump/netbios.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/ntp.h head/contrib/tcpdump/oakley.h head/contrib/tcpdump/ospf.h head/contrib/tcpdump/ospf6.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/pmap_prot.h head/contrib/tcpdump/ppp.h head/contrib/tcpdump/print-802_11.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-beep.c head/contrib/tcpdump/print-bfd.c head/contrib/tcpdump/print-bgp.c head/contrib/tcpdump/print-bootp.c head/contrib/tcpdump/print-cdp.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-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-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-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-lmp.c head/contrib/tcpdump/print-lspping.c head/contrib/tcpdump/print-lwres.c head/contrib/tcpdump/print-mobile.c head/contrib/tcpdump/print-mobility.c head/contrib/tcpdump/print-mpls.c head/contrib/tcpdump/print-msdp.c head/contrib/tcpdump/print-netbios.c head/contrib/tcpdump/print-nfs.c head/contrib/tcpdump/print-ntp.c head/contrib/tcpdump/print-null.c head/contrib/tcpdump/print-ospf.c head/contrib/tcpdump/print-ospf6.c head/contrib/tcpdump/print-pflog.c head/contrib/tcpdump/print-pgm.c head/contrib/tcpdump/print-pim.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-rsvp.c head/contrib/tcpdump/print-rt6.c head/contrib/tcpdump/print-rx.c head/contrib/tcpdump/print-sctp.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-token.c head/contrib/tcpdump/print-udp.c head/contrib/tcpdump/print-vjc.c head/contrib/tcpdump/print-vrrp.c head/contrib/tcpdump/print-wb.c head/contrib/tcpdump/print-zephyr.c head/contrib/tcpdump/route6d.h head/contrib/tcpdump/rpc_auth.h head/contrib/tcpdump/rpc_msg.h head/contrib/tcpdump/rx.h head/contrib/tcpdump/sctpConstants.h head/contrib/tcpdump/sctpHeader.h head/contrib/tcpdump/setsignal.c head/contrib/tcpdump/setsignal.h head/contrib/tcpdump/slcompress.h head/contrib/tcpdump/slip.h head/contrib/tcpdump/sll.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 head/contrib/tcpdump/tcpdump.c head/contrib/tcpdump/telnet.h head/contrib/tcpdump/tftp.h head/contrib/tcpdump/timed.h head/contrib/tcpdump/token.h head/contrib/tcpdump/udp.h head/contrib/tcpdump/util.c head/contrib/tcpdump/vfprintf.c Modified: head/contrib/tcpdump/CHANGES ============================================================================== --- head/contrib/tcpdump/CHANGES Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/CHANGES Sat Mar 21 18:30:25 2009 (r190207) @@ -1,20 +1,36 @@ -$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.17 2007/09/13 13:39:44 ken Exp $ +$Header: /tcpdump/master/tcpdump/CHANGES,v 1.98.2.2 2008-10-15 23:26:30 ken Exp $ -Mon. September 10, 2007. ken@xelerance.com. Summary for 0.9.8 tcpdump release - Rework ARP printer - Rework OSPFv3 printer - Add support for Frame-Relay ARP - Decode DHCP Option 121 (RFC 3442 Classless Static Route) - Decode DHCP Option 249 (MS Classless Static Route) the same as Option 121 - TLV: Add support for Juniper .pcap extensions - Print EGP header in new-world-order style - 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 +Mon. October 27, 2008. ken@netfunctional.ca. Summary for 4.0.0 tcpdump release + Add support for Bluetooth Sniffing + Add support for Realtek Remote Control Protocol (openrrcp.org.ru) + Add support for 802.11 AVS + Add support for SMB over TCP + Add support for 4 byte BGP AS printing + Add support for compiling on case-insensitive file systems + Add support for ikev2 printing + Update support for decoding AFS + Update DHCPv6 printer + Use newer libpcap API's (allows -B option on all platforms) + Add -I to turn on monitor mode + Bugfixes in lldp, lspping, dccp, ESP, NFS printers + Cleanup unused files and various cruft + +Mon. September 10, 2007. ken@xelerance.com. Summary for 3.9.8 tcpdump release + Rework ARP printer + Rework OSPFv3 printer + Add support for Frame-Relay ARP + Decode DHCP Option 121 (RFC 3442 Classless Static Route) + Decode DHCP Option 249 (MS Classless Static Route) the same as Option 121 + TLV: Add support for Juniper .pcap extensions + Print EGP header in new-world-order style + 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 libpcap files on an OS other than where the file was generated -Wed. July 23, 2007. mcr@xelerance.com. Summary for 0.9.7 tcpdump release + +Wed. July 23, 2007. mcr@xelerance.com. Summary for 3.9.7 libpcap release NFS: Print unsigned values as such. RX: parse safely. Modified: head/contrib/tcpdump/CREDITS ============================================================================== --- head/contrib/tcpdump/CREDITS Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/CREDITS Sat Mar 21 18:30:25 2009 (r190207) @@ -1,147 +1,165 @@ This file lists people who have contributed to tcpdump: The current maintainers: - Bill Fenner <fenner@research.att.com> - David Young <dyoung@pobox.com> - Fulvio Risso <risso@polito.it> - Guy Harris <guy@alum.mit.edu> - Hannes Gredler <hannes@juniper.net> - Jun-ichiro itojun Hagino <itojun@iijlab.net> - Michael Richardson <mcr@sandelman.ottawa.on.ca> + Bill Fenner <fenner at research dot att dot com> + David Young <dyoung at pobox dot com> + 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> Additional people who have contributed patches: - Aaron Campbell <aaron@arbor.net> - Alfredo Andres <aandres@s21sec.com> - Albert Chin <china@thewrittenword.com> - Andrew Brown <atatat@atatdot.net> - Andrew Church <andrew@users.sourceforge.net> - Andrew Hintz <adhintz@users.sourceforge.net> - Andrew Tridgell <tridge@linuxcare.com> - Andy Heffernan <ahh@juniper.net> - Arkadiusz Miskiewicz <misiek@pld.org.pl> - Armando L. Caro Jr. <acaro@mail.eecis.udel.edu> - Arnaldo Carvalho de Melo <acme@ghostprotocols.net> - Atsushi Onoe <onoe@netbsd.org> - Ben Smithurst <ben@scientia.demon.co.uk> - Brent L. Bates <blbates@vigyan.com> - Brian Ginsbach <ginsbach@cray.com> - Bruce M. Simpson <bms@spc.org> - Carles Kishimoto Bisbe <ckishimo@ac.upc.es> - Charlie Lenahan <clenahan@fortresstech.com> - Charles M. Hannum <mycroft@netbsd.org> - Chris Cogdon <chris@cogdon.org> - Chris G. Demetriou <cgd@netbsd.org> - Christian Sievers <c_s@users.sourceforge.net> - Chris Jepeway <jepeway@blasted-heath.com> - Chris Larson <clarson@kergoth.com> - Craig Rodrigues <rodrigc@mediaone.net> - Crist J. Clark <cjclark@alum.mit.edu> - Daniel Hagerty <hag@ai.mit.edu> - Darren Reed <darrenr@reed.wattle.id.au> - David Binderman <d.binderman@virgin.net> - David Smith <dsmith@redhat.com> - David Young <dyoung@ojctech.com> - Don Ebright <Don.Ebright@compuware.com> - Eddie Kohler <xexd@sourceforge.net> - Francis Dupont <Francis.Dupont@enst-bretagne.fr> - Francisco Matias Cuenca-Acuna <mcuenca@george.rutgers.edu> - Frank Volf <volf@oasis.IAEhv.nl> - Fulvio Risso <risso@polito.it> - George Bakos <gbakos@ists.dartmouth.edu> - Gerald Combs <gerald@ethereal.com> - Gert Doering <gert@greenie.muc.de> - Greg Stark <gsstark@mit.edu> - Gilbert Ramirez Jr. <gram@xiexie.org> - Gisle Vanem <giva@bgnett.no> - Hannes Viertel <hviertel@juniper.net> - Hank Leininger <tcpdump-workers@progressive-comp.com> - Harry Raaymakers <harryr@connect.com.au> - Heinz-Ado Arnolds <Ado.Arnolds@dhm-systems.de> - Hendrik Scholz <hendrik@scholz.net> - Ian McDonald <imcdnzl@gmail.com> - Jacek Tobiasz <Jacek.Tobiasz@atm.com.pl> - Jakob Schlyter <jakob@openbsd.org> - Jan Oravec <wsx@wsx6.net> - Jason R. Thorpe <thorpej@netbsd.org> - Jefferson Ogata <jogata@nodc.noaa.gov> - Jeffrey Hutzelman <jhutz@cmu.edu> - Jesper Peterson <jesper@endace.com> - Jim Hutchins <jim@ca.sandia.gov> - Jonathan Heusser <jonny@drugphish.ch> - Tatuya Jinmei <jinmei@kame.net> - Jørgen Thomsen <jth@jth.net> - Julian Cowley <julian@lava.net> - Kaarthik Sivakumar <kaarthik@torrentnet.com> - Kazushi Sugyo <sugyo@pb.jp.nec.com> - Kelly Carmichael <kcarmich@ipapp.com> - Ken Hornstein <kenh@cmf.nrl.navy.mil> - Kevin Steves <stevesk@pobox.com> - Klaus Klein <kleink@reziprozitaet.de> - Kris Kennaway <kris@freebsd.org> - Krzysztof Halasa <khc@pm.waw.pl> - Larry Lile <lile@stdio.com> - Lennert Buytenhek <buytenh@gnu.org> - Loris Degioanni <loris@netgroup-serv.polito.it> - Love Hörnquist-Åstrand <lha@stacken.kth.se> - Maciej W. Rozycki <macro@ds2.pg.gda.pl> - Manu Pathak <mapathak@cisco.com> - Marc A. Lehmann <pcg@goof.com> - Mark Ellzey Thomas <mark@ackers.net> - Marko Kiiskila <carnil@cs.tut.fi> - Markus Schöpflin <schoepflin@sourceforge.net> - Marshall Rose <mrose@dbc.mtview.ca.us> - Martin Husemann <martin@netbsd.org> - Max Laier <max@love2party.net> - Michael Madore <mmadore@turbolinux.com> - Michael Shalayeff <mickey@openbsd.org> - Michael Shields <shields@msrl.com> - Michael T. Stolarchuk <mts@off.to> - Michele "mydecay" Marchetto <smarchetto1@tin.it> - Monroe Williams <monroe@pobox.com> - Motonori Shindo <mshindo@mshindo.net> - Nathan J. Williams <nathanw@MIT.EDU> - Nathaniel Couper-Noles <Nathaniel@isi1.tccisi.com> - Neil T. Spring <bluehal@users.sourceforge.net> - Niels Provos <provos@openbsd.org> - Nickolai Zeldovich <kolya@MIT.EDU> - Nicolas Ferrero <toorop@babylo.net> - Noritoshi Demizu <demizu@users.sourceforge.net> - Olaf Kirch <okir@caldera.de> - Onno van der Linden <onno@simplex.nl> - Pascal Hennequin <pascal.hennequin@int-evry.fr> - Pasvorn Boonmark <boonmark@juniper.net> - Paul Mundt <lethal@linux-sh.org> - Paul S. Traina <pst@freebsd.org> - Pavlin Radoslavov <pavlin@icir.org> - Pekka Savola <pekkas@netcore.fi> - Peter Fales <peter@fales-lorenz.net> - Peter Jeremy <peter.jeremy@alcatel.com.au> - <pfhunt@users.sourceforge.net> - Phil Wood <cpw@lanl.gov> - Rafal Maszkowski <rzm@icm.edu.pl> - Raphael Raimbault <raphael.raimbault@netasq.com> - Rick Cheng <rcheng@juniper.net> - Rick Jones <rick.jones2@hp.com> - Rick Watson <watsonrick@users.sourceforge.net> - Rob Braun <bbraun@synack.net> - Roderick Schertler <roderick@argon.org> - Sami Farin <safari@iki.fi> - Scott Rose <syberpunk@users.sourceforge.net> - Sebastian Krahmer <krahmer@cs.uni-potsdam.de> - Sebastien Vincent <svincent@idems.fr> - Seth Webster <swebster@sst.ll.mit.edu> - Shinsuke Suzuki <suz@kame.net> - Steinar Haug <sthaug@nethelp.no> - Swaminathan Chandrasekaran <chander@juniper.net> - Takashi Yamamoto <yamt@mwd.biglobe.ne.jp> - Terry Kennedy <terry@tmk.com> + Aaron Campbell <aaron at arbor dot net> + Alfredo Andres <aandres at s21sec dot com> + Albert Chin <china at thewrittenword 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> + Andrew Church <andrew at users dot sourceforge dot net> + Andrew Hintz <adhintz at users dot sourceforge dot net> + Andrew Silent <andrew at nording dot ru> + Andrew Tridgell <tridge at linuxcare dot com> + Andy Heffernan <ahh at juniper dot net> + 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> + Ben Smithurst <ben at scientia dot demon dot co dot uk> + Bjoern A. Zeeb <bzeeb at Zabbadoz dot NeT> + 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> + Chris Cogdon <chris at cogdon dot org> + Chris G. Demetriou <cgd at netbsd dot org> + Christian Sievers <c_s at users dot sourceforge dot net> + Chris Jepeway <jepeway at blasted-heath dot com> + Chris Larson <clarson at kergoth dot com> + Craig Rodrigues <rodrigc at mediaone dot net> + Crist J. Clark <cjclark at alum dot mit dot edu> + Daniel Hagerty <hag at ai dot mit dot edu> + Darren Reed <darrenr at reed dot wattle dot id dot au> + David Binderman <d dot binderman at virgin dot net> + David Smith <dsmith at redhat dot com> + David Young <dyoung at ojctech dot com> + Don Ebright <Don dot Ebright at compuware dot com> + Eddie Kohler <xexd at sourceforge dot net> + Florent Drouin <Florent dot Drouin at alcatel-lucent dot fr> + Francis Dupont <Francis dot Dupont at enst-bretagne dot fr> + Francisco Matias Cuenca-Acuna <mcuenca at george dot rutgers dot edu> + Francois-Xavier Le Bail <fx dot lebail at yahoo dot com> + 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> + Greg Minshall <minshall at acm dot org> + Greg Stark <gsstark at mit dot edu> + Gilbert Ramirez Jr. <gram at xiexie dot org> + Gisle Vanem <giva at bgnett dot no> + Hannes Viertel <hviertel at juniper dot net> + Hank Leininger <tcpdump-workers at progressive-comp dot com> + 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> + Ian McDonald <imcdnzl at gmail dot com> + Jacek Tobiasz <Jacek dot Tobiasz at atm dot com dot pl> + Jakob Schlyter <jakob at openbsd dot org> + Jan Oravec <wsx at wsx6 dot net> + Jason R. Thorpe <thorpej at netbsd dot org> + Jefferson Ogata <jogata at nodc dot noaa dot gov> + 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> + Joerg Mayer <jmayer@loplof.de> + Jørgen Thomsen <jth at jth dot net> + Julian Cowley <julian at lava dot net> + Kaarthik Sivakumar <kaarthik at torrentnet dot com> + 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> + 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> + Loris Degioanni <loris at netgroup-serv dot polito dot it> + Love Hörnquist-Åstrand <lha at stacken dot kth dot se> + Luis Martin Garcia <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 A. Lehmann <pcg at goof dot com> + 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> + Marshall Rose <mrose at dbc dot mtview dot ca dot us> + Martin Husemann <martin at netbsd dot org> + Max Laier <max at love2party dot net> + Michael A. Meffie III <meffie at sourceforge dot net> + Michael Madore <mmadore at turbolinux dot com> + Michael Shalayeff <mickey at openbsd dot org> + Michael Shields <shields at msrl dot com> + Michael T. Stolarchuk <mts at off dot to> + Michele "mydecay" Marchetto <smarchetto1 at tin dot it> + Mike Frysinger <vapier at gmail dot com> + 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> + 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> + Noritoshi Demizu <demizu at users dot sourceforge dot net> + Olaf Kirch <okir at caldera 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> + Pasvorn Boonmark <boonmark at juniper dot net> + Paul Mundt <lethal at linux-sh dot org> + Paul S. Traina <pst at freebsd dot org> + Pavlin Radoslavov <pavlin at icir dot org> + Pekka Savola <pekkas at netcore dot fi> + 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> + Phil Wood <cpw at lanl dot gov> + Rafal Maszkowski <rzm at icm dot edu dot pl> + Raphael Raimbault <raphael dot raimbault at netasq dot com> + Rick Cheng <rcheng at juniper dot net> + Rick Jones <rick dot jones2 at hp dot com> + Rick Watson <watsonrick at users dot sourceforge dot net> + Rob Braun <bbraun at synack dot net> + Roderick Schertler <roderick at argon dot org> + Sagun Shakya <sagun dot shakya at sun dot com> + Sami Farin <safari at iki dot fi> + 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> + Sebastien Vincent <svincent at idems dot fr> + Sepherosa Ziehau <sepherosa at gmail dot com> + Seth Webster <swebster at sst dot ll dot mit dot edu> + Shinsuke Suzuki <suz at kame dot net> + Steinar Haug <sthaug at nethelp dot no> + Swaminathan Chandrasekaran <chander at juniper dot net> + Takashi Yamamoto <yamt at mwd dot biglobe dot ne dot jp> + Terry Kennedy <terry at tmk dot com> Timo Koskiahde - Tony Li <tli@procket.com> - Uns Lider <unslider@miranda.org> - Victor Oppleman <oppleman@users.sourceforge.net> - Wesley Griffin <wgriffin@users.sourceforge.net> - Wilbert de Graaf <wilbertdg@hetnet.nl> + Tony Li <tli at procket dot com> + Uns Lider <unslider at miranda dot org> + Victor Oppleman <oppleman at users dot sourceforge dot net> + Wesley Griffin <wgriffin at users dot sourceforge dot net> + Wilbert de Graaf <wilbertdg at hetnet dot nl> + Will Drewry <will at alum dot bu dot edu> Yen Yen Lim Yoshifumi Nishida @@ -149,3 +167,6 @@ The original LBL crew: Steve McCanne Craig Leres Van Jacobson + +Past maintainers: + Jun-ichiro itojun Hagino <itojun at iijlab dot net> Copied: head/contrib/tcpdump/INSTALL.txt (from r190206, vendor/tcpdump/dist/INSTALL.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/tcpdump/INSTALL.txt Sat Mar 21 18:30:25 2009 (r190207, copy of r190206, vendor/tcpdump/dist/INSTALL.txt) @@ -0,0 +1,254 @@ +@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.1.2.1 2008-02-06 10:49:22 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 +need to install a "developer" version of libpcap as well as the +"run-time" version. You can also install tcpdump.org's version of +libpcap; see the README file in this directory for the ftp location. + +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/ + +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 +directory), run ./configure (a shell script). "configure" will +determine your system attributes and generate an appropriate Makefile +from Makefile.in. Now build tcpdump by running "make". + +If everything builds ok, su and type "make install". This will install +tcpdump and the manual entry. Any user will be able to use tcpdump to +read saved captures. Whether a user will be able to capture traffic +depends on the OS and the configuration of the system; see the tcpdump +man page for details. DO NOT give untrusted users the ability to +capture traffic. If a user can capture traffic, he or she could use +utilities such as tcpdump to capture any traffic on your net, including +passwords. + +Note that most systems ship tcpdump, but usually an older version. +Remember to remove or rename the installed binary when upgrading. + +If your system is not one which we have tested tcpdump on, you may have +to modify the configure script and Makefile.in. Please send us patches +for any modifications you need to make. + +Please see "PLATFORMS" for notes about tested platforms. + + +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 +chdlc.h - Cisco HDLC definitions +cpack.c - functions to extract packed data +cpack.h - declarations of functions to extract packed data +config.guess - autoconf support +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 +machdep.h - machine dependent definitions +makemib - mib to header script +mib.h - mib definitions +missing/* - replacements for missing library functions +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 +print-ah.c - IPSEC Authentication Header printer routines +print-aodv.c - AODV printer routines +print-arcnet.c - ARCNET printer routines +print-arp.c - Address Resolution Protocol printer routines +print-ascii.c - ASCII packet dump routines +print-atalk.c - AppleTalk printer routines +print-atm.c - ATM printer routines +print-beep.c - BEEP printer routines +print-bgp.c - Border Gateway Protocol printer routines +print-bootp.c - BOOTP and IPv4 DHCP printer routines +print-bt.c - Bluetooth printer routines +print-cdp.c - Cisco Discovery Protocol printer routines +print-chdlc.c - Cisco HDLC printer routines +print-cip.c - Classical-IP over ATM routines +print-cnfp.c - Cisco NetFlow printer routines +print-dccp.c - DCCP printer routines +print-decnet.c - DECnet printer routines +print-dhcp6.c - IPv6 DHCP printer routines +print-domain.c - Domain Name System printer routines +print-dvmrp.c - Distance Vector Multicast Routing Protocol printer routines +print-eap.c - EAP printer routines +print-enc.c - OpenBSD IPsec encapsulation BPF layer printer routines +print-egp.c - External Gateway Protocol printer routines +print-esp.c - IPSEC Encapsulating Security Payload printer routines +print-ether.c - Ethernet printer routines +print-fddi.c - Fiber Distributed Data Interface printer routines +print-fr.c - Frame Relay printer routines +print-frag6.c - IPv6 fragmentation header printer routines +print-gre.c - Generic Routing Encapsulation printer routines +print-hsrp.c - Cisco Hot Standby Router Protocol printer routines +print-icmp.c - Internet Control Message Protocol printer routines +print-icmp6.c - IPv6 Internet Control Message Protocol printer routines +print-igmp.c - Internet Group Management Protocol printer routines +print-igrp.c - Interior Gateway Routing Protocol printer routines +print-ip.c - IP printer routines +print-ip6.c - IPv6 printer routines +print-ip6opts.c - IPv6 header option printer routines +print-ipcomp.c - IP Payload Compression Protocol printer routines +print-ipx.c - IPX printer routines +print-isakmp.c - Internet Security Association and Key Management Protocol +print-isoclns.c - ISO CLNS, ESIS, and ISIS printer routines +print-krb.c - Kerberos printer routines +print-l2tp.c - Layer Two Tunneling Protocol printer routines +print-lane.c - ATM LANE printer routines +print-llc.c - IEEE 802.2 LLC printer routines +print-lspping.c - LSPPING printer routines +print-lwres.c - Lightweight Resolver protocol printer routines +print-mobile.c - IPv4 mobility printer routines +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 +print-ospf.c - Open Shortest Path First printer routines +print-ospf6.c - IPv6 Open Shortest Path First printer routines +print-pflog.c - OpenBSD packet filter log file printer routines +print-pgm.c - Pragmatic General Multicast printer routines +print-pim.c - Protocol Independent Multicast printer routines +print-ppp.c - Point to Point Protocol printer routines +print-pppoe.c - PPP-over-Ethernet printer routines +print-pptp.c - Point-to-Point Tunnelling Protocol printer routines +print-radius.c - Radius protocol printer routines +print-raw.c - Raw IP printer routines +print-rip.c - Routing Information Protocol printer routines +print-ripng.c - IPv6 Routing Information Protocol printer routines +print-rrcp.c - Realtek Remote Control Protocol routines +print-rsvp.c - Resource reSerVation Protocol (RSVP) printer routines +print-rt6.c - IPv6 routing header printer routines +print-rx.c - AFS RX printer routines +print-sctp.c - Stream Control Transmission Protocol printer routines +print-sip.c - SIP printer routines +print-sl.c - Compressed Serial Line Internet Protocol printer routines +print-sll.c - Linux "cooked" capture printer routines +print-slow.c - IEEE "slow protocol" (802.3ad) printer routines +print-smb.c - SMB/CIFS printer routines +print-snmp.c - Simple Network Management Protocol printer routines +print-stp.c - IEEE 802.1d spanning tree protocol printer routines +print-sunatm.c - SunATM DLPI capture printer routines +print-sunrpc.c - Sun Remote Procedure Call printer routines +print-symantec.c - Symantec Enterprise Firewall printer routines +print-tcp.c - TCP printer routines +print-telnet.c - Telnet option printer routines +print-tftp.c - Trivial File Transfer Protocol printer routines +print-timed.c - BSD time daemon protocol printer routines +print-token.c - Token Ring printer routines +print-udp.c - UDP printer routines +print-vjc.c - PPP Van Jacobson compression (RFC1144) printer routines +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 +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 +win32 - headers and routines for building on Win32 systems Modified: head/contrib/tcpdump/Makefile.in ============================================================================== --- head/contrib/tcpdump/Makefile.in Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/Makefile.in Sat Mar 21 18:30:25 2009 (r190207) @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.293.2.7 2007/09/12 19:48:50 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.317.2.4 2008-05-27 07:14:26 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -57,6 +57,7 @@ LIBS = @LIBS@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +RANLIB = @RANLIB@ # 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 @@ -65,45 +66,122 @@ INSTALL_DATA = @INSTALL_DATA@ @rm -f $@ $(CC) $(CFLAGS) -c $(srcdir)/$*.c -CSRC = addrtoname.c af.c cpack.c gmpls.c oui.c gmt2local.c ipproto.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 \ print-802_11.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-cdp.c \ - print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \ - print-domain.c print-dvmrp.c print-enc.c print-egp.c \ + print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.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-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-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-mobile.c print-mpls.c print-msdp.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-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \ - print-pgm.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-sip.c print-sl.c print-sll.c \ + print-pgm.c print-pim.c print-ppp.c print-pppoe.c print-pptp.c \ + print-radius.c print-raw.c print-rip.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-token.c print-udp.c print-vjc.c print-vrrp.c \ + print-timed.c print-token.c print-udld.c print-udp.c \ + print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \ print-wb.c print-zephyr.c setsignal.c tcpdump.c util.c +LIBNETDISSECT_SRC=print-isakmp.c +LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) +LIBNETDISSECT=libnetdissect.a + LOCALSRC = @LOCALSRC@ GENSRC = version.c LIBOBJS = @LIBOBJS@ -SRC = $(CSRC) $(GENSRC) $(LOCALSRC) +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) -HDR = addrtoname.h appletalk.h bootp.h cpack.h dccp.h decnet.h \ - ethertype.h extract.h fddi.h gmt2local.h igrp.h interface.h \ - ipx.h llc.h machdep.h mib.h nfsfh.h nfsv2.h ntp.h ospf.h \ +OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) $(LOCALSRC:.c=.o) $(LIBOBJS) $(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 \ + 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 \ + 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 \ + ospf.h \ + ospf6.h \ + oui.h \ + pcap-missing.h \ + pmap_prot.h \ + ppp.h \ + route6d.h \ + rpc_auth.h \ + rpc_msg.h \ + rx.h \ + sctpConstants.h \ + sctpHeader.h \ setsignal.h \ - gnuc.h ipsec_doi.h isakmp.h l2tp.h nameser.h \ - netbios.h oakley.h ospf6.h pf.h ppp.h route6d.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 = \ /usr/include/arpa/tftp.h \ @@ -120,12 +198,92 @@ TAGFILES = $(SRC) $(HDR) $(TAGHDR) CLEANFILES = $(PROG) $(OBJ) $(GENSRC) +EXTRA_DIST = \ + CHANGES \ + CREDITS \ + INSTALL.txt \ + LICENSE \ + Makefile.in \ + README \ + Readme.Win32 \ + VERSION \ + aclocal.m4 \ + atime.awk \ + bpf_dump.c \ + config.guess \ + config.h.in \ + config.sub \ + configure \ + configure.in \ + install-sh \ + lbl/os-osf4.h \ + lbl/os-solaris2.h \ + lbl/os-sunos4.h \ + lbl/os-ultrix4.h \ + makemib \ + missing/addrinfo.h \ + missing/addrsize.h \ + missing/bittypes.h \ + missing/dlnames.c \ + missing/datalinks.c \ + missing/getaddrinfo.c \ + missing/getnameinfo.c \ + missing/inet_aton.c \ + missing/inet_ntop.c \ + missing/inet_pton.c \ + missing/resolv6.h \ + missing/resolv_ext.h \ + missing/snprintf.c \ + missing/sockstorage.h \ + missing/strdup.c \ + missing/strlcat.c \ + missing/strlcpy.c \ + missing/strsep.c \ + mkdep \ + packetdat.awk \ + pcap_dump_ftell.c \ + print-dhcp6.c \ + print-frag6.c \ + print-icmp6.c \ + print-ip6.c \ + print-ip6opts.c \ + print-mobility.c \ + print-netbios.c \ + print-ospf6.c \ + print-pflog.c \ + print-ripng.c \ + print-rt6.c \ + print-smb.c \ + send-ack.awk \ + smbutil.c \ + stime.awk \ + strcasecmp.c \ + tcpdump.1 \ + vfprintf.c \ + win32/Include/Arpa/tftp.h \ + win32/Include/errno.h \ + win32/Include/getopt.h \ + win32/Include/inetprivate.h \ + win32/Include/telnet.h \ + win32/Include/w32_fzs.h \ + win32/Include/Netinet/in_systm.h \ + win32/Include/Netinet/ip.h \ + win32/Src/getopt.c \ + win32/prj/GNUmakefile \ + win32/prj/WinDump.dsp \ + win32/prj/WinDump.dsw + all: $(PROG) $(PROG): $(OBJ) @V_PCAPDEP@ @rm -f $@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) +$(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) + @rm -f $@ + $(AR) cr $@ $(LIBNETDISSECT_OBJ) + $(RANLIB) $@ + datalinks.o: $(srcdir)/missing/datalinks.c $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c dlnames.o: $(srcdir)/missing/dlnames.c @@ -154,12 +312,20 @@ version.o: version.c version.c: $(srcdir)/VERSION @rm -f $@ - sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@ + if grep CVS ${srcdir}/VERSION >/dev/null; then \ + read ver <${srcdir}/VERSION; \ + echo $$ver | tr -d '\012'; \ + date +_%Y_%m_%d; \ + else \ + cat ${srcdir}/VERSION; \ + fi | sed -e 's/.*/char version[] = "&";/' > $@ + -install: +install: all [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) + $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` [ -d $(DESTDIR)$(mandir)/man1 ] || \ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) $(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 @@ -183,10 +349,15 @@ distclean: tags: $(TAGFILES) ctags -wtd $(TAGFILES) +TAGS: $(TAGFILES) + etags $(TAGFILES) + releasetar: @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \ - list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \ - tar -c -z -f $$name.tar.gz $$name/. ; + mkdir $$name; \ + tar cf - $(CSRC) $(HDR) $(LIBNETDISSECT_SRC) $(EXTRA_DIST) | (cd $$name; tar xf -); \ + tar -c -z -f $$name.tar.gz $$name; \ + rm -rf $$name depend: $(GENSRC) ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) Modified: head/contrib/tcpdump/README ============================================================================== --- head/contrib/tcpdump/README Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/README Sat Mar 21 18:30:25 2009 (r190207) @@ -1,10 +1,11 @@ -@(#) $Header: /tcpdump/master/tcpdump/README,v 1.65.2.1 2007/09/14 01:03:12 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/README,v 1.66.2.1 2008-05-30 01:38:20 guy Exp $ (LBL) TCPDUMP 3.9 Now maintained by "The Tcpdump Group" See www.tcpdump.org -Please send inquiries/comments/reports to tcpdump-workers@tcpdump.org +Please send inquiries/comments/reports to: + tcpdump-workers@lists.tcpdump.org Anonymous CVS is available via: cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master login @@ -68,15 +69,14 @@ trace files. See the above distribution documentation. Problems, bugs, questions, desirable enhancements, etc. should be sent -to the address "tcpdump-workers@tcpdump.org". Bugs, support requests, -and feature requests may also be submitted on the SourceForge site for -tcpdump at +to the address "tcpdump-workers@lists.tcpdump.org". Bugs, support +requests, and feature requests may also be submitted on the SourceForge +site for tcpdump at http://sourceforge.net/projects/tcpdump/ Source code contributions, etc. should be sent to the email address -"patches@tcpdump.org", or submitted as patches on the SourceForge site -for tcpdump. +submitted as patches on the SourceForge site for tcpdump. Current versions can be found at www.tcpdump.org, or the SourceForge site for tcpdump. Modified: head/contrib/tcpdump/VERSION ============================================================================== --- head/contrib/tcpdump/VERSION Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/VERSION Sat Mar 21 18:30:25 2009 (r190207) @@ -1 +1 @@ -3.9.8 +4.0.0 Modified: head/contrib/tcpdump/addrtoname.c ============================================================================== --- head/contrib/tcpdump/addrtoname.c Sat Mar 21 17:09:00 2009 (r190206) +++ head/contrib/tcpdump/addrtoname.c Sat Mar 21 18:30:25 2009 (r190207) @@ -25,7 +25,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.9 2007/09/14 00:26:18 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -81,7 +81,6 @@ extern int ether_ntohost(char *, const s */ #define HASHNAMESIZE 4096 -#define BUFSIZE 128 struct hnamemem { u_int32_t addr; @@ -511,14 +510,19 @@ etheraddr_string(register const u_char * } const char * -linkaddr_string(const u_char *ep, const unsigned int len) +linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len) { register u_int i; register char *cp; register struct enamemem *tp; - if (len == ETHER_ADDR_LEN) /* XXX not totally correct... */ - return etheraddr_string(ep); + if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) { + return etheraddr_string(ep); + } + + if (type == LINKADDR_FRELAY) { + return q922_string(ep); + } tp = lookup_bytestring(ep, len); if (tp->e_name) Modified: head/contrib/tcpdump/addrtoname.h ============================================================================== --- head/contrib/tcpdump/addrtoname.h Sat Mar 21 17:09:00 2009 (r190206) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903211830.n2LIUPXJ043439>