PERFORCE change 127581 for review

Peter Wemm peter at FreeBSD.org
Mon Oct 15 21:21:50 PDT 2007


http://perforce.freebsd.org/chv.cgi?CH=127581

Change 127581 by peter at peter_overcee on 2007/10/16 04:21:32

	IFC @127579 (hopefully fix broken build from sensorsd drama)

Affected files ...

.. //depot/projects/hammer/contrib/libpcap/CHANGES#6 integrate
.. //depot/projects/hammer/contrib/libpcap/CREDITS#6 integrate
.. //depot/projects/hammer/contrib/libpcap/FILES#5 integrate
.. //depot/projects/hammer/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#5 integrate
.. //depot/projects/hammer/contrib/libpcap/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/libpcap/README.dag#3 integrate
.. //depot/projects/hammer/contrib/libpcap/TODO#2 integrate
.. //depot/projects/hammer/contrib/libpcap/VERSION#7 integrate
.. //depot/projects/hammer/contrib/libpcap/bpf_image.c#4 integrate
.. //depot/projects/hammer/contrib/libpcap/config.h.in#6 integrate
.. //depot/projects/hammer/contrib/libpcap/configure#6 integrate
.. //depot/projects/hammer/contrib/libpcap/configure.in#6 integrate
.. //depot/projects/hammer/contrib/libpcap/fad-getad.c#4 integrate
.. //depot/projects/hammer/contrib/libpcap/fad-win32.c#4 integrate
.. //depot/projects/hammer/contrib/libpcap/gencode.c#8 integrate
.. //depot/projects/hammer/contrib/libpcap/gencode.h#6 integrate
.. //depot/projects/hammer/contrib/libpcap/grammar.y#6 integrate
.. //depot/projects/hammer/contrib/libpcap/inet.c#5 integrate
.. //depot/projects/hammer/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#5 integrate
.. //depot/projects/hammer/contrib/libpcap/optimize.c#4 integrate
.. //depot/projects/hammer/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#11 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#5 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#5 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#6 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-int.h#7 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#6 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#5 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap.3#8 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap.c#7 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap.h#7 integrate
.. //depot/projects/hammer/contrib/libpcap/pf.h#3 delete
.. //depot/projects/hammer/contrib/libpcap/savefile.c#6 integrate
.. //depot/projects/hammer/contrib/libpcap/scanner.l#7 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#10 integrate
.. //depot/projects/hammer/contrib/tcpdump/CHANGES#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/CREDITS#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/FILES#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/INSTALL#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/README#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/VERSION#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/af.c#1 branch
.. //depot/projects/hammer/contrib/tcpdump/af.h#1 branch
.. //depot/projects/hammer/contrib/tcpdump/bootp.h#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/config.h.in#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/configure#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/configure.in#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/hammer/contrib/tcpdump/ieee802_11.h#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/ieee802_11_radio.h#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/interface.h#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/ip.h#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/llc.h#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/nameser.h#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/netdissect.h#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/ospf.h#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/parsenfsfh.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/pf.h#3 delete
.. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#8 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-atm.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#8 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-dhcp6.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-domain.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ether.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-fddi.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-fr.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ip.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ipfc.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#8 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-juniper.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-lane.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-llc.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-lmp.c#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-lspping.c#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-null.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-pflog.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-pim.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-pptp.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-rx.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-sll.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-smb.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-tftp.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-token.c#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-udp.c#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/smbutil.c#6 integrate
.. //depot/projects/hammer/contrib/tcpdump/tcp.h#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#5 integrate
.. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#8 integrate
.. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/hammer/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/hammer/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/hammer/contrib/tcpdump/udp.h#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/util.c#6 integrate
.. //depot/projects/hammer/lib/libpcap/Makefile#13 integrate
.. //depot/projects/hammer/lib/libpcap/config.h#5 integrate
.. //depot/projects/hammer/sys/ia64/disasm/disasm.h#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/db_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/exception.S#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/support.S#8 integrate
.. //depot/projects/hammer/sys/sys/param.h#93 integrate
.. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#4 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#83 integrate
.. //depot/projects/hammer/usr.sbin/sensorsd/sensorsd.c#2 delete
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#13 integrate
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#6 integrate
.. //depot/projects/hammer/usr.sbin/wpa/l2_packet.c#5 integrate

