From Paolo Abeni and me: split pcap_open_live() into a "get a pcap_t

handle" routine, an 'activate a pcap_t handle" routine, and some "set
the properties of the pcap_t handle" routines, so that, for example, the
buffer size can be set on a BPF device before the device is bound to an
interface.

Add additional routines to set monitor mode, and make at least an
initial attempt at supporting that on Linux, *BSD, and Mac OS X 10.4 and
10.5.  (Very much "initial" for Linux, which is a twisty little maze of
wireless drivers, many different.)

Have a "timeout" member of the pcap_md structure on all platforms, use
that on Windows instead of the "timeout" member of the pcap_t structure,
and get rid of the "timeout" member of that structure.

config.h.in

@@ -59,6 +59,9 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the <linux/wireless.h> header file. */
+#undef HAVE_LINUX_WIRELESS_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -68,6 +71,9 @@
 /* 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/if_media.h> header file. */
+#undef HAVE_NET_IF_MEDIA_H
+
 /* Define to 1 if you have the <net/pfvar.h> header file. */
 #undef HAVE_NET_PFVAR_H
 

configure.in

@@ -1,12 +1,12 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.148 2008-03-14 09:12:49 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.149 2008-04-04 19:37:44 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl	The Regents of the University of California.  All rights reserved.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.148 $)
+AC_REVISION($Revision: 1.149 $)
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
@@ -448,9 +448,23 @@ linux)
 	if test $ac_cv_linux_vers -lt 2 ; then
 		AC_MSG_ERROR(version 2 or higher required; see the INSTALL doc for more info)
 	fi
+	AC_CHECK_HEADERS(linux/wireless.h, [], [],
+	[
+#include <sys/socket.h>
+#include <net/if.h>
+#include <linux/types.h>
+	])
+	AC_CHECK_HEADERS()
 	AC_LBL_TPACKET_STATS
 	;;
 
+bpf)
+	#
+	# Check whether we have the *BSD-style ioctls.
+	#
+	AC_CHECK_HEADERS(net/if_media.h)
+	;;
+
 dag)
 	V_DEFS="$V_DEFS -DDAG_ONLY"
 	;;

dlpisubs.c

@@ -12,7 +12,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-	"@(#) $Header: /tcpdump/master/libpcap/dlpisubs.c,v 1.1 2008-03-13 18:13:57 guy Exp $ (LBL)";
+	"@(#) $Header: /tcpdump/master/libpcap/dlpisubs.c,v 1.2 2008-04-04 19:37:45 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -197,7 +197,7 @@ pcap_process_pkts(pcap_t *p, pcap_handler callback, u_char *user,
  * Process the mac type. Returns -1 if no matching mac type found, otherwise 0.
  */
 int
-pcap_process_mactype(pcap_t *p, u_int mactype, char *ebuf)
+pcap_process_mactype(pcap_t *p, u_int mactype)
 {
 	int retv = 0;
 
@@ -247,7 +247,7 @@ pcap_process_mactype(pcap_t *p, u_int mactype, char *ebuf)
 #endif
 
 	default:
-		snprintf(ebuf, PCAP_ERRBUF_SIZE, "unknown mactype %u",
+		snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "unknown mactype %u",
 		    mactype);
 		retv = -1;
 	}
@@ -260,22 +260,22 @@ pcap_process_mactype(pcap_t *p, u_int mactype, char *ebuf)
  * Push and configure the buffer module. Returns -1 for error, otherwise 0.
  */
 int
-pcap_conf_bufmod(pcap_t *p, int snaplen, int timeout, char *ebuf)
+pcap_conf_bufmod(pcap_t *p, int snaplen, int timeout)
 {
 	int retv = 0;
 
 	bpf_u_int32 ss, chunksize;
 
 	/* Non-standard call to get the data nicely buffered. */
 	if (ioctl(p->fd, I_PUSH, "bufmod") != 0) {
-		pcap_stream_err("I_PUSH bufmod", errno, ebuf);
+		pcap_stream_err("I_PUSH bufmod", errno, p->errbuf);
 		retv = -1;
 	}
 
 	ss = snaplen;
 	if (ss > 0 &&
 	    strioctl(p->fd, SBIOCSSNAP, sizeof(ss), (char *)&ss) != 0) {
-		pcap_stream_err("SBIOCSSNAP", errno, ebuf);
+		pcap_stream_err("SBIOCSSNAP", errno, p->errbuf);
 		retv = -1;
 	}
 
@@ -286,7 +286,7 @@ pcap_conf_bufmod(pcap_t *p, int snaplen, int timeout, char *ebuf)
 		to.tv_sec = timeout / 1000;
 		to.tv_usec = (timeout * 1000) % 1000000;
 		if (strioctl(p->fd, SBIOCSTIME, sizeof(to), (char *)&to) != 0) {
-			pcap_stream_err("SBIOCSTIME", errno, ebuf);
+			pcap_stream_err("SBIOCSTIME", errno, p->errbuf);
 			retv = -1;
 		}
 	}
@@ -295,7 +295,7 @@ pcap_conf_bufmod(pcap_t *p, int snaplen, int timeout, char *ebuf)
 	chunksize = CHUNKSIZE;
 	if (strioctl(p->fd, SBIOCSCHUNK, sizeof(chunksize), (char *)&chunksize)
 	    != 0) {
-		pcap_stream_err("SBIOCSCHUNKP", errno, ebuf);
+		pcap_stream_err("SBIOCSCHUNKP", errno, p->errbuf);
 		retv = -1;
 	}
 
@@ -307,12 +307,12 @@ pcap_conf_bufmod(pcap_t *p, int snaplen, int timeout, char *ebuf)
  * Allocate data buffer. Returns -1 if memory allocation fails, else 0.
  */
 int
-pcap_alloc_databuf(pcap_t *p, char *ebuf)
+pcap_alloc_databuf(pcap_t *p)
 {
 	p->bufsize = PKTBUFSIZE;
 	p->buffer = (u_char *)malloc(p->bufsize + p->offset);
 	if (p->buffer == NULL) {
-		strlcpy(ebuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+		strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
 		return (-1);
 	}
 

dlpisubs.h

@@ -1,5 +1,5 @@
 /*
- * @(#) $Header: /tcpdump/master/libpcap/dlpisubs.h,v 1.1 2008-03-13 18:13:57 guy Exp $
+ * @(#) $Header: /tcpdump/master/libpcap/dlpisubs.h,v 1.2 2008-04-04 19:37:45 guy Exp $
  */
 
 #ifndef dlpisubs_h
@@ -14,11 +14,11 @@ extern "C" {
  */
 int pcap_stats_dlpi(pcap_t *, struct pcap_stat *);
 int pcap_process_pkts(pcap_t *, pcap_handler, u_char *, int, u_char *, int);
-int pcap_process_mactype(pcap_t *, u_int, char *);
+int pcap_process_mactype(pcap_t *, u_int);
 #ifdef HAVE_SYS_BUFMOD_H
-int pcap_conf_bufmod(pcap_t *, int, int, char *);
+int pcap_conf_bufmod(pcap_t *, int, int);
 #endif
-int pcap_alloc_databuf(pcap_t *, char *);
+int pcap_alloc_databuf(pcap_t *);
 int strioctl(int, int, int, char *);
 
 #ifdef __cplusplus