Merge "Upgrade to libpcap 1.7.4."

am: e76baba

* commit 'e76baba7599e88b3fac3ffee0614996640c8bd86':
  Upgrade to libpcap 1.7.4.

Android.mk

@@ -1,24 +1,48 @@
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
-libpcap_PSRC =	pcap-linux.c pcap-usb-linux.c  pcap-can-linux.c pcap-netfilter-linux.c pcap-netfilter-linux-android.c
-libpcap_FSRC =  fad-gifc.c
-libpcap_CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
-	savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
-	bpf_image.c bpf_dump.c
-libpcap_GENSRC = scanner.c grammar.c bpf_filter.c version.c
+libpcap_cflags := \
+  -Wno-unused-parameter \
+  -D_U_="__attribute__((unused))" \
 
-libpcap_SRC =	$(libpcap_PSRC) $(libpcap_FSRC) $(libpcap_CSRC) $(libpcap_GENSRC)
+include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := \
+  pcap-linux.c pcap-usb-linux.c pcap-can-linux.c pcap-netfilter-linux.c pcap-netfilter-linux-android.c \
+  fad-gifc.c \
+  pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
+  savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
+  bpf/net/bpf_filter.c bpf_image.c bpf_dump.c \
+  version.c \
 
-LOCAL_SRC_FILES:=\
-	$(libpcap_SRC)
+# Generated on the host with `configure && make` and copied across.
+LOCAL_SRC_FILES += grammar.c
+LOCAL_SRC_FILES += scanner.c
 
-LOCAL_CFLAGS:=-O2 -g
-LOCAL_CFLAGS+=-DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -Dlinux -D__GLIBC__ -D_GNU_SOURCE
+LOCAL_CFLAGS += $(libpcap_cflags)
+LOCAL_CFLAGS += -Wno-sign-compare
+LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -include strings.h # For ffs(3).
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_MODULE:= libpcap
 
 include $(BUILD_STATIC_LIBRARY)
+
+libpcap_tests :=  \
+  tests/capturetest.c \
+  tests/filtertest.c \
+  tests/findalldevstest.c \
+  tests/opentest.c \
+  tests/reactivatetest.c \
+  tests/selpolltest.c \
+  tests/valgrindtest.c \
+
+$(foreach test,$(libpcap_tests), \
+  $(eval include $(CLEAR_VARS)) \
+  $(eval LOCAL_MODULE := libpcap_$(basename $(notdir $(test)))) \
+  $(eval LOCAL_SRC_FILES := $(test)) \
+  $(eval LOCAL_CFLAGS := $(libpcap_cflags)) \
+  $(eval LOCAL_STATIC_LIBRARIES := libpcap) \
+  $(eval include $(BUILD_NATIVE_TEST)) \
+)

CHANGES

@@ -1,3 +1,54 @@
+Saturday Jun. 27, 2015 mcr@sandelman.ca
+  Summary for 1.7.4 libpcap release
+	Include fix for GitHub issue #424 -- out of tree builds.
+
+Friday Apr. 10, 2015 guy@alum.mit.edu
+  Summary for 1.7.3 libpcap release
+	Work around a Linux bonding driver bug.
+
+Thursday Feb. 12, 2015 guy@alum.mit.edu/mcr@sandelman.ca
+  Summary for 1.7.2 libpcap release
+	Support for filtering Geneve encapsulated packets.
+	Generalize encapsulation handling, fixing some bugs.
+	Don't add null addresses to address lists.
+	Add pcap_dump_open_append() to open for appending.
+	Fix the swapping of isochronous descriptors in Linux USB.
+	Attempt to handle TPACKET_V1 with 32-bit userland and 64-bit kernel.
+
+Wednesday Nov. 12, 2014 guy@alum.mit.edu/mcr@sandelman.ca
+  Summary for 1.7.0 libpcap release
+	Fix handling of zones for BPF on Solaris
+	new DLT for ZWAVE
+	clarifications for read timeouts.
+	Use BPF extensions in compiled filters, fixing VLAN filters
+	some fixes to compilation without stdint.h
+	EBUSY can now be returned by SNFv3 code.
+	Fix the range checks in BPF loads
+	Various DAG fixes.
+	Various Linux fixes.
+
+Monday Aug. 12, 2014 guy@alum.mit.edu
+  Summary for 1.6.2 libpcap 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
+  Summary for 1.6.1 libpcap release
+	some fixes for the any device
+	changes for how --enable-XXX (--enable-sniffing, --enable-can) works
+
+Wednesday Jul. 2, 2014 mcr@sandelman.ca
+  Summary for 1.6.0 libpcap 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
 Summary for 1.5.3 libpcap release
 	Don't let packets that don't match the current filter get to the
@@ -244,7 +295,7 @@ Mon.    October 27, 2008.  ken@netfunctional.ca.  Summary for 1.0.0 libpcap rele
 	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
