Date: Mon, 14 May 2012 08:01:49 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r235427 - in vendor/tcpdump/dist: . missing tests win32/Include win32/Include/Arpa win32/Include/Netinet win32/prj Message-ID: <201205140801.q4E81nbw021817@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon May 14 08:01:48 2012 New Revision: 235427 URL: http://svn.freebsd.org/changeset/base/235427 Log: Vendor import of tcpdump 4.2.1. Added: vendor/tcpdump/dist/in_cksum.c (contents, props changed) vendor/tcpdump/dist/ppi.h (contents, props changed) vendor/tcpdump/dist/print-802_15_4.c (contents, props changed) vendor/tcpdump/dist/print-babel.c (contents, props changed) vendor/tcpdump/dist/print-carp.c (contents, props changed) vendor/tcpdump/dist/print-ppi.c (contents, props changed) vendor/tcpdump/dist/print-rpki-rtr.c (contents, props changed) vendor/tcpdump/dist/tests/02-sunrise-sunset-esp.pcap (contents, props changed) vendor/tcpdump/dist/tests/08-sunrise-sunset-aes.pcap (contents, props changed) vendor/tcpdump/dist/tests/08-sunrise-sunset-esp2.pcap (contents, props changed) vendor/tcpdump/dist/tests/QinQpacket.out vendor/tcpdump/dist/tests/QinQpacket.pcap (contents, props changed) vendor/tcpdump/dist/tests/QinQpacketv.out vendor/tcpdump/dist/tests/babel.pcap (contents, props changed) vendor/tcpdump/dist/tests/babel1.out vendor/tcpdump/dist/tests/babel1v.out vendor/tcpdump/dist/tests/eapon1.pcap (contents, props changed) vendor/tcpdump/dist/tests/empty.uu vendor/tcpdump/dist/tests/espudp1.pcap (contents, props changed) vendor/tcpdump/dist/tests/forces3vvv.out vendor/tcpdump/dist/tests/ikev2four.pcap (contents, props changed) vendor/tcpdump/dist/tests/ikev2pI2.pcap (contents, props changed) vendor/tcpdump/dist/tests/isakmp-delete-segfault.pcap (contents, props changed) vendor/tcpdump/dist/tests/isakmp-identification-segfault.pcap (contents, props changed) vendor/tcpdump/dist/tests/isakmp-pointer-loop.pcap (contents, props changed) vendor/tcpdump/dist/tests/isakmp4500.pcap (contents, props changed) vendor/tcpdump/dist/tests/lmp.pcap (contents, props changed) vendor/tcpdump/dist/tests/mpls-ldp-hello.pcap (contents, props changed) vendor/tcpdump/dist/tests/ospf-gmpls.pcap (contents, props changed) vendor/tcpdump/dist/tests/print-flags.pcap (contents, props changed) vendor/tcpdump/dist/tests/sflow_multiple_counter_30_pdus.out vendor/tcpdump/dist/tests/sflow_multiple_counter_30_pdus.pcap (contents, props changed) Deleted: vendor/tcpdump/dist/missing/addrsize.h vendor/tcpdump/dist/missing/bittypes.h vendor/tcpdump/dist/missing/resolv6.h vendor/tcpdump/dist/missing/resolv_ext.h vendor/tcpdump/dist/tests/02-sunrise-sunset-esp.puu vendor/tcpdump/dist/tests/08-sunrise-sunset-aes.puu vendor/tcpdump/dist/tests/08-sunrise-sunset-esp2.puu vendor/tcpdump/dist/tests/eapon1.puu vendor/tcpdump/dist/tests/eapon2.puu vendor/tcpdump/dist/tests/espudp1.puu vendor/tcpdump/dist/tests/forces2.pcap vendor/tcpdump/dist/tests/ikev2.puu vendor/tcpdump/dist/tests/ikev2four.puu vendor/tcpdump/dist/tests/ikev2pI2.puu vendor/tcpdump/dist/tests/isakmp-delete-segfault.puu vendor/tcpdump/dist/tests/isakmp-identification-segfault.puu vendor/tcpdump/dist/tests/isakmp-pointer-loop.puu vendor/tcpdump/dist/tests/isakmp4500.puu vendor/tcpdump/dist/tests/lmp.puu vendor/tcpdump/dist/tests/mpls-ldp-hello.puu vendor/tcpdump/dist/tests/ospf-gmpls.puu vendor/tcpdump/dist/tests/print-flags.puu vendor/tcpdump/dist/win32/Include/Arpa/tftp.h vendor/tcpdump/dist/win32/Include/Netinet/in_systm.h vendor/tcpdump/dist/win32/Include/Netinet/ip.h vendor/tcpdump/dist/win32/Include/inetprivate.h vendor/tcpdump/dist/win32/Include/telnet.h Modified: vendor/tcpdump/dist/CHANGES vendor/tcpdump/dist/CREDITS vendor/tcpdump/dist/Makefile.in vendor/tcpdump/dist/VERSION vendor/tcpdump/dist/acconfig.h vendor/tcpdump/dist/aclocal.m4 vendor/tcpdump/dist/addrtoname.c vendor/tcpdump/dist/addrtoname.h vendor/tcpdump/dist/bootp.h vendor/tcpdump/dist/config.h.in vendor/tcpdump/dist/configure vendor/tcpdump/dist/configure.in vendor/tcpdump/dist/cpack.c vendor/tcpdump/dist/cpack.h vendor/tcpdump/dist/ethertype.h vendor/tcpdump/dist/forces.h vendor/tcpdump/dist/ieee802_11_radio.h vendor/tcpdump/dist/interface.h vendor/tcpdump/dist/ip.h vendor/tcpdump/dist/ip6.h vendor/tcpdump/dist/ipproto.c vendor/tcpdump/dist/ipproto.h vendor/tcpdump/dist/netdissect.h vendor/tcpdump/dist/ospf.h vendor/tcpdump/dist/oui.c vendor/tcpdump/dist/oui.h vendor/tcpdump/dist/print-802_11.c vendor/tcpdump/dist/print-ap1394.c vendor/tcpdump/dist/print-arcnet.c vendor/tcpdump/dist/print-arp.c vendor/tcpdump/dist/print-atalk.c vendor/tcpdump/dist/print-atm.c vendor/tcpdump/dist/print-bgp.c vendor/tcpdump/dist/print-cdp.c vendor/tcpdump/dist/print-chdlc.c vendor/tcpdump/dist/print-dccp.c vendor/tcpdump/dist/print-dhcp6.c vendor/tcpdump/dist/print-eigrp.c vendor/tcpdump/dist/print-enc.c vendor/tcpdump/dist/print-ether.c vendor/tcpdump/dist/print-forces.c vendor/tcpdump/dist/print-fr.c vendor/tcpdump/dist/print-gre.c vendor/tcpdump/dist/print-icmp.c vendor/tcpdump/dist/print-icmp6.c vendor/tcpdump/dist/print-igmp.c vendor/tcpdump/dist/print-ip.c vendor/tcpdump/dist/print-ip6.c vendor/tcpdump/dist/print-ipnet.c vendor/tcpdump/dist/print-ipx.c vendor/tcpdump/dist/print-isoclns.c vendor/tcpdump/dist/print-juniper.c vendor/tcpdump/dist/print-lane.c vendor/tcpdump/dist/print-ldp.c vendor/tcpdump/dist/print-llc.c vendor/tcpdump/dist/print-lldp.c vendor/tcpdump/dist/print-lmp.c vendor/tcpdump/dist/print-lspping.c vendor/tcpdump/dist/print-mobile.c vendor/tcpdump/dist/print-mpls.c vendor/tcpdump/dist/print-null.c vendor/tcpdump/dist/print-ospf.c vendor/tcpdump/dist/print-pflog.c vendor/tcpdump/dist/print-pgm.c vendor/tcpdump/dist/print-pim.c vendor/tcpdump/dist/print-ppp.c vendor/tcpdump/dist/print-rrcp.c vendor/tcpdump/dist/print-rsvp.c vendor/tcpdump/dist/print-sctp.c vendor/tcpdump/dist/print-sflow.c vendor/tcpdump/dist/print-sl.c vendor/tcpdump/dist/print-sll.c vendor/tcpdump/dist/print-slow.c vendor/tcpdump/dist/print-sunrpc.c vendor/tcpdump/dist/print-symantec.c vendor/tcpdump/dist/print-tcp.c vendor/tcpdump/dist/print-tftp.c vendor/tcpdump/dist/print-udp.c vendor/tcpdump/dist/print-vrrp.c vendor/tcpdump/dist/tcp.h vendor/tcpdump/dist/tcpdump-stdinc.h vendor/tcpdump/dist/tcpdump.1.in vendor/tcpdump/dist/tcpdump.c vendor/tcpdump/dist/tests/TESTLIST vendor/tcpdump/dist/tests/TESTonce vendor/tcpdump/dist/tests/dio.out vendor/tcpdump/dist/tests/forces1.out vendor/tcpdump/dist/tests/forces1.pcap vendor/tcpdump/dist/tests/forces1vvv.out vendor/tcpdump/dist/tests/forces1vvvv.out vendor/tcpdump/dist/tests/ikev2fourv.out vendor/tcpdump/dist/tests/ikev2fourv4.out vendor/tcpdump/dist/tests/lmp.sh vendor/tcpdump/dist/tests/print-flags.sh vendor/tcpdump/dist/udp.h vendor/tcpdump/dist/win32/prj/GNUmakefile vendor/tcpdump/dist/win32/prj/WinDump.dsp Modified: vendor/tcpdump/dist/CHANGES ============================================================================== --- vendor/tcpdump/dist/CHANGES Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/CHANGES Mon May 14 08:01:48 2012 (r235427) @@ -1,3 +1,64 @@ +Friday December 9, 2011. guy@alum.mit.edu. + Summary for 4.2.1 tcpdump release + Only build the Babel printer if IPv6 is enabled. + Support Babel on port 6696 as well as 6697. + Include ppi.h in release tarball. + Include all the test files in the release tarball, and don't + "include" test files that no longer exist. + Don't assume we have <rpc/rpc.h> - check for it. + Support "-T carp" as a way of dissecting IP protocol 112 as CARP + rather than VRRP. + Support Hilscher NetAnalyzer link-layer header format. + Constify some pointers and fix compiler warnings. + Get rid of never-true test. + Fix an unintended fall-through in a case statement in the ARP + printer. + Fix several cases where sizeof(sizeof(XXX)) was used when just + sizeof(XXX) was intended. + Make stricter sanity checks in the ES-IS printer. + Get rid of some GCCisms that caused builds to fai with compilers + that don't support them. + Fix typo in man page. + Added length checks to Babel printer. + +Sunday July 24, 2011. mcr@sandelman.ca. + Summary for 4.2.+ + merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov + at gmail dot com> + updates to forces for new port numbers + Use "-H", not "-h", for the 802.11s option. (-h always help) + Better ICMPv6 checksum handling. + add support for the RPKI/Router Protocol, per -ietf-sidr-rpki-rtr-12 + get rid of uuencoded pcap test files, git can do binary. + sFlow changes for 64-bit counters. + fixes for PPI packet header handling and printing. + Add DCB Exchange protocol (DCBX) version 1.01. + Babel dissector, from Juliusz Chroboczek and Grégoire Henry. + improvements to radiotap for rate values > 127. + Many improvements to ForCES decode, including fix SCTP TML port + updated RPL type code to RPL-17 draft + Improve printout of DHCPv6 options. + added support and test case for QinQ (802.1q VLAN) packets + Handle DLT_IEEE802_15_4_NOFCS like DLT_IEEE802_15_4. + Build fixes for Sparc and other machines with alignment restrictions. + Merged changes from Debian package. + PGM: Add ACK decoding and add PGMCC DATA and FEEDBACK options. + Build fixes for OSX (Snow Leopard and others) + Add support for IEEE 802.15.4 packets + +Tue. July 20, 2010. guy@alum.mit.edu. + Summary for 4.1.2 tcpdump release + If -U is specified, flush the file after creating it, so it's + not zero-length + Fix TCP flags output description, and some typoes, in the man + page + Add a -h flag, and only attempt to recognize 802.11s mesh + headers if it's set + When printing the link-layer type list, send *all* output to + stderr + Include the CFLAGS setting when configure was run in the + compiler flags + 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. Modified: vendor/tcpdump/dist/CREDITS ============================================================================== --- vendor/tcpdump/dist/CREDITS Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/CREDITS Mon May 14 08:01:48 2012 (r235427) @@ -1,189 +1,203 @@ This file lists people who have contributed to tcpdump: The current maintainers: - 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> + 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 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> - Bert Vermeulen <bert at biot dot com> - 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 Horn <dhorn2000 at gmail dot com> - 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> - Elmar Kirchner <elmar at juniper dot net> - 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> - 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> - Ilpo Järvinen <ilpo dot jarvinen at helsinki dot fi> - Jacek Tobiasz <Jacek dot Tobiasz at atm dot com dot pl> - Jakob Schlyter <jakob at openbsd dot org> - Jamal Hadi Salim <hadi at cyberus dot ca> - 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> - João Medeiros <ignotus21 at sourceforge 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> - 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> - 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> - Lucas C. Villa Real <lucasvr at us dot ibm dot com> - 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 Riepe <too-tired at sourceforge dot net> - 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> - Peter Volkov <pva at gentoo dot org> - 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> - 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> - Robert Edmonds <stu-42 at sourceforge 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 at procket dot com> - Toshihiro Kanda <candy at fct dot kgc dot co dot jp> - 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> - 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> - Yen Yen Lim - Yoshifumi Nishida + A Costa <agcosta at gis dot net> + 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 Nording <andrew at nording dot ru> + Andrew Tridgell <tridge at linuxcare dot com> + Andy Heffernan <ahh at juniper dot net> + Anton Bernal <anton 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> + Bert Vermeulen <bert at biot dot com> + 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> + Chris Jepeway <jepeway at blasted-heath dot com> + Chris Larson <clarson at kergoth dot com> + Christian Sievers <c_s at users dot sourceforge dot net> + Christophe Rhodes <csr21 at cantab dot net> + 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 Horn <dhorn2000 at gmail dot com> + David Smith <dsmith at redhat dot com> + David Young <dyoung at ojctech dot com> + Dmitry Eremin-Solenikov <dbaryshkov at gmail dot com> + Don Ebright <Don dot Ebright at compuware dot com> + Eddie Kohler <xexd at sourceforge dot net> + Elmar Kirchner <elmar at juniper dot net> + 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> + 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> + 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> + 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> + Ilpo Järvinen <ilpo dot jarvinen at helsinki dot fi> + Jacek Tobiasz <Jacek dot Tobiasz at atm dot com dot pl> + Jakob Schlyter <jakob at openbsd dot org> + Jamal Hadi Salim <hadi at cyberus dot ca> + 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> + João Medeiros <ignotus21 at sourceforge dot net> + Joerg Mayer <jmayer@loplof.de> + Jørgen Thomsen <jth at jth dot net> + Julian Cowley <julian at lava dot net> + Juliusz Chroboczek <jch@pps.jussieu.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> + 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> + 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 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 Riepe <too-tired at sourceforge dot net> + Michael Shalayeff <mickey at openbsd dot org> + Michael Shields <shields at msrl dot com> + Michael T. Stolarchuk <mts at off dot to> + Michal Sekletar <msekleta at redhat dot com> + Michele "mydecay" Marchetto <smarchetto1 at tin dot it> + Mike Frysinger <vapier at gmail dot com> + 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> + 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 Ferrell <pflarr at sourceforge 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> + Pawel Worach <pawel dot worach at gmail dot com> + 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> + Peter Volkov <pva at gentoo dot org> + 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> + 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> + Robert Edmonds <stu-42 at sourceforge dot net> + Roderick Schertler <roderick at argon dot org> + Romain Francoise <rfrancoise at debian dot org> + 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 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 at procket dot com> + Toshihiro Kanda <candy at fct dot kgc dot co dot jp> + Uns Lider <unslider at miranda dot org> + Victor Oppleman <oppleman at users dot sourceforge dot net> + 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> + Yen Yen Lim + Yoshifumi Nishida The original LBL crew: - Steve McCanne - Craig Leres - Van Jacobson + Steve McCanne + Craig Leres + Van Jacobson Past maintainers: - Jun-ichiro itojun Hagino <itojun at iijlab dot net> + Jun-ichiro itojun Hagino <itojun at iijlab dot net> Modified: vendor/tcpdump/dist/Makefile.in ============================================================================== --- vendor/tcpdump/dist/Makefile.in Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/Makefile.in Mon May 14 08:01:48 2012 (r235427) @@ -26,6 +26,7 @@ # Top level hierarchy prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ # Pathname of directory to install the binary sbindir = @sbindir@ # Pathname of directory to install the man page @@ -46,7 +47,8 @@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@ # Standard CFLAGS -CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +CFLAGS = @CFLAGS@ +FULL_CFLAGS = $(CCOPT) $(DEFS) $(INCLS) $(CFLAGS) # Standard LDFLAGS LDFLAGS = @LDFLAGS@ @@ -64,15 +66,15 @@ RANLIB = @RANLIB@ # problem if you don't own the file but can write to the directory. .c.o: @rm -f $@ - $(CC) $(CFLAGS) -c $(srcdir)/$*.c + $(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 \ - 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-bt.c \ - print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c \ - print-dccp.c print-decnet.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-fr.c \ @@ -83,8 +85,9 @@ CSRC = addrtoname.c af.c checksum.c cpac 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-rrcp.c print-rsvp.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 \ @@ -165,6 +168,7 @@ HDR = \ oui.h \ pcap-missing.h \ pmap_prot.h \ + ppi.h \ ppp.h \ route6d.h \ rpc_auth.h \ @@ -226,16 +230,12 @@ EXTRA_DIST = \ lbl/os-ultrix4.h \ makemib \ missing/addrinfo.h \ - missing/addrsize.h \ - missing/bittypes.h \ missing/dlnames.c \ missing/datalinks.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 \ @@ -245,6 +245,7 @@ EXTRA_DIST = \ mkdep \ packetdat.awk \ pcap_dump_ftell.c \ + print-babel.c \ print-dhcp6.c \ print-frag6.c \ print-icmp6.c \ @@ -262,12 +263,18 @@ EXTRA_DIST = \ stime.awk \ strcasecmp.c \ tcpdump.1.in \ - tests/02-sunrise-sunset-esp.puu \ - tests/08-sunrise-sunset-aes.puu \ - tests/08-sunrise-sunset-esp2.puu \ + tests/02-sunrise-sunset-esp.pcap \ + tests/08-sunrise-sunset-aes.pcap \ + tests/08-sunrise-sunset-esp2.pcap \ + tests/QinQpacket.out \ + tests/QinQpacket.pcap \ + tests/QinQpacketv.out \ tests/TESTLIST \ tests/TESTonce \ tests/TESTrun.sh \ + tests/babel.pcap \ + tests/babel1.out \ + tests/babel1v.out \ tests/bgp-infinite-loop.pcap \ tests/bgp_vpn_attrset.out \ tests/bgp_vpn_attrset.pcap \ @@ -279,8 +286,8 @@ EXTRA_DIST = \ tests/e1000g.pcap \ tests/eapon1.gdbinit \ tests/eapon1.out \ - tests/eapon1.puu \ - tests/eapon2.puu \ + tests/eapon1.pcap \ + tests/empty.uu \ tests/esp-secrets.txt \ tests/esp0.out \ tests/esp1.gdbinit \ @@ -292,61 +299,57 @@ EXTRA_DIST = \ tests/esp5.gdbinit \ tests/esp5.out \ tests/espudp1.out \ - tests/espudp1.puu \ + tests/espudp1.pcap \ tests/forces1.out \ tests/forces1.pcap \ tests/forces1vvv.out \ tests/forces1vvvv.out \ tests/forces2.out \ - tests/forces2.pcap \ tests/forces2v.out \ tests/forces2vv.out \ - tests/ikev2.puu \ + tests/forces3vvv.out \ tests/ikev2four.out \ - tests/ikev2four.puu \ + tests/ikev2four.pcap \ tests/ikev2fourv.out \ tests/ikev2fourv4.out \ tests/ikev2pI2-secrets.txt \ tests/ikev2pI2.out \ - tests/ikev2pI2.puu \ - tests/isakmp-delete-segfault.puu \ - tests/isakmp-identification-segfault.puu \ - tests/isakmp-pointer-loop.puu \ + tests/ikev2pI2.pcap \ + tests/isakmp-delete-segfault.pcap \ + tests/isakmp-identification-segfault.pcap \ + tests/isakmp-pointer-loop.pcap \ tests/isakmp1.out \ tests/isakmp2.out \ tests/isakmp3.out \ tests/isakmp4.out \ - tests/isakmp4500.puu \ + tests/isakmp4500.pcap \ tests/isis-infinite-loop.pcap \ tests/ldp-infinite-loop.pcap \ tests/lmp.out \ - tests/lmp.puu \ + tests/lmp.pcap \ tests/lmp.sh \ tests/lspping-fec-ldp.pcap \ tests/lspping-fec-rsvp.pcap \ tests/mpls-ldp-hello.out \ - tests/mpls-ldp-hello.puu \ + tests/mpls-ldp-hello.pcap \ tests/mpls-traceroute.pcap \ tests/ospf-gmpls.out \ - tests/ospf-gmpls.puu \ + tests/ospf-gmpls.pcap \ tests/print-A.out \ tests/print-AA.out \ tests/print-capX.out \ tests/print-capXX.out \ - tests/print-flags.puu \ + tests/print-flags.pcap \ tests/print-flags.sh \ tests/print-x.out \ tests/print-xx.out \ tests/rsvp-infinite-loop.pcap \ + tests/sflow_multiple_counter_30_pdus.out \ + tests/sflow_multiple_counter_30_pdus.pcap \ 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 \ @@ -356,7 +359,7 @@ all: $(PROG) $(PROG): $(OBJ) @V_PCAPDEP@ @rm -f $@ - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) + $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ @@ -364,30 +367,30 @@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) $(RANLIB) $@ datalinks.o: $(srcdir)/missing/datalinks.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c dlnames.o: $(srcdir)/missing/dlnames.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c getnameinfo.o: $(srcdir)/missing/getnameinfo.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c inet_pton.o: $(srcdir)/missing/inet_pton.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c inet_ntop.o: $(srcdir)/missing/inet_ntop.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c inet_aton.o: $(srcdir)/missing/inet_aton.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c strlcat.o: $(srcdir)/missing/strlcat.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c strlcpy.o: $(srcdir)/missing/strlcpy.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c strsep.o: $(srcdir)/missing/strsep.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c version.o: version.c - $(CC) $(CFLAGS) -c version.c + $(CC) $(FULL_CFLAGS) -c version.c version.c: $(srcdir)/VERSION @rm -f $@ @@ -423,9 +426,9 @@ 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 check: tcpdump - uudecode --help || (echo "No uudecode program found, not running tests"; echo "apt-get/rpm install sharutils?"; exit 1) (cd tests && ./TESTrun.sh) tags: $(TAGFILES) Modified: vendor/tcpdump/dist/VERSION ============================================================================== --- vendor/tcpdump/dist/VERSION Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/VERSION Mon May 14 08:01:48 2012 (r235427) @@ -1 +1 @@ -4.1.1 +4.2.1 Modified: vendor/tcpdump/dist/acconfig.h ============================================================================== --- vendor/tcpdump/dist/acconfig.h Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/acconfig.h Mon May 14 08:01:48 2012 (r235427) @@ -8,12 +8,6 @@ /* Define if you enable support for the libsmi. */ #undef LIBSMI -/* define if you have struct __res_state_ext */ -#undef HAVE_RES_STATE_EXT - -/* define if your struct __res_state has the nsort member */ -#undef HAVE_NEW_RES_STATE - /* define if you have the addrinfo function. */ #undef HAVE_ADDRINFO @@ -23,15 +17,6 @@ /* define ifyou have the h_errno variable. */ #undef HAVE_H_ERRNO -/* define if IN6ADDRSZ is defined (XXX not used!) */ -#undef HAVE_IN6ADDRSZ - -/* define if INADDRSZ is defined (XXX not used!) */ -#undef HAVE_INADDRSZ - -/* define if RES_USE_INET6 is defined */ -#undef HAVE_RES_USE_INET6 - /* define if you have struct sockaddr_storage */ #undef HAVE_SOCKADDR_STORAGE @@ -68,9 +53,6 @@ /* define if you have getrpcbynumber() */ #undef HAVE_GETRPCBYNUMBER -/* AIX hack. */ -#undef _SUN - /* Workaround for missing 64-bit formats */ #undef PRId64 #undef PRIo64 Modified: vendor/tcpdump/dist/aclocal.m4 ============================================================================== --- vendor/tcpdump/dist/aclocal.m4 Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/aclocal.m4 Mon May 14 08:01:48 2012 (r235427) @@ -47,7 +47,7 @@ AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, $1="-O" $2="" if test "${srcdir}" != "." ; then - $2="-I\$(srcdir)" + $2="-I$srcdir" fi if test "${CFLAGS+set}" = set; then LBL_CFLAGS="$CFLAGS" @@ -309,14 +309,22 @@ AC_DEFUN(AC_LBL_LIBPCAP, # # Look for pcap-config. # - AC_PATH_PROG(PCAP_CONFIG, pcap-config) + AC_PATH_TOOL(PCAP_CONFIG, pcap-config) if test -n "$PCAP_CONFIG" ; then # # Found - use it to get the include flags for # libpcap and the flags to link with libpcap. # - $2="`\"$PCAP_CONFIG\" --cflags` $$2" - libpcap="`\"$PCAP_CONFIG\" --libs`" + # Please read section 11.6 "Shell Substitutions" + # in the autoconf manual before doing anything + # to this that involves quoting. Especially note + # the statement "There is just no portable way to use + # double-quoted strings inside double-quoted back-quoted + # expressions (pfew!)." + # + cflags=`"$PCAP_CONFIG" --cflags` + $2="$cflags $$2" + libpcap=`"$PCAP_CONFIG" --libs` else # # Not found; look for pcap. @@ -378,9 +386,17 @@ AC_DEFUN(AC_LBL_LIBPCAP, # The libpcap directory has a pcap-config script. # Use it to get any additioal libraries needed # to link with the libpcap archive library in - # that directory + # that directory. + # + # Please read section 11.6 "Shell Substitutions" + # in the autoconf manual before doing anything + # to this that involves quoting. Especially note + # the statement "There is just no portable way to use + # double-quoted strings inside double-quoted back-quoted + # expressions (pfew!)." # - libpcap="$libpcap `\"$PCAP_CONFIG\" --additional-libs --static`" + additional_libs=`"$PCAP_CONFIG" --additional-libs --static` + libpcap="$libpcap $additional_libs" fi fi LIBS="$libpcap $LIBS" @@ -418,6 +434,21 @@ AC_DEFUN(AC_LBL_LIBPCAP, fi dnl + dnl Check for "pcap_loop()", to make sure we found a working + dnl libpcap and have all the right other libraries with which + dnl to link. (Otherwise, the checks below will fail, not + dnl because the routines are missing from the library, but + dnl because we aren't linking properly with libpcap, and + dnl that will cause confusing errors at build time.) + dnl + AC_CHECK_FUNC(pcap_loop,, + [ + AC_MSG_ERROR( +[Report this to tcpdump-workers@lists.tcpdump.org, and include the +config.log file in your report]) + ]) + + dnl dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", dnl and "pcap_datalink_name_to_val()", and use substitute versions dnl if they're not present. @@ -1057,113 +1088,6 @@ AC_DEFUN(AC_STRUCT_SA_STORAGE, [ ]) dnl -dnl Checks for macro of IP address size -AC_DEFUN(AC_CHECK_ADDRSZ, [ - $1=yes -dnl check for INADDRSZ - AC_MSG_CHECKING(for INADDRSZ) - AC_CACHE_VAL(ac_cv_inaddrsz, - AC_TRY_COMPILE([ -# include <arpa/nameser.h>], - [int a = INADDRSZ], - ac_cv_inaddrsz=yes, - ac_cv_inaddrsz=no)) - AC_MSG_RESULT($ac_cv_inaddrsz) - if test $ac_cv_inaddrsz = yes; then - AC_DEFINE(HAVE_INADDRSZ) - else - $1=no - fi -dnl check for IN6ADDRSZ - AC_MSG_CHECKING(for IN6ADDRSZ) - AC_CACHE_VAL(ac_cv_in6addrsz, - AC_TRY_COMPILE([ -# include <arpa/nameser.h>], - [int a = IN6ADDRSZ], - ac_cv_in6addrsz=yes, - ac_cv_in6addrsz=no)) - AC_MSG_RESULT($ac_cv_in6addrsz) - if test $ac_cv_in6addrsz = yes; then - AC_DEFINE(HAVE_IN6ADDRSZ) - else - $1=no - fi -]) - -dnl -dnl check for RES_USE_INET6 -AC_DEFUN(AC_CHECK_RES_USE_INET6, [ - AC_MSG_CHECKING(for RES_USE_INET6) - AC_CACHE_VAL($1, - AC_TRY_COMPILE([ -# include <sys/types.h> -# include <netinet/in.h> -# include <resolv.h>], - [int a = RES_USE_INET6], - $1=yes, - $1=no)) - AC_MSG_RESULT($$1) - if test $$1 = yes; then - AC_DEFINE(HAVE_RES_USE_INET6) - fi -]) - -dnl -dnl check for AAAA -AC_DEFUN(AC_CHECK_AAAA, [ - AC_MSG_CHECKING(for AAAA) - AC_CACHE_VAL($1, - AC_TRY_COMPILE([ -# include <sys/types.h> -# include <arpa/nameser.h>], - [int a = T_AAAA], - $1=yes, - $1=no)) - AC_MSG_RESULT($$1) - if test $$1 = yes; then - AC_DEFINE(HAVE_AAAA) - fi -]) - -dnl -dnl check for struct res_state_ext -AC_DEFUN(AC_STRUCT_RES_STATE_EXT, [ - AC_MSG_CHECKING(for res_state_ext) - AC_CACHE_VAL($1, - AC_TRY_COMPILE([ -# include <sys/types.h> -# include <netinet/in.h> -# include <netinet6/in6.h> -# include <resolv.h>], - [struct __res_state_ext e], - $1=yes, - $1=no)) - AC_MSG_RESULT($$1) - if test $$1 = yes; then - AC_DEFINE(HAVE_RES_STATE_EXT) - fi -]) - -dnl -dnl check for struct res_state_ext -AC_DEFUN(AC_STRUCT_RES_STATE, [ - AC_MSG_CHECKING(for nsort in res_state) - AC_CACHE_VAL($1, - AC_TRY_COMPILE([ -# include <sys/types.h> -# include <netinet/in.h> -# include <netinet6/in6.h> -# include <resolv.h>], - [struct __res_state e; e.nsort = 0], - $1=yes, - $1=no)) - AC_MSG_RESULT($$1) - if test $$1 = yes; then - AC_DEFINE(HAVE_NEW_RES_STATE) - fi -]) - -dnl dnl check for h_errno AC_DEFUN(AC_VAR_H_ERRNO, [ AC_MSG_CHECKING(for h_errno) @@ -1187,7 +1111,7 @@ dnl AC_DEFUN(AC_C___ATTRIBUTE__, [ AC_MSG_CHECKING(for __attribute__) AC_CACHE_VAL(ac_cv___attribute__, [ -AC_COMPILE_IFELSE( +AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ #include <stdlib.h> @@ -1204,7 +1128,7 @@ main(int argc, char **argv) { foo(); } - ]]), + ]])], ac_cv___attribute__=yes, ac_cv___attribute__=no)]) if test "$ac_cv___attribute__" = "yes"; then @@ -1225,7 +1149,7 @@ dnl AC_DEFUN(AC_C___ATTRIBUTE___FORMAT_FUNCTION_POINTER, [ AC_MSG_CHECKING([whether __attribute__((format)) can be applied to function pointers]) AC_CACHE_VAL(ac_cv___attribute___format_function_pointer, [ -AC_COMPILE_IFELSE( +AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ #include <stdlib.h> @@ -1237,7 +1161,7 @@ main(int argc, char **argv) { (*foo)("%s", "test"); } - ]]), + ]])], ac_cv___attribute___format_function_pointer=yes, ac_cv___attribute___format_function_pointer=no)]) if test "$ac_cv___attribute___format_function_pointer" = "yes"; then Modified: vendor/tcpdump/dist/addrtoname.c ============================================================================== --- vendor/tcpdump/dist/addrtoname.c Mon May 14 05:12:56 2012 (r235426) +++ vendor/tcpdump/dist/addrtoname.c Mon May 14 08:01:48 2012 (r235427) @@ -508,6 +508,34 @@ etheraddr_string(register const u_char * } const char * +le64addr_string(const u_char *ep) +{ + const unsigned int len = 8; + register u_int i; + register char *cp; + register struct enamemem *tp; + char buf[BUFSIZE]; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205140801.q4E81nbw021817>