Differences ...

==== //depot/projects/hammer/contrib/libpcap/CHANGES#6 (text+ko) ====

@@ -1,4 +1,88 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL)
+
+Mon.	September 10, 2007.  ken at xelerance.com.  Summary for 0.9.8 libpcap release
+	Change build process to put public libpcap headers into pcap subir
+	DLT: Add value for IPMI IPMB packets
+	DLT: Add value for u10 Networks boards
+	Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
+	 libpcap files on an OS other than where the file was generated
+
+Wed.	July 23, 2007.  mcr at xelerance.com.  Summary for 0.9.7 libpcap release
+
+	FIXED version file to be 0.9.7 instead of 0.9.5.
+	added flags/configuration for cloning bpf device.
+	added DLT_MTP2_WITH_PHDR support (PPI)
+        "fix" the "memory leak" in icode_to_fcode() -- documentation bug
+        Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/
+	introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS.
+	Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added.
+        check for IPv4 and IPv6, even for DLT_RAW 
+	add support for DLT_JUNIPER_ISM
+  	Pick up changes from NetBSD: many from tron, christos, drochner
+	Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala.
+	Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header
+
+Wed.	April 25, 2007. ken at xelerance.com.  Summary for 0.9.6 libpcap release
+
+	Put the public libpcap headers into a pcap subdirectory in both the
+	 source directory and the target include directory, and have include
+	 files at the top-level directory to include those headers, for 
+	 backwards compatibility.
+	Add Bluetooth support
+	Add USB capturing support on Linux
+	Add support for the binary USB sniffing interface in Linux
+	Add support for new FreeBSD BIOCSDIRECTION ioctl
+	Add additional filter operations for 802.11 frame types
+	Add support for filtering on MTP2 frame types
+	Propagate some changes from the main branch, so the x.9 branch has 
+	 all the DLT_ and LINKTYPE_ values that the main branch does
+	Reserved a DLT_ and SAVEFILE_ value for PPI (Per Packet Info) 
+	 encapsulated packets
+	Add LINKTYPE_ for IEEE 802.15.4, with address fields padded as done 
+	 by Linux drivers
+	Add LINKTYPE_ value corresponding to DLT_IEEE802_16_MAC_CPS.
+	Add DLT for IEEE 802.16 (WiMAX) MAC Common Part Sublayer
+	Add DLT for Bluetooth HCI UART transport layer
+	When building a shared library, build with "-fPIC" on Linux to support x86_64
+	Link with "$(CC) -shared" rather than "ld -shared" when building a 
+	 ".so" shared library
+	Add support for autoconf 2.60
+	Fixes to discard unread packets when changing filters
+	Changes to handle name changes in the DAG library resulting from 
+	 switching to libtool.
+	Add support for new DAG ERF types.
+        Add an explicit "-ldag" when building the shared library, so the DAG 
+	 library dependency is explicit.
+	Mac OSX fixes for dealing with "wlt" devices
+	Fixes in add_or_find_if() & pcap_findalldevs() to optimize generating
+	 device lists
+	Fixed a bug in pcap_open_live(). The return value of PacketSetHwFilter
+	 was not checked. 
+
+Tue.	September 19, 2006. ken at xelerance.com. Summary for 0.9.5 libpcap release
+
+	Support for LAPD frames with vISDN
+	Support for ERF on channelized T1/E1 cards via DAG API
+	Fix capitalization that caused issues crossc compiling on Linux
+	Better failure detection on PacketGetAdapterNames()
+	Fixes for MPLS packet generation (link layer)
+	OP_PACKET now matches the beginning of the packet, instead of
+	 beginning+link-layer
+	Add DLT/LINKTYPE for carrying FRF.16 Multi-link Frame Relay
+	Fix allocation of buffer for list of link-layer types  
+	Added a new DLT and LINKTYPE value for ARINC 653 Interpartition Communcation Messages
+	Fixed a typo in a DLT value: it should start with DLT_ and not LINKTYPE_
+	Redefined DLT_CAN20B and LINKTYPE_CAN20B as #190 (as this is the right value for CAN).
+	Added definition for DLT_A429 and LINKTYPE_A429 as #184.
+	Added a new DLT and LINKTYPE value for CAN v2.0B frames.
+	Add support for DLT_JUNIPER_VP.
+	Don't double-count received packets on Linux systems that 
+	 support the PACKET_STATISTICS getsockopt() argument on 
+	 PF_PACKET sockets.
+	Add support for DLT_IEEE802_11 and DLT_IEEE802_11_RADIO link 
+	 layers in Windows
+	Add support to build libpcap.lib and wpcap.dll under Cygnus and 
+	 MingW32.
 
 Mon. 	September 5, 2005.  ken at xelerance.com. Summary for 0.9.4 libpcap release
 

