Date: Mon, 28 May 2012 07:34:52 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r236167 - in stable/9: contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/packaging contrib/libpcap/pcap contrib/libpcap/test lib/libpcap Message-ID: <201205280734.q4S7YqlK097370@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon May 28 07:34:52 2012 New Revision: 236167 URL: http://svn.freebsd.org/changeset/base/236167 Log: MFC: libpcap 1.2.1. Added: stable/9/contrib/libpcap/pcap-netfilter-linux.c - copied unchanged from r236166, head/contrib/libpcap/pcap-netfilter-linux.c stable/9/contrib/libpcap/pcap-netfilter-linux.h - copied unchanged from r236166, head/contrib/libpcap/pcap-netfilter-linux.h stable/9/contrib/libpcap/pcap-tstamp.manmisc - copied unchanged from r236166, head/contrib/libpcap/pcap-tstamp.manmisc stable/9/contrib/libpcap/pcap-tstamp.manmisc.in - copied unchanged from r236166, head/contrib/libpcap/pcap-tstamp.manmisc.in stable/9/contrib/libpcap/pcap_list_tstamp_types.3pcap - copied unchanged from r236166, head/contrib/libpcap/pcap_list_tstamp_types.3pcap stable/9/contrib/libpcap/pcap_list_tstamp_types.3pcap.in - copied unchanged from r236166, head/contrib/libpcap/pcap_list_tstamp_types.3pcap.in stable/9/contrib/libpcap/pcap_set_tstamp_type.3pcap - copied unchanged from r236166, head/contrib/libpcap/pcap_set_tstamp_type.3pcap stable/9/contrib/libpcap/pcap_set_tstamp_type.3pcap.in - copied unchanged from r236166, head/contrib/libpcap/pcap_set_tstamp_type.3pcap.in stable/9/contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap - copied unchanged from r236166, head/contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap stable/9/contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap - copied unchanged from r236166, head/contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap stable/9/contrib/libpcap/test/ - copied from r236166, head/contrib/libpcap/test/ Deleted: stable/9/contrib/libpcap/filtertest.c stable/9/contrib/libpcap/findalldevstest.c stable/9/contrib/libpcap/opentest.c stable/9/contrib/libpcap/pcap_free_datalinks.3pcap stable/9/contrib/libpcap/pcap_freealldevs.3pcap stable/9/contrib/libpcap/selpolltest.c Modified: stable/9/contrib/libpcap/CHANGES stable/9/contrib/libpcap/CREDITS stable/9/contrib/libpcap/Makefile.in stable/9/contrib/libpcap/README stable/9/contrib/libpcap/VERSION stable/9/contrib/libpcap/bpf/net/bpf_filter.c stable/9/contrib/libpcap/config.h.in stable/9/contrib/libpcap/configure stable/9/contrib/libpcap/configure.in stable/9/contrib/libpcap/ethertype.h stable/9/contrib/libpcap/fad-getad.c stable/9/contrib/libpcap/gencode.c stable/9/contrib/libpcap/gencode.h stable/9/contrib/libpcap/grammar.y stable/9/contrib/libpcap/inet.c stable/9/contrib/libpcap/packaging/pcap.spec.in stable/9/contrib/libpcap/pcap-bpf.c stable/9/contrib/libpcap/pcap-bt-linux.c stable/9/contrib/libpcap/pcap-common.c stable/9/contrib/libpcap/pcap-config.in stable/9/contrib/libpcap/pcap-dag.c stable/9/contrib/libpcap/pcap-dlpi.c stable/9/contrib/libpcap/pcap-filter.manmisc stable/9/contrib/libpcap/pcap-filter.manmisc.in stable/9/contrib/libpcap/pcap-int.h stable/9/contrib/libpcap/pcap-libdlpi.c stable/9/contrib/libpcap/pcap-linktype.manmisc stable/9/contrib/libpcap/pcap-linktype.manmisc.in stable/9/contrib/libpcap/pcap-linux.c stable/9/contrib/libpcap/pcap-savefile.manfile stable/9/contrib/libpcap/pcap-stdinc.h stable/9/contrib/libpcap/pcap-usb-linux.c stable/9/contrib/libpcap/pcap-win32.c stable/9/contrib/libpcap/pcap.3pcap stable/9/contrib/libpcap/pcap.3pcap.in stable/9/contrib/libpcap/pcap.c stable/9/contrib/libpcap/pcap/bpf.h stable/9/contrib/libpcap/pcap/pcap.h stable/9/contrib/libpcap/pcap_activate.3pcap stable/9/contrib/libpcap/pcap_can_set_rfmon.3pcap stable/9/contrib/libpcap/pcap_compile.3pcap stable/9/contrib/libpcap/pcap_compile.3pcap.in stable/9/contrib/libpcap/pcap_datalink.3pcap stable/9/contrib/libpcap/pcap_datalink.3pcap.in stable/9/contrib/libpcap/pcap_datalink_name_to_val.3pcap stable/9/contrib/libpcap/pcap_datalink_val_to_name.3pcap stable/9/contrib/libpcap/pcap_dump_open.3pcap stable/9/contrib/libpcap/pcap_fileno.3pcap stable/9/contrib/libpcap/pcap_findalldevs.3pcap stable/9/contrib/libpcap/pcap_get_selectable_fd.3pcap stable/9/contrib/libpcap/pcap_list_datalinks.3pcap stable/9/contrib/libpcap/pcap_list_datalinks.3pcap.in stable/9/contrib/libpcap/pcap_loop.3pcap stable/9/contrib/libpcap/pcap_major_version.3pcap stable/9/contrib/libpcap/pcap_next_ex.3pcap stable/9/contrib/libpcap/pcap_open_dead.3pcap stable/9/contrib/libpcap/pcap_open_live.3pcap stable/9/contrib/libpcap/pcap_open_offline.3pcap stable/9/contrib/libpcap/pcap_set_datalink.3pcap stable/9/contrib/libpcap/savefile.c stable/9/contrib/libpcap/scanner.l stable/9/contrib/libpcap/sf-pcap-ng.c stable/9/contrib/libpcap/sf-pcap.c stable/9/lib/libpcap/Makefile stable/9/lib/libpcap/config.h Directory Properties: stable/9/contrib/libpcap/ (props changed) stable/9/lib/libpcap/ (props changed) Modified: stable/9/contrib/libpcap/CHANGES ============================================================================== --- stable/9/contrib/libpcap/CHANGES Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/CHANGES Mon May 28 07:34:52 2012 (r236167) @@ -1,3 +1,77 @@ +Friday December 9, 2011. guy@alum.mit.edu. +Summary for 1.2.1 libpcap release + Update README file. + Fix typoes in README.linux file. + Clean up some compiler warnings. + Fix Linux compile problems and tests for ethtool.h. + Treat Debian/kFreeBSD and GNU/Hurd as systems with GNU + toolchains. + Support 802.1 QinQ as a form of VLAN in filters. + Treat "carp" as equivalent to "vrrp" in filters. + Fix code generated for "ip6 protochain". + Add some new link-layer header types. + Support capturing NetFilter log messages on Linux. + Clean up some error messages. + Turn off monitor mode on exit for mac80211 interfaces on Linux. + Fix problems turning monitor mode on for non-mac80211 interfaces + on Linux. + Properly fail if /sys/class/net or /proc/net/dev exist but can't + be opened. + Fail if pcap_activate() is called on an already-activated + pcap_t, and add a test program for that. + Fix filtering in pcap-ng files. + Don't build for PowerPC on Mac OS X Lion. + Simplify handling of new DLT_/LINKTYPE_ values. + Expand pcap(3PCAP) man page. + +Sunday July 24, 2011. mcr@sandelman.ca. +Summary for 1.2 libpcap release + All of the changes listed below for 1.1.1 and 1.1.2. + Changes to error handling for pcap_findalldevs(). + Fix the calculation of the frame size in memory-mapped captures. + Add a link-layer header type for STANAG 5066 D_PDUs. + Add a link-layer type for a variant of 3GPP TS 27.010. + Noted real nature of LINKTYPE_ARCNET. + Add a link-layer type for DVB-CI. + Fix configure-script discovery of VLAN acceleration support. + see http://netoptimizer.blogspot.com/2010/09/tcpdump-vs-vlan-tags.html + Linux, HP-UX, AIX, NetBSD and OpenBSD compilation/conflict fixes. + Protect against including AIX 5.x's <net/bpf.h> having been included. + Add DLT_DBUS, for raw D-Bus messages. + Treat either EPERM or EACCES as "no soup for you". + Changes to permissions on DLPI systems. + Add DLT_IEEE802_15_4_NOFCS for 802.15.4 interfaces. + +Fri. August 6, 2010. guy@alum.mit.edu. +Summary for 1.1.2 libpcap release + Return DLT_ values, not raw LINKTYPE_ values from + pcap_datalink() when reading pcap-ng files + Add support for "wlan ra" and "wlan ta", to check the RA and TA + of WLAN frames that have them + Don't crash if "wlan addr{1,2,3,4}" are used without 802.11 + headers + Do filtering on USB and Bluetooth capturing + On FreeBSD/SPARC64, use -fPIC - it's apparently necessary + Check for valid port numbers (fit in a 16-bit unsigned field) in + "port" filters + Reject attempts to put savefiles into non-blocking mode + Check for "no such device" for the "get the media types" ioctl + in *BSD + Improve error messages from bpf_open(), and let it do the error + handling + Return more specific errors from pcap_can_set_rfmon(); fix + documentation + Update description fetching code for FreeBSD, fix code for + OpenBSD + Ignore /sys/net/dev files if we get ENODEV for them, not just + ENXIO; fixes handling of bonding devices on Linux + Fix check for a constant 0 argument to BPF_DIV + Use the right version of ar when cross-building + Free any filter set on a savefile when the savefile is closed + Include the CFLAGS setting when configure was run in the + compiler flags + Add support for 802.15.4 interfaces on Linux + Thu. April 1, 2010. guy@alum.mit.edu. Summary for 1.1.1 libpcap release Update CHANGES to reflect more of the changes in 1.1.0. Modified: stable/9/contrib/libpcap/CREDITS ============================================================================== --- stable/9/contrib/libpcap/CREDITS Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/CREDITS Mon May 28 07:34:52 2012 (r236167) @@ -1,145 +1,154 @@ This file lists people who have contributed to libpcap: The current maintainers: - Bill Fenner <fenner at research dot att 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> + 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: - Alan Bawden <Alan at LCS dot MIT dot EDU> - Albert Chin <china at thewrittenword dot com> - Alexander 'Leo' Bergolth <Leo dot Bergolth at wu-wien dot ac dot at> - Alexey Kuznetsov <kuznet at ms2 dot inr dot ac dot ru> - Alon Bar-Lev <alonbl at sourceforge dot net> - Andrew Brown <atatat at atatdot dot net> - Antti Kantee <pooka at netbsd dot org> - Arien Vijn <arienvijn at sourceforge dot net> - Arkadiusz Miskiewicz <misiek at pld dot org dot pl> - Armando L. Caro Jr. <acaro at mail dot eecis dot udel dot edu> - Assar Westerlund <assar at sics dot se> - Brian Ginsbach <ginsbach at cray dot com> - Charles M. Hannum <mycroft at netbsd dot org> - Chris G. Demetriou <cgd at netbsd dot org> - Chris Lightfoot <cwrl at users dot sourceforge dot net> - Chris Maynard <Chris dot Maynard at gtech dot com> - Chris Pepper <pepper at mail dot reppep dot com> - Christian Bell <csbell at myri dot com> - Christian Peron <csjp at freebsd dot org> - Daniele Orlandi <daniele at orlandi dot com> - Darren Reed <darrenr at sun dot com> - David Kaelbling <drk at sgi dot com> - David Young <dyoung at ojctech dot com> - Dean Gaudet <dean at arctic dot org> - Don Ebright <Don dot Ebright at compuware dot com> - Dug Song <dugsong at monkey dot org> - Dustin Spicuzza <dustin at virtualroadside dot com> - Eric Anderson <anderse at hpl dot hp dot com> - Erik de Castro Lopo <erik dot de dot castro dot lopo at sensorynetworks dot com> - Felix Obenhuber <felix at obenhuber dot de> - Florent Drouin <Florent dot Drouin at alcatel-lucent dot fr> - Franz Schaefer <schaefer at mond dot at> - Fulko Hew <fulko dot hew at gmail dot com> - Fumiyuki Shimizu <fumifumi at abacustech dot jp> - Gianluca Varenni <varenni at netgroup-serv dot polito dot it> - Gilbert Hoyek <gil_hoyek at hotmail dot com> - Gisle Vanem <gvanem at broadpark dot no> - Graeme Hewson <ghewson at cix dot compulink dot co dot uk> - Greg Stark <gsstark at mit dot edu> - Greg Troxel <gdt at ir dot bbn dot com> - Gregor Maier <gregor at net dot in dot tum dot de> - Guillaume Pelat <endymion_ at users dot sourceforge dot net> - Hagen Paul Pfeifer <hagen at jauu dot net> - Hyung Sik Yoon <hsyn at kr dot ibm dot com> - Igor Khristophorov <igor at atdot dot org> - Jan-Philip Velders <jpv at veldersjes dot net> - Jason R. Thorpe <thorpej at netbsd dot org> - Javier Achirica <achirica at ttd dot net> - Jean Tourrilhes <jt at hpl dot hp dot com> - Jean-Louis Charton <Jean-Louis.CHARTON at oikialog dot com> - Jefferson Ogata <jogata at nodc dot noaa dot gov> - Jesper Peterson <jesper at endace dot com> - Joerg Mayer <jmayer at loplof dot de> - John Bankier <jbankier at rainfinity dot com> - Jon Lindgren <jonl at yubyub dot net> - Jon Smirl <jonsmirl at gmail dot com> - Juergen Schoenwaelder <schoenw at ibr dot cs dot tu-bs dot de> - Jung-uk Kim <jkim at FreeBSD dot org> - Kazushi Sugyo <sugyo at pb dot jp dot nec dot com> - Klaus Klein <kleink at netbsd dot org> - Koryn Grant <koryn at endace dot com> - Kris Katterjohn <katterjohn at gmail dot com> - Krzysztof Halasa <khc at pm dot waw dot pl> - Lorenzo Cavallaro <sullivan at sikurezza 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> - Marcus Felipe Pereira <marcus at task dot com dot br> - Mark C. Brown <mbrown at hp dot com> - Mark Pizzolato <List-tcpdump-workers at subscriptions dot pizzolato dot net> - Markus Mayer <markus_mayer at sourceforge dot net> - Martin Husemann <martin at netbsd dot org> - Márton Németh <nm127 at freemail dot hu> - Matthew Luckie <mjl at luckie dot org dot nz> - Max Laier <max at love2party dot net> - Mike Frysinger <vapier at gmail dot com> - Mike Kershaw <dragorn at kismetwireless dot net> - Mike Wiacek <mike at iroot dot net> - Monroe Williams <monroe at pobox dot com> - N. Leiten <nleiten at sourceforge dot net> - Nicolas Dade <ndade at nsd dot dyndns dot org> - Octavian Cerna <tavy at ylabs dot com> - Olaf Kirch <okir at caldera dot de> - Ollie Wild <aaw at users dot sourceforge dot net> - Onno van der Linden <onno at simplex dot nl> - Paolo Abeni <paolo dot abeni at email dot it> - Patrick Marie <mycroft at virgaria dot org> - Patrick McHardy <kaber at trash not net> - Paul Mundt <lethal at linux-sh dot org> - Pavel Kankovsky <kan at dcit dot cz> - Pawel Pokrywka <publicpp at gmail dot com> - Peter Fales <peter at fales-lorenz dot net> - Peter Jeremy <peter dot jeremy at alcatel dot com dot au> - Peter Volkov <pva at gentoo dot org> - Phil Wood <cpw at lanl dot gov> - Rafal Maszkowski <rzm at icm dot edu dot pl> - <rcb-isis at users dot sourceforge dot net> - Richard Stearn <richard at rns-stearn dot demon dot co dot uk> - Rick Jones <raj at cup dot hp dot com> - Robert Edmonds <stu-42 at sourceforge dot net> - Roberto Mariani <jelot-tcpdump at jelot dot it> - Romain Francoise <rfrancoise at debian dot org> - Sagun Shakya <sagun dot shakya at sun dot com> - Scott Barron <sb125499 at ohiou dot edu> - Scott Gifford <sgifford at tir dot com> - Sebastian Krahmer <krahmer at cs dot uni-potsdam dot de> - Sebastien Roy <Sebastien dot Roy at Sun dot COM> - Sepherosa Ziehau <sepherosa at gmail dot com> - Shaun Clowes <delius at progsoc dot uts dot edu dot au> - Solomon Peachy <pizza at shaftnet dot org> - Stefan Hudson <hudson at mbay dot net> - Stephen Donnelly <stephen at endace dot com> - Takashi Yamamoto <yamt at mwd dot biglobe dot ne dot jp> - Tanaka Shin-ya <zstanaka at archer dot livedoor dot com> - Tobias Poschwatta <posch at sourceforge dot net> - Tony Li <tli at procket dot com> - Torsten Landschoff <torsten at debian dot org> - Uns Lider <unslider at miranda dot org> - Uwe Girlich <Uwe dot Girlich at philosys dot de> - Wesley Shields <wxs at FreeBSD dot org> - Xianjie Zhang <xzhang at cup dot hp dot com> - Xin Li <delphij at FreeBSD dot org> - Yen Yen Lim - Yvan Vanhullebus <vanhu at sourceforge dot net> - Yoann Vandoorselaere <yoann at prelude-ids dot org> + Alan Bawden <Alan at LCS dot MIT dot EDU> + Albert Chin <china at thewrittenword dot com> + Alexander 'Leo' Bergolth <Leo dot Bergolth at wu-wien dot ac dot at> + Alexey Kuznetsov <kuznet at ms2 dot inr dot ac dot ru> + Alon Bar-Lev <alonbl at sourceforge dot net> + Andrew Brown <atatat at atatdot dot net> + <andy-1 at sourceforge dot net> + Antti Kantee <pooka at netbsd dot org> + Arien Vijn <arienvijn at sourceforge dot net> + Arkadiusz Miskiewicz <misiek at pld dot org dot pl> + Armando L. Caro Jr. <acaro at mail dot eecis dot udel dot edu> + Assar Westerlund <assar at sics dot se> + Brian Ginsbach <ginsbach at cray dot com> + Charles M. Hannum <mycroft at netbsd dot org> + Chris G. Demetriou <cgd at netbsd dot org> + Chris Lightfoot <cwrl at users dot sourceforge dot net> + Chris Maynard <Chris dot Maynard at gtech dot com> + Chris Pepper <pepper at mail dot reppep dot com> + Christian Bell <csbell at myri dot com> + Christian Peron <csjp at freebsd dot org> + Daniele Orlandi <daniele at orlandi dot com> + Darren Reed <darrenr at sun dot com> + David Kaelbling <drk at sgi dot com> + David Young <dyoung at ojctech dot com> + Dean Gaudet <dean at arctic dot org> + Don Ebright <Don dot Ebright at compuware dot com> + Dug Song <dugsong at monkey dot org> + Dustin Spicuzza <dustin at virtualroadside dot com> + Eric Anderson <anderse at hpl dot hp dot com> + Erik de Castro Lopo <erik dot de dot castro dot lopo at sensorynetworks dot com> + Felix Obenhuber <felix at obenhuber dot de> + Florent Drouin <Florent dot Drouin at alcatel-lucent dot fr> + Franz Schaefer <schaefer at mond dot at> + frederich <frederich at sourceforge dot net> + Fulko Hew <fulko dot hew at gmail dot com> + Fumiyuki Shimizu <fumifumi at abacustech dot jp> + Garrett Cooper <yaberauneya at sourceforge dot net> + Gianluca Varenni <gianluca dot varenni at gmail dot com> + Gilbert Hoyek <gil_hoyek at hotmail dot com> + Gisle Vanem <gvanem at broadpark dot no> + Graeme Hewson <ghewson at cix dot compulink dot co dot uk> + Greg Stark <gsstark at mit dot edu> + Greg Troxel <gdt at ir dot bbn dot com> + Gregor Maier <gregor at net dot in dot tum dot de> + Guillaume Pelat <endymion_ at users dot sourceforge dot net> + Hagen Paul Pfeifer <hagen at jauu dot net> + Henri Doreau <hdoreau at sourceforge dot net> + Hyung Sik Yoon <hsyn at kr dot ibm dot com> + Igor Khristophorov <igor at atdot dot org> + Jan-Philip Velders <jpv at veldersjes dot net> + Jason R. Thorpe <thorpej at netbsd dot org> + Javier Achirica <achirica at ttd dot net> + Jean Tourrilhes <jt at hpl dot hp dot com> + Jean-Louis Charton <Jean-Louis.CHARTON at oikialog dot com> + Jefferson Ogata <jogata at nodc dot noaa dot gov> + Jesper Dangaard Brouer <hawk at comx dot dk> + Jesper Peterson <jesper at endace dot com> + Joerg Mayer <jmayer at loplof dot de> + John Bankier <jbankier at rainfinity dot com> + Jon Lindgren <jonl at yubyub dot net> + Jon Smirl <jonsmirl at gmail dot com> + Juergen Schoenwaelder <schoenw at ibr dot cs dot tu-bs dot de> + Julien Moutinho <julm at savines dot alpes dot fr dot eu dot org> + Jung-uk Kim <jkim at FreeBSD dot org> + Kazushi Sugyo <sugyo at pb dot jp dot nec dot com> + Klaus Klein <kleink at netbsd dot org> + Koryn Grant <koryn at endace dot com> + Kris Katterjohn <katterjohn at gmail dot com> + Krzysztof Halasa <khc at pm dot waw dot pl> + Lorenzo Cavallaro <sullivan at sikurezza dot org> + Loris Degioanni <loris at netgroup-serv dot polito dot it> + Love Hörnquist-Åstrand <lha at stacken dot kth dot se> + Luis MartinGarcia <luis dot mgarc at gmail dot com> + Maciej W. Rozycki <macro at ds2 dot pg dot gda dot pl> + Marcus Felipe Pereira <marcus at task dot com dot br> + Mark C. Brown <mbrown at hp dot com> + Mark Pizzolato <List-tcpdump-workers at subscriptions dot pizzolato dot net> + Markus Mayer <markus_mayer at sourceforge dot net> + Martin Husemann <martin at netbsd dot org> + Márton Németh <nm127 at freemail dot hu> + Matthew Luckie <mjl at luckie dot org dot nz> + Max Laier <max at love2party dot net> + Mike Frysinger <vapier at gmail dot com> + Mike Kershaw <dragorn at kismetwireless dot net> + Mike Wiacek <mike at iroot dot net> + Miroslav Lichvar <mlichvar at redhat dot com> + Monroe Williams <monroe at pobox dot com> + <nvercamm at sourceforge dot net> + N. Leiten <nleiten at sourceforge dot net> + Nicolas Dade <ndade at nsd dot dyndns dot org> + Octavian Cerna <tavy at ylabs dot com> + Olaf Kirch <okir at caldera dot de> + Ollie Wild <aaw at users dot sourceforge dot net> + Onno van der Linden <onno at simplex dot nl> + Paolo Abeni <paolo dot abeni at email dot it> + Patrick Marie <mycroft at virgaria dot org> + Patrick McHardy <kaber at trash not net> + Paul Mundt <lethal at linux-sh dot org> + Pavel Kankovsky <kan at dcit dot cz> + Pawel Pokrywka <publicpp at gmail dot com> + Peter Fales <peter at fales-lorenz dot net> + Peter Jeremy <peter dot jeremy at alcatel dot com dot au> + Peter Volkov <pva at gentoo dot org> + Phil Wood <cpw at lanl dot gov> + Rafal Maszkowski <rzm at icm dot edu dot pl> + <rcb-isis at users dot sourceforge dot net> + Richard Stearn <richard at rns-stearn dot demon dot co dot uk> + Rick Jones <raj at cup dot hp dot com> + Robert Edmonds <stu-42 at sourceforge dot net> + Roberto Mariani <jelot-tcpdump at jelot dot it> + Romain Francoise <rfrancoise at debian dot org> + Sagun Shakya <sagun dot shakya at sun dot com> + Scott Barron <sb125499 at ohiou dot edu> + Scott Gifford <sgifford at tir dot com> + Scott Mcmillan <scott dot a dot mcmillan at intel dot com> + Sebastian Krahmer <krahmer at cs dot uni-potsdam dot de> + Sebastien Roy <Sebastien dot Roy at Sun dot COM> + Sepherosa Ziehau <sepherosa at gmail dot com> + Shaun Clowes <delius at progsoc dot uts dot edu dot au> + Solomon Peachy <pizza at shaftnet dot org> + Stefan Hudson <hudson at mbay dot net> + Stephen Donnelly <stephen at endace dot com> + Takashi Yamamoto <yamt at mwd dot biglobe dot ne dot jp> + Tanaka Shin-ya <zstanaka at archer dot livedoor dot com> + Tobias Poschwatta <posch at sourceforge dot net> + Tony Li <tli at procket dot com> + Torsten Landschoff <torsten at debian dot org> + Uns Lider <unslider at miranda dot org> + Uwe Girlich <Uwe dot Girlich at philosys dot de> + Wesley Shields <wxs at FreeBSD dot org> + Xianjie Zhang <xzhang at cup dot hp dot com> + Xin Li <delphij at FreeBSD dot org> + Yen Yen Lim + Yvan Vanhullebus <vanhu at sourceforge dot net> + Yoann Vandoorselaere <yoann at prelude-ids dot org> 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: stable/9/contrib/libpcap/Makefile.in ============================================================================== --- stable/9/contrib/libpcap/Makefile.in Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/Makefile.in Mon May 28 07:34:52 2012 (r236167) @@ -46,19 +46,21 @@ VPATH = @srcdir@ LD = /usr/bin/ld CC = @CC@ +AR = @AR@ CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ ADDLOBJS = @ADDLOBJS@ ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ LIBS = @LIBS@ +CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ DYEXT = @DYEXT@ V_RPATH_OPT = @V_RPATH_OPT@ PROG=libpcap # Standard CFLAGS -CFLAGS = $(CCOPT) $(INCLS) $(DEFS) +FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -78,9 +80,9 @@ YACC = @V_YACC@ # 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 -PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ +PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@ FSRC = fad-@V_FINDALLDEVS@.c SSRC = @SSRC@ CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \ @@ -123,14 +125,29 @@ HDR = $(PUBHDR) \ sf-pcap-ng.h \ sunatmpos.h +TESTS = \ + filtertest \ + findalldevstest \ + nonblocktest \ + opentest \ + selpolltest + +TESTS_SRC = \ + tests/filtertest.c \ + tests/findalldevstest.c \ + tests/nonblocktest.c \ + tests/opentest.c \ + tests/reactivatetest.c \ + tests/selpolltest.c + GENHDR = \ scanner.h tokdefs.h version.h TAGFILES = \ $(SRC) $(HDR) -CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \ - opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \ +CLEANFILES = $(OBJ) libpcap.* $(TESTS) \ + $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \ lex.yy.c pcap-config MAN1 = pcap-config.1 @@ -141,8 +158,10 @@ MAN3PCAP_EXPAND = \ pcap_datalink.3pcap.in \ pcap_dump_open.3pcap.in \ pcap_list_datalinks.3pcap.in \ + pcap_list_tstamp_types.3pcap.in \ pcap_open_dead.3pcap.in \ - pcap_open_offline.3pcap.in + pcap_open_offline.3pcap.in \ + pcap_set_tstamp_type.3pcap.in MAN3PCAP_NOEXPAND = \ pcap_activate.3pcap \ @@ -160,9 +179,7 @@ MAN3PCAP_NOEXPAND = \ pcap_file.3pcap \ pcap_fileno.3pcap \ pcap_findalldevs.3pcap \ - pcap_freealldevs.3pcap \ pcap_freecode.3pcap \ - pcap_free_datalinks.3pcap \ pcap_get_selectable_fd.3pcap \ pcap_geterr.3pcap \ pcap_inject.3pcap \ @@ -187,7 +204,9 @@ MAN3PCAP_NOEXPAND = \ pcap_snapshot.3pcap \ pcap_stats.3pcap \ pcap_statustostr.3pcap \ - pcap_strerror.3pcap + pcap_strerror.3pcap \ + pcap_tstamp_type_name_to_val.3pcap \ + pcap_tstamp_type_val_to_name.3pcap MAN3PCAP = $(MAN3PCAP_NOEXPAND) $(MAN3PCAP_EXPAND:.in=) @@ -196,9 +215,11 @@ MANFILE = \ MANMISC = \ pcap-filter.manmisc.in \ - pcap-linktype.manmisc.in + pcap-linktype.manmisc.in \ + pcap-tstamp.manmisc.in EXTRA_DIST = \ + $(TESTS_SRC) \ CHANGES \ ChmodBPF/ChmodBPF \ ChmodBPF/StartupParameters.plist \ @@ -237,8 +258,6 @@ EXTRA_DIST = \ fad-null.c \ fad-sita.c \ fad-win32.c \ - filtertest.c \ - findalldevstest.c \ grammar.y \ install-sh \ lbl/os-aix4.h \ @@ -263,7 +282,6 @@ EXTRA_DIST = \ msdos/pktdrvr.c \ msdos/pktdrvr.h \ msdos/readme.dos \ - opentest.c \ org.tcpdump.chmod_bpf.plist \ packaging/pcap.spec.in \ pcap-bpf.c \ @@ -282,6 +300,8 @@ EXTRA_DIST = \ pcap-libdlpi.c \ pcap-linux.c \ pcap-namedb.h \ + pcap-netfilter-linux.c \ + pcap-netfilter-linux.h \ pcap-nit.c \ pcap-null.c \ pcap-pf.c \ @@ -299,7 +319,6 @@ EXTRA_DIST = \ pcap-win32.c \ runlex.sh \ scanner.l \ - selpolltest.c \ Win32/Include/Gnuc.h \ Win32/Include/addrinfo.h \ Win32/Include/bittypes.h \ @@ -328,7 +347,7 @@ all: libpcap.a shared pcap-config libpcap.a: $(OBJ) @rm -f $@ - ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS) + $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS) $(RANLIB) $@ shared: libpcap.$(DYEXT) @@ -401,7 +420,7 @@ libpcap.sl: $(OBJ) libpcap.shareda: $(OBJ) @rm -f $@ shr.o $(CC) @V_SHLIB_OPT@ -o shr.o $(OBJ) $(ADDLOBJS) $(LDFLAGS) $(LIBS) - ar rc $@ shr.o + $(AR) rc $@ shr.o # # For platforms that don't support shared libraries (or on which we @@ -414,7 +433,7 @@ scanner.c: $(srcdir)/scanner.l $(srcdir)/runlex.sh $(LEX) -o$@ $< scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c + $(CC) $(FULL_CFLAGS) -c scanner.c pcap.o: version.h @@ -427,13 +446,13 @@ grammar.c: $(srcdir)/grammar.y grammar.o: grammar.c @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + $(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c version.o: version.c - $(CC) $(CFLAGS) -c version.c + $(CC) $(FULL_CFLAGS) -c version.c snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c version.c: $(srcdir)/VERSION @rm -f $@ @@ -467,35 +486,47 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c + $(CC) $(FULL_CFLAGS) -c bpf_filter.c # # Generate the pcap-config script. # -pcap-config: $(srcdir)/pcap-config.in +# Some Makes, e.g. AIX Make and Solaris Make, can't handle "--file=$@.tmp:$<"; +# for example, the Solaris 9 make man page says +# +# Because make assigns $< and $* as it would for implicit rules +# (according to the suffixes list and the directory contents), +# they may be unreliable when used within explicit target entries. +# +# and this is an explicit target entry. +# +# Therefore, instead of using $<, we explicitly put in $(srcdir)/pcap-config.in. +# +pcap-config: $(srcdir)/pcap-config.in ./config.status @rm -f $@ $@.tmp - sed -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \ - $(srcdir)/pcap-config.in >$@.tmp + ./config.status --file=$@.tmp:$(srcdir)/pcap-config.in mv $@.tmp $@ chmod a+x $@ # # Test programs - not built by default, and not installed. # -filtertest: filtertest.c libpcap.a - $(CC) $(CFLAGS) -I. -L. -o filtertest $(srcdir)/filtertest.c libpcap.a $(LIBS) +tests: $(TESTS) + +filtertest: tests/filtertest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o filtertest $(srcdir)/tests/filtertest.c libpcap.a $(LIBS) + +findalldevstest: tests/findalldevstest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o findalldevstest $(srcdir)/tests/findalldevstest.c libpcap.a $(LIBS) -findalldevstest: findalldevstest.c libpcap.a - $(CC) $(CFLAGS) -I. -L. -o findalldevstest $(srcdir)/findalldevstest.c libpcap.a $(LIBS) +nonblocktest: tests/nonblocktest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o nonblocktest $(srcdir)/tests/nonblocktest.c libpcap.a $(LIBS) -selpolltest: selpolltest.c libpcap.a - $(CC) $(CFLAGS) -I. -L. -o selpolltest $(srcdir)/selpolltest.c libpcap.a $(LIBS) +opentest: tests/opentest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o opentest $(srcdir)/tests/opentest.c libpcap.a $(LIBS) -opentest: opentest.c libpcap.a - $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS) +selpolltest: tests/selpolltest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS) install: install-shared install-archive pcap-config [ -d $(DESTDIR)$(libdir) ] || \ @@ -533,12 +564,21 @@ install: install-shared install-archive rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap + ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap + ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap + ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap @@ -622,8 +662,11 @@ uninstall: uninstall-shared rm -f $(DESTDIR)$(mandir)/man3/$$i; done rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap + rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap @@ -660,7 +703,7 @@ clean: distclean: clean rm -f Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h bpf_filter.c pcap-config \ + config.h gnuc.h net os-proto.h bpf_filter.c pcap-config \ stamp-h stamp-h.in rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=) rm -rf autom4te.cache Modified: stable/9/contrib/libpcap/README ============================================================================== --- stable/9/contrib/libpcap/README Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/README Mon May 28 07:34:52 2012 (r236167) @@ -63,13 +63,14 @@ added overhead (especially, for selectiv would translate BPF filters into a filter program that is compatible with the underlying kernel subsystem, but this is not yet implemented. -BPF is standard in 4.4BSD, BSD/OS, NetBSD, FreeBSD, and OpenBSD. DEC -OSF/1/Digital UNIX/Tru64 UNIX uses the packetfilter interface but has -been extended to accept BPF filters (which libpcap utilizes). Also, you -can add BPF filter support to Ultrix using the kernel source and/or -object patches available in: +BPF is standard in 4.4BSD, BSD/OS, NetBSD, FreeBSD, OpenBSD, DragonFly +BSD, and Mac OS X; an older, modified and undocumented version is +standard in AIX. {DEC OSF/1, Digital UNIX, Tru64 UNIX} uses the +packetfilter interface but has been extended to accept BPF filters +(which libpcap utilizes). Also, you can add BPF filter support to +Ultrix using the kernel source and/or object patches available in: - ftp://gatekeeper.dec.com/pub/DEC/net/bpfext42.tar.Z. + http://www.tcpdump.org/other/bpfext42.tar.Z Linux, in the 2.2 kernel and later kernels, has a "Socket Filter" mechanism that accepts BPF filters; see the README.linux file for Modified: stable/9/contrib/libpcap/VERSION ============================================================================== --- stable/9/contrib/libpcap/VERSION Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/VERSION Mon May 28 07:34:52 2012 (r236167) @@ -1 +1 @@ -1.1.1 +1.2.1 Modified: stable/9/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- stable/9/contrib/libpcap/bpf/net/bpf_filter.c Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/bpf/net/bpf_filter.c Mon May 28 07:34:52 2012 (r236167) @@ -619,7 +619,7 @@ bpf_validate(f, len) /* * Check for constant division by 0. */ - if (BPF_RVAL(p->code) == BPF_K && p->k == 0) + if (BPF_SRC(p->code) == BPF_K && p->k == 0) return 0; break; default: Modified: stable/9/contrib/libpcap/config.h.in ============================================================================== --- stable/9/contrib/libpcap/config.h.in Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/config.h.in Mon May 28 07:34:52 2012 (r236167) @@ -18,6 +18,9 @@ /* define if you have streams capable DAG API */ #undef HAVE_DAG_STREAMS_API +/* define if you have vdag_set_device_info() */ +#undef HAVE_DAG_VDAG + /* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you don't. */ #undef HAVE_DECL_ETHER_HOSTTON @@ -52,12 +55,30 @@ /* if libnl exists */ #undef HAVE_LIBNL +/* if libnl exists and is version 2.x */ +#undef HAVE_LIBNL_2_x + /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if you have the <linux/compiler.h> header file. */ +#undef HAVE_LINUX_COMPILER_H + +/* Define to 1 if you have the <linux/ethtool.h> header file. */ +#undef HAVE_LINUX_ETHTOOL_H + +/* Define to 1 if you have the <linux/if_packet.h> header file. */ +#undef HAVE_LINUX_IF_PACKET_H + +/* Define to 1 if you have the <linux/net_tstamp.h> header file. */ +#undef HAVE_LINUX_NET_TSTAMP_H + /* if tp_vlan_tci exists */ #undef HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI +/* Define to 1 if you have the <linux/types.h> header file. */ +#undef HAVE_LINUX_TYPES_H + /* Define to 1 if you have the <linux/usbdevice_fs.h> header file. */ #undef HAVE_LINUX_USBDEVICE_FS_H @@ -73,6 +94,12 @@ /* Define to 1 if you have the <netinet/if_ether.h> header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the <netpacket/if_packet.h> header file. */ +#undef HAVE_NETPACKET_IF_PACKET_H + +/* Define to 1 if you have the <netpacket/packet.h> header file. */ +#undef HAVE_NETPACKET_PACKET_H + /* Define to 1 if you have the <net/if_media.h> header file. */ #undef HAVE_NET_IF_MEDIA_H @@ -217,6 +244,9 @@ /* target host supports CAN sniffing */ #undef PCAP_SUPPORT_CAN +/* target host supports netfilter sniffing */ +#undef PCAP_SUPPORT_NETFILTER + /* target host supports USB sniffing */ #undef PCAP_SUPPORT_USB Modified: stable/9/contrib/libpcap/configure ============================================================================== --- stable/9/contrib/libpcap/configure Mon May 28 04:47:46 2012 (r236166) +++ stable/9/contrib/libpcap/configure Mon May 28 07:34:52 2012 (r236167) @@ -679,6 +679,7 @@ HAVE_LINUX_TPACKET_AUXDATA V_LEX V_YACC RANLIB +AR V_CCOPT V_DEFS V_FINDALLDEVS @@ -696,6 +697,8 @@ MAN_FILE_FORMATS MAN_MISC_INFO PCAP_SUPPORT_USB USB_SRC +PCAP_SUPPORT_NETFILTER +NETFILTER_SRC PCAP_SUPPORT_BT BT_SRC PCAP_SUPPORT_CAN @@ -1293,6 +1296,7 @@ Optional Features: getaddrinfo available] --enable-optimizer-dbg build optimizer debugging code --enable-yydebug build parser debugging code + --disable-universal don't build universal on OS X --enable-bluetooth enable Bluetooth support [default=yes, if support available] --enable-can enable CAN support [default=yes, if support @@ -3229,7 +3233,24 @@ _ACEOF # or accepts command-line arguments like # those the GNU linker accepts. # - V_CCOPT="$V_CCOPT -fpic" + # Some instruction sets require -fPIC on some + # operating systems. Check for them. If you + # have a combination that requires it, add it + # here. + # + PIC_OPT=-fpic + case "$host_cpu" in + + sparc64*) + case "$host_os" in + + freebsd*) + PIC_OPT=-fPIC + ;; + esac + ;; + esac + V_CCOPT="$V_CCOPT $PIC_OPT" V_SONAME_OPT="-Wl,-soname," V_RPATH_OPT="-Wl,-rpath," ;; @@ -5425,24 +5446,29 @@ fi done -for ac_header in net/pfvar.h +for ac_header in linux/types.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> -#include <sys/socket.h> -#include <net/if.h> - +$ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -5462,19 +5488,94 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi ac_res=`eval echo '${'$as_ac_Header'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -5484,29 +5585,33 @@ fi done -if test "$ac_cv_header_net_pfvar_h" = yes; then - # - # Check for various PF actions. - # - { echo "$as_me:$LINENO: checking whether net/pfvar.h defines PF_NAT through PF_NORDR" >&5 -echo $ECHO_N "checking whether net/pfvar.h defines PF_NAT through PF_NORDR... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF + + + +for ac_header in linux/if_packet.h netpacket/packet.h netpacket/if_packet.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205280734.q4S7YqlK097370>