Merge tcpdump 4.0.0 from the vendor branch.

1 files changed, 158 insertions, 137 deletions

diff --git a/contrib/tcpdump/CREDITS b/contrib/tcpdump/CREDITS
index d327880..b058d67 100644
--- a/contrib/tcpdump/CREDITS
+++ b/contrib/tcpdump/CREDITS
@@ -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>