==== //depot/projects/hammer/contrib/libpcap/CREDITS#6 (text+ko) ====

@@ -23,6 +23,7 @@
 	Chris G. Demetriou		<cgd at netbsd.org>
 	Chris Lightfoot			<cwrl at users.sourceforge.net>
 	Chris Pepper			<pepper at mail.reppep.com>
+	Daniele Orlandi			<daniele at orlandi.com>
 	Darren Reed			<darrenr at reed.wattle.id.au>
 	David Kaelbling			<drk at sgi.com>
 	David Young			<dyoung at ojctech.com>
@@ -31,6 +32,7 @@
 	Dug Song			<dugsong at monkey.org>
 	Eric Anderson			<anderse at hpl.hp.com>
         Erik de Castro Lopo             <erik.de.castro.lopo at sensorynetworks.com>
+	Florent Drouin			<Florent.Drouin at alcatel-lucent.fr>
 	Franz Schaefer			<schaefer at mond.at>
 	Gianluca Varenni		<varenni at netgroup-serv.polito.it>
 	Gilbert Hoyek			<gil_hoyek at hotmail.com>
@@ -50,6 +52,7 @@
 	John Bankier			<jbankier at rainfinity.com>
 	Jon Lindgren			<jonl at yubyub.net>
 	Juergen Schoenwaelder		<schoenw at ibr.cs.tu-bs.de>
+	Jung-uk Kim			<jkim at FreeBSD.org>
 	Kazushi Sugyo			<sugyo at pb.jp.nec.com>
 	Klaus Klein			<kleink at netbsd.org>
 	Koryn Grant			<koryn at endace.com>
@@ -63,12 +66,14 @@
 	Mark Pizzolato			<List-tcpdump-workers at subscriptions.pizzolato.net>
 	Martin Husemann			<martin at netbsd.org>
 	Matthew Luckie			<mjl at luckie.org.nz>
+	Max Laier			<max at love2party.net>
 	Mike Kershaw			<dragorn at kismetwireless.net>
 	Mike Wiacek			<mike at iroot.net>
 	Monroe Williams			<monroe at pobox.com>
 	Nicolas Dade			<ndade at nsd.dyndns.org>
 	Octavian Cerna			<tavy at ylabs.com>
 	Olaf Kirch			<okir at caldera.de>
+	Ollie Wild			<aaw at users.sourceforge.net>
 	Onno van der Linden		<onno at simplex.nl>
 	Patrick Marie			<mycroft at virgaria.org>
 	Paul Mundt			<lethal at linux-sh.org>
