Date: Thu, 28 Oct 2010 16:23:26 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r214456 - in vendor/tcpdump/dist: . lbl missing tests win32 win32/Include win32/Include/Arpa win32/Include/Netinet win32/Src win32/prj Message-ID: <201010281623.o9SGNQCX014411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Thu Oct 28 16:23:25 2010 New Revision: 214456 URL: http://svn.freebsd.org/changeset/base/214456 Log: Update tcpdump to 4.1.1. Changes: Thu. April 1, 2010. guy@alum.mit.edu. Summary for 4.1.1 tcpdump release Fix build on systems with PF, such as FreeBSD and OpenBSD. Don't blow up if a zero-length link-layer address is passed to linkaddr_string(). Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. Summary for 4.1.0 tcpdump release Fix printing of MAC addresses for VLAN frames with a length field Add some additional bounds checks and use the EXTRACT_ macros more Add a -b flag to print the AS number in BGP packets in ASDOT notation rather than ASPLAIN notation Add ICMPv6 RFC 5006 support Decode the access flags in NFS access requests Handle the new DLT_ for memory-mapped USB captures on Linux Make the default snapshot (-s) the maximum Print name of device (when -L is used) Support for OpenSolaris (and SXCE build 125 and later) Print new TCP flags Add support for RPL DIO Add support for TCP User Timeout (UTO) Add support for non-standard Ethertypes used by 3com PPPoE gear Add support for 802.11n and 802.11s Add support for Transparent Ethernet Bridge ethertype in GRE Add 4 byte AS support for BGP printer Add support for the MDT SAFI 66 BG printer Add basic IPv6 support to print-olsr Add USB printer Add printer for ForCES Handle frames with an FCS Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames Fix TCP sequence number printing Report 802.2 packets as 802.2 instead of 802.3 Don't include -L/usr/lib in LDFLAGS On x86_64 Linux, look in lib64 directory too Lots of code clean ups Autoconf clean ups Update testcases to make output changes Fix compiling with/out smi (--with{,out}-smi) Fix compiling without IPv6 support (--disable-ipv6) Added: vendor/tcpdump/dist/Makefile-devel-adds (contents, props changed) vendor/tcpdump/dist/Readme.Win32 vendor/tcpdump/dist/forces.h (contents, props changed) vendor/tcpdump/dist/ipnet.h (contents, props changed) vendor/tcpdump/dist/print-forces.c (contents, props changed) vendor/tcpdump/dist/print-ipnet.c (contents, props changed) vendor/tcpdump/dist/print-usb.c (contents, props changed) vendor/tcpdump/dist/signature.c (contents, props changed) vendor/tcpdump/dist/signature.h (contents, props changed) vendor/tcpdump/dist/tcpdump.1.in (contents, props changed) vendor/tcpdump/dist/tests/ 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/TESTLIST vendor/tcpdump/dist/tests/TESTonce (contents, props changed) vendor/tcpdump/dist/tests/TESTrun.sh (contents, props changed) vendor/tcpdump/dist/tests/bgp-infinite-loop.pcap (contents, props changed) vendor/tcpdump/dist/tests/bgp_vpn_attrset.out vendor/tcpdump/dist/tests/bgp_vpn_attrset.pcap (contents, props changed) vendor/tcpdump/dist/tests/chdlc-slarp-short.pcap (contents, props changed) vendor/tcpdump/dist/tests/chdlc-slarp.pcap (contents, props changed) vendor/tcpdump/dist/tests/dio.out vendor/tcpdump/dist/tests/dio.pcap (contents, props changed) vendor/tcpdump/dist/tests/e1000g.out vendor/tcpdump/dist/tests/e1000g.pcap (contents, props changed) vendor/tcpdump/dist/tests/eapon1.gdbinit vendor/tcpdump/dist/tests/eapon1.out vendor/tcpdump/dist/tests/eapon1.puu vendor/tcpdump/dist/tests/eapon2.puu vendor/tcpdump/dist/tests/esp-secrets.txt (contents, props changed) vendor/tcpdump/dist/tests/esp0.out vendor/tcpdump/dist/tests/esp1.gdbinit vendor/tcpdump/dist/tests/esp1.out vendor/tcpdump/dist/tests/esp2.gdbinit vendor/tcpdump/dist/tests/esp2.out vendor/tcpdump/dist/tests/esp3.gdbinit vendor/tcpdump/dist/tests/esp4.gdbinit vendor/tcpdump/dist/tests/esp5.gdbinit vendor/tcpdump/dist/tests/esp5.out vendor/tcpdump/dist/tests/espudp1.out vendor/tcpdump/dist/tests/espudp1.puu vendor/tcpdump/dist/tests/forces1.out vendor/tcpdump/dist/tests/forces1.pcap (contents, props changed) vendor/tcpdump/dist/tests/forces1vvv.out vendor/tcpdump/dist/tests/forces1vvvv.out vendor/tcpdump/dist/tests/forces2.out vendor/tcpdump/dist/tests/forces2.pcap (contents, props changed) vendor/tcpdump/dist/tests/forces2v.out vendor/tcpdump/dist/tests/forces2vv.out vendor/tcpdump/dist/tests/ikev2.puu vendor/tcpdump/dist/tests/ikev2four.out vendor/tcpdump/dist/tests/ikev2four.puu vendor/tcpdump/dist/tests/ikev2fourv.out vendor/tcpdump/dist/tests/ikev2fourv4.out vendor/tcpdump/dist/tests/ikev2pI2-secrets.txt (contents, props changed) vendor/tcpdump/dist/tests/ikev2pI2.out 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/isakmp1.out vendor/tcpdump/dist/tests/isakmp2.out vendor/tcpdump/dist/tests/isakmp3.out vendor/tcpdump/dist/tests/isakmp4.out vendor/tcpdump/dist/tests/isakmp4500.puu vendor/tcpdump/dist/tests/isis-infinite-loop.pcap (contents, props changed) vendor/tcpdump/dist/tests/ldp-infinite-loop.pcap (contents, props changed) vendor/tcpdump/dist/tests/lmp.out vendor/tcpdump/dist/tests/lmp.puu vendor/tcpdump/dist/tests/lmp.sh (contents, props changed) vendor/tcpdump/dist/tests/lspping-fec-ldp.pcap (contents, props changed) vendor/tcpdump/dist/tests/lspping-fec-rsvp.pcap (contents, props changed) vendor/tcpdump/dist/tests/mpls-ldp-hello.out vendor/tcpdump/dist/tests/mpls-ldp-hello.puu vendor/tcpdump/dist/tests/mpls-traceroute.pcap (contents, props changed) vendor/tcpdump/dist/tests/ospf-gmpls.out vendor/tcpdump/dist/tests/ospf-gmpls.puu vendor/tcpdump/dist/tests/print-A.out vendor/tcpdump/dist/tests/print-AA.out vendor/tcpdump/dist/tests/print-capX.out vendor/tcpdump/dist/tests/print-capXX.out vendor/tcpdump/dist/tests/print-flags.puu vendor/tcpdump/dist/tests/print-flags.sh (contents, props changed) vendor/tcpdump/dist/tests/print-x.out vendor/tcpdump/dist/tests/print-xx.out vendor/tcpdump/dist/tests/rsvp-infinite-loop.pcap (contents, props changed) vendor/tcpdump/dist/win32/ vendor/tcpdump/dist/win32/Include/ vendor/tcpdump/dist/win32/Include/Arpa/ vendor/tcpdump/dist/win32/Include/Arpa/tftp.h (contents, props changed) vendor/tcpdump/dist/win32/Include/Netinet/ vendor/tcpdump/dist/win32/Include/Netinet/in_systm.h (contents, props changed) vendor/tcpdump/dist/win32/Include/Netinet/ip.h (contents, props changed) vendor/tcpdump/dist/win32/Include/errno.h (contents, props changed) vendor/tcpdump/dist/win32/Include/getopt.h (contents, props changed) vendor/tcpdump/dist/win32/Include/inetprivate.h (contents, props changed) vendor/tcpdump/dist/win32/Include/telnet.h (contents, props changed) vendor/tcpdump/dist/win32/Include/w32_fzs.h (contents, props changed) vendor/tcpdump/dist/win32/Src/ vendor/tcpdump/dist/win32/Src/getopt.c (contents, props changed) vendor/tcpdump/dist/win32/prj/ vendor/tcpdump/dist/win32/prj/GNUmakefile vendor/tcpdump/dist/win32/prj/WinDump.dsp vendor/tcpdump/dist/win32/prj/WinDump.dsw Deleted: vendor/tcpdump/dist/missing/getaddrinfo.c vendor/tcpdump/dist/tcpdump.1 Modified: vendor/tcpdump/dist/CHANGES vendor/tcpdump/dist/CREDITS vendor/tcpdump/dist/INSTALL.txt vendor/tcpdump/dist/Makefile.in vendor/tcpdump/dist/README vendor/tcpdump/dist/VERSION vendor/tcpdump/dist/acconfig.h vendor/tcpdump/dist/aclocal.m4 vendor/tcpdump/dist/addrtoname.c vendor/tcpdump/dist/af.c vendor/tcpdump/dist/af.h vendor/tcpdump/dist/atmuni31.h vendor/tcpdump/dist/bootp.h vendor/tcpdump/dist/bpf_dump.c vendor/tcpdump/dist/checksum.c vendor/tcpdump/dist/config.guess vendor/tcpdump/dist/config.h.in vendor/tcpdump/dist/config.sub vendor/tcpdump/dist/configure vendor/tcpdump/dist/configure.in vendor/tcpdump/dist/ethertype.h vendor/tcpdump/dist/gmpls.c vendor/tcpdump/dist/gmpls.h vendor/tcpdump/dist/gmt2local.h vendor/tcpdump/dist/icmp6.h vendor/tcpdump/dist/ieee802_11.h vendor/tcpdump/dist/ieee802_11_radio.h vendor/tcpdump/dist/interface.h vendor/tcpdump/dist/ip6.h vendor/tcpdump/dist/ipproto.c vendor/tcpdump/dist/ipproto.h vendor/tcpdump/dist/isakmp.h vendor/tcpdump/dist/l2vpn.c vendor/tcpdump/dist/l2vpn.h vendor/tcpdump/dist/lbl/os-sunos4.h vendor/tcpdump/dist/lbl/os-ultrix4.h vendor/tcpdump/dist/missing/addrinfo.h vendor/tcpdump/dist/netdissect.h vendor/tcpdump/dist/nfs.h vendor/tcpdump/dist/nlpid.c vendor/tcpdump/dist/nlpid.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-atalk.c vendor/tcpdump/dist/print-atm.c vendor/tcpdump/dist/print-bfd.c vendor/tcpdump/dist/print-bgp.c vendor/tcpdump/dist/print-bootp.c vendor/tcpdump/dist/print-bt.c vendor/tcpdump/dist/print-cdp.c vendor/tcpdump/dist/print-cfm.c vendor/tcpdump/dist/print-dccp.c vendor/tcpdump/dist/print-dhcp6.c vendor/tcpdump/dist/print-domain.c vendor/tcpdump/dist/print-enc.c vendor/tcpdump/dist/print-esp.c vendor/tcpdump/dist/print-ether.c vendor/tcpdump/dist/print-fr.c vendor/tcpdump/dist/print-gre.c vendor/tcpdump/dist/print-icmp6.c vendor/tcpdump/dist/print-ip.c vendor/tcpdump/dist/print-ip6.c vendor/tcpdump/dist/print-isakmp.c vendor/tcpdump/dist/print-isoclns.c vendor/tcpdump/dist/print-juniper.c vendor/tcpdump/dist/print-l2tp.c vendor/tcpdump/dist/print-lane.c vendor/tcpdump/dist/print-llc.c vendor/tcpdump/dist/print-lldp.c vendor/tcpdump/dist/print-lspping.c vendor/tcpdump/dist/print-nfs.c vendor/tcpdump/dist/print-ntp.c vendor/tcpdump/dist/print-olsr.c vendor/tcpdump/dist/print-ospf.c vendor/tcpdump/dist/print-pflog.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-rx.c vendor/tcpdump/dist/print-sctp.c vendor/tcpdump/dist/print-sip.c vendor/tcpdump/dist/print-sll.c vendor/tcpdump/dist/print-smb.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-token.c vendor/tcpdump/dist/print-udp.c vendor/tcpdump/dist/setsignal.h vendor/tcpdump/dist/sll.h vendor/tcpdump/dist/smbutil.c vendor/tcpdump/dist/strcasecmp.c vendor/tcpdump/dist/tcp.h vendor/tcpdump/dist/tcpdump-stdinc.h vendor/tcpdump/dist/tcpdump.c vendor/tcpdump/dist/tftp.h vendor/tcpdump/dist/timed.h vendor/tcpdump/dist/token.h vendor/tcpdump/dist/util.c Modified: vendor/tcpdump/dist/CHANGES ============================================================================== --- vendor/tcpdump/dist/CHANGES Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/CHANGES Thu Oct 28 16:23:25 2010 (r214456) @@ -1,4 +1,45 @@ -$Header: /tcpdump/master/tcpdump/CHANGES,v 1.98.2.2 2008-10-15 23:26:30 ken Exp $ +Thu. April 1, 2010. guy@alum.mit.edu. + Summary for 4.1.1 tcpdump release + Fix build on systems with PF, such as FreeBSD and OpenBSD. + Don't blow up if a zero-length link-layer address is passed to + linkaddr_string(). + +Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. + Summary for 4.1.0 tcpdump release + Fix printing of MAC addresses for VLAN frames with a length + field + Add some additional bounds checks and use the EXTRACT_ macros + more + Add a -b flag to print the AS number in BGP packets in ASDOT + notation rather than ASPLAIN notation + Add ICMPv6 RFC 5006 support + Decode the access flags in NFS access requests + Handle the new DLT_ for memory-mapped USB captures on Linux + Make the default snapshot (-s) the maximum + Print name of device (when -L is used) + Support for OpenSolaris (and SXCE build 125 and later) + Print new TCP flags + Add support for RPL DIO + Add support for TCP User Timeout (UTO) + Add support for non-standard Ethertypes used by 3com PPPoE gear + Add support for 802.11n and 802.11s + Add support for Transparent Ethernet Bridge ethertype in GRE + Add 4 byte AS support for BGP printer + Add support for the MDT SAFI 66 BG printer + Add basic IPv6 support to print-olsr + Add USB printer + Add printer for ForCES + Handle frames with an FCS + Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames + Fix TCP sequence number printing + Report 802.2 packets as 802.2 instead of 802.3 + Don't include -L/usr/lib in LDFLAGS + On x86_64 Linux, look in lib64 directory too + Lots of code clean ups + Autoconf clean ups + Update testcases to make output changes + Fix compiling with/out smi (--with{,out}-smi) + Fix compiling without IPv6 support (--disable-ipv6) Mon. October 27, 2008. ken@netfunctional.ca. Summary for 4.0.0 tcpdump release Add support for Bluetooth Sniffing Modified: vendor/tcpdump/dist/CREDITS ============================================================================== --- vendor/tcpdump/dist/CREDITS Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/CREDITS Thu Oct 28 16:23:25 2010 (r214456) @@ -27,6 +27,7 @@ Additional people who have contributed p 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> @@ -44,11 +45,15 @@ Additional people who have contributed p 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> @@ -68,8 +73,10 @@ Additional people who have contributed p 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> + 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> @@ -78,10 +85,12 @@ Additional people who have contributed p 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> + 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> @@ -92,7 +101,8 @@ Additional people who have contributed p 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> + 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> @@ -100,12 +110,13 @@ Additional people who have contributed p 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> + 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> @@ -132,13 +143,16 @@ Additional people who have contributed p 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> @@ -155,11 +169,14 @@ Additional people who have contributed p 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> + Will Drewry <will at alum dot bu dot edu> + William J. Hulley <bill dot hulley at gmail dot com> Yen Yen Lim Yoshifumi Nishida Modified: vendor/tcpdump/dist/INSTALL.txt ============================================================================== --- vendor/tcpdump/dist/INSTALL.txt Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/INSTALL.txt Thu Oct 28 16:23:25 2010 (r214456) @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.1.2.1 2008-02-06 10:49:22 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47:53 guy Exp $ (LBL) If you have not built libpcap, and your system does not have libpcap installed, install libpcap first. Your system might provide a version @@ -221,6 +221,7 @@ print-tftp.c - Trivial File Transfer Pro print-timed.c - BSD time daemon protocol printer routines print-token.c - Token Ring printer routines print-udp.c - UDP printer routines +print-usb.c - USB printer routines print-vjc.c - PPP Van Jacobson compression (RFC1144) printer routines print-vrrp.c - Virtual Router Redundancy Protocol print-wb.c - White Board printer routines Added: vendor/tcpdump/dist/Makefile-devel-adds ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcpdump/dist/Makefile-devel-adds Thu Oct 28 16:23:25 2010 (r214456) @@ -0,0 +1,22 @@ +# +# Auto-regenerate configure script or Makefile when things change. +# From autoconf.info . Works best with GNU Make. +# +${srcdir}/configure: configure.in + cd ${srcdir} && autoconf + +# autoheader might not change config.h.in, so touch a stamp file. +${srcdir}/config.h.in: ${srcdir}/stamp-h.in +${srcdir}/stamp-h.in: configure.in acconfig.h + cd ${srcdir} && autoheader + echo timestamp > ${srcdir}/stamp-h.in + +config.h: stamp-h +stamp-h: ${srcdir}/config.h.in config.status + ./config.status + +Makefile: Makefile.in config.status + ./config.status + +config.status: ${srcdir}/configure + ./config.status --recheck Modified: vendor/tcpdump/dist/Makefile.in ============================================================================== --- vendor/tcpdump/dist/Makefile.in Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/Makefile.in Thu Oct 28 16:23:25 2010 (r214456) @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.317.2.4 2008-05-27 07:14:26 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 23:17:26 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -77,7 +77,7 @@ CSRC = addrtoname.c af.c checksum.c cpac print-eap.c print-eigrp.c\ print-esp.c print-ether.c print-fddi.c print-fr.c \ print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ - print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \ + print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ print-lmp.c print-lspping.c print-lwapp.c \ @@ -88,9 +88,9 @@ CSRC = addrtoname.c af.c checksum.c cpac print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \ print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \ print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \ - print-timed.c print-token.c print-udld.c print-udp.c \ - print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \ - print-wb.c print-zephyr.c setsignal.c tcpdump.c util.c + print-timed.c print-token.c print-udld.c print-udp.c print-usb.c \ + print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-forces.c \ + print-wb.c print-zephyr.c signature.c setsignal.c tcpdump.c util.c LIBNETDISSECT_SRC=print-isakmp.c LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) @@ -128,6 +128,7 @@ HDR = \ ethertype.h \ extract.h \ fddi.h \ + forces.h \ gmpls.h \ gmt2local.h \ icmp6.h \ @@ -139,6 +140,7 @@ HDR = \ ip.h \ ip6.h \ ipfc.h \ + ipnet.h \ ipproto.h \ ipsec_doi.h \ ipx.h \ @@ -171,6 +173,7 @@ HDR = \ sctpConstants.h \ sctpHeader.h \ setsignal.h \ + signature.h \ slcompress.h \ slip.h \ sll.h \ @@ -204,6 +207,7 @@ EXTRA_DIST = \ INSTALL.txt \ LICENSE \ Makefile.in \ + Makefile-devel-adds \ README \ Readme.Win32 \ VERSION \ @@ -226,7 +230,6 @@ EXTRA_DIST = \ missing/bittypes.h \ missing/dlnames.c \ missing/datalinks.c \ - missing/getaddrinfo.c \ missing/getnameinfo.c \ missing/inet_aton.c \ missing/inet_ntop.c \ @@ -258,7 +261,83 @@ EXTRA_DIST = \ smbutil.c \ stime.awk \ strcasecmp.c \ - tcpdump.1 \ + tcpdump.1.in \ + tests/02-sunrise-sunset-esp.puu \ + tests/08-sunrise-sunset-aes.puu \ + tests/08-sunrise-sunset-esp2.puu \ + tests/TESTLIST \ + tests/TESTonce \ + tests/TESTrun.sh \ + tests/bgp-infinite-loop.pcap \ + tests/bgp_vpn_attrset.out \ + tests/bgp_vpn_attrset.pcap \ + tests/chdlc-slarp-short.pcap \ + tests/chdlc-slarp.pcap \ + tests/dio.out \ + tests/dio.pcap \ + tests/e1000g.out \ + tests/e1000g.pcap \ + tests/eapon1.gdbinit \ + tests/eapon1.out \ + tests/eapon1.puu \ + tests/eapon2.puu \ + tests/esp-secrets.txt \ + tests/esp0.out \ + tests/esp1.gdbinit \ + tests/esp1.out \ + tests/esp2.gdbinit \ + tests/esp2.out \ + tests/esp3.gdbinit \ + tests/esp4.gdbinit \ + tests/esp5.gdbinit \ + tests/esp5.out \ + tests/espudp1.out \ + tests/espudp1.puu \ + 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/ikev2four.out \ + tests/ikev2four.puu \ + 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/isakmp1.out \ + tests/isakmp2.out \ + tests/isakmp3.out \ + tests/isakmp4.out \ + tests/isakmp4500.puu \ + tests/isis-infinite-loop.pcap \ + tests/ldp-infinite-loop.pcap \ + tests/lmp.out \ + tests/lmp.puu \ + 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-traceroute.pcap \ + tests/ospf-gmpls.out \ + tests/ospf-gmpls.puu \ + tests/print-A.out \ + tests/print-AA.out \ + tests/print-capX.out \ + tests/print-capXX.out \ + tests/print-flags.puu \ + tests/print-flags.sh \ + tests/print-x.out \ + tests/print-xx.out \ + tests/rsvp-infinite-loop.pcap \ vfprintf.c \ win32/Include/Arpa/tftp.h \ win32/Include/errno.h \ @@ -312,14 +391,13 @@ version.o: version.c version.c: $(srcdir)/VERSION @rm -f $@ - if grep CVS ${srcdir}/VERSION >/dev/null; then \ + if grep GIT ${srcdir}/VERSION >/dev/null; then \ read ver <${srcdir}/VERSION; \ echo $$ver | tr -d '\012'; \ date +_%Y_%m_%d; \ else \ cat ${srcdir}/VERSION; \ - fi | sed -e 's/.*/char version[] = "&";/' > $@ - + fi | sed -e 's/.*/const char version[] = "&";/' > $@ install: all [ -d $(DESTDIR)$(sbindir) ] || \ @@ -328,7 +406,7 @@ install: all $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` [ -d $(DESTDIR)$(mandir)/man1 ] || \ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) - $(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 + $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 uninstall: rm -f $(DESTDIR)$(sbindir)/$(PROG) @@ -340,11 +418,15 @@ lint: $(GENSRC) grep -v 'possible pointer alignment problem' clean: - rm -f $(CLEANFILES) + rm -f $(CLEANFILES) $(PROG)-`cat VERSION`.tar.gz distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h stamp-h stamp-h.in + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 + +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) ctags -wtd $(TAGFILES) Modified: vendor/tcpdump/dist/README ============================================================================== --- vendor/tcpdump/dist/README Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/README Thu Oct 28 16:23:25 2010 (r214456) @@ -1,19 +1,17 @@ -@(#) $Header: /tcpdump/master/tcpdump/README,v 1.66.2.1 2008-05-30 01:38:20 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/README,v 1.68 2008-12-15 00:05:27 guy Exp $ (LBL) -TCPDUMP 3.9 +TCPDUMP 4.x.y Now maintained by "The Tcpdump Group" See www.tcpdump.org Please send inquiries/comments/reports to: tcpdump-workers@lists.tcpdump.org -Anonymous CVS is available via: - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master login - (password "anoncvs") - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout tcpdump +Anonymous Git is available via: + git clone git://bpf.tcpdump.org/tcpdump -Version 3.9 of TCPDUMP can be retrieved with the CVS tag "tcpdump_3_9rel1": - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_9rel1 tcpdump +Version 4.x.y of TCPDUMP can be retrieved with the CVS tag "tcpdump_4_xrely": + cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_4_xrely tcpdump Please submit patches against the master copy to the tcpdump project on sourceforge.net. Added: vendor/tcpdump/dist/Readme.Win32 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tcpdump/dist/Readme.Win32 Thu Oct 28 16:23:25 2010 (r214456) @@ -0,0 +1,24 @@ +To build tcpdump under Windows, you need: + +- version 6 (or higher) of Microsoft Visual Studio or the Cygnus gnu +C compiler. +- The November 2001 (or later) edition of Microsoft Platform +Software Development Kit (SDK), that contains some necessary includes +for IPv6 support. You can download it from http://www.microsoft.com/sdk +- the WinPcap source code, that includes libpcap for win32. Download it +from http://winpcap.polito.it or download libpcap sources from +http://www.tcpdump.org and follow the instructions in the README.Win32 +file. + +First, extract tcpdump and WinPcap in the same folder, and build WinPcap. + +The Visual Studio project and the cygwin makefile are in the Win32\prj +folder. + +From Visual Studio, open windump.dsw and build the program. The release +version of the WinDump.exe executable file will be created in the +windump\win32\prj\release directory . The debug version will be generated +in windump\win32\prj\debug. + +From cygnus, go to windump\win32\prj\ and type "make". WinDump.exe will be +created in the same directory. \ No newline at end of file Modified: vendor/tcpdump/dist/VERSION ============================================================================== --- vendor/tcpdump/dist/VERSION Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/VERSION Thu Oct 28 16:23:25 2010 (r214456) @@ -1 +1 @@ -4.0.0 +4.1.1 Modified: vendor/tcpdump/dist/acconfig.h ============================================================================== --- vendor/tcpdump/dist/acconfig.h Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/acconfig.h Thu Oct 28 16:23:25 2010 (r214456) @@ -2,32 +2,18 @@ * make them to acconfig.h and rerun autoheader */ @TOP@ -/* Define if you have SSLeay 0.9.0b with the buggy cast128. */ -#undef HAVE_BUGGY_CAST128 - /* Define if you enable IPv6 support */ #undef INET6 /* Define if you enable support for the libsmi. */ #undef LIBSMI -/* Define if you have the <smi.h> header file. */ -#undef HAVE_SMI_H - /* 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 struct ether_header.ether_dhost is a struct with ether_addr_octet - */ -#undef ETHER_HEADER_HAS_EA - -/* define if struct ether_arp contains arp_xsha */ -#undef ETHER_ARP_HAS_X - /* define if you have the addrinfo function. */ #undef HAVE_ADDRINFO @@ -43,18 +29,9 @@ /* define if INADDRSZ is defined (XXX not used!) */ #undef HAVE_INADDRSZ -/* define if this is a development version, to use additional prototypes. */ -#undef HAVE_OS_PROTO_H - -/* define if <unistd.h> defines __P() */ -#undef HAVE_PORTABLE_PROTOTYPE - /* define if RES_USE_INET6 is defined */ #undef HAVE_RES_USE_INET6 -/* define if struct sockaddr has the sa_len member */ -#undef HAVE_SOCKADDR_SA_LEN - /* define if you have struct sockaddr_storage */ #undef HAVE_SOCKADDR_STORAGE @@ -91,18 +68,6 @@ /* define if you have getrpcbynumber() */ #undef HAVE_GETRPCBYNUMBER -/* define if unaligned memory accesses fail */ -#undef LBL_ALIGN - -/* The successful return value from signal (?)XXX */ -#undef RETSIGVAL - -/* Define this on IRIX */ -#undef _BSD_SIGNALS - -/* For HP/UX ANSI compiler? */ -#undef _HPUX_SOURCE - /* AIX hack. */ #undef _SUN @@ -115,14 +80,6 @@ /* Whether or not to include the possibly-buggy SMB printer */ #undef TCPDUMP_DO_SMB -/* Long story short: aclocal.m4 depends on autoconf 2.13 - * implementation details wrt "const"; newer versions - * have different implementation details so for now we - * put "const" here. This may cause duplicate definitions - * in config.h but that should be OK since they're the same. - */ -#undef const - /* Define if you have the dnet_htoa function. */ #undef HAVE_DNET_HTOA Modified: vendor/tcpdump/dist/aclocal.m4 ============================================================================== --- vendor/tcpdump/dist/aclocal.m4 Thu Oct 28 16:22:13 2010 (r214455) +++ vendor/tcpdump/dist/aclocal.m4 Thu Oct 28 16:23:25 2010 (r214456) @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.113.2.3 2008-09-25 21:50:04 guy Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.116 2008-09-25 21:45:50 guy Exp $ (LBL) dnl dnl Copyright (c) 1995, 1996, 1997, 1998 dnl The Regents of the University of California. All rights reserved. @@ -23,27 +23,23 @@ dnl LBL autoconf macros dnl dnl -dnl Determine which compiler we're using (cc or gcc) -dnl If using gcc, determine the version number -dnl If using cc, require that it support ansi prototypes -dnl If using gcc, use -O2 (otherwise use -O) -dnl If using cc, explicitly specify /usr/local/include +dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC. dnl -dnl usage: -dnl -dnl AC_LBL_C_INIT(copt, incls) -dnl -dnl results: -dnl -dnl $1 (copt set) -dnl $2 (incls set) -dnl CC -dnl LDFLAGS -dnl ac_cv_lbl_gcc_vers -dnl LBL_CFLAGS -dnl -AC_DEFUN(AC_LBL_C_INIT, - [AC_PREREQ(2.12) +dnl It appears that newer versions of autoconf (2.64 and later) will, +dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the +dnl beginning of the macro, even if the macro itself calls AC_PROG_CC. +dnl See the "Prerequisite Macros" and "Expanded Before Required" sections +dnl in the Autoconf documentation. +dnl +dnl This causes a steaming heap of fail in our case, as we were, in +dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_INIT_BEFORE_CC, +dnl calling AC_PROG_CC, and then doing the tests we now do in +dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC, +dnl and AC_LBL_C_INIT at the top level. +dnl +AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_C_INIT]) AC_BEFORE([$0], [AC_PROG_CC]) AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) AC_BEFORE([$0], [AC_LBL_DEVEL]) @@ -72,7 +68,33 @@ AC_DEFUN(AC_LBL_C_INIT, CC=cc export CC fi - AC_PROG_CC +]) + +dnl +dnl Determine which compiler we're using (cc or gcc) +dnl If using gcc, determine the version number +dnl If using cc, require that it support ansi prototypes +dnl If using gcc, use -O2 (otherwise use -O) +dnl If using cc, explicitly specify /usr/local/include +dnl +dnl usage: +dnl +dnl AC_LBL_C_INIT(copt, incls) +dnl +dnl results: +dnl +dnl $1 (copt set) +dnl $2 (incls set) +dnl CC +dnl LDFLAGS +dnl ac_cv_lbl_gcc_vers +dnl LBL_CFLAGS +dnl +AC_DEFUN(AC_LBL_C_INIT, + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) + AC_BEFORE([$0], [AC_LBL_SHLIBS_INIT]) if test "$GCC" = yes ; then if test "$SHLICC2" = yes ; then ac_cv_lbl_gcc_vers=2 @@ -117,8 +139,26 @@ AC_DEFUN(AC_LBL_C_INIT, AC_MSG_ERROR(see the INSTALL doc for more info) fi CFLAGS="$savedcflags" - V_CCOPT="-Aa $V_CCOPT" - AC_DEFINE(_HPUX_SOURCE) + $1="-Aa $$1" + AC_DEFINE(_HPUX_SOURCE,1,[needed on HP-UX]) + ;; + + osf*) + AC_MSG_CHECKING(for ansi mode in DEC compiler ($CC -std1)) + savedcflags="$CFLAGS" + CFLAGS="-std1" + AC_CACHE_VAL(ac_cv_lbl_cc_osf1_cc_std1, + AC_TRY_COMPILE( + [#include <sys/types.h>], + [int frob(int, char *)], + ac_cv_lbl_cc_osf1_cc_std1=yes, + ac_cv_lbl_cc_osf1_cc_std1=no)) + AC_MSG_RESULT($ac_cv_lbl_cc_osf1_cc_std1) + if test $ac_cv_lbl_cc_osf1_cc_std1 = no ; then + AC_MSG_ERROR(see the INSTALL doc for more info) + fi + CFLAGS="$savedcflags" + $1="-std1 $$1" ;; *) @@ -132,11 +172,15 @@ AC_DEFUN(AC_LBL_C_INIT, case "$host_os" in irix*) - V_CCOPT="$V_CCOPT -xansi -signed -O" + $1="$$1 -xansi -signed -O" ;; osf*) - V_CCOPT="$V_CCOPT -std1 -O" + # + # Presumed to be DEC OSF/1, Digital UNIX, or + # Tru64 UNIX. + # + $1="$$1 -O" ;; ultrix*) @@ -150,14 +194,14 @@ AC_DEFUN(AC_LBL_C_INIT, ac_cv_lbl_cc_const_proto=no)) AC_MSG_RESULT($ac_cv_lbl_cc_const_proto) if test $ac_cv_lbl_cc_const_proto = no ; then - AC_DEFINE(const,) + AC_DEFINE(const,[], + [to handle Ultrix compilers that don't support const in prototypes]) fi ;; esac fi ]) - # # Try compiling a sample of the type of code that appears in # gencode.c with "inline", "__inline__", and "__inline". @@ -167,8 +211,13 @@ AC_DEFUN(AC_LBL_C_INIT, # at least some versions of HP's C compiler can inline that, but can't # inline a function that returns a struct pointer. # +# Make sure we use the V_CCOPT flags, because some of those might +# disable inlining. +# AC_DEFUN(AC_LBL_C_INLINE, [AC_MSG_CHECKING(for inline) + save_CFLAGS="$CFLAGS" + CFLAGS="$V_CCOPT" AC_CACHE_VAL(ac_cv_lbl_inline, [ ac_cv_lbl_inline="" ac_lbl_cc_inline=no @@ -196,6 +245,7 @@ AC_DEFUN(AC_LBL_C_INLINE, if test "$ac_lbl_cc_inline" = yes ; then ac_cv_lbl_inline=$ac_lbl_inline fi]) + CFLAGS="$save_CFLAGS" if test ! -z "$ac_cv_lbl_inline" ; then AC_MSG_RESULT($ac_cv_lbl_inline) else @@ -238,9 +288,10 @@ AC_DEFUN(AC_LBL_LIBPCAP, libpcap=FAIL lastdir=FAIL places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ - egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'` + egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'` for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do - basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//'` + basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \ + sed -e 's/-PRE-GIT$//' ` if test $lastdir = $basedir ; then dnl skip alphas when an actual release is present continue; @@ -254,43 +305,60 @@ AC_DEFUN(AC_LBL_LIBPCAP, done if test $libpcap = FAIL ; then AC_MSG_RESULT(not found) - AC_CHECK_LIB(pcap, main, libpcap="-lpcap") - if test $libpcap = FAIL ; then + + # + # Look for pcap-config. + # + AC_PATH_PROG(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`" + else + # + # Not found; look for pcap. + # + AC_CHECK_LIB(pcap, main, libpcap="-lpcap") + if test $libpcap = FAIL ; then AC_MSG_ERROR(see the INSTALL doc for more info) - fi - dnl - dnl Some versions of Red Hat Linux put "pcap.h" in - dnl "/usr/include/pcap"; had the LBL folks done so, - dnl that would have been a good idea, but for - dnl the Red Hat folks to do so just breaks source - dnl compatibility with other systems. - dnl - dnl We work around this by assuming that, as we didn't - dnl find a local libpcap, libpcap is in /usr/lib or - dnl /usr/local/lib and that the corresponding header - dnl file is under one of those directories; if we don't - dnl find it in either of those directories, we check to - dnl see if it's in a "pcap" subdirectory of them and, - dnl if so, add that subdirectory to the "-I" list. - dnl - dnl (We now also put pcap.h in /usr/include/pcap, but we - dnl leave behind a /usr/include/pcap.h that includes it, - dnl so you can still just include <pcap.h>.) - dnl - AC_MSG_CHECKING(for extraneous pcap header directories) - if test \( ! -r /usr/local/include/pcap.h \) -a \ + fi + dnl + dnl Some versions of Red Hat Linux put "pcap.h" in + dnl "/usr/include/pcap"; had the LBL folks done so, + dnl that would have been a good idea, but for + dnl the Red Hat folks to do so just breaks source + dnl compatibility with other systems. + dnl + dnl We work around this by assuming that, as we didn't + dnl find a local libpcap, libpcap is in /usr/lib or + dnl /usr/local/lib and that the corresponding header + dnl file is under one of those directories; if we don't + dnl find it in either of those directories, we check to + dnl see if it's in a "pcap" subdirectory of them and, + dnl if so, add that subdirectory to the "-I" list. + dnl + dnl (We now also put pcap.h in /usr/include/pcap, but we + dnl leave behind a /usr/include/pcap.h that includes it, + dnl so you can still just include <pcap.h>.) + dnl + AC_MSG_CHECKING(for extraneous pcap header directories) + if test \( ! -r /usr/local/include/pcap.h \) -a \ \( ! -r /usr/include/pcap.h \); then - if test -r /usr/local/include/pcap/pcap.h; then - d="/usr/local/include/pcap" - elif test -r /usr/include/pcap/pcap.h; then - d="/usr/include/pcap" + if test -r /usr/local/include/pcap/pcap.h; then + d="/usr/local/include/pcap" + elif test -r /usr/include/pcap/pcap.h; then + d="/usr/include/pcap" + fi + fi + if test -z "$d" ; then + AC_MSG_RESULT(not found) + else + $2="-I$d $$2" + AC_MSG_RESULT(found -- -I$d added) fi - fi - if test -z "$d" ; then - AC_MSG_RESULT(not found) - else - $2="-I$d $$2" - AC_MSG_RESULT(found -- -I$d added) fi else $1=$libpcap @@ -304,26 +372,50 @@ AC_DEFUN(AC_LBL_LIBPCAP, AC_MSG_ERROR(cannot find pcap.h, see INSTALL) fi AC_MSG_RESULT($libpcap) + AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d) + if test -n "$PCAP_CONFIG"; then + # + # 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 + # + libpcap="$libpcap `\"$PCAP_CONFIG\" --additional-libs --static`" + fi fi LIBS="$libpcap $LIBS" - case "$host_os" in + if ! test -n "$PCAP_CONFIG" ; then + # + # We don't have pcap-config; find out any additional link flags + # we need. (If we have pcap-config, we assume it tells us what + # we need.) + # + case "$host_os" in - aix*) + aix*) + # + # If libpcap is DLPI-based, we have to use /lib/pse.exp if + # present, as we use the STREAMS routines. + # + # (XXX - true only if we're linking with a static libpcap?) + # pseexe="/lib/pse.exp" AC_MSG_CHECKING(for $pseexe) if test -f $pseexe ; then AC_MSG_RESULT(yes) LIBS="$LIBS -I:$pseexe" fi + + # + # If libpcap is BPF-based, we need "-lodm" and "-lcfg", as + # we use them to load the BPF module. # - # We need "-lodm" and "-lcfg", as libpcap requires them on - # AIX, and we just build a static libpcap.a and thus can't - # arrange that when you link with libpcap you automatically - # link with those libraries. + # (XXX - true only if we're linking with a static libpcap?) # LIBS="$LIBS -lodm -lcfg" ;; - esac + esac + fi dnl dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", @@ -383,14 +475,14 @@ AC_DEFUN(AC_LBL_TYPE_SIGNAL, [AC_BEFORE([$0], [AC_LBL_LIBPCAP]) AC_TYPE_SIGNAL if test "$ac_cv_type_signal" = void ; then - AC_DEFINE(RETSIGVAL,) + AC_DEFINE(RETSIGVAL,[],[return value of signal handlers]) else - AC_DEFINE(RETSIGVAL,(0)) + AC_DEFINE(RETSIGVAL,(0),[return value of signal handlers]) fi case "$host_os" in irix*) - AC_DEFINE(_BSD_SIGNALS) + AC_DEFINE(_BSD_SIGNALS,1,[get BSD semantics on Irix]) ;; *) @@ -439,65 +531,6 @@ AC_DEFUN(AC_LBL_FIXINCLUDES, fi]) dnl -dnl Check for flex, default to lex -dnl Require flex 2.4 or higher -dnl Check for bison, default to yacc -dnl Default to lex/yacc if both flex and bison are not available -dnl Define the yy prefix string if using flex and bison -dnl -dnl usage: -dnl -dnl AC_LBL_LEX_AND_YACC(lex, yacc, yyprefix) -dnl -dnl results: -dnl -dnl $1 (lex set) -dnl $2 (yacc appended) -dnl $3 (optional flex and bison -P prefix) -dnl -AC_DEFUN(AC_LBL_LEX_AND_YACC, - [AC_ARG_WITH(flex, [ --without-flex don't use flex]) - AC_ARG_WITH(bison, [ --without-bison don't use bison]) - if test "$with_flex" = no ; then - $1=lex - else - AC_CHECK_PROGS($1, flex, lex) - fi - if test "$$1" = flex ; then - # The -V flag was added in 2.4 - AC_MSG_CHECKING(for flex 2.4 or higher) - AC_CACHE_VAL(ac_cv_lbl_flex_v24, - if flex -V >/dev/null 2>&1; then - ac_cv_lbl_flex_v24=yes - else - ac_cv_lbl_flex_v24=no - fi) - AC_MSG_RESULT($ac_cv_lbl_flex_v24) - if test $ac_cv_lbl_flex_v24 = no ; then - s="2.4 or higher required" - AC_MSG_WARN(ignoring obsolete flex executable ($s)) - $1=lex - fi - fi - if test "$with_bison" = no ; then - $2=yacc - else - AC_CHECK_PROGS($2, bison, yacc) - fi - if test "$$2" = bison ; then - $2="$$2 -y" - fi - if test "$$1" != lex -a "$$2" = yacc -o "$$1" = lex -a "$$2" != yacc ; then - AC_MSG_WARN(don't have both flex and bison; reverting to lex/yacc) - $1=lex - $2=yacc - fi - if test "$$1" = flex -a -n "$3" ; then - $1="$$1 -P$3" - $2="$$2 -p $3" - fi]) - -dnl dnl Checks to see if union wait is used with WEXITSTATUS() dnl dnl usage: @@ -521,9 +554,9 @@ AC_DEFUN(AC_LBL_UNION_WAIT, ac_cv_lbl_union_wait=yes)) AC_MSG_RESULT($ac_cv_lbl_union_wait) if test $ac_cv_lbl_union_wait = yes ; then - AC_DEFINE(DECLWAITSTATUS,union wait) + AC_DEFINE(DECLWAITSTATUS,union wait,[type for wait]) else - AC_DEFINE(DECLWAITSTATUS,int) + AC_DEFINE(DECLWAITSTATUS,int,[type for wait]) fi]) dnl @@ -538,7 +571,7 @@ dnl dnl HAVE_SOCKADDR_SA_LEN (defined) dnl AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, - [AC_MSG_CHECKING(if sockaddr struct has sa_len member) + [AC_MSG_CHECKING(if sockaddr struct has the sa_len member) AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, AC_TRY_COMPILE([ # include <sys/types.h> @@ -548,7 +581,7 @@ AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, ac_cv_lbl_sockaddr_has_sa_len=no)) AC_MSG_RESULT($ac_cv_lbl_sockaddr_has_sa_len) if test $ac_cv_lbl_sockaddr_has_sa_len = yes ; then - AC_DEFINE(HAVE_SOCKADDR_SA_LEN) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010281623.o9SGNQCX014411>