Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/libpcap/dist import newest libpcap
details: https://anonhg.NetBSD.org/src/rev/c3231f127051
branches: trunk
changeset: 333857:c3231f127051
user: christos <christos%NetBSD.org@localhost>
date: Wed Nov 19 18:04:51 2014 +0000
description:
import newest libpcap
diffstat:
external/bsd/libpcap/dist/CHANGES | 79 +-
external/bsd/libpcap/dist/CREDITS | 2 +-
external/bsd/libpcap/dist/INSTALL.txt | 13 +-
external/bsd/libpcap/dist/Makefile.in | 22 +-
external/bsd/libpcap/dist/README | 2 -
external/bsd/libpcap/dist/README.aix | 5 +
external/bsd/libpcap/dist/SUNOS4/nit_if.o.sun4c.4.0.3c | Bin
external/bsd/libpcap/dist/VERSION | 2 +-
external/bsd/libpcap/dist/Win32/Include/Gnuc.h | 4 -
external/bsd/libpcap/dist/Win32/Include/addrinfo.h | 4 -
external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h | 2 -
external/bsd/libpcap/dist/Win32/Include/bittypes.h | 2 -
external/bsd/libpcap/dist/Win32/Include/cdecl_ext.h | 2 -
external/bsd/libpcap/dist/Win32/Include/inetprivate.h | 2 -
external/bsd/libpcap/dist/Win32/Include/ip6_misc.h | 4 -
external/bsd/libpcap/dist/Win32/Include/net/if.h | 2 -
external/bsd/libpcap/dist/Win32/Include/net/netdb.h | 2 -
external/bsd/libpcap/dist/Win32/Include/net/paths.h | 2 -
external/bsd/libpcap/dist/Win32/Include/sockstorage.h | 2 -
external/bsd/libpcap/dist/Win32/Src/ffs.c | 2 -
external/bsd/libpcap/dist/Win32/Src/gai_strerror.c | 2 -
external/bsd/libpcap/dist/Win32/Src/getaddrinfo.c | 7 -
external/bsd/libpcap/dist/Win32/Src/getnetbynm.c | 2 -
external/bsd/libpcap/dist/Win32/Src/getnetent.c | 2 -
external/bsd/libpcap/dist/Win32/Src/getopt.c | 2 -
external/bsd/libpcap/dist/Win32/Src/getservent.c | 2 -
external/bsd/libpcap/dist/Win32/Src/inet_aton.c | 9 -
external/bsd/libpcap/dist/Win32/Src/inet_net.c | 2 -
external/bsd/libpcap/dist/Win32/Src/inet_pton.c | 9 -
external/bsd/libpcap/dist/aclocal.m4 | 2 -
external/bsd/libpcap/dist/arcnet.h | 4 -
external/bsd/libpcap/dist/atmuni31.h | 4 -
external/bsd/libpcap/dist/bpf_dump.c | 6 -
external/bsd/libpcap/dist/bpf_image.c | 27 +-
external/bsd/libpcap/dist/config.guess | 258 ++--
external/bsd/libpcap/dist/config.h.in | 3 +
external/bsd/libpcap/dist/config.sub | 211 ++-
external/bsd/libpcap/dist/configure | 265 +++-
external/bsd/libpcap/dist/configure.in | 193 ++-
external/bsd/libpcap/dist/dlpisubs.c | 8 +-
external/bsd/libpcap/dist/dlpisubs.h | 6 -
external/bsd/libpcap/dist/etherent.c | 7 -
external/bsd/libpcap/dist/ethertype.h | 4 -
external/bsd/libpcap/dist/fad-getad.c | 64 +-
external/bsd/libpcap/dist/fad-gifc.c | 12 +-
external/bsd/libpcap/dist/fad-glifc.c | 12 +-
external/bsd/libpcap/dist/fad-null.c | 7 -
external/bsd/libpcap/dist/fad-sita.c | 4 -
external/bsd/libpcap/dist/fad-win32.c | 111 +-
external/bsd/libpcap/dist/gencode.h | 11 +-
external/bsd/libpcap/dist/ieee80211.h | 2 -
external/bsd/libpcap/dist/inet.c | 307 +++-
external/bsd/libpcap/dist/lbl/os-aix4.h | 4 -
external/bsd/libpcap/dist/lbl/os-hpux11.h | 4 -
external/bsd/libpcap/dist/lbl/os-osf4.h | 4 -
external/bsd/libpcap/dist/lbl/os-osf5.h | 4 -
external/bsd/libpcap/dist/lbl/os-solaris2.h | 4 -
external/bsd/libpcap/dist/lbl/os-sunos4.h | 4 -
external/bsd/libpcap/dist/lbl/os-ultrix4.h | 4 -
external/bsd/libpcap/dist/llc.h | 39 +-
external/bsd/libpcap/dist/missing/snprintf.c | 9 -
external/bsd/libpcap/dist/msdos/bin2c.c | 2 -
external/bsd/libpcap/dist/msdos/common.dj | 1 -
external/bsd/libpcap/dist/msdos/makefile.dj | 1 -
external/bsd/libpcap/dist/msdos/ndis2.c | 2 -
external/bsd/libpcap/dist/msdos/ndis2.h | 2 -
external/bsd/libpcap/dist/msdos/pktdrvr.c | 2 -
external/bsd/libpcap/dist/msdos/pktdrvr.h | 2 -
external/bsd/libpcap/dist/msdos/readme.dos | 2 -
external/bsd/libpcap/dist/nametoaddr.c | 7 -
external/bsd/libpcap/dist/nlpid.h | 4 -
external/bsd/libpcap/dist/pcap-bpf.h | 4 -
external/bsd/libpcap/dist/pcap-bt-linux.c | 6 -
external/bsd/libpcap/dist/pcap-bt-linux.h | 4 -
external/bsd/libpcap/dist/pcap-bt-monitor-linux.c | 241 ++++
external/bsd/libpcap/dist/pcap-bt-monitor-linux.h | 32 +
external/bsd/libpcap/dist/pcap-can-linux.c | 4 +-
external/bsd/libpcap/dist/pcap-can-linux.h | 2 -
external/bsd/libpcap/dist/pcap-canusb-linux.c | 2 -
external/bsd/libpcap/dist/pcap-canusb-linux.h | 2 -
external/bsd/libpcap/dist/pcap-common.c | 196 +++-
external/bsd/libpcap/dist/pcap-common.h | 6 +-
external/bsd/libpcap/dist/pcap-dag.c | 9 +-
external/bsd/libpcap/dist/pcap-dag.h | 4 -
external/bsd/libpcap/dist/pcap-dbus.c | 2 -
external/bsd/libpcap/dist/pcap-dbus.h | 2 -
external/bsd/libpcap/dist/pcap-dlpi.c | 115 +-
external/bsd/libpcap/dist/pcap-dos.c | 6 +-
external/bsd/libpcap/dist/pcap-dos.h | 4 -
external/bsd/libpcap/dist/pcap-enet.c | 6 -
external/bsd/libpcap/dist/pcap-filter.manmisc.in | 89 +-
external/bsd/libpcap/dist/pcap-int.h | 36 +-
external/bsd/libpcap/dist/pcap-libdlpi.c | 64 +-
external/bsd/libpcap/dist/pcap-linktype.manmisc.in | 4 +-
external/bsd/libpcap/dist/pcap-linux.c | 630 ++++++----
external/bsd/libpcap/dist/pcap-netfilter-linux.c | 13 +-
external/bsd/libpcap/dist/pcap-netfilter-linux.h | 2 -
external/bsd/libpcap/dist/pcap-nit.c | 8 +-
external/bsd/libpcap/dist/pcap-null.c | 6 -
external/bsd/libpcap/dist/pcap-pf.c | 9 +-
external/bsd/libpcap/dist/pcap-savefile.manfile.in | 5 +-
external/bsd/libpcap/dist/pcap-septel.c | 16 +-
external/bsd/libpcap/dist/pcap-septel.h | 4 -
external/bsd/libpcap/dist/pcap-sita.c | 4 -
external/bsd/libpcap/dist/pcap-sita.h | 4 -
external/bsd/libpcap/dist/pcap-snf.c | 4 +-
external/bsd/libpcap/dist/pcap-snf.h | 2 -
external/bsd/libpcap/dist/pcap-snit.c | 9 +-
external/bsd/libpcap/dist/pcap-snoop.c | 6 -
external/bsd/libpcap/dist/pcap-stdinc.h | 60 +-
external/bsd/libpcap/dist/pcap-tstamp.manmisc.in | 6 +-
external/bsd/libpcap/dist/pcap-usb-linux.c | 17 +-
external/bsd/libpcap/dist/pcap-usb-linux.h | 4 -
external/bsd/libpcap/dist/pcap-win32.c | 133 +-
external/bsd/libpcap/dist/pcap/bluetooth.h | 15 +-
external/bsd/libpcap/dist/pcap/ipnet.h | 2 -
external/bsd/libpcap/dist/pcap/namedb.h | 4 -
external/bsd/libpcap/dist/pcap/nflog.h | 92 +
external/bsd/libpcap/dist/pcap/sll.h | 4 -
external/bsd/libpcap/dist/pcap/usb.h | 4 -
external/bsd/libpcap/dist/pcap/vlan.h | 4 -
external/bsd/libpcap/dist/pcap_activate.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_breakloop.3pcap | 2 -
external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap | 2 -
external/bsd/libpcap/dist/pcap_close.3pcap | 2 -
external/bsd/libpcap/dist/pcap_compile.3pcap.in | 4 +-
external/bsd/libpcap/dist/pcap_create.3pcap | 2 -
external/bsd/libpcap/dist/pcap_datalink.3pcap.in | 4 +-
external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap | 2 -
external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap | 10 +-
external/bsd/libpcap/dist/pcap_dump.3pcap | 2 -
external/bsd/libpcap/dist/pcap_dump_close.3pcap | 2 -
external/bsd/libpcap/dist/pcap_dump_file.3pcap | 2 -
external/bsd/libpcap/dist/pcap_dump_flush.3pcap | 2 -
external/bsd/libpcap/dist/pcap_dump_ftell.3pcap | 2 -
external/bsd/libpcap/dist/pcap_file.3pcap | 2 -
external/bsd/libpcap/dist/pcap_fileno.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_findalldevs.3pcap | 12 +-
external/bsd/libpcap/dist/pcap_freecode.3pcap | 2 -
external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_get_tstamp_precision.3pcap.in | 9 +-
external/bsd/libpcap/dist/pcap_geterr.3pcap | 2 -
external/bsd/libpcap/dist/pcap_inject.3pcap | 2 -
external/bsd/libpcap/dist/pcap_is_swapped.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_lib_version.3pcap | 2 -
external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in | 4 +-
external/bsd/libpcap/dist/pcap_lookupdev.3pcap | 2 -
external/bsd/libpcap/dist/pcap_lookupnet.3pcap | 2 -
external/bsd/libpcap/dist/pcap_loop.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_major_version.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_next_ex.3pcap | 8 +-
external/bsd/libpcap/dist/pcap_offline_filter.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_open_dead.3pcap.in | 2 -
external/bsd/libpcap/dist/pcap_open_live.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_datalink.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap | 2 +-
external/bsd/libpcap/dist/pcap_set_promisc.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_rfmon.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_snaplen.3pcap | 2 -
external/bsd/libpcap/dist/pcap_set_timeout.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_setdirection.3pcap | 2 -
external/bsd/libpcap/dist/pcap_setfilter.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_setnonblock.3pcap | 2 -
external/bsd/libpcap/dist/pcap_snapshot.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_stats.3pcap | 2 -
external/bsd/libpcap/dist/pcap_statustostr.3pcap | 2 -
external/bsd/libpcap/dist/pcap_strerror.3pcap | 2 -
external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap | 8 +-
external/bsd/libpcap/dist/ppp.h | 3 -
external/bsd/libpcap/dist/runlex.sh | 2 -
external/bsd/libpcap/dist/savefile.c | 7 -
external/bsd/libpcap/dist/sf-pcap-ng.h | 2 -
external/bsd/libpcap/dist/sf-pcap.h | 2 -
external/bsd/libpcap/dist/sunatmpos.h | 4 -
external/bsd/libpcap/dist/tests/capturetest.c | 287 +++++
external/bsd/libpcap/dist/tests/filtertest.c | 25 +-
external/bsd/libpcap/dist/tests/findalldevstest.c | 2 -
external/bsd/libpcap/dist/tests/opentest.c | 2 -
external/bsd/libpcap/dist/tests/reactivatetest.c | 2 -
external/bsd/libpcap/dist/tests/selpolltest.c | 2 -
external/bsd/libpcap/dist/tests/valgrindtest.c | 4 -
182 files changed, 2701 insertions(+), 1530 deletions(-)
diffs (truncated from 8607 to 300 lines):
diff -r 18b62f3e371a -r c3231f127051 external/bsd/libpcap/dist/CHANGES
--- a/external/bsd/libpcap/dist/CHANGES Wed Nov 19 16:26:47 2014 +0000
+++ b/external/bsd/libpcap/dist/CHANGES Wed Nov 19 18:04:51 2014 +0000
@@ -1,3 +1,47 @@
+Monday Aug. 12, 2014 guy%alum.mit.edu@localhost
+ Summary for 1.6.2 tcpdump release
+ Don't crash on filters testing a non-existent link-layer type
+ field.
+ Fix sending in non-blocking mode on Linux with memory-mapped
+ capture.
+ Fix timestamps when reading pcap-ng files on big-endian
+ machines.
+
+Saturday Jul. 19, 2014 mcr%sandelman.ca@localhost
+ Summary for 1.6.1 tcpdump release
+ some fixes for the any device
+ changes for how --enable-XXX works
+
+Wednesday Jul. 2, 2014 mcr%sandelman.ca@localhost
+ Summary for 1.6.0 tcpdump release
+ Don't support D-Bus sniffing on OS X
+ fixes for byte order issues with NFLOG captures
+ Handle using cooked mode for DLT_NETLINK in activate_new().
+ on platforms where you can not capture on down interfaces, do not list them
+ but: do list interfaces which are down, if you can capture on them!
+
+Wednesday December 18, 2013 guy%alum.mit.edu@localhost
+Summary for 1.5.3 libpcap release
+ Don't let packets that don't match the current filter get to the
+ application when TPACKET_V3 is used. (GitHub issue #331)
+ Fix handling of pcap_loop()/pcap_dispatch() with a packet count
+ of 0 on some platforms (including Linux with TPACKET_V3).
+ (GitHub issue #333)
+ Work around TPACKET_V3 deficiency that causes packets to be lost
+ when a timeout of 0 is specified. (GitHub issue #335)
+ Man page formatting fixes.
+
+Wednesday December 4, 2013 guy%alum.mit.edu@localhost
+Summary for 1.5.2 libpcap release
+ Fix libpcap to work when compiled with TPACKET_V3 support and
+ running on a kernel without TPACKET_V3 support. (GitHub
+ issue #329)
+
+Wednesday November 20, 2013 guy%alum.mit.edu@localhost
+Summary for 1.5.1 libpcap release
+ Report an error, rather than crashing, if an IPv6 address is
+ used for link-layer filtering. (Wireshark bug 9376)
+
Wednesday October 30, 2013 guy%alum.mit.edu@localhost
Summary for 1.5.0 libpcap release
TPACKET_V3 support added for Linux
@@ -7,7 +51,8 @@
Fixed build on Solaris 11
Support filtering filtering E1 SS7 traffic on MTP2 layer Annex A
Use "ln -s" to link man pages by default
- Added pcap_open_dead_with_tstamp_precision API interface.
+ Add support for getting nanosecond-resolution time stamps when
+ capturing and reading capture files
Many changes to autoconf to deal better with non-GCC compilers
added many new DLT types
@@ -221,7 +266,7 @@
DLT: Add JUNIPER_ST
802.15.4 support
Variable length 802.11 header support
- X2E data type support
+ X2E data type support
SITA ACN Interface support - see README.sita
Support for memory-mapped capture on Linux
Support for zerocopy BPF on platforms that support it
@@ -233,7 +278,7 @@
can print better diagnostic information
Return PCAP_ERROR_PERM_DENIED if we don't have permission to open a device, so
applications can tell the user they need to go play with permissions
- On Linux, ignore ENETDOWN so we can continue to capture packets if the
+ On Linux, ignore ENETDOWN so we can continue to capture packets if the
interface goes down and comes back up again.
On Linux, support new tpacket frame headers (2.6.27+)
On Mac OS X, add scripts for changing permissions on /dev/bpf* and launchd plist
@@ -246,14 +291,14 @@
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
+ 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. April 25, 2007. ken%xelerance.com@localhost. 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
+ files at the top-level directory to include those headers, for
backwards compatibility.
Add Bluetooth support
Add USB capturing support on Linux
@@ -261,30 +306,30 @@
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
+ 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)
+ 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
+ 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
+ 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
+ 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
+ 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.
+ was not checked.
Tue. September 19, 2006. ken%xelerance.com@localhost. Summary for 0.9.5 libpcap release
@@ -296,19 +341,19 @@
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
+ 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
+ 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
+ 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
+ Add support to build libpcap.lib and wpcap.dll under Cygnus and
MingW32.
Mon. September 5, 2005. ken%xelerance.com@localhost. Summary for 0.9.4 libpcap release
diff -r 18b62f3e371a -r c3231f127051 external/bsd/libpcap/dist/CREDITS
--- a/external/bsd/libpcap/dist/CREDITS Wed Nov 19 16:26:47 2014 +0000
+++ b/external/bsd/libpcap/dist/CREDITS Wed Nov 19 18:04:51 2014 +0000
@@ -111,7 +111,7 @@
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>
- Michal Labedzki
+ Michal Labedzki <michal dot labedzki at tieto dot com>
Michal Sekletar <msekleta at redhat dot com>
Mike Frysinger <vapier at gmail dot com>
Mike Kershaw <dragorn at kismetwireless dot net>
diff -r 18b62f3e371a -r c3231f127051 external/bsd/libpcap/dist/INSTALL.txt
--- a/external/bsd/libpcap/dist/INSTALL.txt Wed Nov 19 16:26:47 2014 +0000
+++ b/external/bsd/libpcap/dist/INSTALL.txt Wed Nov 19 18:04:51 2014 +0000
@@ -1,5 +1,3 @@
-@(#) Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.29 2008-06-12 20:21:51 guy Exp (LBL)
-
To build libpcap, run "./configure" (a shell script). The configure
script will determine your system attributes and generate an
appropriate Makefile from Makefile.in. Next run "make". If everything
@@ -31,19 +29,14 @@
You will need an ANSI C compiler to build libpcap. The configure script
will abort if your compiler is not ANSI compliant. If this happens, use
-the GNU C compiler, available via anonymous ftp:
-
- ftp://ftp.gnu.org/pub/gnu/gcc/
+the generally available GNU C compiler (GCC).
If you use flex, you must use version 2.4.6 or higher. The configure
script automatically detects the version of flex and will not use it
unless it is new enough. You can use "flex -V" to see what version you
have (unless it's really old). The current version of flex is available
-via anonymous ftp:
-
- ftp://ftp.ee.lbl.gov/flex-*.tar.Z
-
-As of this writing, the current version is 2.5.4.
+at flex.sourceforge.net and often comes packaged by means of the OS.
+As of this writing, the current version is 2.5.37.
If you use bison, you must use flex (and visa versa). The configure
script automatically falls back to lex and yacc if both flex and bison
diff -r 18b62f3e371a -r c3231f127051 external/bsd/libpcap/dist/Makefile.in
--- a/external/bsd/libpcap/dist/Makefile.in Wed Nov 19 16:26:47 2014 +0000
+++ b/external/bsd/libpcap/dist/Makefile.in Wed Nov 19 18:04:51 2014 +0000
@@ -16,8 +16,6 @@
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#) Header: /tcpdump/master/libpcap/Makefile.in,v 1.142 2008-11-22 17:30:24 guy Exp (LBL)
#
# Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -85,7 +83,7 @@
@rm -f $@
$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
-PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@ @CANUSB_SRC@ @DBUS_SRC@
+PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @CAN_SRC@ @NETFILTER_SRC@ @CANUSB_SRC@ @DBUS_SRC@
FSRC = fad-@V_FINDALLDEVS@.c
SSRC = @SSRC@
CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
@@ -107,6 +105,7 @@
pcap/bluetooth.h \
pcap/ipnet.h \
pcap/namedb.h \
+ pcap/nflog.h \
pcap/pcap.h \
pcap/sll.h \
pcap/vlan.h \
@@ -129,17 +128,17 @@
sunatmpos.h
TESTS = \
+ capturetest \
filtertest \
findalldevstest \
- nonblocktest \
opentest \
selpolltest \
valgrindtest
TESTS_SRC = \
+ tests/capturetest.c \
tests/filtertest.c \
tests/findalldevstest.c \
- tests/nonblocktest.c \
tests/opentest.c \
tests/reactivatetest.c \
tests/selpolltest.c \
@@ -296,6 +295,8 @@
pcap-bpf.c \
pcap-bt-linux.c \
pcap-bt-linux.h \
+ pcap-bt-monitor-linux.c \
+ pcap-bt-monitor-linux.h \
pcap-can-linux.c \
pcap-can-linux.h \
pcap-canusb-linux.c \
@@ -526,15 +527,15 @@
#
tests: $(TESTS)
+capturetest: tests/capturetest.c libpcap.a
+ $(CC) $(FULL_CFLAGS) -I. -L. -o capturetest $(srcdir)/tests/capturetest.c libpcap.a $(LIBS)
+
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)
-nonblocktest: tests/nonblocktest.c libpcap.a
- $(CC) $(FULL_CFLAGS) -I. -L. -o nonblocktest $(srcdir)/tests/nonblocktest.c libpcap.a $(LIBS)
-
opentest: tests/opentest.c libpcap.a
$(CC) $(FULL_CFLAGS) -I. -L. -o opentest $(srcdir)/tests/opentest.c libpcap.a $(LIBS)
@@ -605,6 +606,8 @@
$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
+ rm -f pcap_tstamp_type_val_to_description.3pcap && \
+ $(LN_S) pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap && \
rm -f pcap_getnonblock.3pcap && \
$(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
for i in $(MANFILE); do \
@@ -688,6 +691,7 @@
rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3pcap
rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3pcap
for i in $(MANFILE); do \
rm -f $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
for i in $(MANMISC); do \
@@ -741,4 +745,4 @@
rm -rf $$name
Home |
Main Index |
Thread Index |
Old Index