@@ -256,7 +307,7 @@ Mon.    October 27, 2008.  ken@netfunctional.ca.  Summary for 1.0.0 libpcap rele
 	 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
@@ -269,45 +320,45 @@ Mon.    September 10, 2007.  ken@xelerance.com.  Summary for 0.9.8 libpcap relea
         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.  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
 	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 
+	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. Summary for 0.9.5 libpcap release
 
@@ -319,19 +370,19 @@ Tue.	September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release
 	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. Summary for 0.9.4 libpcap release

CREDITS

@@ -2,11 +2,12 @@ This file lists people who have contributed to libpcap:
 
 The current maintainers:
     Bill Fenner                   <fenner at research dot att dot com>
-    Denis Ovsienko                <infrastation at yandex dot ru>
+    Denis Ovsienko                <denis at ovsienko dot info>
     Fulvio Risso                  <risso at polito dot it>
     Guy Harris                    <guy at alum dot mit dot edu>
     Hannes Gredler                <hannes at juniper dot net>
     Michael Richardson            <mcr at sandelman dot ottawa dot on dot ca>
+    Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
 
 Additional people who have contributed patches:
 
@@ -45,7 +46,7 @@ Additional people who have contributed patches:
     David Young                   <dyoung at ojctech dot com>
     Dean Gaudet                   <dean at arctic dot org>
     dhruv                         <rsrivat at sourceforge dot net>
-    Don Ebright                   <Don dot Ebright at compuware dot com> 
+    Don Ebright                   <Don dot Ebright at compuware dot com>
     Dug Song                      <dugsong at monkey dot org>
     Dustin Spicuzza               <dustin at virtualroadside dot com>
     dzejarczech                   <dzejarczech at sourceforge dot net>
@@ -83,6 +84,7 @@ Additional people who have contributed patches:
     Jefferson Ogata               <jogata at nodc dot noaa dot gov>
     Jesper Dangaard Brouer        <hawk at comx dot dk>
     Jesper Peterson               <jesper at endace dot com>
+    Jesse Gross                   <jesse at nicira dot com>
     Jiri Slaby                    <jirislaby at gmail dot com>
     Joerg Mayer                   <jmayer at loplof dot de>
     John Bankier                  <jbankier at rainfinity dot com>
@@ -105,13 +107,14 @@ Additional people who have contributed patches:
     Mansour Behabadi              <mansour at oxplot dot com>
     Marcus Felipe Pereira         <marcus at task dot com dot br>
     Mark C. Brown                 <mbrown at hp dot com>
+    Mark Johnston                 <markjdb at gmail dot com>
     Mark Pizzolato                <List-tcpdump-workers at subscriptions dot pizzolato dot net>
     Markus Mayer                  <markus_mayer at sourceforge dot net>
     Martin Husemann               <martin at netbsd dot org>
     Márton Németh                 <nm127 at freemail dot hu>
     Matthew Luckie                <mjl at luckie dot org dot nz>
     Max Laier                     <max at love2party dot net>
-    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>

INSTALL.txt

@@ -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 @@ where the configure scripts fails to detect it.
 
 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
@@ -185,14 +178,14 @@ packet timestamps aren't very good.  This appears to be due to haphazard
 handling of the timestamp in the kernel.
 
 Note well: there is rumoured to be a version of tcpdump floating around
-called 3.0.3 that includes libpcap and is supposed to support Linux. 
+called 3.0.3 that includes libpcap and is supposed to support Linux.
 You should be advised that neither the Network Research Group at LBNL
-nor the Tcpdump Group ever generated a release with this version number. 
+nor the Tcpdump Group ever generated a release with this version number.
 The LBNL Network Research Group notes with interest that a standard
 cracker trick to get people to install trojans is to distribute bogus
-packages that have a version number higher than the current release. 
+packages that have a version number higher than the current release.
 They also noted with annoyance that 90% of the Linux related bug reports
-they got are due to changes made to unofficial versions of their page. 
+they got are due to changes made to unofficial versions of their page.
 If you are having trouble but aren't using a version that came from
 tcpdump.org, please try that before submitting a bug report!
 
@@ -352,7 +345,6 @@ nametoaddr.c	- hostname to address routines
 nlpid.h		- OSI network layer protocol identifier definitions
 net		- symlink to bpf/net
 optimize.c	- BPF optimization routines
-packaging	- packaging information for building libpcap RPMs
 pcap/bluetooth.h - public definition of DLT_BLUETOOTH_HCI_H4_WITH_PHDR header
 pcap/bpf.h	- BPF definitions
 pcap/namedb.h	- public libpcap name database definitions

LICENSE

@@ -1,9 +1,9 @@
 License: BSD
- 
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-  
+
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
   2. Redistributions in binary form must reproduce the above copyright
@@ -13,7 +13,7 @@ are met:
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
-  
+
 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.