@@ -78,6 +83,7 @@
 	Peter Jeremy			<peter.jeremy at alcatel.com.au>
 	Phil Wood			<cpw at lanl.gov>
 	Rafal Maszkowski		<rzm at icm.edu.pl>
+					<rcb-isis at users.sourceforge.net>
 	Rick Jones			<raj at cup.hp.com>
 	Scott Barron			<sb125499 at ohiou.edu>
 	Scott Gifford			<sgifford at tir.com>
@@ -85,6 +91,7 @@
 	Shaun Clowes			<delius at progsoc.uts.edu.au>
 	Solomon Peachy			<pizza at shaftnet.org>
 	Stefan Hudson			<hudson at mbay.net>
+	Stephen Donnelly		<stephen at endace.com>
 	Takashi Yamamoto		<yamt at mwd.biglobe.ne.jp>
         Tanaka Shin-ya                  <zstanaka at archer.livedoor.com>
 	Tony Li				<tli at procket.com>

==== //depot/projects/hammer/contrib/libpcap/FILES#5 (text+ko) ====

@@ -97,7 +97,6 @@
 pcap.3
 pcap.c
 pcap.h
-pf.h
 ppp.h
 savefile.c
 scanner.l

==== //depot/projects/hammer/contrib/libpcap/INSTALL.txt#5 (text+ko) ====

@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL)
 
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an
@@ -373,7 +373,6 @@
 pcap.3		- manual entry
 pcap.c		- pcap utility routines
 pcap.h		- public libpcap definitions
-pf.h		- OpenBSD DLT_PFLOG definitions
 ppp.h		- Point to Point Protocol definitions
 rawss7.h	- information on DLT_ types for SS7
 savefile.c	- offline support

==== //depot/projects/hammer/contrib/libpcap/Makefile.in#4 (text+ko) ====

@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -46,7 +46,9 @@
 INCLS = -I. @V_INCLS@
 DEFS = @DEFS@ @V_DEFS@
 LIBS = @V_LIBS@
+DAGLIBS = @DAGLIBS@
 DYEXT = @DYEXT@
+PROG=libpcap
 
 # Standard CFLAGS
 CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
@@ -112,7 +114,7 @@
 #
 libpcap.so: $(OBJ)
 	@rm -f $@
-	ld -shared -o $@.`cat VERSION` $(OBJ)
+	$(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS)
 
 # the following rule succeeds, but the result is untested.
 libpcap.dylib: $(OBJ)
@@ -216,19 +218,10 @@
 	RPMVERSION=`cat VERSION | sed s/-.*//g`; \
 		sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $<   > $@
 
-tar: Makefile packaging/pcap.spec
-	@cwd=`pwd` ; dir=`basename $$cwd` ; name=libpcap-`cat VERSION` ; \
-	    list="" ; tar="tar chf" ; \
-	    for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \
-	    echo \
-	    "rm -f ../$$name; ln -s $$dir ../$$name" ; \
-	     rm -f ../$$name; ln -s $$dir ../$$name ; \
-	    echo \
-	    "(cd .. ; $$tar - [lots of files]) | gzip -c > /tmp/$$name.tar.gz" ; \
-	     (cd .. ; $$tar - $$list) | gzip -c > /tmp/$$name.tar.gz ; \
-	    echo \
-	    "rm -f ../$$name" ; \
-	     rm -f ../$$name
+releasetar:
+	@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
+	   list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \
+	   tar -c -z -f $$name.tar.gz $$name/. ;
 
 depend:	$(GENSRC) $(GENHDR) bpf_filter.c
 	./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)

==== //depot/projects/hammer/contrib/libpcap/README.dag#3 (text+ko) ====

@@ -77,11 +77,32 @@
 include packets that would have been dropped by the filter). The RX stream
 buffer size is user configurable outside libpcap, typically 16-512MB.
 
