Merge branch 'master' of git+ssh://[email protected]/tcpdump/master/git/libpcap

diff --git a/CHANGES b/CHANGES
index 3c82052df058b9bebb5646d54e1925680667d2ee..4f7fa355c75b4369aeee73e76854b2d29907b01b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,22 @@
+Friday  March 30, 2012.  [email protected]
+Summary for 1.3.0 libpcap release
+        Handle DLT_PFSYNC in {FreeBSD, other *BSD+Mac OS X, other}.
+        Linux: Don't fail if netfilter isn't enabled in the kernel.
+        Add new link-layer type for NFC Forum LLCP.
+        Put the CANUSB stuff into EXTRA_DIST, so it shows up in the release tarball.
+        Add LINKTYPE_NG40/DLT_NG40.
+        Add DLT_MPEG_2_TS/LINKTYPE_MPEG_2_TS for MPEG-2 transport streams.
+        [PATCH] Fix AIX-3.5 crash with read failure during stress
+        AIX fixes.
+        Introduce --disable-shared configure option.
+        Added initial support for canusb devices.
+        Include the pcap(3PCAP) additions as 1.2.1 changes.
+        many updates to documentation: pcap.3pcap.in
+        Improve 'inbound'/'outbound' capture filters under Linux.
+        Note the cleanup of handling of new DLT_/LINKTYPE_ values.
+        On Lion, don't build for PPC.
+        For mac80211 devices we need to clean up monitor mode on exit.
+
 Friday  December 9, 2011.  [email protected].
 Summary for 1.2.1 libpcap release
        Update README file.

diff --git a/configure.in b/configure.in
index fb68d94ed65873d01a94ab1008075a562fc3f7a1..8432d2a8538d65ed23197fd8c94be27a176e1231 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1224,6 +1224,10 @@ solaris*)
        ;;
 esac
 
+AC_ARG_ENABLE(shared,
+AC_HELP_STRING([--enable-shared],[build shared libraries @<:@default=yes, if support available@:>@]))
+test "x$enable_shared" = "xno" && DYEXT="none"
+
 AC_PROG_RANLIB
 AC_CHECK_TOOL([AR], [ar])
 

diff --git a/pcap-bpf.c b/pcap-bpf.c
index 5b83bcb93099b6a7c53795319a1026c83ff42ab5..e18fdfb374e8cf3c3d366dd2f4925215d835107c 100644 (file)
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -1456,7 +1456,11 @@ check_setif_failure(pcap_t *p, int error)
  * 32K isn't very much for modern machines with fast networks; we
  * pick .5M, as that's the maximum on at least some systems with BPF.
  */
+#ifdef _AIX
+#define DEFAULT_BUFSIZE        32768
+#else
 #define DEFAULT_BUFSIZE        524288
+#endif
 
 static int
 pcap_activate_bpf(pcap_t *p)