-pcap_get_selectable_fd() is not supported, DAG cards do not support
+pcap_get_selectable_fd() is not supported, as DAG cards do not support
 poll/select methods.
 
 pcap_inject() and pcap_sendpacket() are not supported.
 
+Some DAG cards now support capturing to multiple virtual interfaces, called
+streams. Capture streams have even numbers. These are available via libpcap
+as separate interfaces, e.g. dag0:0, dag0:2, dag0:4 etc. dag0:0 is the same
+as dag0. These are visible via pcap_findalldevs().
+
+libpcap now does NOT set the card's hardware snaplen (slen). This must now be
+set using the appropriate DAG coniguration program, e.g. dagthree, dagfour,
+dagsix, dagconfig. This is because the snaplen is currently shared between
+all of the streams. In future this may change if per-stream slen is
+implemented.
+
+DAG cards by default capture entire packets including the L2
+CRC/FCS. If the card is not configured to discard the CRC/FCS, this
+can confuse applications that use libpcap if they're not prepared for
+packets to have an FCS. Libpcap now reads the environment variable
+ERF_FCS_BITS to determine how many bits of CRC/FCS to strip from the
+end of the captured frame. This defaults to 32 for use with
+Ethernet. If the card is configured to strip the CRC/FCS, then set
+ERF_FCS_BITS=0. If used with a HDLC/PoS/PPP/Frame Relay link with 16
+bit CRC/FCS, then set ERF_FCS_BITS=16.
+
 ----------------------------------------------------------------------
 
 Please submit bug reports via <support at endace.com>.

==== //depot/projects/hammer/contrib/libpcap/TODO#2 (text+ko) ====

@@ -15,13 +15,6 @@
   style (okay, you can guess that by looking at the code) and a guide for
   what needs to be documented.
 
-Linux kernel interface
-
-- Currently there is a race condition in that a socket is activated at the
-  same time it is opened - before applying a filter. This has to
-  be corrected so that capture starts when pcap_read is called for the 
-  first time. 
-
 Less urgent items
 -----------------
 

==== //depot/projects/hammer/contrib/libpcap/VERSION#7 (text+ko) ====

@@ -1,1 +1,1 @@
-0.9.4
+0.9.8

==== //depot/projects/hammer/contrib/libpcap/bpf_image.c#4 (text+ko) ====

@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003/11/15 23:23:57 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26.2.1 2007/06/11 09:52:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@
 	int n;
 {
 	int v;
-	char *fmt, *op;
+	const char *fmt, *op;
 	static char image[256];
 	char operand[64];
 

==== //depot/projects/hammer/contrib/libpcap/config.h.in#6 (text+ko) ====

@@ -10,9 +10,15 @@
 /* Enable optimizer debugging */
 #undef BDEBUG
 
+/* define if you have a cloning BPF device */
+#undef HAVE_CLONING_BPF
+
 /* define if you have the DAG API */
 #undef HAVE_DAG_API
 
+/* define if you have dag_get_erf_types() */
+#undef HAVE_DAG_GET_ERF_TYPES
+
 /* define if you have streams capable DAG API */
 #undef HAVE_DAG_STREAMS_API
 
@@ -50,9 +56,15 @@
 /* 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 <net/pfvar.h> header file. */
+#undef HAVE_NET_PFVAR_H
+
 /* if there's an os_proto.h */
 #undef HAVE_OS_PROTO_H
 
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
 /* define if you have a /proc/net/dev */
 #undef HAVE_PROC_NET_DEV
 

==== //depot/projects/hammer/contrib/libpcap/configure#6 (text+ko) ====

@@ -1,37 +1,101 @@
 #! /bin/sh
-# From configure.in Revision: 1.120.2.7 .
+# From configure.in Revision: 1.120.2.13 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.61.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -42,21 +106,22 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -64,206 +129,447 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
 fi
 
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+test \$exitcode = 0) || { (exit 1); exit 1; }
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf at gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list