Index: vendor/libpcap/dist/gen_version_c.sh
===================================================================
--- vendor/libpcap/dist/gen_version_c.sh	(revision 333788)
+++ vendor/libpcap/dist/gen_version_c.sh	(nonexistent)
@@ -1,11 +0,0 @@
-#! /bin/sh
-echo '#include <pcap/export-defs.h>' > "$2"
-echo 'PCAP_API_DEF' >> "$2"
-if grep GIT "$1" >/dev/null; then
-	read ver <"$1"
-	echo $ver | tr -d '\012'
-	date +_%Y_%m_%d
-else
-	cat "$1"
-fi | sed -e 's/.*/char pcap_version[] = "&";/' >> "$2"
-

Property changes on: vendor/libpcap/dist/gen_version_c.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/gen_version_header.sh
===================================================================
--- vendor/libpcap/dist/gen_version_header.sh	(revision 333788)
+++ vendor/libpcap/dist/gen_version_header.sh	(nonexistent)
@@ -1,19 +0,0 @@
-#! /bin/sh
-print_version_string()
-{
-	if grep GIT "$1" >/dev/null
-	then
-		read ver <"$1"
-		echo $ver | tr -d '\012'
-		date +_%Y_%m_%d
-	else
-		cat "$1"
-	fi
-}
-if test $# != 3
-then
-	echo "Usage: gen_version_header.sh <version file> <template> <output file>" 1>&2
-	exit 1
-fi
-version_string=`print_version_string "$1"`
-sed "s/%%LIBPCAP_VERSION%%/$version_string/" "$2" >"$3"

Property changes on: vendor/libpcap/dist/gen_version_header.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/config/have_siocglifconf.c
===================================================================
--- vendor/libpcap/dist/config/have_siocglifconf.c	(revision 333788)
+++ vendor/libpcap/dist/config/have_siocglifconf.c	(nonexistent)
@@ -1,6 +0,0 @@
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-int main() {
-    ioctl(0, SIOCGLIFCONF, (char *)0);
-}

Property changes on: vendor/libpcap/dist/config/have_siocglifconf.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap_version.h.in
===================================================================
--- vendor/libpcap/dist/pcap_version.h.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_version.h.in	(nonexistent)
@@ -1,13 +0,0 @@
-/*
- * We make the version string static, and return a pointer to it, rather
- * than exporting the version string directly.  On at least some UNIXes,
- * if you import data from a shared library into an program, the data is
- * bound into the program binary, so if the string in the version of the
- * library with which the program was linked isn't the same as the
- * string in the version of the library with which the program is being
- * run, various undesirable things may happen (warnings, the string
- * being the one from the version of the library with which the program
- * was linked, or even weirder things, such as the string being the one
- * from the library but being truncated).
- */
-static const char pcap_version_string[] = "libpcap version %%LIBPCAP_VERSION%%";

Property changes on: vendor/libpcap/dist/pcap_version.h.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/sf-pcap-ng.c
===================================================================
--- vendor/libpcap/dist/sf-pcap-ng.c	(revision 333788)
+++ vendor/libpcap/dist/sf-pcap-ng.c	(nonexistent)
@@ -1,1424 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- *
- * sf-pcap-ng.c - pcap-ng-file-format-specific code from savefile.c
- */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header$ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#endif /* _WIN32 */
-
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "pcap-int.h"
-
-#include "pcap-common.h"
-
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
-#include "sf-pcap-ng.h"
-
-/*
- * Block types.
- */
-
-/*
- * Common part at the beginning of all blocks.
- */
-struct block_header {
-	bpf_u_int32	block_type;
-	bpf_u_int32	total_length;
-};
-
-/*
- * Common trailer at the end of all blocks.
- */
-struct block_trailer {
-	bpf_u_int32	total_length;
-};
-
-/*
- * Common options.
- */
-#define OPT_ENDOFOPT	0	/* end of options */
-#define OPT_COMMENT	1	/* comment string */
-
-/*
- * Option header.
- */
-struct option_header {
-	u_short		option_code;
-	u_short		option_length;
-};
-
-/*
- * Structures for the part of each block type following the common
- * part.
- */
-
-/*
- * Section Header Block.
- */
-#define BT_SHB			0x0A0D0D0A
-
-struct section_header_block {
-	bpf_u_int32	byte_order_magic;
-	u_short		major_version;
-	u_short		minor_version;
-	u_int64_t	section_length;
-	/* followed by options and trailer */
-};
-
-/*
- * Byte-order magic value.
- */
-#define BYTE_ORDER_MAGIC	0x1A2B3C4D
-
-/*
- * Current version number.  If major_version isn't PCAP_NG_VERSION_MAJOR,
- * that means that this code can't read the file.
- */
-#define PCAP_NG_VERSION_MAJOR	1
-#define PCAP_NG_VERSION_MINOR	0
-
-/*
- * Interface Description Block.
- */
-#define BT_IDB			0x00000001
-
-struct interface_description_block {
-	u_short		linktype;
-	u_short		reserved;
-	bpf_u_int32	snaplen;
-	/* followed by options and trailer */
-};
-
-/*
- * Options in the IDB.
- */
-#define IF_NAME		2	/* interface name string */
-#define IF_DESCRIPTION	3	/* interface description string */
-#define IF_IPV4ADDR	4	/* interface's IPv4 address and netmask */
-#define IF_IPV6ADDR	5	/* interface's IPv6 address and prefix length */
-#define IF_MACADDR	6	/* interface's MAC address */
-#define IF_EUIADDR	7	/* interface's EUI address */
-#define IF_SPEED	8	/* interface's speed, in bits/s */
-#define IF_TSRESOL	9	/* interface's time stamp resolution */
-#define IF_TZONE	10	/* interface's time zone */
-#define IF_FILTER	11	/* filter used when capturing on interface */
-#define IF_OS		12	/* string OS on which capture on this interface was done */
-#define IF_FCSLEN	13	/* FCS length for this interface */
-#define IF_TSOFFSET	14	/* time stamp offset for this interface */
-
-/*
- * Enhanced Packet Block.
- */
-#define BT_EPB			0x00000006
-
-struct enhanced_packet_block {
-	bpf_u_int32	interface_id;
-	bpf_u_int32	timestamp_high;
-	bpf_u_int32	timestamp_low;
-	bpf_u_int32	caplen;
-	bpf_u_int32	len;
-	/* followed by packet data, options, and trailer */
-};
-
-/*
- * Simple Packet Block.
- */
-#define BT_SPB			0x00000003
-
-struct simple_packet_block {
-	bpf_u_int32	len;
-	/* followed by packet data and trailer */
-};
-
-/*
- * Packet Block.
- */
-#define BT_PB			0x00000002
-
-struct packet_block {
-	u_short		interface_id;
-	u_short		drops_count;
-	bpf_u_int32	timestamp_high;
-	bpf_u_int32	timestamp_low;
-	bpf_u_int32	caplen;
-	bpf_u_int32	len;
-	/* followed by packet data, options, and trailer */
-};
-
-/*
- * Block cursor - used when processing the contents of a block.
- * Contains a pointer into the data being processed and a count
- * of bytes remaining in the block.
- */
-struct block_cursor {
-	u_char		*data;
-	size_t		data_remaining;
-	bpf_u_int32	block_type;
-};
-
-typedef enum {
-	PASS_THROUGH,
-	SCALE_UP_DEC,
-	SCALE_DOWN_DEC,
-	SCALE_UP_BIN,
-	SCALE_DOWN_BIN
-} tstamp_scale_type_t;
-
-/*
- * Per-interface information.
- */
-struct pcap_ng_if {
-	u_int tsresol;			/* time stamp resolution */
-	tstamp_scale_type_t scale_type;	/* how to scale */
-	u_int scale_factor;		/* time stamp scale factor for power-of-10 tsresol */
-	u_int64_t tsoffset;		/* time stamp offset */
-};
-
-struct pcap_ng_sf {
-	u_int user_tsresol;		/* time stamp resolution requested by the user */
-	bpf_u_int32 ifcount;		/* number of interfaces seen in this capture */
-	bpf_u_int32 ifaces_size;	/* size of array below */
-	struct pcap_ng_if *ifaces;	/* array of interface information */
-};
-
-static void pcap_ng_cleanup(pcap_t *p);
-static int pcap_ng_next_packet(pcap_t *p, struct pcap_pkthdr *hdr,
-    u_char **data);
-
-static int
-read_bytes(FILE *fp, void *buf, size_t bytes_to_read, int fail_on_eof,
-    char *errbuf)
-{
-	size_t amt_read;
-
-	amt_read = fread(buf, 1, bytes_to_read, fp);
-	if (amt_read != bytes_to_read) {
-		if (ferror(fp)) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
-		} else {
-			if (amt_read == 0 && !fail_on_eof)
-				return (0);	/* EOF */
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "truncated dump file; tried to read %lu bytes, only got %lu",
-			    (unsigned long)bytes_to_read,
-			    (unsigned long)amt_read);
-		}
-		return (-1);
-	}
-	return (1);
-}
-
-static int
-read_block(FILE *fp, pcap_t *p, struct block_cursor *cursor, char *errbuf)
-{
-	int status;
-	struct block_header bhdr;
-	u_char *bdata;
-	size_t data_remaining;
-
-	status = read_bytes(fp, &bhdr, sizeof(bhdr), 0, errbuf);
-	if (status <= 0)
-		return (status);	/* error or EOF */
-
-	if (p->swapped) {
-		bhdr.block_type = SWAPLONG(bhdr.block_type);
-		bhdr.total_length = SWAPLONG(bhdr.total_length);
-	}
-
-	/*
-	 * Is this block "too big"?
-	 *
-	 * We choose 16MB as "too big", for now, so that we handle
-	 * "reasonably" large buffers but don't chew up all the
-	 * memory if we read a malformed file.
-	 */
-	if (bhdr.total_length > 16*1024*1024) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "pcap-ng block size %u > maximum %u",
-		    bhdr.total_length, 16*1024*1024);
-		    return (-1);
-	}
-
-	/*
-	 * Is this block "too small" - i.e., is it shorter than a block
-	 * header plus a block trailer?
-	 */
-	if (bhdr.total_length < sizeof(struct block_header) +
-	    sizeof(struct block_trailer)) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "block in pcap-ng dump file has a length of %u < %lu",
-		    bhdr.total_length,
-		    (unsigned long)(sizeof(struct block_header) + sizeof(struct block_trailer)));
-		return (-1);
-	}
-
-	/*
-	 * Is the buffer big enough?
-	 */
-	if (p->bufsize < bhdr.total_length) {
-		/*
-		 * No - make it big enough.
-		 */
-		void *bigger_buffer;
-
-		bigger_buffer = realloc(p->buffer, bhdr.total_length);
-		if (bigger_buffer == NULL) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory");
-			return (-1);
-		}
-		p->buffer = bigger_buffer;
-	}
-
-	/*
-	 * Copy the stuff we've read to the buffer, and read the rest
-	 * of the block.
-	 */
-	memcpy(p->buffer, &bhdr, sizeof(bhdr));
-	bdata = (u_char *)p->buffer + sizeof(bhdr);
-	data_remaining = bhdr.total_length - sizeof(bhdr);
-	if (read_bytes(fp, bdata, data_remaining, 1, errbuf) == -1)
-		return (-1);
-
-	/*
-	 * Initialize the cursor.
-	 */
-	cursor->data = bdata;
-	cursor->data_remaining = data_remaining - sizeof(struct block_trailer);
-	cursor->block_type = bhdr.block_type;
-	return (1);
-}
-
-static void *
-get_from_block_data(struct block_cursor *cursor, size_t chunk_size,
-    char *errbuf)
-{
-	void *data;
-
-	/*
-	 * Make sure we have the specified amount of data remaining in
-	 * the block data.
-	 */
-	if (cursor->data_remaining < chunk_size) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "block of type %u in pcap-ng dump file is too short",
-		    cursor->block_type);
-		return (NULL);
-	}
-
-	/*
-	 * Return the current pointer, and skip past the chunk.
-	 */
-	data = cursor->data;
-	cursor->data += chunk_size;
-	cursor->data_remaining -= chunk_size;
-	return (data);
-}
-
-static struct option_header *
-get_opthdr_from_block_data(pcap_t *p, struct block_cursor *cursor, char *errbuf)
-{
-	struct option_header *opthdr;
-
-	opthdr = get_from_block_data(cursor, sizeof(*opthdr), errbuf);
-	if (opthdr == NULL) {
-		/*
-		 * Option header is cut short.
-		 */
-		return (NULL);
-	}
-
-	/*
-	 * Byte-swap it if necessary.
-	 */
-	if (p->swapped) {
-		opthdr->option_code = SWAPSHORT(opthdr->option_code);
-		opthdr->option_length = SWAPSHORT(opthdr->option_length);
-	}
-
-	return (opthdr);
-}
-
-static void *
-get_optvalue_from_block_data(struct block_cursor *cursor,
-    struct option_header *opthdr, char *errbuf)
-{
-	size_t padded_option_len;
-	void *optvalue;
-
-	/* Pad option length to 4-byte boundary */
-	padded_option_len = opthdr->option_length;
-	padded_option_len = ((padded_option_len + 3)/4)*4;
-
-	optvalue = get_from_block_data(cursor, padded_option_len, errbuf);
-	if (optvalue == NULL) {
-		/*
-		 * Option value is cut short.
-		 */
-		return (NULL);
-	}
-
-	return (optvalue);
-}
-
-static int
-process_idb_options(pcap_t *p, struct block_cursor *cursor, u_int *tsresol,
-    u_int64_t *tsoffset, int *is_binary, char *errbuf)
-{
-	struct option_header *opthdr;
-	void *optvalue;
-	int saw_tsresol, saw_tsoffset;
-	u_char tsresol_opt;
-	u_int i;
-
-	saw_tsresol = 0;
-	saw_tsoffset = 0;
-	while (cursor->data_remaining != 0) {
-		/*
-		 * Get the option header.
-		 */
-		opthdr = get_opthdr_from_block_data(p, cursor, errbuf);
-		if (opthdr == NULL) {
-			/*
-			 * Option header is cut short.
-			 */
-			return (-1);
-		}
-
-		/*
-		 * Get option value.
-		 */
-		optvalue = get_optvalue_from_block_data(cursor, opthdr,
-		    errbuf);
-		if (optvalue == NULL) {
-			/*
-			 * Option value is cut short.
-			 */
-			return (-1);
-		}
-
-		switch (opthdr->option_code) {
-
-		case OPT_ENDOFOPT:
-			if (opthdr->option_length != 0) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "Interface Description Block has opt_endofopt option with length %u != 0",
-				    opthdr->option_length);
-				return (-1);
-			}
-			goto done;
-
-		case IF_TSRESOL:
-			if (opthdr->option_length != 1) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "Interface Description Block has if_tsresol option with length %u != 1",
-				    opthdr->option_length);
-				return (-1);
-			}
-			if (saw_tsresol) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "Interface Description Block has more than one if_tsresol option");
-				return (-1);
-			}
-			saw_tsresol = 1;
-			memcpy(&tsresol_opt, optvalue, sizeof(tsresol_opt));
-			if (tsresol_opt & 0x80) {
-				/*
-				 * Resolution is negative power of 2.
-				 */
-				*is_binary = 1;
-				*tsresol = 1 << (tsresol_opt & 0x7F);
-			} else {
-				/*
-				 * Resolution is negative power of 10.
-				 */
-				*is_binary = 0;
-				*tsresol = 1;
-				for (i = 0; i < tsresol_opt; i++)
-					*tsresol *= 10;
-			}
-			if (*tsresol == 0) {
-				/*
-				 * Resolution is too high.
-				 */
-				if (tsresol_opt & 0x80) {
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "Interface Description Block if_tsresol option resolution 2^-%u is too high",
-					    tsresol_opt & 0x7F);
-				} else {
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "Interface Description Block if_tsresol option resolution 10^-%u is too high",
-					    tsresol_opt);
-				}
-				return (-1);
-			}
-			break;
-
-		case IF_TSOFFSET:
-			if (opthdr->option_length != 8) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "Interface Description Block has if_tsoffset option with length %u != 8",
-				    opthdr->option_length);
-				return (-1);
-			}
-			if (saw_tsoffset) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "Interface Description Block has more than one if_tsoffset option");
-				return (-1);
-			}
-			saw_tsoffset = 1;
-			memcpy(tsoffset, optvalue, sizeof(*tsoffset));
-			if (p->swapped)
-				*tsoffset = SWAPLL(*tsoffset);
-			break;
-
-		default:
-			break;
-		}
-	}
-
-done:
-	return (0);
-}
-
-static int
-add_interface(pcap_t *p, struct block_cursor *cursor, char *errbuf)
-{
-	struct pcap_ng_sf *ps;
-	u_int tsresol;
-	u_int64_t tsoffset;
-	int is_binary;
-
-	ps = p->priv;
-
-	/*
-	 * Count this interface.
-	 */
-	ps->ifcount++;
-
-	/*
-	 * Grow the array of per-interface information as necessary.
-	 */
-	if (ps->ifcount > ps->ifaces_size) {
-		/*
-		 * We need to grow the array.
-		 */
-		bpf_u_int32 new_ifaces_size;
-		struct pcap_ng_if *new_ifaces;
-
-		if (ps->ifaces_size == 0) {
-			/*
-			 * It's currently empty.
-			 *
-			 * (The Clang static analyzer doesn't do enough,
-			 * err, umm, dataflow *analysis* to realize that
-			 * ps->ifaces_size == 0 if ps->ifaces == NULL,
-			 * and so complains about a possible zero argument
-			 * to realloc(), so we check for the former
-			 * condition to shut it up.
-			 *
-			 * However, it doesn't complain that one of the
-			 * multiplications below could overflow, which is
-			 * a real, albeit extremely unlikely, problem (you'd
-			 * need a pcap-ng file with tens of millions of
-			 * interfaces).)
-			 */
-			new_ifaces_size = 1;
-			new_ifaces = malloc(sizeof (struct pcap_ng_if));
-		} else {
-			/*
-			 * It's not currently empty; double its size.
-			 * (Perhaps overkill once we have a lot of interfaces.)
-			 *
-			 * Check for overflow if we double it.
-			 */
-			if (ps->ifaces_size * 2 < ps->ifaces_size) {
-				/*
-				 * The maximum number of interfaces before
-				 * ps->ifaces_size overflows is the largest
-				 * possible 32-bit power of 2, as we do
-				 * size doubling.
-				 */
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "more than %u interfaces in the file",
-				    0x80000000U);
-				return (0);
-			}
-
-			/*
-			 * ps->ifaces_size * 2 doesn't overflow, so it's
-			 * safe to multiply.
-			 */
-			new_ifaces_size = ps->ifaces_size * 2;
-
-			/*
-			 * Now make sure that's not so big that it overflows
-			 * if we multiply by sizeof (struct pcap_ng_if).
-			 *
-			 * That can happen on 32-bit platforms, with a 32-bit
-			 * size_t; it shouldn't happen on 64-bit platforms,
-			 * with a 64-bit size_t, as new_ifaces_size is
-			 * 32 bits.
-			 */
-			if (new_ifaces_size * sizeof (struct pcap_ng_if) < new_ifaces_size) {
-				/*
-				 * As this fails only with 32-bit size_t,
-				 * the multiplication was 32x32->32, and
-				 * the largest 32-bit value that can safely
-				 * be multiplied by sizeof (struct pcap_ng_if)
-				 * without overflow is the largest 32-bit
-				 * (unsigned) value divided by
-				 * sizeof (struct pcap_ng_if).
-				 */
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "more than %u interfaces in the file",
-				    0xFFFFFFFFU / ((u_int)sizeof (struct pcap_ng_if)));
-				return (0);
-			}
-			new_ifaces = realloc(ps->ifaces, new_ifaces_size * sizeof (struct pcap_ng_if));
-		}
-		if (new_ifaces == NULL) {
-			/*
-			 * We ran out of memory.
-			 * Give up.
-			 */
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "out of memory for per-interface information (%u interfaces)",
-			    ps->ifcount);
-			return (0);
-		}
-		ps->ifaces_size = new_ifaces_size;
-		ps->ifaces = new_ifaces;
-	}
-
-	/*
-	 * Set the default time stamp resolution and offset.
-	 */
-	tsresol = 1000000;	/* microsecond resolution */
-	is_binary = 0;		/* which is a power of 10 */
-	tsoffset = 0;		/* absolute timestamps */
-
-	/*
-	 * Now look for various time stamp options, so we know
-	 * how to interpret the time stamps for this interface.
-	 */
-	if (process_idb_options(p, cursor, &tsresol, &tsoffset, &is_binary,
-	    errbuf) == -1)
-		return (0);
-
-	ps->ifaces[ps->ifcount - 1].tsresol = tsresol;
-	ps->ifaces[ps->ifcount - 1].tsoffset = tsoffset;
-
-	/*
-	 * Determine whether we're scaling up or down or not
-	 * at all for this interface.
-	 */
-	if (tsresol == ps->user_tsresol) {
-		/*
-		 * The resolution is the resolution the user wants,
-		 * so we don't have to do scaling.
-		 */
-		ps->ifaces[ps->ifcount - 1].scale_type = PASS_THROUGH;
-	} else if (tsresol > ps->user_tsresol) {
-		/*
-		 * The resolution is greater than what the user wants,
-		 * so we have to scale the timestamps down.
-		 */
-		if (is_binary)
-			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_DOWN_BIN;
-		else {
-			/*
-			 * Calculate the scale factor.
-			 */
-			ps->ifaces[ps->ifcount - 1].scale_factor = tsresol/ps->user_tsresol;
-			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_DOWN_DEC;
-		}
-	} else {
-		/*
-		 * The resolution is less than what the user wants,
-		 * so we have to scale the timestamps up.
-		 */
-		if (is_binary)
-			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_UP_BIN;
-		else {
-			/*
-			 * Calculate the scale factor.
-			 */
-			ps->ifaces[ps->ifcount - 1].scale_factor = ps->user_tsresol/tsresol;
-			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_UP_DEC;
-		}
-	}
-	return (1);
-}
-
-/*
- * Check whether this is a pcap-ng savefile and, if it is, extract the
- * relevant information from the header.
- */
-pcap_t *
-pcap_ng_check_header(bpf_u_int32 magic, FILE *fp, u_int precision, char *errbuf,
-    int *err)
-{
-	size_t amt_read;
-	bpf_u_int32 total_length;
-	bpf_u_int32 byte_order_magic;
-	struct block_header *bhdrp;
-	struct section_header_block *shbp;
-	pcap_t *p;
-	int swapped = 0;
-	struct pcap_ng_sf *ps;
-	int status;
-	struct block_cursor cursor;
-	struct interface_description_block *idbp;
-
-	/*
-	 * Assume no read errors.
-	 */
-	*err = 0;
-
-	/*
-	 * Check whether the first 4 bytes of the file are the block
-	 * type for a pcap-ng savefile.
-	 */
-	if (magic != BT_SHB) {
-		/*
-		 * XXX - check whether this looks like what the block
-		 * type would be after being munged by mapping between
-		 * UN*X and DOS/Windows text file format and, if it
-		 * does, look for the byte-order magic number in
-		 * the appropriate place and, if we find it, report
-		 * this as possibly being a pcap-ng file transferred
-		 * between UN*X and Windows in text file format?
-		 */
-		return (NULL);	/* nope */
-	}
-
-	/*
-	 * OK, they are.  However, that's just \n\r\r\n, so it could,
-	 * conceivably, be an ordinary text file.
-	 *
-	 * It could not, however, conceivably be any other type of
-	 * capture file, so we can read the rest of the putative
-	 * Section Header Block; put the block type in the common
-	 * header, read the rest of the common header and the
-	 * fixed-length portion of the SHB, and look for the byte-order
-	 * magic value.
-	 */
-	amt_read = fread(&total_length, 1, sizeof(total_length), fp);
-	if (amt_read < sizeof(total_length)) {
-		if (ferror(fp)) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
-			*err = 1;
-			return (NULL);	/* fail */
-		}
-
-		/*
-		 * Possibly a weird short text file, so just say
-		 * "not pcap-ng".
-		 */
-		return (NULL);
-	}
-	amt_read = fread(&byte_order_magic, 1, sizeof(byte_order_magic), fp);
-	if (amt_read < sizeof(byte_order_magic)) {
-		if (ferror(fp)) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
-			*err = 1;
-			return (NULL);	/* fail */
-		}
-
-		/*
-		 * Possibly a weird short text file, so just say
-		 * "not pcap-ng".
-		 */
-		return (NULL);
-	}
-	if (byte_order_magic != BYTE_ORDER_MAGIC) {
-		byte_order_magic = SWAPLONG(byte_order_magic);
-		if (byte_order_magic != BYTE_ORDER_MAGIC) {
-			/*
-			 * Not a pcap-ng file.
-			 */
-			return (NULL);
-		}
-		swapped = 1;
-		total_length = SWAPLONG(total_length);
-	}
-
-	/*
-	 * Check the sanity of the total length.
-	 */
-	if (total_length < sizeof(*bhdrp) + sizeof(*shbp) + sizeof(struct block_trailer)) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "Section Header Block in pcap-ng dump file has a length of %u < %lu",
-		    total_length,
-		    (unsigned long)(sizeof(*bhdrp) + sizeof(*shbp) + sizeof(struct block_trailer)));
-		*err = 1;
-		return (NULL);
-	}
-
-	/*
-	 * OK, this is a good pcap-ng file.
-	 * Allocate a pcap_t for it.
-	 */
-	p = pcap_open_offline_common(errbuf, sizeof (struct pcap_ng_sf));
-	if (p == NULL) {
-		/* Allocation failed. */
-		*err = 1;
-		return (NULL);
-	}
-	p->swapped = swapped;
-	ps = p->priv;
-
-	/*
-	 * What precision does the user want?
-	 */
-	switch (precision) {
-
-	case PCAP_TSTAMP_PRECISION_MICRO:
-		ps->user_tsresol = 1000000;
-		break;
-
-	case PCAP_TSTAMP_PRECISION_NANO:
-		ps->user_tsresol = 1000000000;
-		break;
-
-	default:
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "unknown time stamp resolution %u", precision);
-		free(p);
-		*err = 1;
-		return (NULL);
-	}
-
-	p->opt.tstamp_precision = precision;
-
-	/*
-	 * Allocate a buffer into which to read blocks.  We default to
-	 * the maximum of:
-	 *
-	 *	the total length of the SHB for which we read the header;
-	 *
-	 *	2K, which should be more than large enough for an Enhanced
-	 *	Packet Block containing a full-size Ethernet frame, and
-	 *	leaving room for some options.
-	 *
-	 * If we find a bigger block, we reallocate the buffer.
-	 */
-	p->bufsize = 2048;
-	if (p->bufsize < total_length)
-		p->bufsize = total_length;
-	p->buffer = malloc(p->bufsize);
-	if (p->buffer == NULL) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory");
-		free(p);
-		*err = 1;
-		return (NULL);
-	}
-
-	/*
-	 * Copy the stuff we've read to the buffer, and read the rest
-	 * of the SHB.
-	 */
-	bhdrp = (struct block_header *)p->buffer;
-	shbp = (struct section_header_block *)((u_char *)p->buffer + sizeof(struct block_header));
-	bhdrp->block_type = magic;
-	bhdrp->total_length = total_length;
-	shbp->byte_order_magic = byte_order_magic;
-	if (read_bytes(fp,
-	    (u_char *)p->buffer + (sizeof(magic) + sizeof(total_length) + sizeof(byte_order_magic)),
-	    total_length - (sizeof(magic) + sizeof(total_length) + sizeof(byte_order_magic)),
-	    1, errbuf) == -1)
-		goto fail;
-
-	if (p->swapped) {
-		/*
-		 * Byte-swap the fields we've read.
-		 */
-		shbp->major_version = SWAPSHORT(shbp->major_version);
-		shbp->minor_version = SWAPSHORT(shbp->minor_version);
-
-		/*
-		 * XXX - we don't care about the section length.
-		 */
-	}
-	/* currently only SHB version 1.0 is supported */
-	if (! (shbp->major_version == PCAP_NG_VERSION_MAJOR &&
-	       shbp->minor_version == PCAP_NG_VERSION_MINOR)) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "unsupported pcap-ng savefile version %u.%u",
-		    shbp->major_version, shbp->minor_version);
-		goto fail;
-	}
-	p->version_major = shbp->major_version;
-	p->version_minor = shbp->minor_version;
-
-	/*
-	 * Save the time stamp resolution the user requested.
-	 */
-	p->opt.tstamp_precision = precision;
-
-	/*
-	 * Now start looking for an Interface Description Block.
-	 */
-	for (;;) {
-		/*
-		 * Read the next block.
-		 */
-		status = read_block(fp, p, &cursor, errbuf);
-		if (status == 0) {
-			/* EOF - no IDB in this file */
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "the capture file has no Interface Description Blocks");
-			goto fail;
-		}
-		if (status == -1)
-			goto fail;	/* error */
-		switch (cursor.block_type) {
-
-		case BT_IDB:
-			/*
-			 * Get a pointer to the fixed-length portion of the
-			 * IDB.
-			 */
-			idbp = get_from_block_data(&cursor, sizeof(*idbp),
-			    errbuf);
-			if (idbp == NULL)
-				goto fail;	/* error */
-
-			/*
-			 * Byte-swap it if necessary.
-			 */
-			if (p->swapped) {
-				idbp->linktype = SWAPSHORT(idbp->linktype);
-				idbp->snaplen = SWAPLONG(idbp->snaplen);
-			}
-
-			/*
-			 * Interface capture length sanity check
-			 */
-			if (idbp->snaplen > MAXIMUM_SNAPLEN) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "invalid interface capture length %u, "
-				    "bigger than maximum of %u",
-				    idbp->snaplen, MAXIMUM_SNAPLEN);
-				goto fail;
-			}
-
-			/*
-			 * Try to add this interface.
-			 */
-			if (!add_interface(p, &cursor, errbuf))
-				goto fail;
-
-			goto done;
-
-		case BT_EPB:
-		case BT_SPB:
-		case BT_PB:
-			/*
-			 * Saw a packet before we saw any IDBs.  That's
-			 * not valid, as we don't know what link-layer
-			 * encapsulation the packet has.
-			 */
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "the capture file has a packet block before any Interface Description Blocks");
-			goto fail;
-
-		default:
-			/*
-			 * Just ignore it.
-			 */
-			break;
-		}
-	}
-
-done:
-	p->tzoff = 0;	/* XXX - not used in pcap */
-	p->snapshot = idbp->snaplen;
-	p->linktype = linktype_to_dlt(idbp->linktype);
-	p->linktype_ext = 0;
-
-	p->next_packet_op = pcap_ng_next_packet;
-	p->cleanup_op = pcap_ng_cleanup;
-
-	return (p);
-
-fail:
-	free(ps->ifaces);
-	free(p->buffer);
-	free(p);
-	*err = 1;
-	return (NULL);
-}
-
-static void
-pcap_ng_cleanup(pcap_t *p)
-{
-	struct pcap_ng_sf *ps = p->priv;
-
-	free(ps->ifaces);
-	sf_cleanup(p);
-}
-
-/*
- * Read and return the next packet from the savefile.  Return the header
- * in hdr and a pointer to the contents in data.  Return 0 on success, 1
- * if there were no more packets, and -1 on an error.
- */
-static int
-pcap_ng_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char **data)
-{
-	struct pcap_ng_sf *ps = p->priv;
-	struct block_cursor cursor;
-	int status;
-	struct enhanced_packet_block *epbp;
-	struct simple_packet_block *spbp;
-	struct packet_block *pbp;
-	bpf_u_int32 interface_id = 0xFFFFFFFF;
-	struct interface_description_block *idbp;
-	struct section_header_block *shbp;
-	FILE *fp = p->rfile;
-	u_int64_t t, sec, frac;
-
-	/*
-	 * Look for an Enhanced Packet Block, a Simple Packet Block,
-	 * or a Packet Block.
-	 */
-	for (;;) {
-		/*
-		 * Read the block type and length; those are common
-		 * to all blocks.
-		 */
-		status = read_block(fp, p, &cursor, p->errbuf);
-		if (status == 0)
-			return (1);	/* EOF */
-		if (status == -1)
-			return (-1);	/* error */
-		switch (cursor.block_type) {
-
-		case BT_EPB:
-			/*
-			 * Get a pointer to the fixed-length portion of the
-			 * EPB.
-			 */
-			epbp = get_from_block_data(&cursor, sizeof(*epbp),
-			    p->errbuf);
-			if (epbp == NULL)
-				return (-1);	/* error */
-
-			/*
-			 * Byte-swap it if necessary.
-			 */
-			if (p->swapped) {
-				/* these were written in opposite byte order */
-				interface_id = SWAPLONG(epbp->interface_id);
-				hdr->caplen = SWAPLONG(epbp->caplen);
-				hdr->len = SWAPLONG(epbp->len);
-				t = ((u_int64_t)SWAPLONG(epbp->timestamp_high)) << 32 |
-				    SWAPLONG(epbp->timestamp_low);
-			} else {
-				interface_id = epbp->interface_id;
-				hdr->caplen = epbp->caplen;
-				hdr->len = epbp->len;
-				t = ((u_int64_t)epbp->timestamp_high) << 32 |
-				    epbp->timestamp_low;
-			}
-			goto found;
-
-		case BT_SPB:
-			/*
-			 * Get a pointer to the fixed-length portion of the
-			 * SPB.
-			 */
-			spbp = get_from_block_data(&cursor, sizeof(*spbp),
-			    p->errbuf);
-			if (spbp == NULL)
-				return (-1);	/* error */
-
-			/*
-			 * SPB packets are assumed to have arrived on
-			 * the first interface.
-			 */
-			interface_id = 0;
-
-			/*
-			 * Byte-swap it if necessary.
-			 */
-			if (p->swapped) {
-				/* these were written in opposite byte order */
-				hdr->len = SWAPLONG(spbp->len);
-			} else
-				hdr->len = spbp->len;
-
-			/*
-			 * The SPB doesn't give the captured length;
-			 * it's the minimum of the snapshot length
-			 * and the packet length.
-			 */
-			hdr->caplen = hdr->len;
-			if (hdr->caplen > (bpf_u_int32)p->snapshot)
-				hdr->caplen = p->snapshot;
-			t = 0;	/* no time stamps */
-			goto found;
-
-		case BT_PB:
-			/*
-			 * Get a pointer to the fixed-length portion of the
-			 * PB.
-			 */
-			pbp = get_from_block_data(&cursor, sizeof(*pbp),
-			    p->errbuf);
-			if (pbp == NULL)
-				return (-1);	/* error */
-
-			/*
-			 * Byte-swap it if necessary.
-			 */
-			if (p->swapped) {
-				/* these were written in opposite byte order */
-				interface_id = SWAPSHORT(pbp->interface_id);
-				hdr->caplen = SWAPLONG(pbp->caplen);
-				hdr->len = SWAPLONG(pbp->len);
-				t = ((u_int64_t)SWAPLONG(pbp->timestamp_high)) << 32 |
-				    SWAPLONG(pbp->timestamp_low);
-			} else {
-				interface_id = pbp->interface_id;
-				hdr->caplen = pbp->caplen;
-				hdr->len = pbp->len;
-				t = ((u_int64_t)pbp->timestamp_high) << 32 |
-				    pbp->timestamp_low;
-			}
-			goto found;
-
-		case BT_IDB:
-			/*
-			 * Interface Description Block.  Get a pointer
-			 * to its fixed-length portion.
-			 */
-			idbp = get_from_block_data(&cursor, sizeof(*idbp),
-			    p->errbuf);
-			if (idbp == NULL)
-				return (-1);	/* error */
-
-			/*
-			 * Byte-swap it if necessary.
-			 */
-			if (p->swapped) {
-				idbp->linktype = SWAPSHORT(idbp->linktype);
-				idbp->snaplen = SWAPLONG(idbp->snaplen);
-			}
-
-			/*
-			 * If the link-layer type or snapshot length
-			 * differ from the ones for the first IDB we
-			 * saw, quit.
-			 *
-			 * XXX - just discard packets from those
-			 * interfaces?
-			 */
-			if (p->linktype != idbp->linktype) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "an interface has a type %u different from the type of the first interface",
-				    idbp->linktype);
-				return (-1);
-			}
-			if ((bpf_u_int32)p->snapshot != idbp->snaplen) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "an interface has a snapshot length %u different from the type of the first interface",
-				    idbp->snaplen);
-				return (-1);
-			}
-
-			/*
-			 * Try to add this interface.
-			 */
-			if (!add_interface(p, &cursor, p->errbuf))
-				return (-1);
-			break;
-
-		case BT_SHB:
-			/*
-			 * Section Header Block.  Get a pointer
-			 * to its fixed-length portion.
-			 */
-			shbp = get_from_block_data(&cursor, sizeof(*shbp),
-			    p->errbuf);
-			if (shbp == NULL)
-				return (-1);	/* error */
-
-			/*
-			 * Assume the byte order of this section is
-			 * the same as that of the previous section.
-			 * We'll check for that later.
-			 */
-			if (p->swapped) {
-				shbp->byte_order_magic =
-				    SWAPLONG(shbp->byte_order_magic);
-				shbp->major_version =
-				    SWAPSHORT(shbp->major_version);
-			}
-
-			/*
-			 * Make sure the byte order doesn't change;
-			 * pcap_is_swapped() shouldn't change its
-			 * return value in the middle of reading a capture.
-			 */
-			switch (shbp->byte_order_magic) {
-
-			case BYTE_ORDER_MAGIC:
-				/*
-				 * OK.
-				 */
-				break;
-
-			case SWAPLONG(BYTE_ORDER_MAGIC):
-				/*
-				 * Byte order changes.
-				 */
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "the file has sections with different byte orders");
-				return (-1);
-
-			default:
-				/*
-				 * Not a valid SHB.
-				 */
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "the file has a section with a bad byte order magic field");
-				return (-1);
-			}
-
-			/*
-			 * Make sure the major version is the version
-			 * we handle.
-			 */
-			if (shbp->major_version != PCAP_NG_VERSION_MAJOR) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "unknown pcap-ng savefile major version number %u",
-				    shbp->major_version);
-				return (-1);
-			}
-
-			/*
-			 * Reset the interface count; this section should
-			 * have its own set of IDBs.  If any of them
-			 * don't have the same interface type, snapshot
-			 * length, or resolution as the first interface
-			 * we saw, we'll fail.  (And if we don't see
-			 * any IDBs, we'll fail when we see a packet
-			 * block.)
-			 */
-			ps->ifcount = 0;
-			break;
-
-		default:
-			/*
-			 * Not a packet block, IDB, or SHB; ignore it.
-			 */
-			break;
-		}
-	}
-
-found:
-	/*
-	 * Is the interface ID an interface we know?
-	 */
-	if (interface_id >= ps->ifcount) {
-		/*
-		 * Yes.  Fail.
-		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "a packet arrived on interface %u, but there's no Interface Description Block for that interface",
-		    interface_id);
-		return (-1);
-	}
-
-	/*
-	 * Convert the time stamp to seconds and fractions of a second,
-	 * with the fractions being in units of the file-supplied resolution.
-	 */
-	sec = t / ps->ifaces[interface_id].tsresol + ps->ifaces[interface_id].tsoffset;
-	frac = t % ps->ifaces[interface_id].tsresol;
-
-	/*
-	 * Convert the fractions from units of the file-supplied resolution
-	 * to units of the user-requested resolution.
-	 */
-	switch (ps->ifaces[interface_id].scale_type) {
-
-	case PASS_THROUGH:
-		/*
-		 * The interface resolution is what the user wants,
-		 * so we're done.
-		 */
-		break;
-
-	case SCALE_UP_DEC:
-		/*
-		 * The interface resolution is less than what the user
-		 * wants; scale the fractional part up to the units of
-		 * the resolution the user requested by multiplying by
-		 * the quotient of the user-requested resolution and the
-		 * file-supplied resolution.
-		 *
-		 * Those resolutions are both powers of 10, and the user-
-		 * requested resolution is greater than the file-supplied
-		 * resolution, so the quotient in question is an integer.
-		 * We've calculated that quotient already, so we just
-		 * multiply by it.
-		 */
-		frac *= ps->ifaces[interface_id].scale_factor;
-		break;
-
-	case SCALE_UP_BIN:
-		/*
-		 * The interface resolution is less than what the user
-		 * wants; scale the fractional part up to the units of
-		 * the resolution the user requested by multiplying by
-		 * the quotient of the user-requested resolution and the
-		 * file-supplied resolution.
-		 *
-		 * The file-supplied resolution is a power of 2, so the
-		 * quotient is not an integer, so, in order to do this
-		 * entirely with integer arithmetic, we multiply by the
-		 * user-requested resolution and divide by the file-
-		 * supplied resolution.
-		 *
-		 * XXX - Is there something clever we could do here,
-		 * given that we know that the file-supplied resolution
-		 * is a power of 2?  Doing a multiplication followed by
-		 * a division runs the risk of overflowing, and involves
-		 * two non-simple arithmetic operations.
-		 */
-		frac *= ps->user_tsresol;
-		frac /= ps->ifaces[interface_id].tsresol;
-		break;
-
-	case SCALE_DOWN_DEC:
-		/*
-		 * The interface resolution is greater than what the user
-		 * wants; scale the fractional part up to the units of
-		 * the resolution the user requested by multiplying by
-		 * the quotient of the user-requested resolution and the
-		 * file-supplied resolution.
-		 *
-		 * Those resolutions are both powers of 10, and the user-
-		 * requested resolution is less than the file-supplied
-		 * resolution, so the quotient in question isn't an
-		 * integer, but its reciprocal is, and we can just divide
-		 * by the reciprocal of the quotient.  We've calculated
-		 * the reciprocal of that quotient already, so we must
-		 * divide by it.
-		 */
-		frac /= ps->ifaces[interface_id].scale_factor;
-		break;
-
-
-	case SCALE_DOWN_BIN:
-		/*
-		 * The interface resolution is greater than what the user
-		 * wants; convert the fractional part to units of the
-		 * resolution the user requested by multiplying by the
-		 * quotient of the user-requested resolution and the
-		 * file-supplied resolution.  We do that by multiplying
-		 * by the user-requested resolution and dividing by the
-		 * file-supplied resolution, as the quotient might not
-		 * fit in an integer.
-		 *
-		 * The file-supplied resolution is a power of 2, so the
-		 * quotient is not an integer, and neither is its
-		 * reciprocal, so, in order to do this entirely with
-		 * integer arithmetic, we multiply by the user-requested
-		 * resolution and divide by the file-supplied resolution.
-		 *
-		 * XXX - Is there something clever we could do here,
-		 * given that we know that the file-supplied resolution
-		 * is a power of 2?  Doing a multiplication followed by
-		 * a division runs the risk of overflowing, and involves
-		 * two non-simple arithmetic operations.
-		 */
-		frac *= ps->user_tsresol;
-		frac /= ps->ifaces[interface_id].tsresol;
-		break;
-	}
-#ifdef _WIN32
-	/*
-	 * tv_sec and tv_used in the Windows struct timeval are both
-	 * longs.
-	 */
-	hdr->ts.tv_sec = (long)sec;
-	hdr->ts.tv_usec = (long)frac;
-#else
-	/*
-	 * tv_sec in the UN*X struct timeval is a time_t; tv_usec is
-	 * suseconds_t in UN*Xes that work the way the current Single
-	 * UNIX Standard specify - but not all older UN*Xes necessarily
-	 * support that type, so just cast to int.
-	 */
-	hdr->ts.tv_sec = (time_t)sec;
-	hdr->ts.tv_usec = (int)frac;
-#endif
-
-	/*
-	 * Get a pointer to the packet data.
-	 */
-	*data = get_from_block_data(&cursor, hdr->caplen, p->errbuf);
-	if (*data == NULL)
-		return (-1);
-
-	if (p->swapped)
-		swap_pseudo_headers(p->linktype, hdr, *data);
-
-	return (0);
-}

Property changes on: vendor/libpcap/dist/sf-pcap-ng.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/fad-helpers.c
===================================================================
--- vendor/libpcap/dist/fad-helpers.c	(revision 333788)
+++ vendor/libpcap/dist/fad-helpers.c	(nonexistent)
@@ -1,884 +0,0 @@
-/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
-/*
- * Copyright (c) 1994, 1995, 1996, 1997, 1998
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-
-#include <sys/param.h>
-#ifndef MSDOS
-#include <sys/file.h>
-#endif
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-
-struct mbuf;		/* Squelch compiler warnings on some platforms for */
-struct rtentry;		/* declarations in <net/if.h> */
-#include <net/if.h>
-#include <netinet/in.h>
-#endif /* _WIN32 */
-
-#include <ctype.h>
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if !defined(_WIN32) && !defined(__BORLANDC__)
-#include <unistd.h>
-#endif /* !_WIN32 && !__BORLANDC__ */
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#else
-#define INT_MAX		2147483647
-#endif
-
-#include "pcap-int.h"
-
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
-#ifndef _WIN32
-/* Not all systems have IFF_LOOPBACK */
-#ifdef IFF_LOOPBACK
-#define ISLOOPBACK(name, flags) ((flags) & IFF_LOOPBACK)
-#else
-#define ISLOOPBACK(name, flags) ((name)[0] == 'l' && (name)[1] == 'o' && \
-    (isdigit((unsigned char)((name)[2])) || (name)[2] == '\0'))
-#endif
-
-#ifdef IFF_UP
-#define ISUP(flags) ((flags) & IFF_UP)
-#else
-#define ISUP(flags) 0
-#endif
-
-#ifdef IFF_RUNNING
-#define ISRUNNING(flags) ((flags) & IFF_RUNNING)
-#else
-#define ISRUNNING(flags) 0
-#endif
-
-/*
- * Map UN*X-style interface flags to libpcap flags.
- */
-bpf_u_int32
-if_flags_to_pcap_flags(const char *name _U_, u_int if_flags)
-{
-	bpf_u_int32 pcap_flags;
-
-	pcap_flags = 0;
-	if (ISLOOPBACK(name, if_flags))
-		pcap_flags |= PCAP_IF_LOOPBACK;
-	if (ISUP(if_flags))
-		pcap_flags |= PCAP_IF_UP;
-	if (ISRUNNING(if_flags))
-		pcap_flags |= PCAP_IF_RUNNING;
-	return (pcap_flags);
-}
-#endif
-
-static struct sockaddr *
-dup_sockaddr(struct sockaddr *sa, size_t sa_length)
-{
-	struct sockaddr *newsa;
-
-	if ((newsa = malloc(sa_length)) == NULL)
-		return (NULL);
-	return (memcpy(newsa, sa, sa_length));
-}
-
-/*
- * Construct a "figure of merit" for an interface, for use when sorting
- * the list of interfaces, in which interfaces that are up are superior
- * to interfaces that aren't up, interfaces that are up and running are
- * superior to interfaces that are up but not running, and non-loopback
- * interfaces that are up and running are superior to loopback interfaces,
- * and interfaces with the same flags have a figure of merit that's higher
- * the lower the instance number.
- *
- * The goal is to try to put the interfaces most likely to be useful for
- * capture at the beginning of the list.
- *
- * The figure of merit, which is lower the "better" the interface is,
- * has the uppermost bit set if the interface isn't running, the bit
- * below that set if the interface isn't up, the bit below that set
- * if the interface is a loopback interface, and the interface index
- * in the 29 bits below that.  (Yes, we assume u_int is 32 bits.)
- */
-static u_int
-get_figure_of_merit(pcap_if_t *dev)
-{
-	const char *cp;
-	u_int n;
-
-	if (strcmp(dev->name, "any") == 0) {
-		/*
-		 * Give the "any" device an artificially high instance
-		 * number, so it shows up after all other non-loopback
-		 * interfaces.
-		 */
-		n = 0x1FFFFFFF;	/* 29 all-1 bits */
-	} else {
-		/*
-		 * A number at the end of the device name string is
-		 * assumed to be a unit number.
-		 */
-		cp = dev->name + strlen(dev->name) - 1;
-		while (cp-1 >= dev->name && *(cp-1) >= '0' && *(cp-1) <= '9')
-			cp--;
-		if (*cp >= '0' && *cp <= '9')
-			n = atoi(cp);
-		else
-			n = 0;
-	}
-	if (!(dev->flags & PCAP_IF_RUNNING))
-		n |= 0x80000000;
-	if (!(dev->flags & PCAP_IF_UP))
-		n |= 0x40000000;
-	if (dev->flags & PCAP_IF_LOOPBACK)
-		n |= 0x20000000;
-	return (n);
-}
-
-/*
- * Try to get a description for a given device.
- * Returns a mallocated description if it could and NULL if it couldn't.
- *
- * XXX - on FreeBSDs that support it, should it get the sysctl named
- * "dev.{adapter family name}.{adapter unit}.%desc" to get a description
- * of the adapter?  Note that "dev.an.0.%desc" is "Aironet PC4500/PC4800"
- * with my Cisco 350 card, so the name isn't entirely descriptive.  The
- * "dev.an.0.%pnpinfo" has a better description, although one might argue
- * that the problem is really a driver bug - if it can find out that it's
- * a Cisco 340 or 350, rather than an old Aironet card, it should use
- * that in the description.
- *
- * Do NetBSD, DragonflyBSD, or OpenBSD support this as well?  FreeBSD
- * and OpenBSD let you get a description, but it's not generated by the OS,
- * it's set with another ioctl that ifconfig supports; we use that to get
- * a description in FreeBSD and OpenBSD, but if there is no such
- * description available, it still might be nice to get some description
- * string based on the device type or something such as that.
- *
- * In OS X, the System Configuration framework can apparently return
- * names in 10.4 and later.
- *
- * It also appears that freedesktop.org's HAL offers an "info.product"
- * string, but the HAL specification says it "should not be used in any
- * UI" and "subsystem/capability specific properties" should be used
- * instead and, in any case, I think HAL is being deprecated in
- * favor of other stuff such as DeviceKit.  DeviceKit doesn't appear
- * to have any obvious product information for devices, but maybe
- * I haven't looked hard enough.
- *
- * Using the System Configuration framework, or HAL, or DeviceKit, or
- * whatever, would require that libpcap applications be linked with
- * the frameworks/libraries in question.  That shouldn't be a problem
- * for programs linking with the shared version of libpcap (unless
- * you're running on AIX - which I think is the only UN*X that doesn't
- * support linking a shared library with other libraries on which it
- * depends, and having an executable linked only with the first shared
- * library automatically pick up the other libraries when started -
- * and using HAL or whatever).  Programs linked with the static
- * version of libpcap would have to use pcap-config with the --static
- * flag in order to get the right linker flags in order to pick up
- * the additional libraries/frameworks; those programs need that anyway
- * for libpcap 1.1 and beyond on Linux, as, by default, it requires
- * -lnl.
- *
- * Do any other UN*Xes, or desktop environments support getting a
- * description?
- */
-static char *
-get_if_description(const char *name)
-{
-#ifdef SIOCGIFDESCR
-	char *description = NULL;
-	int s;
-	struct ifreq ifrdesc;
-#ifndef IFDESCRSIZE
-	size_t descrlen = 64;
-#else
-	size_t descrlen = IFDESCRSIZE;
-#endif /* IFDESCRSIZE */
-
-	/*
-	 * Get the description for the interface.
-	 */
-	memset(&ifrdesc, 0, sizeof ifrdesc);
-	strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s >= 0) {
-#ifdef __FreeBSD__
-		/*
-		 * On FreeBSD, if the buffer isn't big enough for the
-		 * description, the ioctl succeeds, but the description
-		 * isn't copied, ifr_buffer.length is set to the description
-		 * length, and ifr_buffer.buffer is set to NULL.
-		 */
-		for (;;) {
-			free(description);
-			if ((description = malloc(descrlen)) != NULL) {
-				ifrdesc.ifr_buffer.buffer = description;
-				ifrdesc.ifr_buffer.length = descrlen;
-				if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0) {
-					if (ifrdesc.ifr_buffer.buffer ==
-					    description)
-						break;
-					else
-						descrlen = ifrdesc.ifr_buffer.length;
-				} else {
-					/*
-					 * Failed to get interface description.
-					 */
-					free(description);
-					description = NULL;
-					break;
-				}
-			} else
-				break;
-		}
-#else /* __FreeBSD__ */
-		/*
-		 * The only other OS that currently supports
-		 * SIOCGIFDESCR is OpenBSD, and it has no way
-		 * to get the description length - it's clamped
-		 * to a maximum of IFDESCRSIZE.
-		 */
-		if ((description = malloc(descrlen)) != NULL) {
-			ifrdesc.ifr_data = (caddr_t)description;
-			if (ioctl(s, SIOCGIFDESCR, &ifrdesc) != 0) {
-				/*
-				 * Failed to get interface description.
-				 */
-				free(description);
-				description = NULL;
-			}
-		}
-#endif /* __FreeBSD__ */
-		close(s);
-		if (description != NULL && strlen(description) == 0) {
-			/*
-			 * Description is empty, so discard it.
-			 */
-			free(description);
-			description = NULL;
-		}
-	}
-
-#ifdef __FreeBSD__
-	/*
-	 * For FreeBSD, if we didn't get a description, and this is
-	 * a device with a name of the form usbusN, label it as a USB
-	 * bus.
-	 */
-	if (description == NULL) {
-		if (strncmp(name, "usbus", 5) == 0) {
-			/*
-			 * OK, it begins with "usbus".
-			 */
-			long busnum;
-			char *p;
-
-			errno = 0;
-			busnum = strtol(name + 5, &p, 10);
-			if (errno == 0 && p != name + 5 && *p == '\0' &&
-			    busnum >= 0 && busnum <= INT_MAX) {
-				/*
-				 * OK, it's a valid number that's not
-				 * bigger than INT_MAX.  Construct
-				 * a description from it.
-				 */
-				static const char descr_prefix[] = "USB bus number ";
-				size_t descr_size;
-
-				/*
-				 * Allow enough room for a 32-bit bus number.
-				 * sizeof (descr_prefix) includes the
-				 * terminating NUL.
-				 */
-				descr_size = sizeof (descr_prefix) + 10;
-				description = malloc(descr_size);
-				if (description != NULL) {
-					pcap_snprintf(description, descr_size,
-					    "%s%ld", descr_prefix, busnum);
-				}
-			}
-		}
-	}
-#endif
-	return (description);
-#else /* SIOCGIFDESCR */
-	return (NULL);
-#endif /* SIOCGIFDESCR */
-}
-
-/*
- * Look for a given device in the specified list of devices.
- *
- * If we find it, return 0 and set *curdev_ret to point to it.
- *
- * If we don't find it, check whether we can open it:
- *
- *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
- *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
- *     it, as that probably means it exists but doesn't support
- *     packet capture.
- *
- *     Otherwise, attempt to add an entry for it, with the specified
- *     ifnet flags and description, and, if that succeeds, return 0
- *     and set *curdev_ret to point to the new entry, otherwise
- *     return PCAP_ERROR and set errbuf to an error message.  If we
- *     weren't given a description, try to get one.
- */
-int
-add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
-    bpf_u_int32 flags, const char *description, char *errbuf)
-{
-	pcap_t *p;
-	pcap_if_t *curdev, *prevdev, *nextdev;
-	u_int this_figure_of_merit, nextdev_figure_of_merit;
-	char open_errbuf[PCAP_ERRBUF_SIZE];
-	int ret;
-
-	/*
-	 * Is there already an entry in the list for this interface?
-	 */
-	for (curdev = *alldevs; curdev != NULL; curdev = curdev->next) {
-		if (strcmp(name, curdev->name) == 0)
-			break;	/* yes, we found it */
-	}
-
-	if (curdev == NULL) {
-		/*
-		 * No, we didn't find it.
-		 *
-		 * Can we open this interface for live capture?
-		 *
-		 * We do this check so that interfaces that are
-		 * supplied by the interface enumeration mechanism
-		 * we're using but that don't support packet capture
-		 * aren't included in the list.  Loopback interfaces
-		 * on Solaris are an example of this; we don't just
-		 * omit loopback interfaces on all platforms because
-		 * you *can* capture on loopback interfaces on some
-		 * OSes.
-		 *
-		 * On OS X, we don't do this check if the device
-		 * name begins with "wlt"; at least some versions
-		 * of OS X offer monitor mode capturing by having
-		 * a separate "monitor mode" device for each wireless
-		 * adapter, rather than by implementing the ioctls
-		 * that {Free,Net,Open,DragonFly}BSD provide.
-		 * Opening that device puts the adapter into monitor
-		 * mode, which, at least for some adapters, causes
-		 * them to deassociate from the network with which
-		 * they're associated.
-		 *
-		 * Instead, we try to open the corresponding "en"
-		 * device (so that we don't end up with, for users
-		 * without sufficient privilege to open capture
-		 * devices, a list of adapters that only includes
-		 * the wlt devices).
-		 */
-#ifdef __APPLE__
-		if (strncmp(name, "wlt", 3) == 0) {
-			char *en_name;
-			size_t en_name_len;
-
-			/*
-			 * Try to allocate a buffer for the "en"
-			 * device's name.
-			 */
-			en_name_len = strlen(name) - 1;
-			en_name = malloc(en_name_len + 1);
-			if (en_name == NULL) {
-				(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "malloc: %s", pcap_strerror(errno));
-				return (-1);
-			}
-			strcpy(en_name, "en");
-			strcat(en_name, name + 3);
-			p = pcap_create(en_name, open_errbuf);
-			free(en_name);
-		} else
-#endif /* __APPLE */
-		p = pcap_create(name, open_errbuf);
-		if (p == NULL) {
-			/*
-			 * The attempt to create the pcap_t failed;
-			 * that's probably an indication that we're
-			 * out of memory.
-			 *
-			 * Don't bother including this interface,
-			 * but don't treat it as an error.
-			 */
-			*curdev_ret = NULL;
-			return (0);
-		}
-		/* Small snaplen, so we don't try to allocate much memory. */
-		pcap_set_snaplen(p, 68);
-		ret = pcap_activate(p);
-		pcap_close(p);
-		switch (ret) {
-
-		case PCAP_ERROR_NO_SUCH_DEVICE:
-		case PCAP_ERROR_IFACE_NOT_UP:
-			/*
-			 * We expect these two errors - they're the
-			 * reason we try to open the device.
-			 *
-			 * PCAP_ERROR_NO_SUCH_DEVICE typically means
-			 * "there's no such device *known to the
-			 * OS's capture mechanism*", so, even though
-			 * it might be a valid network interface, you
-			 * can't capture on it (e.g., the loopback
-			 * device in Solaris up to Solaris 10, or
-			 * the vmnet devices in OS X with VMware
-			 * Fusion).  We don't include those devices
-			 * in our list of devices, as there's no
-			 * point in doing so - they're not available
-			 * for capture.
-			 *
-			 * PCAP_ERROR_IFACE_NOT_UP means that the
-			 * OS's capture mechanism doesn't work on
-			 * interfaces not marked as up; some capture
-			 * mechanisms *do* support that, so we no
-			 * longer reject those interfaces out of hand,
-			 * but we *do* want to reject them if they
-			 * can't be opened for capture.
-			 */
-			*curdev_ret = NULL;
-			return (0);
-		}
-
-		/*
-		 * Yes, we can open it, or we can't, for some other
-		 * reason.
-		 *
-		 * If we can open it, we want to offer it for
-		 * capture, as you can capture on it.  If we can't,
-		 * we want to offer it for capture, so that, if
-		 * the user tries to capture on it, they'll get
-		 * an error and they'll know why they can't
-		 * capture on it (e.g., insufficient permissions)
-		 * or they'll report it as a problem (and then
-		 * have the error message to provide as information).
-		 *
-		 * Allocate a new entry.
-		 */
-		curdev = malloc(sizeof(pcap_if_t));
-		if (curdev == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			return (-1);
-		}
-
-		/*
-		 * Fill in the entry.
-		 */
-		curdev->next = NULL;
-		curdev->name = strdup(name);
-		if (curdev->name == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			free(curdev);
-			return (-1);
-		}
-		if (description == NULL) {
-			/*
-			 * We weren't handed a description for the
-			 * interface, so see if we can generate one
-			 * ourselves.
-			 */
-			curdev->description = get_if_description(name);
-		} else {
-			/*
-			 * We were handed a description; make a copy.
-			 */
-			curdev->description = strdup(description);
-			if (curdev->description == NULL) {
-				(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "malloc: %s", pcap_strerror(errno));
-				free(curdev->name);
-				free(curdev);
-				return (-1);
-			}
-		}
-		curdev->addresses = NULL;	/* list starts out as empty */
-		curdev->flags = flags;
-
-		/*
-		 * Add it to the list, in the appropriate location.
-		 * First, get the "figure of merit" for this
-		 * interface.
-		 */
-		this_figure_of_merit = get_figure_of_merit(curdev);
-
-		/*
-		 * Now look for the last interface with an figure of merit
-		 * less than or equal to the new interface's figure of
-		 * merit.
-		 *
-		 * We start with "prevdev" being NULL, meaning we're before
-		 * the first element in the list.
-		 */
-		prevdev = NULL;
-		for (;;) {
-			/*
-			 * Get the interface after this one.
-			 */
-			if (prevdev == NULL) {
-				/*
-				 * The next element is the first element.
-				 */
-				nextdev = *alldevs;
-			} else
-				nextdev = prevdev->next;
-
-			/*
-			 * Are we at the end of the list?
-			 */
-			if (nextdev == NULL) {
-				/*
-				 * Yes - we have to put the new entry
-				 * after "prevdev".
-				 */
-				break;
-			}
-
-			/*
-			 * Is the new interface's figure of merit less
-			 * than the next interface's figure of merit,
-			 * meaning that the new interface is better
-			 * than the next interface?
-			 */
-			nextdev_figure_of_merit = get_figure_of_merit(nextdev);
-			if (this_figure_of_merit < nextdev_figure_of_merit) {
-				/*
-				 * Yes - we should put the new entry
-				 * before "nextdev", i.e. after "prevdev".
-				 */
-				break;
-			}
-
-			prevdev = nextdev;
-		}
-
-		/*
-		 * Insert before "nextdev".
-		 */
-		curdev->next = nextdev;
-
-		/*
-		 * Insert after "prevdev" - unless "prevdev" is null,
-		 * in which case this is the first interface.
-		 */
-		if (prevdev == NULL) {
-			/*
-			 * This is the first interface.  Pass back a
-			 * pointer to it, and put "curdev" before
-			 * "nextdev".
-			 */
-			*alldevs = curdev;
-		} else
-			prevdev->next = curdev;
-	}
-
-	*curdev_ret = curdev;
-	return (0);
-}
-
-/*
- * Try to get a description for a given device, and then look for that
- * device in the specified list of devices.
- *
- * If we find it, then, if the specified address isn't null, add it to
- * the list of addresses for the device and return 0.
- *
- * If we don't find it, check whether we can open it:
- *
- *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
- *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
- *     it, as that probably means it exists but doesn't support
- *     packet capture.
- *
- *     Otherwise, attempt to add an entry for it, with the specified
- *     ifnet flags, and, if that succeeds, add the specified address
- *     to its list of addresses if that address is non-null, set
- *     *curdev_ret to point to the new entry, and return 0, otherwise
- *     return PCAP_ERROR and set errbuf to an error message.
- *
- * (We can get called with a null address because we might get a list
- * of interface name/address combinations from the underlying OS, with
- * the address being absent in some cases, rather than a list of
- * interfaces with each interface having a list of addresses, so this
- * call may be the only call made to add to the list, and we want to
- * add interfaces even if they have no addresses.)
- */
-int
-add_addr_to_iflist(pcap_if_t **alldevs, const char *name, bpf_u_int32 flags,
-    struct sockaddr *addr, size_t addr_size,
-    struct sockaddr *netmask, size_t netmask_size,
-    struct sockaddr *broadaddr, size_t broadaddr_size,
-    struct sockaddr *dstaddr, size_t dstaddr_size,
-    char *errbuf)
-{
-	pcap_if_t *curdev;
-
-	if (add_or_find_if(&curdev, alldevs, name, flags, NULL, errbuf) == -1) {
-		/*
-		 * Error - give up.
-		 */
-		return (-1);
-	}
-	if (curdev == NULL) {
-		/*
-		 * Device wasn't added because it can't be opened.
-		 * Not a fatal error.
-		 */
-		return (0);
-	}
-
-	if (addr == NULL) {
-		/*
-		 * There's no address to add; this entry just meant
-		 * "here's a new interface".
-		 */
-		return (0);
-	}
-
-	/*
-	 * "curdev" is an entry for this interface, and we have an
-	 * address for it; add an entry for that address to the
-	 * interface's list of addresses.
-	 *
-	 * Allocate the new entry and fill it in.
-	 */
-	return (add_addr_to_dev(curdev, addr, addr_size, netmask,
-	    netmask_size, broadaddr, broadaddr_size, dstaddr,
-	    dstaddr_size, errbuf));
-}
-
-/*
- * Add an entry to the list of addresses for an interface.
- * "curdev" is the entry for that interface.
- * If this is the first IP address added to the interface, move it
- * in the list as appropriate.
- */
-int
-add_addr_to_dev(pcap_if_t *curdev,
-    struct sockaddr *addr, size_t addr_size,
-    struct sockaddr *netmask, size_t netmask_size,
-    struct sockaddr *broadaddr, size_t broadaddr_size,
-    struct sockaddr *dstaddr, size_t dstaddr_size,
-    char *errbuf)
-{
-	pcap_addr_t *curaddr, *prevaddr, *nextaddr;
-
-	curaddr = malloc(sizeof(pcap_addr_t));
-	if (curaddr == NULL) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "malloc: %s", pcap_strerror(errno));
-		return (-1);
-	}
-
-	curaddr->next = NULL;
-	if (addr != NULL) {
-		curaddr->addr = dup_sockaddr(addr, addr_size);
-		if (curaddr->addr == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			free(curaddr);
-			return (-1);
-		}
-	} else
-		curaddr->addr = NULL;
-
-	if (netmask != NULL) {
-		curaddr->netmask = dup_sockaddr(netmask, netmask_size);
-		if (curaddr->netmask == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			if (curaddr->addr != NULL)
-				free(curaddr->addr);
-			free(curaddr);
-			return (-1);
-		}
-	} else
-		curaddr->netmask = NULL;
-
-	if (broadaddr != NULL) {
-		curaddr->broadaddr = dup_sockaddr(broadaddr, broadaddr_size);
-		if (curaddr->broadaddr == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			if (curaddr->netmask != NULL)
-				free(curaddr->netmask);
-			if (curaddr->addr != NULL)
-				free(curaddr->addr);
-			free(curaddr);
-			return (-1);
-		}
-	} else
-		curaddr->broadaddr = NULL;
-
-	if (dstaddr != NULL) {
-		curaddr->dstaddr = dup_sockaddr(dstaddr, dstaddr_size);
-		if (curaddr->dstaddr == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
-			if (curaddr->broadaddr != NULL)
-				free(curaddr->broadaddr);
-			if (curaddr->netmask != NULL)
-				free(curaddr->netmask);
-			if (curaddr->addr != NULL)
-				free(curaddr->addr);
-			free(curaddr);
-			return (-1);
-		}
-	} else
-		curaddr->dstaddr = NULL;
-
-	/*
-	 * Find the end of the list of addresses.
-	 */
-	for (prevaddr = curdev->addresses; prevaddr != NULL; prevaddr = nextaddr) {
-		nextaddr = prevaddr->next;
-		if (nextaddr == NULL) {
-			/*
-			 * This is the end of the list.
-			 */
-			break;
-		}
-	}
-
-	if (prevaddr == NULL) {
-		/*
-		 * The list was empty; this is the first member.
-		 */
-		curdev->addresses = curaddr;
-	} else {
-		/*
-		 * "prevaddr" is the last member of the list; append
-		 * this member to it.
-		 */
-		prevaddr->next = curaddr;
-	}
-
-	return (0);
-}
-
-/*
- * Look for a given device in the specified list of devices.
- *
- * If we find it, return 0.
- *
- * If we don't find it, check whether we can open it:
- *
- *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
- *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
- *     it, as that probably means it exists but doesn't support
- *     packet capture.
- *
- *     Otherwise, attempt to add an entry for it, with the specified
- *     ifnet flags and description, and, if that succeeds, return 0
- *     and set *curdev_ret to point to the new entry, otherwise
- *     return PCAP_ERROR and set errbuf to an error message.
- */
-int
-pcap_add_if(pcap_if_t **devlist, const char *name, u_int flags,
-    const char *description, char *errbuf)
-{
-	pcap_if_t *curdev;
-
-	return (add_or_find_if(&curdev, devlist, name, flags, description,
-	    errbuf));
-}
-
-
-/*
- * Free a list of interfaces.
- */
-void
-pcap_freealldevs(pcap_if_t *alldevs)
-{
-	pcap_if_t *curdev, *nextdev;
-	pcap_addr_t *curaddr, *nextaddr;
-
-	for (curdev = alldevs; curdev != NULL; curdev = nextdev) {
-		nextdev = curdev->next;
-
-		/*
-		 * Free all addresses.
-		 */
-		for (curaddr = curdev->addresses; curaddr != NULL; curaddr = nextaddr) {
-			nextaddr = curaddr->next;
-			if (curaddr->addr)
-				free(curaddr->addr);
-			if (curaddr->netmask)
-				free(curaddr->netmask);
-			if (curaddr->broadaddr)
-				free(curaddr->broadaddr);
-			if (curaddr->dstaddr)
-				free(curaddr->dstaddr);
-			free(curaddr);
-		}
-
-		/*
-		 * Free the name string.
-		 */
-		free(curdev->name);
-
-		/*
-		 * Free the description string, if any.
-		 */
-		if (curdev->description != NULL)
-			free(curdev->description);
-
-		/*
-		 * Free the interface.
-		 */
-		free(curdev);
-	}
-}

Property changes on: vendor/libpcap/dist/fad-helpers.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-win32.c
===================================================================
--- vendor/libpcap/dist/pcap-win32.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-win32.c	(nonexistent)
@@ -1,1548 +0,0 @@
-/*
- * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy)
- * Copyright (c) 2005 - 2010 CACE Technologies, Davis (California)
- * All rights reserved.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino, CACE Technologies
- * nor the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#define PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include <Packet32.h>
-#include <pcap-int.h>
-#include <pcap/dlt.h>
-#ifdef __MINGW32__
-#ifdef __MINGW64__
-#include <ntddndis.h>
-#else  /*__MINGW64__*/
-#include <ddk/ntddndis.h>
-#include <ddk/ndis.h>
-#endif /*__MINGW64__*/
-#else /*__MINGW32__*/
-#include <ntddndis.h>
-#endif /*__MINGW32__*/
-#ifdef HAVE_DAG_API
-#include <dagnew.h>
-#include <dagapi.h>
-#endif /* HAVE_DAG_API */
-#ifdef __MINGW32__
-int* _errno();
-#define errno (*_errno())
-#endif /* __MINGW32__ */
-#ifdef HAVE_REMOTE
-#include "pcap-rpcap.h"
-#endif /* HAVE_REMOTE */
-
-static int pcap_setfilter_win32_npf(pcap_t *, struct bpf_program *);
-static int pcap_setfilter_win32_dag(pcap_t *, struct bpf_program *);
-static int pcap_getnonblock_win32(pcap_t *, char *);
-static int pcap_setnonblock_win32(pcap_t *, int, char *);
-
-/*dimension of the buffer in the pcap_t structure*/
-#define	WIN32_DEFAULT_USER_BUFFER_SIZE 256000
-
-/*dimension of the buffer in the kernel driver NPF */
-#define	WIN32_DEFAULT_KERNEL_BUFFER_SIZE 1000000
-
-/* Equivalent to ntohs(), but a lot faster under Windows */
-#define SWAPS(_X) ((_X & 0xff) << 8) | (_X >> 8)
-
-/*
- * Private data for capturing on WinPcap devices.
- */
-struct pcap_win {
-	int nonblock;
-	int rfmon_selfstart;		/* a flag tells whether the monitor mode is set by itself */
-	int filtering_in_kernel;	/* using kernel filter */
-
-#ifdef HAVE_DAG_API
-	int	dag_fcs_bits;		/* Number of checksum bits from link layer */
-#endif
-};
-
-BOOL WINAPI DllMain(
-  HANDLE hinstDLL,
-  DWORD dwReason,
-  LPVOID lpvReserved
-)
-{
-	return (TRUE);
-}
-
-/*
- * Define stub versions of the monitor-mode support routines if this
- * isn't Npcap. HAVE_NPCAP_PACKET_API is defined by Npcap but not
- * WinPcap.
- */
-#ifndef HAVE_NPCAP_PACKET_API
-static int
-PacketIsMonitorModeSupported(PCHAR AdapterName _U_)
-{
-	/*
-	 * We don't support monitor mode.
-	 */
-	return (0);
-}
-
-static int
-PacketSetMonitorMode(PCHAR AdapterName _U_, int mode _U_)
-{
-	/*
-	 * This should never be called, as PacketIsMonitorModeSupported()
-	 * will return 0, meaning "we don't support monitor mode, so
-	 * don't try to turn it on or off".
-	 */
-	return (0);
-}
-
-static int
-PacketGetMonitorMode(PCHAR AdapterName _U_)
-{
-	/*
-	 * This should fail, so that pcap_activate_win32() returns
-	 * PCAP_ERROR_RFMON_NOTSUP if our caller requested monitor
-	 * mode.
-	 */
-	return (-1);
-}
-#endif
-
-/* Start winsock */
-int
-wsockinit(void)
-{
-	WORD wVersionRequested;
-	WSADATA wsaData;
-	static int err = -1;
-	static int done = 0;
-
-	if (done)
-		return (err);
-
-	wVersionRequested = MAKEWORD( 1, 1);
-	err = WSAStartup( wVersionRequested, &wsaData );
-	atexit ((void(*)(void))WSACleanup);
-	done = 1;
-
-	if ( err != 0 )
-		err = -1;
-	return (err);
-}
-
-int
-pcap_wsockinit(void)
-{
-       return (wsockinit());
-}
-
-static int
-pcap_stats_win32(pcap_t *p, struct pcap_stat *ps)
-{
-	struct bpf_stat bstats;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-	/*
-	 * Try to get statistics.
-	 *
-	 * (Please note - "struct pcap_stat" is *not* the same as
-	 * WinPcap's "struct bpf_stat". It might currently have the
-	 * same layout, but let's not cheat.
-	 *
-	 * Note also that we don't fill in ps_capt, as we might have
-	 * been called by code compiled against an earlier version of
-	 * WinPcap that didn't have ps_capt, in which case filling it
-	 * in would stomp on whatever comes after the structure passed
-	 * to us.
-	 */
-	if (!PacketGetStats(p->adapter, &bstats)) {
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "PacketGetStats error: %s", errbuf);
-		return (-1);
-	}
-	ps->ps_recv = bstats.bs_recv;
-	ps->ps_drop = bstats.bs_drop;
-
-	/*
-	 * XXX - PacketGetStats() doesn't fill this in, so we just
-	 * return 0.
-	 */
-#if 0
-	ps->ps_ifdrop = bstats.ps_ifdrop;
-#else
-	ps->ps_ifdrop = 0;
-#endif
-
-	return (0);
-}
-
-/*
- * Win32-only routine for getting statistics.
- *
- * This way is definitely safer than passing the pcap_stat * from the userland.
- * In fact, there could happen than the user allocates a variable which is not
- * big enough for the new structure, and the library will write in a zone
- * which is not allocated to this variable.
- *
- * In this way, we're pretty sure we are writing on memory allocated to this
- * variable.
- *
- * XXX - but this is the wrong way to handle statistics.  Instead, we should
- * have an API that returns data in a form like the Options section of a
- * pcapng Interface Statistics Block:
- *
- *    http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=https://raw.githubusercontent.com/pcapng/pcapng/master/draft-tuexen-opsawg-pcapng.xml&modeAsFormat=html/ascii&type=ascii#rfc.section.4.6
- *
- * which would let us add new statistics straightforwardly and indicate which
- * statistics we are and are *not* providing, rather than having to provide
- * possibly-bogus values for statistics we can't provide.
- */
-struct pcap_stat *
-pcap_stats_ex_win32(pcap_t *p, int *pcap_stat_size)
-{
-	struct bpf_stat bstats;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-	*pcap_stat_size = sizeof (p->stat);
-
-	/*
-	 * Try to get statistics.
-	 *
-	 * (Please note - "struct pcap_stat" is *not* the same as
-	 * WinPcap's "struct bpf_stat". It might currently have the
-	 * same layout, but let's not cheat.)
-	 */
-	if (!PacketGetStatsEx(p->adapter, &bstats)) {
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "PacketGetStatsEx error: %s", errbuf);
-		return (NULL);
-	}
-	p->stat.ps_recv = bstats.bs_recv;
-	p->stat.ps_drop = bstats.bs_drop;
-	p->stat.ps_ifdrop = bstats.ps_ifdrop;
-#ifdef HAVE_REMOTE
-	p->stat.ps_capt = bstats.bs_capt;
-#endif
-	return (&p->stat);
-}
-
-/* Set the dimension of the kernel-level capture buffer */
-static int
-pcap_setbuff_win32(pcap_t *p, int dim)
-{
-	if(PacketSetBuff(p->adapter,dim)==FALSE)
-	{
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: not enough memory to allocate the kernel buffer");
-		return (-1);
-	}
-	return (0);
-}
-
-/* Set the driver working mode */
-static int
-pcap_setmode_win32(pcap_t *p, int mode)
-{
-	if(PacketSetMode(p->adapter,mode)==FALSE)
-	{
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: working mode not recognized");
-		return (-1);
-	}
-
-	return (0);
-}
-
-/*set the minimum amount of data that will release a read call*/
-static int
-pcap_setmintocopy_win32(pcap_t *p, int size)
-{
-	if(PacketSetMinToCopy(p->adapter, size)==FALSE)
-	{
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: unable to set the requested mintocopy size");
-		return (-1);
-	}
-	return (0);
-}
-
-static HANDLE
-pcap_getevent_win32(pcap_t *p)
-{
-	return (PacketGetReadEvent(p->adapter));
-}
-
-static int
-pcap_oid_get_request_win32(pcap_t *p, bpf_u_int32 oid, void *data, size_t *lenp)
-{
-	PACKET_OID_DATA *oid_data_arg;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-	/*
-	 * Allocate a PACKET_OID_DATA structure to hand to PacketRequest().
-	 * It should be big enough to hold "*lenp" bytes of data; it
-	 * will actually be slightly larger, as PACKET_OID_DATA has a
-	 * 1-byte data array at the end, standing in for the variable-length
-	 * data that's actually there.
-	 */
-	oid_data_arg = malloc(sizeof (PACKET_OID_DATA) + *lenp);
-	if (oid_data_arg == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Couldn't allocate argument buffer for PacketRequest");
-		return (PCAP_ERROR);
-	}
-
-	/*
-	 * No need to copy the data - we're doing a fetch.
-	 */
-	oid_data_arg->Oid = oid;
-	oid_data_arg->Length = (ULONG)(*lenp);	/* XXX - check for ridiculously large value? */
-	if (!PacketRequest(p->adapter, FALSE, oid_data_arg)) {
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error calling PacketRequest: %s", errbuf);
-		free(oid_data_arg);
-		return (PCAP_ERROR);
-	}
-
-	/*
-	 * Get the length actually supplied.
-	 */
-	*lenp = oid_data_arg->Length;
-
-	/*
-	 * Copy back the data we fetched.
-	 */
-	memcpy(data, oid_data_arg->Data, *lenp);
-	free(oid_data_arg);
-	return (0);
-}
-
-static int
-pcap_oid_set_request_win32(pcap_t *p, bpf_u_int32 oid, const void *data,
-    size_t *lenp)
-{
-	PACKET_OID_DATA *oid_data_arg;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-	/*
-	 * Allocate a PACKET_OID_DATA structure to hand to PacketRequest().
-	 * It should be big enough to hold "*lenp" bytes of data; it
-	 * will actually be slightly larger, as PACKET_OID_DATA has a
-	 * 1-byte data array at the end, standing in for the variable-length
-	 * data that's actually there.
-	 */
-	oid_data_arg = malloc(sizeof (PACKET_OID_DATA) + *lenp);
-	if (oid_data_arg == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Couldn't allocate argument buffer for PacketRequest");
-		return (PCAP_ERROR);
-	}
-
-	oid_data_arg->Oid = oid;
-	oid_data_arg->Length = (ULONG)(*lenp);	/* XXX - check for ridiculously large value? */
-	memcpy(oid_data_arg->Data, data, *lenp);
-	if (!PacketRequest(p->adapter, TRUE, oid_data_arg)) {
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error calling PacketRequest: %s", errbuf);
-		free(oid_data_arg);
-		return (PCAP_ERROR);
-	}
-
-	/*
-	 * Get the length actually copied.
-	 */
-	*lenp = oid_data_arg->Length;
-
-	/*
-	 * No need to copy the data - we're doing a set.
-	 */
-	free(oid_data_arg);
-	return (0);
-}
-
-static u_int
-pcap_sendqueue_transmit_win32(pcap_t *p, pcap_send_queue *queue, int sync)
-{
-	u_int res;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-	if (p->adapter==NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Cannot transmit a queue to an offline capture or to a TurboCap port");
-		return (0);
-	}
-
-	res = PacketSendPackets(p->adapter,
-		queue->buffer,
-		queue->len,
-		(BOOLEAN)sync);
-
-	if(res != queue->len){
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error opening adapter: %s", errbuf);
-	}
-
-	return (res);
-}
-
-static int
-pcap_setuserbuffer_win32(pcap_t *p, int size)
-{
-	unsigned char *new_buff;
-
-	if (size<=0) {
-		/* Bogus parameter */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error: invalid size %d",size);
-		return (-1);
-	}
-
-	/* Allocate the buffer */
-	new_buff=(unsigned char*)malloc(sizeof(char)*size);
-
-	if (!new_buff) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error: not enough memory");
-		return (-1);
-	}
-
-	free(p->buffer);
-
-	p->buffer=new_buff;
-	p->bufsize=size;
-
-	return (0);
-}
-
-static int
-pcap_live_dump_win32(pcap_t *p, char *filename, int maxsize, int maxpacks)
-{
-	BOOLEAN res;
-
-	/* Set the packet driver in dump mode */
-	res = PacketSetMode(p->adapter, PACKET_MODE_DUMP);
-	if(res == FALSE){
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error setting dump mode");
-		return (-1);
-	}
-
-	/* Set the name of the dump file */
-	res = PacketSetDumpName(p->adapter, filename, (int)strlen(filename));
-	if(res == FALSE){
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error setting kernel dump file name");
-		return (-1);
-	}
-
-	/* Set the limits of the dump file */
-	res = PacketSetDumpLimits(p->adapter, maxsize, maxpacks);
-
-	return (0);
-}
-
-static int
-pcap_live_dump_ended_win32(pcap_t *p, int sync)
-{
-	return (PacketIsDumpEnded(p->adapter, (BOOLEAN)sync));
-}
-
-static PAirpcapHandle
-pcap_get_airpcap_handle_win32(pcap_t *p)
-{
-#ifdef HAVE_AIRPCAP_API
-	return (PacketGetAirPcapHandle(p->adapter));
-#else
-	return (NULL);
-#endif /* HAVE_AIRPCAP_API */
-}
-
-static int
-pcap_read_win32_npf(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
-	PACKET Packet;
-	int cc;
-	int n = 0;
-	register u_char *bp, *ep;
-	u_char *datap;
-	struct pcap_win *pw = p->priv;
-
-	cc = p->cc;
-	if (p->cc == 0) {
-		/*
-		 * Has "pcap_breakloop()" been called?
-		 */
-		if (p->break_loop) {
-			/*
-			 * Yes - clear the flag that indicates that it
-			 * has, and return PCAP_ERROR_BREAK to indicate
-			 * that we were told to break out of the loop.
-			 */
-			p->break_loop = 0;
-			return (PCAP_ERROR_BREAK);
-		}
-
-		/*
-		 * Capture the packets.
-		 *
-		 * The PACKET structure had a bunch of extra stuff for
-		 * Windows 9x/Me, but the only interesting data in it
-		 * in the versions of Windows that we support is just
-		 * a copy of p->buffer, a copy of p->buflen, and the
-		 * actual number of bytes read returned from
-		 * PacketReceivePacket(), none of which has to be
-		 * retained from call to call, so we just keep one on
-		 * the stack.
-		 */
-		PacketInitPacket(&Packet, (BYTE *)p->buffer, p->bufsize);
-		if (!PacketReceivePacket(p->adapter, &Packet, TRUE)) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error: PacketReceivePacket failed");
-			return (PCAP_ERROR);
-		}
-
-		cc = Packet.ulBytesReceived;
-
-		bp = p->buffer;
-	}
-	else
-		bp = p->bp;
-
-	/*
-	 * Loop through each packet.
-	 */
-#define bhp ((struct bpf_hdr *)bp)
-	ep = bp + cc;
-	while (1) {
-		register int caplen, hdrlen;
-
-		/*
-		 * Has "pcap_breakloop()" been called?
-		 * If so, return immediately - if we haven't read any
-		 * packets, clear the flag and return PCAP_ERROR_BREAK
-		 * to indicate that we were told to break out of the loop,
-		 * otherwise leave the flag set, so that the *next* call
-		 * will break out of the loop without having read any
-		 * packets, and return the number of packets we've
-		 * processed so far.
-		 */
-		if (p->break_loop) {
-			if (n == 0) {
-				p->break_loop = 0;
-				return (PCAP_ERROR_BREAK);
-			} else {
-				p->bp = bp;
-				p->cc = (int) (ep - bp);
-				return (n);
-			}
-		}
-		if (bp >= ep)
-			break;
-
-		caplen = bhp->bh_caplen;
-		hdrlen = bhp->bh_hdrlen;
-		datap = bp + hdrlen;
-
-		/*
-		 * Short-circuit evaluation: if using BPF filter
-		 * in kernel, no need to do it now - we already know
-		 * the packet passed the filter.
-		 *
-		 * XXX - bpf_filter() should always return TRUE if
-		 * handed a null pointer for the program, but it might
-		 * just try to "run" the filter, so we check here.
-		 */
-		if (pw->filtering_in_kernel ||
-		    p->fcode.bf_insns == NULL ||
-		    bpf_filter(p->fcode.bf_insns, datap, bhp->bh_datalen, caplen)) {
-			/*
-			 * XXX A bpf_hdr matches a pcap_pkthdr.
-			 */
-			(*callback)(user, (struct pcap_pkthdr*)bp, datap);
-			bp += Packet_WORDALIGN(caplen + hdrlen);
-			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
-				p->bp = bp;
-				p->cc = (int) (ep - bp);
-				return (n);
-			}
-		} else {
-			/*
-			 * Skip this packet.
-			 */
-			bp += Packet_WORDALIGN(caplen + hdrlen);
-		}
-	}
-#undef bhp
-	p->cc = 0;
-	return (n);
-}
-
-#ifdef HAVE_DAG_API
-static int
-pcap_read_win32_dag(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
-	struct pcap_win *pw = p->priv;
-	PACKET Packet;
-	u_char *dp = NULL;
-	int	packet_len = 0, caplen = 0;
-	struct pcap_pkthdr	pcap_header;
-	u_char *endofbuf;
-	int n = 0;
-	dag_record_t *header;
-	unsigned erf_record_len;
-	ULONGLONG ts;
-	int cc;
-	unsigned swt;
-	unsigned dfp = p->adapter->DagFastProcess;
-
-	cc = p->cc;
-	if (cc == 0) /* Get new packets only if we have processed all the ones of the previous read */
-	{
-		/*
-		 * Get new packets from the network.
-		 *
-		 * The PACKET structure had a bunch of extra stuff for
-		 * Windows 9x/Me, but the only interesting data in it
-		 * in the versions of Windows that we support is just
-		 * a copy of p->buffer, a copy of p->buflen, and the
-		 * actual number of bytes read returned from
-		 * PacketReceivePacket(), none of which has to be
-		 * retained from call to call, so we just keep one on
-		 * the stack.
-		 */
-		PacketInitPacket(&Packet, (BYTE *)p->buffer, p->bufsize);
-		if (!PacketReceivePacket(p->adapter, &Packet, TRUE)) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error: PacketReceivePacket failed");
-			return (-1);
-		}
-
-		cc = Packet.ulBytesReceived;
-		if(cc == 0)
-			/* The timeout has expired but we no packets arrived */
-			return (0);
-		header = (dag_record_t*)p->adapter->DagBuffer;
-	}
-	else
-		header = (dag_record_t*)p->bp;
-
-	endofbuf = (char*)header + cc;
-
-	/*
-	 * Cycle through the packets
-	 */
-	do
-	{
-		erf_record_len = SWAPS(header->rlen);
-		if((char*)header + erf_record_len > endofbuf)
-			break;
-
-		/* Increase the number of captured packets */
-		p->stat.ps_recv++;
-
-		/* Find the beginning of the packet */
-		dp = ((u_char *)header) + dag_record_size;
-
-		/* Determine actual packet len */
-		switch(header->type)
-		{
-		case TYPE_ATM:
-			packet_len = ATM_SNAPLEN;
-			caplen = ATM_SNAPLEN;
-			dp += 4;
-
-			break;
-
-		case TYPE_ETH:
-			swt = SWAPS(header->wlen);
-			packet_len = swt - (pw->dag_fcs_bits);
-			caplen = erf_record_len - dag_record_size - 2;
-			if (caplen > packet_len)
-			{
-				caplen = packet_len;
-			}
-			dp += 2;
-
-			break;
-
-		case TYPE_HDLC_POS:
-			swt = SWAPS(header->wlen);
-			packet_len = swt - (pw->dag_fcs_bits);
-			caplen = erf_record_len - dag_record_size;
-			if (caplen > packet_len)
-			{
-				caplen = packet_len;
-			}
-
-			break;
-		}
-
-		if(caplen > p->snapshot)
-			caplen = p->snapshot;
-
-		/*
-		 * Has "pcap_breakloop()" been called?
-		 * If so, return immediately - if we haven't read any
-		 * packets, clear the flag and return -2 to indicate
-		 * that we were told to break out of the loop, otherwise
-		 * leave the flag set, so that the *next* call will break
-		 * out of the loop without having read any packets, and
-		 * return the number of packets we've processed so far.
-		 */
-		if (p->break_loop)
-		{
-			if (n == 0)
-			{
-				p->break_loop = 0;
-				return (-2);
-			}
-			else
-			{
-				p->bp = (char*)header;
-				p->cc = endofbuf - (char*)header;
-				return (n);
-			}
-		}
-
-		if(!dfp)
-		{
-			/* convert between timestamp formats */
-			ts = header->ts;
-			pcap_header.ts.tv_sec = (int)(ts >> 32);
-			ts = (ts & 0xffffffffi64) * 1000000;
-			ts += 0x80000000; /* rounding */
-			pcap_header.ts.tv_usec = (int)(ts >> 32);
-			if (pcap_header.ts.tv_usec >= 1000000) {
-				pcap_header.ts.tv_usec -= 1000000;
-				pcap_header.ts.tv_sec++;
-			}
-		}
-
-		/* No underlaying filtering system. We need to filter on our own */
-		if (p->fcode.bf_insns)
-		{
-			if (bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen) == 0)
-			{
-				/* Move to next packet */
-				header = (dag_record_t*)((char*)header + erf_record_len);
-				continue;
-			}
-		}
-
-		/* Fill the header for the user suppplied callback function */
-		pcap_header.caplen = caplen;
-		pcap_header.len = packet_len;
-
-		/* Call the callback function */
-		(*callback)(user, &pcap_header, dp);
-
-		/* Move to next packet */
-		header = (dag_record_t*)((char*)header + erf_record_len);
-
-		/* Stop if the number of packets requested by user has been reached*/
-		if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt))
-		{
-			p->bp = (char*)header;
-			p->cc = endofbuf - (char*)header;
-			return (n);
-		}
-	}
-	while((u_char*)header < endofbuf);
-
-	return (1);
-}
-#endif /* HAVE_DAG_API */
-
-/* Send a packet to the network */
-static int
-pcap_inject_win32(pcap_t *p, const void *buf, size_t size){
-	LPPACKET PacketToSend;
-
-	PacketToSend=PacketAllocatePacket();
-
-	if (PacketToSend == NULL)
-	{
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: PacketAllocatePacket failed");
-		return (-1);
-	}
-
-	PacketInitPacket(PacketToSend, (PVOID)buf, (UINT)size);
-	if(PacketSendPacket(p->adapter,PacketToSend,TRUE) == FALSE){
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: PacketSendPacket failed");
-		PacketFreePacket(PacketToSend);
-		return (-1);
-	}
-
-	PacketFreePacket(PacketToSend);
-
-	/*
-	 * We assume it all got sent if "PacketSendPacket()" succeeded.
-	 * "pcap_inject()" is expected to return the number of bytes
-	 * sent.
-	 */
-	return ((int)size);
-}
-
-static void
-pcap_cleanup_win32(pcap_t *p)
-{
-	struct pcap_win *pw = p->priv;
-	if (p->adapter != NULL) {
-		PacketCloseAdapter(p->adapter);
-		p->adapter = NULL;
-	}
-	if (pw->rfmon_selfstart)
-	{
-		PacketSetMonitorMode(p->opt.device, 0);
-	}
-	pcap_cleanup_live_common(p);
-}
-
-static int
-pcap_activate_win32(pcap_t *p)
-{
-	struct pcap_win *pw = p->priv;
-	NetType type;
-	int res;
-	char errbuf[PCAP_ERRBUF_SIZE+1];
-
-#ifdef HAVE_REMOTE
-	char host[PCAP_BUF_SIZE + 1];
-	char port[PCAP_BUF_SIZE + 1];
-	char name[PCAP_BUF_SIZE + 1];
-	int srctype;
-	int opensource_remote_result;
-
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
-	md = (struct pcap_md *) ((u_char*)p->priv + sizeof(struct pcap_win));
-
-	/*
-	Retrofit; we have to make older applications compatible with the remote capture
-	So, we're calling the pcap_open_remote() from here, that is a very dirty thing.
-	Obviously, we cannot exploit all the new features; for instance, we cannot
-	send authentication, we cannot use a UDP data connection, and so on.
-	*/
-	if (pcap_parsesrcstr(p->opt.device, &srctype, host, port, name, p->errbuf))
-		return PCAP_ERROR;
-
-	if (srctype == PCAP_SRC_IFREMOTE)
-	{
-		opensource_remote_result = pcap_opensource_remote(p, NULL);
-
-		if (opensource_remote_result != 0)
-			return opensource_remote_result;
-
-		md->rmt_flags = (p->opt.promisc) ? PCAP_OPENFLAG_PROMISCUOUS : 0;
-
-		return 0;
-	}
-
-	if (srctype == PCAP_SRC_IFLOCAL)
-	{
-		/*
-		* If it starts with rpcap://, cut down the string
-		*/
-		if (strncmp(p->opt.device, PCAP_SRC_IF_STRING, strlen(PCAP_SRC_IF_STRING)) == 0)
-		{
-			size_t len = strlen(p->opt.device) - strlen(PCAP_SRC_IF_STRING) + 1;
-			char *new_string;
-			/*
-			* allocate a new string and free the old one
-			*/
-			if (len > 0)
-			{
-				new_string = (char*)malloc(len);
-				if (new_string != NULL)
-				{
-					char *tmp;
-					strcpy_s(new_string, len, p->opt.device + strlen(PCAP_SRC_IF_STRING));
-					tmp = p->opt.device;
-					p->opt.device = new_string;
-					free(tmp);
-				}
-			}
-		}
-	}
-
-#endif	/* HAVE_REMOTE */
-
-	if (p->opt.rfmon) {
-		/*
-		 * Monitor mode is supported on Windows Vista and later.
-		 */
-		if (PacketGetMonitorMode(p->opt.device) == 1)
-		{
-			pw->rfmon_selfstart = 0;
-		}
-		else
-		{
-			if ((res = PacketSetMonitorMode(p->opt.device, 1)) != 1)
-			{
-				pw->rfmon_selfstart = 0;
-				// Monitor mode is not supported.
-				if (res == 0)
-				{
-					return PCAP_ERROR_RFMON_NOTSUP;
-				}
-				else
-				{
-					return PCAP_ERROR;
-				}
-			}
-			else
-			{
-				pw->rfmon_selfstart = 1;
-			}
-		}
-	}
-
-	/* Init WinSock */
-	wsockinit();
-
-	p->adapter = PacketOpenAdapter(p->opt.device);
-
-	if (p->adapter == NULL)
-	{
-		/* Adapter detected but we are not able to open it. Return failure. */
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		if (pw->rfmon_selfstart)
-		{
-			PacketSetMonitorMode(p->opt.device, 0);
-		}
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Error opening adapter: %s", errbuf);
-		return (PCAP_ERROR);
-	}
-
-	/*get network type*/
-	if(PacketGetNetType (p->adapter,&type) == FALSE)
-	{
-		pcap_win32_err_to_str(GetLastError(), errbuf);
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Cannot determine the network type: %s", errbuf);
-		goto bad;
-	}
-
-	/*Set the linktype*/
-	switch (type.LinkType)
-	{
-	case NdisMediumWan:
-		p->linktype = DLT_EN10MB;
-		break;
-
-	case NdisMedium802_3:
-		p->linktype = DLT_EN10MB;
-		/*
-		 * This is (presumably) a real Ethernet capture; give it a
-		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
-		 * that an application can let you choose it, in case you're
-		 * capturing DOCSIS traffic that a Cisco Cable Modem
-		 * Termination System is putting out onto an Ethernet (it
-		 * doesn't put an Ethernet header onto the wire, it puts raw
-		 * DOCSIS frames out on the wire inside the low-level
-		 * Ethernet framing).
-		 */
-		p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
-		/*
-		 * If that fails, just leave the list empty.
-		 */
-		if (p->dlt_list != NULL) {
-			p->dlt_list[0] = DLT_EN10MB;
-			p->dlt_list[1] = DLT_DOCSIS;
-			p->dlt_count = 2;
-		}
-		break;
-
-	case NdisMediumFddi:
-		p->linktype = DLT_FDDI;
-		break;
-
-	case NdisMedium802_5:
-		p->linktype = DLT_IEEE802;
-		break;
-
-	case NdisMediumArcnetRaw:
-		p->linktype = DLT_ARCNET;
-		break;
-
-	case NdisMediumArcnet878_2:
-		p->linktype = DLT_ARCNET;
-		break;
-
-	case NdisMediumAtm:
-		p->linktype = DLT_ATM_RFC1483;
-		break;
-
-	case NdisMediumCHDLC:
-		p->linktype = DLT_CHDLC;
-		break;
-
-	case NdisMediumPPPSerial:
-		p->linktype = DLT_PPP_SERIAL;
-		break;
-
-	case NdisMediumNull:
-		p->linktype = DLT_NULL;
-		break;
-
-	case NdisMediumBare80211:
-		p->linktype = DLT_IEEE802_11;
-		break;
-
-	case NdisMediumRadio80211:
-		p->linktype = DLT_IEEE802_11_RADIO;
-		break;
-
-	case NdisMediumPpi:
-		p->linktype = DLT_PPI;
-		break;
-
-	default:
-		p->linktype = DLT_EN10MB;			/*an unknown adapter is assumed to be ethernet*/
-		break;
-	}
-
-	/* Set promiscuous mode */
-	if (p->opt.promisc)
-	{
-
-		if (PacketSetHwFilter(p->adapter,NDIS_PACKET_TYPE_PROMISCUOUS) == FALSE)
-		{
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "failed to set hardware filter to promiscuous mode");
-			goto bad;
-		}
-	}
-	else
-	{
-		if (PacketSetHwFilter(p->adapter,NDIS_PACKET_TYPE_ALL_LOCAL) == FALSE)
-		{
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "failed to set hardware filter to non-promiscuous mode");
-			goto bad;
-		}
-	}
-
-	/* Set the buffer size */
-	p->bufsize = WIN32_DEFAULT_USER_BUFFER_SIZE;
-
-	if(!(p->adapter->Flags & INFO_FLAG_DAG_CARD))
-	{
-	/*
-	 * Traditional Adapter
-	 */
-		/*
-		 * If the buffer size wasn't explicitly set, default to
-		 * WIN32_DEFAULT_KERNEL_BUFFER_SIZE.
-		 */
-	 	if (p->opt.buffer_size == 0)
-	 		p->opt.buffer_size = WIN32_DEFAULT_KERNEL_BUFFER_SIZE;
-
-		if(PacketSetBuff(p->adapter,p->opt.buffer_size)==FALSE)
-		{
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: not enough memory to allocate the kernel buffer");
-			goto bad;
-		}
-
-		p->buffer = malloc(p->bufsize);
-		if (p->buffer == NULL)
-		{
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
-			goto bad;
-		}
-
-		if (p->opt.immediate)
-		{
-			/* tell the driver to copy the buffer as soon as data arrives */
-			if(PacketSetMinToCopy(p->adapter,0)==FALSE)
-			{
-				pcap_win32_err_to_str(GetLastError(), errbuf);
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "Error calling PacketSetMinToCopy: %s",
-				    errbuf);
-				goto bad;
-			}
-		}
-		else
-		{
-			/* tell the driver to copy the buffer only if it contains at least 16K */
-			if(PacketSetMinToCopy(p->adapter,16000)==FALSE)
-			{
-				pcap_win32_err_to_str(GetLastError(), errbuf);
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "Error calling PacketSetMinToCopy: %s",
-				    errbuf);
-				goto bad;
-			}
-		}
-	}
-	else
-#ifdef HAVE_DAG_API
-	{
-	/*
-	 * Dag Card
-	 */
-		LONG	status;
-		HKEY	dagkey;
-		DWORD	lptype;
-		DWORD	lpcbdata;
-		int		postype = 0;
-		char	keyname[512];
-
-		pcap_snprintf(keyname, sizeof(keyname), "%s\\CardParams\\%s",
-			"SYSTEM\\CurrentControlSet\\Services\\DAG",
-			strstr(_strlwr(p->opt.device), "dag"));
-		do
-		{
-			status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &dagkey);
-			if(status != ERROR_SUCCESS)
-				break;
-
-			status = RegQueryValueEx(dagkey,
-				"PosType",
-				NULL,
-				&lptype,
-				(char*)&postype,
-				&lpcbdata);
-
-			if(status != ERROR_SUCCESS)
-			{
-				postype = 0;
-			}
-
-			RegCloseKey(dagkey);
-		}
-		while(FALSE);
-
-
-		p->snapshot = PacketSetSnapLen(p->adapter, snaplen);
-
-		/* Set the length of the FCS associated to any packet. This value
-		 * will be subtracted to the packet length */
-		pw->dag_fcs_bits = p->adapter->DagFcsLen;
-	}
-#else
-	goto bad;
-#endif /* HAVE_DAG_API */
-
-	PacketSetReadTimeout(p->adapter, p->opt.timeout);
-
-#ifdef HAVE_DAG_API
-	if(p->adapter->Flags & INFO_FLAG_DAG_CARD)
-	{
-		/* install dag specific handlers for read and setfilter */
-		p->read_op = pcap_read_win32_dag;
-		p->setfilter_op = pcap_setfilter_win32_dag;
-	}
-	else
-	{
-#endif /* HAVE_DAG_API */
-		/* install traditional npf handlers for read and setfilter */
-		p->read_op = pcap_read_win32_npf;
-		p->setfilter_op = pcap_setfilter_win32_npf;
-#ifdef HAVE_DAG_API
-	}
-#endif /* HAVE_DAG_API */
-	p->setdirection_op = NULL;	/* Not implemented. */
-	    /* XXX - can this be implemented on some versions of Windows? */
-	p->inject_op = pcap_inject_win32;
-	p->set_datalink_op = NULL;	/* can't change data link type */
-	p->getnonblock_op = pcap_getnonblock_win32;
-	p->setnonblock_op = pcap_setnonblock_win32;
-	p->stats_op = pcap_stats_win32;
-	p->stats_ex_op = pcap_stats_ex_win32;
-	p->setbuff_op = pcap_setbuff_win32;
-	p->setmode_op = pcap_setmode_win32;
-	p->setmintocopy_op = pcap_setmintocopy_win32;
-	p->getevent_op = pcap_getevent_win32;
-	p->oid_get_request_op = pcap_oid_get_request_win32;
-	p->oid_set_request_op = pcap_oid_set_request_win32;
-	p->sendqueue_transmit_op = pcap_sendqueue_transmit_win32;
-	p->setuserbuffer_op = pcap_setuserbuffer_win32;
-	p->live_dump_op = pcap_live_dump_win32;
-	p->live_dump_ended_op = pcap_live_dump_ended_win32;
-	p->get_airpcap_handle_op = pcap_get_airpcap_handle_win32;
-	p->cleanup_op = pcap_cleanup_win32;
-
-	return (0);
-bad:
-	pcap_cleanup_win32(p);
-	return (PCAP_ERROR);
-}
-
-/*
-* Check if rfmon mode is supported on the pcap_t for Windows systems.
-*/
-static int
-pcap_can_set_rfmon_win32(pcap_t *p)
-{
-	return (PacketIsMonitorModeSupported(p->opt.device) == 1);
-}
-
-pcap_t *
-pcap_create_interface(const char *device _U_, char *ebuf)
-{
-	pcap_t *p;
-
-#ifdef HAVE_REMOTE
-	p = pcap_create_common(ebuf, sizeof(struct pcap_win) + sizeof(struct pcap_md));
-#else
-	p = pcap_create_common(ebuf, sizeof(struct pcap_win));
-#endif /* HAVE_REMOTE */
-	if (p == NULL)
-		return (NULL);
-
-	p->activate_op = pcap_activate_win32;
-	p->can_set_rfmon_op = pcap_can_set_rfmon_win32;
-	return (p);
-}
-
-static int
-pcap_setfilter_win32_npf(pcap_t *p, struct bpf_program *fp)
-{
-	struct pcap_win *pw = p->priv;
-
-	if(PacketSetBpf(p->adapter,fp)==FALSE){
-		/*
-		 * Kernel filter not installed.
-		 *
-		 * XXX - we don't know whether this failed because:
-		 *
-		 *  the kernel rejected the filter program as invalid,
-		 *  in which case we should fall back on userland
-		 *  filtering;
-		 *
-		 *  the kernel rejected the filter program as too big,
-		 *  in which case we should again fall back on
-		 *  userland filtering;
-		 *
-		 *  there was some other problem, in which case we
-		 *  should probably report an error.
-		 *
-		 * For NPF devices, the Win32 status will be
-		 * STATUS_INVALID_DEVICE_REQUEST for invalid
-		 * filters, but I don't know what it'd be for
-		 * other problems, and for some other devices
-		 * it might not be set at all.
-		 *
-		 * So we just fall back on userland filtering in
-		 * all cases.
-		 */
-
-		/*
-		 * install_bpf_program() validates the program.
-		 *
-		 * XXX - what if we already have a filter in the kernel?
-		 */
-		if (install_bpf_program(p, fp) < 0)
-			return (-1);
-		pw->filtering_in_kernel = 0;	/* filtering in userland */
-		return (0);
-	}
-
-	/*
-	 * It worked.
-	 */
-	pw->filtering_in_kernel = 1;	/* filtering in the kernel */
-
-	/*
-	 * Discard any previously-received packets, as they might have
-	 * passed whatever filter was formerly in effect, but might
-	 * not pass this filter (BIOCSETF discards packets buffered
-	 * in the kernel, so you can lose packets in any case).
-	 */
-	p->cc = 0;
-	return (0);
-}
-
-/*
- * We filter at user level, since the kernel driver does't process the packets
- */
-static int
-pcap_setfilter_win32_dag(pcap_t *p, struct bpf_program *fp) {
-
-	if(!fp)
-	{
-		strlcpy(p->errbuf, "setfilter: No filter specified", sizeof(p->errbuf));
-		return (-1);
-	}
-
-	/* Install a user level filter */
-	if (install_bpf_program(p, fp) < 0)
-	{
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			"setfilter, unable to install the filter: %s", pcap_strerror(errno));
-		return (-1);
-	}
-
-	return (0);
-}
-
-static int
-pcap_getnonblock_win32(pcap_t *p, char *errbuf)
-{
-	struct pcap_win *pw = p->priv;
-
-	/*
-	 * XXX - if there were a PacketGetReadTimeout() call, we
-	 * would use it, and return 1 if the timeout is -1
-	 * and 0 otherwise.
-	 */
-	return (pw->nonblock);
-}
-
-static int
-pcap_setnonblock_win32(pcap_t *p, int nonblock, char *errbuf)
-{
-	struct pcap_win *pw = p->priv;
-	int newtimeout;
-	char win_errbuf[PCAP_ERRBUF_SIZE+1];
-
-	if (nonblock) {
-		/*
-		 * Set the read timeout to -1 for non-blocking mode.
-		 */
-		newtimeout = -1;
-	} else {
-		/*
-		 * Restore the timeout set when the device was opened.
-		 * (Note that this may be -1, in which case we're not
-		 * really leaving non-blocking mode.  However, although
-		 * the timeout argument to pcap_set_timeout() and
-		 * pcap_open_live() is an int, you're not supposed to
-		 * supply a negative value, so that "shouldn't happen".)
-		 */
-		newtimeout = p->opt.timeout;
-	}
-	if (!PacketSetReadTimeout(p->adapter, newtimeout)) {
-		pcap_win32_err_to_str(GetLastError(), win_errbuf);
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "PacketSetReadTimeout: %s", win_errbuf);
-		return (-1);
-	}
-	pw->nonblock = (newtimeout == -1);
-	return (0);
-}
-
-static int
-pcap_add_if_win32(pcap_if_t **devlist, char *name, bpf_u_int32 flags,
-    const char *description, char *errbuf)
-{
-	pcap_if_t *curdev;
-	npf_if_addr if_addrs[MAX_NETWORK_ADDRESSES];
-	LONG if_addr_size;
-	int res = 0;
-
-	if_addr_size = MAX_NETWORK_ADDRESSES;
-
-	/*
-	 * Add an entry for this interface, with no addresses.
-	 */
-	if (add_or_find_if(&curdev, devlist, name, flags, description,
-	    errbuf) == -1) {
-		/*
-		 * Failure.
-		 */
-		return (-1);
-	}
-
-	/*
-	 * Get the list of addresses for the interface.
-	 */
-	if (!PacketGetNetInfoEx((void *)name, if_addrs, &if_addr_size)) {
-		/*
-		 * Failure.
-		 *
-		 * We don't return an error, because this can happen with
-		 * NdisWan interfaces, and we want to supply them even
-		 * if we can't supply their addresses.
-		 *
-		 * We return an entry with an empty address list.
-		 */
-		return (0);
-	}
-
-	/*
-	 * Now add the addresses.
-	 */
-	while (if_addr_size-- > 0) {
-		/*
-		 * "curdev" is an entry for this interface; add an entry for
-		 * this address to its list of addresses.
-		 */
-		if(curdev == NULL)
-			break;
-		res = add_addr_to_dev(curdev,
-		    (struct sockaddr *)&if_addrs[if_addr_size].IPAddress,
-		    sizeof (struct sockaddr_storage),
-		    (struct sockaddr *)&if_addrs[if_addr_size].SubnetMask,
-		    sizeof (struct sockaddr_storage),
-		    (struct sockaddr *)&if_addrs[if_addr_size].Broadcast,
-		    sizeof (struct sockaddr_storage),
-		    NULL,
-		    0,
-		    errbuf);
-		if (res == -1) {
-			/*
-			 * Failure.
-			 */
-			break;
-		}
-	}
-
-	return (res);
-}
-
-int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
-{
-	pcap_if_t *devlist = NULL;
-	int ret = 0;
-	const char *desc;
-	char *AdaptersName;
-	ULONG NameLength;
-	char *name;
-	char our_errbuf[PCAP_ERRBUF_SIZE+1];
-
-	/*
-	 * Find out how big a buffer we need.
-	 *
-	 * This call should always return FALSE; if the error is
-	 * ERROR_INSUFFICIENT_BUFFER, NameLength will be set to
-	 * the size of the buffer we need, otherwise there's a
-	 * problem, and NameLength should be set to 0.
-	 *
-	 * It shouldn't require NameLength to be set, but,
-	 * at least as of WinPcap 4.1.3, it checks whether
-	 * NameLength is big enough before it checks for a
-	 * NULL buffer argument, so, while it'll still do
-	 * the right thing if NameLength is uninitialized and
-	 * whatever junk happens to be there is big enough
-	 * (because the pointer argument will be null), it's
-	 * still reading an uninitialized variable.
-	 */
-	NameLength = 0;
-	if (!PacketGetAdapterNames(NULL, &NameLength))
-	{
-		DWORD last_error = GetLastError();
-
-		if (last_error != ERROR_INSUFFICIENT_BUFFER)
-		{
-			pcap_win32_err_to_str(last_error, our_errbuf);
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "PacketGetAdapterNames: %s", our_errbuf);
-			return (-1);
-		}
-	}
-
-	if (NameLength > 0)
-		AdaptersName = (char*) malloc(NameLength);
-	else
-	{
-		*alldevsp = NULL;
-		return 0;
-	}
-	if (AdaptersName == NULL)
-	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Cannot allocate enough memory to list the adapters.");
-		return (-1);
-	}
-
-	if (!PacketGetAdapterNames(AdaptersName, &NameLength)) {
-		pcap_win32_err_to_str(GetLastError(), our_errbuf);
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "PacketGetAdapterNames: %s",
-		    our_errbuf);
-		free(AdaptersName);
-		return (-1);
-	}
-
-	/*
-	 * "PacketGetAdapterNames()" returned a list of
-	 * null-terminated ASCII interface name strings,
-	 * terminated by a null string, followed by a list
-	 * of null-terminated ASCII interface description
-	 * strings, terminated by a null string.
-	 * This means there are two ASCII nulls at the end
-	 * of the first list.
-	 *
-	 * Find the end of the first list; that's the
-	 * beginning of the second list.
-	 */
-	desc = &AdaptersName[0];
-	while (*desc != '\0' || *(desc + 1) != '\0')
-		desc++;
-
-	/*
- 	 * Found it - "desc" points to the first of the two
-	 * nulls at the end of the list of names, so the
-	 * first byte of the list of descriptions is two bytes
-	 * after it.
-	 */
-	desc += 2;
-
-	/*
-	 * Loop over the elements in the first list.
-	 */
-	name = &AdaptersName[0];
-	while (*name != '\0') {
-		bpf_u_int32 flags = 0;
-#ifdef HAVE_PACKET_IS_LOOPBACK_ADAPTER
-		/*
-		 * Is this a loopback interface?
-		 */
-		if (PacketIsLoopbackAdapter(name)) {
-			/* Yes */
-			flags |= PCAP_IF_LOOPBACK;
-		}
-#endif
-
-		/*
-		 * Add an entry for this interface.
-		 */
-		if (pcap_add_if_win32(&devlist, name, flags, desc,
-		    errbuf) == -1) {
-			/*
-			 * Failure.
-			 */
-			ret = -1;
-			break;
-		}
-		name += strlen(name) + 1;
-		desc += strlen(desc) + 1;
-	}
-
-	if (ret == -1) {
-		/*
-		 * We had an error; free the list we've been constructing.
-		 */
-		if (devlist != NULL) {
-			pcap_freealldevs(devlist);
-			devlist = NULL;
-		}
-	}
-
-	*alldevsp = devlist;
-	free(AdaptersName);
-	return (ret);
-}
Index: vendor/libpcap/dist/SUNOS4/nit_if.o.sparc
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: vendor/libpcap/dist/SUNOS4/nit_if.o.sparc
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: vendor/libpcap/dist/SUNOS4/nit_if.o.sun3
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: vendor/libpcap/dist/SUNOS4/nit_if.o.sun3
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: vendor/libpcap/dist/SUNOS4/nit_if.o.sun4c.4.0.3c
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: vendor/libpcap/dist/SUNOS4/nit_if.o.sun4c.4.0.3c
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: vendor/libpcap/dist/GenVersion.bat
===================================================================
--- vendor/libpcap/dist/GenVersion.bat	(revision 333788)
+++ vendor/libpcap/dist/GenVersion.bat	(nonexistent)
@@ -1,23 +0,0 @@
-REM
-REM Automatically generate pcap_version.h based on pcap_version.h.in
-REM for Windows
-REM The version string comes from VERSION
-REM @echo off
-REM
-
-setlocal enableextensions disabledelayedexpansion
-
-set "search=%%%%LIBPCAP_VERSION%%%%"
-set /p replace=<%1
-
-if exist %3 del %3 2>nul
-
-for /f "delims=" %%i in ('type %2' ) do (
-	set "line=%%i"
-	setlocal enabledelayedexpansion
-	set "line=!line:%search%=%replace%!"
-	>>%3 echo(!line!
-	endlocal
-)
-
-echo pcap_version.h generated
Index: vendor/libpcap/dist/README.macosx
===================================================================
--- vendor/libpcap/dist/README.macosx	(revision 333788)
+++ vendor/libpcap/dist/README.macosx	(nonexistent)
@@ -1,74 +0,0 @@
-As with other systems using BPF, Mac OS X allows users with read access
-to the BPF devices to capture packets with libpcap and allows users with
-write access to the BPF devices to send packets with libpcap.
-
-On some systems that use BPF, the BPF devices live on the root file
-system, and the permissions and/or ownership on those devices can be
-changed to give users other than root permission to read or write those
-devices.
-
-On newer versions of FreeBSD, the BPF devices live on devfs, and devfs
-can be configured to set the permissions and/or ownership of those
-devices to give users other than root permission to read or write those
-devices.
-
-On Mac OS X, the BPF devices live on devfs, but the OS X version of
-devfs is based on an older (non-default) FreeBSD devfs, and that version
-of devfs cannot be configured to set the permissions and/or ownership of
-those devices.
-
-Therefore, we supply:
-
-	a "startup item" for older versions of Mac OS X;
-
-	a launchd daemon for Tiger and later versions of Mac OS X;
-
-Both of them will change the ownership of the BPF devices so that the
-"admin" group owns them, and will change the permission of the BPF
-devices to rw-rw----, so that all users in the "admin" group - i.e., all
-users with "Allow user to administer this computer" turned on - have
-both read and write access to them.
-
-The startup item is in the ChmodBPF directory in the source tree.  A
-/Library/StartupItems directory should be created if it doesn't already
-exist, and the ChmodBPF directory should be copied to the
-/Library/StartupItems directory (copy the entire directory, so that
-there's a /Library/StartupItems/ChmodBPF directory, containing all the
-files in the source tree's ChmodBPF directory; don't copy the individual
-items in that directory to /Library/StartupItems).  The ChmodBPF
-directory, and all files under it, must be owned by root.  Installing
-the files won't immediately cause the startup item to be executed; it
-will be executed on the next reboot.  To change the permissions before
-the reboot, run
-
-	sudo SystemStarter start ChmodBPF
-
-The launchd daemon is the chmod_bpf script, plus the
-org.tcpdump.chmod_bpf.plist launchd plist file.  chmod_bpf should be
-installed in /usr/local/bin/chmod_bpf, and org.tcpdump.chmod_bpf.plist
-should be installed in /Library/LaunchDaemons.  chmod_bpf, and
-org.tcpdump.chmod_bpf.plist, must be owned by root.  Installing the
-script and plist file won't immediately cause the script to be executed;
-it will be executed on the next reboot.  To change the permissions
-before the reboot, run
-
-	sudo /usr/local/bin/chmod_bpf
-
-or
-
-	sudo launchctl load /Library/LaunchDaemons/org.tcpdump.chmod_bpf.plist
-
-If you want to give a particular user permission to access the BPF
-devices, rather than giving all administrative users permission to
-access them, you can have the ChmodBPF/ChmodBPF script change the
-ownership of /dev/bpf* without changing the permissions.  If you want to
-give a particular user permission to read and write the BPF devices and
-give the administrative users permission to read but not write the BPF
-devices, you can have the script change the owner to that user, the
-group to "admin", and the permissions to rw-r-----.  Other possibilities
-are left as an exercise for the reader.
-
-(NOTE: due to a bug in Snow Leopard, if you change the permissions not
-to grant write permission to everybody who should be allowed to capture
-traffic, non-root users who cannot open the BPF devices for writing will
-not be able to capture outgoing packets.)
Index: vendor/libpcap/dist/pcap-stdinc.h
===================================================================
--- vendor/libpcap/dist/pcap-stdinc.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-stdinc.h	(nonexistent)
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
- * Copyright (c) 2005 - 2009 CACE Technologies, Inc. Davis (California)
- * All rights reserved.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef pcap_stdinc_h
-#define pcap_stdinc_h
-
-/*
- * Avoids a compiler warning in case this was already defined
- * (someone defined _WINSOCKAPI_ when including 'windows.h', in order
- * to prevent it from including 'winsock.h')
- */
-#ifdef _WINSOCKAPI_
-#undef _WINSOCKAPI_
-#endif
-
-#include <winsock2.h>
-#include <fcntl.h>
-#include <time.h>
-#include <io.h>
-
-#include <ws2tcpip.h>
-
-#if defined(_MSC_VER)
-  /*
-   * MSVC.
-   */
-  #if _MSC_VER >= 1800
-    /*
-     * VS 2013 or newer; we have <inttypes.h>.
-     */
-    #include <inttypes.h>
-
-    #define u_int8_t uint8_t
-    #define u_int16_t uint16_t
-    #define u_int32_t uint32_t
-    #define u_int64_t uint64_t
-  #else
-    /*
-     * Earlier VS; we have to define this stuff ourselves.
-     */
-    #ifndef HAVE_U_INT8_T
-      typedef unsigned char u_int8_t;
-      typedef signed char int8_t;
-    #endif
-
-    #ifndef HAVE_U_INT16_T
-      typedef unsigned short u_int16_t;
-      typedef signed short int16_t;
-    #endif
-
-    #ifndef HAVE_U_INT32_T
-      typedef unsigned int u_int32_t;
-      typedef signed int int32_t;
-    #endif
-
-    #ifndef HAVE_U_INT64_T
-      #ifdef _MSC_EXTENSIONS
-        typedef unsigned _int64 u_int64_t;
-        typedef _int64 int64_t;
-      #else /* _MSC_EXTENSIONS */
-        typedef unsigned long long u_int64_t;
-        typedef long long int64_t;
-      #endif
-    #endif
-  #endif
-#elif defined(__MINGW32__)
-  #include <stdint.h>
-#endif
-
-#endif /* pcap_stdinc_h */
Index: vendor/libpcap/dist/sf-pcap-ng.h
===================================================================
--- vendor/libpcap/dist/sf-pcap-ng.h	(revision 333788)
+++ vendor/libpcap/dist/sf-pcap-ng.h	(nonexistent)
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- *
- * sf-pcap-ng.h - pcap-ng-file-format-specific routines
- *
- * Used to read pcap-ng savefiles.
- */
-
-#ifndef sf_pcap_ng_h
-#define	sf_pcap_ng_h
-
-extern pcap_t *pcap_ng_check_header(bpf_u_int32 magic, FILE *fp,
-    u_int precision, char *errbuf, int *err);
-
-#endif

Property changes on: vendor/libpcap/dist/sf-pcap-ng.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/inet.c
===================================================================
--- vendor/libpcap/dist/inet.c	(revision 333788)
+++ vendor/libpcap/dist/inet.c	(nonexistent)
@@ -1,403 +0,0 @@
-/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
-/*
- * Copyright (c) 1994, 1995, 1996, 1997, 1998
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-
-#include <sys/param.h>
-#ifndef MSDOS
-#include <sys/file.h>
-#endif
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-
-struct mbuf;		/* Squelch compiler warnings on some platforms for */
-struct rtentry;		/* declarations in <net/if.h> */
-#include <net/if.h>
-#include <netinet/in.h>
-#endif /* _WIN32 */
-
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if !defined(_WIN32) && !defined(__BORLANDC__)
-#include <unistd.h>
-#endif /* !_WIN32 && !__BORLANDC__ */
-
-#include "pcap-int.h"
-
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
-#if !defined(_WIN32) && !defined(MSDOS)
-
-/*
- * Return the name of a network interface attached to the system, or NULL
- * if none can be found.  The interface must be configured up; the
- * lowest unit number is preferred; loopback is ignored.
- */
-char *
-pcap_lookupdev(errbuf)
-	register char *errbuf;
-{
-	pcap_if_t *alldevs;
-/* for old BSD systems, including bsdi3 */
-#ifndef IF_NAMESIZE
-#define IF_NAMESIZE IFNAMSIZ
-#endif
-	static char device[IF_NAMESIZE + 1];
-	char *ret;
-
-	if (pcap_findalldevs(&alldevs, errbuf) == -1)
-		return (NULL);
-
-	if (alldevs == NULL || (alldevs->flags & PCAP_IF_LOOPBACK)) {
-		/*
-		 * There are no devices on the list, or the first device
-		 * on the list is a loopback device, which means there
-		 * are no non-loopback devices on the list.  This means
-		 * we can't return any device.
-		 *
-		 * XXX - why not return a loopback device?  If we can't
-		 * capture on it, it won't be on the list, and if it's
-		 * on the list, there aren't any non-loopback devices,
-		 * so why not just supply it as the default device?
-		 */
-		(void)strlcpy(errbuf, "no suitable device found",
-		    PCAP_ERRBUF_SIZE);
-		ret = NULL;
-	} else {
-		/*
-		 * Return the name of the first device on the list.
-		 */
-		(void)strlcpy(device, alldevs->name, sizeof(device));
-		ret = device;
-	}
-
-	pcap_freealldevs(alldevs);
-	return (ret);
-}
-
-int
-pcap_lookupnet(device, netp, maskp, errbuf)
-	register const char *device;
-	register bpf_u_int32 *netp, *maskp;
-	register char *errbuf;
-{
-	register int fd;
-	register struct sockaddr_in *sin4;
-	struct ifreq ifr;
-
-	/*
-	 * The pseudo-device "any" listens on all interfaces and therefore
-	 * has the network address and -mask "0.0.0.0" therefore catching
-	 * all traffic. Using NULL for the interface is the same as "any".
-	 */
-	if (!device || strcmp(device, "any") == 0
-#ifdef HAVE_DAG_API
-	    || strstr(device, "dag") != NULL
-#endif
-#ifdef HAVE_SEPTEL_API
-	    || strstr(device, "septel") != NULL
-#endif
-#ifdef PCAP_SUPPORT_BT
-	    || strstr(device, "bluetooth") != NULL
-#endif
-#ifdef PCAP_SUPPORT_USB
-	    || strstr(device, "usbmon") != NULL
-#endif
-#ifdef HAVE_SNF_API
-	    || strstr(device, "snf") != NULL
-#endif
-	    ) {
-		*netp = *maskp = 0;
-		return 0;
-	}
-
-	fd = socket(AF_INET, SOCK_DGRAM, 0);
-	if (fd < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
-		    pcap_strerror(errno));
-		return (-1);
-	}
-	memset(&ifr, 0, sizeof(ifr));
-#ifdef linux
-	/* XXX Work around Linux kernel bug */
-	ifr.ifr_addr.sa_family = AF_INET;
-#endif
-	(void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
-	if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
-		if (errno == EADDRNOTAVAIL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: no IPv4 address assigned", device);
-		} else {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "SIOCGIFADDR: %s: %s",
-			    device, pcap_strerror(errno));
-		}
-		(void)close(fd);
-		return (-1);
-	}
-	sin4 = (struct sockaddr_in *)&ifr.ifr_addr;
-	*netp = sin4->sin_addr.s_addr;
-	memset(&ifr, 0, sizeof(ifr));
-#ifdef linux
-	/* XXX Work around Linux kernel bug */
-	ifr.ifr_addr.sa_family = AF_INET;
-#endif
-	(void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
-	if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "SIOCGIFNETMASK: %s: %s", device, pcap_strerror(errno));
-		(void)close(fd);
-		return (-1);
-	}
-	(void)close(fd);
-	*maskp = sin4->sin_addr.s_addr;
-	if (*maskp == 0) {
-		if (IN_CLASSA(*netp))
-			*maskp = IN_CLASSA_NET;
-		else if (IN_CLASSB(*netp))
-			*maskp = IN_CLASSB_NET;
-		else if (IN_CLASSC(*netp))
-			*maskp = IN_CLASSC_NET;
-		else {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "inet class for 0x%x unknown", *netp);
-			return (-1);
-		}
-	}
-	*netp &= *maskp;
-	return (0);
-}
-
-#elif defined(_WIN32)
-
-/*
- * Return the name of a network interface attached to the system, or NULL
- * if none can be found.  The interface must be configured up; the
- * lowest unit number is preferred; loopback is ignored.
- *
- * In the best of all possible worlds, this would be the same as on
- * UN*X, but there may be software that expects this to return a
- * full list of devices after the first device.
- */
-#define ADAPTERSNAME_LEN	8192
-char *
-pcap_lookupdev(errbuf)
-	register char *errbuf;
-{
-	DWORD dwVersion;
-	DWORD dwWindowsMajorVersion;
-	char our_errbuf[PCAP_ERRBUF_SIZE+1];
-
-#pragma warning (push)
-#pragma warning (disable: 4996) /* disable MSVC's GetVersion() deprecated warning here */
-	dwVersion = GetVersion();	/* get the OS version */
-#pragma warning (pop)
-	dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
-
-	if (dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4) {
-		/*
-		 * Windows 95, 98, ME.
-		 */
-		ULONG NameLength = ADAPTERSNAME_LEN;
-		static char AdaptersName[ADAPTERSNAME_LEN];
-
-		if (PacketGetAdapterNames(AdaptersName,&NameLength) )
-			return (AdaptersName);
-		else
-			return NULL;
-	} else {
-		/*
-		 * Windows NT (NT 4.0 and later).
-		 * Convert the names to Unicode for backward compatibility.
-		 */
-		ULONG NameLength = ADAPTERSNAME_LEN;
-		static WCHAR AdaptersName[ADAPTERSNAME_LEN];
-		size_t BufferSpaceLeft;
-		char *tAstr;
-		WCHAR *Unameptr;
-		char *Adescptr;
-		size_t namelen, i;
-		WCHAR *TAdaptersName = (WCHAR*)malloc(ADAPTERSNAME_LEN * sizeof(WCHAR));
-		int NAdapts = 0;
-
-		if(TAdaptersName == NULL)
-		{
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "memory allocation failure");
-			return NULL;
-		}
-
-		if ( !PacketGetAdapterNames((PTSTR)TAdaptersName,&NameLength) )
-		{
-			pcap_win32_err_to_str(GetLastError(), our_errbuf);
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				"PacketGetAdapterNames: %s", our_errbuf);
-			free(TAdaptersName);
-			return NULL;
-		}
-
-
-		BufferSpaceLeft = ADAPTERSNAME_LEN * sizeof(WCHAR);
-		tAstr = (char*)TAdaptersName;
-		Unameptr = AdaptersName;
-
-		/*
-		 * Convert the device names to Unicode into AdapterName.
-		 */
-		do {
-			/*
-			 * Length of the name, including the terminating
-			 * NUL.
-			 */
-			namelen = strlen(tAstr) + 1;
-
-			/*
-			 * Do we have room for the name in the Unicode
-			 * buffer?
-			 */
-			if (BufferSpaceLeft < namelen * sizeof(WCHAR)) {
-				/*
-				 * No.
-				 */
-				goto quit;
-			}
-			BufferSpaceLeft -= namelen * sizeof(WCHAR);
-
-			/*
-			 * Copy the name, converting ASCII to Unicode.
-			 * namelen includes the NUL, so we copy it as
-			 * well.
-			 */
-			for (i = 0; i < namelen; i++)
-				*Unameptr++ = *tAstr++;
-
-			/*
-			 * Count this adapter.
-			 */
-			NAdapts++;
-		} while (namelen != 1);
-
-		/*
-		 * Copy the descriptions, but don't convert them from
-		 * ASCII to Unicode.
-		 */
-		Adescptr = (char *)Unameptr;
-		while(NAdapts--)
-		{
-			size_t desclen;
-
-			desclen = strlen(tAstr) + 1;
-
-			/*
-			 * Do we have room for the name in the Unicode
-			 * buffer?
-			 */
-			if (BufferSpaceLeft < desclen) {
-				/*
-				 * No.
-				 */
-				goto quit;
-			}
-
-			/*
-			 * Just copy the ASCII string.
-			 * namelen includes the NUL, so we copy it as
-			 * well.
-			 */
-			memcpy(Adescptr, tAstr, desclen);
-			Adescptr += desclen;
-			tAstr += desclen;
-			BufferSpaceLeft -= desclen;
-		}
-
-	quit:
-		free(TAdaptersName);
-		return (char *)(AdaptersName);
-	}
-}
-
-
-int
-pcap_lookupnet(device, netp, maskp, errbuf)
-	register const char *device;
-	register bpf_u_int32 *netp, *maskp;
-	register char *errbuf;
-{
-	/*
-	 * We need only the first IPv4 address, so we must scan the array returned by PacketGetNetInfo()
-	 * in order to skip non IPv4 (i.e. IPv6 addresses)
-	 */
-	npf_if_addr if_addrs[MAX_NETWORK_ADDRESSES];
-	LONG if_addr_size = 1;
-	struct sockaddr_in *t_addr;
-	unsigned int i;
-
-	if (!PacketGetNetInfoEx((void *)device, if_addrs, &if_addr_size)) {
-		*netp = *maskp = 0;
-		return (0);
-	}
-
-	for(i=0; i<MAX_NETWORK_ADDRESSES; i++)
-	{
-		if(if_addrs[i].IPAddress.ss_family == AF_INET)
-		{
-			t_addr = (struct sockaddr_in *) &(if_addrs[i].IPAddress);
-			*netp = t_addr->sin_addr.S_un.S_addr;
-			t_addr = (struct sockaddr_in *) &(if_addrs[i].SubnetMask);
-			*maskp = t_addr->sin_addr.S_un.S_addr;
-
-			*netp &= *maskp;
-			return (0);
-		}
-
-	}
-
-	*netp = *maskp = 0;
-	return (0);
-}
-
-#endif /* !_WIN32 && !MSDOS */
Index: vendor/libpcap/dist/bpf/net/bpf_filter.c
===================================================================
--- vendor/libpcap/dist/bpf/net/bpf_filter.c	(revision 333788)
+++ vendor/libpcap/dist/bpf/net/bpf_filter.c	(nonexistent)
@@ -1,766 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)bpf.c	7.5 (Berkeley) 7/15/91
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef _WIN32
-
-#include <pcap-stdinc.h>
-
-#else /* _WIN32 */
-
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#define	SOLARIS	(defined(sun) && (defined(__SVR4) || defined(__svr4__)))
-#if defined(__hpux) || SOLARIS
-# include <sys/sysmacros.h>
-# include <sys/stream.h>
-# define	mbuf	msgb
-# define	m_next	b_cont
-# define	MLEN(m)	((m)->b_wptr - (m)->b_rptr)
-# define	mtod(m,t)	((t)(m)->b_rptr)
-#else /* defined(__hpux) || SOLARIS */
-# define	MLEN(m)	((m)->m_len)
-#endif /* defined(__hpux) || SOLARIS */
-
-#endif /* _WIN32 */
-
-#include <pcap/bpf.h>
-
-#if !defined(KERNEL) && !defined(_KERNEL)
-#include <stdlib.h>
-#endif
-
-#define int32 bpf_int32
-#define u_int32 bpf_u_int32
-
-#ifndef LBL_ALIGN
-/*
- * XXX - IA-64?  If not, this probably won't work on Win64 IA-64
- * systems, unless LBL_ALIGN is defined elsewhere for them.
- * XXX - SuperH?  If not, this probably won't work on WinCE SuperH
- * systems, unless LBL_ALIGN is defined elsewhere for them.
- */
-#if defined(sparc) || defined(__sparc__) || defined(mips) || \
-    defined(ibm032) || defined(__alpha) || defined(__hpux) || \
-    defined(__arm__)
-#define LBL_ALIGN
-#endif
-#endif
-
-#ifndef LBL_ALIGN
-#ifndef _WIN32
-#include <netinet/in.h>
-#endif
-
-#define EXTRACT_SHORT(p)	((u_short)ntohs(*(u_short *)p))
-#define EXTRACT_LONG(p)		(ntohl(*(u_int32 *)p))
-#else
-#define EXTRACT_SHORT(p)\
-	((u_short)\
-		((u_short)*((u_char *)p+0)<<8|\
-		 (u_short)*((u_char *)p+1)<<0))
-#define EXTRACT_LONG(p)\
-		((u_int32)*((u_char *)p+0)<<24|\
-		 (u_int32)*((u_char *)p+1)<<16|\
-		 (u_int32)*((u_char *)p+2)<<8|\
-		 (u_int32)*((u_char *)p+3)<<0)
-#endif
-
-#if defined(KERNEL) || defined(_KERNEL)
-# if !defined(__hpux) && !SOLARIS
-#include <sys/mbuf.h>
-# endif
-#define MINDEX(len, _m, _k) \
-{ \
-	len = MLEN(m); \
-	while ((_k) >= len) { \
-		(_k) -= len; \
-		(_m) = (_m)->m_next; \
-		if ((_m) == 0) \
-			return 0; \
-		len = MLEN(m); \
-	} \
-}
-
-static int
-m_xword(m, k, err)
-	register struct mbuf *m;
-	register int k, *err;
-{
-	register int len;
-	register u_char *cp, *np;
-	register struct mbuf *m0;
-
-	MINDEX(len, m, k);
-	cp = mtod(m, u_char *) + k;
-	if (len - k >= 4) {
-		*err = 0;
-		return EXTRACT_LONG(cp);
-	}
-	m0 = m->m_next;
-	if (m0 == 0 || MLEN(m0) + len - k < 4)
-		goto bad;
-	*err = 0;
-	np = mtod(m0, u_char *);
-	switch (len - k) {
-
-	case 1:
-		return (cp[0] << 24) | (np[0] << 16) | (np[1] << 8) | np[2];
-
-	case 2:
-		return (cp[0] << 24) | (cp[1] << 16) | (np[0] << 8) | np[1];
-
-	default:
-		return (cp[0] << 24) | (cp[1] << 16) | (cp[2] << 8) | np[0];
-	}
-    bad:
-	*err = 1;
-	return 0;
-}
-
-static int
-m_xhalf(m, k, err)
-	register struct mbuf *m;
-	register int k, *err;
-{
-	register int len;
-	register u_char *cp;
-	register struct mbuf *m0;
-
-	MINDEX(len, m, k);
-	cp = mtod(m, u_char *) + k;
-	if (len - k >= 2) {
-		*err = 0;
-		return EXTRACT_SHORT(cp);
-	}
-	m0 = m->m_next;
-	if (m0 == 0)
-		goto bad;
-	*err = 0;
-	return (cp[0] << 8) | mtod(m0, u_char *)[0];
- bad:
-	*err = 1;
-	return 0;
-}
-#endif
-
-#ifdef __linux__
-#include <linux/types.h>
-#include <linux/if_packet.h>
-#include <linux/filter.h>
-#endif
-
-enum {
-        BPF_S_ANC_NONE,
-        BPF_S_ANC_VLAN_TAG,
-        BPF_S_ANC_VLAN_TAG_PRESENT,
-};
-
-/*
- * Execute the filter program starting at pc on the packet p
- * wirelen is the length of the original packet
- * buflen is the amount of data present
- * aux_data is auxiliary data, currently used only when interpreting
- * filters intended for the Linux kernel in cases where the kernel
- * rejects the filter; it contains VLAN tag information
- * For the kernel, p is assumed to be a pointer to an mbuf if buflen is 0,
- * in all other cases, p is a pointer to a buffer and buflen is its size.
- *
- * Thanks to Ani Sinha <ani@arista.com> for providing initial implementation
- */
-u_int
-bpf_filter_with_aux_data(pc, p, wirelen, buflen, aux_data)
-	register const struct bpf_insn *pc;
-	register const u_char *p;
-	u_int wirelen;
-	register u_int buflen;
-	register const struct bpf_aux_data *aux_data;
-{
-	register u_int32 A, X;
-	register bpf_u_int32 k;
-	u_int32 mem[BPF_MEMWORDS];
-#if defined(KERNEL) || defined(_KERNEL)
-	struct mbuf *m, *n;
-	int merr, len;
-
-	if (buflen == 0) {
-		m = (struct mbuf *)p;
-		p = mtod(m, u_char *);
-		buflen = MLEN(m);
-	} else
-		m = NULL;
-#endif
-
-	if (pc == 0)
-		/*
-		 * No filter means accept all.
-		 */
-		return (u_int)-1;
-	A = 0;
-	X = 0;
-	--pc;
-	while (1) {
-		++pc;
-		switch (pc->code) {
-
-		default:
-#if defined(KERNEL) || defined(_KERNEL)
-			return 0;
-#else
-			abort();
-#endif
-		case BPF_RET|BPF_K:
-			return (u_int)pc->k;
-
-		case BPF_RET|BPF_A:
-			return (u_int)A;
-
-		case BPF_LD|BPF_W|BPF_ABS:
-			k = pc->k;
-			if (k > buflen || sizeof(int32_t) > buflen - k) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				A = m_xword(m, k, &merr);
-				if (merr != 0)
-					return 0;
-				continue;
-#else
-				return 0;
-#endif
-			}
-			A = EXTRACT_LONG(&p[k]);
-			continue;
-
-		case BPF_LD|BPF_H|BPF_ABS:
-			k = pc->k;
-			if (k > buflen || sizeof(int16_t) > buflen - k) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				A = m_xhalf(m, k, &merr);
-				if (merr != 0)
-					return 0;
-				continue;
-#else
-				return 0;
-#endif
-			}
-			A = EXTRACT_SHORT(&p[k]);
-			continue;
-
-		case BPF_LD|BPF_B|BPF_ABS:
-			{
-#if defined(SKF_AD_VLAN_TAG) && defined(SKF_AD_VLAN_TAG_PRESENT)
-				int code = BPF_S_ANC_NONE;
-#define ANCILLARY(CODE) case SKF_AD_OFF + SKF_AD_##CODE:		\
-				code = BPF_S_ANC_##CODE;		\
-                                        if (!aux_data)                  \
-                                                return 0;               \
-                                        break;
-
-				switch (pc->k) {
-					ANCILLARY(VLAN_TAG);
-					ANCILLARY(VLAN_TAG_PRESENT);
-				default :
-#endif
-					k = pc->k;
-					if (k >= buflen) {
-#if defined(KERNEL) || defined(_KERNEL)
-						if (m == NULL)
-							return 0;
-						n = m;
-						MINDEX(len, n, k);
-						A = mtod(n, u_char *)[k];
-						continue;
-#else
-						return 0;
-#endif
-					}
-					A = p[k];
-#if defined(SKF_AD_VLAN_TAG) && defined(SKF_AD_VLAN_TAG_PRESENT)
-				}
-				switch (code) {
-				case BPF_S_ANC_VLAN_TAG:
-					if (aux_data)
-						A = aux_data->vlan_tag;
-					break;
-
-				case BPF_S_ANC_VLAN_TAG_PRESENT:
-					if (aux_data)
-						A = aux_data->vlan_tag_present;
-					break;
-				}
-#endif
-				continue;
-			}
-		case BPF_LD|BPF_W|BPF_LEN:
-			A = wirelen;
-			continue;
-
-		case BPF_LDX|BPF_W|BPF_LEN:
-			X = wirelen;
-			continue;
-
-		case BPF_LD|BPF_W|BPF_IND:
-			k = X + pc->k;
-			if (pc->k > buflen || X > buflen - pc->k ||
-			    sizeof(int32_t) > buflen - k) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				A = m_xword(m, k, &merr);
-				if (merr != 0)
-					return 0;
-				continue;
-#else
-				return 0;
-#endif
-			}
-			A = EXTRACT_LONG(&p[k]);
-			continue;
-
-		case BPF_LD|BPF_H|BPF_IND:
-			k = X + pc->k;
-			if (X > buflen || pc->k > buflen - X ||
-			    sizeof(int16_t) > buflen - k) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				A = m_xhalf(m, k, &merr);
-				if (merr != 0)
-					return 0;
-				continue;
-#else
-				return 0;
-#endif
-			}
-			A = EXTRACT_SHORT(&p[k]);
-			continue;
-
-		case BPF_LD|BPF_B|BPF_IND:
-			k = X + pc->k;
-			if (pc->k >= buflen || X >= buflen - pc->k) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				n = m;
-				MINDEX(len, n, k);
-				A = mtod(n, u_char *)[k];
-				continue;
-#else
-				return 0;
-#endif
-			}
-			A = p[k];
-			continue;
-
-		case BPF_LDX|BPF_MSH|BPF_B:
-			k = pc->k;
-			if (k >= buflen) {
-#if defined(KERNEL) || defined(_KERNEL)
-				if (m == NULL)
-					return 0;
-				n = m;
-				MINDEX(len, n, k);
-				X = (mtod(n, char *)[k] & 0xf) << 2;
-				continue;
-#else
-				return 0;
-#endif
-			}
-			X = (p[pc->k] & 0xf) << 2;
-			continue;
-
-		case BPF_LD|BPF_IMM:
-			A = pc->k;
-			continue;
-
-		case BPF_LDX|BPF_IMM:
-			X = pc->k;
-			continue;
-
-		case BPF_LD|BPF_MEM:
-			A = mem[pc->k];
-			continue;
-
-		case BPF_LDX|BPF_MEM:
-			X = mem[pc->k];
-			continue;
-
-		case BPF_ST:
-			mem[pc->k] = A;
-			continue;
-
-		case BPF_STX:
-			mem[pc->k] = X;
-			continue;
-
-		case BPF_JMP|BPF_JA:
-#if defined(KERNEL) || defined(_KERNEL)
-			/*
-			 * No backward jumps allowed.
-			 */
-			pc += pc->k;
-#else
-			/*
-			 * XXX - we currently implement "ip6 protochain"
-			 * with backward jumps, so sign-extend pc->k.
-			 */
-			pc += (bpf_int32)pc->k;
-#endif
-			continue;
-
-		case BPF_JMP|BPF_JGT|BPF_K:
-			pc += (A > pc->k) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JGE|BPF_K:
-			pc += (A >= pc->k) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JEQ|BPF_K:
-			pc += (A == pc->k) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JSET|BPF_K:
-			pc += (A & pc->k) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JGT|BPF_X:
-			pc += (A > X) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JGE|BPF_X:
-			pc += (A >= X) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JEQ|BPF_X:
-			pc += (A == X) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_JMP|BPF_JSET|BPF_X:
-			pc += (A & X) ? pc->jt : pc->jf;
-			continue;
-
-		case BPF_ALU|BPF_ADD|BPF_X:
-			A += X;
-			continue;
-
-		case BPF_ALU|BPF_SUB|BPF_X:
-			A -= X;
-			continue;
-
-		case BPF_ALU|BPF_MUL|BPF_X:
-			A *= X;
-			continue;
-
-		case BPF_ALU|BPF_DIV|BPF_X:
-			if (X == 0)
-				return 0;
-			A /= X;
-			continue;
-
-		case BPF_ALU|BPF_MOD|BPF_X:
-			if (X == 0)
-				return 0;
-			A %= X;
-			continue;
-
-		case BPF_ALU|BPF_AND|BPF_X:
-			A &= X;
-			continue;
-
-		case BPF_ALU|BPF_OR|BPF_X:
-			A |= X;
-			continue;
-
-		case BPF_ALU|BPF_XOR|BPF_X:
-			A ^= X;
-			continue;
-
-		case BPF_ALU|BPF_LSH|BPF_X:
-			A <<= X;
-			continue;
-
-		case BPF_ALU|BPF_RSH|BPF_X:
-			A >>= X;
-			continue;
-
-		case BPF_ALU|BPF_ADD|BPF_K:
-			A += pc->k;
-			continue;
-
-		case BPF_ALU|BPF_SUB|BPF_K:
-			A -= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_MUL|BPF_K:
-			A *= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_DIV|BPF_K:
-			A /= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_MOD|BPF_K:
-			A %= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_AND|BPF_K:
-			A &= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_OR|BPF_K:
-			A |= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_XOR|BPF_K:
-			A ^= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_LSH|BPF_K:
-			A <<= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_RSH|BPF_K:
-			A >>= pc->k;
-			continue;
-
-		case BPF_ALU|BPF_NEG:
-			/*
-			 * Most BPF arithmetic is unsigned, but negation
-			 * can't be unsigned; throw some casts to
-			 * specify what we're trying to do.
-			 */
-			A = (u_int32)(-(int32)A);
-			continue;
-
-		case BPF_MISC|BPF_TAX:
-			X = A;
-			continue;
-
-		case BPF_MISC|BPF_TXA:
-			A = X;
-			continue;
-		}
-	}
-}
-
-u_int
-bpf_filter(pc, p, wirelen, buflen)
-	register const struct bpf_insn *pc;
-	register const u_char *p;
-	u_int wirelen;
-	register u_int buflen;
-{
-	return bpf_filter_with_aux_data(pc, p, wirelen, buflen, NULL);
-}
-
-
-/*
- * Return true if the 'fcode' is a valid filter program.
- * The constraints are that each jump be forward and to a valid
- * code, that memory accesses are within valid ranges (to the
- * extent that this can be checked statically; loads of packet
- * data have to be, and are, also checked at run time), and that
- * the code terminates with either an accept or reject.
- *
- * The kernel needs to be able to verify an application's filter code.
- * Otherwise, a bogus program could easily crash the system.
- */
-int
-bpf_validate(f, len)
-	const struct bpf_insn *f;
-	int len;
-{
-	u_int i, from;
-	const struct bpf_insn *p;
-
-	if (len < 1)
-		return 0;
-	/*
-	 * There's no maximum program length in userland.
-	 */
-#if defined(KERNEL) || defined(_KERNEL)
-	if (len > BPF_MAXINSNS)
-		return 0;
-#endif
-
-	for (i = 0; i < (u_int)len; ++i) {
-		p = &f[i];
-		switch (BPF_CLASS(p->code)) {
-		/*
-		 * Check that memory operations use valid addresses.
-		 */
-		case BPF_LD:
-		case BPF_LDX:
-			switch (BPF_MODE(p->code)) {
-			case BPF_IMM:
-				break;
-			case BPF_ABS:
-			case BPF_IND:
-			case BPF_MSH:
-				/*
-				 * There's no maximum packet data size
-				 * in userland.  The runtime packet length
-				 * check suffices.
-				 */
-#if defined(KERNEL) || defined(_KERNEL)
-				/*
-				 * More strict check with actual packet length
-				 * is done runtime.
-				 */
-				if (p->k >= bpf_maxbufsize)
-					return 0;
-#endif
-				break;
-			case BPF_MEM:
-				if (p->k >= BPF_MEMWORDS)
-					return 0;
-				break;
-			case BPF_LEN:
-				break;
-			default:
-				return 0;
-			}
-			break;
-		case BPF_ST:
-		case BPF_STX:
-			if (p->k >= BPF_MEMWORDS)
-				return 0;
-			break;
-		case BPF_ALU:
-			switch (BPF_OP(p->code)) {
-			case BPF_ADD:
-			case BPF_SUB:
-			case BPF_MUL:
-			case BPF_OR:
-			case BPF_AND:
-			case BPF_XOR:
-			case BPF_LSH:
-			case BPF_RSH:
-			case BPF_NEG:
-				break;
-			case BPF_DIV:
-			case BPF_MOD:
-				/*
-				 * Check for constant division or modulus
-				 * by 0.
-				 */
-				if (BPF_SRC(p->code) == BPF_K && p->k == 0)
-					return 0;
-				break;
-			default:
-				return 0;
-			}
-			break;
-		case BPF_JMP:
-			/*
-			 * Check that jumps are within the code block,
-			 * and that unconditional branches don't go
-			 * backwards as a result of an overflow.
-			 * Unconditional branches have a 32-bit offset,
-			 * so they could overflow; we check to make
-			 * sure they don't.  Conditional branches have
-			 * an 8-bit offset, and the from address is <=
-			 * BPF_MAXINSNS, and we assume that BPF_MAXINSNS
-			 * is sufficiently small that adding 255 to it
-			 * won't overflow.
-			 *
-			 * We know that len is <= BPF_MAXINSNS, and we
-			 * assume that BPF_MAXINSNS is < the maximum size
-			 * of a u_int, so that i + 1 doesn't overflow.
-			 *
-			 * For userland, we don't know that the from
-			 * or len are <= BPF_MAXINSNS, but we know that
-			 * from <= len, and, except on a 64-bit system,
-			 * it's unlikely that len, if it truly reflects
-			 * the size of the program we've been handed,
-			 * will be anywhere near the maximum size of
-			 * a u_int.  We also don't check for backward
-			 * branches, as we currently support them in
-			 * userland for the protochain operation.
-			 */
-			from = i + 1;
-			switch (BPF_OP(p->code)) {
-			case BPF_JA:
-#if defined(KERNEL) || defined(_KERNEL)
-				if (from + p->k < from || from + p->k >= len)
-#else
-				if (from + p->k >= (u_int)len)
-#endif
-					return 0;
-				break;
-			case BPF_JEQ:
-			case BPF_JGT:
-			case BPF_JGE:
-			case BPF_JSET:
-				if (from + p->jt >= (u_int)len || from + p->jf >= (u_int)len)
-					return 0;
-				break;
-			default:
-				return 0;
-			}
-			break;
-		case BPF_RET:
-			break;
-		case BPF_MISC:
-			break;
-		default:
-			return 0;
-		}
-	}
-	return BPF_CLASS(f[len - 1].code) == BPF_RET;
-}
Index: vendor/libpcap/dist/remote-ext.h
===================================================================
--- vendor/libpcap/dist/remote-ext.h	(revision 333788)
+++ vendor/libpcap/dist/remote-ext.h	(nonexistent)
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 2002 - 2003
- * NetGroup, Politecnico di Torino (Italy)
- * All rights reserved.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-
-#ifndef __REMOTE_EXT_H__
-#define __REMOTE_EXT_H__
-
-
-#ifndef HAVE_REMOTE
-#error Please do not include this file directly. Just define HAVE_REMOTE and then include pcap.h
-#endif
-
-/*// Definition for Microsoft Visual Studio */
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * \file remote-ext.h
- *
- * The goal of this file it to include most of the new definitions that should be
- * placed into the pcap.h file.
- *
- * It includes all new definitions (structures and functions like pcap_open().
- * Some of the functions are not really a remote feature, but, right now,
- * they are placed here.
- */
-
-
-
-/*// All this stuff is public */
-/*
- * \addtogroup remote_struct
- * \{
- */
-
-
-
-
-/*
- * \brief Defines the maximum buffer size in which address, port, interface names are kept.
- *
- * In case the adapter name or such is larger than this value, it is truncated.
- * This is not used by the user; however it must be aware that an hostname / interface
- * name longer than this value will be truncated.
- */
-#define PCAP_BUF_SIZE 1024
-
-
-/*
- * \addtogroup remote_source_ID
- * \{
- */
-
-
-/*
- * \brief Internal representation of the type of source in use (file,
- * remote/local interface).
- *
- * This indicates a file, i.e. the user want to open a capture from a local file.
- */
-#define PCAP_SRC_FILE 2
-/*
- * \brief Internal representation of the type of source in use (file,
- * remote/local interface).
- *
- * This indicates a local interface, i.e. the user want to open a capture from
- * a local interface. This does not involve the RPCAP protocol.
- */
-#define PCAP_SRC_IFLOCAL 3
-/*
- * \brief Internal representation of the type of source in use (file,
- * remote/local interface).
- *
- * This indicates a remote interface, i.e. the user want to open a capture from
- * an interface on a remote host. This does involve the RPCAP protocol.
- */
-#define PCAP_SRC_IFREMOTE 4
-
-/*
- * \}
- */
-
-
-
-/* \addtogroup remote_source_string
- *
- * The formats allowed by the pcap_open() are the following:
- * - file://path_and_filename [opens a local file]
- * - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
- * - rpcap://host/devicename [opens the selected device available on a remote host]
- * - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
- * - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
- * - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
- *
- * The formats allowed by the pcap_findalldevs_ex() are the following:
- * - file://folder/ [lists all the files in the given folder]
- * - rpcap:// [lists all local adapters]
- * - rpcap://host:port/ [lists the devices available on a remote host]
- *
- * Referring to the 'host' and 'port' parameters, they can be either numeric or literal. Since
- * IPv6 is fully supported, these are the allowed formats:
- *
- * - host (literal): e.g. host.foo.bar
- * - host (numeric IPv4): e.g. 10.11.12.13
- * - host (numeric IPv4, IPv6 style): e.g. [10.11.12.13]
- * - host (numeric IPv6): e.g. [1:2:3::4]
- * - port: can be either numeric (e.g. '80') or literal (e.g. 'http')
- *
- * Here you find some allowed examples:
- * - rpcap://host.foo.bar/devicename [everything literal, no port number]
- * - rpcap://host.foo.bar:1234/devicename [everything literal, with port number]
- * - rpcap://10.11.12.13/devicename [IPv4 numeric, no port number]
- * - rpcap://10.11.12.13:1234/devicename [IPv4 numeric, with port number]
- * - rpcap://[10.11.12.13]:1234/devicename [IPv4 numeric with IPv6 format, with port number]
- * - rpcap://[1:2:3::4]/devicename [IPv6 numeric, no port number]
- * - rpcap://[1:2:3::4]:1234/devicename [IPv6 numeric, with port number]
- * - rpcap://[1:2:3::4]:http/devicename [IPv6 numeric, with literal port number]
- *
- * \{
- */
-
-
-/*
- * \brief String that will be used to determine the type of source in use (file,
- * remote/local interface).
- *
- * This string will be prepended to the interface name in order to create a string
- * that contains all the information required to open the source.
- *
- * This string indicates that the user wants to open a capture from a local file.
- */
-#define PCAP_SRC_FILE_STRING "file://"
-/*
- * \brief String that will be used to determine the type of source in use (file,
- * remote/local interface).
- *
- * This string will be prepended to the interface name in order to create a string
- * that contains all the information required to open the source.
- *
- * This string indicates that the user wants to open a capture from a network interface.
- * This string does not necessarily involve the use of the RPCAP protocol. If the
- * interface required resides on the local host, the RPCAP protocol is not involved
- * and the local functions are used.
- */
-#define PCAP_SRC_IF_STRING "rpcap://"
-
-/*
- * \}
- */
-
-
-
-
-
-/*
- * \addtogroup remote_open_flags
- * \{
- */
-
-/*
- * \brief Defines if the adapter has to go in promiscuous mode.
- *
- * It is '1' if you have to open the adapter in promiscuous mode, '0' otherwise.
- * Note that even if this parameter is false, the interface could well be in promiscuous
- * mode for some other reason (for example because another capture process with
- * promiscuous mode enabled is currently using that interface).
- * On on Linux systems with 2.2 or later kernels (that have the "any" device), this
- * flag does not work on the "any" device; if an argument of "any" is supplied,
- * the 'promisc' flag is ignored.
- */
-#define PCAP_OPENFLAG_PROMISCUOUS		1
-
-/*
- * \brief Defines if the data transfer (in case of a remote
- * capture) has to be done with UDP protocol.
- *
- * If it is '1' if you want a UDP data connection, '0' if you want
- * a TCP data connection; control connection is always TCP-based.
- * A UDP connection is much lighter, but it does not guarantee that all
- * the captured packets arrive to the client workstation. Moreover,
- * it could be harmful in case of network congestion.
- * This flag is meaningless if the source is not a remote interface.
- * In that case, it is simply ignored.
- */
-#define PCAP_OPENFLAG_DATATX_UDP			2
-
-
-/*
- * \brief Defines if the remote probe will capture its own generated traffic.
- *
- * In case the remote probe uses the same interface to capture traffic and to send
- * data back to the caller, the captured traffic includes the RPCAP traffic as well.
- * If this flag is turned on, the RPCAP traffic is excluded from the capture, so that
- * the trace returned back to the collector is does not include this traffic.
- */
-#define PCAP_OPENFLAG_NOCAPTURE_RPCAP	4
-
-/*
- * \brief Defines if the local adapter will capture its own generated traffic.
- *
- * This flag tells the underlying capture driver to drop the packets that were sent by itself.
- * This is useful when building applications like bridges, that should ignore the traffic
- * they just sent.
- */
-#define PCAP_OPENFLAG_NOCAPTURE_LOCAL	8
-
-/*
- * \brief This flag configures the adapter for maximum responsiveness.
- *
- * In presence of a large value for nbytes, WinPcap waits for the arrival of several packets before
- * copying the data to the user. This guarantees a low number of system calls, i.e. lower processor usage,
- * i.e. better performance, which is good for applications like sniffers. If the user sets the
- * PCAP_OPENFLAG_MAX_RESPONSIVENESS flag, the capture driver will copy the packets as soon as the application
- * is ready to receive them. This is suggested for real time applications (like, for example, a bridge)
- * that need the best responsiveness.
- */
-#define PCAP_OPENFLAG_MAX_RESPONSIVENESS	16
-
-/*
- * \}
- */
-
-
-/*
- * \addtogroup remote_samp_methods
- * \{
- */
-
-/*
- *\brief No sampling has to be done on the current capture.
- *
- * In this case, no sampling algorithms are applied to the current capture.
- */
-#define PCAP_SAMP_NOSAMP	0
-
-/*
- * \brief It defines that only 1 out of N packets must be returned to the user.
- *
- * In this case, the 'value' field of the 'pcap_samp' structure indicates the
- * number of packets (minus 1) that must be discarded before one packet got accepted.
- * In other words, if 'value = 10', the first packet is returned to the caller, while
- * the following 9 are discarded.
- */
-#define PCAP_SAMP_1_EVERY_N	1
-
-/*
- * \brief It defines that we have to return 1 packet every N milliseconds.
- *
- * In this case, the 'value' field of the 'pcap_samp' structure indicates the 'waiting
- * time' in milliseconds before one packet got accepted.
- * In other words, if 'value = 10', the first packet is returned to the caller; the next
- * returned one will be the first packet that arrives when 10ms have elapsed.
- */
-#define PCAP_SAMP_FIRST_AFTER_N_MS 2
-
-/*
- * \}
- */
-
-
-/*
- * \addtogroup remote_auth_methods
- * \{
- */
-
-/*
- * \brief It defines the NULL authentication.
- *
- * This value has to be used within the 'type' member of the pcap_rmtauth structure.
- * The 'NULL' authentication has to be equal to 'zero', so that old applications
- * can just put every field of struct pcap_rmtauth to zero, and it does work.
- */
-#define RPCAP_RMTAUTH_NULL 0
-/*
- * \brief It defines the username/password authentication.
- *
- * With this type of authentication, the RPCAP protocol will use the username/
- * password provided to authenticate the user on the remote machine. If the
- * authentication is successful (and the user has the right to open network devices)
- * the RPCAP connection will continue; otherwise it will be dropped.
- *
- * This value has to be used within the 'type' member of the pcap_rmtauth structure.
- */
-#define RPCAP_RMTAUTH_PWD 1
-
-/*
- * \}
- */
-
-
-
-
-/*
- * \brief This structure keeps the information needed to autheticate
- * the user on a remote machine.
- *
- * The remote machine can either grant or refuse the access according
- * to the information provided.
- * In case the NULL authentication is required, both 'username' and
- * 'password' can be NULL pointers.
- *
- * This structure is meaningless if the source is not a remote interface;
- * in that case, the functions which requires such a structure can accept
- * a NULL pointer as well.
- */
-struct pcap_rmtauth
-{
-	/*
-	 * \brief Type of the authentication required.
-	 *
-	 * In order to provide maximum flexibility, we can support different types
-	 * of authentication based on the value of this 'type' variable. The currently
-	 * supported authentication methods are defined into the
-	 * \link remote_auth_methods Remote Authentication Methods Section\endlink.
-	 */
-	int type;
-	/*
-	 * \brief Zero-terminated string containing the username that has to be
-	 * used on the remote machine for authentication.
-	 *
-	 * This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
-	 * and it can be NULL.
-	 */
-	char *username;
-	/*
-	 * \brief Zero-terminated string containing the password that has to be
-	 * used on the remote machine for authentication.
-	 *
-	 * This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
-	 * and it can be NULL.
-	 */
-	char *password;
-};
-
-
-/*
- * \brief This structure defines the information related to sampling.
- *
- * In case the sampling is requested, the capturing device should read
- * only a subset of the packets coming from the source. The returned packets depend
- * on the sampling parameters.
- *
- * \warning The sampling process is applied <strong>after</strong> the filtering process.
- * In other words, packets are filtered first, then the sampling process selects a
- * subset of the 'filtered' packets and it returns them to the caller.
- */
-struct pcap_samp
-{
-	/*
-	 * Method used for sampling. Currently, the supported methods are listed in the
-	 * \link remote_samp_methods Sampling Methods Section\endlink.
-	 */
-	int method;
-
-	/*
-	 * This value depends on the sampling method defined. For its meaning, please check
-	 * at the \link remote_samp_methods Sampling Methods Section\endlink.
-	 */
-	int value;
-};
-
-
-
-
-// Maximum length of an host name (needed for the RPCAP active mode)
-#define RPCAP_HOSTLIST_SIZE 1024
-
-
-/*
- * \}
- */ // end of public documentation
-
-
-// Exported functions
-
-
-
-/*
- * \name New WinPcap functions
- *
- * This section lists the new functions that are able to help considerably in writing
- * WinPcap programs because of their easiness of use.
- */
-// \{
-PCAP_API pcap_t *pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf);
-PCAP_API int pcap_createsrcstr(char *source, int type, const char *host, const char *port, const char *name, char *errbuf);
-PCAP_API int pcap_parsesrcstr(const char *source, int *type, char *host, char *port, char *name, char *errbuf);
-PCAP_API int pcap_findalldevs_ex(char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf);
-PCAP_API struct pcap_samp *pcap_setsampling(pcap_t *p);
-
-// \}
-// End of new WinPcap functions
-
-/*
- * \name Remote Capture functions
- */
-
-/*
- * Some minor differences between UN*X sockets and and Winsock sockets.
- */
-#ifndef _WIN32
-  /*!
-   * \brief In Winsock, a socket handle is of type SOCKET; in UN*X, it's
-   * a file descriptor, and therefore a signed integer.
-   * We define SOCKET to be a signed integer on UN*X, so that it can
-   * be used on both platforms.
-   */
-  #define SOCKET int
-
-  /*!
-   * \brief In Winsock, the error return if socket() fails is INVALID_SOCKET;
-   * in UN*X, it's -1.
-   * We define INVALID_SOCKET to be -1 on UN*X, so that it can be used on
-   * both platforms.
-   */
-  #define INVALID_SOCKET -1
-#endif
-
-// \{
-PCAP_API SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf);
-PCAP_API int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf);
-PCAP_API int pcap_remoteact_close(const char *host, char *errbuf);
-PCAP_API void pcap_remoteact_cleanup();
-// \}
-// End of remote capture functions
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-

Property changes on: vendor/libpcap/dist/remote-ext.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/CHANGES
===================================================================
--- vendor/libpcap/dist/CHANGES	(revision 333788)
+++ vendor/libpcap/dist/CHANGES	(revision 333789)
@@ -1,837 +1,864 @@
+Wednesday, Jan. 25, 2017 guy@alum.mit.edu
+  Summary for 1.9.0 libpcap release
+    Man page improvements
+    Fix Linux cooked mode userspace filtering (GitHub pull request #429)
+    Fix compilation if IPv6 support not enabled
+    Fix some Linux memory-mapped capture buffer size issues
+    Don't fail if kernel filter can't be set on Linux (GitHub issue
+      #549)
+    Improve sorting of interfaces for pcap_findalldevs()
+    Don't list Linux usbmon devices if usbmon module isn't loaded
+    Report PCAP_ERROR_PERM_DENIED if no permission to open Linux usbmon
+      devices
+    Fix DLT_ type for Solaris IPNET devices
+    Always return an error message for errors finding DAG or Myricom
+      devices
+    If possible, don't require that a device be openable when
+      enumerating them for pcap_findalldevs()
+    Don't put incompletely-initialized addresses in the address list for
+    When finding Myricom devices, update description for regular
+      interfaces that are Myricom devices and handle SNF_FLAGS=0x2(port
+      aggregation enabled)
+    Fix compilation error in DAG support
+    Fix issues with CMake configuration
+    Add support for stream buffers larger than 2GB on newer DAG cards
+    Remove support for building against DAG versions without STREAMS
+      support (before dag-3.0.0 2007)
+
 Tuesday, Oct. 25, 2016 mcr@sandelman.ca
   Summary for 1.8.1 libpcap release
     Add a target in Makefile.in for Exuberant Ctags use: 'extags'.
     Rename configure.in to configure.ac: autoconf 2.59
     Clean up the name-to-DLT mapping table.
     Add some newer DLT_ values: IPMI_HPM_2,ZWAVE_R1_R2,ZWAVE_R3,WATTSTOPPER_DLM,ISO_14443,RDS
     Clarify what the return values are for both success and failure.
     Many changes to build on windows
     Check for the "break the loop" condition in the inner loop for TPACKET_V3.
     Fix handling of packet count in the TPACKET_V3 inner loop: GitHub issue #493.
     Filter out duplicate looped back CAN frames.
     Fix the handling of loopback filters for IPv6 packets.
     Add a link-layer header type for RDS (IEC 62106) groups.
     Use different intermediate folders for x86 and x64 builds on Windows.
     On Linux, handle all CAN captures with pcap-linux.c, in cooked mode.
     Removes the need for the "host-endian" link-layer header type.
     Compile with '-Wused-but-marked-unused' in devel mode if supported
     Have separate DLTs for big-endian and host-endian SocketCAN headers.
     Reflect version.h being renamed to pcap_version.h.
     Require that version.h be generated: all build procedures we support generate version.h (autoconf, CMake, MSVC)!
     Properly check for sock_recv() errors.
     Re-impose some of Winsock's limitations on sock_recv().
     Replace sprintf() with pcap_snprintf().
     Fix signature of pcap_stats_ex_remote().
     Initial cmake support for remote packet capture.
     Have rpcap_remoteact_getsock() return a SOCKET and supply an "is active" flag.
     Clean up {DAG, Septel, Myricom SNF}-only builds.
     Do UTF-16-to-ASCII conversion into the right place.
     pcap_create_interface() needs the interface name on Linux.
     Clean up hardware time stamp support: the "any" device does not support any time stamp types.
     Add support for capturing on FreeBSD usbusN interfaces.
     Add a LINKTYPE/DLT_ value for FreeBSD USB.
     Go back to using PCAP_API on Windows.
     CMake support
     Add TurboCap support from WinPcap.
     Recognize 802.1ad nested VLAN tag in vlan filter.
 
 Thursday Sep. 3, 2015 guy@alum.mit.edu
   Summary for 1.7.5 libpcap release
 	Man page cleanups.
 	Add some allocation failure checks.
 	Fix a number of Linux/ucLinux configure/build issues.
 	Fix some memory leaks.
 	Recognize 802.1ad nested VLAN tag in vlan filter.
 	Fix building Bluetooth Linux Monitor support with BlueZ 5.1+
 
 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
 	    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
 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
 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
 Summary for 1.5.0 libpcap release
 	TPACKET_V3 support added for Linux
 	Point users to the the-tcpdump-group repository on GitHub rather
 	    than the mcr repository
 	Checks added for malloc()/realloc()/etc. failures
 	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
         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
 
 Saturday April 6, 2013 guy@alum.mit.edu
 Summary for 1.4.0 libpcap release
 	Add netfilter/nfqueue interface.
 	If we don't have support for IPv6 address resolution, support,
 	    in filter expressions, what IPv6 stuff we can.
 	Fix pcap-config to include -lpthread if canusb support is
 	    present
 	Try to fix "pcap_parse not defined" problems when --without-flex
 	    and --without-bison are used when you have Flex and Bison
 	Fix some issues with the pcap_loop man page.
 	Fix pcap_getnonblock() and pcap_setnonblock() to fill in the
 	    supplied error message buffer
 	Fix typo that, it appeared, would cause pcap-libdlpi.c not to
 	    compile (perhaps systems with libdlpi also have BPF and use
 	    that instead)
 	Catch attempts to call pcap_compile() on a non-activated pcap_t
 	Fix crash on Linux with CAN-USB support without usbfs
 	Fix addition of VLAN tags for Linux cooked captures
 	Check for both EOPNOTSUPP and EINVAL after SIOCETHTOOL ioctl, so
 	    that the driver can report either one if it doesn't support
 	    SIOCETHTOOL
 	Add DLT_INFINIBAND and DLT_SCTP
 	Describe "proto XXX" and "protochain XXX" in the pcap-filter man
 	    page
 	Handle either directories, or symlinks to directories, that
 	    correspond to interfaces in /sys/class/net
 	Fix handling of VLAN tag insertion to check, on Linux 3.x
 	    kernels, for VLAN tag valid flag
 	Clean up some man pages
 	Support libnl3 as well as libnl1 and libnl2 on Linux
 	Fix handling of Bluetooth devices on 3.x Linux kernels
 
 Friday  March 30, 2012.  mcr@sandelman.ca
 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.  guy@alum.mit.edu.
 Summary for 1.2.1 libpcap release
 	Update README file.
 	Fix typoes in README.linux file.
 	Clean up some compiler warnings.
 	Fix Linux compile problems and tests for ethtool.h.
 	Treat Debian/kFreeBSD and GNU/Hurd as systems with GNU
 	 toolchains.
 	Support 802.1 QinQ as a form of VLAN in filters.
 	Treat "carp" as equivalent to "vrrp" in filters.
 	Fix code generated for "ip6 protochain".
 	Add some new link-layer header types.
 	Support capturing NetFilter log messages on Linux.
 	Clean up some error messages.
 	Turn off monitor mode on exit for mac80211 interfaces on Linux.
 	Fix problems turning monitor mode on for non-mac80211 interfaces
 	 on Linux.
 	Properly fail if /sys/class/net or /proc/net/dev exist but can't
 	 be opened.
 	Fail if pcap_activate() is called on an already-activated
 	 pcap_t, and add a test program for that.
 	Fix filtering in pcap-ng files.
 	Don't build for PowerPC on Mac OS X Lion.
 	Simplify handling of new DLT_/LINKTYPE_ values.
 	Expand pcap(3PCAP) man page.
 
 Sunday  July 24, 2011.  mcr@sandelman.ca.
 Summary for 1.2 libpcap release
         All of the changes listed below for 1.1.1 and 1.1.2.
         Changes to error handling for pcap_findalldevs().
         Fix the calculation of the frame size in memory-mapped captures.
         Add a link-layer header type for STANAG 5066 D_PDUs.
         Add a link-layer type for a variant of 3GPP TS 27.010.
         Noted real nature of LINKTYPE_ARCNET.
         Add a link-layer type for DVB-CI.
         Fix configure-script discovery of VLAN acceleration support.
          see http://netoptimizer.blogspot.com/2010/09/tcpdump-vs-vlan-tags.html
         Linux, HP-UX, AIX, NetBSD and OpenBSD compilation/conflict fixes.
         Protect against including AIX 5.x's <net/bpf.h> having been included.
         Add DLT_DBUS, for raw D-Bus messages.
         Treat either EPERM or EACCES as "no soup for you".
         Changes to permissions on DLPI systems.
         Add DLT_IEEE802_15_4_NOFCS for 802.15.4 interfaces.
 
 Fri.    August 6, 2010.  guy@alum.mit.edu.
 Summary for 1.1.2 libpcap release
 	Return DLT_ values, not raw LINKTYPE_ values from
 	  pcap_datalink() when reading pcap-ng files
 	Add support for "wlan ra" and "wlan ta", to check the RA and TA
 	  of WLAN frames that have them
 	Don't crash if "wlan addr{1,2,3,4}" are used without 802.11
 	  headers
 	Do filtering on USB and Bluetooth capturing
 	On FreeBSD/SPARC64, use -fPIC - it's apparently necessary
 	Check for valid port numbers (fit in a 16-bit unsigned field) in
 	  "port" filters
 	Reject attempts to put savefiles into non-blocking mode
 	Check for "no such device" for the "get the media types" ioctl
 	  in *BSD
 	Improve error messages from bpf_open(), and let it do the error
 	  handling
 	Return more specific errors from pcap_can_set_rfmon(); fix
 	  documentation
 	Update description fetching code for FreeBSD, fix code for
 	  OpenBSD
 	Ignore /sys/net/dev files if we get ENODEV for them, not just
 	  ENXIO; fixes handling of bonding devices on Linux
 	Fix check for a constant 0 argument to BPF_DIV
 	Use the right version of ar when cross-building
 	Free any filter set on a savefile when the savefile is closed
 	Include the CFLAGS setting when configure was run in the
 	  compiler flags
 	Add support for 802.15.4 interfaces on Linux
 
 Thu.    April 1, 2010.  guy@alum.mit.edu.
 Summary for 1.1.1 libpcap release
 	Update CHANGES to reflect more of the changes in 1.1.0.
 	Fix build on RHEL5.
 	Fix shared library build on AIX.
 
 Thu.	March 11, 2010.  ken@netfunctional.ca/guy@alum.mit.edu.
 Summary for 1.1.0 libpcap release
 	Add SocketCAN capture support
 	Add Myricom SNF API support
 	Update Endace DAG and ERF support
 	Add support for shared libraries on Solaris, HP-UX, and AIX
 	Build, install, and un-install shared libraries by default;
 	  don't build/install shared libraries on platforms we don't support
 	Fix building from a directory other than the source directory
 	Fix compiler warnings and builds on some platforms
 	Update config.guess and config.sub
 	Support monitor mode on mac80211 devices on Linux
 	Fix USB memory-mapped capturing on Linux; it requires a new DLT_
 	  value
 	On Linux, scan /sys/class/net for devices if we have it; scan
 	  it, or /proc/net/dev if we don't have /sys/class/net, even if
 	  we have getifaddrs(), as it'll find interfaces with no
 	  addresses
 	Add limited support for reading pcap-ng files
 	Fix BPF driver-loading error handling on AIX
 	Support getting the full-length interface description on FreeBSD
 	In the lexical analyzer, free up any addrinfo structure we got back
 	  from getaddrinfo().
 	Add support for BPF and libdlpi in OpenSolaris (and SXCE)
 	Hyphenate "link-layer" everywhere
 	Add /sys/kernel/debug/usb/usbmon to the list of usbmon locations
 	In pcap_read_linux_mmap(), if there are no frames available, call
 	  poll() even if we're in non-blocking mode, so we pick up
 	  errors, and check for the errors in question.
 	Note that poll() works on BPF devices is Snow Leopard
 	If an ENXIO or ENETDOWN is received, it may mean the device has
 	  gone away.  Deal with it.
 	For BPF, raise the default capture buffer size to from 32k to 512k
 	Support ps_ifdrop on Linux
 	Added a bunch of #ifdef directives to make wpcap.dll (WinPcap) compile
 	 under cygwin.
 	Changes to Linux mmapped captures.
 	Fix bug where create_ring would fail for particular snaplen and
 	  buffer size combinations
 	Update pcap-config so that it handles libpcap requiring
 	  additional libraries
 	Add workaround for threadsafeness on Windows
 	Add missing mapping for DLT_ENC <-> LINKTYPE_ENC
 	DLT: Add DLT_CAN_SOCKETCAN
 	DLT: Add Solaris ipnet
 	Don't check for DLT_IPNET if it's not defined
 	Add link-layer types for Fibre Channel FC-2
 	Add link-layer types for Wireless HART
 	Add link-layer types for AOS
 	Add link-layer types for DECT
 	Autoconf fixes (AIX, HP-UX, OSF/1, Tru64 cleanups)
 	Install headers unconditionally, and include vlan.h/bluetooth.h if
 	  enabled
 	Autoconf fixes+cleanup
 	Support enabling/disabling bluetooth (--{en,dis}able-bluetooth)
 	Support disabling SITA support (--without-sita)
 	Return -1 on failure to create packet ring (if supported but
 	  creation failed)
 	Fix handling of 'any' device, so that it can be opened, and no longer
 	  attempt to open it in Monitor mode
 	Add support for snapshot length for USB Memory-Mapped Interface
 	Fix configure and build on recent Linux kernels
 	Fix memory-mapped Linux capture to support pcap_next() and
 	  pcap_next_ex()
 	Fixes for Linux USB capture
 	DLT: Add DLT_LINUX_EVDEV
 	DLT: Add DLT_GSMTAP_UM
 	DLT: Add DLT_GSMTAP_ABIS
 
 Mon.    October 27, 2008.  ken@netfunctional.ca.  Summary for 1.0.0 libpcap release
 	Compile with IPv6 support by default
 	Compile with large file support on by default
 	Add pcap-config script, which deals with -I/-L flags for compiling
 	DLT: Add IPMB
 	DLT: Add LAPD
 	DLT: Add AX25 (AX.25 w/KISS header)
 	DLT: Add JUNIPER_ST
 	802.15.4 support
 	Variable length 802.11 header 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
 	Support for setting buffer size when opening devices
 	Support for setting monitor mode when opening 802.11 devices
 	Better support for dealing with VLAN tagging/stripping on Linux
 	Fix dynamic library support on OSX
 	Return PCAP_ERROR_IFACE_NOT_UP if the interface isn't 'UP', so applications
 	 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
 	 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
 	On Solaris, support 'passive mode' on systems that support it
 	Fixes to autoconf and general build environment
 	Man page reorganization + cleanup
 	Autogenerate VERSION numbers better
 
 Mon.    September 10, 2007.  ken@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.	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
 	 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@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@xelerance.com. Summary for 0.9.4 libpcap release
 
 	Support for radiotap on Linux (Mike Kershaw)
 	Fixes for HP-UX
 	Support for additional Juniper link-layer types
 	Fixes for filters on MPLS-encapsulated packets
 	"vlan" filter fixed
 	"pppoed" and "pppoes" filters added; the latter modifies later
 	parts of the filter expression to look at the PPP headers and
 	headers in the PPP payload
 
 Tue. 	July 5, 2005.  ken@xelerance.com. Summary for 0.9.3 libpcap release
 
 	Fixes for compiling on nearly every platform,
 		including improved 64bit support
 	MSDOS Support
 	Add support for sending packets
 	OpenBSD pf format support
 	IrDA capture (Linux only)
 
 Tue.   March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release
 
 	Fixed minor problem in gencode.c that would appear on 64-bit
 	platforms.
 	Version number is now sane.
 
 Mon.   March 29, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.2 release
 
 	updates for autoconf 2.5
 	fixes for ppp interfaces for freebsd 4.1
 	pcap gencode can generate code for 802.11, IEEE1394, and pflog.
 
 Wed.   November 12, 2003. mcr@sandelman.ottawa.on.ca. Summary for 0.8 release
 
 	added pcap_findalldevs()
 	Win32 patches from NetGroup, Politecnico di Torino (Italy)
 	OpenBSD pf, DLT_PFLOG added
 	Many changes to ATM support.
 	lookup pcap_lookupnet()
 	Added DLT_ARCNET_LINUX, DLT_ENC, DLT_IEEE802_11_RADIO, DLT_SUNATM,
 		DLT_IP_OVER_FC, DLT_FRELAY, others.
 	Sigh.  More AIX wonderfulness.
 	Document updates.
 	Changes to API: pcap_next_ex(), pcap_breakloop(), pcap_dump_flush(),
 			pcap_list_datalinks(), pcap_set_datalink(),
 			pcap_lib_version(), pcap_datalink_val_to_name(),
 			pcap_datalink_name_to_val(), new error returns.
 
 Tuesday, February 25, 2003. fenner@research.att.com.  0.7.2 release
 
  	Support link types that use 802.2 always, never, and sometimes.
  	Don't decrease the size of the BPF buffer from the default.
  	Support frame relay.
  	Handle 32-bit timestamps in DLPI, and pass the right buffer size.
  	Handle Linux systems with modern kernel but without
  	 SOL_PACKET in the userland headers.
  	Linux support for ARPHRD_RAWHDLC.
  	Handle 32-bit timestamps in snoop.
  	Support eg (Octane/O2xxx/O3xxx Gigabit) devices.
  	Add new reserved DLT types.
 
 Monday October 23, 2001. mcr@sandelman.ottawa.on.ca. Summary for 0.7 release
 
 	Added pcap_findalldevs() call to get list of interfaces in a MI way.
 
 	pcap_stats() has been documented as to what its counters mean on
 	each platform.
 
 Tuesday January 9, 2001. guy@alum.mit.edu. Summary for 0.6 release
 
 	New Linux libpcap implementation, which, in 2.2 and later
 	kernels, uses PF_PACKET sockets and supports kernel packet
 	filtering (if compiled into the kernel), and supports the "any"
 	device for capturing on all interfaces.  Cleans up promiscuous
 	mode better on pre-2.2 kernels, and has various other fixes
 	(handles 2.4 ARPHRD_IEEE802_TR, handles ISDN devices better,
 	doesn't show duplicate packets on loopback interface, etc.).
 
 	Fixed HP-UX libpcap implementation to correctly get the PPA for
 	an interface, to allow interfaces to be opened by interface name.
 
 	libpcap savefiles have system-independent link-layer type values
 	in the header, rather than sometimes platform-dependent DLT_
 	values, to make it easier to exchange capture files between
 	different OSes.
 
 	Non-standard capture files produced by some Linux tcpdumps, e.g.
 	the one from Red Hat Linux 6.2 and later, can now be read.
 
 	Updated autoconf stock files.
 
 	Filter expressions can filter on VLAN IDs and various OSI
 	protocols, and work on Token Ring (with non-source-routed
 	packets).
 
 	"pcap_open_dead()" added to allow compiling filter expressions
 	to pcap code without opening a capture device or capture file.
 
 	Header files fixed to allow use in C++ programs.
 
 	Removed dependancy on native headers for packet layout.
 	Removed Linux specific headers that were shipped.
 
 	Security fixes: Strcpy replaced with strlcpy, sprintf replaced
 	with snprintf.
 
 	Fixed bug that could cause subsequent "pcap_compile()"s to fail
 	erroneously after one compile failed.
 
 	Assorted other bug fixes.
 
 	README.aix and README.linux files added to describe
 	platform-specific issues.
 
 	"getifaddrs()" rather than SIOCGIFCONF used, if available.
 
 v0.5 Sat Jun 10 11:09:15 PDT 2000
 
 itojun@iijlab.net
 - Brought in KAME IPv6/IPsec bpf compiler.
 - Fixes for NetBSD.
 - Support added for OpenBSD DLT_LOOP and BSD/OS DLT_C_HDLC (Cisco HDLC),
   and changes to work around different BSDs having different DLT_ types
   with the same numeric value.
 
 Assar Westerlund  <assar@sics.se>
 - Building outside the source code tree fixed.
 - Changed to write out time stamps with 32-bit seconds and microseconds
   fields, regardless of whether those fields are 32 bits or 64 bits in
   the OS's native "struct timeval".
 - Changed "pcap_lookupdev()" to dynamically grow the buffer into which
   the list of interfaces is read as necessary in order to hold the
   entire list.
 
 Greg Troxel <gdt@ir.bbn.com>
 - Added a new "pcap_compile_nopcap()", which lets you compile a filter
   expression into a BPF program without having an open live capture or
   capture file.
 
 v0.4 Sat Jul 25 12:40:09 PDT 1998
 
 - Fix endian problem with DLT_NULL devices. From FreeBSD via Bill
   Fenner (fenner@parc.xerox.com)
 
 - Fix alignment problem with FDDI under DLPI. This was causing core
   dumps under Solaris.
 
 - Added configure options to disable flex and bison. Resulted from a
   bug report by barnett@grymoire.crd.ge.com (Bruce Barnett). Also added
   options to disable gcc and to force a particular packet capture type.
 
 - Added support for Fore ATM interfaces (qaa and fa) under IRIX. Thanks
   to John Hawkinson (jhawk@mit.edu)
 
 - Change Linux PPP and SLIP to use DLT_RAW since the kernel does not
   supply any "link layer" data.
 
 - Change Linux to use SIOCGIFHWADDR ioctl to determine link layer type.
   Thanks to Thomas Sailer (sailer@ife.ee.ethz.ch)
 
 - Change IRIX PPP to use DLT_RAW since the kernel does not supply any
   "link layer" data.
 
 - Modified to support the new BSD/OS 2.1 PPP and SLIP link layer header
   formats.
 
 - Added some new SGI snoop interface types. Thanks to Steve Alexander
   (sca@refugee.engr.sgi.com)
 
 - Fixes for HP-UX 10.20 (which is similar to HP-UX 9). Thanks to
   Richard Allen (ra@hp.is) and Steinar Haug (sthaug@nethelp.no)
 
 - Fddi supports broadcast as reported by Jeff Macdonald
   (jeff@iacnet.com). Also correct ieee802 and arcnet.
 
 - Determine Linux pcap buffer size at run time or else it might not be
   big enough for some interface types (e.g. FDDI). Thanks to Jes
   Sorensen (Jes.Sorensen@cern.ch)
 
 - Fix some linux alignment problems.
 
 - Document promisc argument to pcap_open_live(). Reported by Ian Marsh
   (ianm@sics.se)
 
 - Support Metricom radio packets under Linux. Thanks to Kevin Lai
   (laik@gunpowder.stanford.edu)
 
 - Bind to interface name under Linux to avoid packets from multiple
   interfaces on multi-homed hosts. Thanks to Kevin Lai
   (laik@gunpowder.stanford.edu)
 
 - Change L_SET to SEEK_SET for HP-UX. Thanks to Roland Roberts
   (rroberts@muller.com)
 
 - Fixed an uninitialized memory reference found by Kent Vander Velden
   (graphix@iastate.edu)
 
 - Fixed lex pattern for IDs to allow leading digits. As reported by
   Theo de Raadt (deraadt@cvs.openbsd.org)
 
 - Fixed Linux include file problems when using GNU libc.
 
 - Ifdef ARPHRD_FDDI since not all versions of the Linux kernel have it.
   Reported reported by Eric Jacksch (jacksch@tenebris.ca)
 
 - Fixed bug in pcap_dispatch() that kept it from returning on packet
   timeouts.
 
 - Changed ISLOOPBACK() macro when IFF_LOOPBACK isn't available to check
   for "lo" followed by an eos or digit (newer versions of Linux
   apparently call the loopback "lo" instead of "lo0").
 
 - Fixed Linux networking include files to use ints instead of longs to
   avoid problems with 64 bit longs on the alpha. Thanks to Cristian
   Gafton (gafton@redhat.com)
 
 v0.3 Sat Nov 30 20:56:27 PST 1996
 
 - Added Linux support.
 
 - Fixed savefile bugs.
 
 - Solaris x86 fix from Tim Rylance (t.rylance@elsevier.nl)
 
 - Add support for bpf kernel port filters.
 
 - Remove duplicate atalk protocol table entry. Thanks to Christian
   Hopps (chopps@water.emich.edu)
 
 - Fixed pcap_lookupdev() to ignore nonexistent devices. This was
   reported to happen under BSD/OS by David Vincenzetti
   (vince@cryptonet.it)
 
 - Avoid solaris compiler warnings. Thanks to Bruce Barnett
   (barnett@grymoire.crd.ge.com)
 
 v0.2.1 Sun Jul 14 03:02:26 PDT 1996
 
 - Fixes for HP-UX 10. Thanks in part to to Thomas Wolfram
   (wolf@prz.tu-berlin.de) and Rick Jones (raj@hpisrdq.cup.hp.com)
 
 - Added support for SINIX. Thanks to Andrej Borsenkow
   (borsenkow.msk@sni.de)
 
 - Fixes for AIX (although this system is not yet supported). Thanks to
   John Hawkinson (jhawk@mit.edu)
 
 - Use autoconf's idea of the top level directory in install targets.
   Thanks to John Hawkinson.
 
 - Add missing autoconf packet capture result message. Thanks to Bill
   Fenner (fenner@parc.xerox.com)
 
 - Fixed padding problems in the pf module.
 
 - Fixed some more alignment problems on the alpha.
 
 - Added explicit netmask support. Thanks to Steve Nuchia
   (steve@research.oknet.com)
 
 - Fixed to handle raw ip addresses such as 0.0.0.1 without "left
   justifing"
 
 - Add "sca" keyword (for DEC cluster services) as suggested by Terry
   Kennedy (terry@spcvxa.spc.edu)
 
 - Add "atalk" keyword as suggested by John Hawkinson.
 
 - Add "igrp" keyword.
 
 - Fixed HID definition in grammar.y to be a string, not a value.
 
 - Use $CC when checking gcc version. Thanks to Carl Lindberg
   (carl_lindberg@blacksmith.com)
 
 - Removed obsolete reference to pcap_immediate() from the man page.
   Michael Stolarchuk (mts@terminator.rs.itd.umich.edu)
 
 - DLT_NULL has a 4 byte family header. Thanks to Jeffrey Honig
   (jch@bsdi.com)
 
 v0.2 Sun Jun 23 02:28:42 PDT 1996
 
 - Add support for HP-UX. Resulted from code contributed by Tom Murray
   (tmurray@hpindck.cup.hp.com) and Philippe-Andri Prindeville
   (philipp@res.enst.fr)
 
 - Update INSTALL with a reminder to install include files. Thanks to
   Mark Andrews (mandrews@aw.sgi.com)
 
 - Fix bpf compiler alignment bug on the alpha.
 
 - Use autoconf to detect architectures that can't handle misaligned
   accesses.
 
 - Added loopback support for snoop. Resulted from report Steve
   Alexander (sca@engr.sgi.com)
 
 v0.1 Fri Apr 28 18:11:03 PDT 1995
 
 - Fixed compiler and optimizer bugs.  The BPF filter engine uses unsigned
   comparison operators, while the code generator and optimizer assumed
   signed semantics in several places.  Thanks to Charlie Slater
   (cslater@imatek.com) for pointing this out.
 
 - Removed FDDI ifdef's, they aren't really needed. Resulted from report
   by Gary Veum (veum@boa.gsfc.nasa.gov).
 
 - Add pcap-null.c which allows offline use of libpcap on systems that
   don't support live package capture. This feature resulting from a
   request from Jan van Oorschot (j.p.m.voorschot@et.tudelft.nl).
 
 - Make bpf_compile() reentrant. Fix thanks to Pascal Hennequin
   (Pascal.Hennequin@hugo.int-evry.fr).
 
 - Port to GNU autoconf.
 
 - Fix pcap-dlpi.c to work with isdn. Resulted from report by Flemming
   Johansen (fsj@csd.cri.dk).
 
 - Handle multi-digit interface unit numbers (aka ppa's) under dlpi.
   Resulted from report by Daniel Ehrlich (ehrlich@cse.psu.edu).
 
 - Fix pcap-dlpi.c to work in non-promiscuous mode. Resulted from report
   by Jeff Murphy (jcmurphy@acsu.buffalo.edu).
 
 - Add support for "long jumps". Thanks to Jeffrey Mogul
   (mogul@pa.dec.com).
 
 - Fix minor problems when compiling with BDEBUG as noticed by Scott
   Bertilson (scott@unet.umn.edu).
 
 - Declare sys_errlist "const char *const" to avoid problems under
   FreeBSD. Resulted from report by jher@eden.com.
 
 v0.0.6 Fri Apr 28 04:07:13 PDT 1995
 
 - Add missing variable declaration missing from 0.0.6
 
 v0.0.5 Fri Apr 28 00:22:21 PDT 1995
 
 - Workaround for problems when pcap_read() returns 0 due to the timeout
   expiring.
 
 v0.0.4 Thu Apr 20 20:41:48 PDT 1995
 
 - Change configuration to not use gcc v2 flags with gcc v1.
 
 - Fixed a bug in pcap_next(); if pcap_dispatch() returns 0, pcap_next()
   should also return 0. Thanks to Richard Stevens (rstevens@noao.edu).
 
 - Fixed configure to test for snoop before dlpi to avoid problems under
   IRIX 5. Thanks to J. Eric Townsend (jet@abulafia.genmagic.com).
 
 - Hack around deficiency in Ultrix's make.
 
 - Fix two bugs related to the Solaris pre-5.3.2 bufmod bug; handle
   savefiles that have more than snapshot bytes of data in them (so we
   can read old savefiles) and avoid writing such files.
 
 - Added checkioctl which is used with gcc to check that the
   "fixincludes" script has been run.
 
 v0.0.3 Tue Oct 18 18:13:46 PDT 1994
 
 - Fixed configure to test for snoop before dlpi to avoid problems under
   IRIX 5. Thanks to J. Eric Townsend (jet@abulafia.genmagic.com).
 
 v0.0.2 Wed Oct 12 20:56:37 PDT 1994
 
 - Implement timeout in the dlpi pcap_open_live(). Thanks to Richard
   Stevens.
 
 - Determine pcap link type from dlpi media type. Resulted from report
   by Mahesh Jethanandani (mahesh@npix.com).
 
 v0.0.1 Fri Jun 24 14:50:57 PDT 1994
 
 - Fixed bug in nit_setflags() in pcap-snit.c. The streams ioctl timeout
   wasn't being initialized sometimes resulting in an "NIOCSFLAGS:
   Invalid argument" error under OSF/1. Reported by Matt Day
   (mday@artisoft.com) and Danny Mitzel (dmitzel@whitney.hitc.com).
 
 - Turn on FDDI support by default.
 
 v0.0 Mon Jun 20 19:20:16 PDT 1994
 
 - Initial release.
 
 - Fixed bug with greater/less keywords, reported by Mark Andrews
   (mandrews@alias.com).
 
 - Fix bug where '|' was defined as BPF_AND instead of BPF_OR, reported
   by Elan Amir (elan@leeb.cs.berkeley.edu).
 
 - Machines with little-endian byte ordering are supported thanks to
   Jeff Mogul.
 
 - Add hack for version 2.3 savefiles which don't have caplen and len
   swapped thanks to Vern Paxson.
 
 - Added "&&" and "||" aliases for "and" and "or" thanks to Vern Paxson.
 
 - Added length, inbound and outbound keywords.
Index: vendor/libpcap/dist/CMakeLists.txt
===================================================================
--- vendor/libpcap/dist/CMakeLists.txt	(revision 333788)
+++ vendor/libpcap/dist/CMakeLists.txt	(revision 333789)
@@ -1,520 +1,2294 @@
-cmake_minimum_required( VERSION 2.8.8 )
+cmake_minimum_required(VERSION 2.8.6)
 
-project( pcap )
 #
-# Call the library "wpcap" on Windows, for backwards compatibility.
+# Apple doesn't build with an install_name starting with @rpath, and
+# neither do we with autotools; don't do so with CMake, either, and
+# suppress warnings about that.
 #
-if( WIN32 )
-    set( LIBRARY_NAME wpcap )
-else()
-    set( LIBRARY_NAME pcap )
+if(POLICY CMP0042)
+    cmake_policy(SET CMP0042 OLD)
 endif()
 
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
+project(pcap)
+
+#
+# Try to enable as many C99 features as we can.
+# At minimum, we want C++/C99-style // comments.
+#
+# Newer versions of compilers might default to supporting C99, but older
+# versions may require a special flag.
+#
+# Prior to CMake 3.1, setting CMAKE_C_STANDARD will not have any effect,
+# so, unless and until we require CMake 3.1 or later, we have to do it
+# ourselves on pre-3.1 CMake, so we just do it ourselves on all versions
+# of CMake.
+#
+# Note: with CMake 3.1 through 3.5, the only compilers for which CMake
+# handles CMAKE_C_STANDARD are GCC and Clang.  3.6 adds support only
+# for Intel C; 3.9 adds support for PGI C, Sun C, and IBM XL C, and
+# 3.10 adds support for Cray C and IAR C, but no version of CMake has
+# support for HP C.  Therefore, even if we use CMAKE_C_STANDARD with
+# compilers for which CMake supports it, we may still have to do it
+# ourselves on other compilers.
+#
+# See the CMake documentation for the CMAKE_<LANG>_COMPILER_ID variables
+# for a list of compiler IDs.
+#
+# We don't worry about MSVC; it doesn't have such a flag - either it
+# doesn't support the C99 features we need at all, or it supports them
+# regardless of the compiler flag.
+#
+# XXX - this just tests whether the option works and adds it if it does.
+# We don't test whether it's necessary in order to get the C99 features
+# that we use; if we ever have a user who tries to compile with a compiler
+# that can't be made to support those features, we can add a test to make
+# sure we actually *have* C99 support.
+#
+include(CheckCCompilerFlag)
+macro(check_and_add_compiler_option _option)
+    message(STATUS "Checking C compiler flag ${_option}")
+    string(REPLACE "=" "-" _temp_option_variable ${_option})
+    string(REGEX REPLACE "^-" "" _option_variable ${_temp_option_variable})
+    check_c_compiler_flag("${_option}" ${_option_variable})
+    if(${${_option_variable}})
+        set(C_ADDITIONAL_FLAGS "${C_ADDITIONAL_FLAGS} ${_option}")
+    endif()
+endmacro()
+
+set(C_ADDITIONAL_FLAGS "")
+if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR
+   CMAKE_C_COMPILER_ID MATCHES "Clang")
+    check_and_add_compiler_option("-std=gnu99")
+elseif(CMAKE_C_COMPILER_ID MATCHES "XL")
+    #
+    # We want support for extensions picked up for GNU C compatibility,
+    # so we use -qlanglvl=extc99.
+    #
+    check_and_add_compiler_option("-qlanglvl=extc99")
+elseif(CMAKE_C_COMPILER_ID MATCHES "HP")
+    check_and_add_compiler_option("-AC99")
+elseif(CMAKE_C_COMPILER_ID MATCHES "Sun")
+    check_and_add_compiler_option("-xc99")
+elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+    check_and_add_compiler_option("-c99")
+endif()
+
+#
+# Build all runtimes in the top-level binary directory; that way,
+# on Windows, the executables will be in the same directory as
+# the DLLs, so the system will find pcap.dll when any of the
+# executables are run.
+#
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run)
+
 ###################################################################
 #   Parameters
 ###################################################################
 
-option (INET6 "Enable IPv6" ON)
-if( MSVC )
-    option (USE_STATIC_RT "Use static Runtime" ON)
-endif( MSVC )
-option (BUILD_SHARED_LIBS "Build shared libraries" ON)
-if( WIN32 )
+if(WIN32)
+    #
+    # On Windows, allow the library name to be overridden, for the
+    # benefit of projects that combine libpcap with their own
+    # kernel-mode code to support capturing.
+    #
+    set(LIBRARY_NAME pcap CACHE STRING "Library name")
+else()
+    #
+    # On UN*X, it's always been libpcap.
+    #
+    set(LIBRARY_NAME pcap)
+endif()
+
+option(INET6 "Enable IPv6" ON)
+if(WIN32)
+    option(USE_STATIC_RT "Use static Runtime" ON)
+endif(WIN32)
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+if(WIN32)
     set(PACKET_DLL_DIR "" CACHE PATH "Path to directory with include and lib subdirectories for packet.dll")
-endif( WIN32 )
+endif(WIN32)
 
+# To pacify those who hate the protochain instruction
+option(NO_PROTOCHAIN "Disable protochain instruction" OFF)
+
 #
-# XXX - this should be an option, defaulting to "yes" for Windows and to
-# "no", for now, on UN*X.
+# Start out with the capture mechanism type unspecified; the user
+# can explicitly specify it and, if they don't, we'll pick an
+# appropriate one.
 #
-if( WIN32 )
-    set( HAVE_REMOTE 1 )
-endif( WIN32 )
+set(PCAP_TYPE "" CACHE STRING "Packet capture type")
 
+#
+# Default to having remote capture support on Windows and, for now, to
+# not having it on UN*X.
+#
+if(WIN32)
+    option(ENABLE_REMOTE "Enable remote capture" ON)
+else()
+    option(ENABLE_REMOTE "Enable remote capture" OFF)
+endif(WIN32)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    option(PCAP_SUPPORT_PACKET_RING "Enable Linux packet ring support" ON)
+    option(BUILD_WITH_LIBNL "Build with libnl" ON)
+endif()
+
+#
+# By default, build universal with the appropriate set of architectures
+# for the OS on which we're doing the build.
+#
+if(APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
+    #
+    # Get the major version of Darwin.
+    #
+    string(REGEX MATCH "^([0-9]+)" SYSTEM_VERSION_MAJOR "${CMAKE_SYSTEM_VERSION}")
+
+    if(SYSTEM_VERSION_MAJOR LESS 8)
+        #
+        # Pre-Tiger.  Build only for 32-bit PowerPC.
+        #
+        set(CMAKE_OSX_ARCHITECTURES "ppc")
+    elseif(SYSTEM_VERSION_MAJOR EQUAL 8)
+        #
+        # Tiger.  Is this prior to, or with, Intel support?
+        #
+        # Get the minor version of Darwin.
+        #
+        string(REPLACE "${SYSTEM_VERSION_MAJOR}." "" SYSTEM_MINOR_AND_PATCH_VERSION ${CMAKE_SYSTEM_VERSION})
+        string(REGEX MATCH "^([0-9]+)" SYSTEM_VERSION_MINOR "${SYSTEM_MINOR_AND_PATCH_VERSION}")
+        if(SYSTEM_VERSION_MINOR LESS 4)
+            #
+            # Prior to Intel support.  Build for 32-bit
+            # PowerPC and 64-bit PowerPC, with 32-bit PowerPC
+            # first.  (I'm guessing that's what Apple does.)
+            #
+            set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64")
+        elseif(SYSTEM_VERSION_MINOR LESS 7)
+            #
+            # With Intel support but prior to x86-64 support.
+            # Build for 32-bit PowerPC, 64-bit PowerPC, and x86,
+            # with 32-bit PowerPC first.
+            # (I'm guessing that's what Apple does.)
+            #
+            set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64;i386")
+        else()
+            #
+            # With Intel support including x86-64 support.
+            # Build for 32-bit PowerPC, 64-bit PowerPC, x86,
+            # and x86-64, with 32-bit PowerPC first.
+            # (I'm guessing that's what Apple does.)
+            #
+            set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64;i386;x86_64")
+        endif()
+    elseif(SYSTEM_VERSION_MAJOR EQUAL 9)
+        #
+        # Leopard.  Build for 32-bit PowerPC, 64-bit
+        # PowerPC, x86, and x86-64, with 32-bit PowerPC
+        # first.  (That's what Apple does.)
+        #
+        set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64;i386;x86_64")
+    elseif(SYSTEM_VERSION_MAJOR EQUAL 10)
+        #
+        # Snow Leopard.  Build for x86-64, x86, and
+        # 32-bit PowerPC, with x86-64 first.  (That's
+        # what Apple does, even though Snow Leopard
+        # doesn't run on PPC, so PPC libpcap runs under
+        # Rosetta, and Rosetta doesn't support BPF
+        # ioctls, so PPC programs can't do live
+        # captures.)
+        #
+        set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc")
+    else()
+        #
+        # Post-Snow Leopard.  Build for x86-64 and
+        # x86, with x86-64 first.  (That's probably what
+        # Apple does, given that Rosetta is gone.)
+        # XXX - update if and when Apple drops support
+        # for 32-bit x86 code.
+        #
+        set(CMAKE_OSX_ARCHITECTURES "x86_64;i386")
+    endif()
+endif()
+
+#
+# Additional capture modules.
+#
+option(DISABLE_USB "Disable USB sniffing support" OFF)
+option(DISABLE_BLUETOOTH "Disable Bluetooth sniffing support" OFF)
+option(DISABLE_NETMAP "Disable netmap support" OFF)
+#
+# We don't support D-Bus sniffing on macOS; see
+#
+# https://bugs.freedesktop.org/show_bug.cgi?id=74029
+#
+if(APPLE)
+    option(DISABLE_DBUS "Disable D-Bus sniffing support" ON)
+else(APPLE)
+    option(DISABLE_DBUS "Disable D-Bus sniffing support" OFF)
+endif(APPLE)
+option(DISABLE_RDMA "Disable RDMA sniffing support" OFF)
+
+option(DISABLE_DAG "Disable Endace DAG card support" OFF)
+
+option(DISABLE_SEPTEL "Disable Septel card support" OFF)
+set(SEPTEL_ROOT "${CMAKE_SOURCE_DIR}/../septel" CACHE PATH "Path to directory with include and lib subdirectories for Septel API")
+
+option(DISABLE_SNF "Disable Myricom SNF support" OFF)
+
+option(DISABLE_TC "Disable Riverbed TurboCap support" OFF)
+
+#
+# Debugging options.
+#
+option(BDEBUG "Build optimizer debugging code" OFF)
+option(YYDEBUG "Build parser debugging code" OFF)
+
+###################################################################
+#   Versioning
+###################################################################
+
+# Get, parse, format and set pcap's version string from [pcap_root]/VERSION
+# for later use.
+ 
+# Get MAJOR, MINOR, PATCH & SUFFIX
+file(STRINGS ${pcap_SOURCE_DIR}/VERSION
+    PACKAGE_VERSION
+    LIMIT_COUNT 1 # Read only the first line
+)
+
+# Get "just" MAJOR
+string(REGEX MATCH "^([0-9]+)" PACKAGE_VERSION_MAJOR "${PACKAGE_VERSION}")
+
+# Get MAJOR, MINOR & PATCH
+string(REGEX MATCH "^([0-9]+.)?([0-9]+.)?([0-9]+)" PACKAGE_VERSION_NOSUFFIX "${PACKAGE_VERSION}")
+
+if(WIN32) 
+    # Convert PCAP_VERSION_NOSUFFIX to Windows preferred version format
+    string(REPLACE "." "," PACKAGE_VERSION_PREDLL ${PACKAGE_VERSION_NOSUFFIX})
+
+    # Append NANO (used for Windows internal versioning) to PCAP_VERSION_PREDLL
+    # 0 means unused.
+    set(PACKAGE_VERSION_DLL ${PACKAGE_VERSION_PREDLL},0)
+endif(WIN32)
+
+set(PACKAGE_NAME "${LIBRARY_NAME}")
+set(PACKAGE_STRING "${LIBRARY_NAME} ${PACKAGE_VERSION}")
+
 ######################################
 # Project settings
 ######################################
 
-add_definitions( -DHAVE_CONFIG_H )
+add_definitions(-DHAVE_CONFIG_H)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${pcap_SOURCE_DIR}
 )
 
-if( WIN32 )
-    if( NOT "${PACKET_DLL_DIR}" STREQUAL "" )
-        include_directories("${PACKET_DLL_DIR}/Include")
-        if( CMAKE_CL_64 )
-            link_directories("${PACKET_DLL_DIR}/Lib/x64")
-        else( CMAKE_CL_64 )
-            link_directories("${PACKET_DLL_DIR}/Lib")
-        endif( CMAKE_CL_64 )
-    endif()
-    include_directories(
-        ../Common/
-        Win32/Include
-    )
-endif( WIN32)
+include(CheckFunctionExists)
+include(CMakePushCheckState)
 
-add_definitions( -DBUILDING_PCAP )
+if(WIN32)
 
-if( MSVC )
-    add_definitions( -D__STDC__ )
-    add_definitions( -D_CRT_SECURE_NO_WARNINGS )
-    add_definitions( "-D_U_=" )
-elseif( CMAKE_COMPILER_IS_GNUCXX )
-    add_definitions( "-D_U_=__attribute__((unused))" )
-else(MSVC)
-    add_definitions( "-D_U_=" )
-endif( MSVC )
+    if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
+        include_directories(${CMAKE_HOME_DIRECTORY}/../../Common)
+    endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
 
-if( MSVC )
-    if (USE_STATIC_RT)
-        MESSAGE( STATUS "Use STATIC runtime" )
-        set(NAME_RT MT)
-        set (CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
-        set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
-        set (CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-        set (CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+    find_package(Packet)
+    if(PACKET_FOUND)
+        set(HAVE_PACKET32 TRUE)
+        include_directories(${PACKET_INCLUDE_DIRS})
+        #
+        # Check whether we have the NPcap PacketIsLoopbackAdapter()
+        # function.
+        #
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_LIBRARIES ${PACKET_LIBRARIES})
+        check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER)
+        cmake_pop_check_state()
+    endif(PACKET_FOUND)
 
-        set (CMAKE_C_FLAGS_MINSIZEREL       "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
-        set (CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
-        set (CMAKE_C_FLAGS_RELEASE          "${CMAKE_C_FLAGS_RELEASE} /MT")
-        set (CMAKE_C_FLAGS_DEBUG            "${CMAKE_C_FLAGS_DEBUG} /MTd")
-    else (USE_STATIC_RT)
-        MESSAGE( STATUS "Use DYNAMIC runtime" )
-        set(NAME_RT MD)
-        set (CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
-        set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
-        set (CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-        set (CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+endif(WIN32)
 
-        set (CMAKE_C_FLAGS_MINSIZEREL       "${CMAKE_C_FLAGS_MINSIZEREL} /MD")
-        set (CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MD")
-        set (CMAKE_C_FLAGS_RELEASE          "${CMAKE_C_FLAGS_RELEASE} /MD")
-        set (CMAKE_C_FLAGS_DEBUG            "${CMAKE_C_FLAGS_DEBUG} /MDd")
-   endif (USE_STATIC_RT)
-endif( MSVC )
+if(MSVC)
+    add_definitions(-D__STDC__)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif(MSVC)
 
+if(USE_STATIC_RT)
+    message(STATUS "Use STATIC runtime")
+        if(MSVC)
+            foreach(RT_FLAG
+                CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+                CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
+                CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+                CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+                string(REGEX REPLACE "/MD" "/MT" ${RT_FLAG} "${${RT_FLAG}}")
+            endforeach(RT_FLAG)
+        elseif(MINGW)
+            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc")
+        endif()
+else (USE_STATIC_RT)
+    message(STATUS "Use DYNAMIC runtime")
+endif(USE_STATIC_RT)
+
 ###################################################################
 #   Detect available platform features
 ###################################################################
 
 include(CheckIncludeFile)
-include(CheckFunctionExists)
+include(CheckIncludeFiles)
 include(CheckStructHasMember)
 include(CheckTypeSize)
 
 #
 # Header files.
 #
-check_include_file( inttypes.h HAVE_INTTYPES_H )
-check_include_file( stdint.h HAVE_STDINT_H )
-check_include_file( unistd.h HAVE_UNISTD_H )
-if( NOT HAVE_UNISTD_H )
-    add_definitions( -DYY_NO_UNISTD_H )
-endif( NOT HAVE_UNISTD_H )
-check_include_file( bitypes.h HAVE_SYS_BITYPES_H )
-check_include_file( limits.h HAVE_LIMITS_H )
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+check_include_file(stdint.h HAVE_STDINT_H)
+check_include_file(unistd.h HAVE_UNISTD_H)
+if(NOT HAVE_UNISTD_H)
+    add_definitions(-DYY_NO_UNISTD_H)
+endif(NOT HAVE_UNISTD_H)
+check_include_file(bitypes.h HAVE_SYS_BITYPES_H)
+if(NOT WIN32)
+    check_include_file(sys/ioccom.h HAVE_SYS_IOCCOM_H)
+    check_include_file(sys/sockio.h HAVE_SYS_SOCKIO_H)
+    check_include_file(sys/select.h HAVE_SYS_SELECT_H)
+endif(NOT WIN32)
+check_include_file(limits.h HAVE_LIMITS_H)
+if(NOT WIN32)
+    check_include_file(netpacket/packet.h HAVE_NETPACKET_PACKET_H)
+    check_include_files("sys/types.h;sys/socket.h;net/if.h;net/pfvar.h" HAVE_NET_PFVAR_H)
+    if(HAVE_NET_PFVAR_H)
+        #
+        # Check for various PF actions.
+        #
+        check_c_source_compiles(
+"#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
+int
+main(void)
+{
+    return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR;
+}
+"
+            HAVE_PF_NAT_THROUGH_PF_NORDR)
+    endif(HAVE_NET_PFVAR_H)
+    check_include_file(netinet/if_ether.h HAVE_NETINET_IF_ETHER_H)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        check_include_file(linux/sockios.h HAVE_LINUX_SOCKIOS_H)
+        #
+        # linux/if_bonding.h requires sys/socket.h.
+        #
+        check_include_files("sys/socket.h;linux/if_bonding.h" HAVE_LINUX_IF_BONDING_H)
+    endif()
+endif(NOT WIN32)
+
 #
 # Functions.
 #
-check_function_exists( strerror HAVE_STRERROR )
-check_function_exists( strlcpy HAVE_STRLCPY )
-check_function_exists( snprintf HAVE_SNPRINTF )
-check_function_exists( vsnprintf HAVE_VSNPRINTF )
-check_function_exists( strtok_r HAVE_STRTOK_R )
+check_function_exists(strerror HAVE_STRERROR)
+check_function_exists(strerror_r HAVE_STRERROR_R)
+check_function_exists(strerror_s HAVE_STRERROR_S)
+check_function_exists(strlcpy HAVE_STRLCPY)
+check_function_exists(strlcat HAVE_STRLCAT)
+check_function_exists(snprintf HAVE_SNPRINTF)
+check_function_exists(vsnprintf HAVE_VSNPRINTF)
+check_function_exists(strtok_r HAVE_STRTOK_R)
 
-if (WIN32)
+#
+# These tests are for network applications that need socket functions
+# and getaddrinfo()/getnameinfo()-ish functions.  We now require
+# getaddrinfo() and getnameinfo().  On UN*X systems, we also prefer
+# versions of recvmsg() that conform to the Single UNIX Specification,
+# so that we can check whether a datagram received with recvmsg() was
+# truncated when received due to the buffer being too small.
+#
+# On Windows, getaddrinfo() is in the ws2_32 library.
+
+# On most UN*X systems, they're available in the system library.
+#
+# Under Solaris, we need to link with libsocket and libnsl to get
+# getaddrinfo() and getnameinfo() and, if we have libxnet, we need to
+# link with libxnet before libsocket to get a version of recvmsg()
+# that conforms to the Single UNIX Specification.
+#
+# We use getaddrinfo() because we want a portable thread-safe way
+# of getting information for a host name or port; there exist _r
+# versions of gethostbyname() and getservbyname() on some platforms,
+# but not on all platforms.
+#
+# NOTE: if you hand check_library_exists as its last argument a variable
+# that's been set, it skips the test, so we need different variables.
+#
+set(PCAP_LINK_LIBRARIES "")
+include(CheckLibraryExists)
+include(CheckSymbolExists)
+if(WIN32)
     #
-    # Check for Windows-only functions, such as packet.dll functions.
+    # We need winsock2.h and ws2tcpip.h.
     #
-    check_function_exists( PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER )
-endif()
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_LIBRARIES ws2_32)
+    check_symbol_exists(getaddrinfo "winsock2.h;ws2tcpip.h" LIBWS2_32_HAS_GETADDRINFO)
+    cmake_pop_check_state()
+    if(LIBWS2_32_HAS_GETADDRINFO)
+        set(PCAP_LINK_LIBRARIES ws2_32 ${PCAP_LINK_LIBRARIES})
+    else(LIBWS2_32_HAS_GETADDRINFO)
+        message(FATAL_ERROR "getaddrinfo is required, but wasn't found")
+    endif(LIBWS2_32_HAS_GETADDRINFO)
+else(WIN32)
+    #
+    # UN*X.  First try the system libraries, then try the libraries
+    # for Solaris and possibly other systems that picked up the
+    # System V library split.
+    #
+    check_function_exists(getaddrinfo STDLIBS_HAVE_GETADDRINFO)
+    if(NOT STDLIBS_HAVE_GETADDRINFO)
+        #
+        # Not found in the standard system libraries.
+        # Try libsocket, which requires libnsl.
+        #
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_LIBRARIES nsl)
+        check_library_exists(socket getaddrinfo "" LIBSOCKET_HAS_GETADDRINFO)
+        cmake_pop_check_state()
+        if(LIBSOCKET_HAS_GETADDRINFO)
+            #
+            # OK, we found it in libsocket.
+            #
+            set(PCAP_LINK_LIBRARIES socket nsl ${PCAP_LINK_LIBRARIES})
+        else(LIBSOCKET_HAS_GETADDRINFO)
+            #
+            # We didn't find it.
+            #
+            message(FATAL_ERROR "getaddrinfo is required, but wasn't found")
+        endif(LIBSOCKET_HAS_GETADDRINFO)
 
+        #
+        # OK, do we have recvmsg() in libxnet?
+        # We also link with libsocket and libnsl.
+        #
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_LIBRARIES socket nsl)
+        check_library_exists(xnet recvmsg "" LIBXNET_HAS_RECVMSG)
+        cmake_pop_check_state()
+        if(LIBXNET_HAS_RECVMSG)
+            #
+            # Yes - link with it as well.
+            #
+            set(PCAP_LINK_LIBRARIES xnet ${PCAP_LINK_LIBRARIES})
+        endif(LIBXNET_HAS_RECVMSG)
+    endif(NOT STDLIBS_HAVE_GETADDRINFO)
+
+    # DLPI needs putmsg under HPUX so test for -lstr while we're at it
+    check_function_exists(putmsg STDLIBS_HAVE_PUTMSG)
+    if(NOT STDLIBS_HAVE_PUTMSG)
+        check_library_exists(str putmsg "" LIBSTR_HAS_PUTMSG)
+        if(LIBSTR_HAS_PUTMSG)
+            set(PCAP_LINK_LIBRARIES str ${PCAP_LINK_LIBRARIES})
+        endif(LIBSTR_HAS_PUTMSG)
+    endif(NOT STDLIBS_HAVE_PUTMSG)
+endif(WIN32)
+
 #
+# Check for reentrant versions of getnetbyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getnetbyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getnetbyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+cmake_push_check_state()
+set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LINK_LIBRARIES})
+check_symbol_exists(getnetbyname_r netdb.h NETDB_H_DECLARES_GETNETBYNAME_R)
+if(NETDB_H_DECLARES_GETNETBYNAME_R)
+    check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct netent netent_buf;
+    char buf[1024];
+    struct netent *resultp;
+    int h_errnoval;
+
+    return getnetbyname_r((const char *)0, &netent_buf, buf, sizeof buf, &resultp, &h_errnoval);
+}
+"
+        HAVE_LINUX_GETNETBYNAME_R)
+    if(NOT HAVE_LINUX_GETNETBYNAME_R)
+        check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct netent netent_buf;
+    char buf[1024];
+
+    return getnetbyname_r((const char *)0, &netent_buf, buf, (int)sizeof buf) != NULL;
+}
+"
+            HAVE_SOLARIS_IRIX_GETNETBYNAME_R)
+        if(NOT HAVE_SOLARIS_IRIX_GETNETBYNAME_R)
+            check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct netent netent_buf;
+    struct netent_data net_data;
+
+    return getnetbyname_r((const char *)0, &netent_buf, &net_data);
+}
+"
+                HAVE_AIX_GETNETBYNAME_R)
+        endif(NOT HAVE_SOLARIS_IRIX_GETNETBYNAME_R)
+    endif(NOT HAVE_LINUX_GETNETBYNAME_R)
+endif(NETDB_H_DECLARES_GETNETBYNAME_R)
+cmake_pop_check_state()
+
+#
+# Check for reentrant versions of getprotobyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getprotobyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getprotobyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+cmake_push_check_state()
+set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LINK_LIBRARIES})
+check_symbol_exists(getprotobyname_r netdb.h NETDB_H_DECLARES_GETPROTOBYNAME_R)
+if(NETDB_H_DECLARES_GETPROTOBYNAME_R)
+    check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct protoent protoent_buf;
+    char buf[1024];
+    struct protoent *resultp;
+
+    return getprotobyname_r((const char *)0, &protoent_buf, buf, sizeof buf, &resultp);
+}
+"
+        HAVE_LINUX_GETPROTOBYNAME_R)
+    if(NOT HAVE_LINUX_GETPROTOBYNAME_R)
+        check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct protoent protoent_buf;
+    char buf[1024];
+
+    return getprotobyname_r((const char *)0, &protoent_buf, buf, (int)sizeof buf) != NULL;
+}
+"
+            HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R)
+        if(NOT HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R)
+            check_c_source_compiles(
+"#include <netdb.h>
+
+int
+main(void)
+{
+    struct protoent protoent_buf;
+    struct protoent_data proto_data;
+
+    return getprotobyname_r((const char *)0, &protoent_buf, &proto_data);
+}
+"
+                HAVE_AIX_GETPROTOBYNAME_R)
+        endif(NOT HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R)
+    endif(NOT HAVE_LINUX_GETPROTOBYNAME_R)
+endif(NETDB_H_DECLARES_GETPROTOBYNAME_R)
+cmake_pop_check_state()
+
+#
 # Data types.
 #
-# XXX - there's no check_struct() macro that's like check_struct_has_member()
+# XXX - there's no check_type() macro that's like check_type_size()
 # except that it only checks for the existence of the structure type,
-# so we use check_struct_has_member() and look for ss_family.
+# so we use check_type_size() and ignore the size.
 #
-check_struct_has_member("struct sockaddr_storage" ss_family sys/socket.h  HAVE_SOCKADDR_STORAGE)
-set(CMAKE_EXTRA_INCLUDE_FILES unistd.h sys/socket.h)
+cmake_push_check_state()
+if(WIN32)
+    set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h)
+else(WIN32)
+    set(CMAKE_EXTRA_INCLUDE_FILES unistd.h sys/socket.h)
+endif(WIN32)
+check_type_size("struct sockaddr_storage" STRUCT_SOCKADDR_STORAGE)
 check_type_size("socklen_t" SOCKLEN_T)
-set(CMAKE_EXTRA_INCLUDE_FILES unistd.h)
+cmake_pop_check_state()
 
 #
 # Structure fields.
 #
-check_struct_has_member("struct sockaddr" sa_len sys/socket.h HAVE_SOCKADDR_SA_LEN )
+if(WIN32)
+    check_struct_has_member("struct sockaddr" sa_len winsock2.h HAVE_STRUCT_SOCKADDR_SA_LEN)
+else(WIN32)
+    check_struct_has_member("struct sockaddr" sa_len sys/socket.h HAVE_STRUCT_SOCKADDR_SA_LEN)
+endif(WIN32)
 
-if( INET6 )
-    MESSAGE( STATUS "Use IPv6" )
-endif( INET6 )
+#
+# Do we have ffs(), and is it declared in <strings.h>?
+#
+check_function_exists(ffs HAVE_FFS)
+if(HAVE_FFS)
+    #
+    # OK, we have ffs().  Is it declared in <strings.h>?
+    #
+    # This test fails if we don't have <strings.h> or if we do
+    # but it doesn't declare ffs().
+    #
+    check_symbol_exists(ffs strings.h STRINGS_H_DECLARES_FFS)
+endif()
 
-if( WIN32 )
-    add_definitions( -DHAVE_ADDRINFO )
-endif( WIN32 )
+#
+# This requires the libraries that we require, as ether_hostton might be
+# in one of those libraries.  That means we have to do this after
+# we check for those libraries.
+#
+# You are in a twisty little maze of UN*Xes, all different.
+# Some might not have ether_hostton().
+# Some might have it and declare it in <net/ethernet.h>.
+# Some might have it and declare it in <netinet/ether.h>
+# Some might have it and declare it in <sys/ethernet.h>.
+# Some might have it and declare it in <arpa/inet.h>.
+# Some might have it and declare it in <netinet/if_ether.h>.
+# Some might have it and not declare it in any header file.
+#
+# Before you is a C compiler.
+#
+cmake_push_check_state()
+set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LINK_LIBRARIES})
+check_function_exists(ether_hostton HAVE_ETHER_HOSTTON)
+if(HAVE_ETHER_HOSTTON)
+    #
+    # OK, we have ether_hostton().  Is it declared in <net/ethernet.h>?
+    #
+    # This test fails if we don't have <net/ethernet.h> or if we do
+    # but it doesn't declare ether_hostton().
+    #
+    check_symbol_exists(ether_hostton net/ethernet.h NET_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+    if(NET_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+        #
+        # Yes - we have it declared.
+        #
+        set(HAVE_DECL_ETHER_HOSTTON TRUE)
+    endif()
+    #
+    # Did that succeed?
+    #
+    if(NOT HAVE_DECL_ETHER_HOSTTON)
+        #
+        # No - how about <netinet/ether.h>, as on Linux?
+        #
+        # This test fails if we don't have <netinet/ether.h>
+        # or if we do but it doesn't declare ether_hostton().
+        #
+        check_symbol_exists(ether_hostton netinet/ether.h NETINET_ETHER_H_DECLARES_ETHER_HOSTTON)
+        if(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON)
+            #
+            # Yes - we have it declared.
+            #
+            set(HAVE_DECL_ETHER_HOSTTON TRUE)
+        endif()
+    endif()
+    #
+    # Did that succeed?
+    #
+    if(NOT HAVE_DECL_ETHER_HOSTTON)
+        #
+        # No - how about <sys/ethernet.h>, as on Solaris 10 and later?
+        #
+        # This test fails if we don't have <sys/ethernet.h>
+        # or if we do but it doesn't declare ether_hostton().
+        #
+        check_symbol_exists(ether_hostton sys/ethernet.h SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+        if(SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+            #
+            # Yes - we have it declared.
+            #
+            set(HAVE_DECL_ETHER_HOSTTON TRUE)
+        endif()
+    endif()
+    #
+    # Did that succeed?
+    #
+    if(NOT HAVE_DECL_ETHER_HOSTTON)
+        #
+        # No, how about <arpa/inet.h>, as on AIX?
+        #
+        # This test fails if we don't have <arpa/inet.h>
+        # or if we do but it doesn't declare ether_hostton().
+        #
+        check_symbol_exists(ether_hostton arpa/inet.h ARPA_INET_H_DECLARES_ETHER_HOSTTON)
+        if(ARPA_INET_H_DECLARES_ETHER_HOSTTON)
+            #
+            # Yes - we have it declared.
+            #
+            set(HAVE_DECL_ETHER_HOSTTON TRUE)
+        endif()
+    endif()
+    #
+    # Did that succeed?
+    #
+    if(NOT HAVE_DECL_ETHER_HOSTTON)
+        #
+        # No, how about <netinet/if_ether.h>?
+        # On some platforms, it requires <net/if.h> and
+        # <netinet/in.h>, and we always include it with
+        # both of them, so test it with both of them.
+        #
+        # This test fails if we don't have <netinet/if_ether.h>
+        # and the headers we include before it, or if we do but
+        # <netinet/if_ether.h> doesn't declare ether_hostton().
+        #
+        check_symbol_exists(ether_hostton "sys/types.h;sys/socket.h;net/if.h;netinet/in.h;netinet/if_ether.h" NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON)
+        if(NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON)
+            #
+            # Yes - we have it declared.
+            #
+            set(HAVE_DECL_ETHER_HOSTTON TRUE)
+        endif()
+    endif()
+    #
+    # After all that, is ether_hostton() declared?
+    #
+    if(NOT HAVE_DECL_ETHER_HOSTTON)
+        #
+        # No, we'll have to declare it ourselves.
+        # Do we have "struct ether_addr" if we include <netinet/if_ether.h>?
+        #
+        # XXX - there's no check_type() macro that's like check_type_size()
+        # except that it only checks for the existence of the structure type,
+        # so we use check_type_size() and ignore the size.
+        #
+        cmake_push_check_state()
+        set(CMAKE_EXTRA_INCLUDE_FILES sys/types.h sys/socket.h net/if.h netinet/in.h netinet/if_ether.h)
+        check_type_size("struct ether_addr" STRUCT_ETHER_ADDR)
+        cmake_pop_check_state()
+    endif()
+endif()
+cmake_pop_check_state()
 
-######################################
-# External dependencies
-######################################
+#
+# Large file support on UN*X, a/k/a LFS.
+#
+if(NOT WIN32)
+  include(FindLFS)
+  if(LFS_FOUND)
+    #
+    # Add the required #defines.
+    #
+    add_definitions(${LFS_DEFINITIONS})
+  endif()
 
+  #
+  # Check for fseeko as well.
+  #
+  include(FindFseeko)
+  if(FSEEKO_FOUND)
+    set(HAVE_FSEEKO ON)
+
+    #
+    # Add the required #defines.
+    #
+    add_definitions(${FSEEKO_DEFINITIONS})
+  endif()
+endif()
+
+if(INET6)
+    message(STATUS "Support IPv6")
+endif(INET6)
+
+#
+# Pthreads.
+# We might need them, because some libraries we use might use them,
+# but we don't necessarily need them.
+# That's only on UN*X; on Windows, if they use threads, we assume
+# they're native Windows threads.
+#
+if(NOT WIN32)
+  set(CMAKE_THREAD_PREFER_PTHREAD ON)
+  find_package(Threads)
+  if(NOT CMAKE_USE_PTHREADS_INIT)
+    #
+    # If it's not pthreads, we won't use it; we use it for libraries
+    # that require it.
+    #
+    set(CMAKE_THREAD_LIBS_INIT "")
+  endif(NOT CMAKE_USE_PTHREADS_INIT)
+endif(NOT WIN32)
+
 ######################################
 # Input files
 ######################################
 
 set(PROJECT_SOURCE_LIST_C
     bpf_dump.c
+    bpf_filter.c
     bpf_image.c
     etherent.c
-    fad-helpers.c
+    fmtutils.c
     gencode.c
-    inet.c
     nametoaddr.c
     optimize.c
     pcap-common.c
     pcap.c
     savefile.c
-    sf-pcap-ng.c
+    sf-pcapng.c
     sf-pcap.c
-    bpf/net/bpf_filter.c
 )
 
-if( WIN32 )
-    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/win_snprintf.c )
+if(WIN32)
+    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/win_snprintf.c)
 else()
-    if( NOT HAVE_SNPRINTF )
-        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/snprintf.c )
-    endif( NOT HAVE_SNPRINTF )
-    if( NOT HAVE_STRTOK_R )
-        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/strtok_r.c )
-    endif( NOT HAVE_STRTOK_R )
-endif( WIN32 )
+    if(NOT HAVE_SNPRINTF)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/snprintf.c)
+    endif(NOT HAVE_SNPRINTF)
+    if(NOT HAVE_STRTOK_R)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} missing/strtok_r.c)
+    endif(NOT HAVE_STRTOK_R)
+endif(WIN32)
 
-if( HAVE_REMOTE )
-    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C}
-        pcap-new.c pcap-rpcap.c sockutils.c)
-endif( HAVE_REMOTE )
-
 #
-# Determine the main pcap-XXX.c file to use.
+# Determine the main pcap-XXX.c file to use, and the libraries with
+# which we need to link libpcap, if any.
 #
-if( WIN32 )
+if(WIN32)
     #
-    # WinPcap.
+    # Windows.
     #
-    set( PCAP_TYPE win32 )
+    # Has the user explicitly specified a capture type?
+    #
+    if(PCAP_TYPE STREQUAL "")
+        #
+        # The user didn't explicitly specify a capture mechanism.
+        # Check whether we have packet.dll.
+        #
+        if(HAVE_PACKET32)
+            #
+            # We have packet.dll.
+            # Set the capture type to NPF.
+            #
+            set(PCAP_TYPE npf)
+        else()
+            #
+            # We don't have any capture type we know about, so just use
+            # the null capture type, and only support reading (and writing)
+            # capture files.
+            #
+            set(PCAP_TYPE null)
+        endif()
+    endif()
 else()
     #
-    # UN*X - figure out what type of packet capture mechanism we
-    # have.
+    # UN*X.
     #
-    if( EXISTS /dev/bpf )
-	#
-	# Cloning BPF device.
-	#
-	set( PCAP_TYPE bpf )
-	AC_DEFINE(HAVE_CLONING_BPF,1,[define if you have a cloning BPF device])
-    elseif( EXISTS /dev/bpf0 )
-	set( PCAP_TYPE bpf )
+    # Figure out what type of packet capture mechanism we have, and
+    # what libraries we'd need to link libpcap with, if any.
+    #
 
+    #
+    # Has the user explicitly specified a capture type?
+    #
+    if(PCAP_TYPE STREQUAL "")
         #
-        # XXX - many more BPF checks.
+        # Check for a bunch of headers for various packet capture mechanisms.
         #
-    elseif( EXISTS /usr/include/net/pfilt.h )
+        check_include_files("sys/types.h;net/bpf.h" HAVE_NET_BPF_H)
+        if(HAVE_NET_BPF_H)
+            #
+            # Does it define BIOCSETIF?
+            # I.e., is it a header for an LBL/BSD-style capture
+            # mechanism, or is it just a header for a BPF filter
+            # engine?  Some versions of Arch Linux, for example,
+            # have a net/bpf.h that doesn't define BIOCSETIF;
+            # as it's a Linux, it should use packet sockets,
+            # instead.
+            #
+            #
+            # We need:
+            #
+            #  sys/types.h, because FreeBSD 10's net/bpf.h
+            #  requires that various BSD-style integer types
+            #  be defined;
+            #
+            #  sys/ioctl.h and, if we have it, sys/ioccom.h,
+            #  because net/bpf.h defines ioctls;
+            #
+            #  net/if.h, because it defines some structures
+            #  used in ioctls defined by net/bpf.h;
+            #
+            #  sys/socket.h, because OpenBSD 5.9's net/bpf.h
+            #  defines some structure fields as being
+            #  struct sockaddrs;
+            #
+            # and net/bpf.h doesn't necessarily include all
+            # of those headers itself.
+            #
+            if(HAVE_SYS_IOCCOM_H)
+                check_symbol_exists(BIOCSETIF "sys/types.h;sys/ioctl.h;sys/socket.h;sys/ioccom.h;net/bpf.h;net/if.h" BPF_H_DEFINES_BIOCSETIF)
+            else(HAVE_SYS_IOCCOM_H)
+                check_symbol_exists(BIOCSETIF "sys/types.h;sys/ioctl.h;sys/socket.h;net/bpf.h;net/if.h" BPF_H_DEFINES_BIOCSETIF)
+            endif(HAVE_SYS_IOCCOM_H)
+        endif(HAVE_NET_BPF_H)
+        check_include_file(net/pfilt.h HAVE_NET_PFILT_H)
+        check_include_file(net/enet.h HAVE_NET_ENET_H)
+        check_include_file(net/nit.h HAVE_NET_NIT_H)
+        check_include_file(sys/net/nit.h HAVE_SYS_NET_NIT_H)
+        check_include_file(linux/socket.h HAVE_LINUX_SOCKET_H)
+        check_include_file(net/raw.h HAVE_NET_RAW_H)
+        check_include_file(sys/dlpi.h HAVE_SYS_DLPI_H)
+
+        if(BPF_H_DEFINES_BIOCSETIF)
+            #
+            # BPF.
+            # Check this before DLPI, so that we pick BPF on
+            # Solaris 11 and later.
+            #
+            set(PCAP_TYPE bpf)
+        elseif(HAVE_LINUX_SOCKET_H)
+            #
+            # No prizes for guessing this one.
+            #
+            set(PCAP_TYPE linux)
+        elseif(HAVE_NET_PFILT_H)
+            #
+            # DEC OSF/1, Digital UNIX, Tru64 UNIX
+            #
+            set(PCAP_TYPE pf)
+        elseif(HAVE_NET_ENET_H)
+            #
+            # Stanford Enetfilter.
+            #
+            set(PCAP_TYPE enet)
+        elseif(HAVE_NET_NIT_H)
+            #
+            # SunOS 4.x STREAMS NIT.
+            #
+            set(PCAP_TYPE snit)
+        elseif(HAVE_SYS_NET_NIT_H)
+            #
+            # Pre-SunOS 4.x non-STREAMS NIT.
+            #
+            set(PCAP_TYPE nit)
+        elseif(HAVE_NET_RAW_H)
+            #
+            # IRIX snoop.
+            #
+            set(PCAP_TYPE snoop)
+        elseif(HAVE_SYS_DLPI_H)
+            #
+            # DLPI on pre-Solaris 11 SunOS 5, HP-UX, possibly others.
+            #
+            set(PCAP_TYPE dlpi)
+        else()
+            #
+            # Nothing we support.
+            #
+            set(PCAP_TYPE null)
+        endif()
+    endif()
+endif(WIN32)
+message(STATUS "Packet capture mechanism type: ${PCAP_TYPE}")
+
+#
+# Do capture-mechanism-dependent tests.
+#
+if(WIN32)
+    if(PCAP_TYPE STREQUAL "npf")
         #
-        # DEC OSF/1, Digital UNIX, Tru64 UNIX
+        # Link with packet.dll before WinSock2.
         #
-	set( PCAP_TYPE pf )
-    elseif( EXISTS /dev/enet )
-        set( PCAP_TYPE enet )
-    elseif( EXISTS /dev/nit )
-        set( PCAP_TYPE snit )
-    elseif( EXISTS /usr/include/sys/net/nit.h )
-        set( PCAP_TYPE nit )
-    elseif( EXISTS /usr/include/linux/socket.h )
-        set( PCAP_TYPE linux )
+        set(PCAP_LINK_LIBRARIES ${PACKET_LIBRARIES} ${PCAP_LINK_LIBRARIES})
+    elseif(PCAP_TYPE STREQUAL "null")
+    else()
+        message(ERROR "${PCAP_TYPE} is not a valid pcap type")
+    endif()
+else(WIN32)
+    if(PCAP_TYPE STREQUAL "dlpi")
+        #
+        # Needed for common functions used by pcap-[dlpi,libdlpi].c
+        #
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} dlpisubs.c)
 
-	#
-	# Do we have the wireless extensions?
-	#
-        check_include_file( linux/wireless.h HAVE_LINUX_WIRELESS_H )
+        #
+        # Checks for some header files.
+        #
+        check_include_file(sys/bufmod.h HAVE_SYS_BUFMOD_H)
+        check_include_file(sys/dlpi_ext.h HAVE_SYS_DLPI_EXT_H)
 
         #
-        # XXX - many more Linux checks.
-	#
-    elseif( EXISTS /usr/include/net/raw.h )
-        set( PCAP_TYPE snoop )
-    elseif( EXISTS /usr/include/odmi.h )
+        # Checks to see if Solaris has the public libdlpi(3LIB) library.
+        # Note: The existence of /usr/include/libdlpi.h does not mean it is the
+        # public libdlpi(3LIB) version. Before libdlpi was made public, a
+        # private version also existed, which did not have the same APIs.
+        # Due to a gcc bug, the default search path for 32-bit libraries does
+        # not include /lib, we add it explicitly here.
+        # [http://bugs.opensolaris.org/view_bug.do?bug_id=6619485].
+        # Also, due to the bug above applications that link to libpcap with
+        # libdlpi will have to add "-L/lib" option to "configure".
         #
-        # On AIX, the BPF devices might not yet be present - they're
-        # created the first time libpcap runs after booting.
-        # We check for odmi.h instead.
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_FLAGS "-L/lib")
+        set(CMAKE_REQUIRED_LIBRARIES dlpi)
+        check_function_exists(dlpi_walk HAVE_LIBDLPI)
+        cmake_pop_check_state()
+        if(HAVE_LIBDLPI)
+            #
+            # XXX - add -L/lib
+            #
+            set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} dlpi)
+            set(PCAP_TYPE libdlpi)
+        endif()
+
         #
-        set( PCAP_TYPE bpf )
-    elseif( /usr/include/sys/dlpi.h )
-        set( PCAP_TYPE dlpi )
+        # This check is for Solaris with DLPI support for passive modes.
+        # See dlpi(7P) for more details.
+        #
+        # XXX - there's no check_type() macro that's like check_type_size()
+        # except that it only checks for the existence of the structure type,
+        # so we use check_type_size() and ignore the size.
+        #
+        cmake_push_check_state()
+        set(CMAKE_EXTRA_INCLUDE_FILES sys/types.h sys/dlpi.h)
+        check_type_size(dl_passive_req_t DL_PASSIVE_REQ_T)
+        cmake_pop_check_state()
+    elseif(PCAP_TYPE STREQUAL "linux")
+        #
+        # Do we have the wireless extensions?
+        # linux/wireless.h requires sys/socket.h.
+        #
+        check_include_files("sys/socket.h;linux/wireless.h" HAVE_LINUX_WIRELESS_H)
 
         #
-        # XXX - many more DLPI checks.
+        # Do we have libnl?
         #
+        if(BUILD_WITH_LIBNL)
+            #
+            # Try libnl 3.x first.
+            #
+            cmake_push_check_state()
+            set(CMAKE_REQUIRED_LIBRARIES nl-3)
+            check_function_exists(nl_socket_alloc HAVE_LIBNL)
+            cmake_pop_check_state()
+            if(HAVE_LIBNL)
+                #
+                # Yes, we have libnl 3.x.
+                #
+                set(PCAP_LINK_LIBRARIES nl-genl-3 nl-3 ${PCAP_LINK_LIBRARIES})
+                set(HAVE_LIBNL_3_x ON)
+                set(HAVE_LIBNL_NLE ON)
+                set(HAVE_LIBNL_SOCKETS ON)
+                include_directories("/usr/include/libnl3")
+            else()
+                #
+                # Try libnl 2.x.
+                #
+                cmake_push_check_state()
+                set(CMAKE_REQUIRED_LIBRARIES nl)
+                check_function_exists(nl_socket_alloc HAVE_LIBNL)
+                cmake_pop_check_state()
+                if(HAVE_LIBNL)
+                    #
+                    # Yes, we have libnl 2.x.
+                    #
+                    set(PCAP_LINK_LIBRARIES nl-genl nl ${PCAP_LINK_LIBRARIES})
+                    set(HAVE_LIBNL_2_x ON)
+                    set(HAVE_LIBNL_NLE ON)
+                    set(HAVE_LIBNL_SOCKETS ON)
+                else()
+                    #
+                    # No, we don't; do we have libnl 1.x?
+                    #
+                    cmake_push_check_state()
+                    set(CMAKE_REQUIRED_LIBRARIES nl)
+                    check_function_exists(nl_handle_alloc HAVE_LIBNL)
+                    cmake_pop_check_state()
+                    if(HAVE_LIBNL)
+                        set(PCAP_LINK_LIBRARIES nl ${PCAP_LINK_LIBRARIES})
+                    endif()
+                endif()
+            endif()
+        endif()
+
+        check_include_file(linux/ethtool.h HAVE_LINUX_ETHTOOL_H)
+
+        #
+        # Checks to see if tpacket_stats is defined in linux/if_packet.h
+        # If so then pcap-linux.c can use this to report proper statistics.
+        #
+        # XXX - there's no check_type() macro that's like check_type_size()
+        # except that it only checks for the existence of the structure type,
+        # so we use check_type_size() and ignore the size.
+        #
+        cmake_push_check_state()
+        set(CMAKE_EXTRA_INCLUDE_FILES linux/if_packet.h)
+        check_type_size("struct tpacket_stats" STRUCT_TPACKET_STATS)
+        cmake_pop_check_state()
+
+        check_struct_has_member("struct tpacket_auxdata" tp_vlan_tci linux/if_packet.h HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI)
+    elseif(PCAP_TYPE STREQUAL "bpf")
+        #
+        # Check whether we have the *BSD-style ioctls.
+        #
+        check_include_files("sys/types.h;net/if_media.h" HAVE_NET_IF_MEDIA_H)
+
+        #
+        # Check whether we have struct BPF_TIMEVAL.
+        #
+        # XXX - there's no check_type() macro that's like check_type_size()
+        # except that it only checks for the existence of the structure type,
+        # so we use check_type_size() and ignore the size.
+        #
+        cmake_push_check_state()
+        if(HAVE_SYS_IOCCOM_H)
+            set(CMAKE_EXTRA_INCLUDE_FILES sys/types.h sys/ioccom.h net/bpf.h)
+            check_type_size("struct BPF_TIMEVAL" STRUCT_BPF_TIMEVAL)
+        else()
+            set(CMAKE_EXTRA_INCLUDE_FILES  sys/types.h net/bpf.h)
+            check_type_size("struct BPF_TIMEVAL" STRUCT_BPF_TIMEVAL)
+        endif()
+        cmake_pop_check_state()
+    elseif(PCAP_TYPE STREQUAL "null")
     else()
-	set( PCAP_TYPE null )
+        message(FATAL_ERROR "${PCAP_TYPE} is not a valid pcap type")
     endif()
-endif( WIN32 )
-message(STATUS "Packet capture mechanism type: ${PCAP_TYPE}")
+endif(WIN32)
+
 set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-${PCAP_TYPE}.c)
 
 #
 # Now figure out how we get a list of interfaces and addresses,
 # if we support capturing.  Don't bother if we don't support
 # capturing.
 #
-if( NOT WIN32 )
+if(NOT WIN32)
     #
     # UN*X - figure out what type of interface list mechanism we
     # have.
     #
-    if( ${PCAP_TYPE} STREQUAL "null" )
-        #
-        # We can't capture, so we can't open any capture
-        # devices, so we won't return any interfaces.
-        #
-        set( FINDALLDEVS_TYPE null )
-    else()
-        check_function_exists( getifaddrs HAVE_GETIFADDRS )
-        if( ${HAVE_GETIFADDRS} )
+    # If the capture type is null, that means we can't capture,
+    # so we can't open any capture devices, so we won't return
+    # any interfaces.
+    #
+    if(NOT PCAP_TYPE STREQUAL "null")
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LINK_LIBRARIES})
+        check_function_exists(getifaddrs HAVE_GETIFADDRS)
+        cmake_pop_check_state()
+        if(NOT HAVE_GETIFADDRS)
             #
+            # It's not in the libraries that, at this point, we've
+            # found we need to link libpcap with.
+            #
+            # It's in libsocket on Solaris and possibly other OSes;
+            # as long as we're not linking with libxnet, check there.
+            #
+            # NOTE: if you hand check_library_exists as its last
+            # argument a variable that's been set, it skips the test,
+            # so we need different variables.
+            #
+            if(NOT LIBXNET_HAS_GETHOSTBYNAME)
+                check_library_exists(socket getifaddrs "" SOCKET_HAS_GETIFADDRS)
+                if(SOCKET_HAS_GETIFADDRS)
+                    set(PCAP_LINK_LIBRARIES socket ${PCAP_LINK_LIBRARIES})
+                    set(HAVE_GETIFADDRS TRUE)
+                endif()
+            endif()
+        endif()
+        if(HAVE_GETIFADDRS)
+            #
             # We have "getifaddrs()"; make sure we have <ifaddrs.h>
             # as well, just in case some platform is really weird.
+            # It may require that sys/types.h be included first,
+            # so include it first.
             #
-            check_include_file( ifaddrs.h HAVE_IFADDRS_H )
-            if( ${HAVE_IFADDRS_H} )
+            check_include_files("sys/types.h;ifaddrs.h" HAVE_IFADDRS_H)
+            if(HAVE_IFADDRS_H)
                 #
                 # We have the header, so we use "getifaddrs()" to
                 # get the list of interfaces.
                 #
-                set( FINDALLDEVS_TYPE getad )
+                set(FINDALLDEVS_TYPE getad)
             else()
                 #
                 # We don't have the header - give up.
                 # XXX - we could also fall back on some other
                 # mechanism, but, for now, this'll catch this
                 # problem so that we can at least try to figure
                 # out something to do on systems with "getifaddrs()"
                 # but without "ifaddrs.h", if there is something
                 # we can do on those systems.
                 #
-                message(FATAL_ERROR "Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>." )
+                message(FATAL_ERROR "Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>.")
             endif()
         else()
             #
-            # Well, we don't have "getifaddrs()", so we have to use
-            # some other mechanism; determine what that mechanism is.
+            # Well, we don't have "getifaddrs()", at least not with the
+            # libraries with which we've decided we need to link
+            # libpcap with, so we have to use some other mechanism.
             #
-            # The first thing we use is the type of capture mechanism,
-            # which is somewhat of a proxy for the OS we're using.
+            # Note that this may happen on Solaris, which has
+            # getifaddrs(), but in -lsocket, not in -lxnet, so we
+            # won't find it if we link with -lxnet, which we want
+            # to do for other reasons.
             #
-            if( ${PCAP_TYPE} STREQUAL "dlpi" OR ${PCAP_TYPE} STREQUAL "libdlpi" )
-                #
-                # This might be Solaris 8 or later, with
-                # SIOCGLIFCONF, or it might be some other OS
-                # or some older version of Solaris, with
-                # just SIOCGIFCONF.
-                #
-                try_compile( HAVE_SIOCGLIFCONF ${CMAKE_CURRENT_BINARY_DIR} "${pcap_SOURCE_DIR}/config/have_siocglifconf.c"  )
-                message( STATUS "HAVE_SIOCGLIFCONF = ${HAVE_SIOCGLIFCONF}" )
-                if( HAVE_SIOCGLIFCONF )
-                    set( FINDALLDEVS_TYPE glifc )
-                else()
-                    set( FINDALLDEVS_TYPE gifc )
-                endif()
+            # For now, we use either the SIOCGIFCONF ioctl or the
+            # SIOCGLIFCONF ioctl, preferring the latter if we have
+            # it; the latter is a Solarisism that first appeared
+            # in Solaris 8.  (Solaris's getifaddrs() appears to
+            # be built atop SIOCGLIFCONF; using it directly
+            # avoids a not-all-that-useful middleman.)
+            #
+            try_compile(HAVE_SIOCGLIFCONF ${CMAKE_CURRENT_BINARY_DIR} "${pcap_SOURCE_DIR}/cmake/have_siocglifconf.c" )
+            if(HAVE_SIOCGLIFCONF)
+                set(FINDALLDEVS_TYPE glifc)
             else()
+                set(FINDALLDEVS_TYPE gifc)
+            endif()
+        endif()
+        message(STATUS "Find-interfaces mechanism type: ${FINDALLDEVS_TYPE}")
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} fad-${FINDALLDEVS_TYPE}.c)
+    endif()
+endif()
+
+# Check for hardware timestamp support.
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    check_include_file(linux/net_tstamp.h HAVE_LINUX_NET_TSTAMP_H)
+endif()
+
+#
+# Check for additional native sniffing capabilities.
+#
+
+# Check for USB sniffing support on Linux.
+# On FreeBSD, it uses BPF, so we don't need to do anything special here.
+if(NOT DISABLE_USB)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        set(PCAP_SUPPORT_USB TRUE)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-usb-linux.c)
+        set(LINUX_USB_MON_DEV /dev/usbmon)
+        #
+        # Do we have a version of <linux/compiler.h> available?
+        # If so, we might need it for <linux/usbdevice_fs.h>.
+        #
+        check_include_files("linux/compiler.h" HAVE_LINUX_COMPILER_H)
+        if(HAVE_LINUX_COMPILER_H)
+            #
+            # Yes - include it when testing for <linux/usbdevice_fs.h>.
+            #
+            check_include_files("linux/compiler.h;linux/usbdevice_fs.h" HAVE_LINUX_USBDEVICE_FS_H)
+        else(HAVE_LINUX_COMPILER_H)
+            check_include_files("linux/usbdevice_fs.h" HAVE_LINUX_USBDEVICE_FS_H)
+        endif(HAVE_LINUX_COMPILER_H)
+        if(HAVE_LINUX_USBDEVICE_FS_H)
+            #
+            # OK, does it define bRequestType?  Older versions of the kernel
+            # define fields with names like "requesttype, "request", and
+            # "value", rather than "bRequestType", "bRequest", and
+            # "wValue".
+            #
+            if(HAVE_LINUX_COMPILER_H)
+                check_struct_has_member("struct usbdevfs_ctrltransfer" bRequestType "linux/compiler.h;linux/usbdevice_fs.h" HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE)
+            else(HAVE_LINUX_COMPILER_H)
+                check_struct_has_member("struct usbdevfs_ctrltransfer" bRequestType "linux/usbdevice_fs.h" HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE)
+            endif(HAVE_LINUX_COMPILER_H)
+        endif()
+    endif()
+endif()
+
+# Check for netfilter sniffing support.
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    #
+    # Life's too short to deal with trying to get this to compile
+    # if you don't get the right types defined with
+    # __KERNEL_STRICT_NAMES getting defined by some other include.
+    #
+    # Check whether the includes Just Work.  If not, don't turn on
+    # netfilter support.
+    #
+    check_c_source_compiles(
+"#include <sys/socket.h>
+#include <netinet/in.h>
+#include <linux/types.h>
+
+#include <linux/netlink.h>
+#include <linux/netfilter.h>
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter/nfnetlink_log.h>
+#include <linux/netfilter/nfnetlink_queue.h>
+
+int
+main(void)
+{
+    return 0;
+}
+"
+        PCAP_SUPPORT_NETFILTER)
+    if(PCAP_SUPPORT_NETFILTER)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-netfilter-linux.c)
+    endif(PCAP_SUPPORT_NETFILTER)
+endif()
+
+# Check for netmap sniffing support.
+if(NOT DISABLE_NETMAP)
+    #
+    # Check whether net/netmap_user.h is usable if NETMAP_WITH_LIBS is
+    # defined; it's not usable on DragonFly BSD 4.6 if NETMAP_WITH_LIBS
+    # is defined, for example, as it includes a non-existent malloc.h
+    # header.
+    #
+    check_c_source_compiles(
+"#define NETMAP_WITH_LIBS
+#include <net/netmap_user.h>
+
+int
+main(void)
+{
+    return 0;
+}
+"
+        PCAP_SUPPORT_NETMAP)
+    if(PCAP_SUPPORT_NETMAP)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-netmap.c)
+    endif(PCAP_SUPPORT_NETMAP)
+endif()
+
+# Check for Bluetooth sniffing support
+if(NOT DISABLE_BLUETOOTH)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        check_include_file(bluetooth/bluetooth.h HAVE_BLUETOOTH_BLUETOOTH_H)
+        if(HAVE_BLUETOOTH_BLUETOOTH_H)
+            set(PCAP_SUPPORT_BT TRUE)
+            set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-bt-linux.c)
+            #
+            # OK, does struct sockaddr_hci have an hci_channel
+            # member?
+            #
+            check_struct_has_member("struct sockaddr_hci" hci_channel "bluetooth/bluetooth.h;bluetooth/hci.h" HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL)
+            if(HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL)
                 #
-                # Assume we just have SIOCGIFCONF.
-                # (XXX - on at least later Linux kernels, there's
-                # another mechanism, and we should be using that
-                # instead.)
+                # OK, is HCI_CHANNEL_MONITOR defined?
                 #
-                set( FINDALLDEVS_TYPE gifc )
+               check_c_source_compiles(
+"#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+
+int
+main(void)
+{
+    u_int i = HCI_CHANNEL_MONITOR;
+    return 0;
+}
+"
+                   PCAP_SUPPORT_BT_MONITOR)
+               if(PCAP_SUPPORT_BT_MONITOR)
+                   #
+                   # Yes, so we can also support Bluetooth monitor
+                   # sniffing.
+                   #
+                   set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-bt-monitor-linux.c)
+               endif(PCAP_SUPPORT_BT_MONITOR)
+            endif(HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL)
+        endif(HAVE_BLUETOOTH_BLUETOOTH_H)
+    endif()
+endif()
+
+# Check for Bluetooth sniffing support
+if(NOT DISABLE_DBUS)
+    #
+    # We don't support D-Bus sniffing on macOS; see
+    #
+    # https://bugs.freedesktop.org/show_bug.cgi?id=74029
+    #
+    if(APPLE)
+        message(FATAL_ERROR "Due to freedesktop.org bug 74029, D-Bus capture support is not available on macOS")
+    endif(APPLE)
+    include(FindPkgConfig)
+    pkg_check_modules(DBUS dbus-1)
+    if(DBUS_FOUND)
+        set(PCAP_SUPPORT_DBUS TRUE)
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-dbus.c)
+        include_directories(${DBUS_INCLUDE_DIRS})
+        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${DBUS_LIBRARIES})
+    endif(DBUS_FOUND)
+endif(NOT DISABLE_DBUS)
+
+# Check for RDMA sniffing support
+if(NOT DISABLE_RDMA)
+    check_library_exists(ibverbs ibv_get_device_list "" LIBIBVERBS_HAS_IBV_GET_DEVICE_LIST)
+    if(LIBIBVERBS_HAS_IBV_GET_DEVICE_LIST)
+        check_include_file(infiniband/verbs.h HAVE_INFINIBAND_VERBS_H)
+        if(HAVE_INFINIBAND_VERBS_H)
+            check_symbol_exists(ibv_create_flow infiniband/verbs.h PCAP_SUPPORT_RDMASNIFF)
+            if(PCAP_SUPPORT_RDMASNIFF)
+                set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-rdmasniff.c)
+                set(PCAP_LINK_LIBRARIES ibverbs ${PCAP_LINK_LIBRARIES})
+            endif(PCAP_SUPPORT_RDMASNIFF)
+        endif(HAVE_INFINIBAND_VERBS_H)
+    endif(LIBIBVERBS_HAS_IBV_GET_DEVICE_LIST)
+endif(NOT DISABLE_RDMA)
+
+#
+# Check for sniffing capabilities using third-party APIs.
+#
+
+# Check for Endace DAG card support.
+if(NOT DISABLE_DAG)
+    #
+    # Try to find the DAG header file and library.
+    #
+    find_package(DAG)
+
+    #
+    # Did we succeed?
+    #
+    if(DAG_FOUND)
+        #
+        # Yes.
+        # Check for various DAG API functions.
+        #
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_INCLUDES ${DAG_INCLUDE_DIRS})
+        set(CMAKE_REQUIRED_LIBRARIES ${DAG_LIBRARIES})
+        check_function_exists(dag_attach_stream HAVE_DAG_STREAMS_API)
+        if(NOT HAVE_DAG_STREAMS_API)
+            message(FATAL_ERROR "DAG library lacks streams support")
+        endif()
+        check_function_exists(dag_attach_stream64 HAVE_DAG_LARGE_STREAMS_API)
+        check_function_exists(dag_get_erf_types HAVE_DAG_GET_ERF_TYPES)
+        check_function_exists(dag_get_stream_erf_types HAVE_DAG_GET_STREAM_ERF_TYPES)
+        cmake_pop_check_state()
+
+        include_directories(AFTER ${DAG_INCLUDE_DIRS})
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-dag.c)
+        set(HAVE_DAG_API TRUE)
+        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${DAG_LIBRARIES})
+
+        if(HAVE_DAG_LARGE_STREAMS_API)
+            get_filename_component(DAG_LIBRARY_DIR ${DAG_LIBRARY} PATH)
+            check_library_exists(vdag vdag_set_device_info ${DAG_LIBRARY_DIR} HAVE_DAG_VDAG)
+            if(HAVE_DAG_VDAG)
+                set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
             endif()
         endif()
     endif()
-    message(STATUS "Find-interfaces mechanism type: ${FINDALLDEVS_TYPE}")
-    set( PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} fad-${FINDALLDEVS_TYPE}.c )
+endif() 
+
+# Check for Septel card support.
+set(PROJECT_EXTERNAL_OBJECT_LIST "")
+if(NOT DISABLE_SEPTEL)
+    #
+    # Do we have the msg.h header?
+    #
+    set(SEPTEL_INCLUDE_DIRS "${SEPTEL_ROOT}/INC")
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_INCLUDES ${SEPTEL_INCLUDE_DIRS})
+    check_include_file(msg.h HAVE_INC_MSG_H)
+    cmake_pop_check_state()
+    if(HAVE_INC_MSG_H)
+        #
+        # Yes.
+        #
+        include_directories(AFTER ${SEPTEL_INCLUDE_DIRS})
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-septel.c)
+        set(PROJECT_EXTERNAL_OBJECT_LIST ${PROJECT_EXTERNAL_OBJECT_LIST} "${SEPTEL_ROOT}/asciibin.o ${SEPTEL_ROOT}/bit2byte.o ${SEPTEL_ROOT}/confirm.o ${SEPTEL_ROOT}/fmtmsg.o ${SEPTEL_ROOT}/gct_unix.o ${SEPTEL_ROOT}/hqueue.o ${SEPTEL_ROOT}/ident.o ${SEPTEL_ROOT}/mem.o ${SEPTEL_ROOT}/pack.o ${SEPTEL_ROOT}/parse.o ${SEPTEL_ROOT}/pool.o ${SEPTEL_ROOT}/sdlsig.o ${SEPTEL_ROOT}/strtonum.o ${SEPTEL_ROOT}/timer.o ${SEPTEL_ROOT}/trace.o")
+        set(HAVE_SEPTEL_API TRUE)
+    endif()
+endif() 
+
+# Check for Myricom SNF support.
+if(NOT DISABLE_SNF)
+    #
+    # Try to find the SNF header file and library.
+    #
+    find_package(SNF)
+
+    #
+    # Did we succeed?
+    #
+    if(SNF_FOUND)
+        #
+        # Yes.
+        #
+        include_directories(AFTER ${SNF_INCLUDE_DIRS})
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-snf.c)
+        set(HAVE_SNF_API TRUE)
+        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${SNF_LIBRARIES})
+    endif()
+endif() 
+
+# Check for Riverbed TurboCap support.
+if(NOT DISABLE_TC)
+    #
+    # Try to find the TurboCap header file and library.
+    #
+    find_package(TC)
+
+    #
+    # Did we succeed?
+    #
+    if(TC_FOUND)
+        #
+        # Yes.
+        #
+        include_directories(AFTER ${TC_INCLUDE_DIRS})
+        set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-tc.c)
+        set(HAVE_TC_API TRUE)
+        set(PCAP_LINK_LIBRARIES "${PCAP_LINK_LIBRARIES} ${TC_LIBRARIES} ${CMAKE_USE_PTHREADS_INIT} stdc++")
+    endif()
+endif() 
+
+#
+# Remote capture support.
+#
+
+if(ENABLE_REMOTE)
+    #
+    # Check for various members of struct msghdr.
+    # We need to include ftmacros.h on some platforms, to make sure we
+    # get the POSIX/Single USER Specification version of struct msghdr,
+    # which has those members, rather than the backwards-compatible
+    # version, which doesn't.  That's not a system header file, and
+    # at least some versions of CMake include it as <ftmacros.h>, which
+    # won't check the current directory, so we add the top-level
+    # source directory to the list of include directories when we do
+    # the check.
+    #
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR})
+    check_struct_has_member("struct msghdr" msg_control "ftmacros.h;sys/socket.h" HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    check_struct_has_member("struct msghdr" msg_flags "ftmacros.h;sys/socket.h" HAVE_STRUCT_MSGHDR_MSG_FLAGS)
+    cmake_pop_check_state()
+    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C}
+        pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c)
+endif(ENABLE_REMOTE)
+
+###################################################################
+#   Warning options
+###################################################################
+
+#
+# Check and add warning options if we have a .devel file.
+#
+if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel)
+    #
+    # Warning options.
+    #
+    if(MSVC AND NOT ${CMAKE_C_COMPILER} MATCHES "clang*")
+        #
+        # MSVC, with Microsoft's front end and code generator.
+        # "MSVC" is also set for Microsoft's compiler with a Clang
+        # front end and their code generator ("Clang/C2"), so we
+        # check for clang.exe and treat that differently.
+        #
+        check_and_add_compiler_option(-Wall)
+        #
+        # Disable some pointless warnings that /Wall turns on.
+        #
+        # Unfortunately, MSVC does not appear to have an equivalent
+        # to "__attribute__((unused))" to mark a particular function
+        # parameter as being known to be unused, so that the compiler
+        # won't warn about it (for example, the function might have
+        # that parameter because a pointer to it is being used, and
+        # the signature of that function includes that parameter).
+        # C++ lets you give a parameter a type but no name, but C
+        # doesn't have that.
+        #
+        check_and_add_compiler_option(-wd4100)
+        #
+        # In theory, we care whether somebody uses f() rather than
+        # f(void) to declare a function with no arguments, but, in
+        # practice, there are places in the Windows header files
+        # that appear to do that, so we squelch that warning.
+        #
+        check_and_add_compiler_option(-wd4255)
+        #
+        # Windows FD_SET() generates this, so we suppress it.
+        #
+        check_and_add_compiler_option(-wd4548)
+        #
+        # Perhaps testing something #defined to be 0 with #ifdef is an
+        # error, and it should be tested with #if, but perhaps it's
+        # not, and Microsoft does that in its headers, so we squelch
+        # that warning.
+        #
+        check_and_add_compiler_option(-wd4574)
+        #
+        # The Windows headers also test not-defined values in #if, so
+        # we don't want warnings about that, either.
+        #
+        check_and_add_compiler_option(-wd4668)
+        #
+        # We do *not* care whether some function is, or isn't, going to be
+        # expanded inline.
+        #
+        check_and_add_compiler_option(-wd4710)
+        check_and_add_compiler_option(-wd4711)
+        #
+        # We do *not* care whether we're adding padding bytes after
+        # structure members.
+        #
+        check_and_add_compiler_option(-wd4820)
+    else()
+        #
+        # Other compilers, including MSVC with a Clang front end and
+        # Microsoft's code generator.  We currently treat them as if
+        # they might support GCC-style -W options.
+        #
+        check_and_add_compiler_option(-Wall)
+        check_and_add_compiler_option(-Wsign-compare)
+        check_and_add_compiler_option(-Wmissing-prototypes)
+        check_and_add_compiler_option(-Wstrict-prototypes)
+        check_and_add_compiler_option(-Wshadow)
+        check_and_add_compiler_option(-Wdeclaration-after-statement)
+        check_and_add_compiler_option(-Wused-but-marked-unused)
+        check_and_add_compiler_option(-Wdocumentation)
+        check_and_add_compiler_option(-Wcomma)
+        check_and_add_compiler_option(-Wmissing-noreturn)
+        # Warns about safeguards added in case the enums are extended
+        # check_and_add_compiler_option(-Wcovered-switch-default)
+        check_and_add_compiler_option(-Wmissing-variable-declarations)
+        check_and_add_compiler_option(-Wunused-parameter)
+        check_and_add_compiler_option(-Wformat-nonliteral)
+        check_and_add_compiler_option(-Wunreachable-code)
+    endif()
 endif()
 
-file(GLOB PROJECT_SOURCE_LIST_CORE_H
+#
+# Suppress some warnings we get with MSVC even without /Wall.
+#
+if(MSVC AND NOT ${CMAKE_C_COMPILER} MATCHES "clang*")
+    #
+    # Yes, we have some functions that never return but that
+    # have a non-void return type.  That's because, on some
+    # platforms, they *do* return values but, on other
+    # platforms, including Windows, they just fail and
+    # longjmp out by calling bpf_error().
+    #
+    check_and_add_compiler_option(-wd4646)
+endif()
+
+file(GLOB PROJECT_SOURCE_LIST_H
     *.h
     pcap/*.h
 )
-set( PROJECT_SOURCE_LIST_H ${PROJECT_SOURCE_LIST_H} ${PROJECT_SOURCE_LIST_CORE_H} )
 
-if( WIN32 )
-    file(GLOB PROJECT_SOURCE_LIST_WIN32_H
-        Win32/Include/*.h
-    )
-    set( PROJECT_SOURCE_LIST_H ${PROJECT_SOURCE_LIST_H} ${PROJECT_SOURCE_LIST_WIN32_H} )
-endif( WIN32 )
+#
+# Try to have the compiler default to hiding symbols, so that only
+# symbols explicitly exported with PCAP_API will be visible outside
+# (shared) libraries.
+#
+# Not necessary with MSVC, as that's the default.
+#
+# XXX - we don't use ADD_COMPILER_EXPORT_FLAGS, because, as of CMake
+# 2.8.12.2, it doesn't know about Sun C/Oracle Studio, and, as of
+# CMake 2.8.6, it only sets the C++ compiler flags, rather than
+# allowing an arbitrary variable to be set with the "hide symbols
+# not explicitly exported" flag.
+#
+if(NOT MSVC)
+    if(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+        #
+        # Sun C/Oracle Studio.
+        #
+        check_and_add_compiler_option(-xldscope=hidden)
+    else()
+        #
+        # Try this for all other compilers; it's what GCC uses,
+        # and a number of other compilers, such as Clang and Intel C,
+        # use it as well.
+        #
+        check_and_add_compiler_option(-fvisibility=hidden)
+    endif()
+endif(NOT MSVC)
 
 #
-# {Flex} and YACC/Berkeley YACC/Bison.
+# Flex/Lex and YACC/Berkeley YACC/Bison.
 # From a mail message to the CMake mailing list by Andy Cedilnik of
 # Kitware.
 #
 
 #
 # Try to find Flex, a Windows version of Flex, or Lex.
 #
 find_program(LEX_EXECUTABLE NAMES flex win_flex lex)
-if( ${LEX_EXECUTABLE} STREQUAL "LEX_EXECUTABLE-NOTFOUND" )
-    message(FATAL_ERROR "Neither flex nor win_flex nor lex was found." )
+if(LEX_EXECUTABLE STREQUAL "LEX_EXECUTABLE-NOTFOUND")
+    message(FATAL_ERROR "Neither flex nor win_flex nor lex was found.")
 endif()
 message(STATUS "Lexical analyzer generator: ${LEX_EXECUTABLE}")
 
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${CMAKE_CURRENT_BINARY_DIR}/scanner.h
     SOURCE ${pcap_SOURCE_DIR}/scanner.l
     COMMAND ${LEX_EXECUTABLE} -P pcap_ --header-file=scanner.h --nounput -o${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${pcap_SOURCE_DIR}/scanner.l
     DEPENDS ${pcap_SOURCE_DIR}/scanner.l
 )
 
 #
 # Since scanner.c does not exist yet when cmake is run, mark
 # it as generated.
 #
 # Since scanner.c includes grammar.h, mark that as a dependency.
 #
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/scanner.c PROPERTIES
     GENERATED TRUE
-    OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/scanner.h
+    OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/grammar.h
 )
 
 #
 # Add scanner.c to the list of sources.
 #
 #set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${CMAKE_CURRENT_BINARY_DIR}/scanner.c)
 
 #
 # Try to find YACC or Bison.
 #
 find_program(YACC_EXECUTABLE NAMES bison win_bison byacc yacc)
-if( ${YACC_EXECUTABLE} STREQUAL "YACC_EXECUTABLE-NOTFOUND" )
-    message(FATAL_ERROR "Neither bison nor win_bison nor byacc nor yacc was found." )
+if(YACC_EXECUTABLE STREQUAL "YACC_EXECUTABLE-NOTFOUND")
+    message(FATAL_ERROR "Neither bison nor win_bison nor byacc nor yacc was found.")
 endif()
 message(STATUS "Parser generator: ${YACC_EXECUTABLE}")
 
 #
 # Create custom command for the scanner.
-# Find out whether it's Bison or notby looking at the last component
+# Find out whether it's Bison or not by looking at the last component
 # of the path (without a .exe extension, if this is Windows).
 #
 get_filename_component(YACC_NAME ${YACC_EXECUTABLE} NAME_WE)
-if( "${YACC_NAME}" STREQUAL "bison" OR "${YACC_NAME}" STREQUAL "win_bison" )
-    set( YACC_COMPATIBILITY_FLAG "-y" )
+if("${YACC_NAME}" STREQUAL "bison" OR "${YACC_NAME}" STREQUAL "win_bison")
+    set(YACC_COMPATIBILITY_FLAG "-y")
 endif()
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/grammar.c ${CMAKE_CURRENT_BINARY_DIR}/grammar.h
     SOURCE ${pcap_SOURCE_DIR}/grammar.y
     COMMAND ${YACC_EXECUTABLE} ${YACC_COMPATIBILITY_FLAG} -p pcap_ -o ${CMAKE_CURRENT_BINARY_DIR}/grammar.c -d ${pcap_SOURCE_DIR}/grammar.y
     DEPENDS ${pcap_SOURCE_DIR}/grammar.y
 )
 
 #
 # Since grammar.c does not exists yet when cmake is run, mark
 # it as generated.
 #
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/grammar.c PROPERTIES
     GENERATED TRUE
+    OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/scanner.h
 )
 
 #
 # Add grammar.c to the list of sources.
 #
 #set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${CMAKE_CURRENT_BINARY_DIR}/grammar.c)
 
-if( WIN32 )
+#
+# Assume, by default, no support for shared libraries and V7/BSD
+# convention for man pages (file formats in section 5, miscellaneous
+# info in section 7, administrative commands and daemons in section 8).
+# Individual cases can override this.
+#
+set(MAN_FILE_FORMATS 5)
+set(MAN_MISC_INFO 7)
+set(MAN_ADMIN_COMMANDS 8)
+if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
+    # Workaround to enable certain features
+    set(_SUN TRUE)
+    if(PCAP_TYPE STREQUAL "bpf")
+        #
+        # If we're using BPF, we need libodm and libcfg, as
+        # we use them to load the BPF module.
+        #
+        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} odm cfg)
+    endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+    if(CMAKE_SYSTEM_VERSION MATCHES "[A-Z.]*9\.[0-9]*")
+        #
+        # HP-UX 9.x.
+        #
+        set(HAVE_HPUX9 TRUE)
+    elseif(CMAKE_SYSTEM_VERSION MATCHES "[A-Z.]*10\.0")
+        #
+        # HP-UX 10.0.
+        #
+    elseif(CMAKE_SYSTEM_VERSION MATCHES "[A-Z.]*10\.1")
+        #
+        # HP-UX 10.1.
+        #
+    else()
+        #
+        # HP-UX 10.20 and later.
+        #
+        set(HAVE_HPUX10_20_OR_LATER TRUE)
+    endif()
+
     #
-    # CMake does not love Windows.
+    # Use System V conventions for man pages.
     #
-    file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/GenVersion.bat" GenVersion_path)
-    file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/VERSION" VERSION_path)
-    file(TO_NATIVE_PATH "${pcap_SOURCE_DIR}/pcap_version.h.in" version_h_in_path)
-    file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h" version_h_path)
-    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
-        SOURCE ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in
-        COMMAND ${GenVersion_path} ${VERSION_path} ${version_h_in_path} ${version_h_path}
-        DEPENDS ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in
-    )
-else( WIN32 )
-    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.c
-        SOURCE ${pcap_SOURCE_DIR}/VERSION
-        COMMAND ${pcap_SOURCE_DIR}/gen_version_c.sh ${pcap_SOURCE_DIR}/VERSION ${CMAKE_CURRENT_BINARY_DIR}/version.c
-        DEPENDS ${pcap_SOURCE_DIR}/VERSION
-    )
-    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
-        SOURCE ${pcap_SOURCE_DIR}/VERSION
-        COMMAND ${pcap_SOURCE_DIR}/gen_version_header.sh ${pcap_SOURCE_DIR}/VERSION ${pcap_SOURCE_DIR}/pcap_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h
-        DEPENDS ${pcap_SOURCE_DIR}/VERSION
-    )
-
+    set(MAN_ADMIN_COMMANDS 1m)
+    set(MAN_FILE_FORMATS 4)
+    set(MAN_MISC_INFO 5)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "IRIX" OR CMAKE_SYSTEM_NAME STREQUAL "IRIX64")
     #
-    # Since version.c does not exists yet when cmake is run, mark
-    # it as generated.
+    # Use IRIX conventions for man pages; they're the same as the
+    # System V conventions, except that they use section 8 for
+    # administrative commands and daemons.
     #
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/version.c PROPERTIES
-        GENERATED TRUE
-    )
+    set(MAN_FILE_FORMATS 4)
+    set(MAN_MISC_INFO 5)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "OSF1")
+    #
+    # DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX.
+    # Use Tru64 UNIX conventions for man pages; they're the same as the
+    # System V conventions except that they use section 8 for
+    # administrative commands and daemons.
+    #
+    set(MAN_FILE_FORMATS 4)
+    set(MAN_MISC_INFO 5)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*")
+    #
+    # SunOS 5.x.
+    #
+    set(HAVE_SOLARIS TRUE)
+    #
+    # Make sure errno is thread-safe, in case we're called in
+    # a multithreaded program.  We don't guarantee that two
+    # threads can use the *same* pcap_t safely, but the
+    # current version does guarantee that you can use different
+    # pcap_t's in different threads, and even that pcap_compile()
+    # is thread-safe (it wasn't thread-safe in some older versions).
+    #
+    add_definitions(-D_TS_ERRNO)
 
+    if(CMAKE_SYSTEM_VERSION STREQUAL "5.12")
+    else()
+        #
+        # Use System V conventions for man pages.
+        #
+        set(MAN_ADMIN_COMMANDS 1m)
+        set(MAN_FILE_FORMATS 4)
+        set(MAN_MISC_INFO 5)
+    endif()
+endif()
+
+source_group("Source Files" FILES ${PROJECT_SOURCE_LIST_C})
+source_group("Header Files" FILES ${PROJECT_SOURCE_LIST_H})
+
+if(WIN32)
     #
-    # Add version.c to the list of sources.
+    # Add pcap-dll.rc to the list of sources.
     #
-    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${CMAKE_CURRENT_BINARY_DIR}/version.c)
-endif( WIN32 )
+    set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${pcap_SOURCE_DIR}/pcap-dll.rc)
+endif(WIN32)
 
 #
-# Since pcap_version.h does not exists yet when cmake is run, mark
-# it as generated.
+# Add subdirectories after we've set various variables, so they pick up
+# pick up those variables.
 #
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h PROPERTIES
-    GENERATED TRUE
-)
+if(ENABLE_REMOTE)
+    add_subdirectory(rpcapd)
+endif(ENABLE_REMOTE)
+add_subdirectory(testprogs)
 
+######################################
+# Register targets
+######################################
+
 #
-# Add pcap_version.h to the list of headers.
+# Special target to serialize the building of the generated source.
 #
-set(PROJECT_SOURCE_LIST_H ${PROJECT_SOURCE_LIST_H} ${CMAKE_CURRENT_BINARY_DIR}/pcap_version.h)
+# See
+#
+#  http://public.kitware.com/pipermail/cmake/2013-August/055510.html
+#
+add_custom_target(SerializeTarget
+    DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/grammar.c
+    ${CMAKE_CURRENT_BINARY_DIR}/scanner.c
+)
 
-source_group("Source Files" FILES ${PROJECT_SOURCE_LIST_C})
-source_group("Header Files" FILES ${PROJECT_SOURCE_LIST_H})
+set_source_files_properties(${PROJECT_EXTERNAL_OBJECT_LIST} PROPERTIES
+    EXTERNAL_OBJECT TRUE)
 
-######################################
-# Register targets
-######################################
+if(BUILD_SHARED_LIBS)
+    add_library(${LIBRARY_NAME} SHARED
+        ${PROJECT_SOURCE_LIST_C}
+        ${CMAKE_CURRENT_BINARY_DIR}/grammar.c
+        ${CMAKE_CURRENT_BINARY_DIR}/scanner.c
+        ${PROJECT_EXTERNAL_OBJECT_LIST}
+    )
+    add_dependencies(${LIBRARY_NAME} SerializeTarget)
+    set_target_properties(${LIBRARY_NAME} PROPERTIES
+        COMPILE_DEFINITIONS BUILDING_PCAP)
+endif(BUILD_SHARED_LIBS)
 
-add_library(${LIBRARY_NAME}
+add_library(${LIBRARY_NAME}_static STATIC
     ${PROJECT_SOURCE_LIST_C}
     ${CMAKE_CURRENT_BINARY_DIR}/grammar.c
     ${CMAKE_CURRENT_BINARY_DIR}/scanner.c
-    ${PROJECT_SOURCE_LIST_H}
+    ${PROJECT_EXTERNAL_OBJECT_LIST}
 )
+add_dependencies(${LIBRARY_NAME}_static SerializeTarget)
+set_target_properties(${LIBRARY_NAME}_static PROPERTIES
+    COMPILE_DEFINITIONS BUILDING_PCAP)
 
-if( WIN32 )
-    target_link_libraries ( ${LIBRARY_NAME}
-        packet
-        ws2_32
+if(WIN32)
+    if(BUILD_SHARED_LIBS)
+        set_target_properties(${LIBRARY_NAME} PROPERTIES
+            VERSION ${PACKAGE_VERSION_NOSUFFIX} # only MAJOR and MINOR are needed
+        )
+    endif(BUILD_SHARED_LIBS)
+    if(MSVC)
+        # XXX For DLLs, the TARGET_PDB_FILE generator expression can be used to locate
+        # its PDB file's output directory for installation.
+        # cmake doesn't offer a generator expression for PDB files generated by the
+        # compiler (static libraries).
+        # So instead of considering any possible output there is (there are many),
+        # this will search for the PDB file in the compiler's initial output directory,
+        # which is always ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles\wpcap_static.dir
+        # regardless of architecture, build generator etc.
+        # Quite hackish indeed.
+        set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:${LIBRARY_NAME}_static>)
+        set_target_properties(${LIBRARY_NAME}_static PROPERTIES
+            COMPILE_PDB_NAME ${LIBRARY_NAME}_static
+            OUTPUT_NAME "${LIBRARY_NAME}_static"
+        )
+    elseif(MINGW)
+        #
+        # For compatibility, build the shared library without the "lib" prefix on
+        # MinGW as well.
+        #
+        set_target_properties(${LIBRARY_NAME} PROPERTIES 
+            PREFIX ""
+            OUTPUT_NAME "${LIBRARY_NAME}"
+        )
+        set_target_properties(${LIBRARY_NAME}_static PROPERTIES
+            OUTPUT_NAME "${LIBRARY_NAME}"
+        )
+    endif()
+else(WIN32) # UN*X
+    if(BUILD_SHARED_LIBS)
+        if(APPLE)
+            set_target_properties(${LIBRARY_NAME} PROPERTIES
+                VERSION ${PACKAGE_VERSION}
+                SOVERSION A
+            )
+        else(APPLE)
+            set_target_properties(${LIBRARY_NAME} PROPERTIES
+                VERSION ${PACKAGE_VERSION}
+                SOVERSION ${PACKAGE_VERSION_MAJOR}
+            )
+        endif(APPLE)
+    endif(BUILD_SHARED_LIBS)
+    set_target_properties(${LIBRARY_NAME}_static PROPERTIES
+        OUTPUT_NAME "${LIBRARY_NAME}"
     )
-endif( WIN32 )
+endif(WIN32)
 
+if(BUILD_SHARED_LIBS)
+    if(NOT C_ADDITIONAL_FLAGS STREQUAL "")
+        set_target_properties(${LIBRARY_NAME} PROPERTIES COMPILE_FLAGS ${C_ADDITIONAL_FLAGS})
+    endif()
+    target_link_libraries(${LIBRARY_NAME} ${PCAP_LINK_LIBRARIES})
+endif(BUILD_SHARED_LIBS)
+
+if(NOT C_ADDITIONAL_FLAGS STREQUAL "")
+    set_target_properties(${LIBRARY_NAME}_static PROPERTIES COMPILE_FLAGS ${C_ADDITIONAL_FLAGS})
+endif()
+
 ######################################
 # Write out the config.h file
 ######################################
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+######################################
+# Install pcap library, include files, and man pages
+######################################
+
+#
+# "Define GNU standard installation directories", which actually
+# are also defined, to some degree, by autotools, and at least
+# some of which are general UN*X conventions.
+#
+include(GNUInstallDirs)
+
+set(LIBRARY_NAME_STATIC ${LIBRARY_NAME}_static)
+
+function(install_manpage_symlink SOURCE TARGET MANDIR)
+    if(MINGW)
+        find_program(LINK_EXECUTABLE ln)
+            if(LINK_EXECUTABLE)
+                set(LINK_COMMAND "\"${LINK_EXECUTABLE}\" \"-s\" \"${SOURCE}\" \"${TARGET}\"")
+            else(LINK_EXECUTABLE)
+                message(FATAL_ERROR "ln (http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ln.html) not found.")
+            endif(LINK_EXECUTABLE)
+    else(MINGW)
+        set(LINK_COMMAND "\"${CMAKE_COMMAND}\" \"-E\" \"create_symlink\" \"${SOURCE}\" \"${TARGET}\"")
+    endif(MINGW)
+
+    install(CODE
+        "message(STATUS \"Symlinking: ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
+         execute_process(
+            COMMAND \"${CMAKE_COMMAND}\" \"-E\" \"remove\" \"${TARGET}\"
+            WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${MANDIR}
+          )
+         execute_process(
+            COMMAND ${LINK_COMMAND}
+            WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${MANDIR}
+            RESULT_VARIABLE EXIT_STATUS
+          )
+          if(NOT EXIT_STATUS EQUAL 0)
+              message(FATAL_ERROR \"Could not create symbolic link from ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
+          endif()
+          set(CMAKE_INSTALL_MANIFEST_FILES \${CMAKE_INSTALL_MANIFEST_FILES} ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${TARGET})")
+endfunction(install_manpage_symlink)
+
+set(MAN1_NOEXPAND pcap-config.1)
+set(MAN3PCAP_EXPAND
+    pcap.3pcap.in
+    pcap_compile.3pcap.in
+    pcap_datalink.3pcap.in
+    pcap_dump_open.3pcap.in
+    pcap_get_tstamp_precision.3pcap.in
+    pcap_list_datalinks.3pcap.in
+    pcap_list_tstamp_types.3pcap.in
+    pcap_open_dead.3pcap.in
+    pcap_open_offline.3pcap.in
+    pcap_set_tstamp_precision.3pcap.in
+    pcap_set_tstamp_type.3pcap.in
+)
+set(MAN3PCAP_NOEXPAND
+    pcap_activate.3pcap
+    pcap_breakloop.3pcap
+    pcap_can_set_rfmon.3pcap
+    pcap_close.3pcap
+    pcap_create.3pcap
+    pcap_datalink_name_to_val.3pcap
+    pcap_datalink_val_to_name.3pcap
+    pcap_dump.3pcap
+    pcap_dump_close.3pcap
+    pcap_dump_file.3pcap
+    pcap_dump_flush.3pcap
+    pcap_dump_ftell.3pcap
+    pcap_file.3pcap
+    pcap_fileno.3pcap
+    pcap_findalldevs.3pcap
+    pcap_freecode.3pcap
+    pcap_get_required_select_timeout.3pcap
+    pcap_get_selectable_fd.3pcap
+    pcap_geterr.3pcap
+    pcap_inject.3pcap
+    pcap_is_swapped.3pcap
+    pcap_lib_version.3pcap
+    pcap_lookupdev.3pcap
+    pcap_lookupnet.3pcap
+    pcap_loop.3pcap
+    pcap_major_version.3pcap
+    pcap_next_ex.3pcap
+    pcap_offline_filter.3pcap
+    pcap_open_live.3pcap
+    pcap_set_buffer_size.3pcap
+    pcap_set_datalink.3pcap
+    pcap_set_immediate_mode.3pcap
+    pcap_set_promisc.3pcap
+    pcap_set_protocol.3pcap
+    pcap_set_rfmon.3pcap
+    pcap_set_snaplen.3pcap
+    pcap_set_timeout.3pcap
+    pcap_setdirection.3pcap
+    pcap_setfilter.3pcap
+    pcap_setnonblock.3pcap
+    pcap_snapshot.3pcap
+    pcap_stats.3pcap
+    pcap_statustostr.3pcap
+    pcap_strerror.3pcap
+    pcap_tstamp_type_name_to_val.3pcap
+    pcap_tstamp_type_val_to_name.3pcap
+)
+set(MANFILE_EXPAND pcap-savefile.manfile.in)
+set(MANMISC_EXPAND
+    pcap-filter.manmisc.in
+    pcap-linktype.manmisc.in
+    pcap-tstamp.manmisc.in
+)
+
+if(NOT BUILD_SHARED_LIBS)
+    unset(LIBRARY_NAME)
+endif(NOT BUILD_SHARED_LIBS)
+
+if(WIN32)
+    if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+        #
+        # Install 64-bit code built with MSVC in the amd64 subdirectories,
+        # as that's where it expects it to be.
+        #
+        install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME_STATIC}
+                RUNTIME DESTINATION bin/amd64
+                LIBRARY DESTINATION lib/amd64
+                ARCHIVE DESTINATION lib/amd64)
+        if(NOT MINGW)
+            install(FILES $<TARGET_FILE_DIR:${LIBRARY_NAME_STATIC}>/${LIBRARY_NAME_STATIC}.pdb
+                    DESTINATION bin/amd64 OPTIONAL)
+            if(BUILD_SHARED_LIBS)
+                install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}>
+                        DESTINATION bin/amd64 OPTIONAL)
+            endif(BUILD_SHARED_LIBS)
+        endif(NOT MINGW)
+    else(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+        #
+        # Install 32-bit code, and 64-bit code not built with MSVC
+        # in the top-level directories, as those are where they
+        # expect it to be.
+        #
+        install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME_STATIC}
+                RUNTIME DESTINATION bin
+                LIBRARY DESTINATION lib
+                ARCHIVE DESTINATION lib)
+        if(NOT MINGW)
+            install(FILES $<TARGET_FILE_DIR:${LIBRARY_NAME_STATIC}>/${LIBRARY_NAME_STATIC}.pdb
+                    DESTINATION bin OPTIONAL)
+            if(BUILD_SHARED_LIBS)
+                install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}>
+                        DESTINATION bin OPTIONAL)
+            endif(BUILD_SHARED_LIBS)
+        endif(NOT MINGW)
+    endif(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+else(WIN32)
+    install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME_STATIC} DESTINATION lib)
+endif(WIN32)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pcap/ DESTINATION include/pcap)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
+
+# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
+# pcap-config and process man pages and arrange that they be installed.
+if(NOT MSVC)
+    set(PACKAGE_NAME ${LIBRARY_NAME})
+    set(prefix ${CMAKE_INSTALL_PREFIX})
+    set(exec_prefix "\${prefix}")
+    set(includedir "\${prefix}/include")
+    set(libdir "\${exec_prefix}/lib")
+    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
+       CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR
+       CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
+       CMAKE_SYSTEM_NAME STREQUAL "DragonFly BSD" OR
+       CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
+       CMAKE_SYSTEM_NAME STREQUAL "OSF1")
+        #
+        # Platforms where the linker is the GNU linker
+        # or accepts command-line arguments like
+        # those the GNU linker accepts.
+        #
+        set(V_RPATH_OPT "-Wl,-rpath,")
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*")
+        #
+        # SunOS 5.x.
+        #
+        # XXX - this assumes GCC is using the Sun linker,
+        # rather than the GNU linker.
+        #
+        set(V_RPATH_OPT "-Wl,-R,")
+    else()
+        #
+        # No option needed to set the RPATH.
+        #
+        set(V_RPATH_OPT "")
+    endif()
+    set(LIBS "")
+    foreach(LIB ${PCAP_LINK_LIBRARIES})
+        set(LIBS "${LIBS} -l${LIB}")
+    endforeach(LIB)
+    configure_file(${CMAKE_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
+    configure_file(${CMAKE_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
+
+    #
+    # Man pages.
+    #
+    # For each section of the manual for which we have man pages
+    # that require macro expansion, do the expansion.
+    #
+    set(MAN1 "")
+    foreach(MANPAGE ${MAN1_NOEXPAND})
+        set(MAN1 ${MAN1} ${CMAKE_SOURCE_DIR}/${MANPAGE})
+    endforeach(MANPAGE)
+    install(FILES ${MAN1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+
+    set(MAN3PCAP "")
+    foreach(MANPAGE ${MAN3PCAP_NOEXPAND})
+        set(MAN3PCAP ${MAN3PCAP} ${CMAKE_SOURCE_DIR}/${MANPAGE})
+    endforeach(MANPAGE)
+    foreach(TEMPLATE_MANPAGE ${MAN3PCAP_EXPAND})
+        string(REPLACE ".in" "" MANPAGE ${TEMPLATE_MANPAGE})
+        configure_file(${CMAKE_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY)
+        set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE})
+    endforeach(TEMPLATE_MANPAGE)
+    install(FILES ${MAN3PCAP} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_dump_open.3pcap pcap_dump_fopen.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_findalldevs.3pcap pcap_freealldevs.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_geterr.3pcap pcap_perror.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_inject.3pcap pcap_sendpacket.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_loop.3pcap pcap_dispatch.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_major_version.3pcap pcap_minor_version.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_next_ex.3pcap pcap_next.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_open_dead.3pcap pcap_open_dead_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+    install_manpage_symlink(pcap_setnonblock.3pcap pcap_getnonblock.3pcap ${CMAKE_INSTALL_MANDIR}/man3)
+
+    set(MANFILE "")
+    foreach(TEMPLATE_MANPAGE ${MANFILE_EXPAND})
+        string(REPLACE ".manfile.in" ".${MAN_FILE_FORMATS}" MANPAGE ${TEMPLATE_MANPAGE})
+        configure_file(${CMAKE_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY)
+        set(MANFILE ${MANFILE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE})
+    endforeach(TEMPLATE_MANPAGE)
+    install(FILES ${MANFILE} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_FILE_FORMATS})
+
+    set(MANMISC "")
+    foreach(TEMPLATE_MANPAGE ${MANMISC_EXPAND})
+        string(REPLACE ".manmisc.in" ".${MAN_MISC_INFO}" MANPAGE ${TEMPLATE_MANPAGE})
+        configure_file(${CMAKE_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY)
+        set(MANMISC ${MANMISC} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE})
+    endforeach(TEMPLATE_MANPAGE)
+    install(FILES ${MANMISC} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_MISC_INFO})
+endif(NOT MSVC)
+
+# uninstall target
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
Index: vendor/libpcap/dist/CONTRIBUTING
===================================================================
--- vendor/libpcap/dist/CONTRIBUTING	(nonexistent)
+++ vendor/libpcap/dist/CONTRIBUTING	(revision 333789)
@@ -0,0 +1,29 @@
+Guidelines for contributing
+===========================
+
+To report a security issue (segfault, buffer overflow, infinite loop, arbitrary
+code execution etc) please send an e-mail to security@tcpdump.org, do not use
+the bug tracker!
+
+To report a non-security problem (failure to compile, failure to capture packets
+properly, missing support for a network interface type or DLT) please check
+first that it reproduces with the latest stable release of libpcap. If it does,
+please check that the problem reproduces with the current git master branch of
+libpcap. If it does (and it is not a security-related problem, otherwise see
+above), please navigate to https://github.com/the-tcpdump-group/libpcap/issues
+and check if the problem has already been reported. If it has not, please open
+a new issue and provide the following details:
+
+* libpcap version (e.g. from tcpdump --version)
+* operating system name and version and any other details that may be relevant
+  (uname -a, compiler name and version, CPU type etc.)
+* configure flags if any were used
+* statement of the problem
+* steps to reproduce
+
+Please note that if you know exactly how to solve the problem and the solution
+would not be too intrusive, it would be best to contribute some development time
+and open a pull request instead.
+
+Still not sure how to do? Feel free to [subscribe](http://www.tcpdump.org/#mailing-lists)
+to the mailing list tcpdump-workers@lists.tcpdump.org and ask!
Index: vendor/libpcap/dist/CREDITS
===================================================================
--- vendor/libpcap/dist/CREDITS	(revision 333788)
+++ vendor/libpcap/dist/CREDITS	(revision 333789)
@@ -1,180 +1,180 @@
 This file lists people who have contributed to libpcap:
 
 The current maintainers:
     Bill Fenner                   <fenner at research dot att dot com>
     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:
 
     Akos Vandra                   <axos88 at gmail dot com>
     Alan Bawden                   <Alan at LCS dot MIT dot EDU>
     Albert Chin                   <china at thewrittenword dot com>
     Alexander 'Leo' Bergolth      <Leo dot Bergolth at wu-wien dot ac dot at>
     Alexey Kuznetsov              <kuznet at ms2 dot inr dot ac dot ru>
     Alon Bar-Lev                  <alonbl at sourceforge dot net>
     Andres Perera                 <andres dot p at zoho dot com>
     Andrew Brown                  <atatat at atatdot dot net>
                                   <andy-1 at sourceforge dot net>
     Ani Sinha                     <ani at aristanetworks dot com>
     Antti Kantee                  <pooka at netbsd dot org>
     Arien Vijn                    <arienvijn at sourceforge dot net>
     Arkadiusz Miskiewicz          <misiek at pld dot org dot pl>
     Armando L. Caro Jr.           <acaro at mail dot eecis dot udel dot edu>
     Assar Westerlund              <assar at sics dot se>
     Bill Parker                   <wp02855 at gmail dot com>
     Brent Cook                    <brent at boundary dot com>
     Brian Ginsbach                <ginsbach at cray dot com>
     Charles M. Hannum             <mycroft at netbsd dot org>
     Chris G. Demetriou            <cgd at netbsd dot org>
     Chris Lightfoot               <cwrl at users dot sourceforge dot net>
     Chris Maynard                 <Chris dot Maynard at gtech dot com>
     Chris Pepper                  <pepper at mail dot reppep dot com>
     Christian Bell                <csbell at myri dot com>
     Christian Peron               <csjp at freebsd dot org>
     Christian Svensson            <blue at cmd dot nu>
     Daniele Orlandi               <daniele at orlandi dot com>
     Darren Lim                    <darren dot lim at endace dot com>
     Darren Reed                   <darrenr at sun dot com>
     David Clark                   <david dot clark at datasoft dot com>
     David Kaelbling               <drk at sgi dot com>
     David Ward                    <david dot ward at ll dot mit dot edu>
     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>
     Dug Song                      <dugsong at monkey dot org>
     Dustin Spicuzza               <dustin at virtualroadside dot com>
     dzejarczech                   <dzejarczech at sourceforge dot net>
     Edward Sheldrake              <ejs1920 at sourceforge dot net>
     Eric Anderson                 <anderse at hpl dot hp dot com>
     Erik de Castro Lopo           <erik dot de dot castro dot lopo at sensorynetworks dot com>
     Felix Obenhuber               <felix at obenhuber dot de>
     Florent Drouin                <Florent dot Drouin at alcatel-lucent dot fr>
     Franz Schaefer                <schaefer at mond dot at>
     frederich                     <frederich at sourceforge dot net>
     Fulko Hew                     <fulko dot hew at gmail dot com>
     Fumiyuki Shimizu              <fumifumi at abacustech dot jp>
     Gabor Tatarka                 <gabor dot tatarka at ericsson dot com>
     Garrett Cooper                <yaberauneya at sourceforge dot net>
     George Neville-Neil           <gnn at freebsd dot org>
     Gianluca Varenni              <gianluca dot varenni at gmail dot com>
     Gilbert Hoyek                 <gil_hoyek at hotmail dot com>
-    Gisle Vanem                   <gvanem at broadpark dot no>
+    Gisle Vanem                   <gvanem at yahoo dot no>
     Graeme Hewson                 <ghewson at cix dot compulink dot co dot uk>
     Gregor Maier                  <gregor at net dot in dot tum dot de>
     Greg Stark                    <gsstark at mit dot edu>
     Greg Troxel                   <gdt at ir dot bbn dot com>
     Guillaume Pelat               <endymion_ at users dot sourceforge dot net>
     Gustavo Zacarias              <gustavo at zacarias dot com dot ar>
     Hagen Paul Pfeifer            <hagen at jauu dot net>
     Henri Doreau                  <hdoreau at sourceforge dot net>
     Hyung Sik Yoon                <hsyn at kr dot ibm dot com>
     Igor Khristophorov            <igor at atdot dot org>
     Jakub Zawadzki                <darkjames at darkjames dot pl>
     Jan-Philip Velders            <jpv at veldersjes dot net>
     Jason R. Thorpe               <thorpej at netbsd dot org>
     Javier Achirica               <achirica at ttd dot net>
     Jean-Louis Charton            <Jean-Louis dot CHARTON at oikialog dot com>
     Jean Tourrilhes               <jt at hpl dot hp dot com>
     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>
     Jon Lindgren                  <jonl at yubyub dot net>
     Jon Smirl                     <jonsmirl at gmail dot com>
     Jorge Boncompte [DTI2]        <jorge at dti2 dot net>
     Juergen Schoenwaelder         <schoenw at ibr dot cs dot tu-bs dot de>
     Julien Moutinho               <julm at savines dot alpes dot fr dot eu dot org>
     Jung-uk Kim                   <jkim at FreeBSD dot org>
     Kazushi Sugyo                 <sugyo at pb dot jp dot nec dot com>
     Klaus Klein                   <kleink at netbsd dot org>
     Koryn Grant                   <koryn at endace dot com>
     Kris Katterjohn               <katterjohn at gmail dot com>
     Krzysztof Halasa              <khc at pm dot waw dot pl>
     Lorenzo Cavallaro             <sullivan at sikurezza dot org>
     Loris Degioanni               <loris at netgroup-serv dot polito dot it>
     Love Hörnquist-Åstrand        <lha at stacken dot kth dot se>
     Luis MartinGarcia             <luis dot mgarc at gmail dot com>
     Maciej W. Rozycki             <macro at ds2 dot pg dot gda dot pl>
     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 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>
     Mike Wiacek                   <mike at iroot dot net>
     Miroslav Lichvar              <mlichvar at redhat dot com>
     Monroe Williams               <monroe at pobox dot com>
     Nicolas Dade                  <ndade at nsd dot dyndns dot org>
     Niko Delarich                 <niko dot delarich at gmail dot com>
     N. Leiten                     <nleiten at sourceforge dot net>
                                   <nvercamm at sourceforge dot net>
     Octavian Cerna                <tavy at ylabs dot com>
     Olaf Kirch                    <okir at caldera dot de>
     Ollie Wild                    <aaw at users dot sourceforge dot net>
     Onno van der Linden           <onno at simplex dot nl>
     Paolo Abeni                   <paolo dot abeni at email dot it>
     Patrick Marie                 <mycroft at virgaria dot org>
     Patrick McHardy               <kaber at trash not net>
     Paul Mundt                    <lethal at linux-sh dot org>
     Pavel Kankovsky               <kan at dcit dot cz>
     Pawel Pokrywka                <publicpp at gmail dot com>
     Peter Fales                   <peter at fales-lorenz dot net>
     Peter Jeremy                  <peter dot jeremy at alcatel dot com dot au>
     Peter Volkov                  <pva at gentoo dot org>
     Phil Wood                     <cpw at lanl dot gov>
     Rafal Maszkowski              <rzm at icm dot edu dot pl>
                                   <rcb-isis at users dot sourceforge dot net>
     Richard Stearn                <richard at rns-stearn dot demon dot co dot uk>
     Rick Jones                    <raj at cup dot hp dot com>
     Robert Edmonds                <stu-42 at sourceforge dot net>
     Roberto Mariani               <jelot-tcpdump at jelot dot it>
     Romain Francoise              <rfrancoise at debian dot org>
     Sagun Shakya                  <sagun dot shakya at sun dot com>
     Scott Barron                  <sb125499 at ohiou dot edu>
     Scott Gifford                 <sgifford at tir dot com>
     Scott Mcmillan                <scott dot a dot mcmillan at intel dot com>
     Sebastian Krahmer             <krahmer at cs dot uni-potsdam dot de>
     Sebastien Roy                 <Sebastien dot Roy at Sun dot COM>
     Sepherosa Ziehau              <sepherosa at gmail dot com>
     Shaun Clowes                  <delius at progsoc dot uts dot edu dot au>
     Solomon Peachy                <pizza at shaftnet dot org>
     Stefan Hudson                 <hudson at mbay dot net>
     Stephen Donnelly              <stephen at endace dot com>
     Takashi Yamamoto              <yamt at mwd dot biglobe dot ne dot jp>
     Tanaka Shin-ya                <zstanaka at archer dot livedoor dot com>
     Tobias Poschwatta             <posch at sourceforge dot net>
     Tony Li                       <tli at procket dot com>
     Torsten Landschoff            <torsten at debian dot org>
     Uns Lider                     <unslider at miranda dot org>
     Uwe Girlich                   <Uwe dot Girlich at philosys dot de>
     Wesley Shields                <wxs at FreeBSD dot org>
     Xianjie Zhang                 <xzhang at cup dot hp dot com>
     Xin Li                        <delphij at FreeBSD dot org>
     Yen Yen Lim
     Yoann Vandoorselaere          <yoann at prelude-ids dot org>
     Yvan Vanhullebus              <vanhu at sourceforge dot net>
 
 The original LBL crew:
     Steve McCanne
     Craig Leres
     Van Jacobson
 
 Past maintainers:
     Jun-ichiro itojun Hagino         <itojun at iijlab dot net>		Also see: http://www.wide.ad.jp/itojun-award/
Index: vendor/libpcap/dist/INSTALL.txt
===================================================================
--- vendor/libpcap/dist/INSTALL.txt	(revision 333788)
+++ vendor/libpcap/dist/INSTALL.txt	(revision 333789)
@@ -1,374 +1,357 @@
 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
 goes well you can su to root and run "make install". However, you need
 not install libpcap if you just want to build tcpdump; just make sure
 the tcpdump and libpcap directory trees have the same parent
 directory.
 
 If configure says:
 
     configure: warning: cannot determine packet capture interface
     configure: warning: (see INSTALL for more info)
 
 then your system either does not support packet capture or your system
 does support packet capture but libpcap does not support that
 particular type. (If you have HP-UX, see below.) If your system uses a
 packet capture not supported by libpcap, please send us patches; don't
 forget to include an autoconf fragment suitable for use in
 configure.ac.
 
 It is possible to override the default packet capture type, although
 the circumstance where this works are limited. For example if you have
 installed bpf under SunOS 4 and wish to build a snit libpcap:
 
     ./configure --with-pcap=snit
 
 Another example is to force a supported packet capture type in the case
 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 generally available GNU C compiler (GCC).
 
 You will need either Flex 2.5.31 or later, or a version of Lex
 compatible with it (if any exist), to build libpcap.  The configure
 script will abort if there isn't any such program.  If you have an older
 version of Flex, or don't have a compatible version of Lex, the current
 version of flex is available at flex.sourceforge.net.
 
 You will need either Bison, Berkeley YACC, or a version of YACC
 compatible with them (if any exist), to build libpcap.  The configure
 script will abort if there isn't any such program.  If you don't have
 any such program, the current version of Bison can be found at
 http://ftp.gnu.org/gnu/bison/ and the current version of Berkeley YACC
 can be found at http://invisible-island.net/byacc/.
 
 Sometimes the stock C compiler does not interact well with Flex and
 Bison. The list of problems includes undefined references for alloca.
 You can get around this by installing GCC.
 
 If you use Solaris, there is a bug with bufmod(7) that is fixed in
 Solaris 2.3.2 (aka SunOS 5.3.2). Setting a snapshot length with the
 broken bufmod(7) results in data be truncated from the FRONT of the
 packet instead of the end.  The work around is to not set a snapshot
 length but this results in performance problems since the entire packet
 is copied to user space. If you must run an older version of Solaris,
 there is a patch available from Sun; ask for bugid 1149065. After
 installing the patch, use "setenv BUFMOD_FIXED" to enable use of
 bufmod(7). However, we recommend you run a more current release of
 Solaris.
 
 If you use the SPARCompiler, you must be careful to not use the
 /usr/ucb/cc interface. If you do, you will get bogus warnings and
 perhaps errors. Either make sure your path has /opt/SUNWspro/bin
 before /usr/ucb or else:
 
     setenv CC /opt/SUNWspro/bin/cc
 
 before running configure. (You might have to do a "make distclean"
 if you already ran configure once).
 
 Also note that "make depend" won't work; while all of the known
 universe uses -M, the SPARCompiler uses -xM to generate makefile
 dependencies.
 
 If you are trying to do packet capture with a FORE ATM card, you may or
 may not be able to. They usually only release their driver in object
 code so unless their driver supports packet capture, there's not much
 libpcap can do.
 
 If you get an error like:
 
     tcpdump: recv_ack: bind error 0x???
 
 when using DLPI, look for the DL_ERROR_ACK error return values, usually
 in /usr/include/sys/dlpi.h, and find the corresponding value.
 
 Under {DEC OSF/1, Digital UNIX, Tru64 UNIX}, packet capture must be
 enabled before it can be used.  For instructions on how to enable packet
 filter support, see:
 
 	ftp://ftp.digital.com/pub/Digital/dec-faq/Digital-UNIX
 
 Look for the "How do I configure the Berkeley Packet Filter and capture
 tcpdump traces?" item.
 
 Once you enable packet filter support, your OSF system will support bpf
 natively.
 
 Under Ultrix, packet capture must be enabled before it can be used. For
 instructions on how to enable packet filter support, see:
 
 	ftp://ftp.digital.com/pub/Digital/dec-faq/ultrix
 
 If you use HP-UX, you must have at least version 9 and either the
 version of cc that supports ANSI C (cc -Aa) or else use the GNU C
 compiler. You must also buy the optional streams package. If you don't
 have:
 
     /usr/include/sys/dlpi.h
     /usr/include/sys/dlpi_ext.h
 
 then you don't have the streams package. In addition, we believe you
 need to install the "9.X LAN and DLPI drivers cumulative" patch
 (PHNE_6855) to make the version 9 DLPI work with libpcap.
 
 The DLPI streams package is standard starting with HP-UX 10.
 
 The HP implementation of DLPI is a little bit eccentric. Unlike
 Solaris, you must attach /dev/dlpi instead of the specific /dev/*
 network pseudo device entry in order to capture packets. The PPA is
 based on the ifnet "index" number. Under HP-UX 9, it is necessary to
 read /dev/kmem and the kernel symbol file (/hp-ux). Under HP-UX 10,
 DLPI can provide information for determining the PPA. It does not seem
 to be possible to trace the loopback interface. Unlike other DLPI
 implementations, PHYS implies MULTI and SAP and you get an error if you
 try to enable more than one promiscuous mode at a time.
 
 It is impossible to capture outbound packets on HP-UX 9.  To do so on
 HP-UX 10, you will, apparently, need a late "LAN products cumulative
 patch" (at one point, it was claimed that this would be PHNE_18173 for
 s700/10.20; at another point, it was claimed that the required patches
 were PHNE_20892, PHNE_20725 and PHCO_10947, or newer patches), and to do
 so on HP-UX 11 you will, apparently, need the latest lancommon/DLPI
 patches and the latest driver patch for the interface(s) in use on HP-UX
 11 (at one point, it was claimed that patches PHNE_19766, PHNE_19826,
 PHNE_20008, and PHNE_20735 did the trick).
 
 Furthermore, on HP-UX 10, you will need to turn on a kernel switch by
 doing
 
 	echo 'lanc_outbound_promisc_flag/W 1' | adb -w /stand/vmunix /dev/mem
 
 You would have to arrange that this happen on reboots; the right way to
 do that would probably be to put it into an executable script file
 "/sbin/init.d/outbound_promisc" and making
 "/sbin/rc2.d/S350outbound_promisc" a symbolic link to that script.
 
 Finally, testing shows that there can't be more than one simultaneous
 DLPI user per network interface.
 
 If you use Linux, this version of libpcap is known to compile and run
 under Red Hat 4.0 with the 2.0.25 kernel.  It may work with earlier 2.X
 versions but is guaranteed not to work with 1.X kernels.  Running more
 than one libpcap program at a time, on a system with a 2.0.X kernel, can
 cause problems since promiscuous mode is implemented by twiddling the
 interface flags from the libpcap application; the packet capture
 mechanism in the 2.2 and later kernels doesn't have this problem.  Also,
 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.
 You should be advised that neither the Network Research Group at LBNL
 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.
 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.
 If you are having trouble but aren't using a version that came from
 tcpdump.org, please try that before submitting a bug report!
 
 On Linux, libpcap will not work if the kernel does not have the packet
 socket option enabled; see the README.linux file for information about
 this.
 
 If you use AIX, you may not be able to build libpcap from this release.
 We do not have an AIX system in house so it's impossible for us to test
 AIX patches submitted to us.  We are told that you must link against
 /lib/pse.exp, that you must use AIX cc or a GNU C compiler newer than
 2.7.2, and that you may need to run strload before running a libpcap
 application.
 
 Read the README.aix file for information on installing libpcap and
 configuring your system to be able to support libpcap.
 
 If you use NeXTSTEP, you will not be able to build libpcap from this
 release.
 
 If you use SINIX, you should be able to build libpcap from this
 release. It is known to compile and run on SINIX-Y/N 5.42 with the C-DS
 V1.0 or V1.1 compiler. But note that in some releases of SINIX, yacc
 emits incorrect code; if grammar.y fails to compile, change every
 occurence of:
 
 	#ifdef YYDEBUG
 
 to:
 	#if YYDEBUG
 
 Another workaround is to use flex and bison.
 
 If you use SCO, you might have trouble building libpcap from this
 release. We do not have a machine running SCO and have not had reports
 of anyone successfully building on it; the current release of libpcap
 does not compile on SCO OpenServer 5.  Although SCO apparently supports
 DLPI to some extent, the DLPI in OpenServer 5 is very non-standard, and
 it appears that completely new code would need to be written to capture
 network traffic.  SCO do not appear to provide tcpdump binaries for
 OpenServer 5 or OpenServer 6 as part of SCO Skunkware:
 
 	http://www.sco.com/skunkware/
 
 If you use UnixWare, you might be able to build libpcap from this
 release, or you might not.  We do not have a machine running UnixWare,
 so we have not tested it; however, SCO provide packages for libpcap
 0.6.2 and tcpdump 3.7.1 in the UnixWare 7/Open UNIX 8 part of SCO
 Skunkware, and the source package for libpcap 0.6.2 is not changed from
 the libpcap 0.6.2 source release, so this release of libpcap might also
 build without changes on UnixWare 7.
 
 If linking tcpdump fails with "Undefined: _alloca" when using bison on
 a Sun4, your version of Bison is broken. In any case version 1.16 or
 higher is recommended (1.14 is known to cause problems 1.16 is known to
 work). Either pick up a current version from:
 
 	http://ftp.gnu.org/gnu/bison/
 
 or hack around it by inserting the lines:
 
 	#ifdef __GNUC__
 	#define alloca __builtin_alloca
 	#else
 	#ifdef sparc
 	#include <alloca.h>
 	#else
 	char *alloca ();
 	#endif
 	#endif
 
 right after the (100 line!) GNU license comment in bison.simple, remove
 grammar.[co] and fire up make again.
 
 If you use SunOS 4, your kernel must support streams NIT. If you run a
 libpcap program and it dies with:
 
     /dev/nit: No such device
 
 You must add streams NIT support to your kernel configuration, run
 config and boot the new kernel.
 
-If you are running a version of SunOS earlier than 4.1, you will need
-to replace the Sun supplied /sys/sun{3,4,4c}/OBJ/nit_if.o with the
-appropriate version from this distribution's SUNOS4 subdirectory and
-build a new kernel:
-
-	nit_if.o.sun3-sunos4		(any flavor of sun3)
-	nit_if.o.sun4c-sunos4.0.3c	(SS1, SS1+, IPC, SLC, etc.)
-	nit_if.o.sun4-sunos4		(Sun4's not covered by
-					    nit_if.o.sun4c-sunos4.0.3c)
-
-These nit replacements fix a bug that makes nit essentially unusable in
-pre-SunOS 4.1.  In addition, our sun4c-sunos4.0.3c nit gives you
-timestamps to the resolution of the SS-1 clock (1 us) rather than the
-lousy 20ms timestamps Sun gives you  (tcpdump will print out the full
-timestamp resolution if it finds it's running on a SS-1).
-
 FILES
 -----
 CHANGES		- description of differences between releases
-ChmodBPF/*	- Mac OS X startup item to set ownership and permissions
+ChmodBPF/*	- macOS startup item to set ownership and permissions
 		  on /dev/bpf*
 CMakeLists.txt	- CMake file
+CONTRIBUTING	- guidelines for contributing
 CREDITS		- people that have helped libpcap along
 INSTALL.txt	- this file
 LICENSE		- the license under which tcpdump is distributed
 Makefile.in	- compilation rules (input to the configure script)
 README		- description of distribution
 README.aix	- notes on using libpcap on AIX
 README.dag	- notes on using libpcap to capture on Endace DAG devices
 README.hpux	- notes on using libpcap on HP-UX
 README.linux	- notes on using libpcap on Linux
-README.macosx	- notes on using libpcap on Mac OS X
+README.macos	- notes on using libpcap on macOS
 README.septel   - notes on using libpcap to capture on Intel/Septel devices
 README.sita	- notes on using libpcap to capture on SITA devices
 README.tru64	- notes on using libpcap on Digital/Tru64 UNIX
 README.Win32	- notes on using libpcap on Win32 systems (with WinPcap)
-SUNOS4		- pre-SunOS 4.1 replacement kernel nit modules
 VERSION		- version of this release
 acconfig.h	- support for post-2.13 autoconf
 aclocal.m4	- autoconf macros
 arcnet.h	- ARCNET definitions
 atmuni31.h	- ATM Q.2931 definitions
 bpf/net		- copy of bpf_filter.c
 bpf_dump.c	- BPF program printing routines
 bpf_filter.c	- symlink to bpf/net/bpf_filter.c
 bpf_image.c	- BPF disassembly routine
 config.guess	- autoconf support
 config.h.in	- autoconf input
 config.sub	- autoconf support
 configure	- configure script (run this first)
 configure.ac	- configure script source
 dlpisubs.c	- DLPI-related functions for pcap-dlpi.c and pcap-libdlpi.c
 dlpisubs.h	- DLPI-related function declarations
 etherent.c	- /etc/ethers support routines
 ethertype.h	- Ethernet protocol types and names definitions
 fad-getad.c	- pcap_findalldevs() for systems with getifaddrs()
 fad-gifc.c	- pcap_findalldevs() for systems with only SIOCGIFLIST
 fad-glifc.c	- pcap_findalldevs() for systems with SIOCGLIFCONF
 filtertest.c	- test program for BPF compiler
 findalldevstest.c - test program for pcap_findalldevs()
 gencode.c	- BPF code generation routines
 gencode.h	- BPF code generation definitions
 grammar.y	- filter string grammar
 ieee80211.h	- 802.11 definitions
-inet.c		- network routines
 install-sh	- BSD style install script
 lbl/os-*.h	- OS-dependent defines and prototypes
 llc.h		- 802.2 LLC SAP definitions
 missing/*	- replacements for missing library functions
 mkdep		- construct Makefile dependency list
 msdos/*		- drivers for MS-DOS capture support
 nametoaddr.c	- hostname to address routines
 nlpid.h		- OSI network layer protocol identifier definitions
 net		- symlink to bpf/net
 optimize.c	- BPF optimization routines
 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
 pcap/pcap.h	- public libpcap definitions
 pcap/sll.h	- public definition of DLT_LINUX_SLL header
 pcap/usb.h	- public definition of DLT_USB header
 pcap-bpf.c	- BSD Packet Filter support
 pcap-bpf.h	- header for backwards compatibility
 pcap-bt-linux.c	- Bluetooth capture support for Linux
 pcap-bt-linux.h	- Bluetooth capture support for Linux
 pcap-dag.c	- Endace DAG device capture support
 pcap-dag.h	- Endace DAG device capture support
 pcap-dlpi.c	- Data Link Provider Interface support
 pcap-dos.c	- MS-DOS capture support
 pcap-dos.h	- headers for MS-DOS capture support
 pcap-enet.c	- enet support
 pcap-int.h	- internal libpcap definitions
 pcap-libdlpi.c	- Data Link Provider Interface support for systems with libdlpi
 pcap-linux.c	- Linux packet socket support
 pcap-namedb.h	- header for backwards compatibility
 pcap-nit.c	- SunOS Network Interface Tap support
 pcap-nit.h	- SunOS Network Interface Tap definitions
+pcap-npf.c	- WinPcap capture support
 pcap-null.c	- dummy monitor support (allows offline use of libpcap)
 pcap-pf.c	- Ultrix and Digital/Tru64 UNIX Packet Filter support
 pcap-pf.h	- Ultrix and Digital/Tru64 UNIX Packet Filter definitions
 pcap-septel.c   - Intel/Septel device capture support
 pcap-septel.h   - Intel/Septel device capture support
 pcap-sita.c	- SITA device capture support
 pcap-sita.h	- SITA device capture support
 pcap-sita.html	- SITA device capture documentation
 pcap-stdinc.h	- includes and #defines for compiling on Win32 systems
 pcap-snit.c	- SunOS 4.x STREAMS-based Network Interface Tap support
 pcap-snoop.c	- IRIX Snoop network monitoring support
 pcap-usb-linux.c - USB capture support for Linux
 pcap-usb-linux.h - USB capture support for Linux
-pcap-win32.c	- WinPcap capture support
 pcap.3pcap	- manual entry for the library
 pcap.c		- pcap utility routines
 pcap.h		- header for backwards compatibility
 pcap_*.3pcap	- manual entries for library functions
 pcap-filter.4	- manual entry for filter syntax
 pcap-linktype.4	- manual entry for link-layer header types
 ppp.h		- Point to Point Protocol definitions
 savefile.c	- offline support
 scanner.l	- filter string scanner
 sunatmpos.h	- definitions for SunATM capturing
 Win32		- headers and routines for building on Win32 systems
Index: vendor/libpcap/dist/Makefile.in
===================================================================
--- vendor/libpcap/dist/Makefile.in	(revision 333788)
+++ vendor/libpcap/dist/Makefile.in	(revision 333789)
@@ -1,752 +1,763 @@
 #  Copyright (c) 1993, 1994, 1995, 1996
 # 	The Regents of the University of California.  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that: (1) source code distributions
 #  retain the above copyright notice and this paragraph in its entirety, (2)
 #  distributions including binary code include the above copyright notice and
 #  this paragraph in its entirety in the documentation or other materials
 #  provided with the distribution, and (3) all advertising materials mentioning
 #  features or use of this software display the following acknowledgement:
 #  ``This product includes software developed by the University of California,
 #  Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 #  the University nor the names of its contributors may 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.
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
 #
 
 # Top level hierarchy
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 # Pathname of directory to install the configure program
 bindir = @bindir@
+# Pathname of directory to install the rpcapd daemon
+sbindir = @sbindir@
 # Pathname of directory to install the include files
 includedir = @includedir@
 # Pathname of directory to install the library
 libdir =  @libdir@
 # Pathname of directory to install the man pages
 mandir = @mandir@
 
 # VPATH
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 #
 # You shouldn't need to edit anything below.
 #
 
 LD = /usr/bin/ld
 CC = @CC@
 AR = @AR@
 LN_S = @LN_S@
 MKDEP = @MKDEP@
 CCOPT = @V_CCOPT@
+SHLIB_CCOPT = @V_SHLIB_CCOPT@
 INCLS = -I. @V_INCLS@
-DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@
+DEFS = -DBUILDING_PCAP -Dpcap_EXPORTS @DEFS@ @V_DEFS@
 ADDLOBJS = @ADDLOBJS@
 ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
 LIBS = @LIBS@
 CROSSFLAGS=
 CFLAGS = @CFLAGS@   ${CROSSFLAGS}
 LDFLAGS = @LDFLAGS@ ${CROSSFLAGS}
 DYEXT = @DYEXT@
 V_RPATH_OPT = @V_RPATH_OPT@
 DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
 PROG=libpcap
+PTHREAD_LIBS=@PTHREAD_LIBS@
+BUILD_RPCAPD=@BUILD_RPCAPD@
+INSTALL_RPCAPD=@INSTALL_RPCAPD@
+EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@
 
-# Standard CFLAGS
-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
+# Standard CFLAGS for building members of a shared library
+FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 RANLIB = @RANLIB@
 
 LEX = @LEX@
 YACC = @YACC@
 
 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
 # Also, gcc does not remove the .o before forking 'as', which can be a
 # problem if you don't own the file but can write to the directory.
 .c.o:
 	@rm -f $@
 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
 
-PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@
+PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@ @NETMAP_SRC@ @RDMA_SRC@
 FSRC =  @V_FINDALLDEVS@
 SSRC =  @SSRC@
-CSRC =	pcap.c inet.c fad-helpers.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
-GENSRC = scanner.c grammar.c bpf_filter.c version.c
+CSRC =	pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
+	fmtutils.c \
+	savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
+	bpf_image.c bpf_filter.c bpf_dump.c
+GENSRC = scanner.c grammar.c
 LIBOBJS = @LIBOBJS@
 
 SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
 
 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
 # hack the extra indirection
 OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
 PUBHDR = \
 	pcap.h \
 	pcap-bpf.h \
 	pcap-namedb.h \
 	pcap/bpf.h \
 	pcap/bluetooth.h \
 	pcap/can_socketcan.h \
+	pcap/compiler-tests.h \
 	pcap/dlt.h \
-	pcap/export-defs.h \
+	pcap/funcattrs.h \
+	pcap/pcap-inttypes.h \
 	pcap/ipnet.h \
 	pcap/namedb.h \
 	pcap/nflog.h \
 	pcap/pcap.h \
 	pcap/sll.h \
 	pcap/vlan.h \
 	pcap/usb.h
 
 HDR = $(PUBHDR) \
 	arcnet.h \
 	atmuni31.h \
+	diag-control.h \
 	ethertype.h \
 	extract.h \
+	fmtutils.h \
+	ftmacros.h \
 	gencode.h \
 	ieee80211.h \
 	llc.h \
 	nametoaddr.h \
 	nlpid.h \
+	optimize.h \
 	pcap-common.h \
 	pcap-int.h \
-	pcap-stdinc.h \
+	pcap-rpcap.h \
+	pcap-types.h \
 	portability.h \
 	ppp.h \
+	rpcap-protocol.h \
 	sf-pcap.h \
-	sf-pcap-ng.h \
-	sunatmpos.h
+	sf-pcapng.h \
+	sunatmpos.h \
+	varattrs.h
 
-TESTS = \
-	@VALGRINDTEST@ \
-	capturetest \
-	can_set_rfmon_test \
-	filtertest \
-	findalldevstest \
-	opentest \
-	reactivatetest \
-	selpolltest
-
-TESTS_SRC = \
-	tests/valgrindtest.c \
-	tests/capturetest.c \
-	tests/can_set_rfmon_test.c \
-	tests/filtertest.c \
-	tests/findalldevstest.c \
-	tests/opentest.c \
-	tests/reactivatetest.c \
-	tests/selpolltest.c
-
 GENHDR = \
-	scanner.h grammar.h pcap_version.h
+	scanner.h grammar.h
 
 TAGFILES = \
 	$(SRC) $(HDR)
 
-CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
+CLEANFILES = $(OBJ) libpcap.a libpcap.so.`cat $(srcdir)/VERSION` \
 	$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
-	lex.yy.c pcap-config
+	lex.yy.c pcap-config libpcap.pc
 
 MAN1 = pcap-config.1
 
 MAN3PCAP_EXPAND = \
 	pcap.3pcap.in \
 	pcap_compile.3pcap.in \
 	pcap_datalink.3pcap.in \
 	pcap_dump_open.3pcap.in \
 	pcap_get_tstamp_precision.3pcap.in \
 	pcap_list_datalinks.3pcap.in \
 	pcap_list_tstamp_types.3pcap.in \
 	pcap_open_dead.3pcap.in \
 	pcap_open_offline.3pcap.in \
 	pcap_set_tstamp_precision.3pcap.in \
 	pcap_set_tstamp_type.3pcap.in
 
 MAN3PCAP_NOEXPAND = \
 	pcap_activate.3pcap \
 	pcap_breakloop.3pcap \
 	pcap_can_set_rfmon.3pcap \
 	pcap_close.3pcap \
 	pcap_create.3pcap \
 	pcap_datalink_name_to_val.3pcap \
 	pcap_datalink_val_to_name.3pcap \
 	pcap_dump.3pcap \
 	pcap_dump_close.3pcap \
 	pcap_dump_file.3pcap \
 	pcap_dump_flush.3pcap \
 	pcap_dump_ftell.3pcap \
 	pcap_file.3pcap \
 	pcap_fileno.3pcap \
 	pcap_findalldevs.3pcap \
 	pcap_freecode.3pcap \
+	pcap_get_required_select_timeout.3pcap \
 	pcap_get_selectable_fd.3pcap \
 	pcap_geterr.3pcap \
 	pcap_inject.3pcap \
 	pcap_is_swapped.3pcap \
 	pcap_lib_version.3pcap \
 	pcap_lookupdev.3pcap \
 	pcap_lookupnet.3pcap \
 	pcap_loop.3pcap \
 	pcap_major_version.3pcap \
 	pcap_next_ex.3pcap \
 	pcap_offline_filter.3pcap \
 	pcap_open_live.3pcap \
 	pcap_set_buffer_size.3pcap \
 	pcap_set_datalink.3pcap \
 	pcap_set_immediate_mode.3pcap \
 	pcap_set_promisc.3pcap \
+	pcap_set_protocol.3pcap \
 	pcap_set_rfmon.3pcap \
 	pcap_set_snaplen.3pcap \
 	pcap_set_timeout.3pcap \
 	pcap_setdirection.3pcap \
 	pcap_setfilter.3pcap \
 	pcap_setnonblock.3pcap \
 	pcap_snapshot.3pcap \
 	pcap_stats.3pcap \
 	pcap_statustostr.3pcap \
 	pcap_strerror.3pcap \
 	pcap_tstamp_type_name_to_val.3pcap \
 	pcap_tstamp_type_val_to_name.3pcap
 
 MAN3PCAP = $(MAN3PCAP_NOEXPAND) $(MAN3PCAP_EXPAND:.in=)
 
 MANFILE = \
 	pcap-savefile.manfile.in
 
 MANMISC = \
 	pcap-filter.manmisc.in \
 	pcap-linktype.manmisc.in \
 	pcap-tstamp.manmisc.in
 
 EXTRA_DIST = \
-	$(TESTS_SRC) \
 	CHANGES \
 	ChmodBPF/ChmodBPF \
 	ChmodBPF/StartupParameters.plist \
 	CREDITS \
 	CMakeLists.txt \
-	GenVersion.bat \
 	INSTALL.txt \
 	LICENSE \
 	Makefile.in \
 	Makefile-devel-adds \
 	README \
 	README.aix \
 	README.dag \
 	README.hpux \
 	README.linux \
-	README.macosx \
+	README.macos \
 	README.septel \
 	README.sita \
 	README.tru64 \
 	README.Win32 \
-	SUNOS4/nit_if.o.sparc \
-	SUNOS4/nit_if.o.sun3 \
-	SUNOS4/nit_if.o.sun4c.4.0.3c \
+	CONTRIBUTING \
 	TODO \
 	VERSION \
 	aclocal.m4 \
-	bpf/net/bpf_filter.c \
 	chmod_bpf \
+	cmake_uninstall.cmake.in \
 	cmakeconfig.h.in \
-	cmake/preconfigure.cmake \
-	config/have_siocglifconf.c \
+	cmake/Modules/FindDAG.cmake \
+	cmake/Modules/FindFseeko.cmake \
+	cmake/Modules/FindLFS.cmake \
+	cmake/Modules/FindPacket.cmake \
+	cmake/Modules/FindSNF.cmake \
+	cmake/Modules/FindTC.cmake \
+	cmake/have_siocglifconf.c \
 	config.guess \
 	config.h.in \
 	config.sub \
 	configure \
 	configure.ac \
 	dlpisubs.c \
 	dlpisubs.h \
 	fad-getad.c \
 	fad-gifc.c \
 	fad-glifc.c \
-	fad-helpers.c \
-	gen_version_c.sh \
-	gen_version_header.sh \
 	grammar.y \
 	install-sh \
 	lbl/os-aix4.h \
 	lbl/os-aix7.h \
 	lbl/os-hpux11.h \
 	lbl/os-osf4.h \
 	lbl/os-osf5.h \
 	lbl/os-solaris2.h \
 	lbl/os-sunos4.h \
 	lbl/os-ultrix4.h \
+	libpcap.pc.in \
 	missing/getopt.c \
 	missing/getopt.h \
 	missing/snprintf.c \
 	missing/strtok_r.c \
 	missing/win_snprintf.c \
 	mkdep \
 	msdos/bin2c.c \
-	msdos/common.dj \
 	msdos/makefile \
 	msdos/makefile.dj \
 	msdos/makefile.wc \
-	msdos/ndis2.c \
-	msdos/ndis2.h \
-	msdos/ndis_0.asm \
 	msdos/pkt_rx0.asm \
 	msdos/pkt_rx1.s \
 	msdos/pktdrvr.c \
 	msdos/pktdrvr.h \
 	msdos/readme.dos \
+	nomkdep \
 	org.tcpdump.chmod_bpf.plist \
 	pcap-bpf.c \
 	pcap-bt-linux.c \
 	pcap-bt-linux.h \
 	pcap-bt-monitor-linux.c \
 	pcap-bt-monitor-linux.h \
 	pcap-config.in \
 	pcap-dag.c \
 	pcap-dag.h \
 	pcap-dbus.c \
 	pcap-dbus.h \
+	pcap-dll.rc \
 	pcap-dlpi.c \
 	pcap-dos.c \
 	pcap-dos.h \
 	pcap-enet.c \
 	pcap-int.h \
 	pcap-libdlpi.c \
 	pcap-linux.c \
 	pcap-namedb.h \
 	pcap-new.c \
 	pcap-netfilter-linux.c \
 	pcap-netfilter-linux.h \
+	pcap-netmap.c \
+	pcap-netmap.h \
 	pcap-nit.c \
+	pcap-npf.c \
 	pcap-null.c \
 	pcap-pf.c \
+	pcap-rdmasniff.c \
+	pcap-rdmasniff.h \
 	pcap-rpcap.c \
-	pcap-rpcap.h \
+	pcap-rpcap-int.h \
 	pcap-septel.c \
 	pcap-septel.h \
 	pcap-sita.h \
 	pcap-sita.c \
 	pcap-sita.html \
 	pcap-snf.c \
 	pcap-snf.h \
 	pcap-snit.c \
 	pcap-snoop.c \
 	pcap-tc.c \
 	pcap-tc.h \
 	pcap-usb-linux.c \
 	pcap-usb-linux.h \
-	pcap-win32.c \
-	remote-ext.h \
+	rpcap-protocol.c \
+	rpcapd/CMakeLists.txt \
+	rpcapd/Makefile.in \
+	rpcapd/config_params.h \
+	rpcapd/daemon.h \
+	rpcapd/daemon.c \
+	rpcapd/fileconf.c \
+	rpcapd/fileconf.h \
+	rpcapd/log.h \
+	rpcapd/log-stderr.c \
+	rpcapd/org.tcpdump.rpcapd.plist \
+	rpcapd/rpcapd.c \
+	rpcapd/rpcapd.h \
+	rpcapd/rpcapd.inetd.conf \
+	rpcapd/rpcapd.manadmin.in \
+	rpcapd/rpcapd.rc \
+	rpcapd/rpcapd.socket \
+	rpcapd/rpcapd.xinetd.conf \
+	rpcapd/rpcapd@.service \
+	rpcapd/win32-svc.h \
 	sockutils.c \
 	sockutils.h \
 	scanner.l \
-	tests/CMakeLists.txt \
-	pcap_version.h.in \
-	Win32/Include/Gnuc.h \
-	Win32/Include/net/if.h \
+	testprogs/CMakeLists.txt \
+	testprogs/Makefile.in \
+	testprogs/can_set_rfmon_test.c \
+	testprogs/capturetest.c \
+	testprogs/filtertest.c \
+	testprogs/findalldevstest.c \
+	testprogs/opentest.c \
+	testprogs/reactivatetest.c \
+	testprogs/selpolltest.c \
+	testprogs/threadsignaltest.c \
+	testprogs/unix.h \
+	testprogs/valgrindtest.c \
+	tests/shb-option-too-long.pcapng \
 	Win32/Prj/wpcap.sln \
 	Win32/Prj/wpcap.vcxproj \
 	Win32/Prj/wpcap.vcxproj.filters
 
-all: libpcap.a shared pcap-config
+all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
 
 libpcap.a: $(OBJ)
 	@rm -f $@
 	$(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
 	$(RANLIB) $@
 
 shared: libpcap.$(DYEXT)
 
 libpcap.so: $(OBJ)
 	@rm -f $@
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
-	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
+	@V_SHLIB_CMD@ $(LDFLAGS) @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER \
 	    -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
 
 #
 # The following rule succeeds, but the result is untested.
 #
-# In Mac OS X, the libpcap dylib has the name "libpcap.A.dylib", with
-# its full path as the install_name, and with the compatibility and
-# current version both set to 1.  The compatibility version is set to
-# 1 so that programs built with a newer version of the library will run
-# against older versions; multi-platform software probably will fail if
-# it uses APIs added in the newer version, but Mac OS X-specific software
-# will use weak linking and check at run time whether those APIs are
-# available.
+# In macOS, the libpcap dylib has the name "libpcap.A.dylib", with its
+# full path as the install_name, and with the compatibility and current
+# version both set to 1.  The compatibility version is set to 1 so that
+# programs built with a newer version of the library will run against
+# older versions if they don't use APIs available in the newer version
+# but not in the older version.
 #
 # We also use "A" as the major version, and 1 as the compatibility version,
 # but set the current version to the value in VERSION, with any non-numeric
 # stuff stripped off (the compatibility and current version must be of the
 # form X[.Y[.Z]], with Y and Z possibly absent, and with all components
 # numeric).
 #
 libpcap.dylib: $(OBJ)
 	rm -f libpcap*.dylib
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=A; \
 	COMPAT_VER=1; \
 	CURRENT_VER=`sed 's/[^0-9.].*$$//' $(srcdir)/VERSION`; \
 	$(CC) -dynamiclib -undefined error $(LDFLAGS) \
 	    -o libpcap.$$VER.dylib $(OBJ) $(ADDLOBJS) $(LIBS) \
 	    -install_name $(libdir)/libpcap.$$MAJOR_VER.dylib \
 	    -compatibility_version $$COMPAT_VER \
 	    -current_version $$CURRENT_VER
 
 #
 # The HP-UX linker manual says that the convention for a versioned library
 # is libXXX.{number}, not libXXX.sl.{number}.  That appears to be the case
 # on at least one HP-UX 11.00 system; libXXX.sl is a symlink to
 # libXXX.{number}.
 #
 # The manual also says "library-level versioning" (think "sonames") was
 # added in HP-UX 10.0.
 #
 # XXX - this assumes we're using the HP linker, rather than the GNU
 # linker, even with GCC.
 #
 libpcap.sl: $(OBJ)
 	@MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	rm -f libpcap.$$MAJOR_VER
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	ld -b $(LDFLAGS) -o libpcap.$$MAJOR_VER +h libpcap.$$MAJOR_VER \
 	    $(OBJ) $(ADDLOBJS) $(LIBS)
 
 #
 # AIX is different from everybody else.  A shared library is an archive
 # library with one or more shared-object components.  We still build a
 # normal static archive library on AIX, for the benefit of the traditional
 # scheme of building libpcap and tcpdump in subdirectories of the
 # same directory, with tcpdump statically linked with the libpcap
 # in question, but we also build a shared library as "libpcap.shareda"
 # and install *it*, rather than the static library, as "libpcap.a".
 #
 libpcap.shareda: $(OBJ)
 	@rm -f $@ shr.o
-	$(CC) @V_SHLIB_OPT@ -o shr.o $(OBJ) $(ADDLOBJS) $(LDFLAGS) $(LIBS)
+	$(CC) $(LDFLAGS) @V_SHLIB_OPT@ -o shr.o $(OBJ) $(ADDLOBJS) $(LIBS)
 	$(AR) rc $@ shr.o
 
 #
 # For platforms that don't support shared libraries (or on which we
 # don't support shared libraries).
 #
 libpcap.none:
 
 scanner.c: $(srcdir)/scanner.l
 	$(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $<
 scanner.h: scanner.c
 ## Recover from the removal of $@
 	@if test -f $@; then :; else \
 		rm -f scanner.c; \
 		$(MAKE) $(MAKEFLAGS) scanner.c; \
 	fi
 
 scanner.o: scanner.c grammar.h
 	$(CC) $(FULL_CFLAGS) -c scanner.c
 
-pcap.o: pcap_version.h
-
 grammar.c: $(srcdir)/grammar.y
 	$(YACC) -p pcap_ -o grammar.c -d $<
 grammar.h: grammar.c
 ## Recover from the removal of $@
 	@if test -f $@; then :; else \
 		rm -f grammar.c; \
 		$(MAKE) $(MAKEFLAGS) grammar.c; \
 	fi
 
-grammar.o: grammar.c
+grammar.o: grammar.c scanner.h
 	$(CC) $(FULL_CFLAGS) -c grammar.c
 
 gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
 
-version.o: version.c
-	$(CC) $(FULL_CFLAGS) -c version.c
-
 snprintf.o: $(srcdir)/missing/snprintf.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
 
 strtok_r.o: $(srcdir)/missing/strtok_r.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
 
-version.c: $(srcdir)/VERSION $(srcdir)/gen_version_c.sh
-	#
-	# Older programs import this if they want to show the
-	# libpcap version number, rather than calling
-	# pcap_lib_version(), so we need to export it.
-	#
-	@rm -f $@
-	$(srcdir)/gen_version_c.sh $(srcdir)/VERSION $@
-
-pcap_version.h: $(srcdir)/VERSION $(srcdir)/pcap_version.h.in $(srcdir)/gen_version_header.sh
-	@rm -f $@
-	$(srcdir)/gen_version_header.sh $(srcdir)/VERSION $(srcdir)/pcap_version.h.in $@
-
-bpf_filter.c: $(srcdir)/bpf/net/bpf_filter.c
-	rm -f bpf_filter.c
-	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
-
-bpf_filter.o: bpf_filter.c
-	$(CC) $(FULL_CFLAGS) -c bpf_filter.c
-
 #
-# Generate the pcap-config script.
+# Generate the libpcap.pc file.
 #
 # Some Makes, e.g. AIX Make and Solaris Make, can't handle "--file=$@.tmp:$<";
 # for example, the Solaris 9 make man page says
 #
 #	Because make assigns $< and $* as it would for implicit rules
 #	(according to the suffixes list and the directory contents),
 #	they may be unreliable when used within explicit target entries.
 #
 # and this is an explicit target entry.
 #
-# Therefore, instead of using $<, we explicitly put in $(srcdir)/pcap-config.in.
+# Therefore, instead of using $<, we explicitly put in $(srcdir)/libpcap.pc.in.
 #
+libpcap.pc: $(srcdir)/libpcap.pc.in ./config.status
+	@rm -f $@ $@.tmp
+	./config.status --file=$@.tmp:$(srcdir)/libpcap.pc.in
+	mv $@.tmp $@
+	chmod a+x $@
+
+#
+# Generate the pcap-config script.  See above.
+#
 pcap-config: $(srcdir)/pcap-config.in ./config.status
 	@rm -f $@ $@.tmp
 	./config.status --file=$@.tmp:$(srcdir)/pcap-config.in
 	mv $@.tmp $@
 	chmod a+x $@
 
 #
+# Remote pcap daemon.
+#
+build-rpcapd: libpcap.a
+	cd rpcapd; $(MAKE)
+
+#
 # Test programs - not built by default, and not installed.
 #
-tests: $(TESTS)
+testprogs: FORCE
+	cd testprogs; $(MAKE)
 
-capturetest: tests/capturetest.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o capturetest $(srcdir)/tests/capturetest.c libpcap.a $(LIBS)
+FORCE:
 
-can_set_rfmon_test: tests/can_set_rfmon_test.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o can_set_rfmon_test $(srcdir)/tests/can_set_rfmon_test.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)
-
-opentest: tests/opentest.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o opentest $(srcdir)/tests/opentest.c libpcap.a $(LIBS)
-
-reactivatetest: tests/reactivatetest.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o reactivatetest $(srcdir)/tests/reactivatetest.c libpcap.a $(LIBS)
-
-selpolltest: tests/selpolltest.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS)
-
-valgrindtest: tests/valgrindtest.c libpcap.a
-	$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
-
-install: install-shared install-archive pcap-config
+install: install-shared install-archive libpcap.pc pcap-config @INSTALL_RPCAPD@
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	[ -d $(DESTDIR)$(includedir) ] || \
 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
 	[ -d $(DESTDIR)$(includedir)/pcap ] || \
 	    (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
 	[ -d $(DESTDIR)$(mandir)/man1 ] || \
 	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
 	[ -d $(DESTDIR)$(mandir)/man3 ] || \
 	    (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
 	[ -d $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@ ] || \
 	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
 	[ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
 	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
 	for i in $(PUBHDR); do \
 		$(INSTALL_DATA) $(srcdir)/$$i \
 		    $(DESTDIR)$(includedir)/$$i; done
 	[ -d $(DESTDIR)$(bindir) ] || \
 	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
 	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
+	[ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
+	    (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
+	$(INSTALL_DATA) libpcap.pc $(DESTDIR)$(libdir)/pkgconfig/libpcap.pc
 	for i in $(MAN1); do \
 		$(INSTALL_DATA) $(srcdir)/$$i \
 		    $(DESTDIR)$(mandir)/man1/$$i; done
 	for i in $(MAN3PCAP_NOEXPAND); do \
 		$(INSTALL_DATA) $(srcdir)/$$i \
 		    $(DESTDIR)$(mandir)/man3/$$i; done
 	for i in $(MAN3PCAP_EXPAND:.in=); do \
 		$(INSTALL_DATA) $$i \
 		    $(DESTDIR)$(mandir)/man3/$$i; done
 	(cd $(DESTDIR)$(mandir)/man3 && \
 	rm -f pcap_datalink_val_to_description.3pcap && \
 	$(LN_S) pcap_datalink_val_to_name.3pcap \
 		 pcap_datalink_val_to_description.3pcap && \
 	rm -f pcap_dump_fopen.3pcap && \
 	$(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
 	rm -f pcap_freealldevs.3pcap && \
 	$(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
 	rm -f pcap_perror.3pcap && \
 	$(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
 	rm -f pcap_sendpacket.3pcap && \
 	$(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
 	rm -f pcap_free_datalinks.3pcap && \
 	$(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
 	rm -f pcap_free_tstamp_types.3pcap && \
 	$(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
 	rm -f pcap_dispatch.3pcap && \
 	$(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
 	rm -f pcap_minor_version.3pcap && \
 	$(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
 	rm -f pcap_next.3pcap && \
 	$(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
 	rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
 	$(LN_S) pcap_open_dead.3pcap \
 		 pcap_open_dead_with_tstamp_precision.3pcap && \
 	rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
 	$(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
 	rm -f pcap_fopen_offline.3pcap && \
 	$(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 \
 		$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
 		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
 	for i in $(MANMISC); do \
 		$(INSTALL_DATA) `echo $$i | sed 's/.manmisc.in/.manmisc/'` \
 		    $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
 
 install-shared: install-shared-$(DYEXT)
 install-shared-so: libpcap.so
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	$(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
 	ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
 	ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
 install-shared-dylib: libpcap.dylib
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=A; \
 	$(INSTALL_PROGRAM) libpcap.$$VER.dylib $(DESTDIR)$(libdir)/libpcap.$$VER.dylib; \
 	ln -sf libpcap.$$VER.dylib $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER.dylib; \
 	ln -sf libpcap.$$MAJOR_VER.dylib $(DESTDIR)$(libdir)/libpcap.dylib
 install-shared-sl: libpcap.sl
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	$(INSTALL_PROGRAM) libpcap.$$MAJOR_VER $(DESTDIR)$(libdir)
 	ln -sf libpcap.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.sl
 install-shared-shareda: libpcap.shareda
 	#
 	# AIX shared libraries are weird.  They're archive libraries
 	# with one or more shared object components.
 	#
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	$(INSTALL_PROGRAM) libpcap.shareda $(DESTDIR)$(libdir)/libpcap.a
 install-shared-none:
 
 install-archive: install-archive-$(DYEXT)
 install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.a
 	#
 	# Most platforms have separate suffixes for shared and
 	# archive libraries, so we install both.
 	#
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
 install-archive-shareda:
 	#
 	# AIX, however, doesn't, so we don't install the archive
 	# library on AIX.
 	#
 
-uninstall: uninstall-shared
+install-rpcapd:
+	cd rpcapd; $(MAKE) DESTDIR=$(DESTDIR) install
+
+uninstall: uninstall-shared uninstall-rpcapd
 	rm -f $(DESTDIR)$(libdir)/libpcap.a
 	for i in $(PUBHDR); do \
 		rm -f $(DESTDIR)$(includedir)/$$i; done
 	-rmdir $(DESTDIR)$(includedir)/pcap
+	rm -f $(DESTDIR)/$(libdir)/pkgconfig/libpcap.pc
 	rm -f $(DESTDIR)/$(bindir)/pcap-config
 	for i in $(MAN1); do \
 		rm -f $(DESTDIR)$(mandir)/man1/$$i; done
 	for i in $(MAN3PCAP); do \
 		rm -f $(DESTDIR)$(mandir)/man3/$$i; done
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3pcap
 	rm -f $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3pcap
 	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 \
 		rm -f $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
 
 uninstall-shared: uninstall-shared-$(DYEXT)
 uninstall-shared-so:
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.so
 uninstall-shared-dylib:
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=A; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.$$VER.dylib; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER.dylib; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.dylib
 uninstall-shared-sl:
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER; \
 	rm -f $(DESTDIR)$(libdir)/libpcap.sl
 uninstall-shared-shareda:
 	rm -f $(DESTDIR)$(libdir)/libpcap.a
 uninstall-shared-none:
 
+uninstall-rpcapd:
+	cd rpcapd; $(MAKE) DESTDIR=$(DESTDIR) uninstall
+
 clean:
 	rm -f $(CLEANFILES)
+	cd rpcapd; $(MAKE) clean
+	cd testprogs; $(MAKE) clean
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-	    config.h gnuc.h net os-proto.h bpf_filter.c pcap-config \
-	    stamp-h stamp-h.in
+	    config.h gnuc.h net os-proto.h libpcap.pc \
+	    pcap-config stamp-h stamp-h.in
 	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
 	rm -rf autom4te.cache
+	cd rpcapd; $(MAKE) distclean
+	cd testprogs; $(MAKE) distclean
 
 extags: $(TAGFILES)
 	ctags $(TAGFILES)
 
 tags: $(TAGFILES)
 	ctags -wtd $(TAGFILES)
 
 releasetar:
 	@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
 	   mkdir $$name; \
 	   tar cf - $(CSRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
 	      $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) | \
 	      (cd $$name; tar xf -); \
 	   tar -c -z -f $$name.tar.gz $$name; \
 	   rm -rf $$name
 
-depend:	$(GENSRC) $(GENHDR) bpf_filter.c
-	$(MKDEP) -c $(CC) -m $(CFLAGS) $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC)
+depend:	$(GENSRC) $(GENHDR)
+	$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" $(CFLAGS) $(DEFS) $(INCLS) $(SRC)
+	cd rpcapd; $(MAKE) depend
+	cd testprogs; $(MAKE) depend
Index: vendor/libpcap/dist/README
===================================================================
--- vendor/libpcap/dist/README	(revision 333788)
+++ vendor/libpcap/dist/README	(revision 333789)
@@ -1,106 +1,89 @@
-LIBPCAP 1.x.y
+To report a security issue please send an e-mail to security@tcpdump.org.
 
-www.tcpdump.org
+To report bugs and other problems, contribute patches, request a
+feature, provide generic feedback etc please see the file
+CONTRIBUTING in the libpcap source tree root.
 
-Please send inquiries/comments/reports to:
-	tcpdump-workers@lists.tcpdump.org
+LIBPCAP 1.x.y
+Now maintained by "The Tcpdump Group"
+https://www.tcpdump.org
 
 Anonymous Git is available via:
 	git clone git://bpf.tcpdump.org/libpcap
 
-Please submit patches by forking the branch on GitHub at
-
-	http://github.com/the-tcpdump-group/libpcap/tree/master
-
-and issuing a pull request.
-
 formerly from 	Lawrence Berkeley National Laboratory
 		Network Research Group <libpcap@ee.lbl.gov>
 		ftp://ftp.ee.lbl.gov/old/libpcap-0.4a7.tar.Z
 
 This directory contains source code for libpcap, a system-independent
 interface for user-level packet capture.  libpcap provides a portable
 framework for low-level network monitoring.  Applications include
 network statistics collection, security monitoring, network debugging,
 etc.  Since almost every system vendor provides a different interface
 for packet capture, and since we've developed several tools that
 require this functionality, we've created this system-independent API
 to ease in porting and to alleviate the need for several
 system-dependent packet capture modules in each application.
 
 For some platforms there are README.{system} files that discuss issues
 with the OS's interface for packet capture on those platforms, such as
 how to enable support for that interface in the OS, if it's not built in
 by default.
 
 The libpcap interface supports a filtering mechanism based on the
 architecture in the BSD packet filter.  BPF is described in the 1993
 Winter Usenix paper ``The BSD Packet Filter: A New Architecture for
 User-level Packet Capture''.  A compressed PostScript version can be
 found at
 
 	ftp://ftp.ee.lbl.gov/papers/bpf-usenix93.ps.Z
 
 or
 
-	http://www.tcpdump.org/papers/bpf-usenix93.ps.Z
+	https://www.tcpdump.org/papers/bpf-usenix93.ps.Z
 
 and a gzipped version can be found at
 
-	http://www.tcpdump.org/papers/bpf-usenix93.ps.gz
+	https://www.tcpdump.org/papers/bpf-usenix93.ps.gz
 
 A PDF version can be found at
 
-	http://www.tcpdump.org/papers/bpf-usenix93.pdf
+	https://www.tcpdump.org/papers/bpf-usenix93.pdf
 
 Although most packet capture interfaces support in-kernel filtering,
 libpcap utilizes in-kernel filtering only for the BPF interface.
 On systems that don't have BPF, all packets are read into user-space
 and the BPF filters are evaluated in the libpcap library, incurring
 added overhead (especially, for selective filters).  Ideally, libpcap
 would translate BPF filters into a filter program that is compatible
 with the underlying kernel subsystem, but this is not yet implemented.
 
 BPF is standard in 4.4BSD, BSD/OS, NetBSD, FreeBSD, OpenBSD, DragonFly
-BSD, and Mac OS X; an older, modified and undocumented version is
-standard in AIX.  {DEC OSF/1, Digital UNIX, Tru64 UNIX} uses the
-packetfilter interface but has been extended to accept BPF filters
-(which libpcap utilizes).  Also, you can add BPF filter support to
-Ultrix using the kernel source and/or object patches available in:
+BSD, and macOS; an older, modified and undocumented version is standard
+in AIX.  {DEC OSF/1, Digital UNIX, Tru64 UNIX} uses the packetfilter
+interface but has been extended to accept BPF filters (which libpcap
+utilizes).  Also, you can add BPF filter support to Ultrix using the
+kernel source and/or object patches available in:
 
-	http://www.tcpdump.org/other/bpfext42.tar.Z
+	https://www.tcpdump.org/other/bpfext42.tar.Z
 
 Linux, in the 2.2 kernel and later kernels, has a "Socket Filter"
 mechanism that accepts BPF filters; see the README.linux file for
 information on configuring that option.
 
 Note to Linux distributions and *BSD systems that include libpcap:
 
 There's now a rule to make a shared library, which should work on Linux
 and *BSD, among other platforms.
 
 It sets the soname of the library to "libpcap.so.1"; this is what it
 should be, *NOT* libpcap.so.1.x or libpcap.so.1.x.y or something such as
 that.
 
 We've been maintaining binary compatibility between libpcap releases for
 quite a while; there's no reason to tie a binary linked with libpcap to
 a particular release of libpcap.
 
-Problems, bugs, questions, desirable enhancements, etc. should be sent
-to the address "tcpdump-workers@lists.tcpdump.org".  Bugs, support
-requests, and feature requests may also be submitted on the GitHub issue
-tracker for libpcap at
+Current versions can be found at https://www.tcpdump.org.
 
-	https://github.com/the-tcpdump-group/libpcap/issues
-
-Source code contributions, etc. should be sent to the email address
-above or submitted by forking the branch on GitHub at
-
-	http://github.com/the-tcpdump-group/libpcap/tree/master
-
-and issuing a pull request.
-
-Current versions can be found at www.tcpdump.org.
-
- - The TCPdump team
+ - The TCPdump group
Index: vendor/libpcap/dist/README.macos
===================================================================
--- vendor/libpcap/dist/README.macos	(nonexistent)
+++ vendor/libpcap/dist/README.macos	(revision 333789)
@@ -0,0 +1,74 @@
+As with other systems using BPF, macOS allows users with read access to
+the BPF devices to capture packets with libpcap and allows users with
+write access to the BPF devices to send packets with libpcap.
+
+On some systems that use BPF, the BPF devices live on the root file
+system, and the permissions and/or ownership on those devices can be
+changed to give users other than root permission to read or write those
+devices.
+
+On newer versions of FreeBSD, the BPF devices live on devfs, and devfs
+can be configured to set the permissions and/or ownership of those
+devices to give users other than root permission to read or write those
+devices.
+
+On macOS, the BPF devices live on devfs, but the macOS version of devfs
+is based on an older (non-default) FreeBSD devfs, and that version of
+devfs cannot be configured to set the permissions and/or ownership of
+those devices.
+
+Therefore, we supply:
+
+	a "startup item" for older versions of macOS;
+
+	a launchd daemon for Tiger and later versions of macOS;
+
+Both of them will change the ownership of the BPF devices so that the
+"admin" group owns them, and will change the permission of the BPF
+devices to rw-rw----, so that all users in the "admin" group - i.e., all
+users with "Allow user to administer this computer" turned on - have
+both read and write access to them.
+
+The startup item is in the ChmodBPF directory in the source tree.  A
+/Library/StartupItems directory should be created if it doesn't already
+exist, and the ChmodBPF directory should be copied to the
+/Library/StartupItems directory (copy the entire directory, so that
+there's a /Library/StartupItems/ChmodBPF directory, containing all the
+files in the source tree's ChmodBPF directory; don't copy the individual
+items in that directory to /Library/StartupItems).  The ChmodBPF
+directory, and all files under it, must be owned by root.  Installing
+the files won't immediately cause the startup item to be executed; it
+will be executed on the next reboot.  To change the permissions before
+the reboot, run
+
+	sudo SystemStarter start ChmodBPF
+
+The launchd daemon is the chmod_bpf script, plus the
+org.tcpdump.chmod_bpf.plist launchd plist file.  chmod_bpf should be
+installed in /usr/local/bin/chmod_bpf, and org.tcpdump.chmod_bpf.plist
+should be installed in /Library/LaunchDaemons.  chmod_bpf, and
+org.tcpdump.chmod_bpf.plist, must be owned by root.  Installing the
+script and plist file won't immediately cause the script to be executed;
+it will be executed on the next reboot.  To change the permissions
+before the reboot, run
+
+	sudo /usr/local/bin/chmod_bpf
+
+or
+
+	sudo launchctl load /Library/LaunchDaemons/org.tcpdump.chmod_bpf.plist
+
+If you want to give a particular user permission to access the BPF
+devices, rather than giving all administrative users permission to
+access them, you can have the ChmodBPF/ChmodBPF script change the
+ownership of /dev/bpf* without changing the permissions.  If you want to
+give a particular user permission to read and write the BPF devices and
+give the administrative users permission to read but not write the BPF
+devices, you can have the script change the owner to that user, the
+group to "admin", and the permissions to rw-r-----.  Other possibilities
+are left as an exercise for the reader.
+
+(NOTE: due to a bug in Snow Leopard, if you change the permissions not
+to grant write permission to everybody who should be allowed to capture
+traffic, non-root users who cannot open the BPF devices for writing will
+not be able to capture outgoing packets.)
Index: vendor/libpcap/dist/README.septel
===================================================================
--- vendor/libpcap/dist/README.septel	(revision 333788)
+++ vendor/libpcap/dist/README.septel	(revision 333789)
@@ -1,50 +1,50 @@
 The following instructions apply if you have a Linux platform and want
 libpcap to support the Septel range of passive network monitoring cards
 from Intel (http://www.intel.com)
 
 1) Install and build the Septel software distribution by following the
 instructions supplied with that package.
 
 2) Configure libcap. To allow the 'configure' script to locate the Septel
 software distribution use the '--with-septel' option:
 
         ./configure --with-septel=DIR
 
 where DIR is the root of the Septel software distribution, for example
 /var/src/septel.
 
 By default (if you write only ./configure --with-septel) it takes
 ./../septel as argument for DIR.
 
 If the Septel software is correctly detected 'configure' will
 report:
 
         checking whether we have Septel API... yes
 
 If 'configure' reports that there is no Septel API, the directory may have been
 incorrectly specified or the Septel software was not built before configuring
 libpcap.
 
 See also the libpcap INSTALL.txt file for further libpcap configuration
 options.
 
 Building libpcap at this stage will include support for both the native
 packet capture stream and for capturing from Septel cards.  To build
 libpcap with only Septel support specify the capture type as 'septel'
 when configuring libpcap:
 
         ./configure --with-septel=DIR --with-pcap=septel
 
 Applications built with libpcap configured in this way will only detect Septel
 cards and will not capture from the native OS packet stream.
 
 Note: As mentioned in pcap-septel.c we should first edit the system.txt
 file to change the user part example (UPE) module id to 0xdd instead of
-0x2d for technical reason.  So this change in system.txt is crutial and
+0x2d for technical reason.  So this change in system.txt is crucial and
 things will go wrong if it's not done.  System.txt along with config.txt
 are configuration files that are edited by the user before running the
 gctload program that uses these files for initialising modules and
 configuring parameters.
 
 ----------------------------------------------------------------------
 for more information please contact me : gil_hoyek@hotmail.com
Index: vendor/libpcap/dist/README.sita
===================================================================
--- vendor/libpcap/dist/README.sita	(revision 333788)
+++ vendor/libpcap/dist/README.sita	(revision 333789)
@@ -1,64 +1,64 @@
 The following instructions apply if you have a Linux platform and want
-libpcap to support the 'ACN' WAN/LAN router product from from SITA
+libpcap to support the 'ACN' WAN/LAN router product from SITA
 (http://www.sita.aero)
 
 This might also work on non-Linux Unix-compatible platforms, but that
 has not been tested.
 
 See also the libpcap INSTALL.txt file for further libpcap configuration
 options.
 
 These additions/extensions have been made to PCAP to allow it to
 capture packets from a SITA ACN device (and potentially others).
 
 To enable its support you need to ensure that the distribution has
 a correct configure.ac file; that can be created if neccessay by
 using the normal autoconf procedure of:
 
 aclocal
 autoconf
 autoheader
 automake
 
 Then run configure with the 'sita' option:
 
 ./configure --with-sita
 
 Applications built with libpcap configured in this way will only detect SITA
 ACN interfaces and will not capture from the native OS packet stream.
 
 The SITA extension provides a remote datascope operation for capturing
 both WAN and LAN protocols.  It effectively splits the operation of
 PCAP into two halves.  The top layer performs the majority of the
 work, but interfaces via a TCP session to remote agents that
 provide the lower layer functionality of actual sniffing and
 filtering. More detailed information regarding the functions and
 inter-device protocol and naming conventions are described in detail
 in 'pcap-sita.html'.
 
 pcap_findalldevs() reads the local system's /etc/hosts file looking
 for host names that match the format of IOP type devices.  ie.  aaa_I_x_y
 and then queries each associated IP address for a list of its WAN and
 LAN devices.  The local system the aggregates the lists obtained from
 each IOP, sorts it, and provides it (to Wireshark et.al) as the
 list of monitorable interfaces.
 
 Once a valid interface has been selected, pcap_open() is called
 which opens a TCP session (to a well known port) on the target IOP
 and tells it to start monitoring.
 
 All captured packets are then forwarded across that TCP session
 back to the local 'top layer' for forwarding to the actual
 sniffing program (wireshark...)
 
 Note that the DLT_SITA link-layer type includes a proprietary header
 that is documented as part of the SITA dissector of Wireshark and is
 also described in 'pcap-sita.html' for posterity sake.
 
 That header provides:
 - Packet direction (in/out) (1 octet)
 - Link layer hardware signal status (1 octet)
 - Transmit/Receive error status (2 octets)
 - Encapsulated WAN protocol ID (1 octet)
 
 
Index: vendor/libpcap/dist/VERSION
===================================================================
--- vendor/libpcap/dist/VERSION	(revision 333788)
+++ vendor/libpcap/dist/VERSION	(revision 333789)
@@ -1 +1 @@
-1.8.1
+1.9.0-PRE-GIT
Index: vendor/libpcap/dist/Win32/Include/Gnuc.h
===================================================================
--- vendor/libpcap/dist/Win32/Include/Gnuc.h	(revision 333788)
+++ vendor/libpcap/dist/Win32/Include/Gnuc.h	(nonexistent)
@@ -1,8 +0,0 @@
-/* inline foo */
-#ifndef __cplusplus
-#ifdef __GNUC__
-#define inline __inline
-#else
-#define inline
-#endif
-#endif

Property changes on: vendor/libpcap/dist/Win32/Include/Gnuc.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/Win32/Include/net/if.h
===================================================================
--- vendor/libpcap/dist/Win32/Include/net/if.h	(revision 333788)
+++ vendor/libpcap/dist/Win32/Include/net/if.h	(nonexistent)
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-/*
- * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
- * helps userland compatability.  (struct timeval ifi_lastchange)
- */
-#ifndef KERNEL
-#include <pcap-stdinc.h>
-#endif
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_recvquota;		/* polling quota for receive intrs */
-	u_char	ifi_xmitquota;		/* polling quota for xmit intrs */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	u_long	ifi_recvtiming;		/* usec spent receiving when timing */
-	u_long	ifi_xmittiming;		/* usec spent xmitting when timing */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-};
-
-/* ws2tcpip.h has interface flags: IFF_* */
-#if 0
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_DEBUG	0x4		/* turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-/*#define IFF_NOTRAILERS 0x20		 * obsolete: avoid use of trailers */
-#define	IFF_RUNNING	0x40		/* resources allocated */
-#define	IFF_NOARP	0x80		/* no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* receive all packets */
-#define	IFF_ALLMULTI	0x200		/* receive all multicast packets */
-#define	IFF_OACTIVE	0x400		/* transmission in progress */
-#define	IFF_SIMPLEX	0x800		/* can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* supports multicast */
-#endif /* 0 */
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI)
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatability */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatability */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * Message format for use in obtaining information about multicast addresses
- * from the routing socket
- */
-struct ifma_msghdr {
-	u_short	ifmam_msglen;	/* to skip over non-understood messages */
-	u_char	ifmam_version;	/* future binary compatability */
-	u_char	ifmam_type;	/* message type */
-	int	ifmam_addrs;	/* like rtm_addrs */
-	int	ifmam_flags;	/* value of ifa_flags */
-	u_short	ifmam_index;	/* index for associated ifp */
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-#define	IFNAMSIZ	16
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		short	ifru_flags;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-};
-
-#define	_SIZEOF_ADDR_IFREQ(ifr) \
-	((ifr).ifr_addr.sa_len > sizeof(struct sockaddr) ? \
-	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
-	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-#ifdef KERNEL
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_IFADDR);
-MALLOC_DECLARE(M_IFMADDR);
-#endif
-#endif
-
-/* XXX - this should go away soon */
-#ifdef KERNEL
-#include <net/if_var.h>
-#endif
-
-#endif /* !_NET_IF_H_ */

Property changes on: vendor/libpcap/dist/Win32/Include/net/if.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj
===================================================================
--- vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj	(revision 333788)
+++ vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj	(revision 333789)
@@ -1,234 +1,233 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
     <ProjectGuid>{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\Release\</OutDir>
     <IntDir>.\Release\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>../../../;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>../../../;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>.\Debug\</OutDir>
     <IntDir>.\Debug\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>../../../;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>../../../;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>../../;../../lbl/;../../bpf/;../include/;../../../../common;../../../../dag/include;../../../../dag/drv/windows;../../../Win32-Extensions;./;Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;NDEBUG;YY_NEVER_INTERACTIVE;_USRDLL;BUILDING_PCAP;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;HAVE_ADDRINFO;HAVE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;NDEBUG;YY_NEVER_INTERACTIVE;_USRDLL;pcap_EXPORTS;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;ENABLE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;..\..\..\..\packetWin7\Dll\Project\Release No NetMon and AirPcap\Packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>call ..\..\GenVersion.bat ..\..\VERSION ..\..\pcap_version.h.in ..\..\pcap_version.h
 win_flex -Ppcap_ -7 --outfile=..\..\scanner.c --header-file=..\..\scanner.h ..\..\scanner.l
 win_bison -ppcap_ --yacc --output=..\..\grammar.c --defines ..\..\grammar.y</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>../../;../../lbl/;../../bpf/;../include/;../../../../common;../../../../dag/include;../../../../dag/drv/windows;../../../Win32-Extensions;./;Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;NDEBUG;YY_NEVER_INTERACTIVE;_USRDLL;BUILDING_PCAP;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;HAVE_ADDRINFO;HAVE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;NDEBUG;YY_NEVER_INTERACTIVE;_USRDLL;pcap_EXPORTS;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;ENABLE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;..\..\..\..\packetWin7\Dll\Project\x64\Release No NetMon and AirPcap\Packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>call ..\..\GenVersion.bat ..\..\VERSION ..\..\pcap_version.h.in ..\..\pcap_version.h
 win_flex -Ppcap_ -7 --outfile=..\..\scanner.c --header-file=..\..\scanner.h ..\..\scanner.l
 win_bison -ppcap_ --yacc --output=..\..\grammar.c --defines ..\..\grammar.y</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <Optimization>Disabled</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../;../../lbl/;../../bpf/;../include/;../../../../common;../../../../dag/include;../../../../dag/drv/windows;../../../Win32-Extensions;./;Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;_DEBUG;YY_NEVER_INTERACTIVE;_USRDLL;BUILDING_PCAP;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;HAVE_ADDRINFO;HAVE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;_DEBUG;YY_NEVER_INTERACTIVE;_USRDLL;pcap_EXPORTS;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;ENABLE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;..\..\..\..\packetWin7\Dll\Project\Release No NetMon and AirPcap\Packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>call ..\..\GenVersion.bat ..\..\VERSION ..\..\pcap_version.h.in ..\..\pcap_version.h
 win_flex -Ppcap_ -7 --outfile=..\..\scanner.c --header-file=..\..\scanner.h ..\..\scanner.l
 win_bison -ppcap_ --yacc --output=..\..\grammar.c --defines ..\..\grammar.y</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <Optimization>Disabled</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../;../../lbl/;../../bpf/;../include/;../../../../common;../../../../dag/include;../../../../dag/drv/windows;../../../Win32-Extensions;./;Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;_DEBUG;YY_NEVER_INTERACTIVE;_USRDLL;BUILDING_PCAP;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;HAVE_ADDRINFO;HAVE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_VERSION_H;__STDC_VERSION__=199901L;HAVE_PACKET_IS_LOOPBACK_ADAPTER;_DEBUG;YY_NEVER_INTERACTIVE;_USRDLL;pcap_EXPORTS;HAVE_STRERROR;__STDC__;INET6;_WINDOWS;ENABLE_REMOTE;WIN32;_U_=;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;..\..\..\..\packetWin7\Dll\Project\x64\Release No NetMon and AirPcap\Packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>call ..\..\GenVersion.bat ..\..\VERSION ..\..\pcap_version.h.in ..\..\pcap_version.h
 win_flex -Ppcap_ -7 --outfile=..\..\scanner.c --header-file=..\..\scanner.h ..\..\scanner.l
 win_bison -ppcap_ --yacc --output=..\..\grammar.c --defines ..\..\grammar.y</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\bpf\net\bpf_filter.c" />
     <ClCompile Include="..\..\bpf_dump.c" />
     <ClCompile Include="..\..\bpf_image.c" />
     <ClCompile Include="..\..\etherent.c" />
-    <ClCompile Include="..\..\fad-helpers.c" />
     <ClCompile Include="..\..\gencode.c" />
     <ClCompile Include="..\..\grammar.c" />
     <ClCompile Include="..\..\inet.c" />
     <ClCompile Include="..\..\missing\win_snprintf.c" />
     <ClCompile Include="..\..\nametoaddr.c" />
     <ClCompile Include="..\..\optimize.c" />
     <ClCompile Include="..\..\pcap-common.c" />
     <ClCompile Include="..\..\pcap-new.c" />
     <ClCompile Include="..\..\pcap-rpcap.c" />
     <ClCompile Include="..\..\pcap-win32.c" />
     <ClCompile Include="..\..\pcap.c" />
     <ClCompile Include="..\..\savefile.c" />
     <ClCompile Include="..\..\scanner.c" />
-    <ClCompile Include="..\..\sf-pcap-ng.c" />
+    <ClCompile Include="..\..\sf-pcapng.c" />
     <ClCompile Include="..\..\sf-pcap.c" />
     <ClCompile Include="..\..\sockutils.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\pcap-common.h" />
     <ClInclude Include="..\..\pcap-int.h" />
     <ClInclude Include="..\..\pcap-rpcap.h" />
     <ClInclude Include="..\..\pcap-stdinc.h" />
     <ClInclude Include="..\..\pcap.h" />
     <ClInclude Include="..\..\remote-ext.h" />
     <ClInclude Include="..\..\sockutils.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\Win32-Extensions\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Index: vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj.filters
===================================================================
--- vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj.filters	(revision 333788)
+++ vendor/libpcap/dist/Win32/Prj/wpcap.vcxproj.filters	(revision 333789)
@@ -1,107 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\..\bpf_dump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\bpf\net\bpf_filter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\bpf_image.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\etherent.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gencode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\grammar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\inet.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\nametoaddr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\optimize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcap-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\savefile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\scanner.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sf-pcap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sf-pcap-ng.c">
+    <ClCompile Include="..\..\sf-pcapng.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcap-common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\fad-helpers.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\missing\win_snprintf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcap-new.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcap-rpcap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sockutils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
       <UniqueIdentifier>{c51dce5e-0da9-4e33-a235-d5c76c76485c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
       <UniqueIdentifier>{5ec9fd4b-10b5-4527-b249-56b53d844fb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{c90886f0-8973-436b-a7a1-b9e881544f9a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\pcap-stdinc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\pcap-common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\pcap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\pcap-int.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\pcap-rpcap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\remote-ext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\sockutils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\Win32-Extensions\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>
Index: vendor/libpcap/dist/aclocal.m4
===================================================================
--- vendor/libpcap/dist/aclocal.m4	(revision 333788)
+++ vendor/libpcap/dist/aclocal.m4	(revision 333789)
@@ -1,1253 +1,1006 @@
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl	The Regents of the University of California.  All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
 dnl modification, are permitted provided that: (1) source code distributions
 dnl retain the above copyright notice and this paragraph in its entirety, (2)
 dnl distributions including binary code include the above copyright notice and
 dnl this paragraph in its entirety in the documentation or other materials
 dnl provided with the distribution, and (3) all advertising materials mentioning
 dnl features or use of this software display the following acknowledgement:
 dnl ``This product includes software developed by the University of California,
 dnl Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 dnl the University nor the names of its contributors may be used to endorse
 dnl or promote products derived from this software without specific prior
 dnl written permission.
 dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 dnl WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 dnl
 dnl LBL autoconf macros
 dnl
 
 dnl
 dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC.
 dnl
 dnl It appears that newer versions of autoconf (2.64 and later) will,
 dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the
 dnl beginning of the macro, even if the macro itself calls AC_PROG_CC.
 dnl See the "Prerequisite Macros" and "Expanded Before Required" sections
 dnl in the Autoconf documentation.
 dnl
 dnl This causes a steaming heap of fail in our case, as we were, in
 dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_INIT_BEFORE_CC,
 dnl calling AC_PROG_CC, and then doing the tests we now do in
 dnl AC_LBL_C_INIT.  Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
 dnl and AC_LBL_C_INIT at the top level.
 dnl
 AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
 [
     AC_BEFORE([$0], [AC_LBL_C_INIT])
     AC_BEFORE([$0], [AC_PROG_CC])
     AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
     AC_BEFORE([$0], [AC_LBL_DEVEL])
     AC_ARG_WITH(gcc, [  --without-gcc           don't use gcc])
     $1=""
     if test "${srcdir}" != "." ; then
 	    $1="-I\$(srcdir)"
     fi
     if test "${CFLAGS+set}" = set; then
 	    LBL_CFLAGS="$CFLAGS"
     fi
     if test -z "$CC" ; then
 	    case "$host_os" in
 
 	    bsdi*)
 		    AC_CHECK_PROG(SHLICC2, shlicc2, yes, no)
 		    if test $SHLICC2 = yes ; then
 			    CC=shlicc2
 			    export CC
 		    fi
 		    ;;
 	    esac
     fi
     if test -z "$CC" -a "$with_gcc" = no ; then
 	    CC=cc
 	    export CC
     fi
 ])
 
 dnl
 dnl Determine which compiler we're using (cc or gcc)
 dnl If using gcc, determine the version number
 dnl If using cc:
 dnl     require that it support ansi prototypes
 dnl     use -O (AC_PROG_CC will use -g -O2 on gcc, so we don't need to
 dnl     do that ourselves for gcc)
 dnl     add -g flags, as appropriate
 dnl     explicitly specify /usr/local/include
 dnl
 dnl NOTE WELL: with newer versions of autoconf, "gcc" means any compiler
 dnl that defines __GNUC__, which means clang, for example, counts as "gcc".
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_C_INIT(copt, incls)
 dnl
 dnl results:
 dnl
 dnl	$1 (copt set)
 dnl	$2 (incls set)
 dnl	CC
 dnl	LDFLAGS
 dnl	LBL_CFLAGS
 dnl
 AC_DEFUN(AC_LBL_C_INIT,
 [
     AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
     AC_BEFORE([$0], [AC_LBL_DEVEL])
     AC_BEFORE([$0], [AC_LBL_SHLIBS_INIT])
     if test "$GCC" = yes ; then
 	    #
 	    # -Werror forces warnings to be errors.
 	    #
 	    ac_lbl_cc_force_warning_errors=-Werror
 
 	    #
 	    # Try to have the compiler default to hiding symbols,
 	    # so that only symbols explicitly exported with
 	    # PCAP_API will be visible outside (shared) libraries.
 	    #
 	    AC_LBL_CHECK_COMPILER_OPT($1, -fvisibility=hidden)
     else
 	    $2="$$2 -I/usr/local/include"
 	    LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 	    case "$host_os" in
 
 	    darwin*)
 		    #
 		    # This is assumed either to be GCC or clang, both
 		    # of which use -Werror to force warnings to be errors.
 		    #
 		    ac_lbl_cc_force_warning_errors=-Werror
 
 		    #
 		    # Try to have the compiler default to hiding symbols,
 		    # so that only symbols explicitly exported with
 		    # PCAP_API will be visible outside (shared) libraries.
 		    #
 		    AC_LBL_CHECK_COMPILER_OPT($1, -fvisibility=hidden)
 		    ;;
 
 	    hpux*)
 		    #
 		    # HP C, which is what we presume we're using, doesn't
 		    # exit with a non-zero exit status if we hand it an
 		    # invalid -W flag, can't be forced to do so even with
 		    # +We, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    ;;
 
 	    irix*)
 		    #
 		    # MIPS C, which is what we presume we're using, doesn't
 		    # necessarily exit with a non-zero exit status if we
 		    # hand it an invalid -W flag, can't be forced to do
 		    # so, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    #
 		    # It also, apparently, defaults to "char" being
 		    # unsigned, unlike most other C implementations;
 		    # I suppose we could say "signed char" whenever
 		    # we want to guarantee a signed "char", but let's
 		    # just force signed chars.
 		    #
 		    # -xansi is normally the default, but the
 		    # configure script was setting it; perhaps -cckr
 		    # was the default in the Old Days.  (Then again,
 		    # that would probably be for backwards compatibility
 		    # in the days when ANSI C was Shiny and New, i.e.
 		    # 1989 and the early '90's, so maybe we can just
 		    # drop support for those compilers.)
 		    #
 		    # -g is equivalent to -g2, which turns off
 		    # optimization; we choose -g3, which generates
 		    # debugging information but doesn't turn off
 		    # optimization (even if the optimization would
 		    # cause inaccuracies in debugging).
 		    #
 		    $1="$$1 -xansi -signed -g3"
 		    ;;
 
 	    osf*)
 		    #
 		    # Presumed to be DEC OSF/1, Digital UNIX, or
 		    # Tru64 UNIX.
 		    #
 		    # The DEC C compiler, which is what we presume we're
 		    # using, doesn't exit with a non-zero exit status if we
 		    # hand it an invalid -W flag, can't be forced to do
 		    # so, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    #
 		    # -g is equivalent to -g2, which turns off
 		    # optimization; we choose -g3, which generates
 		    # debugging information but doesn't turn off
 		    # optimization (even if the optimization would
 		    # cause inaccuracies in debugging).
 		    #
 		    $1="$$1 -g3"
 		    ;;
 
 	    solaris*)
 		    #
 		    # Assumed to be Sun C, which requires -errwarn to force
 		    # warnings to be treated as errors.
 		    #
 		    ac_lbl_cc_force_warning_errors=-errwarn
 
 		    #
 		    # Try to have the compiler default to hiding symbols,
 		    # so that only symbols explicitly exported with
 		    # PCAP_API will be visible outside (shared) libraries.
 		    #
 		    AC_LBL_CHECK_COMPILER_OPT($1, -xldscope=hidden)
 		    ;;
 
 	    ultrix*)
 		    AC_MSG_CHECKING(that Ultrix $CC hacks const in prototypes)
 		    AC_CACHE_VAL(ac_cv_lbl_cc_const_proto,
 			AC_TRY_COMPILE(
 			    [#include <sys/types.h>],
 			    [struct a { int b; };
 			    void c(const struct a *)],
 			    ac_cv_lbl_cc_const_proto=yes,
 			    ac_cv_lbl_cc_const_proto=no))
 		    AC_MSG_RESULT($ac_cv_lbl_cc_const_proto)
 		    if test $ac_cv_lbl_cc_const_proto = no ; then
 			    AC_DEFINE(const,[],
 			        [to handle Ultrix compilers that don't support const in prototypes])
 		    fi
 		    ;;
 	    esac
 	    $1="$$1 -O"
     fi
 ])
 
 dnl
 dnl Check whether, if you pass an unknown warning option to the
 dnl compiler, it fails or just prints a warning message and succeeds.
 dnl Set ac_lbl_unknown_warning_option_error to the appropriate flag
 dnl to force an error if it would otherwise just print a warning message
 dnl and succeed.
 dnl
 AC_DEFUN(AC_LBL_CHECK_UNKNOWN_WARNING_OPTION_ERROR,
     [
 	AC_MSG_CHECKING([whether the compiler fails when given an unknown warning option])
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Wxyzzy-this-will-never-succeed-xyzzy"
 	AC_TRY_COMPILE(
 	    [],
 	    [return 0],
 	    [
 		AC_MSG_RESULT([no])
 		#
 		# We're assuming this is clang, where
 		# -Werror=unknown-warning-option is the appropriate
 		# option to force the compiler to fail.
 		#
 		ac_lbl_unknown_warning_option_error="-Werror=unknown-warning-option"
 	    ],
 	    [
 		AC_MSG_RESULT([yes])
 	    ])
 	CFLAGS="$save_CFLAGS"
     ])
 
 dnl
 dnl Check whether the compiler option specified as the second argument
 dnl is supported by the compiler and, if so, add it to the macro
 dnl specified as the first argument
 dnl
 AC_DEFUN(AC_LBL_CHECK_COMPILER_OPT,
     [
 	AC_MSG_CHECKING([whether the compiler supports the $2 option])
 	save_CFLAGS="$CFLAGS"
 	if expr "x$2" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error $2"
 	elif expr "x$2" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror $2"
 	elif expr "x$2" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror $2"
 	else
 	    CFLAGS="$CFLAGS $2"
 	fi
 	AC_TRY_COMPILE(
 	    [],
 	    [return 0],
 	    [
 		AC_MSG_RESULT([yes])
 		CFLAGS="$save_CFLAGS"
 		$1="$$1 $2"
 	    ],
 	    [
 		AC_MSG_RESULT([no])
 		CFLAGS="$save_CFLAGS"
 	    ])
     ])
 
 dnl
 dnl Check whether the compiler supports an option to generate
 dnl Makefile-style dependency lines
 dnl
 dnl GCC uses -M for this.  Non-GCC compilers that support this
 dnl use a variety of flags, including but not limited to -M.
 dnl
 dnl We test whether the flag in question is supported, as older
 dnl versions of compilers might not support it.
 dnl
 dnl We don't try all the possible flags, just in case some flag means
 dnl "generate dependencies" on one compiler but means something else
 dnl on another compiler.
 dnl
 dnl Most compilers that support this send the output to the standard
 dnl output by default.  IBM's XLC, however, supports -M but sends
 dnl the output to {sourcefile-basename}.u, and AIX has no /dev/stdout
 dnl to work around that, so we don't bother with XLC.
 dnl
 AC_DEFUN(AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT,
     [
 	AC_MSG_CHECKING([whether the compiler supports generating dependencies])
 	if test "$GCC" = yes ; then
 		#
 		# GCC, or a compiler deemed to be GCC by AC_PROG_CC (even
 		# though it's not); we assume that, in this case, the flag
 		# would be -M.
 		#
 		ac_lbl_dependency_flag="-M"
 	else
 		#
 		# Not GCC or a compiler deemed to be GCC; what platform is
 		# this?  (We're assuming that if the compiler isn't GCC
 		# it's the compiler from the vendor of the OS; that won't
 		# necessarily be true for x86 platforms, where it might be
 		# the Intel C compiler.)
 		#
 		case "$host_os" in
 
 		irix*|osf*|darwin*)
 			#
 			# MIPS C for IRIX, DEC C, and clang all use -M.
 			#
 			ac_lbl_dependency_flag="-M"
 			;;
 
 		solaris*)
 			#
 			# Sun C uses -xM.
 			#
 			ac_lbl_dependency_flag="-xM"
 			;;
 
 		hpux*)
 			#
 			# HP's older C compilers don't support this.
 			# HP's newer C compilers support this with
 			# either +M or +Make; the older compilers
 			# interpret +M as something completely
 			# different, so we use +Make so we don't
 			# think it works with the older compilers.
 			#
 			ac_lbl_dependency_flag="+Make"
 			;;
 
 		*)
 			#
 			# Not one of the above; assume no support for
 			# generating dependencies.
 			#
 			ac_lbl_dependency_flag=""
 			;;
 		esac
 	fi
 
 	#
 	# Is ac_lbl_dependency_flag defined and, if so, does the compiler
 	# complain about it?
 	#
 	# Note: clang doesn't seem to exit with an error status when handed
 	# an unknown non-warning error, even if you pass it
 	# -Werror=unknown-warning-option.  However, it always supports
 	# -M, so the fact that this test always succeeds with clang
 	# isn't an issue.
 	#
 	if test ! -z "$ac_lbl_dependency_flag"; then
 		AC_LANG_CONFTEST(
 		    [AC_LANG_SOURCE([[int main(void) { return 0; }]])])
-		echo "$CC" $ac_lbl_dependency_flag conftest.c >&5
-		if "$CC" $ac_lbl_dependency_flag conftest.c >/dev/null 2>&1; then
+		if AC_RUN_LOG([eval "$CC $ac_lbl_dependency_flag conftest.c >/dev/null 2>&1"]); then
 			AC_MSG_RESULT([yes, with $ac_lbl_dependency_flag])
 			DEPENDENCY_CFLAG="$ac_lbl_dependency_flag"
 			MKDEP='${srcdir}/mkdep'
 		else
 			AC_MSG_RESULT([no])
 			#
 			# We can't run mkdep, so have "make depend" do
 			# nothing.
 			#
-			MKDEP=:
+			MKDEP='${srcdir}/nomkdep'
 		fi
 		rm -rf conftest*
 	else
 		AC_MSG_RESULT([no])
 		#
 		# We can't run mkdep, so have "make depend" do
 		# nothing.
 		#
-		MKDEP=:
+		MKDEP='${srcdir}/nomkdep'
 	fi
 	AC_SUBST(DEPENDENCY_CFLAG)
 	AC_SUBST(MKDEP)
     ])
 
 dnl
 dnl Determine what options are needed to build a shared library
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_SHLIBS_INIT
 dnl
 dnl results:
 dnl
-dnl	V_CCOPT (modified to build position-independent code)
+dnl	V_SHLIB_CCOPT (modified to build position-independent code)
 dnl	V_SHLIB_CMD
 dnl	V_SHLIB_OPT
 dnl	V_SONAME_OPT
 dnl	V_RPATH_OPT
 dnl
 AC_DEFUN(AC_LBL_SHLIBS_INIT,
     [AC_PREREQ(2.50)
     if test "$GCC" = yes ; then
 	    #
 	    # On platforms where we build a shared library:
 	    #
 	    #	add options to generate position-independent code,
-	    #	if necessary (it's the default in AIX and Darwin/OS X);
+	    #	if necessary (it's the default in AIX and Darwin/macOS);
 	    #
 	    #	define option to set the soname of the shared library,
 	    #	if the OS supports that;
 	    #
 	    #	add options to specify, at link time, a directory to
 	    #	add to the run-time search path, if that's necessary.
 	    #
 	    V_SHLIB_CMD="\$(CC)"
 	    V_SHLIB_OPT="-shared"
 	    case "$host_os" in
 
 	    aix*)
 		    ;;
 
 	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
 	    	    #
 		    # Platforms where the linker is the GNU linker
 		    # or accepts command-line arguments like
 		    # those the GNU linker accepts.
 		    #
 		    # Some instruction sets require -fPIC on some
 		    # operating systems.  Check for them.  If you
 		    # have a combination that requires it, add it
 		    # here.
 		    #
 		    PIC_OPT=-fpic
 		    case "$host_cpu" in
 
 		    sparc64*)
 			case "$host_os" in
 
 			freebsd*|openbsd*)
 			    PIC_OPT=-fPIC
 			    ;;
 			esac
 			;;
 		    esac
-		    V_CCOPT="$V_CCOPT $PIC_OPT"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT $PIC_OPT"
 		    V_SONAME_OPT="-Wl,-soname,"
 		    V_RPATH_OPT="-Wl,-rpath,"
 		    ;;
 
 	    hpux*)
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 	    	    #
 		    # XXX - this assumes GCC is using the HP linker,
 		    # rather than the GNU linker, and that the "+h"
 		    # option is used on all HP-UX platforms, both .sl
 		    # and .so.
 		    #
 		    V_SONAME_OPT="-Wl,+h,"
 		    #
 		    # By default, directories specifed with -L
 		    # are added to the run-time search path, so
 		    # we don't add them in pcap-config.
 		    #
 		    ;;
 
 	    solaris*)
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 		    #
 		    # XXX - this assumes GCC is using the Sun linker,
 		    # rather than the GNU linker.
 		    #
 		    V_SONAME_OPT="-Wl,-h,"
 		    V_RPATH_OPT="-Wl,-R,"
 		    ;;
 	    esac
     else
 	    #
 	    # Set the appropriate compiler flags and, on platforms
 	    # where we build a shared library:
 	    #
 	    #	add options to generate position-independent code,
-	    #	if necessary (it's the default in Darwin/OS X);
+	    #	if necessary (it's the default in Darwin/macOS);
 	    #
 	    #	if we generate ".so" shared libraries, define the
 	    #	appropriate options for building the shared library;
 	    #
 	    #	add options to specify, at link time, a directory to
 	    #	add to the run-time search path, if that's necessary.
 	    #
 	    # Note: spaces after V_SONAME_OPT are significant; on
 	    # some platforms the soname is passed with a GCC-like
 	    # "-Wl,-soname,{soname}" option, with the soname part
 	    # of the option, while on other platforms the C compiler
 	    # driver takes it as a regular option with the soname
 	    # following the option.  The same applies to V_RPATH_OPT.
 	    #
 	    case "$host_os" in
 
 	    aix*)
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
 		    ;;
 
 	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
 		    #
 		    # "cc" is GCC.
 		    #
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-shared"
 		    V_SONAME_OPT="-Wl,-soname,"
 		    V_RPATH_OPT="-Wl,-rpath,"
 		    ;;
 
 	    hpux*)
-		    V_CCOPT="$V_CCOPT +z"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT +z"
 		    V_SHLIB_CMD="\$(LD)"
 		    V_SHLIB_OPT="-b"
 		    V_SONAME_OPT="+h "
 		    #
 		    # By default, directories specifed with -L
 		    # are added to the run-time search path, so
 		    # we don't add them in pcap-config.
 		    #
 		    ;;
 
 	    osf*)
 	    	    #
 		    # Presumed to be DEC OSF/1, Digital UNIX, or
 		    # Tru64 UNIX.
 		    #
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-shared"
 		    V_SONAME_OPT="-soname "
 		    V_RPATH_OPT="-rpath "
 		    ;;
 
 	    solaris*)
-		    V_CCOPT="$V_CCOPT -Kpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -Kpic"
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-G"
 		    V_SONAME_OPT="-h "
 		    V_RPATH_OPT="-R"
 		    ;;
 	    esac
     fi
 ])
 
 #
 # Try compiling a sample of the type of code that appears in
 # gencode.c with "inline", "__inline__", and "__inline".
 #
 # Autoconf's AC_C_INLINE, at least in autoconf 2.13, isn't good enough,
 # as it just tests whether a function returning "int" can be inlined;
 # at least some versions of HP's C compiler can inline that, but can't
 # inline a function that returns a struct pointer.
 #
 # Make sure we use the V_CCOPT flags, because some of those might
 # disable inlining.
 #
 AC_DEFUN(AC_LBL_C_INLINE,
     [AC_MSG_CHECKING(for inline)
     save_CFLAGS="$CFLAGS"
     CFLAGS="$V_CCOPT"
     AC_CACHE_VAL(ac_cv_lbl_inline, [
 	ac_cv_lbl_inline=""
 	ac_lbl_cc_inline=no
 	for ac_lbl_inline in inline __inline__ __inline
 	do
 	    AC_TRY_COMPILE(
 		[#define inline $ac_lbl_inline
 		static inline struct iltest *foo(void);
 		struct iltest {
 		    int iltest1;
 		    int iltest2;
 		};
 
 		static inline struct iltest *
 		foo()
 		{
 		    static struct iltest xxx;
 
 		    return &xxx;
 		}],,ac_lbl_cc_inline=yes,)
 	    if test "$ac_lbl_cc_inline" = yes ; then
 		break;
 	    fi
 	done
 	if test "$ac_lbl_cc_inline" = yes ; then
 	    ac_cv_lbl_inline=$ac_lbl_inline
 	fi])
     CFLAGS="$save_CFLAGS"
     if test ! -z "$ac_cv_lbl_inline" ; then
 	AC_MSG_RESULT($ac_cv_lbl_inline)
     else
 	AC_MSG_RESULT(no)
     fi
     AC_DEFINE_UNQUOTED(inline, $ac_cv_lbl_inline, [Define as token for inline if inlining supported])])
 
 dnl
 dnl If using gcc, make sure we have ANSI ioctl definitions
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_FIXINCLUDES
 dnl
 AC_DEFUN(AC_LBL_FIXINCLUDES,
     [if test "$GCC" = yes ; then
 	    AC_MSG_CHECKING(for ANSI ioctl definitions)
 	    AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
 		AC_TRY_COMPILE(
 		    [/*
 		     * This generates a "duplicate case value" when fixincludes
 		     * has not be run.
 		     */
 #		include <sys/types.h>
 #		include <sys/time.h>
 #		include <sys/ioctl.h>
 #		ifdef HAVE_SYS_IOCCOM_H
 #		include <sys/ioccom.h>
 #		endif],
 		    [switch (0) {
 		    case _IO('A', 1):;
 		    case _IO('B', 1):;
 		    }],
 		    ac_cv_lbl_gcc_fixincludes=yes,
 		    ac_cv_lbl_gcc_fixincludes=no))
 	    AC_MSG_RESULT($ac_cv_lbl_gcc_fixincludes)
 	    if test $ac_cv_lbl_gcc_fixincludes = no ; then
 		    # Don't cache failure
 		    unset ac_cv_lbl_gcc_fixincludes
 		    AC_MSG_ERROR(see the INSTALL for more info)
 	    fi
     fi])
 
 dnl
 dnl Checks to see if union wait is used with WEXITSTATUS()
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_UNION_WAIT
 dnl
 dnl results:
 dnl
 dnl	DECLWAITSTATUS (defined)
 dnl
 AC_DEFUN(AC_LBL_UNION_WAIT,
     [AC_MSG_CHECKING(if union wait is used)
     AC_CACHE_VAL(ac_cv_lbl_union_wait,
 	AC_TRY_COMPILE([
 #	include <sys/types.h>
 #	include <sys/wait.h>],
 	    [int status;
 	    u_int i = WEXITSTATUS(status);
 	    u_int j = waitpid(0, &status, 0);],
 	    ac_cv_lbl_union_wait=no,
 	    ac_cv_lbl_union_wait=yes))
     AC_MSG_RESULT($ac_cv_lbl_union_wait)
     if test $ac_cv_lbl_union_wait = yes ; then
 	    AC_DEFINE(DECLWAITSTATUS,union wait,[type for wait])
     else
 	    AC_DEFINE(DECLWAITSTATUS,int,[type for wait])
     fi])
 
 dnl
-dnl Checks to see if the sockaddr struct has the 4.4 BSD sa_len member
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_SOCKADDR_SA_LEN
-dnl
-dnl results:
-dnl
-dnl	HAVE_SOCKADDR_SA_LEN (defined)
-dnl
-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
-    [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
-    AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
-	AC_TRY_COMPILE([
-#	include <sys/types.h>
-#	include <sys/socket.h>],
-	[u_int i = sizeof(((struct sockaddr *)0)->sa_len)],
-	ac_cv_lbl_sockaddr_has_sa_len=yes,
-	ac_cv_lbl_sockaddr_has_sa_len=no))
-    AC_MSG_RESULT($ac_cv_lbl_sockaddr_has_sa_len)
-    if test $ac_cv_lbl_sockaddr_has_sa_len = yes ; then
-	    AC_DEFINE(HAVE_SOCKADDR_SA_LEN,1,[if struct sockaddr has the sa_len member])
-    fi])
-
-dnl
-dnl Checks to see if there's a sockaddr_storage structure
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_SOCKADDR_STORAGE
-dnl
-dnl results:
-dnl
-dnl	HAVE_SOCKADDR_STORAGE (defined)
-dnl
-AC_DEFUN(AC_LBL_SOCKADDR_STORAGE,
-    [AC_MSG_CHECKING(if sockaddr_storage struct exists)
-    AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
-	AC_TRY_COMPILE([
-#	include <sys/types.h>
-#	include <sys/socket.h>],
-	[u_int i = sizeof (struct sockaddr_storage)],
-	ac_cv_lbl_has_sockaddr_storage=yes,
-	ac_cv_lbl_has_sockaddr_storage=no))
-    AC_MSG_RESULT($ac_cv_lbl_has_sockaddr_storage)
-    if test $ac_cv_lbl_has_sockaddr_storage = yes ; then
-	    AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[if struct sockaddr_storage exists])
-    fi])
-
-dnl
-dnl Checks to see if the dl_hp_ppa_info_t struct has the HP-UX 11.00
-dnl dl_module_id_1 member
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1
-dnl
-dnl results:
-dnl
-dnl	HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 (defined)
-dnl
-dnl NOTE: any compile failure means we conclude that it doesn't have
-dnl that member, so if we don't have DLPI, don't have a <sys/dlpi_ext.h>
-dnl header, or have one that doesn't declare a dl_hp_ppa_info_t type,
-dnl we conclude it doesn't have that member (which is OK, as either we
-dnl won't be using code that would use that member, or we wouldn't
-dnl compile in any case).
-dnl
-AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1,
-    [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
-    AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
-	AC_TRY_COMPILE([
-#	include <sys/types.h>
-#	include <sys/dlpi.h>
-#	include <sys/dlpi_ext.h>],
-	[u_int i = sizeof(((dl_hp_ppa_info_t *)0)->dl_module_id_1)],
-	ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=yes,
-	ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=no))
-    AC_MSG_RESULT($ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1)
-    if test $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1 = yes ; then
-	    AC_DEFINE(HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1,1,[if ppa_info_t_dl_module_id exists])
-    fi])
-
-dnl
 dnl Checks to see if -R is used
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_HAVE_RUN_PATH
 dnl
 dnl results:
 dnl
 dnl	ac_cv_lbl_have_run_path (yes or no)
 dnl
 AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
     [AC_MSG_CHECKING(for ${CC-cc} -R)
     AC_CACHE_VAL(ac_cv_lbl_have_run_path,
 	[echo 'main(){}' > conftest.c
 	${CC-cc} -o conftest conftest.c -R/a1/b2/c3 >conftest.out 2>&1
 	if test ! -s conftest.out ; then
 		ac_cv_lbl_have_run_path=yes
 	else
 		ac_cv_lbl_have_run_path=no
 	fi
 	rm -f -r conftest*])
     AC_MSG_RESULT($ac_cv_lbl_have_run_path)
     ])
 
 dnl
 dnl Checks to see if unaligned memory accesses fail
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_UNALIGNED_ACCESS
 dnl
 dnl results:
 dnl
 dnl	LBL_ALIGN (DEFINED)
 dnl
 AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
     [AC_MSG_CHECKING(if unaligned accesses fail)
     AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
 	[case "$host_cpu" in
 
 	#
 	# These are CPU types where:
 	#
 	#	the CPU faults on an unaligned access, but at least some
 	#	OSes that support that CPU catch the fault and simulate
 	#	the unaligned access (e.g., Alpha/{Digital,Tru64} UNIX) -
 	#	the simulation is slow, so we don't want to use it;
 	#
 	#	the CPU, I infer (from the old
 	#
 	# XXX: should also check that they don't do weird things (like on arm)
 	#
 	#	comment) doesn't fault on unaligned accesses, but doesn't
 	#	do a normal unaligned fetch, either (e.g., presumably, ARM);
 	#
 	#	for whatever reason, the test program doesn't work
 	#	(this has been claimed to be the case for several of those
 	#	CPUs - I don't know what the problem is; the problem
 	#	was reported as "the test program dumps core" for SuperH,
 	#	but that's what the test program is *supposed* to do -
 	#	it dumps core before it writes anything, so the test
 	#	for an empty output file should find an empty output
 	#	file and conclude that unaligned accesses don't work).
 	#
 	# This run-time test won't work if you're cross-compiling, so
 	# in order to support cross-compiling for a particular CPU,
 	# we have to wire in the list of CPU types anyway, as far as
 	# I know, so perhaps we should just have a set of CPUs on
 	# which we know it doesn't work, a set of CPUs on which we
 	# know it does work, and have the script just fail on other
 	# cpu types and update it when such a failure occurs.
 	#
 	alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1)
 		ac_cv_lbl_unaligned_fail=yes
 		;;
 
 	*)
 		cat >conftest.c <<EOF
 #		include <sys/types.h>
 #		include <sys/wait.h>
 #		include <stdio.h>
 		unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
 		main() {
 		unsigned int i;
 		pid_t pid;
 		int status;
 		/* avoid "core dumped" message */
 		pid = fork();
 		if (pid <  0)
 			exit(2);
 		if (pid > 0) {
 			/* parent */
 			pid = waitpid(pid, &status, 0);
 			if (pid < 0)
 				exit(3);
 			exit(!WIFEXITED(status));
 		}
 		/* child */
 		i = *(unsigned int *)&a[[1]];
 		printf("%d\n", i);
 		exit(0);
 		}
 EOF
 		${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
 		    conftest.c $LIBS >/dev/null 2>&1
 		if test ! -x conftest ; then
 			dnl failed to compile for some reason
 			ac_cv_lbl_unaligned_fail=yes
 		else
 			./conftest >conftest.out
 			if test ! -s conftest.out ; then
 				ac_cv_lbl_unaligned_fail=yes
 			else
 				ac_cv_lbl_unaligned_fail=no
 			fi
 		fi
 		rm -f -r conftest* core core.conftest
 		;;
 	esac])
     AC_MSG_RESULT($ac_cv_lbl_unaligned_fail)
     if test $ac_cv_lbl_unaligned_fail = yes ; then
 	    AC_DEFINE(LBL_ALIGN,1,[if unaligned access fails])
     fi])
 
 dnl
 dnl If the file .devel exists:
 dnl	Add some warning flags if the compiler supports them
 dnl	If an os prototype include exists, symlink os-proto.h to it
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_DEVEL(copt)
 dnl
 dnl results:
 dnl
 dnl	$1 (copt appended)
 dnl	HAVE_OS_PROTO_H (defined)
 dnl	os-proto.h (symlinked)
 dnl
 AC_DEFUN(AC_LBL_DEVEL,
     [rm -f os-proto.h
     if test "${LBL_CFLAGS+set}" = set; then
 	    $1="$$1 ${LBL_CFLAGS}"
     fi
     if test -f .devel ; then
 	    #
 	    # Skip all the warning option stuff on some compilers.
 	    #
 	    if test "$ac_lbl_cc_dont_try_gcc_dashW" != yes; then
 		    AC_LBL_CHECK_UNKNOWN_WARNING_OPTION_ERROR()
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wall)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wsign-compare)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wmissing-prototypes)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wstrict-prototypes)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wshadow)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wdeclaration-after-statement)
 		    AC_LBL_CHECK_COMPILER_OPT($1, -Wused-but-marked-unused)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wdocumentation)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wcomma)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wmissing-noreturn)
+		    # Warns about safeguards added in case the enums are
+		    # extended
+		    # AC_LBL_CHECK_COMPILER_OPT($1, -Wcovered-switch-default)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wmissing-variable-declarations)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wunused-parameter)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wformat-nonliteral)
+		    AC_LBL_CHECK_COMPILER_OPT($1, -Wunreachable-code)
 	    fi
 	    AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
 	    #
 	    # We used to set -n32 for IRIX 6 when not using GCC (presumed
 	    # to mean that we're using MIPS C or MIPSpro C); it specified
 	    # the "new" faster 32-bit ABI, introduced in IRIX 6.2.  I'm
 	    # not sure why that would be something to do *only* with a
 	    # .devel file; why should the ABI for which we produce code
 	    # depend on .devel?
 	    #
 	    os=`echo $host_os | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]].*$/\1/'`
 	    name="lbl/os-$os.h"
 	    if test -f $name ; then
 		    ln -s $name os-proto.h
 		    AC_DEFINE(HAVE_OS_PROTO_H, 1,
 			[if there's an os_proto.h for this platform, to use additional prototypes])
 	    else
 		    AC_MSG_WARN(can't find $name)
 	    fi
     fi])
 
 dnl
 dnl Improved version of AC_CHECK_LIB
 dnl
 dnl Thanks to John Hawkinson (jhawk@mit.edu)
 dnl
 dnl usage:
 dnl
 dnl	AC_LBL_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [,
 dnl	    ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
 dnl
 dnl results:
 dnl
 dnl	LIBS
 dnl
 dnl XXX - "AC_LBL_LIBRARY_NET" was redone to use "AC_SEARCH_LIBS"
 dnl rather than "AC_LBL_CHECK_LIB", so this isn't used any more.
 dnl We keep it around for reference purposes in case it's ever
 dnl useful in the future.
 dnl
 
 define(AC_LBL_CHECK_LIB,
 [AC_MSG_CHECKING([for $2 in -l$1])
 dnl Use a cache variable name containing the library, function
 dnl name, and extra libraries to link with, because the test really is
 dnl for library $1 defining function $2, when linked with potinal
 dnl library $5, not just for library $1.  Separate tests with the same
 dnl $1 and different $2's or $5's may have different results.
 ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'`
 AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var,
 [ac_save_LIBS="$LIBS"
 LIBS="-l$1 $5 $LIBS"
 AC_TRY_LINK(dnl
 ifelse([$2], [main], , dnl Avoid conflicting decl of main.
 [/* Override any gcc2 internal prototype to avoid an error.  */
 ]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
 extern "C"
 #endif
 ])dnl
 [/* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $2();
 ]),
 	    [$2()],
 	    eval "ac_cv_lbl_lib_$ac_lib_var=yes",
 	    eval "ac_cv_lbl_lib_$ac_lib_var=no")
 LIBS="$ac_save_LIBS"
 ])dnl
 if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then
   AC_MSG_RESULT(yes)
   ifelse([$3], ,
 [changequote(, )dnl
   ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 changequote([, ])dnl
   AC_DEFINE_UNQUOTED($ac_tr_lib)
   LIBS="-l$1 $LIBS"
 ], [$3])
 else
   AC_MSG_RESULT(no)
 ifelse([$4], , , [$4
 ])dnl
 fi
 ])
 
 dnl
 dnl AC_LBL_LIBRARY_NET
 dnl
-dnl This test is for network applications that need socket() and
-dnl gethostbyname() -ish functions.  Under Solaris, those applications
-dnl need to link with "-lsocket -lnsl".  Under IRIX, they need to link
-dnl with "-lnsl" but should *not* link with "-lsocket" because
-dnl libsocket.a breaks a number of things (for instance:
-dnl gethostbyname() under IRIX 5.2, and snoop sockets under most
-dnl versions of IRIX).
+dnl This test is for network applications that need socket functions and
+dnl getaddrinfo()/getnameinfo()-ish functions.  We now require
+dnl getaddrinfo() and getnameinfo().  We also prefer versions of
+dnl recvmsg() that conform to the Single UNIX Specification, so that we
+dnl can check whether a datagram received with recvmsg() was truncated
+dnl when received due to the buffer being too small.
 dnl
-dnl Unfortunately, many application developers are not aware of this,
-dnl and mistakenly write tests that cause -lsocket to be used under
-dnl IRIX.  It is also easy to write tests that cause -lnsl to be used
-dnl under operating systems where neither are necessary (or useful),
-dnl such as SunOS 4.1.4, which uses -lnsl for TLI.
+dnl On most operating systems, they're available in the system library.
 dnl
-dnl This test exists so that every application developer does not test
-dnl this in a different, and subtly broken fashion.
-
-dnl It has been argued that this test should be broken up into two
-dnl seperate tests, one for the resolver libraries, and one for the
-dnl libraries necessary for using Sockets API. Unfortunately, the two
-dnl are carefully intertwined and allowing the autoconf user to use
-dnl them independantly potentially results in unfortunate ordering
-dnl dependancies -- as such, such component macros would have to
-dnl carefully use indirection and be aware if the other components were
-dnl executed. Since other autoconf macros do not go to this trouble,
-dnl and almost no applications use sockets without the resolver, this
-dnl complexity has not been implemented.
+dnl Under Solaris, we need to link with libsocket and libnsl to get
+dnl getaddrinfo() and getnameinfo() and, if we have libxnet, we need to
+dnl link with libxnet before libsocket to get a version of recvmsg()
+dnl that conforms to the Single UNIX Specification.
 dnl
-dnl The check for libresolv is in case you are attempting to link
-dnl statically and happen to have a libresolv.a lying around (and no
-dnl libnsl.a).
+dnl We use getaddrinfo() because we want a portable thread-safe way
+dnl of getting information for a host name or port; there exist _r
+dnl versions of gethostbyname() and getservbyname() on some platforms,
+dnl but not on all platforms.
 dnl
 AC_DEFUN(AC_LBL_LIBRARY_NET, [
-    # Most operating systems have gethostbyname() in the default searched
-    # libraries (i.e. libc):
-    # Some OSes (eg. Solaris) place it in libnsl
-    # Some strange OSes (SINIX) have it in libsocket:
-    AC_SEARCH_LIBS(gethostbyname, nsl socket resolv)
-    # Unfortunately libsocket sometimes depends on libnsl and
-    # AC_SEARCH_LIBS isn't up to the task of handling dependencies like this.
-    if test "$ac_cv_search_gethostbyname" = "no"
-    then
-	AC_CHECK_LIB(socket, gethostbyname,
-                     LIBS="-lsocket -lnsl $LIBS", , -lnsl)
-    fi
-    AC_SEARCH_LIBS(socket, socket, ,
-	AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl))
+    #
+    # Most operating systems have getaddrinfo() in the default searched
+    # libraries (i.e. libc).  Check there first.
+    #
+    AC_CHECK_FUNC(getaddrinfo,,
+    [
+	#
+	# Not found in the standard system libraries.
+	# Try libsocket, which requires libnsl.
+	#
+	AC_CHECK_LIB(socket, getaddrinfo,
+	[
+	    #
+	    # OK, we found it in libsocket.
+	    #
+	    LIBS="-lsocket -lnsl $LIBS"
+	],
+	[
+	    #
+	    # We didn't find it.
+	    #
+	    AC_MSG_ERROR([getaddrinfo is required, but wasn't found])
+	], -lnsl)
+
+	#
+	# OK, do we have recvmsg() in libxnet?
+	# We also link with libsocket and libnsl.
+	#
+	AC_CHECK_LIB(xnet, recvmsg,
+	[
+	    #
+	    # Yes - link with it as well.
+	    #
+	    LIBS="-lxnet $LIBS"
+	], , -lsocket -lnsl)
+    ])
     # DLPI needs putmsg under HPUX so test for -lstr while we're at it
     AC_SEARCH_LIBS(putmsg, str)
-    ])
-
-dnl
-dnl Test for __attribute__
-dnl
-
-AC_DEFUN(AC_C___ATTRIBUTE__, [
-AC_MSG_CHECKING(for __attribute__)
-AC_CACHE_VAL(ac_cv___attribute__, [
-AC_COMPILE_IFELSE([
-  AC_LANG_SOURCE([[
-#include <stdlib.h>
-
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
-  exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-  foo();
-}
-  ]])],
-ac_cv___attribute__=yes,
-ac_cv___attribute__=no)])
-if test "$ac_cv___attribute__" = "yes"; then
-  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
-else
-  #
-  # We can't use __attribute__, so we can't use __attribute__((unused)),
-  # so we define _U_ to an empty string.
-  #
-  V_DEFS="$V_DEFS -D_U_=\"\""
-fi
-AC_MSG_RESULT($ac_cv___attribute__)
 ])
-
-dnl
-dnl Test whether __attribute__((unused)) can be used without warnings
-dnl
-
-AC_DEFUN(AC_C___ATTRIBUTE___UNUSED, [
-AC_MSG_CHECKING([whether __attribute__((unused)) can be used without warnings])
-AC_CACHE_VAL(ac_cv___attribute___unused, [
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $ac_lbl_cc_force_warning_errors"
-AC_COMPILE_IFELSE([
-  AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main(int argc  __attribute((unused)), char **argv __attribute((unused)))
-{
-  printf("Hello, world!\n");
-  return 0;
-}
-  ]])],
-ac_cv___attribute___unused=yes,
-ac_cv___attribute___unused=no)])
-CFLAGS="$save_CFLAGS"
-if test "$ac_cv___attribute___unused" = "yes"; then
-  V_DEFS="$V_DEFS -D_U_=\"__attribute__((unused))\""
-else
-  V_DEFS="$V_DEFS -D_U_=\"\""
-fi
-AC_MSG_RESULT($ac_cv___attribute___unused)
-])
-
-dnl
-dnl Test whether __attribute__((format)) can be used without warnings
-dnl
-
-AC_DEFUN(AC_C___ATTRIBUTE___FORMAT, [
-AC_MSG_CHECKING([whether __attribute__((format)) can be used without warnings])
-AC_CACHE_VAL(ac_cv___attribute___format, [
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $ac_lbl_cc_force_warning_errors"
-AC_COMPILE_IFELSE([
-  AC_LANG_SOURCE([[
-#include <stdlib.h>
-
-extern int foo(const char *fmt, ...)
-		  __attribute__ ((format (printf, 1, 2)));
-
-int
-main(int argc, char **argv)
-{
-  foo("%s", "test");
-}
-  ]])],
-ac_cv___attribute___format=yes,
-ac_cv___attribute___format=no)])
-CFLAGS="$save_CFLAGS"
-if test "$ac_cv___attribute___format" = "yes"; then
-  AC_DEFINE(__ATTRIBUTE___FORMAT_OK, 1,
-    [define if your compiler allows __attribute__((format)) without a warning])
-fi
-AC_MSG_RESULT($ac_cv___attribute___format)
-])
-
-dnl
-dnl Checks to see if tpacket_stats is defined in linux/if_packet.h
-dnl If so then pcap-linux.c can use this to report proper statistics.
-dnl
-dnl -Scott Barron
-dnl
-AC_DEFUN(AC_LBL_TPACKET_STATS,
-   [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
-   AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
-   AC_TRY_COMPILE([
-#  include <linux/if_packet.h>],
-   [struct tpacket_stats stats],
-   ac_cv_lbl_tpacket_stats=yes,
-   ac_cv_lbl_tpacket_stats=no))
-   AC_MSG_RESULT($ac_cv_lbl_tpacket_stats)
-   if test $ac_cv_lbl_tpacket_stats = yes; then
-       AC_DEFINE(HAVE_TPACKET_STATS,1,[if if_packet.h has tpacket_stats defined])
-   fi])
-
-dnl
-dnl Checks to see if the tpacket_auxdata struct has a tp_vlan_tci member.
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI
-dnl
-dnl results:
-dnl
-dnl	HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI (defined)
-dnl
-dnl NOTE: any compile failure means we conclude that it doesn't have
-dnl that member, so if we don't have tpacket_auxdata, we conclude it
-dnl doesn't have that member (which is OK, as either we won't be using
-dnl code that would use that member, or we wouldn't compile in any case).
-dnl
-AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
-    [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
-    AC_CACHE_VAL(ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci,
-	AC_TRY_COMPILE([
-#	include <sys/types.h>
-#	include <linux/if_packet.h>],
-	[u_int i = sizeof(((struct tpacket_auxdata *)0)->tp_vlan_tci)],
-	ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=yes,
-	ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=no))
-    AC_MSG_RESULT($ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci)
-    if test $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci = yes ; then
-	    HAVE_LINUX_TPACKET_AUXDATA=tp_vlan_tci
-	    AC_SUBST(HAVE_LINUX_TPACKET_AUXDATA)
-	    AC_DEFINE(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,1,[if tp_vlan_tci exists])
-    fi])
-
-dnl
-dnl Checks to see if Solaris has the dl_passive_req_t struct defined
-dnl in <sys/dlpi.h>.
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_DL_PASSIVE_REQ_T
-dnl
-dnl results:
-dnl
-dnl 	HAVE_DLPI_PASSIVE (defined)
-dnl
-AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
-        [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
-       AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
-                AC_TRY_COMPILE([
-#       include <sys/types.h>
-#       include <sys/dlpi.h>],
-        [u_int i = sizeof(dl_passive_req_t)],
-        ac_cv_lbl_has_dl_passive_req_t=yes,
-        ac_cv_lbl_has_dl_passive_req_t=no))
-    AC_MSG_RESULT($ac_cv_lbl_has_dl_passive_req_t)
-    if test $ac_cv_lbl_has_dl_passive_req_t = yes ; then
-            AC_DEFINE(HAVE_DLPI_PASSIVE,1,[if passive_req_t primitive
-		exists])
-    fi])
Index: vendor/libpcap/dist/bpf_dump.c
===================================================================
--- vendor/libpcap/dist/bpf_dump.c	(revision 333788)
+++ vendor/libpcap/dist/bpf_dump.c	(revision 333789)
@@ -1,61 +1,62 @@
 /*
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <pcap.h>
 #include <stdio.h>
 
+#include "optimize.h"
+
 void
 bpf_dump(const struct bpf_program *p, int option)
 {
 	const struct bpf_insn *insn;
 	int i;
 	int n = p->bf_len;
 
 	insn = p->bf_insns;
 	if (option > 2) {
 		printf("%d\n", n);
 		for (i = 0; i < n; ++insn, ++i) {
 			printf("%u %u %u %u\n", insn->code,
 			       insn->jt, insn->jf, insn->k);
 		}
 		return ;
 	}
 	if (option > 1) {
 		for (i = 0; i < n; ++insn, ++i)
 			printf("{ 0x%x, %d, %d, 0x%08x },\n",
 			       insn->code, insn->jt, insn->jf, insn->k);
 		return;
 	}
 	for (i = 0; i < n; ++insn, ++i) {
 #ifdef BDEBUG
-		extern int bids[];
-		if (bids[i] > 0)
+		if (i < NBIDS && bids[i] > 0)
 			printf("[%02d]", bids[i] - 1);
 		else
 			printf(" -- ");
 #endif
 		puts(bpf_image(insn, i));
 	}
 }
Index: vendor/libpcap/dist/bpf_filter.c
===================================================================
--- vendor/libpcap/dist/bpf_filter.c	(nonexistent)
+++ vendor/libpcap/dist/bpf_filter.c	(revision 333789)
@@ -0,0 +1,539 @@
+/*-
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from the Stanford/CMU enet packet filter,
+ * (net/enet.c) distributed as part of 4.3BSD, and code contributed
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
+ * Berkeley Laboratory.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)bpf.c	7.5 (Berkeley) 7/15/91
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pcap/pcap-inttypes.h>
+#include "pcap-types.h"
+
+#ifndef _WIN32
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#endif /* _WIN32 */
+
+#include <pcap/bpf.h>
+
+#include <stdlib.h>
+
+#define int32 bpf_int32
+#define u_int32 bpf_u_int32
+
+#ifndef LBL_ALIGN
+/*
+ * XXX - IA-64?  If not, this probably won't work on Win64 IA-64
+ * systems, unless LBL_ALIGN is defined elsewhere for them.
+ * XXX - SuperH?  If not, this probably won't work on WinCE SuperH
+ * systems, unless LBL_ALIGN is defined elsewhere for them.
+ */
+#if defined(sparc) || defined(__sparc__) || defined(mips) || \
+    defined(ibm032) || defined(__alpha) || defined(__hpux) || \
+    defined(__arm__)
+#define LBL_ALIGN
+#endif
+#endif
+
+#ifndef LBL_ALIGN
+#ifndef _WIN32
+#include <netinet/in.h>
+#endif
+
+#define EXTRACT_SHORT(p)	((u_short)ntohs(*(u_short *)p))
+#define EXTRACT_LONG(p)		(ntohl(*(u_int32 *)p))
+#else
+#define EXTRACT_SHORT(p)\
+	((u_short)\
+		((u_short)*((u_char *)p+0)<<8|\
+		 (u_short)*((u_char *)p+1)<<0))
+#define EXTRACT_LONG(p)\
+		((u_int32)*((u_char *)p+0)<<24|\
+		 (u_int32)*((u_char *)p+1)<<16|\
+		 (u_int32)*((u_char *)p+2)<<8|\
+		 (u_int32)*((u_char *)p+3)<<0)
+#endif
+
+#ifdef __linux__
+#include <linux/types.h>
+#include <linux/if_packet.h>
+#include <linux/filter.h>
+#endif
+
+enum {
+        BPF_S_ANC_NONE,
+        BPF_S_ANC_VLAN_TAG,
+        BPF_S_ANC_VLAN_TAG_PRESENT,
+};
+
+/*
+ * Execute the filter program starting at pc on the packet p
+ * wirelen is the length of the original packet
+ * buflen is the amount of data present
+ * aux_data is auxiliary data, currently used only when interpreting
+ * filters intended for the Linux kernel in cases where the kernel
+ * rejects the filter; it contains VLAN tag information
+ * For the kernel, p is assumed to be a pointer to an mbuf if buflen is 0,
+ * in all other cases, p is a pointer to a buffer and buflen is its size.
+ *
+ * Thanks to Ani Sinha <ani@arista.com> for providing initial implementation
+ */
+u_int
+bpf_filter_with_aux_data(const struct bpf_insn *pc, const u_char *p,
+    u_int wirelen, u_int buflen, const struct bpf_aux_data *aux_data)
+{
+	register u_int32 A, X;
+	register bpf_u_int32 k;
+	u_int32 mem[BPF_MEMWORDS];
+
+	if (pc == 0)
+		/*
+		 * No filter means accept all.
+		 */
+		return (u_int)-1;
+	A = 0;
+	X = 0;
+	--pc;
+	for (;;) {
+		++pc;
+		switch (pc->code) {
+
+		default:
+			abort();
+		case BPF_RET|BPF_K:
+			return (u_int)pc->k;
+
+		case BPF_RET|BPF_A:
+			return (u_int)A;
+
+		case BPF_LD|BPF_W|BPF_ABS:
+			k = pc->k;
+			if (k > buflen || sizeof(int32_t) > buflen - k) {
+				return 0;
+			}
+			A = EXTRACT_LONG(&p[k]);
+			continue;
+
+		case BPF_LD|BPF_H|BPF_ABS:
+			k = pc->k;
+			if (k > buflen || sizeof(int16_t) > buflen - k) {
+				return 0;
+			}
+			A = EXTRACT_SHORT(&p[k]);
+			continue;
+
+		case BPF_LD|BPF_B|BPF_ABS:
+			switch (pc->k) {
+
+#if defined(SKF_AD_VLAN_TAG_PRESENT)
+			case SKF_AD_OFF + SKF_AD_VLAN_TAG:
+				if (!aux_data)
+					return 0;
+				A = aux_data->vlan_tag;
+				break;
+
+			case SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT:
+				if (!aux_data)
+					return 0;
+				A = aux_data->vlan_tag_present;
+				break;
+#endif
+			default:
+				k = pc->k;
+				if (k >= buflen) {
+					return 0;
+				}
+				A = p[k];
+				break;
+			}
+			continue;
+
+		case BPF_LD|BPF_W|BPF_LEN:
+			A = wirelen;
+			continue;
+
+		case BPF_LDX|BPF_W|BPF_LEN:
+			X = wirelen;
+			continue;
+
+		case BPF_LD|BPF_W|BPF_IND:
+			k = X + pc->k;
+			if (pc->k > buflen || X > buflen - pc->k ||
+			    sizeof(int32_t) > buflen - k) {
+				return 0;
+			}
+			A = EXTRACT_LONG(&p[k]);
+			continue;
+
+		case BPF_LD|BPF_H|BPF_IND:
+			k = X + pc->k;
+			if (X > buflen || pc->k > buflen - X ||
+			    sizeof(int16_t) > buflen - k) {
+				return 0;
+			}
+			A = EXTRACT_SHORT(&p[k]);
+			continue;
+
+		case BPF_LD|BPF_B|BPF_IND:
+			k = X + pc->k;
+			if (pc->k >= buflen || X >= buflen - pc->k) {
+				return 0;
+			}
+			A = p[k];
+			continue;
+
+		case BPF_LDX|BPF_MSH|BPF_B:
+			k = pc->k;
+			if (k >= buflen) {
+				return 0;
+			}
+			X = (p[pc->k] & 0xf) << 2;
+			continue;
+
+		case BPF_LD|BPF_IMM:
+			A = pc->k;
+			continue;
+
+		case BPF_LDX|BPF_IMM:
+			X = pc->k;
+			continue;
+
+		case BPF_LD|BPF_MEM:
+			A = mem[pc->k];
+			continue;
+
+		case BPF_LDX|BPF_MEM:
+			X = mem[pc->k];
+			continue;
+
+		case BPF_ST:
+			mem[pc->k] = A;
+			continue;
+
+		case BPF_STX:
+			mem[pc->k] = X;
+			continue;
+
+		case BPF_JMP|BPF_JA:
+			/*
+			 * XXX - we currently implement "ip6 protochain"
+			 * with backward jumps, so sign-extend pc->k.
+			 */
+			pc += (bpf_int32)pc->k;
+			continue;
+
+		case BPF_JMP|BPF_JGT|BPF_K:
+			pc += (A > pc->k) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JGE|BPF_K:
+			pc += (A >= pc->k) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JEQ|BPF_K:
+			pc += (A == pc->k) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JSET|BPF_K:
+			pc += (A & pc->k) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JGT|BPF_X:
+			pc += (A > X) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JGE|BPF_X:
+			pc += (A >= X) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JEQ|BPF_X:
+			pc += (A == X) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_JMP|BPF_JSET|BPF_X:
+			pc += (A & X) ? pc->jt : pc->jf;
+			continue;
+
+		case BPF_ALU|BPF_ADD|BPF_X:
+			A += X;
+			continue;
+
+		case BPF_ALU|BPF_SUB|BPF_X:
+			A -= X;
+			continue;
+
+		case BPF_ALU|BPF_MUL|BPF_X:
+			A *= X;
+			continue;
+
+		case BPF_ALU|BPF_DIV|BPF_X:
+			if (X == 0)
+				return 0;
+			A /= X;
+			continue;
+
+		case BPF_ALU|BPF_MOD|BPF_X:
+			if (X == 0)
+				return 0;
+			A %= X;
+			continue;
+
+		case BPF_ALU|BPF_AND|BPF_X:
+			A &= X;
+			continue;
+
+		case BPF_ALU|BPF_OR|BPF_X:
+			A |= X;
+			continue;
+
+		case BPF_ALU|BPF_XOR|BPF_X:
+			A ^= X;
+			continue;
+
+		case BPF_ALU|BPF_LSH|BPF_X:
+			A <<= X;
+			continue;
+
+		case BPF_ALU|BPF_RSH|BPF_X:
+			A >>= X;
+			continue;
+
+		case BPF_ALU|BPF_ADD|BPF_K:
+			A += pc->k;
+			continue;
+
+		case BPF_ALU|BPF_SUB|BPF_K:
+			A -= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_MUL|BPF_K:
+			A *= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_DIV|BPF_K:
+			A /= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_MOD|BPF_K:
+			A %= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_AND|BPF_K:
+			A &= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_OR|BPF_K:
+			A |= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_XOR|BPF_K:
+			A ^= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_LSH|BPF_K:
+			A <<= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_RSH|BPF_K:
+			A >>= pc->k;
+			continue;
+
+		case BPF_ALU|BPF_NEG:
+			/*
+			 * Most BPF arithmetic is unsigned, but negation
+			 * can't be unsigned; throw some casts to
+			 * specify what we're trying to do.
+			 */
+			A = (u_int32)(-(int32)A);
+			continue;
+
+		case BPF_MISC|BPF_TAX:
+			X = A;
+			continue;
+
+		case BPF_MISC|BPF_TXA:
+			A = X;
+			continue;
+		}
+	}
+}
+
+u_int
+bpf_filter(const struct bpf_insn *pc, const u_char *p, u_int wirelen,
+    u_int buflen)
+{
+	return bpf_filter_with_aux_data(pc, p, wirelen, buflen, NULL);
+}
+
+
+/*
+ * Return true if the 'fcode' is a valid filter program.
+ * The constraints are that each jump be forward and to a valid
+ * code, that memory accesses are within valid ranges (to the
+ * extent that this can be checked statically; loads of packet
+ * data have to be, and are, also checked at run time), and that
+ * the code terminates with either an accept or reject.
+ *
+ * The kernel needs to be able to verify an application's filter code.
+ * Otherwise, a bogus program could easily crash the system.
+ */
+int
+bpf_validate(const struct bpf_insn *f, int len)
+{
+	u_int i, from;
+	const struct bpf_insn *p;
+
+	if (len < 1)
+		return 0;
+
+	for (i = 0; i < (u_int)len; ++i) {
+		p = &f[i];
+		switch (BPF_CLASS(p->code)) {
+		/*
+		 * Check that memory operations use valid addresses.
+		 */
+		case BPF_LD:
+		case BPF_LDX:
+			switch (BPF_MODE(p->code)) {
+			case BPF_IMM:
+				break;
+			case BPF_ABS:
+			case BPF_IND:
+			case BPF_MSH:
+				/*
+				 * There's no maximum packet data size
+				 * in userland.  The runtime packet length
+				 * check suffices.
+				 */
+				break;
+			case BPF_MEM:
+				if (p->k >= BPF_MEMWORDS)
+					return 0;
+				break;
+			case BPF_LEN:
+				break;
+			default:
+				return 0;
+			}
+			break;
+		case BPF_ST:
+		case BPF_STX:
+			if (p->k >= BPF_MEMWORDS)
+				return 0;
+			break;
+		case BPF_ALU:
+			switch (BPF_OP(p->code)) {
+			case BPF_ADD:
+			case BPF_SUB:
+			case BPF_MUL:
+			case BPF_OR:
+			case BPF_AND:
+			case BPF_XOR:
+			case BPF_LSH:
+			case BPF_RSH:
+			case BPF_NEG:
+				break;
+			case BPF_DIV:
+			case BPF_MOD:
+				/*
+				 * Check for constant division or modulus
+				 * by 0.
+				 */
+				if (BPF_SRC(p->code) == BPF_K && p->k == 0)
+					return 0;
+				break;
+			default:
+				return 0;
+			}
+			break;
+		case BPF_JMP:
+			/*
+			 * Check that jumps are within the code block,
+			 * and that unconditional branches don't go
+			 * backwards as a result of an overflow.
+			 * Unconditional branches have a 32-bit offset,
+			 * so they could overflow; we check to make
+			 * sure they don't.  Conditional branches have
+			 * an 8-bit offset, and the from address is <=
+			 * BPF_MAXINSNS, and we assume that BPF_MAXINSNS
+			 * is sufficiently small that adding 255 to it
+			 * won't overflow.
+			 *
+			 * We know that len is <= BPF_MAXINSNS, and we
+			 * assume that BPF_MAXINSNS is < the maximum size
+			 * of a u_int, so that i + 1 doesn't overflow.
+			 *
+			 * For userland, we don't know that the from
+			 * or len are <= BPF_MAXINSNS, but we know that
+			 * from <= len, and, except on a 64-bit system,
+			 * it's unlikely that len, if it truly reflects
+			 * the size of the program we've been handed,
+			 * will be anywhere near the maximum size of
+			 * a u_int.  We also don't check for backward
+			 * branches, as we currently support them in
+			 * userland for the protochain operation.
+			 */
+			from = i + 1;
+			switch (BPF_OP(p->code)) {
+			case BPF_JA:
+				if (from + p->k >= (u_int)len)
+					return 0;
+				break;
+			case BPF_JEQ:
+			case BPF_JGT:
+			case BPF_JGE:
+			case BPF_JSET:
+				if (from + p->jt >= (u_int)len || from + p->jf >= (u_int)len)
+					return 0;
+				break;
+			default:
+				return 0;
+			}
+			break;
+		case BPF_RET:
+			break;
+		case BPF_MISC:
+			break;
+		default:
+			return 0;
+		}
+	}
+	return BPF_CLASS(f[len - 1].code) == BPF_RET;
+}

Property changes on: vendor/libpcap/dist/bpf_filter.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/bpf_image.c
===================================================================
--- vendor/libpcap/dist/bpf_image.c	(revision 333788)
+++ vendor/libpcap/dist/bpf_image.c	(revision 333789)
@@ -1,320 +1,332 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#endif /* _WIN32 */
+#include <pcap-types.h>
 
 #include <stdio.h>
 #include <string.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 char *
-bpf_image(p, n)
-	const struct bpf_insn *p;
-	int n;
+bpf_image(const struct bpf_insn *p, int n)
 {
-	int v;
-	const char *fmt, *op;
+	const char *op;
 	static char image[256];
-	char operand[64];
+	char operand_buf[64];
+	const char *operand;
 
-	v = p->k;
 	switch (p->code) {
 
 	default:
 		op = "unimp";
-		fmt = "0x%x";
-		v = p->code;
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "0x%x", p->code);
+		operand = operand_buf;
 		break;
 
 	case BPF_RET|BPF_K:
 		op = "ret";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_RET|BPF_A:
 		op = "ret";
-		fmt = "";
+		operand = "";
 		break;
 
 	case BPF_LD|BPF_W|BPF_ABS:
 		op = "ld";
-		fmt = "[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_H|BPF_ABS:
 		op = "ldh";
-		fmt = "[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_B|BPF_ABS:
 		op = "ldb";
-		fmt = "[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_W|BPF_LEN:
 		op = "ld";
-		fmt = "#pktlen";
+		operand = "#pktlen";
 		break;
 
 	case BPF_LD|BPF_W|BPF_IND:
 		op = "ld";
-		fmt = "[x + %d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[x + %d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_H|BPF_IND:
 		op = "ldh";
-		fmt = "[x + %d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[x + %d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_B|BPF_IND:
 		op = "ldb";
-		fmt = "[x + %d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "[x + %d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_IMM:
 		op = "ld";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LDX|BPF_IMM:
 		op = "ldx";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LDX|BPF_MSH|BPF_B:
 		op = "ldxb";
-		fmt = "4*([%d]&0xf)";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "4*([%d]&0xf)", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LD|BPF_MEM:
 		op = "ld";
-		fmt = "M[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "M[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_LDX|BPF_MEM:
 		op = "ldx";
-		fmt = "M[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "M[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ST:
 		op = "st";
-		fmt = "M[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "M[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_STX:
 		op = "stx";
-		fmt = "M[%d]";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "M[%d]", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JA:
 		op = "ja";
-		fmt = "%d";
-		v = n + 1 + p->k;
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "%d", n + 1 + p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JGT|BPF_K:
 		op = "jgt";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JGE|BPF_K:
 		op = "jge";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JEQ|BPF_K:
 		op = "jeq";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JSET|BPF_K:
 		op = "jset";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_JMP|BPF_JGT|BPF_X:
 		op = "jgt";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_JMP|BPF_JGE|BPF_X:
 		op = "jge";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_JMP|BPF_JEQ|BPF_X:
 		op = "jeq";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_JMP|BPF_JSET|BPF_X:
 		op = "jset";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_ADD|BPF_X:
 		op = "add";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_SUB|BPF_X:
 		op = "sub";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_MUL|BPF_X:
 		op = "mul";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_DIV|BPF_X:
 		op = "div";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_MOD|BPF_X:
 		op = "mod";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_AND|BPF_X:
 		op = "and";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_OR|BPF_X:
 		op = "or";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_XOR|BPF_X:
 		op = "xor";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_LSH|BPF_X:
 		op = "lsh";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_RSH|BPF_X:
 		op = "rsh";
-		fmt = "x";
+		operand = "x";
 		break;
 
 	case BPF_ALU|BPF_ADD|BPF_K:
 		op = "add";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_SUB|BPF_K:
 		op = "sub";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_MUL|BPF_K:
 		op = "mul";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_DIV|BPF_K:
 		op = "div";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_MOD|BPF_K:
 		op = "mod";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_AND|BPF_K:
 		op = "and";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_OR|BPF_K:
 		op = "or";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_XOR|BPF_K:
 		op = "xor";
-		fmt = "#0x%x";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#0x%x", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_LSH|BPF_K:
 		op = "lsh";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_RSH|BPF_K:
 		op = "rsh";
-		fmt = "#%d";
+		(void)pcap_snprintf(operand_buf, sizeof operand_buf, "#%d", p->k);
+		operand = operand_buf;
 		break;
 
 	case BPF_ALU|BPF_NEG:
 		op = "neg";
-		fmt = "";
+		operand = "";
 		break;
 
 	case BPF_MISC|BPF_TAX:
 		op = "tax";
-		fmt = "";
+		operand = "";
 		break;
 
 	case BPF_MISC|BPF_TXA:
 		op = "txa";
-		fmt = "";
+		operand = "";
 		break;
 	}
-	(void)pcap_snprintf(operand, sizeof operand, fmt, v);
 	if (BPF_CLASS(p->code) == BPF_JMP && BPF_OP(p->code) != BPF_JA) {
 		(void)pcap_snprintf(image, sizeof image,
 			      "(%03d) %-8s %-16s jt %d\tjf %d",
 			      n, op, operand, n + 1 + p->jt, n + 1 + p->jf);
 	} else {
 		(void)pcap_snprintf(image, sizeof image,
 			      "(%03d) %-8s %s",
 			      n, op, operand);
 	}
 	return image;
 }
Index: vendor/libpcap/dist/chmod_bpf
===================================================================
--- vendor/libpcap/dist/chmod_bpf	(revision 333788)
+++ vendor/libpcap/dist/chmod_bpf	(revision 333789)
@@ -1,19 +1,19 @@
 #! /bin/sh
 
 #
-# Unfortunately, Mac OS X's devfs is based on the old FreeBSD
+# Unfortunately, macOS's devfs is based on the old FreeBSD
 # one, not the current one, so there's no way to configure it
 # to create BPF devices with particular owners or groups.
 # This startup item will make it owned by the admin group,
 # with permissions rw-rw----, so that anybody in the admin
 # group can use programs that capture or send raw packets.
 #
 # Change this as appropriate for your site, e.g. to make
 # it owned by a particular user without changing the permissions,
 # so only that user and the super-user can capture or send raw
 # packets, or give it the permissions rw-r-----, so that
 # only the super-user can send raw packets but anybody in the
 # admin group can capture packets.
 #
 chgrp admin /dev/bpf*
 chmod g+rw /dev/bpf*
Index: vendor/libpcap/dist/cmake/preconfigure.cmake
===================================================================
--- vendor/libpcap/dist/cmake/preconfigure.cmake	(revision 333788)
+++ vendor/libpcap/dist/cmake/preconfigure.cmake	(nonexistent)
@@ -1,55 +0,0 @@
-if( NOT LIBPCAP_PRECONFIGURED )
-    set( LIBPCAP_PRECONFIGURED TRUE )
-
-    ###################################################################
-    #   Parameters
-    ###################################################################
-
-    option (USE_STATIC_RT "Use static Runtime" ON)
-
-    ######################################
-    # Project setings
-    ######################################
-
-    add_definitions( -DBUILDING_PCAP )
-
-    if( MSVC )
-        add_definitions( -D__STDC__ )
-        add_definitions( -D_CRT_SECURE_NO_WARNINGS )
-        add_definitions( "-D_U_=" )
-    elseif( CMAKE_COMPILER_IS_GNUCXX )
-        add_definitions( "-D_U_=__attribute__((unused))" )
-    else(MSVC)
-        add_definitions( "-D_U_=" )
-    endif( MSVC )
-
-    if (USE_STATIC_RT)
-        MESSAGE( STATUS "Use STATIC runtime" )
-
-        if( MSVC )
-            set (CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
-            set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
-            set (CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-            set (CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-
-            set (CMAKE_C_FLAGS_MINSIZEREL       "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
-            set (CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
-            set (CMAKE_C_FLAGS_RELEASE          "${CMAKE_C_FLAGS_RELEASE} /MT")
-            set (CMAKE_C_FLAGS_DEBUG            "${CMAKE_C_FLAGS_DEBUG} /MTd")
-        endif( MSVC )
-    else (USE_STATIC_RT)
-        MESSAGE( STATUS "Use DYNAMIC runtime" )
-
-        if( MSVC )
-            set (CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
-            set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
-            set (CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-            set (CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-
-            set (CMAKE_C_FLAGS_MINSIZEREL       "${CMAKE_C_FLAGS_MINSIZEREL} /MD")
-            set (CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MD")
-            set (CMAKE_C_FLAGS_RELEASE          "${CMAKE_C_FLAGS_RELEASE} /MD")
-            set (CMAKE_C_FLAGS_DEBUG            "${CMAKE_C_FLAGS_DEBUG} /MDd")
-        endif( MSVC )
-    endif (USE_STATIC_RT)
-endif( NOT LIBPCAP_PRECONFIGURED )
Index: vendor/libpcap/dist/cmake/Modules/FindDAG.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindDAG.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindDAG.cmake	(revision 333789)
@@ -0,0 +1,32 @@
+#
+# Try to find the Endace DAG library.
+#
+
+# Try to find the header
+find_path(DAG_INCLUDE_DIR dagapi.h)
+
+#
+# Try to find the libraries
+#
+# We assume that if we have libdag we have libdagconf, as they're
+# installed at the same time from the same package.
+#
+find_library(DAG_LIBRARY dag)
+find_library(DAGCONF_LIBRARY dagconf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DAG
+  DEFAULT_MSG
+  DAG_INCLUDE_DIR
+  DAG_LIBRARY
+  DAGCONF_LIBRARY
+)
+
+mark_as_advanced(
+  DAG_INCLUDE_DIR
+  DAG_LIBRARY
+  DAGCONF_LIBRARY
+)
+
+set(DAG_INCLUDE_DIRS ${DAG_INCLUDE_DIR})
+set(DAG_LIBRARIES ${DAG_LIBRARY} ${DAGCONF_LIBRARY})
Index: vendor/libpcap/dist/cmake/Modules/FindFseeko.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindFseeko.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindFseeko.cmake	(revision 333789)
@@ -0,0 +1,85 @@
+# CMake support for fseeko
+#
+# Based on FindLFS.cmake by
+# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# This defines the following variables
+#
+# FSEEKO_DEFINITIONS - List of definitions to pass to add_definitions()
+# FSEEKO_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
+# FSEEKO_LIBRARIES - List of libraries and linker flags
+# FSEEKO_FOUND - If there is Large files support
+#
+
+include(CheckCSourceCompiles)
+include(FindPackageHandleStandardArgs)
+include(CMakePushCheckState)
+
+# Check for the availability of fseeko()
+# The cases handled are:
+#
+#  * Native fseeko()
+#  * Preprocessor flag -D_LARGEFILE_SOURCE
+#
+function(_fseeko_check)
+    set(_fseeko_cppflags)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_QUIET 1)
+    set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS})
+    message(STATUS "Looking for native fseeko support")
+    check_symbol_exists(fseeko stdio.h fseeko_native)
+    cmake_pop_check_state()
+    if (fseeko_native)
+        message(STATUS "Looking for native fseeko support - found")
+        set(FSEEKO_FOUND TRUE)
+    else()
+        message(STATUS "Looking for native fseeko support - not found")
+    endif()
+
+    if (NOT FSEEKO_FOUND)
+        # See if it's available with _LARGEFILE_SOURCE.
+        cmake_push_check_state()
+        set(CMAKE_REQUIRED_QUIET 1)
+        set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS} "-D_LARGEFILE_SOURCE")
+        check_symbol_exists(fseeko stdio.h fseeko_need_largefile_source)
+        cmake_pop_check_state()
+        if (fseeko_need_largefile_source)
+            message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - found")
+            set(FSEEKO_FOUND TRUE)
+            set(_fseeko_cppflags "-D_LARGEFILE_SOURCE")
+        else()
+            message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - not found")
+        endif()
+    endif()
+
+    set(FSEEKO_DEFINITIONS ${_fseeko_cppflags} CACHE STRING "Extra definitions for fseeko support")
+    set(FSEEKO_COMPILE_OPTIONS "" CACHE STRING "Extra compiler options for fseeko support")
+    set(FSEEKO_LIBRARIES "" CACHE STRING "Extra definitions for fseeko support")
+    set(FSEEKO_FOUND ${FSEEKO_FOUND} CACHE INTERNAL "Found fseeko")
+endfunction()
+
+if (NOT FSEEKO_FOUND)
+    _fseeko_check()
+endif()
+
+find_package_handle_standard_args(FSEEKO "Could not find fseeko. Set FSEEKO_DEFINITIONS, FSEEKO_COMPILE_OPTIONS, FSEEKO_LIBRARIES." FSEEKO_FOUND)
Index: vendor/libpcap/dist/cmake/Modules/FindLFS.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindLFS.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindLFS.cmake	(revision 333789)
@@ -0,0 +1,153 @@
+# CMake support for large files
+#
+# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# This defines the following variables
+#
+# LFS_DEFINITIONS - List of definitions to pass to add_definitions()
+# LFS_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
+# LFS_LIBRARIES - List of libraries and linker flags
+# LFS_FOUND - If there is Large files support
+#
+
+include(CheckCSourceCompiles)
+include(FindPackageHandleStandardArgs)
+include(CMakePushCheckState)
+
+# Test program to check for LFS. Requires that off_t has at least 8 byte large
+set(_lfs_test_source
+    "
+    #include <sys/types.h>
+    typedef char my_static_assert[sizeof(off_t) >= 8 ? 1 : -1];
+    int main(void) { return 0; }
+    "
+)
+
+# Check if the given options are needed
+#
+# This appends to the variables _lfs_cppflags, _lfs_cflags, and _lfs_ldflags,
+# it also sets LFS_FOUND to 1 if it works.
+function(_lfs_check_compiler_option var options definitions libraries)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_QUIET 1)
+    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${options})
+    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${definitions})
+    set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_DEFINITIONS} ${libraries})
+
+    message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries}")
+    check_c_source_compiles("${_lfs_test_source}" ${var})
+    cmake_pop_check_state()
+
+    if(${var})
+        message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - found")
+        set(_lfs_cppflags ${_lfs_cppflags} ${definitions} PARENT_SCOPE)
+        set(_lfs_cflags ${_lfs_cflags} ${options} PARENT_SCOPE)
+        set(_lfs_ldflags ${_lfs_ldflags} ${libraries} PARENT_SCOPE)
+        set(LFS_FOUND TRUE PARENT_SCOPE)
+    else()
+        message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - not found")
+    endif()
+endfunction()
+
+# Check for the availability of LFS.
+# The cases handled are:
+#
+#  * Native LFS
+#  * Output of getconf LFS_CFLAGS; getconf LFS_LIBS; getconf LFS_LDFLAGS
+#  * Preprocessor flag -D_FILE_OFFSET_BITS=64
+#  * Preprocessor flag -D_LARGE_FILES
+#
+function(_lfs_check)
+    set(_lfs_cflags)
+    set(_lfs_cppflags)
+    set(_lfs_ldflags)
+    set(_lfs_libs)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_QUIET 1)
+    message(STATUS "Looking for native LFS support")
+    check_c_source_compiles("${_lfs_test_source}" lfs_native)
+    cmake_pop_check_state()
+    if (lfs_native)
+        message(STATUS "Looking for native LFS support - found")
+        set(LFS_FOUND TRUE)
+    else()
+        message(STATUS "Looking for native LFS support - not found")
+    endif()
+
+    if (NOT LFS_FOUND)
+        # Check using getconf. If getconf fails, don't worry, the check in
+        # _lfs_check_compiler_option will fail as well.
+        execute_process(COMMAND getconf LFS_CFLAGS
+                        OUTPUT_VARIABLE _lfs_cflags_raw
+                        OUTPUT_STRIP_TRAILING_WHITESPACE
+                        ERROR_QUIET)
+        execute_process(COMMAND getconf LFS_LIBS
+                        OUTPUT_VARIABLE _lfs_libs_tmp
+                        OUTPUT_STRIP_TRAILING_WHITESPACE
+                        ERROR_QUIET)
+        execute_process(COMMAND getconf LFS_LDFLAGS
+                        OUTPUT_VARIABLE _lfs_ldflags_tmp
+                        OUTPUT_STRIP_TRAILING_WHITESPACE
+                        ERROR_QUIET)
+
+        separate_arguments(_lfs_cflags_raw)
+        separate_arguments(_lfs_ldflags_tmp)
+        separate_arguments(_lfs_libs_tmp)
+
+        # Move -D flags to the place they are supposed to be
+        foreach(flag ${_lfs_cflags_raw})
+            if (flag MATCHES "-D.*")
+                list(APPEND _lfs_cppflags_tmp ${flag})
+            else()
+                list(APPEND _lfs_cflags_tmp ${flag})
+            endif()
+        endforeach()
+
+        # Check if the flags we received (if any) produce working LFS support
+        _lfs_check_compiler_option(lfs_getconf_works
+                                   "${_lfs_cflags_tmp}"
+                                   "${_lfs_cppflags_tmp}"
+                                   "${_lfs_libs_tmp};${_lfs_ldflags_tmp}")
+    endif()
+
+    if(NOT LFS_FOUND)  # IRIX stuff
+        _lfs_check_compiler_option(lfs_need_n32 "-n32" "" "")
+    endif()
+    if(NOT LFS_FOUND)  # Linux and friends
+        _lfs_check_compiler_option(lfs_need_file_offset_bits "" "-D_FILE_OFFSET_BITS=64" "")
+    endif()
+    if(NOT LFS_FOUND)  # AIX
+        _lfs_check_compiler_option(lfs_need_large_files "" "-D_LARGE_FILES=1" "")
+    endif()
+
+    set(LFS_DEFINITIONS ${_lfs_cppflags} CACHE STRING "Extra definitions for large file support")
+    set(LFS_COMPILE_OPTIONS ${_lfs_cflags} CACHE STRING "Extra definitions for large file support")
+    set(LFS_LIBRARIES ${_lfs_libs} ${_lfs_ldflags} CACHE STRING "Extra definitions for large file support")
+    set(LFS_FOUND ${LFS_FOUND} CACHE INTERNAL "Found LFS")
+endfunction()
+
+if (NOT LFS_FOUND)
+    _lfs_check()
+endif()
+
+find_package_handle_standard_args(LFS "Could not find LFS. Set LFS_DEFINITIONS, LFS_COMPILE_OPTIONS, LFS_LIBRARIES." LFS_FOUND)
Index: vendor/libpcap/dist/cmake/Modules/FindPacket.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindPacket.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindPacket.cmake	(revision 333789)
@@ -0,0 +1,81 @@
+#
+# Copyright (C) 2017 Ali Abdulkadir <autostart.ini@gmail.com>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sub-license, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# FindPacket
+# ==========
+#
+# Find the Packet library and include files.
+#
+# This module defines the following variables:
+#
+# PACKET_INCLUDE_DIR     - absolute path to the directory containing Packet32.h.
+#
+# PACKET_LIBRARY         - relative or absolute path to the Packet library to
+#                          link with. An absolute path is will be used if the
+#                          Packet library is not located in the compiler's
+#                          default search path. See e.g. PACKET_DLL_DIR
+#                          variable below.
+
+# PACKET_FOUND           - TRUE if the Packet library *and* header are found.
+#
+# Hints and Backward Compatibility
+# ================================
+#
+# To tell this module where to look, a user may set the environment variable
+# PACKET_DLL_DIR to point cmake to the *root* of a directory with include and
+# lib subdirectories for packet.dll (e.g WpdPack/npcap-sdk).
+# Alternatively, PACKET_DLL_DIR may also be set from cmake command line or GUI
+# (e.g cmake -DPACKET_DLL_DIR=/path/to/packet [...])
+#
+
+# The 64-bit Packet.lib is located under /x64
+set(64BIT_SUBDIR "")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(64BIT_SUBDIR "/x64")
+endif()
+
+# Find the header
+find_path(PACKET_INCLUDE_DIR Packet32.h
+  HINTS "${PACKET_DLL_DIR}" ENV PACKET_DLL_DIR
+  PATH_SUFFIXES include Include
+)
+
+# Find the library
+find_library(PACKET_LIBRARY
+  NAMES Packet packet
+  HINTS "${PACKET_DLL_DIR}" ENV PACKET_DLL_DIR
+  PATH_SUFFIXES Lib${64BIT_SUBDIR} lib${64BIT_SUBDIR}
+)
+
+# Set PACKET_FOUND to TRUE if PACKET_INCLUDE_DIR and PACKET_LIBRARY are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PACKET
+  DEFAULT_MSG
+  PACKET_INCLUDE_DIR
+  PACKET_LIBRARY
+)
+
+mark_as_advanced(PACKET_INCLUDE_DIR PACKET_LIBRARY)
+
+set(PACKET_INCLUDE_DIRS ${PACKET_INCLUDE_DIR})
+set(PACKET_LIBRARIES ${PACKET_LIBRARY})
Index: vendor/libpcap/dist/cmake/Modules/FindPthreads-w32.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindPthreads-w32.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindPthreads-w32.cmake	(revision 333789)
@@ -0,0 +1,152 @@
+# ==============================================================================
+# This is a heavily modified version of FindPthreads.cmake for the pcap project.
+# It's meant to find Pthreads-w32, an implementation of the
+# Threads component of the POSIX 1003.1c 1995 Standard (or later)
+# for Microsoft's WIndows.
+#
+# Apart from this notice, this module "enjoys" the following modifications:
+#
+# - changed its name to FindPthreads-w32.cmake to not conflict with FindThreads.cmake
+#
+# - users may be able to use the environment variable PTHREADS_ROOT to point
+#   cmake to the *root* of their Pthreads-w32 installation.
+#   Alternatively, PTHREADS_ROOT may also be set from cmake command line or GUI
+#   (-DPTHREADS_ROOT=/path/to/Pthreads-w32)
+#   Two other variables that can be defined in a similar fashion are
+#   PTHREAD_INCLUDE_PATH and PTHREAD_LIBRARY_PATH.
+#
+# - added some additional status/error messages
+#
+# - changed formating (uppercase to lowercare + indentation)
+#
+# - removed some stuff
+#
+# - when searching for Pthreads-win32 libraries, the directory structure of the
+#   pre-build binaries folder found in the pthreads-win32 CVS code repository is
+#   considered (e.i /Pre-built.2/lib/x64 /Pre-built.2/lib/x86)
+#
+# Send suggestion, patches, gifts and praises to pcap's developers.
+# ==============================================================================
+#
+# Find the Pthreads library
+# This module searches for the Pthreads-win32 library (including the
+# pthreads-win32 port).
+#
+# This module defines these variables:
+#
+#  PTHREADS_FOUND       - True if the Pthreads library was found
+#  PTHREADS_LIBRARY     - The location of the Pthreads library
+#  PTHREADS_INCLUDE_DIR - The include directory of the Pthreads library
+#  PTHREADS_DEFINITIONS - Preprocessor definitions to define (HAVE_PTHREAD_H is a fairly common one)
+#
+# This module responds to the PTHREADS_EXCEPTION_SCHEME
+# variable on Win32 to allow the user to control the
+# library linked against. The Pthreads-win32 port
+# provides the ability to link against a version of the
+# library with exception handling.
+# IT IS NOT RECOMMENDED THAT YOU CHANGE PTHREADS_EXCEPTION_SCHEME
+# TO ANYTHING OTHER THAN "C" because most POSIX thread implementations
+# do not support stack unwinding.
+#
+#  PTHREADS_EXCEPTION_SCHEME
+#       C  = no exceptions (default)
+#           (NOTE: This is the default scheme on most POSIX thread
+#           implementations and what you should probably be using)
+#       CE = C++ Exception Handling
+#       SE = Structure Exception Handling (MSVC only)
+#
+
+#
+# Define a default exception scheme to link against
+# and validate user choice.
+#
+#
+if(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
+  # Assign default if needed
+  set(PTHREADS_EXCEPTION_SCHEME "C")
+else(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
+  # Validate
+  if(NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "C" AND
+    NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "CE" AND
+    NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
+
+    message(FATAL_ERROR "See documentation for FindPthreads.cmake, only C, CE, and SE modes are allowed")
+
+  endif(NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "C" AND
+    NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "CE" AND
+    NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
+
+  if(NOT MSVC AND PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
+    message(FATAL_ERROR "Structured Exception Handling is only allowed for MSVC")
+  endif(NOT MSVC AND PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
+
+endif(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
+
+if(PTHREADS_ROOT)
+  set(PTHREADS_ROOT PATHS ${PTHREADS_ROOT} NO_DEFAULT_PATH)
+else()
+  set(PTHREADS_ROOT $ENV{PTHREADS_ROOT})
+endif(PTHREADS_ROOT)
+
+#
+# Find the header file
+#
+find_path(PTHREADS_INCLUDE_DIR
+  NAMES pthread.h
+  HINTS
+  $ENV{PTHREAD_INCLUDE_PATH}
+  ${PTHREADS_ROOT}/include
+)
+
+if(PTHREADS_INCLUDE_DIR)
+  message(STATUS "Found pthread.h: ${PTHREADS_INCLUDE_DIR}")
+# else()
+# message(FATAL_ERROR "Could not find pthread.h. See README.Win32 for more information.")
+endif(PTHREADS_INCLUDE_DIR)
+
+#
+# Find the library
+#
+set(names)
+if(MSVC)
+  set(names
+      pthreadV${PTHREADS_EXCEPTION_SCHEME}2
+      libpthread
+  )
+elseif(MINGW)
+  set(names
+      pthreadG${PTHREADS_EXCEPTION_SCHEME}2
+      pthread
+  )
+endif(MSVC)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  set(SUBDIR "/x86")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(SUBDIR "/x64")
+endif()
+
+find_library(PTHREADS_LIBRARY NAMES ${names}
+  DOC "The Portable Threads Library"
+  HINTS
+  ${CMAKE_SOURCE_DIR}/lib
+  $ENV{PTHREAD_LIBRARY_PATH}
+  ${PTHREADS_ROOT}
+  C:/MinGW/lib/
+  PATH_SUFFIXES lib/${SUBDIR}
+)
+
+if(PTHREADS_LIBRARY)
+message(STATUS "Found PTHREADS library: ${PTHREADS_LIBRARY} (PTHREADS Exception Scheme: ${PTHREADS_EXCEPTION_SCHEME})")
+# else()
+# message(FATAL_ERROR "Could not find PTHREADS LIBRARY. See README.Win32 for more information.")
+endif(PTHREADS_LIBRARY)
+
+if(PTHREADS_INCLUDE_DIR AND PTHREADS_LIBRARY)
+  set(PTHREADS_DEFINITIONS -DHAVE_PTHREAD_H)
+  set(PTHREADS_INCLUDE_DIRS ${PTHREADS_INCLUDE_DIR})
+  set(PTHREADS_LIBRARIES ${PTHREADS_LIBRARY})
+  set(PTHREADS_FOUND TRUE)
+endif(PTHREADS_INCLUDE_DIR AND PTHREADS_LIBRARY)
+
+mark_as_advanced(PTHREADS_INCLUDE_DIR PTHREADS_LIBRARY)
Index: vendor/libpcap/dist/cmake/Modules/FindSNF.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindSNF.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindSNF.cmake	(revision 333789)
@@ -0,0 +1,24 @@
+#
+# Try to find the Myricom SNF library.
+#
+
+# Try to find the header
+find_path(SNF_INCLUDE_DIR snf.h /opt/snf)
+
+# Try to find the library
+find_library(SNF_LIBRARY snf /opt/snf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SNF
+  DEFAULT_MSG
+  SNF_INCLUDE_DIR
+  SNF_LIBRARY
+)
+
+mark_as_advanced(
+  SNF_INCLUDE_DIR
+  SNF_LIBRARY
+)
+
+set(SNF_INCLUDE_DIRS ${SNF_INCLUDE_DIR})
+set(SNF_LIBRARIES ${SNF_LIBRARY})
Index: vendor/libpcap/dist/cmake/Modules/FindTC.cmake
===================================================================
--- vendor/libpcap/dist/cmake/Modules/FindTC.cmake	(nonexistent)
+++ vendor/libpcap/dist/cmake/Modules/FindTC.cmake	(revision 333789)
@@ -0,0 +1,24 @@
+#
+# Try to find the Riverbed TurboCap library.
+#
+
+# Try to find the header
+find_path(TC_INCLUDE_DIR TcApi.h)
+
+# Try to find the library
+find_library(TC_LIBRARY TcApi)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TC
+  DEFAULT_MSG
+  TC_INCLUDE_DIR
+  TC_LIBRARY
+)
+
+mark_as_advanced(
+  TC_INCLUDE_DIR
+  TC_LIBRARY
+)
+
+set(TC_INCLUDE_DIRS ${TC_INCLUDE_DIR})
+set(TC_LIBRARIES ${TC_LIBRARY})
Index: vendor/libpcap/dist/cmake/have_siocglifconf.c
===================================================================
--- vendor/libpcap/dist/cmake/have_siocglifconf.c	(nonexistent)
+++ vendor/libpcap/dist/cmake/have_siocglifconf.c	(revision 333789)
@@ -0,0 +1,6 @@
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+int main() {
+    ioctl(0, SIOCGLIFCONF, (char *)0);
+}

Property changes on: vendor/libpcap/dist/cmake/have_siocglifconf.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/cmake_uninstall.cmake.in
===================================================================
--- vendor/libpcap/dist/cmake_uninstall.cmake.in	(nonexistent)
+++ vendor/libpcap/dist/cmake_uninstall.cmake.in	(revision 333789)
@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    exec_program(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)

Property changes on: vendor/libpcap/dist/cmake_uninstall.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/cmakeconfig.h.in
===================================================================
--- vendor/libpcap/dist/cmakeconfig.h.in	(revision 333788)
+++ vendor/libpcap/dist/cmakeconfig.h.in	(revision 333789)
@@ -1,345 +1,366 @@
 /* cmakeconfig.h.in */
 
+/* Define to 1 if arpa/inet.h declares `ether_hostton' */
+#cmakedefine ARPA_INET_H_DECLARES_ETHER_HOSTTON 1
+
 /* Enable optimizer debugging */
 #cmakedefine BDEBUG 1
 
-/* define if you have a cloning BPF device */
-#cmakedefine HAVE_CLONING_BPF 1
+/* Define to 1 if remote packet capture is to be supported */
+#cmakedefine ENABLE_REMOTE 1
 
+/* define if we have the AIX getnetbyname_r() */
+#cmakedefine HAVE_AIX_GETNETBYNAME_R 1
+
+/* define if we have the AIX getprotobyname_r() */
+#cmakedefine HAVE_AIX_GETPROTOBYNAME_R 1
+
 /* define if you have the DAG API */
 #cmakedefine HAVE_DAG_API 1
 
 /* define if you have dag_get_erf_types() */
 #cmakedefine HAVE_DAG_GET_ERF_TYPES 1
 
 /* define if you have dag_get_stream_erf_types() */
 #cmakedefine HAVE_DAG_GET_STREAM_ERF_TYPES 1
 
-/* define if you have streams capable DAG API */
-#cmakedefine HAVE_DAG_STREAMS_API 1
+/* define if you have large streams capable DAG API */
+#cmakedefine HAVE_DAG_LARGE_STREAMS_API 1
 
 /* define if you have vdag_set_device_info() */
 #cmakedefine HAVE_DAG_VDAG 1
 
-/* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
-   don't. */
+/* Define to 1 if you have the declaration of `ether_hostton' */
 #cmakedefine HAVE_DECL_ETHER_HOSTTON 1
 
-/* define if you have a /dev/dlpi */
-#cmakedefine HAVE_DEV_DLPI 1
+/* Define to 1 if `dl_module_id_1' is a member of `dl_hp_ppa_info_t'. */
+#cmakedefine HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1 1
 
-/* if passive_req_t primitive exists */
-#cmakedefine HAVE_DLPI_PASSIVE 1
+/* Define to 1 if the system has the type `dl_passive_req_t'. */
+#cmakedefine HAVE_DL_PASSIVE_REQ_T 1
 
 /* Define to 1 if you have the `ether_hostton' function. */
 #cmakedefine HAVE_ETHER_HOSTTON 1
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #cmakedefine HAVE_FSEEKO 1
 
+/* Define to 1 if you have the `getspnam' function. */
+#cmakedefine HAVE_GETSPNAM 1
+
 /* on HP-UX 10.20 or later */
 #cmakedefine HAVE_HPUX10_20_OR_LATER 1
 
 /* on HP-UX 9.x */
 #cmakedefine HAVE_HPUX9 1
 
-/* if ppa_info_t_dl_module_id exists */
-#cmakedefine HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 
 /* if libdlpi exists */
 #cmakedefine HAVE_LIBDLPI 1
 
 /* if libnl exists */
 #cmakedefine HAVE_LIBNL 1
 
 /* if libnl exists and is version 2.x */
 #cmakedefine HAVE_LIBNL_2_x 1
 
 /* if libnl exists and is version 3.x */
 #cmakedefine HAVE_LIBNL_3_x 1
 
 /* libnl has NLE_FAILURE */
 #cmakedefine HAVE_LIBNL_NLE 1
 
 /* libnl has new-style socket api */
 #cmakedefine HAVE_LIBNL_SOCKETS 1
 
 /* Define to 1 if you have the <limits.h> header file. */
 #cmakedefine HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <linux/compiler.h> header file. */
 #cmakedefine HAVE_LINUX_COMPILER_H 1
 
 /* Define to 1 if you have the <linux/ethtool.h> header file. */
 #cmakedefine HAVE_LINUX_ETHTOOL_H 1
 
+/* define if we have the Linux getnetbyname_r() */
+#cmakedefine HAVE_LINUX_GETNETBYNAME_R 1
+
+/* define if we have the Linux getprotobyname_r() */
+#cmakedefine HAVE_LINUX_GETPROTOBYNAME_R 1
+
 /* Define to 1 if you have the <linux/if_bonding.h> header file. */
 #cmakedefine HAVE_LINUX_IF_BONDING_H 1
 
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#cmakedefine HAVE_LINUX_IF_PACKET_H 1
-
 /* Define to 1 if you have the <linux/net_tstamp.h> header file. */
 #cmakedefine HAVE_LINUX_NET_TSTAMP_H 1
 
+/* Define to 1 if you have the <linux/socket.h> header file. */
+#cmakedefine HAVE_LINUX_SOCKET_H 1
+
 /* Define to 1 if you have the <linux/sockios.h> header file. */
 #cmakedefine HAVE_LINUX_SOCKIOS_H 1
 
-/* if tp_vlan_tci exists */
-#cmakedefine HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI 1
-
-/* Define to 1 if you have the <linux/types.h> header file. */
-#cmakedefine HAVE_LINUX_TYPES_H 1
-
 /* Define to 1 if you have the <linux/usbdevice_fs.h> header file. */
 #cmakedefine HAVE_LINUX_USBDEVICE_FS_H 1
 
 /* Define to 1 if you have the <linux/wireless.h> header file. */
 #cmakedefine HAVE_LINUX_WIRELESS_H 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
 
-/* Define to 1 if you have the <netinet/ether.h> header file. */
-#cmakedefine HAVE_NETINET_ETHER_H 1
-
-/* Define to 1 if you have the <netinet/if_ether.h> header file. */
-#cmakedefine HAVE_NETINET_IF_ETHER_H 1
-
-/* Define to 1 if you have the <netpacket/if_packet.h> header file. */
-#cmakedefine HAVE_NETPACKET_IF_PACKET_H 1
-
 /* Define to 1 if you have the <netpacket/packet.h> header file. */
 #cmakedefine HAVE_NETPACKET_PACKET_H 1
 
+/* Define to 1 if you have the <net/bpf.h> header file. */
+#cmakedefine HAVE_NET_BPF_H 1
+
+/* Define to 1 if you have the <net/enet.h> header file. */
+#cmakedefine HAVE_NET_ENET_H 1
+
 /* Define to 1 if you have the <net/if_media.h> header file. */
 #cmakedefine HAVE_NET_IF_MEDIA_H 1
 
+/* Define to 1 if you have the <net/nit.h> header file. */
+#cmakedefine HAVE_NET_NIT_H 1
+
+/* Define to 1 if you have the <net/pfilt.h> header file. */
+#cmakedefine HAVE_NET_PFILT_H 1
+
 /* Define to 1 if you have the <net/pfvar.h> header file. */
 #cmakedefine HAVE_NET_PFVAR_H 1
 
+/* Define to 1 if you have the <net/raw.h> header file. */
+#cmakedefine HAVE_NET_RAW_H 1
+
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 #cmakedefine HAVE_OS_PROTO_H 1
 
-/* Define to 1 if remote packet capture is to be supported */
-#cmakedefine HAVE_REMOTE 1
+/* Define to 1 if Packet32 API (WinPcap NPF driver) is available */
+#cmakedefine HAVE_PACKET32 1
 
-/* Define to 1 if you have the <paths.h> header file. */
-#cmakedefine HAVE_PATHS_H 1
-
 /* define if net/pfvar.h defines PF_NAT through PF_NORDR */
 #cmakedefine HAVE_PF_NAT_THROUGH_PF_NORDR 1
 
 /* define if you have the Septel API */
 #cmakedefine HAVE_SEPTEL_API 1
 
 /* define if you have the Myricom SNF API */
 #cmakedefine HAVE_SNF_API 1
 
 /* Define to 1 if you have the `snprintf' function. */
 #cmakedefine HAVE_SNPRINTF 1
 
-/* if struct sockaddr has the sa_len member */
-#cmakedefine HAVE_SOCKADDR_SA_LEN 1
-
-/* if struct sockaddr_storage exists */
-#cmakedefine HAVE_SOCKADDR_STORAGE 1
-
-/* define if socklen_t is defined */
+/* Define to 1 if the system has the type `socklen_t'. */
 #cmakedefine HAVE_SOCKLEN_T 1
 
 /* On solaris */
 #cmakedefine HAVE_SOLARIS 1
 
+/* define if we have the Solaris/IRIX getnetbyname_r() */
+#cmakedefine HAVE_SOLARIS_IRIX_GETNETBYNAME_R 1
+
+/* define if we have the Solaris/IRIX getprotobyname_r() */
+#cmakedefine HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the `strerror' function. */
 #cmakedefine HAVE_STRERROR 1
 
+/* Define to 1 if you have the `strerror_r' function. */
+#cmakedefine HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the `strerror_s' function. */
+#cmakedefine HAVE_STRERROR_S 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcat' function. */
+#cmakedefine HAVE_STRLCAT 1
+
 /* Define to 1 if you have the `strlcpy' function. */
 #cmakedefine HAVE_STRLCPY 1
 
+/* Define to 1 if you have the `strtok_r' function. */
+#cmakedefine HAVE_STRTOK_R 1
+
 /* Define to 1 if the system has the type `struct BPF_TIMEVAL'. */
 #cmakedefine HAVE_STRUCT_BPF_TIMEVAL 1
 
 /* Define to 1 if the system has the type `struct ether_addr'. */
 #cmakedefine HAVE_STRUCT_ETHER_ADDR 1
 
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#cmakedefine HAVE_SYS_BITYPES_H 1
+/* Define to 1 if `msg_control' is a member of `struct msghdr'. */
+#cmakedefine HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
 
+/* Define to 1 if `msg_flags' is a member of `struct msghdr'. */
+#cmakedefine HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
+
+/* Define to 1 if `hci_channel' is a member of `struct sockaddr_hci'. */
+#cmakedefine HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL 1
+
+/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
+#cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#cmakedefine HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if `tp_vlan_tci' is a member of `struct tpacket_auxdata'. */
+#cmakedefine HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI 1
+
+/* Define to 1 if the system has the type `struct tpacket_stats'. */
+#cmakedefine HAVE_STRUCT_TPACKET_STATS 1
+
+/* Define to 1 if `bRequestType' is a member of `struct
+   usbdevfs_ctrltransfer'. */
+#cmakedefine HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1
+
 /* Define to 1 if you have the <sys/bufmod.h> header file. */
 #cmakedefine HAVE_SYS_BUFMOD_H 1
 
 /* Define to 1 if you have the <sys/dlpi_ext.h> header file. */
 #cmakedefine HAVE_SYS_DLPI_EXT_H 1
 
+/* Define to 1 if you have the <sys/dlpi.h> header file. */
+#cmakedefine HAVE_SYS_DLPI_H 1
+
 /* Define to 1 if you have the <sys/ioccom.h> header file. */
 #cmakedefine HAVE_SYS_IOCCOM_H 1
 
+/* Define to 1 if you have the <sys/net/nit.h> header file. */
+#cmakedefine HAVE_SYS_NET_NIT_H 1
+
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #cmakedefine HAVE_SYS_SOCKIO_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H 1
 
 /* define if you have the TurboCap API */
 #cmakedefine HAVE_TC_API 1
 
-/* if if_packet.h has tpacket_stats defined */
-#cmakedefine HAVE_TPACKET_STATS 1
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 
-/* if struct usbdevfs_ctrltransfer has bRequestType */
-#cmakedefine HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1
-
 /* Define to 1 if you have the `vsnprintf' function. */
 #cmakedefine HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `PacketIsLoopbackAdapter' function. */
 #cmakedefine HAVE_PACKET_IS_LOOPBACK_ADAPTER 1
 
-/* define if the system supports zerocopy BPF */
-#cmakedefine HAVE_ZEROCOPY_BPF 1
-
-/* define if your compiler has __attribute__ */
-#cmakedefine HAVE___ATTRIBUTE__ 1
-
 /* IPv6 */
 #cmakedefine INET6 1
 
 /* if unaligned access fails */
 #cmakedefine LBL_ALIGN 1
 
 /* path for device for USB sniffing */
-#cmakedefine LINUX_USB_MON_DEV 1
+#cmakedefine LINUX_USB_MON_DEV "@LINUX_USB_MON_DEV@"
 
-/* if we need a pcap_parse wrapper around yyparse */
-#cmakedefine NEED_YYPARSE_WRAPPER 1
-
 /* Define to 1 if netinet/ether.h declares `ether_hostton' */
 #cmakedefine NETINET_ETHER_H_DECLARES_ETHER_HOSTTON 1
 
 /* Define to 1 if netinet/if_ether.h declares `ether_hostton' */
 #cmakedefine NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON 1
 
+/* Define to 1 if net/ethernet.h declares `ether_hostton' */
+#cmakedefine NET_ETHERNET_H_DECLARES_ETHER_HOSTTON 1
+
 /* do not use protochain */
 #cmakedefine NO_PROTOCHAIN 1
 
 /* Define to the address where bug reports for this package should be sent. */
 #cmakedefine PACKAGE_BUGREPORT 1
 
+/* Define to the DLL-preferred version string of of this package. */
+#cmakedefine PACKAGE_VERSION_DLL @PACKAGE_VERSION_DLL@
+
 /* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME 1
+#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
 
 /* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING 1
+#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
 
 /* Define to the one symbol short name of this package. */
 #cmakedefine PACKAGE_TARNAME 1
 
 /* Define to the home page for this package. */
 #cmakedefine PACKAGE_URL 1
 
 /* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION 1
+#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 
-/* /dev/dlpi directory */
-#cmakedefine PCAP_DEV_PREFIX 1
-
 /* target host supports Bluetooth sniffing */
 #cmakedefine PCAP_SUPPORT_BT 1
 
 /* target host supports Bluetooth Monitor */
 #cmakedefine PCAP_SUPPORT_BT_MONITOR 1
 
 /* support D-Bus sniffing */
 #cmakedefine PCAP_SUPPORT_DBUS 1
 
 /* target host supports netfilter sniffing */
 #cmakedefine PCAP_SUPPORT_NETFILTER 1
 
-/* use Linux packet ring capture if available */
+/* target host supports netmap */
+#cmakedefine PCAP_SUPPORT_NETMAP 1
+
+/* use packet ring capture support on Linux if available */
 #cmakedefine PCAP_SUPPORT_PACKET_RING 1
 
+/* target host supports RDMA sniffing */
+#cmakedefine PCAP_SUPPORT_RDMASNIFF 1
+
 /* target host supports USB sniffing */
 #cmakedefine PCAP_SUPPORT_USB 1
 
 /* include ACN support */
 #cmakedefine SITA 1
 
-/* if struct sockaddr_hci has hci_channel member */
-#cmakedefine SOCKADDR_HCI_HAS_HCI_CHANNEL 1
-
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS 1
 
+/* Define to 1 if strings.h declares `ffs' */
+#cmakedefine STRINGS_H_DECLARES_FFS 1
+
+/* Define to 1 if sys/ethernet.h declares `ether_hostton' */
+#cmakedefine SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON 1
+
 /* Enable parser debugging */
 #cmakedefine YYDEBUG 1
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #cmakedefine _FILE_OFFSET_BITS 1
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #cmakedefine _LARGEFILE_SOURCE 1
 
 /* Define for large files, on AIX-style hosts. */
 #cmakedefine _LARGE_FILES 1
 
 /* define on AIX to get certain functions */
 #cmakedefine _SUN 1
 
-/* define if your compiler allows __attribute__((format)) without a warning */
-#cmakedefine __ATTRIBUTE___FORMAT_OK 1
-
 #if 0
-/* to handle Ultrix compilers that don't support const in prototypes */
-#cmakedefine const 1
-
-/* Define as token for inline if inlining supported */
-#cmakedefine inline 1
-
-/* Define to `short' if int16_t not defined. */
-#cmakedefine int16_t 1
-
-/* Define to `int' if int32_t not defined. */
-#cmakedefine int32_t 1
-
-/* Define to `long long' if int64_t not defined. */
-#cmakedefine int64_t 1
-
-/* Define to `signed char' if int8_t not defined. */
-#cmakedefine int8_t 1
-
 /* on sinix */
 #cmakedefine sinix 1
-
-/* Define to `unsigned short' if u_int16_t not defined. */
-#cmakedefine u_int16_t 1
-
-/* Define to `unsigned int' if u_int32_t not defined. */
-#cmakedefine u_int32_t 1
-
-/* Define to `unsigned long long' if u_int64_t not defined. */
-#cmakedefine u_int64_t 1
-
-/* Define to `unsigned char' if u_int8_t not defined. */
-#cmakedefine u_int8_t 1
 #endif
Index: vendor/libpcap/dist/config.h.in
===================================================================
--- vendor/libpcap/dist/config.h.in	(revision 333788)
+++ vendor/libpcap/dist/config.h.in	(revision 333789)
@@ -1,347 +1,374 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if arpa/inet.h declares `ether_hostton' */
+#undef ARPA_INET_H_DECLARES_ETHER_HOSTTON
+
 /* Enable optimizer debugging */
 #undef BDEBUG
 
-/* define if you have a cloning BPF device */
-#undef HAVE_CLONING_BPF
+/* Define to 1 if remote packet capture is to be supported */
+#undef ENABLE_REMOTE
 
+/* define if we have the AIX getnetbyname_r() */
+#undef HAVE_AIX_GETNETBYNAME_R
+
+/* define if we have the AIX getprotobyname_r() */
+#undef HAVE_AIX_GETPROTOBYNAME_R
+
+/* Define to 1 if you have the <dagapi.h> header file. */
+#undef HAVE_DAGAPI_H
+
 /* 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 dag_get_stream_erf_types() */
 #undef HAVE_DAG_GET_STREAM_ERF_TYPES
 
-/* define if you have streams capable DAG API */
-#undef HAVE_DAG_STREAMS_API
+/* define if you have large streams capable DAG API */
+#undef HAVE_DAG_LARGE_STREAMS_API
 
 /* define if you have vdag_set_device_info() */
 #undef HAVE_DAG_VDAG
 
-/* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
-   don't. */
+/* Define to 1 if you have the declaration of `ether_hostton' */
 #undef HAVE_DECL_ETHER_HOSTTON
 
-/* define if you have a /dev/dlpi */
-#undef HAVE_DEV_DLPI
+/* Define to 1 if `dl_module_id_1' is a member of `dl_hp_ppa_info_t'. */
+#undef HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1
 
-/* if passive_req_t primitive exists */
-#undef HAVE_DLPI_PASSIVE
+/* Define to 1 if the system has the type `dl_passive_req_t'. */
+#undef HAVE_DL_PASSIVE_REQ_T
 
 /* Define to 1 if you have the `ether_hostton' function. */
 #undef HAVE_ETHER_HOSTTON
 
+/* Define to 1 if you have the `ffs' function. */
+#undef HAVE_FFS
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define to 1 if you have the `getspnam' function. */
+#undef HAVE_GETSPNAM
+
 /* on HP-UX 10.20 or later */
 #undef HAVE_HPUX10_20_OR_LATER
 
 /* on HP-UX 9.x */
 #undef HAVE_HPUX9
 
-/* if ppa_info_t_dl_module_id exists */
-#undef HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `dag' library (-ldag). */
+#undef HAVE_LIBDAG
+
 /* if libdlpi exists */
 #undef HAVE_LIBDLPI
 
 /* if libnl exists */
 #undef HAVE_LIBNL
 
 /* if libnl exists and is version 2.x */
 #undef HAVE_LIBNL_2_x
 
 /* if libnl exists and is version 3.x */
 #undef HAVE_LIBNL_3_x
 
 /* libnl has NLE_FAILURE */
 #undef HAVE_LIBNL_NLE
 
 /* libnl has new-style socket api */
 #undef HAVE_LIBNL_SOCKETS
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
 /* Define to 1 if you have the <linux/compiler.h> header file. */
 #undef HAVE_LINUX_COMPILER_H
 
 /* Define to 1 if you have the <linux/ethtool.h> header file. */
 #undef HAVE_LINUX_ETHTOOL_H
 
+/* define if we have the Linux getnetbyname_r() */
+#undef HAVE_LINUX_GETNETBYNAME_R
+
+/* define if we have the Linux getprotobyname_r() */
+#undef HAVE_LINUX_GETPROTOBYNAME_R
+
 /* Define to 1 if you have the <linux/if_bonding.h> header file. */
 #undef HAVE_LINUX_IF_BONDING_H
 
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#undef HAVE_LINUX_IF_PACKET_H
-
 /* Define to 1 if you have the <linux/net_tstamp.h> header file. */
 #undef HAVE_LINUX_NET_TSTAMP_H
 
+/* Define to 1 if you have the <linux/socket.h> header file. */
+#undef HAVE_LINUX_SOCKET_H
+
 /* Define to 1 if you have the <linux/sockios.h> header file. */
 #undef HAVE_LINUX_SOCKIOS_H
 
-/* if tp_vlan_tci exists */
-#undef HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI
-
-/* Define to 1 if you have the <linux/types.h> header file. */
-#undef HAVE_LINUX_TYPES_H
-
 /* Define to 1 if you have the <linux/usbdevice_fs.h> header file. */
 #undef HAVE_LINUX_USBDEVICE_FS_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
 
-/* Define to 1 if you have the <netinet/ether.h> header file. */
-#undef HAVE_NETINET_ETHER_H
-
-/* 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 <netpacket/if_packet.h> header file. */
-#undef HAVE_NETPACKET_IF_PACKET_H
-
 /* Define to 1 if you have the <netpacket/packet.h> header file. */
 #undef HAVE_NETPACKET_PACKET_H
 
+/* Define to 1 if you have the <net/bpf.h> header file. */
+#undef HAVE_NET_BPF_H
+
+/* Define to 1 if you have the <net/enet.h> header file. */
+#undef HAVE_NET_ENET_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/nit.h> header file. */
+#undef HAVE_NET_NIT_H
+
+/* Define to 1 if you have the <net/pfilt.h> header file. */
+#undef HAVE_NET_PFILT_H
+
 /* Define to 1 if you have the <net/pfvar.h> header file. */
 #undef HAVE_NET_PFVAR_H
 
+/* Define to 1 if you have the <net/raw.h> header file. */
+#undef HAVE_NET_RAW_H
+
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 #undef HAVE_OS_PROTO_H
 
 /* define if net/pfvar.h defines PF_NAT through PF_NORDR */
 #undef HAVE_PF_NAT_THROUGH_PF_NORDR
 
 /* define if you have the Septel API */
 #undef HAVE_SEPTEL_API
 
 /* define if you have the Myricom SNF API */
 #undef HAVE_SNF_API
 
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
-/* if struct sockaddr has the sa_len member */
-#undef HAVE_SOCKADDR_SA_LEN
-
-/* if struct sockaddr_storage exists */
-#undef HAVE_SOCKADDR_STORAGE
-
-/* define if socklen_t is defined */
+/* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T
 
 /* On solaris */
 #undef HAVE_SOLARIS
 
+/* define if we have the Solaris/IRIX getnetbyname_r() */
+#undef HAVE_SOLARIS_IRIX_GETNETBYNAME_R
+
+/* define if we have the Solaris/IRIX getprotobyname_r() */
+#undef HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
+/* Define to 1 if you have the `strerror_r' function. */
+#undef HAVE_STRERROR_R
+
+/* Define to 1 if you have the `strerror_s' function. */
+#undef HAVE_STRERROR_S
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
 /* Define to 1 if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 
 /* Define to 1 if the system has the type `struct BPF_TIMEVAL'. */
 #undef HAVE_STRUCT_BPF_TIMEVAL
 
 /* Define to 1 if the system has the type `struct ether_addr'. */
 #undef HAVE_STRUCT_ETHER_ADDR
 
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
+/* Define to 1 if `msg_control' is a member of `struct msghdr'. */
+#undef HAVE_STRUCT_MSGHDR_MSG_CONTROL
 
+/* Define to 1 if `msg_flags' is a member of `struct msghdr'. */
+#undef HAVE_STRUCT_MSGHDR_MSG_FLAGS
+
+/* Define to 1 if `hci_channel' is a member of `struct sockaddr_hci'. */
+#undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
+
+/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
+/* Define to 1 if `tp_vlan_tci' is a member of `struct tpacket_auxdata'. */
+#undef HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI
+
+/* Define to 1 if the system has the type `struct tpacket_stats'. */
+#undef HAVE_STRUCT_TPACKET_STATS
+
+/* Define to 1 if `bRequestType' is a member of `struct
+   usbdevfs_ctrltransfer'. */
+#undef HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE
+
 /* Define to 1 if you have the <sys/bufmod.h> header file. */
 #undef HAVE_SYS_BUFMOD_H
 
 /* Define to 1 if you have the <sys/dlpi_ext.h> header file. */
 #undef HAVE_SYS_DLPI_EXT_H
 
+/* Define to 1 if you have the <sys/dlpi.h> header file. */
+#undef HAVE_SYS_DLPI_H
+
 /* Define to 1 if you have the <sys/ioccom.h> header file. */
 #undef HAVE_SYS_IOCCOM_H
 
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
+/* Define to 1 if you have the <sys/net/nit.h> header file. */
+#undef HAVE_SYS_NET_NIT_H
 
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
 /* define if you have the TurboCap API */
 #undef HAVE_TC_API
 
-/* if if_packet.h has tpacket_stats defined */
-#undef HAVE_TPACKET_STATS
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* if struct usbdevfs_ctrltransfer has bRequestType */
-#undef HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE
-
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* define if the system supports zerocopy BPF */
-#undef HAVE_ZEROCOPY_BPF
-
-/* define if your compiler has __attribute__ */
-#undef HAVE___ATTRIBUTE__
-
 /* IPv6 */
 #undef INET6
 
 /* if unaligned access fails */
 #undef LBL_ALIGN
 
 /* path for device for USB sniffing */
 #undef LINUX_USB_MON_DEV
 
 /* Define to 1 if netinet/ether.h declares `ether_hostton' */
 #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON
 
 /* Define to 1 if netinet/if_ether.h declares `ether_hostton' */
 #undef NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON
 
+/* Define to 1 if net/ethernet.h declares `ether_hostton' */
+#undef NET_ETHERNET_H_DECLARES_ETHER_HOSTTON
+
 /* do not use protochain */
 #undef NO_PROTOCHAIN
 
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
 /* Define to the full name of this package. */
 #undef PACKAGE_NAME
 
 /* Define to the full name and version of this package. */
 #undef PACKAGE_STRING
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the home page for this package. */
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* /dev/dlpi directory */
-#undef PCAP_DEV_PREFIX
-
 /* target host supports Bluetooth sniffing */
 #undef PCAP_SUPPORT_BT
 
 /* target host supports Bluetooth Monitor */
 #undef PCAP_SUPPORT_BT_MONITOR
 
 /* support D-Bus sniffing */
 #undef PCAP_SUPPORT_DBUS
 
 /* target host supports netfilter sniffing */
 #undef PCAP_SUPPORT_NETFILTER
 
-/* use Linux packet ring capture if available */
+/* target host supports netmap */
+#undef PCAP_SUPPORT_NETMAP
+
+/* use packet ring capture support on Linux if available */
 #undef PCAP_SUPPORT_PACKET_RING
 
+/* target host supports RDMA sniffing */
+#undef PCAP_SUPPORT_RDMASNIFF
+
 /* target host supports USB sniffing */
 #undef PCAP_SUPPORT_USB
 
 /* include ACN support */
 #undef SITA
 
-/* if struct sockaddr_hci has hci_channel member */
-#undef SOCKADDR_HCI_HAS_HCI_CHANNEL
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to 1 if strings.h declares `ffs' */
+#undef STRINGS_H_DECLARES_FFS
+
+/* Define to 1 if sys/ethernet.h declares `ether_hostton' */
+#undef SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON
+
 /* Enable parser debugging */
 #undef YYDEBUG
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
 #undef YYTEXT_POINTER
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
 /* define on AIX to get certain functions */
 #undef _SUN
 
-/* define if your compiler allows __attribute__((format)) without a warning */
-#undef __ATTRIBUTE___FORMAT_OK
-
 /* to handle Ultrix compilers that don't support const in prototypes */
 #undef const
 
 /* Define as token for inline if inlining supported */
 #undef inline
 
-/* Define to `short' if int16_t not defined. */
-#undef int16_t
-
-/* Define to `int' if int32_t not defined. */
-#undef int32_t
-
-/* Define to `long long' if int64_t not defined. */
-#undef int64_t
-
-/* Define to `signed char' if int8_t not defined. */
-#undef int8_t
-
 /* on sinix */
 #undef sinix
-
-/* Define to `unsigned short' if u_int16_t not defined. */
-#undef u_int16_t
-
-/* Define to `unsigned int' if u_int32_t not defined. */
-#undef u_int32_t
-
-/* Define to `unsigned long long' if u_int64_t not defined. */
-#undef u_int64_t
-
-/* Define to `unsigned char' if u_int8_t not defined. */
-#undef u_int8_t
Index: vendor/libpcap/dist/configure
===================================================================
--- vendor/libpcap/dist/configure	(revision 333788)
+++ vendor/libpcap/dist/configure	(revision 333789)
@@ -1,10359 +1,11376 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for pcap 1.9.0-PRE-GIT.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 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 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=:
   # Pre-4.2 versions of Zsh do 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_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 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.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 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
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     _as_can_reexec=no; export _as_can_reexec;
     # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do 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_required="as_fn_return () { (exit \$1); }
 as_fn_success () { as_fn_return 0; }
 as_fn_failure () { as_fn_return 1; }
 as_fn_ret_success () { return 0; }
 as_fn_ret_failure () { return 1; }
 
 exitcode=0
 as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
 else
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
   as_have_required=no
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
 	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
 		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
 	   done;;
        esac
   as_found=false
 done
 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
 fi; }
 IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno; then :
   $as_echo "$0: This script requires a shell more modern than all"
   $as_echo "$0: the shells that I found on your system."
   if test x${ZSH_VERSION+set} = xset ; then
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 # Unset more variables known to interfere with behavior of common tools.
 CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 
 ## --------------------- ##
 ## M4sh Shell Functions. ##
 ## --------------------- ##
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 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
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # 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
 
 
   as_lineno_1=$LINENO as_lineno_1a=$LINENO
   as_lineno_2=$LINENO as_lineno_2a=$LINENO
   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
   ' <$as_myself |
     sed '
       s/[$]LINENO.*/&-/
       t lineno
       b
       :lineno
       N
       :loop
       s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
   # in an infinite loop.  This has already happened in practice.
   _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
   . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='pcap'
+PACKAGE_TARNAME='pcap'
+PACKAGE_VERSION='1.9.0-PRE-GIT'
+PACKAGE_STRING='pcap 1.9.0-PRE-GIT'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="pcap.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
 #ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
 # ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
 #ifdef HAVE_STRING_H
 # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
 ac_subst_vars='LTLIBOBJS
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-PCAP_SUPPORT_PACKET_RING
+RDMA_SRC
+PCAP_SUPPORT_RDMASNIFF
 DBUS_SRC
 PCAP_SUPPORT_DBUS
 PKGCONFIG
 BT_MONITOR_SRC
 BT_SRC
 PCAP_SUPPORT_BT
+NETMAP_SRC
+PCAP_SUPPORT_NETMAP
 NETFILTER_SRC
 PCAP_SUPPORT_NETFILTER
 USB_SRC
 PCAP_SUPPORT_USB
+EXTRA_NETWORK_LIBS
+RPCAPD_LIBS
+INSTALL_RPCAPD
+BUILD_RPCAPD
+PTHREAD_LIBS
+MAN_ADMIN_COMMANDS
 MAN_MISC_INFO
 MAN_FILE_FORMATS
 DYEXT
 SSRC
 ADDLARCHIVEOBJS
 ADDLOBJS
 V_YACC
 V_RPATH_OPT
 V_SONAME_OPT
 V_SHLIB_OPT
 V_SHLIB_CMD
+V_SHLIB_CCOPT
 V_PCAP
 V_LEX
 V_INCLS
 V_FINDALLDEVS
 V_DEFS
 V_CCOPT
 MKDEP
 DEPENDENCY_CFLAG
 LN_S
 AR
 RANLIB
 YFLAGS
 YACC
 LEXLIB
 LEX_OUTPUT_ROOT
 LEX
-HAVE_LINUX_TPACKET_AUXDATA
-VALGRINDTEST
+PCAP_SUPPORT_PACKET_RING
+VALGRINDTEST_SRC
 LIBOBJS
 EGREP
 GREP
 CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
 CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
 SHLICC2
 target_os
 target_vendor
 target_cpu
 target
 host_os
 host_vendor
 host_cpu
 host
 build_os
 build_vendor
 build_cpu
 build
 target_alias
 host_alias
 build_alias
 LIBS
 ECHO_T
 ECHO_N
 ECHO_C
 DEFS
 mandir
 localedir
 libdir
 psdir
 pdfdir
 dvidir
 htmldir
 infodir
 docdir
 oldincludedir
 includedir
 localstatedir
 sharedstatedir
 sysconfdir
 datadir
 datarootdir
 libexecdir
 sbindir
 bindir
 program_transform_name
 prefix
 exec_prefix
 PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_gcc
 enable_largefile
 enable_protochain
 with_sita
 with_pcap
 with_libnl
+enable_packet_ring
 enable_ipv6
-enable_optimizer_dbg
-enable_yydebug
 with_dag
 with_dag_includes
 with_dag_libraries
 with_septel
 with_snf
 with_snf_includes
 with_snf_libraries
 with_turbocap
+enable_remote
+enable_optimizer_dbg
+enable_yydebug
 enable_universal
 enable_shared
 enable_usb
+enable_netmap
 enable_bluetooth
 enable_dbus
-enable_packet_ring
+enable_rdma
 '
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
 CPP
 YACC
 YFLAGS'
 
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
 ac_unrecognized_opts=
 ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
 exec_prefix=NONE
 no_create=
 no_recursion=
 prefix=NONE
 program_prefix=NONE
 program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
 verbose=
 x_includes=NONE
 x_libraries=NONE
 
 # Installation directory options.
 # These are left unexpanded so users can "make install exec_prefix=/foo"
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
 # (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
 datarootdir='${prefix}/share'
 datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
 pdfdir='${docdir}'
 psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
 
 ac_prev=
 ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
   case $ac_option in
   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
   *=)   ac_optarg= ;;
   *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
     bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
     ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
     build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
     cache_file=$ac_optarg ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
   -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
   | --dataroo | --dataro | --datar)
     ac_prev=datarootdir ;;
   -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
   | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
   -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
     docdir=$ac_optarg ;;
 
   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
     ac_prev=dvidir ;;
   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   | --exec | --exe | --ex)
     ac_prev=exec_prefix ;;
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
     exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
   -help | --help | --hel | --he | -h)
     ac_init_help=long ;;
   -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
     ac_init_help=recursive ;;
   -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
     ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
   -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
     ac_prev=htmldir ;;
   -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
   | --ht=*)
     htmldir=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
     includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
     infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
     libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
   -localedir | --localedir | --localedi | --localed | --locale)
     ac_prev=localedir ;;
   -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
     localedir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
     mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c | -n)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
     no_recursion=yes ;;
 
   -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
   | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
   | --oldin | --oldi | --old | --ol | --o)
     ac_prev=oldincludedir ;;
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
     oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
     prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
     program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
     program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
   | --program-transform-n | --program-transform- \
   | --program-transform | --program-transfor \
   | --program-transfo | --program-transf \
   | --program-trans | --program-tran \
   | --progr-tra | --program-tr | --program-t)
     ac_prev=program_transform_name ;;
   -program-transform-name=* | --program-transform-name=* \
   | --program-transform-nam=* | --program-transform-na=* \
   | --program-transform-n=* | --program-transform-=* \
   | --program-transform=* | --program-transfor=* \
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
   -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
     ac_prev=pdfdir ;;
   -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
     pdfdir=$ac_optarg ;;
 
   -psdir | --psdir | --psdi | --psd | --ps)
     ac_prev=psdir ;;
   -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
     psdir=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
     sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
   | --sharedst | --shareds | --shared | --share | --shar \
   | --sha | --sh)
     ac_prev=sharedstatedir ;;
   -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
     sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
     site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
     sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
     ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
     target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers | -V)
     ac_init_version=: ;;
 
   -with-* | --with-*)
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
     with_x=yes ;;
 
   -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
   | --x-incl | --x-inc | --x-in | --x-i)
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
     x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
   -*) as_fn_error $? "unrecognized option: \`$ac_option'
 Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
   case $ac_val in
     */ )
       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
       eval $ac_var=\$ac_val;;
   esac
   # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
 host=$host_alias
 target=$target_alias
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
 fi
 
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
 
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
   as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
   ac_confdir=`$as_dirname -- "$as_myself" ||
 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
   srcdir=$ac_confdir
   if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
   srcdir=.
 fi
 # Remove unnecessary trailing slashes from srcdir.
 # Double slashes in file names in object file debugging info
 # mess up M-x gdb in Emacs.
 case $srcdir in
 */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 esac
 for ac_var in $ac_precious_vars; do
   eval ac_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_env_${ac_var}_value=\$${ac_var}
   eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_cv_env_${ac_var}_value=\$${ac_var}
 done
 
 #
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures pcap 1.9.0-PRE-GIT to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
   -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
 Fine tuning of the installation directories:
   --bindir=DIR            user executables [EPREFIX/bin]
   --sbindir=DIR           system admin executables [EPREFIX/sbin]
   --libexecdir=DIR        program executables [EPREFIX/libexec]
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/pcap]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
   --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
 
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
   --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of pcap 1.9.0-PRE-GIT:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-largefile     omit support for large files
   --disable-protochain    disable \"protochain\" insn
-  --enable-ipv6           build IPv6-capable version [default=yes, if
-                          getaddrinfo available]
+  --enable-packet-ring    enable packet ring support on Linux [default=yes]
+  --enable-ipv6           build IPv6-capable version [default=yes]
+  --enable-remote         enable remote packet capture [default=no]
+  --disable-remote        disable remote packet capture
   --enable-optimizer-dbg  build optimizer debugging code
   --enable-yydebug        build parser debugging code
-  --disable-universal     don't build universal on OS X
+  --disable-universal     don't build universal on macOS
   --enable-shared         build shared libraries [default=yes, if support
                           available]
-  --enable-usb            enable nusb support [default=yes, if support
+  --enable-usb            enable USB capture support [default=yes, if support
                           available]
+  --enable-netmap         enable netmap support [default=yes, if support
+                          available]
   --enable-bluetooth      enable Bluetooth support [default=yes, if support
                           available]
   --enable-dbus           enable D-Bus capture support [default=yes, if
                           support available]
-  --enable-packet-ring    enable Linux packet ring support [default=yes]
+  --enable-rdma           enable RDMA capture support [default=yes, if support
+                          available]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --without-gcc           don't use gcc
   --with-sita             include SITA support
   --with-pcap=TYPE        use packet capture TYPE
   --without-libnl         disable libnl support [default=yes, on Linux, if
                           present]
   --with-dag[=DIR]        include Endace DAG support (located in directory
                           DIR, if supplied). [default=yes, if present]
   --with-dag-includes=IDIR
                           Endace DAG include directory, if not DIR/include
   --with-dag-libraries=LDIR
                           Endace DAG library directory, if not DIR/lib
   --with-septel[=DIR]     include Septel support (located in directory DIR, if
                           supplied). [default=yes, if present]
   --with-snf[=DIR]        include Myricom SNF support (located in directory
                           DIR, if supplied). [default=yes, if present]
   --with-snf-includes=IDIR
                           Myricom SNF include directory, if not DIR/include
   --with-snf-libraries=LDIR
                           Myricom SNF library directory, if not DIR/lib
   --with-turbocap[=DIR]   include Riverbed TurboCap support (located in
                           directory DIR, if supplied). [default=yes, if
                           present]
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   YACC        The `Yet Another Compiler Compiler' implementation to use.
               Defaults to the first program found out of: `bison -y', `byacc',
               `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
     test -d "$ac_dir" ||
       { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
       continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
   esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
 # for backward compatibility:
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
   .)  # We are building in place.
     ac_srcdir=.
     ac_top_srcdir=$ac_top_builddir_sub
     ac_abs_top_srcdir=$ac_pwd ;;
   [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_top_srcdir=$srcdir
     ac_abs_top_srcdir=$srcdir ;;
   *) # Relative name.
     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_build_prefix$srcdir
     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
     # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
     elif test -f "$ac_srcdir/configure"; then
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
       $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+pcap configure 1.9.0-PRE-GIT
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
 
 ## ------------------------ ##
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_cpp ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if { { ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
 # the include files in INCLUDES and setting the cache variable VAR
 # accordingly.
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 $as_echo_n "checking $2 usability... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 $as_echo_n "checking $2 presence... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
   yes:no: )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
   no:yes:* )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
 # that executables *can* be run.
 ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then :
   ac_retval=0
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
        $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
 # INCLUDES, setting the cache variable VAR accordingly.
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $2 (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char $2 ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined __stub_$2 || defined __stub___$2
 choke me
 #endif
 
 int
 main ()
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
 # accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
   (void) $as_decl_use;
 #else
   (void) $as_decl_name;
 #endif
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by pcap $as_me 1.9.0-PRE-GIT, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
 exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
 hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
 uname -s = `(uname -s) 2>/dev/null || echo unknown`
 uname -v = `(uname -v) 2>/dev/null || echo unknown`
 
 /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
 /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 /usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
 _ASUNAME
 
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
 } >&5
 
 cat >&5 <<_ACEOF
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
 _ACEOF
 
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
 # Strip out --silent because we don't want to record it for future runs.
 # Also quote any args containing shell meta-characters.
 # Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
   for ac_arg
   do
     case $ac_arg in
     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
       as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
 	case $ac_arg in
 	  *=* | --config-cache | -C | -disable-* | --disable-* \
 	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
 	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
 	  | -with-* | --with-* | -without-* | --without-* | --x)
 	    case "$ac_configure_args0 " in
 	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
 	    esac
 	    ;;
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
       as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
     $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
   for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
   (set) 2>&1 |
     case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       sed -n \
 	"s/'\''/'\''\\\\'\'''\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
       ;; #(
     *)
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
     echo
 
     $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=\$$ac_var
       case $ac_val in
       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
       $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
 	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
       $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       $as_echo "$as_me: caught signal $ac_signal"
     $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
 $as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_URL "$PACKAGE_URL"
 _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
   # We do not want a PATH search for config.site.
   case $CONFIG_SITE in #((
     -*)  ac_site_file1=./$CONFIG_SITE;;
     */*) ac_site_file1=$CONFIG_SITE;;
     *)   ac_site_file1=./$CONFIG_SITE;;
   esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
 else
   ac_site_file1=$ac_default_prefix/share/config.site
   ac_site_file2=$ac_default_prefix/etc/config.site
 fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
   if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
 for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val=\$ac_cv_env_${ac_var}_value
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
     *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
 ## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
   elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
   elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
 # and are intended to be withdrawn in a future Autoconf release.
 # They can cause serious problems if a builder's source tree is in a directory
 # whose full name contains unusual characters.
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
 if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_build
 shift
 build_cpu=$1
 build_vendor=$2
 shift; shift
 # Remember, the first character of IFS is used to create $*,
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
 if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_host
 shift
 host_cpu=$1
 host_vendor=$2
 shift; shift
 # Remember, the first character of IFS is used to create $*,
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
 if ${ac_cv_target+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_target
 shift
 target_cpu=$1
 target_vendor=$2
 shift; shift
 # Remember, the first character of IFS is used to create $*,
 # except with old shells:
 target_os=$*
 IFS=$ac_save_IFS
 case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
 
 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.
 test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
 
 
 
 
 
 
 
 # Check whether --with-gcc was given.
 if test "${with_gcc+set}" = set; then :
   withval=$with_gcc;
 fi
 
     V_CCOPT=""
     if test "${srcdir}" != "." ; then
 	    V_CCOPT="-I\$(srcdir)"
     fi
     if test "${CFLAGS+set}" = set; then
 	    LBL_CFLAGS="$CFLAGS"
     fi
     if test -z "$CC" ; then
 	    case "$host_os" in
 
 	    bsdi*)
 		    # Extract the first word of "shlicc2", so it can be a program name with args.
 set dummy shlicc2; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_SHLICC2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$SHLICC2"; then
   ac_cv_prog_SHLICC2="$SHLICC2" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_SHLICC2="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_SHLICC2" && ac_cv_prog_SHLICC2="no"
 fi
 fi
 SHLICC2=$ac_cv_prog_SHLICC2
 if test -n "$SHLICC2"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLICC2" >&5
 $as_echo "$SHLICC2" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 		    if test $SHLICC2 = yes ; then
 			    CC=shlicc2
 			    export CC
 		    fi
 		    ;;
 	    esac
     fi
     if test -z "$CC" -a "$with_gcc" = no ; then
 	    CC=cc
 	    export CC
     fi
 
+#
+# Try to enable as many C99 features as we can.
+# At minimum, we want C++/C99-style // comments.
+#
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
   if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
     ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
   for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_CC" && break
 done
 
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 fi
 
 fi
 
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     sed '10a\
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
 if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
 for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
 	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
 	# safe: cross compilers may not add the suffix if given an `-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
   ac_file=''
 fi
 if test -z "$ac_file"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
 main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 #ifndef __GNUC__
        choke me
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
 if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
     CFLAGS="-O2"
   else
     CFLAGS=
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
 struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
      char **p;
      int i;
 {
   return p[i];
 }
 static char *f (char * (*g) (char **, int), char **p, ...)
 {
   char *s;
   va_list v;
   va_start (v,p);
   s = g (p, va_arg (v,int));
   va_end (v);
   return s;
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
    as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
    that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
    inside strings and character constants.  */
 #define FOO(x) 'x'
 int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 int argc;
 char **argv;
 int
 main ()
 {
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
   return 0;
 }
 _ACEOF
 for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c89" != xno; then :
 
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
 
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
 
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
 
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
 
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
 
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+
+
+
+
+
     if test "$GCC" = yes ; then
 	    #
 	    # -Werror forces warnings to be errors.
 	    #
 	    ac_lbl_cc_force_warning_errors=-Werror
 
 	    #
 	    # Try to have the compiler default to hiding symbols,
 	    # so that only symbols explicitly exported with
 	    # PCAP_API will be visible outside (shared) libraries.
 	    #
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -fvisibility=hidden option" >&5
 $as_echo_n "checking whether the compiler supports the -fvisibility=hidden option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-fvisibility=hidden" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -fvisibility=hidden"
 	elif expr "x-fvisibility=hidden" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
 	elif expr "x-fvisibility=hidden" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
 	else
 	    CFLAGS="$CFLAGS -fvisibility=hidden"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -fvisibility=hidden"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     else
 	    V_INCLS="$V_INCLS -I/usr/local/include"
 	    LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 	    case "$host_os" in
 
 	    darwin*)
 		    #
 		    # This is assumed either to be GCC or clang, both
 		    # of which use -Werror to force warnings to be errors.
 		    #
 		    ac_lbl_cc_force_warning_errors=-Werror
 
 		    #
 		    # Try to have the compiler default to hiding symbols,
 		    # so that only symbols explicitly exported with
 		    # PCAP_API will be visible outside (shared) libraries.
 		    #
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -fvisibility=hidden option" >&5
 $as_echo_n "checking whether the compiler supports the -fvisibility=hidden option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-fvisibility=hidden" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -fvisibility=hidden"
 	elif expr "x-fvisibility=hidden" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
 	elif expr "x-fvisibility=hidden" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
 	else
 	    CFLAGS="$CFLAGS -fvisibility=hidden"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -fvisibility=hidden"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 		    ;;
 
 	    hpux*)
 		    #
 		    # HP C, which is what we presume we're using, doesn't
 		    # exit with a non-zero exit status if we hand it an
 		    # invalid -W flag, can't be forced to do so even with
 		    # +We, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    ;;
 
 	    irix*)
 		    #
 		    # MIPS C, which is what we presume we're using, doesn't
 		    # necessarily exit with a non-zero exit status if we
 		    # hand it an invalid -W flag, can't be forced to do
 		    # so, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    #
 		    # It also, apparently, defaults to "char" being
 		    # unsigned, unlike most other C implementations;
 		    # I suppose we could say "signed char" whenever
 		    # we want to guarantee a signed "char", but let's
 		    # just force signed chars.
 		    #
 		    # -xansi is normally the default, but the
 		    # configure script was setting it; perhaps -cckr
 		    # was the default in the Old Days.  (Then again,
 		    # that would probably be for backwards compatibility
 		    # in the days when ANSI C was Shiny and New, i.e.
 		    # 1989 and the early '90's, so maybe we can just
 		    # drop support for those compilers.)
 		    #
 		    # -g is equivalent to -g2, which turns off
 		    # optimization; we choose -g3, which generates
 		    # debugging information but doesn't turn off
 		    # optimization (even if the optimization would
 		    # cause inaccuracies in debugging).
 		    #
 		    V_CCOPT="$V_CCOPT -xansi -signed -g3"
 		    ;;
 
 	    osf*)
 		    #
 		    # Presumed to be DEC OSF/1, Digital UNIX, or
 		    # Tru64 UNIX.
 		    #
 		    # The DEC C compiler, which is what we presume we're
 		    # using, doesn't exit with a non-zero exit status if we
 		    # hand it an invalid -W flag, can't be forced to do
 		    # so, and doesn't handle GCC-style -W flags, so we
 		    # don't want to try using GCC-style -W flags.
 		    #
 		    ac_lbl_cc_dont_try_gcc_dashW=yes
 		    #
 		    # -g is equivalent to -g2, which turns off
 		    # optimization; we choose -g3, which generates
 		    # debugging information but doesn't turn off
 		    # optimization (even if the optimization would
 		    # cause inaccuracies in debugging).
 		    #
 		    V_CCOPT="$V_CCOPT -g3"
 		    ;;
 
 	    solaris*)
 		    #
 		    # Assumed to be Sun C, which requires -errwarn to force
 		    # warnings to be treated as errors.
 		    #
 		    ac_lbl_cc_force_warning_errors=-errwarn
 
 		    #
 		    # Try to have the compiler default to hiding symbols,
 		    # so that only symbols explicitly exported with
 		    # PCAP_API will be visible outside (shared) libraries.
 		    #
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -xldscope=hidden option" >&5
 $as_echo_n "checking whether the compiler supports the -xldscope=hidden option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-xldscope=hidden" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -xldscope=hidden"
 	elif expr "x-xldscope=hidden" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -xldscope=hidden"
 	elif expr "x-xldscope=hidden" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -xldscope=hidden"
 	else
 	    CFLAGS="$CFLAGS -xldscope=hidden"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -xldscope=hidden"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 		    ;;
 
 	    ultrix*)
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking that Ultrix $CC hacks const in prototypes" >&5
 $as_echo_n "checking that Ultrix $CC hacks const in prototypes... " >&6; }
 		    if ${ac_cv_lbl_cc_const_proto+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
 main ()
 {
 struct a { int b; };
 			    void c(const struct a *)
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_lbl_cc_const_proto=yes
 else
   ac_cv_lbl_cc_const_proto=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_cc_const_proto" >&5
 $as_echo "$ac_cv_lbl_cc_const_proto" >&6; }
 		    if test $ac_cv_lbl_cc_const_proto = no ; then
 
 $as_echo "#define const /**/" >>confdefs.h
 
 		    fi
 		    ;;
 	    esac
 	    V_CCOPT="$V_CCOPT -O"
     fi
 
 
     if test "$GCC" = yes ; then
 	    #
 	    # On platforms where we build a shared library:
 	    #
 	    #	add options to generate position-independent code,
-	    #	if necessary (it's the default in AIX and Darwin/OS X);
+	    #	if necessary (it's the default in AIX and Darwin/macOS);
 	    #
 	    #	define option to set the soname of the shared library,
 	    #	if the OS supports that;
 	    #
 	    #	add options to specify, at link time, a directory to
 	    #	add to the run-time search path, if that's necessary.
 	    #
 	    V_SHLIB_CMD="\$(CC)"
 	    V_SHLIB_OPT="-shared"
 	    case "$host_os" in
 
 	    aix*)
 		    ;;
 
 	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
 	    	    #
 		    # Platforms where the linker is the GNU linker
 		    # or accepts command-line arguments like
 		    # those the GNU linker accepts.
 		    #
 		    # Some instruction sets require -fPIC on some
 		    # operating systems.  Check for them.  If you
 		    # have a combination that requires it, add it
 		    # here.
 		    #
 		    PIC_OPT=-fpic
 		    case "$host_cpu" in
 
 		    sparc64*)
 			case "$host_os" in
 
 			freebsd*|openbsd*)
 			    PIC_OPT=-fPIC
 			    ;;
 			esac
 			;;
 		    esac
-		    V_CCOPT="$V_CCOPT $PIC_OPT"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT $PIC_OPT"
 		    V_SONAME_OPT="-Wl,-soname,"
 		    V_RPATH_OPT="-Wl,-rpath,"
 		    ;;
 
 	    hpux*)
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 	    	    #
 		    # XXX - this assumes GCC is using the HP linker,
 		    # rather than the GNU linker, and that the "+h"
 		    # option is used on all HP-UX platforms, both .sl
 		    # and .so.
 		    #
 		    V_SONAME_OPT="-Wl,+h,"
 		    #
 		    # By default, directories specifed with -L
 		    # are added to the run-time search path, so
 		    # we don't add them in pcap-config.
 		    #
 		    ;;
 
 	    solaris*)
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 		    #
 		    # XXX - this assumes GCC is using the Sun linker,
 		    # rather than the GNU linker.
 		    #
 		    V_SONAME_OPT="-Wl,-h,"
 		    V_RPATH_OPT="-Wl,-R,"
 		    ;;
 	    esac
     else
 	    #
 	    # Set the appropriate compiler flags and, on platforms
 	    # where we build a shared library:
 	    #
 	    #	add options to generate position-independent code,
-	    #	if necessary (it's the default in Darwin/OS X);
+	    #	if necessary (it's the default in Darwin/macOS);
 	    #
 	    #	if we generate ".so" shared libraries, define the
 	    #	appropriate options for building the shared library;
 	    #
 	    #	add options to specify, at link time, a directory to
 	    #	add to the run-time search path, if that's necessary.
 	    #
 	    # Note: spaces after V_SONAME_OPT are significant; on
 	    # some platforms the soname is passed with a GCC-like
 	    # "-Wl,-soname,{soname}" option, with the soname part
 	    # of the option, while on other platforms the C compiler
 	    # driver takes it as a regular option with the soname
 	    # following the option.  The same applies to V_RPATH_OPT.
 	    #
 	    case "$host_os" in
 
 	    aix*)
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
 		    ;;
 
 	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
 		    #
 		    # "cc" is GCC.
 		    #
-		    V_CCOPT="$V_CCOPT -fpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-shared"
 		    V_SONAME_OPT="-Wl,-soname,"
 		    V_RPATH_OPT="-Wl,-rpath,"
 		    ;;
 
 	    hpux*)
-		    V_CCOPT="$V_CCOPT +z"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT +z"
 		    V_SHLIB_CMD="\$(LD)"
 		    V_SHLIB_OPT="-b"
 		    V_SONAME_OPT="+h "
 		    #
 		    # By default, directories specifed with -L
 		    # are added to the run-time search path, so
 		    # we don't add them in pcap-config.
 		    #
 		    ;;
 
 	    osf*)
 	    	    #
 		    # Presumed to be DEC OSF/1, Digital UNIX, or
 		    # Tru64 UNIX.
 		    #
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-shared"
 		    V_SONAME_OPT="-soname "
 		    V_RPATH_OPT="-rpath "
 		    ;;
 
 	    solaris*)
-		    V_CCOPT="$V_CCOPT -Kpic"
+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -Kpic"
 		    V_SHLIB_CMD="\$(CC)"
 		    V_SHLIB_OPT="-G"
 		    V_SONAME_OPT="-h "
 		    V_RPATH_OPT="-R"
 		    ;;
 	    esac
     fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
     save_CFLAGS="$CFLAGS"
     CFLAGS="$V_CCOPT"
     if ${ac_cv_lbl_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 	ac_cv_lbl_inline=""
 	ac_lbl_cc_inline=no
 	for ac_lbl_inline in inline __inline__ __inline
 	do
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define inline $ac_lbl_inline
 		static inline struct iltest *foo(void);
 		struct iltest {
 		    int iltest1;
 		    int iltest2;
 		};
 
 		static inline struct iltest *
 		foo()
 		{
 		    static struct iltest xxx;
 
 		    return &xxx;
 		}
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_lbl_cc_inline=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    if test "$ac_lbl_cc_inline" = yes ; then
 		break;
 	    fi
 	done
 	if test "$ac_lbl_cc_inline" = yes ; then
 	    ac_cv_lbl_inline=$ac_lbl_inline
 	fi
 fi
 
     CFLAGS="$save_CFLAGS"
     if test ! -z "$ac_cv_lbl_inline" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_inline" >&5
 $as_echo "$ac_cv_lbl_inline" >&6; }
     else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
 
 cat >>confdefs.h <<_ACEOF
 #define inline $ac_cv_lbl_inline
 _ACEOF
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-$as_echo_n "checking for __attribute__... " >&6; }
-if ${ac_cv___attribute__+:} false; then :
+#
+# Try to arrange for large file support.
+#
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-
-#include <stdlib.h>
-
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
 {
-  exit(1);
+
+  ;
+  return 0;
 }
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
-main(int argc, char **argv)
+main ()
 {
-  foo();
-}
 
+  ;
+  return 0;
+}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv___attribute__=yes
-else
-  ac_cv___attribute__=no
+  ac_cv_sys_file_offset_bits=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
 
-if test "$ac_cv___attribute__" = "yes"; then
-
-$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h
-
-else
-  #
-  # We can't use __attribute__, so we can't use __attribute__((unused)),
-  # so we define _U_ to an empty string.
-  #
-  V_DEFS="$V_DEFS -D_U_=\"\""
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
-$as_echo "$ac_cv___attribute__" >&6; }
-
-if test "$ac_cv___attribute__" = "yes"; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((unused)) can be used without warnings" >&5
-$as_echo_n "checking whether __attribute__((unused)) can be used without warnings... " >&6; }
-if ${ac_cv___attribute___unused+:} false; then :
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $ac_lbl_cc_force_warning_errors"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
-main(int argc  __attribute((unused)), char **argv __attribute((unused)))
+main ()
 {
-  printf("Hello, world!\n");
+
+  ;
   return 0;
 }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
 
+  ;
+  return 0;
+}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv___attribute___unused=yes
-else
-  ac_cv___attribute___unused=no
+  ac_cv_sys_large_files=1; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
 
-CFLAGS="$save_CFLAGS"
-if test "$ac_cv___attribute___unused" = "yes"; then
-  V_DEFS="$V_DEFS -D_U_=\"__attribute__((unused))\""
-else
-  V_DEFS="$V_DEFS -D_U_=\"\""
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute___unused" >&5
-$as_echo "$ac_cv___attribute___unused" >&6; }
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((format)) can be used without warnings" >&5
-$as_echo_n "checking whether __attribute__((format)) can be used without warnings... " >&6; }
-if ${ac_cv___attribute___format+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_source+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $ac_lbl_cc_force_warning_errors"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-
-#include <stdlib.h>
-
-extern int foo(const char *fmt, ...)
-		  __attribute__ ((format (printf, 1, 2)));
-
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
-main(int argc, char **argv)
+main ()
 {
-  foo("%s", "test");
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
 }
-
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv___attribute___format=yes
-else
-  ac_cv___attribute___format=no
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=1; break
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
 
-CFLAGS="$save_CFLAGS"
-if test "$ac_cv___attribute___format" = "yes"; then
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
 
-$as_echo "#define __ATTRIBUTE___FORMAT_OK 1" >>confdefs.h
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute___format" >&5
-$as_echo "$ac_cv___attribute___format" >&6; }
 
-fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
 
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
       ac_path_GREP_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_GREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
     as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
   ac_path_EGREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
       ac_path_EGREP_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_EGREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
   ac_cv_header_stdc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "memchr" >/dev/null 2>&1; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "free" >/dev/null 2>&1; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
   if test "$cross_compiling" = yes; then :
   :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
 		   (('a' <= (c) && (c) <= 'i') \
 		     || ('j' <= (c) && (c) <= 'r') \
 		     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
 main ()
 {
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
       return 2;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 
-for ac_header in sys/bitypes.h
+for ac_header in sys/ioccom.h sys/sockio.h limits.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_bitypes_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_BITYPES_H 1
-_ACEOF
-
-fi
-
-done
-
-
-ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_int8_t" = xyes; then :
-
-else
-
-$as_echo "#define int8_t signed char" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_u_int8_t" = xyes; then :
-
-else
-
-$as_echo "#define u_int8_t unsigned char" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_int16_t" = xyes; then :
-
-else
-
-$as_echo "#define int16_t short" >>confdefs.h
-
-	$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_u_int16_t" = xyes; then :
-
-else
-
-$as_echo "#define u_int16_t unsigned short" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_int32_t" = xyes; then :
-
-else
-
-$as_echo "#define int32_t int" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_u_int32_t" = xyes; then :
-
-else
-
-$as_echo "#define u_int32_t unsigned int" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_int64_t" = xyes; then :
-
-else
-
-$as_echo "#define int64_t long long" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-"
-if test "x$ac_cv_type_u_int64_t" = xyes; then :
-
-else
-
-$as_echo "#define u_int64_t unsigned long long" >>confdefs.h
-
-fi
-
-
-#
-# Try to arrange for large file support.
-#
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_sys_largefile_source=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  ac_cv_sys_largefile_source=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
-$as_echo "$ac_cv_sys_largefile_source" >&6; }
-case $ac_cv_sys_largefile_source in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
-;;
-esac
-rm -rf conftest*
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-if test $ac_cv_sys_largefile_source != unknown; then
-
-$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
-
-fi
-
-
-for ac_header in sys/ioccom.h sys/select.h sys/sockio.h limits.h
-do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-for ac_header in linux/types.h
+for ac_header in netpacket/packet.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_types_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "netpacket/packet.h" "ac_cv_header_netpacket_packet_h" "$ac_includes_default"
+if test "x$ac_cv_header_netpacket_packet_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_TYPES_H 1
+#define HAVE_NETPACKET_PACKET_H 1
 _ACEOF
 
 fi
 
 done
 
-for ac_header in linux/if_packet.h netpacket/packet.h netpacket/if_packet.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
 for ac_header in net/pfvar.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "net/pfvar.h" "ac_cv_header_net_pfvar_h" "#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
 "
 if test "x$ac_cv_header_net_pfvar_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NET_PFVAR_H 1
 _ACEOF
 
 fi
 
 done
 
 if test "$ac_cv_header_net_pfvar_h" = yes; then
 	#
 	# Check for various PF actions.
 	#
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether net/pfvar.h defines PF_NAT through PF_NORDR" >&5
 $as_echo_n "checking whether net/pfvar.h defines PF_NAT through PF_NORDR... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 	    #include <sys/socket.h>
 	    #include <net/if.h>
 	    #include <net/pfvar.h>
 int
 main ()
 {
 return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_PF_NAT_THROUGH_PF_NORDR 1" >>confdefs.h
 
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-for ac_header in netinet/if_ether.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "netinet/if_ether.h" "ac_cv_header_netinet_if_ether_h" "#include <sys/types.h>
-#include <sys/socket.h>
-"
-if test "x$ac_cv_header_netinet_if_ether_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NETINET_IF_ETHER_H 1
-_ACEOF
 
-fi
-
-done
-
-if test "$ac_cv_header_netinet_if_ether_h" != yes; then
-	#
-	# The simple test didn't work.
-	# Do we need to include <net/if.h> first?
-	# Unset ac_cv_header_netinet_if_ether_h so we don't
-	# treat the previous failure as a cached value and
-	# suppress the next test.
-	#
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Rechecking with some additional includes" >&5
-$as_echo "$as_me: Rechecking with some additional includes" >&6;}
-	unset ac_cv_header_netinet_if_ether_h
-	for ac_header in netinet/if_ether.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "netinet/if_ether.h" "ac_cv_header_netinet_if_ether_h" "#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-"
-if test "x$ac_cv_header_netinet_if_ether_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NETINET_IF_ETHER_H 1
-_ACEOF
-
-fi
-
-done
-
-fi
-
 case "$host_os" in
 linux*|uclinux*)
 	for ac_header in linux/sockios.h linux/if_bonding.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
 #include <sys/socket.h>
 #include <linux/if.h>
 
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 	;;
 esac
 
 if test "$GCC" = yes ; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI ioctl definitions" >&5
 $as_echo_n "checking for ANSI ioctl definitions... " >&6; }
 	    if ${ac_cv_lbl_gcc_fixincludes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /*
 		     * This generates a "duplicate case value" when fixincludes
 		     * has not be run.
 		     */
 #		include <sys/types.h>
 #		include <sys/time.h>
 #		include <sys/ioctl.h>
 #		ifdef HAVE_SYS_IOCCOM_H
 #		include <sys/ioccom.h>
 #		endif
 int
 main ()
 {
 switch (0) {
 		    case _IO('A', 1):;
 		    case _IO('B', 1):;
 		    }
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_lbl_gcc_fixincludes=yes
 else
   ac_cv_lbl_gcc_fixincludes=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_gcc_fixincludes" >&5
 $as_echo "$ac_cv_lbl_gcc_fixincludes" >&6; }
 	    if test $ac_cv_lbl_gcc_fixincludes = no ; then
 		    # Don't cache failure
 		    unset ac_cv_lbl_gcc_fixincludes
 		    as_fn_error $? "see the INSTALL for more info" "$LINENO" 5
 	    fi
     fi
 
-for ac_func in strerror strlcpy
+for ac_func in strerror strerror_r strerror_s strlcpy strlcat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 needsnprintf=no
 for ac_func in vsnprintf snprintf
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
   needsnprintf=yes
 fi
 done
 
 if test $needsnprintf = yes; then
 	case " $LIBOBJS " in
   *" snprintf.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
  ;;
 esac
 
 fi
 
 needstrtok_r=no
 for ac_func in strtok_r
 do :
   ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
 if test "x$ac_cv_func_strtok_r" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOK_R 1
 _ACEOF
 
 else
   needstrtok_r=yes
 fi
 done
 
 if test $needstrtok_r = yes; then
 	case " $LIBOBJS " in
   *" strtok_r.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strtok_r.$ac_objext"
  ;;
 esac
 
 fi
 
 #
+# Do we have ffs(), and is it declared in <strings.h>?
+#
+for ac_func in ffs
+do :
+  ac_fn_c_check_func "$LINENO" "ffs" "ac_cv_func_ffs"
+if test "x$ac_cv_func_ffs" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FFS 1
+_ACEOF
+
+fi
+done
+
+if test "$ac_cv_func_ffs" = yes; then
+	#
+	# We have ffs(); is it declared in <strings.h>?
+	#
+	# This test fails if we don't have <strings.h> or if we do
+	# but it doesn't declare ffs().
+	#
+	ac_fn_c_check_decl "$LINENO" "ffs" "ac_cv_have_decl_ffs" "
+#include <strings.h>
+
+"
+if test "x$ac_cv_have_decl_ffs" = xyes; then :
+
+
+$as_echo "#define STRINGS_H_DECLARES_FFS /**/" >>confdefs.h
+
+
+fi
+
+fi
+
+#
 # Do this before checking for ether_hostton(), as it's a
-# "gethostbyname() -ish function".
+# "getaddrinfo()-ish function".
 #
 
-    # Most operating systems have gethostbyname() in the default searched
-    # libraries (i.e. libc):
-    # Some OSes (eg. Solaris) place it in libnsl
-    # Some strange OSes (SINIX) have it in libsocket:
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
-$as_echo_n "checking for library containing gethostbyname... " >&6; }
-if ${ac_cv_search_gethostbyname+:} false; then :
+    #
+    # Most operating systems have getaddrinfo() in the default searched
+    # libraries (i.e. libc).  Check there first.
+    #
+    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+if test "x$ac_cv_func_getaddrinfo" = xyes; then :
+
+else
+
+	#
+	# Not found in the standard system libraries.
+	# Try libsocket, which requires libnsl.
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
+$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_getaddrinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket -lnsl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyname ();
+char getaddrinfo ();
 int
 main ()
 {
-return gethostbyname ();
+return getaddrinfo ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl socket resolv; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_gethostbyname=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_getaddrinfo=yes
+else
+  ac_cv_lib_socket_getaddrinfo=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_gethostbyname+:} false; then :
-  break
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-done
-if ${ac_cv_search_gethostbyname+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
+$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
+if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then :
 
+	    #
+	    # OK, we found it in libsocket.
+	    #
+	    LIBS="-lsocket -lnsl $LIBS"
+
 else
-  ac_cv_search_gethostbyname=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
-$as_echo "$ac_cv_search_gethostbyname" >&6; }
-ac_res=$ac_cv_search_gethostbyname
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+	    #
+	    # We didn't find it.
+	    #
+	    as_fn_error $? "getaddrinfo is required, but wasn't found" "$LINENO" 5
+
 fi
 
-    # Unfortunately libsocket sometimes depends on libnsl and
-    # AC_SEARCH_LIBS isn't up to the task of handling dependencies like this.
-    if test "$ac_cv_search_gethostbyname" = "no"
-    then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
-$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_gethostbyname+:} false; then :
+
+	#
+	# OK, do we have recvmsg() in libxnet?
+	# We also link with libsocket and libnsl.
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recvmsg in -lxnet" >&5
+$as_echo_n "checking for recvmsg in -lxnet... " >&6; }
+if ${ac_cv_lib_xnet_recvmsg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket -lnsl $LIBS"
+LIBS="-lxnet -lsocket -lnsl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyname ();
+char recvmsg ();
 int
 main ()
 {
-return gethostbyname ();
+return recvmsg ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_gethostbyname=yes
+  ac_cv_lib_xnet_recvmsg=yes
 else
-  ac_cv_lib_socket_gethostbyname=no
+  ac_cv_lib_xnet_recvmsg=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gethostbyname" >&5
-$as_echo "$ac_cv_lib_socket_gethostbyname" >&6; }
-if test "x$ac_cv_lib_socket_gethostbyname" = xyes; then :
-  LIBS="-lsocket -lnsl $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xnet_recvmsg" >&5
+$as_echo "$ac_cv_lib_xnet_recvmsg" >&6; }
+if test "x$ac_cv_lib_xnet_recvmsg" = xyes; then :
+
+	    #
+	    # Yes - link with it as well.
+	    #
+	    LIBS="-lxnet $LIBS"
+
 fi
 
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-$as_echo_n "checking for library containing socket... " >&6; }
-if ${ac_cv_search_socket+:} false; then :
+
+fi
+
+    # DLPI needs putmsg under HPUX so test for -lstr while we're at it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing putmsg" >&5
+$as_echo_n "checking for library containing putmsg... " >&6; }
+if ${ac_cv_search_putmsg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket ();
+char putmsg ();
 int
 main ()
 {
-return socket ();
+return putmsg ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket; do
+for ac_lib in '' str; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_socket=$ac_res
+  ac_cv_search_putmsg=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_socket+:} false; then :
+  if ${ac_cv_search_putmsg+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_socket+:} false; then :
+if ${ac_cv_search_putmsg+:} false; then :
 
 else
-  ac_cv_search_socket=no
+  ac_cv_search_putmsg=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-$as_echo "$ac_cv_search_socket" >&6; }
-ac_res=$ac_cv_search_socket
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_putmsg" >&5
+$as_echo "$ac_cv_search_putmsg" >&6; }
+ac_res=$ac_cv_search_putmsg
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+fi
+
+
+
+#
+# Check for reentrant versions of getnetbyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getnetbyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getnetbyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+ac_fn_c_check_decl "$LINENO" "getnetbyname_r" "ac_cv_have_decl_getnetbyname_r" "#include <netdb.h>
+"
+if test "x$ac_cv_have_decl_getnetbyname_r" = xyes; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux getnetbyname_r()" >&5
+$as_echo_n "checking for the Linux getnetbyname_r()... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+
+		struct netent netent_buf;
+		char buf[1024];
+		struct netent *resultp;
+		int h_errnoval;
+
+		return getnetbyname_r((const char *)0, &netent_buf, buf, sizeof buf, &resultp, &h_errnoval);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LINUX_GETNETBYNAME_R 1" >>confdefs.h
+
+
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket -lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris/IRIX getnetbyname_r()" >&5
+$as_echo_n "checking for Solaris/IRIX getnetbyname_r()... " >&6; }
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
+			struct netent netent_buf;
+			char buf[1024];
+
+			return getnetbyname_r((const char *)0, &netent_buf, buf, (int)sizeof buf) != NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SOLARIS_IRIX_GETNETBYNAME_R 1" >>confdefs.h
+
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX getnetbyname_r()" >&5
+$as_echo_n "checking for AIX getnetbyname_r()... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
 int
 main ()
 {
-return socket ();
+
+				struct netent netent_buf;
+				struct netent_data net_data;
+
+				return getnetbyname_r((const char *)0, &netent_buf, &net_data);
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_socket=yes
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_AIX_GETNETBYNAME_R 1" >>confdefs.h
+
+
 else
-  ac_cv_lib_socket_socket=no
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
-  LIBS="-lsocket -lnsl $LIBS"
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-    # DLPI needs putmsg under HPUX so test for -lstr while we're at it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing putmsg" >&5
-$as_echo_n "checking for library containing putmsg... " >&6; }
-if ${ac_cv_search_putmsg+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+#
+# Check for reentrant versions of getprotobyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getprotobyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getprotobyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+ac_fn_c_check_decl "$LINENO" "getprotobyname_r" "ac_cv_have_decl_getprotobyname_r" "#include <netdb.h>
+"
+if test "x$ac_cv_have_decl_getprotobyname_r" = xyes; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux getprotobyname_r()" >&5
+$as_echo_n "checking for the Linux getprotobyname_r()... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+
+		struct protoent protoent_buf;
+		char buf[1024];
+		struct protoent *resultp;
+
+		return getprotobyname_r((const char *)0, &protoent_buf, buf, sizeof buf, &resultp);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LINUX_GETPROTOBYNAME_R 1" >>confdefs.h
+
+
 else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris/IRIX getprotobyname_r()" >&5
+$as_echo_n "checking for Solaris/IRIX getprotobyname_r()... " >&6; }
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char putmsg ();
+			struct protoent protoent_buf;
+			char buf[1024];
+
+			return getprotobyname_r((const char *)0, &protoent_buf, buf, (int)sizeof buf) != NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R 1" >>confdefs.h
+
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX getprotobyname_r()" >&5
+$as_echo_n "checking for AIX getprotobyname_r()... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
 int
 main ()
 {
-return putmsg ();
+
+				struct protoent protoent_buf;
+				struct protoent_data proto_data;
+
+				return getprotobyname_r((const char *)0, &protoent_buf, &proto_data);
+
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' str; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_putmsg=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_AIX_GETPROTOBYNAME_R 1" >>confdefs.h
+
+
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_putmsg+:} false; then :
-  break
+    conftest$ac_exeext conftest.$ac_ext
+
 fi
-done
-if ${ac_cv_search_putmsg+:} false; then :
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-else
-  ac_cv_search_putmsg=no
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_putmsg" >&5
-$as_echo "$ac_cv_search_putmsg" >&6; }
-ac_res=$ac_cv_search_putmsg
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 
-
 #
 # You are in a twisty little maze of UN*Xes, all different.
 # Some might not have ether_hostton().
-# Some might have it, but not declare it in any header file.
-# Some might have it, but declare it in <netinet/if_ether.h>.
-# Some might have it, but declare it in <netinet/ether.h>
-# (And some might have it but document it as something declared in
-# <netinet/ethernet.h>, although <netinet/if_ether.h> appears to work.)
+# Some might have it and declare it in <net/ethernet.h>.
+# Some might have it and declare it in <netinet/ether.h>
+# Some might have it and declare it in <sys/ethernet.h>.
+# Some might have it and declare it in <arpa/inet.h>.
+# Some might have it and declare it in <netinet/if_ether.h>.
+# Some might have it and not declare it in any header file.
 #
 # Before you is a C compiler.
 #
 for ac_func in ether_hostton
 do :
   ac_fn_c_check_func "$LINENO" "ether_hostton" "ac_cv_func_ether_hostton"
 if test "x$ac_cv_func_ether_hostton" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ETHER_HOSTTON 1
 _ACEOF
 
 fi
 done
 
 if test "$ac_cv_func_ether_hostton" = yes; then
 	#
-	# OK, we have ether_hostton().  Do we have <netinet/if_ether.h>?
+	# OK, we have ether_hostton().  Is it declared in <net/ethernet.h>?
 	#
-	if test "$ac_cv_header_netinet_if_ether_h" = yes; then
+	# This test fails if we don't have <net/ethernet.h> or if we do
+	# but it doesn't declare ether_hostton().
+	#
+	ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
+#include <net/ethernet.h>
+
+"
+if test "x$ac_cv_have_decl_ether_hostton" = xyes; then :
+
+
+$as_echo "#define NET_ETHERNET_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
+
+
+fi
+
+	#
+	# Did that succeed?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# Yes.  Does it declare ether_hostton()?
+		# No, how about <netinet/ether.h>, as on Linux?
 		#
+		# This test fails if we don't have <netinet/ether.h>
+		# or if we do but it doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
 		ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-#include <netinet/if_ether.h>
+#include <netinet/ether.h>
 
 "
 if test "x$ac_cv_have_decl_ether_hostton" = xyes; then :
 
 
-$as_echo "#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
+$as_echo "#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
 
 
 fi
 
 	fi
 	#
 	# Did that succeed?
 	#
 	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# No, how about <netinet/ether.h>, as on Linux?
+		# No, how about <sys/ethernet.h>, as on Solaris 10
+		# and later?
 		#
-		for ac_header in netinet/ether.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "netinet/ether.h" "ac_cv_header_netinet_ether_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_ether_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NETINET_ETHER_H 1
-_ACEOF
+		# This test fails if we don't have <sys/ethernet.h>
+		# or if we do but it doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
+#include <sys/ethernet.h>
 
-fi
+"
+if test "x$ac_cv_have_decl_ether_hostton" = xyes; then :
 
-done
 
-		if test "$ac_cv_header_netinet_ether_h" = yes; then
-			#
-			# We have it - does it declare ether_hostton()?
-			# Unset ac_cv_have_decl_ether_hostton so we don't
-			# treat the previous failure as a cached value and
-			# suppress the next test.
-			#
-			unset ac_cv_have_decl_ether_hostton
-			ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
-#include <netinet/ether.h>
+$as_echo "#define SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
 
+
+fi
+
+	fi
+	#
+	# Did that succeed?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" != yes; then
+		#
+		# No, how about <arpa/inet.h>, as in AIX?
+		#
+		# This test fails if we don't have <arpa/inet.h>
+		# (if we have ether_hostton(), we should have
+		# networking, and if we have networking, we should
+		# have <arapa/inet.h>) or if we do but it doesn't
+		# declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
+#include <arpa/inet.h>
+
 "
 if test "x$ac_cv_have_decl_ether_hostton" = xyes; then :
 
 
-$as_echo "#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
+$as_echo "#define ARPA_INET_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
 
 
 fi
 
-		fi
 	fi
 	#
-	# Is ether_hostton() declared?
+	# Did that succeed?
 	#
 	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# No, we'll have to declare it ourselves.
-		# Do we have "struct ether_addr"?
+		# No, how about <netinet/if_ether.h>?
+		# On some platforms, it requires <net/if.h> and
+		# <netinet/in.h>, and we always include it with
+		# both of them, so test it with both of them.
 		#
-		ac_fn_c_check_type "$LINENO" "struct ether_addr" "ac_cv_type_struct_ether_addr" "
+		# This test fails if we don't have <netinet/if_ether.h>
+		# and the headers we include before it, or if we do but
+		# <netinet/if_ether.h> doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" "
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-struct mbuf;
-struct rtentry;
 #include <net/if.h>
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 "
+if test "x$ac_cv_have_decl_ether_hostton" = xyes; then :
+
+
+$as_echo "#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h
+
+
+fi
+
+	fi
+	#
+	# After all that, is ether_hostton() declared?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" = yes; then
+		#
+		# Yes.
+		#
+
+$as_echo "#define HAVE_DECL_ETHER_HOSTTON 1" >>confdefs.h
+
+        else
+		#
+		# No, we'll have to declare it ourselves.
+		# Do we have "struct ether_addr" if we include
+		# <netinet/if_ether.h>?
+		#
+		ac_fn_c_check_type "$LINENO" "struct ether_addr" "ac_cv_type_struct_ether_addr" "
+			#include <sys/types.h>
+			#include <sys/socket.h>
+			#include <net/if.h>
+			#include <netinet/in.h>
+			#include <netinet/if_ether.h>
+
+"
 if test "x$ac_cv_type_struct_ether_addr" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_ETHER_ADDR 1
 _ACEOF
 
 
 fi
 
+	fi
+fi
 
-$as_echo "#define HAVE_DECL_ETHER_HOSTTON 0" >>confdefs.h
+#
+# For various things that might use pthreads.
+#
+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
 
-	else
+	#
+	# OK, we have pthread.h.  Do we have pthread_create in the
+	# system libraries?
+	#
+	ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create"
+if test "x$ac_cv_func_pthread_create" = xyes; then :
 
-$as_echo "#define HAVE_DECL_ETHER_HOSTTON 1" >>confdefs.h
+		#
+		# Yes.
+		#
+		ac_lbl_have_pthreads="found"
 
-	fi
+else
+
+		#
+		# No - do we have it in -lpthreads?
+		#
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
+$as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
+if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthreads  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthreads_pthread_create=yes
+else
+  ac_cv_lib_pthreads_pthread_create=no
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
 
+			#
+			# Yes - add -lpthreads.
+			#
+			ac_lbl_have_pthreads="found"
+			PTHREAD_LIBS="$PTHREAD_LIBS -lpthreads"
+
+else
+
+			#
+			# No - do we have it in -lpthread?
+			#
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+
+				#
+				# Yes - add -lpthread.
+				#
+                                ac_lbl_have_pthreads="found"
+				PTHREAD_LIBS="$PTHREAD_LIBS -lpthread"
+
+else
+
+				#
+				# No.
+				#
+				ac_lbl_have_pthreads="not found"
+
+fi
+
+
+fi
+
+
+fi
+
+
+else
+
+	#
+	# We didn't find pthread.h.
+	#
+	ac_lbl_have_pthreads="not found"
+
+
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --disable-protochain option is specified" >&5
 $as_echo_n "checking if --disable-protochain option is specified... " >&6; }
 # Check whether --enable-protochain was given.
 if test "${enable_protochain+set}" = set; then :
   enableval=$enable_protochain;
 fi
 
 case "x$enable_protochain" in
 xyes)	enable_protochain=enabled	;;
 xno)	enable_protochain=disabled	;;
 x)	enable_protochain=enabled	;;
 esac
 
 if test "$enable_protochain" = "disabled"; then
 
 $as_echo "#define NO_PROTOCHAIN 1" >>confdefs.h
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_protochain}" >&5
 $as_echo "${enable_protochain}" >&6; }
 
 #
 # valgrindtest directly uses the native capture mechanism, but
 # only tests with BPF and PF_PACKET sockets; only enable it if
 # we have BPF or PF_PACKET sockets.
 #
-VALGRINDTEST=
+VALGRINDTEST_SRC=
 
 #
 # SITA support is mutually exclusive with native capture support;
 # "--with-sita" selects SITA support.
 #
 
 # Check whether --with-sita was given.
 if test "${with_sita+set}" = set; then :
   withval=$with_sita;
 	if test ! "x$withval" = "xno" ; then
 
 $as_echo "#define SITA 1" >>confdefs.h
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Enabling SITA ACN support" >&5
 $as_echo "$as_me: Enabling SITA ACN support" >&6;}
 		V_PCAP=sita
 	fi
 
 else
 
-if test -z "$with_pcap" && test "$cross_compiling" = yes; then
-	as_fn_error $? "pcap type not determined when cross-compiling; use --with-pcap=..." "$LINENO" 5
-fi
 
 # Check whether --with-pcap was given.
 if test "${with_pcap+set}" = set; then :
   withval=$with_pcap;
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking packet capture type" >&5
-$as_echo_n "checking packet capture type... " >&6; }
 if test ! -z "$with_pcap" ; then
 	V_PCAP="$withval"
-elif test -r /dev/bpf -o -h /dev/bpf ; then
+else
 	#
-	# Cloning BPF device.
+	# Check for a bunch of headers for various packet
+	# capture mechanisms.
 	#
-	V_PCAP=bpf
+	for ac_header in net/bpf.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "net/bpf.h" "ac_cv_header_net_bpf_h" "$ac_includes_default"
+if test "x$ac_cv_header_net_bpf_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_BPF_H 1
+_ACEOF
 
-$as_echo "#define HAVE_CLONING_BPF 1" >>confdefs.h
+fi
 
+done
 
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /dev/bpf0 ; then
-	V_PCAP=bpf
+	if test "$ac_cv_header_net_bpf_h" = yes; then
+		#
+		# Does it define BIOCSETIF?
+		# I.e., is it a header for an LBL/BSD-style capture
+		# mechanism, or is it just a header for a BPF filter
+		# engine?  Some versions of Arch Linux, for example,
+		# have a net/bpf.h that doesn't define BIOCSETIF;
+		# as it's a Linux, it should use packet sockets,
+		# instead.
+		#
+		# We need:
+		#
+		#  sys/types.h, because FreeBSD 10's net/bpf.h
+		#  requires that various BSD-style integer types
+		#  be defined;
+		#
+		#  sys/ioctl.h and, if we have it, sys/ioccom.h,
+		#  because net/bpf.h defines ioctls;
+		#
+		#  net/if.h, because it defines some structures
+		#  used in ioctls defined by net/bpf.h;
+		#
+		#  sys/socket.h, because OpenBSD 5.9's net/bpf.h
+		#  defines some structure fields as being
+		#  struct sockaddrs;
+		#
+		# and net/bpf.h doesn't necessarily include all
+		# of those headers itself.
+		#
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if net/bpf.h defines BIOCSETIF" >&5
+$as_echo_n "checking if net/bpf.h defines BIOCSETIF... " >&6; }
+		if ${ac_cv_lbl_bpf_h_defines_biocsetif+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/net/pfilt.h ; then
-	V_PCAP=pf
-elif test -r /dev/enet ; then
-	V_PCAP=enet
-elif test -r /dev/nit ; then
-	V_PCAP=snit
-elif test -r /usr/include/sys/net/nit.h ; then
-	V_PCAP=nit
-elif test -r /usr/include/linux/socket.h ; then
-	V_PCAP=linux
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_IOCCOM_H
+#include <sys/ioccom.h>
+#endif
+#include <net/bpf.h>
+#include <net/if.h>
 
-	#
-	# XXX - this won't work with older kernels that have SOCK_PACKET
-	# sockets but not PF_PACKET sockets.
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/net/raw.h ; then
-	V_PCAP=snoop
-elif test -r /usr/include/odmi.h ; then
-	#
-	# On AIX, the BPF devices might not yet be present - they're
-	# created the first time libpcap runs after booting.
-	# We check for odmi.h instead.
-	#
-	V_PCAP=bpf
-elif test -c /dev/bpf0 ; then		# check again in case not readable
-	V_PCAP=bpf
-
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/sys/dlpi.h ; then
-	V_PCAP=dlpi
-elif test -c /dev/enet ; then		# check again in case not readable
-	V_PCAP=enet
-elif test -c /dev/nit ; then		# check again in case not readable
-	V_PCAP=snit
+int
+main ()
+{
+u_int i = BIOCSETIF;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_lbl_bpf_h_defines_biocsetif=yes
 else
-	V_PCAP=null
+  ac_cv_lbl_bpf_h_defines_biocsetif=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_bpf_h_defines_biocsetif" >&5
+$as_echo "$ac_cv_lbl_bpf_h_defines_biocsetif" >&6; }
+	fi
+	for ac_header in net/pfilt.h net/enet.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+	for ac_header in net/nit.h sys/net/nit.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+	for ac_header in linux/socket.h net/raw.h sys/dlpi.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+	if test "$ac_cv_lbl_bpf_h_defines_biocsetif" = yes; then
+		#
+		# BPF.
+		# Check this before DLPI, so that we pick BPF on
+		# Solaris 11 and later.
+		#
+		V_PCAP=bpf
+
+		#
+		# We have BPF, so build valgrindtest with "make test"
+		# on macOS and FreeBSD (add your OS once there's a
+		# valgrind for it).
+		#
+		case "$host_os" in
+
+		freebsd*|darwin*|linux*)
+			VALGRINDTEST_SRC=valgrindtest.c
+			;;
+		esac
+	elif test "$ac_cv_header_linux_socket_h" = yes; then
+		#
+		# No prizes for guessing this one.
+		#
+		V_PCAP=linux
+
+		#
+		# XXX - this won't work with older kernels that have
+		# SOCK_PACKET sockets but not PF_PACKET sockets.
+		#
+		VALGRINDTEST_SRC=valgrindtest.c
+	elif test "$ac_cv_header_net_pfilt_h" = yes; then
+	        #
+	        # DEC OSF/1, Digital UNIX, Tru64 UNIX
+        	#
+		V_PCAP=pf
+	elif test "$ac_cv_header_net_enet_h" = yes; then
+		#
+		# Stanford Enetfilter.
+		#
+		V_PCAP=enet
+	elif test "$ac_cv_header_net_nit_h" = yes; then
+		#
+		# SunOS 4.x STREAMS NIT.
+		#
+		V_PCAP=snit
+	elif test "$ac_cv_header_sys_net_nit_h" = yes; then
+		#
+		# Pre-SunOS 4.x non-STREAMS NIT.
+		#
+		V_PCAP=nit
+	elif test "$ac_cv_header_net_raw_h" = yes; then
+		#
+		# IRIX snoop.
+		#
+		V_PCAP=snoop
+	elif test "$ac_cv_header_sys_dlpi_h" = yes; then
+		#
+		# DLPI on pre-Solaris 11 SunOS 5, HP-UX, possibly others.
+		#
+		V_PCAP=dlpi
+	else
+		#
+		# Nothing we support.
+		#
+		V_PCAP=null
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine packet capture interface" >&5
+$as_echo "$as_me: WARNING: cannot determine packet capture interface" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: (see the INSTALL doc for more info)" >&5
+$as_echo "$as_me: WARNING: (see the INSTALL doc for more info)" >&2;}
+	fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking packet capture type" >&5
+$as_echo_n "checking packet capture type... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_PCAP" >&5
 $as_echo "$V_PCAP" >&6; }
 
 
 #
 # Do capture-mechanism-dependent tests.
 #
 case "$V_PCAP" in
 dlpi)
 	#
 	# Needed for common functions used by pcap-[dlpi,libdlpi].c
 	#
  	SSRC="dlpisubs.c"
 
 	#
 	# Checks for some header files.
 	#
 	for ac_header in sys/bufmod.h sys/dlpi_ext.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 
 	#
 	# Checks to see if Solaris has the public libdlpi(3LIB) library.
 	# Note: The existence of /usr/include/libdlpi.h does not mean it is the
 	# public libdlpi(3LIB) version. Before libdlpi was made public, a
 	# private version also existed, which did not have the same APIs.
 	# Due to a gcc bug, the default search path for 32-bit libraries does
 	# not include /lib, we add it explicitly here.
 	# [http://bugs.opensolaris.org/view_bug.do?bug_id=6619485].
 	# Also, due to the bug above applications that link to libpcap with
 	# libdlpi will have to add "-L/lib" option to "configure".
 	#
 	saved_ldflags=$LDFLAGS
 	LDFLAGS="$LIBS -L/lib"
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlpi_walk in -ldlpi" >&5
 $as_echo_n "checking for dlpi_walk in -ldlpi... " >&6; }
 if ${ac_cv_lib_dlpi_dlpi_walk+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldlpi  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dlpi_walk ();
 int
 main ()
 {
 return dlpi_walk ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dlpi_dlpi_walk=yes
 else
   ac_cv_lib_dlpi_dlpi_walk=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dlpi_dlpi_walk" >&5
 $as_echo "$ac_cv_lib_dlpi_dlpi_walk" >&6; }
 if test "x$ac_cv_lib_dlpi_dlpi_walk" = xyes; then :
 
 			LIBS="-ldlpi $LIBS"
 			V_PCAP=libdlpi
 
 $as_echo "#define HAVE_LIBDLPI 1" >>confdefs.h
 
 
 else
   V_PCAP=dlpi
 fi
 
 	LDFLAGS=$saved_ldflags
 
 	#
 	# Checks whether <sys/dlpi.h> is usable, to catch weird SCO
 	# versions of DLPI.
 	#
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/dlpi.h> is usable" >&5
 $as_echo_n "checking whether <sys/dlpi.h> is usable... " >&6; }
 	if ${ac_cv_sys_dlpi_usable+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 			#include <sys/types.h>
 			#include <sys/time.h>
 			#include <sys/dlpi.h>
 
 int
 main ()
 {
 int i = DL_PROMISC_PHYS;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_dlpi_usable=yes
 else
   ac_cv_sys_dlpi_usable=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_dlpi_usable" >&5
 $as_echo "$ac_cv_sys_dlpi_usable" >&6; }
 	if test $ac_cv_sys_dlpi_usable = no ; then
 		as_fn_error $? "<sys/dlpi.h> is not usable on this system; it probably has a non-standard DLPI" "$LINENO" 5
 	fi
 
 	#
-	# Check whether we have a /dev/dlpi device or have multiple devices.
+	# Check to see if Solaris has the dl_passive_req_t struct defined
+	# in <sys/dlpi.h>.
+	# This check is for DLPI support for passive modes.
+	# See dlpi(7P) for more details.
 	#
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/dlpi device" >&5
-$as_echo_n "checking for /dev/dlpi device... " >&6; }
-	if test -c /dev/dlpi ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	ac_fn_c_check_type "$LINENO" "dl_passive_req_t" "ac_cv_type_dl_passive_req_t" "
+		#include <sys/types.h>
+		#include <sys/dlpi.h>
 
-$as_echo "#define HAVE_DEV_DLPI 1" >>confdefs.h
+"
+if test "x$ac_cv_type_dl_passive_req_t" = xyes; then :
 
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		dir="/dev/dlpi"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir directory" >&5
-$as_echo_n "checking for $dir directory... " >&6; }
-		if test -d $dir ; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
 cat >>confdefs.h <<_ACEOF
-#define PCAP_DEV_PREFIX "$dir"
+#define HAVE_DL_PASSIVE_REQ_T 1
 _ACEOF
 
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		fi
-	fi
 
-	#
-	# This check is for Solaris with DLPI support for passive modes.
-	# See dlpi(7P) for more details.
-	#
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dl_passive_req_t struct exists" >&5
-$as_echo_n "checking if dl_passive_req_t struct exists... " >&6; }
-       if ${ac_cv_lbl_has_dl_passive_req_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#       include <sys/types.h>
-#       include <sys/dlpi.h>
-int
-main ()
-{
-u_int i = sizeof(dl_passive_req_t)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_has_dl_passive_req_t=yes
-else
-  ac_cv_lbl_has_dl_passive_req_t=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_has_dl_passive_req_t" >&5
-$as_echo "$ac_cv_lbl_has_dl_passive_req_t" >&6; }
-    if test $ac_cv_lbl_has_dl_passive_req_t = yes ; then
-
-$as_echo "#define HAVE_DLPI_PASSIVE 1" >>confdefs.h
-
-    fi
 	;;
 
 linux)
 	#
 	# Do we have the wireless extensions?
 	#
 	for ac_header in linux/wireless.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "linux/wireless.h" "ac_cv_header_linux_wireless_h" "
 #include <sys/socket.h>
 #include <linux/if.h>
 #include <linux/types.h>
 
 "
 if test "x$ac_cv_header_linux_wireless_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_WIRELESS_H 1
 _ACEOF
 
 fi
 
 done
 
 
 	#
 	# Do we have libnl?
 	#
 
 # Check whether --with-libnl was given.
 if test "${with_libnl+set}" = set; then :
   withval=$with_libnl; with_libnl=$withval
+else
+  with_libnl=if_available
 fi
 
 
 	if test x$with_libnl != xno ; then
 		have_any_nl="no"
 
                 incdir=-I/usr/include/libnl3
                 libnldir=
-                if test x$withval != x ; then
-                  libnldir=-L${withval}/lib/.libs
-                  incdir=-I${withval}/include
-                fi
+                case "$with_libnl" in
 
+                yes|if_available)
+                  ;;
+
+                *)
+                  if test -d $withval; then
+                    libnldir=-L${withval}/lib/.libs
+                    incdir=-I${withval}/include
+                  fi
+                  ;;
+                esac
+
 		#
 		# Try libnl 3.x first.
 		#
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_socket_alloc in -lnl-3" >&5
 $as_echo_n "checking for nl_socket_alloc in -lnl-3... " >&6; }
 if ${ac_cv_lib_nl_3_nl_socket_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnl-3 ${incdir} ${libnldir} -lnl-genl-3 -lnl-3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char nl_socket_alloc ();
 int
 main ()
 {
 return nl_socket_alloc ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nl_3_nl_socket_alloc=yes
 else
   ac_cv_lib_nl_3_nl_socket_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_3_nl_socket_alloc" >&5
 $as_echo "$ac_cv_lib_nl_3_nl_socket_alloc" >&6; }
 if test "x$ac_cv_lib_nl_3_nl_socket_alloc" = xyes; then :
 
 			#
 			# Yes, we have libnl 3.x.
 			#
 			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
 
 $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_3_x 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_NLE 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_SOCKETS 1" >>confdefs.h
 
 			V_INCLS="$V_INCLS ${incdir}"
 			have_any_nl="yes"
 
 fi
 
 
 		if test x$have_any_nl = xno ; then
 			#
 			# Try libnl 2.x
 			#
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_socket_alloc in -lnl" >&5
 $as_echo_n "checking for nl_socket_alloc in -lnl... " >&6; }
 if ${ac_cv_lib_nl_nl_socket_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char nl_socket_alloc ();
 int
 main ()
 {
 return nl_socket_alloc ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nl_nl_socket_alloc=yes
 else
   ac_cv_lib_nl_nl_socket_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_socket_alloc" >&5
 $as_echo "$ac_cv_lib_nl_nl_socket_alloc" >&6; }
 if test "x$ac_cv_lib_nl_nl_socket_alloc" = xyes; then :
 
 				#
 				# Yes, we have libnl 2.x.
 				#
 				LIBS="${libnldir} -lnl-genl -lnl $LIBS"
 
 $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_2_x 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_NLE 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_LIBNL_SOCKETS 1" >>confdefs.h
 
 				have_any_nl="yes"
 
 fi
 
 		fi
 
 		if test x$have_any_nl = xno ; then
 			#
 			# No, we don't; do we have libnl 1.x?
 			#
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_handle_alloc in -lnl" >&5
 $as_echo_n "checking for nl_handle_alloc in -lnl... " >&6; }
 if ${ac_cv_lib_nl_nl_handle_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char nl_handle_alloc ();
 int
 main ()
 {
 return nl_handle_alloc ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nl_nl_handle_alloc=yes
 else
   ac_cv_lib_nl_nl_handle_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_handle_alloc" >&5
 $as_echo "$ac_cv_lib_nl_nl_handle_alloc" >&6; }
 if test "x$ac_cv_lib_nl_nl_handle_alloc" = xyes; then :
 
 				#
 				# Yes.
 				#
 				LIBS="${libnldir} -lnl $LIBS"
 
 $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 				have_any_nl="yes"
 
 fi
 
 		fi
 
 		if test x$have_any_nl = xno ; then
 			#
 			# No, we don't have libnl at all.
 			#
 			if test x$with_libnl = xyes ; then
 				as_fn_error $? "libnl support requested but libnl not found" "$LINENO" 5
 			fi
 		fi
 	fi
 
 	for ac_header in linux/ethtool.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "linux/ethtool.h" "ac_cv_header_linux_ethtool_h" "
 $ac_includes_default
 #include <linux/types.h>
 
 "
 if test "x$ac_cv_header_linux_ethtool_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_ETHTOOL_H 1
 _ACEOF
 
 fi
 
 done
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if if_packet.h has tpacket_stats defined" >&5
-$as_echo_n "checking if if_packet.h has tpacket_stats defined... " >&6; }
-   if ${ac_cv_lbl_tpacket_stats+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-#  include <linux/if_packet.h>
-int
-main ()
-{
-struct tpacket_stats stats
-  ;
-  return 0;
-}
+	#
+	# Check to see if struct tpacket_stats is defined in
+	# <linux/if_packet.h>.  If so, then pcap-linux.c can use this
+	# to report proper statistics.
+	#
+	# -Scott Barron
+	#
+	ac_fn_c_check_type "$LINENO" "struct tpacket_stats" "ac_cv_type_struct_tpacket_stats" "
+		#include <linux/if_packet.h>
+
+"
+if test "x$ac_cv_type_struct_tpacket_stats" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TPACKET_STATS 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_tpacket_stats=yes
-else
-  ac_cv_lbl_tpacket_stats=no
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_tpacket_stats" >&5
-$as_echo "$ac_cv_lbl_tpacket_stats" >&6; }
-   if test $ac_cv_lbl_tpacket_stats = yes; then
 
-$as_echo "#define HAVE_TPACKET_STATS 1" >>confdefs.h
+	#
+	# Check to see if the tpacket_auxdata struct has a tp_vlan_tci member.
+	#
+	# NOTE: any failure means we conclude that it doesn't have that
+	# member, so if we don't have tpacket_auxdata, we conclude it
+	# doesn't have that member (which is OK, as either we won't be
+	# using code that would use that member, or we wouldn't compile
+	# in any case).
+	ac_fn_c_check_member "$LINENO" "struct tpacket_auxdata" "tp_vlan_tci" "ac_cv_member_struct_tpacket_auxdata_tp_vlan_tci" "
+		#include <sys/types.h>
+		#include <linux/if_packet.h>
 
-   fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tpacket_auxdata struct has tp_vlan_tci member" >&5
-$as_echo_n "checking if tpacket_auxdata struct has tp_vlan_tci member... " >&6; }
-    if ${ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+"
+if test "x$ac_cv_member_struct_tpacket_auxdata_tp_vlan_tci" = xyes; then :
 
-#	include <sys/types.h>
-#	include <linux/if_packet.h>
-int
-main ()
-{
-u_int i = sizeof(((struct tpacket_auxdata *)0)->tp_vlan_tci)
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=yes
-else
-  ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&5
-$as_echo "$ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&6; }
-    if test $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci = yes ; then
-	    HAVE_LINUX_TPACKET_AUXDATA=tp_vlan_tci
 
+fi
 
-$as_echo "#define HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI 1" >>confdefs.h
-
-    fi
 	;;
 
 bpf)
 	#
 	# Check whether we have the *BSD-style ioctls.
 	#
 	for ac_header in net/if_media.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "net/if_media.h" "ac_cv_header_net_if_media_h" "$ac_includes_default"
 if test "x$ac_cv_header_net_if_media_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NET_IF_MEDIA_H 1
 _ACEOF
 
 fi
 
 done
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the system supports zerocopy BPF" >&5
-$as_echo_n "checking whether the system supports zerocopy BPF... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/socket.h>
-	    #include <sys/ioctl.h>
-	    #include <net/if.h>
-	    #include <net/bpf.h>
-int
-main ()
-{
-return (BIOCROTZBUF + BPF_BUFMODE_ZBUF);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+	#
+	# Check whether we have struct BPF_TIMEVAL.
+	#
+	ac_fn_c_check_type "$LINENO" "struct BPF_TIMEVAL" "ac_cv_type_struct_BPF_TIMEVAL" "
+		#include <sys/types.h>
+		#include <sys/ioctl.h>
+		#ifdef HAVE_SYS_IOCCOM_H
+		#include <sys/ioccom.h>
+		#endif
+		#include <net/bpf.h>
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_ZEROCOPY_BPF 1" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-	    #
-	    # Check whether we have struct BPF_TIMEVAL.
-	    #
-	    ac_fn_c_check_type "$LINENO" "struct BPF_TIMEVAL" "ac_cv_type_struct_BPF_TIMEVAL" "
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
-#include <net/bpf.h>
-
 "
 if test "x$ac_cv_type_struct_BPF_TIMEVAL" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_BPF_TIMEVAL 1
 _ACEOF
 
 
 fi
 
 	;;
 
 dag)
 	#
 	# --with-pcap=dag is the only way to get here, and it means
 	# "DAG support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DDAG_ONLY"
 	xxx_only=yes
 	;;
 
 septel)
 	#
 	# --with-pcap=septel is the only way to get here, and it means
 	# "Septel support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DSEPTEL_ONLY"
 	xxx_only=yes
 	;;
 
 snf)
 	#
 	# --with-pcap=snf is the only way to get here, and it means
 	# "SNF support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DSNF_ONLY"
 	xxx_only=yes
 	;;
 
 null)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine packet capture interface" >&5
-$as_echo "$as_me: WARNING: cannot determine packet capture interface" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: (see the INSTALL doc for more info)" >&5
-$as_echo "$as_me: WARNING: (see the INSTALL doc for more info)" >&2;}
 	;;
+
+*)
+	as_fn_error $? "$V_PCAP is not a valid pcap type" "$LINENO" 5
+	;;
 esac
 
 if test "$V_PCAP" != null
 then
 	ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs"
 if test "x$ac_cv_func_getifaddrs" = xyes; then :
 
 		#
 		# We have "getifaddrs()"; make sure we have <ifaddrs.h>
 		# as well, just in case some platform is really weird.
 		#
 		ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
 if test "x$ac_cv_header_ifaddrs_h" = xyes; then :
 
 		    #
 		    # We have the header, so we use "getifaddrs()" to
 		    # get the list of interfaces.
 		    #
 		    V_FINDALLDEVS=fad-getad.c
 
 else
 
 		    #
 		    # We don't have the header - give up.
 		    # XXX - we could also fall back on some other
 		    # mechanism, but, for now, this'll catch this
 		    # problem so that we can at least try to figure
 		    # out something to do on systems with "getifaddrs()"
 		    # but without "ifaddrs.h", if there is something
 		    # we can do on those systems.
 		    #
 		    as_fn_error $? "Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>." "$LINENO" 5
 
 fi
 
 
 
 else
 
 		#
-		# Well, we don't have "getifaddrs()", so we have to use
-		# some other mechanism; determine what that mechanism is.
+		# Well, we don't have "getifaddrs()", at least not with the
+		# libraries with which we've decided we need to link
+		# libpcap with, so we have to use some other mechanism.
 		#
-		# The first thing we use is the type of capture mechanism,
-		# which is somewhat of a proxy for the OS we're using.
+		# Note that this may happen on Solaris, which has
+		# getifaddrs(), but in -lsocket, not in -lxnet, so we
+		# won't find it if we link with -lxnet, which we want
+		# to do for other reasons.
 		#
-		case "$V_PCAP" in
-
-		dlpi|libdlpi)
-			#
-			# This might be Solaris 8 or later, with
-			# SIOCGLIFCONF, or it might be some other OS
-			# or some older version of Solaris, with
-			# just SIOCGIFCONF.
-			#
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have SIOCGLIFCONF" >&5
+		# For now, we use either the SIOCGIFCONF ioctl or the
+		# SIOCGLIFCONF ioctl, preferring the latter if we have
+		# it; the latter is a Solarisism that first appeared
+		# in Solaris 8.  (Solaris's getifaddrs() appears to
+		# be built atop SIOCGLIFCONF; using it directly
+		# avoids a not-all-that-useful middleman.)
+		#
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have SIOCGLIFCONF" >&5
 $as_echo_n "checking whether we have SIOCGLIFCONF... " >&6; }
-			if ${ac_cv_lbl_have_siocglifconf+:} false; then :
+		if ${ac_cv_lbl_have_siocglifconf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/param.h>
-				#include <sys/file.h>
-				#include <sys/ioctl.h>
-				#include <sys/socket.h>
-				#include <sys/sockio.h>
+			#include <sys/file.h>
+			#include <sys/ioctl.h>
+			#include <sys/socket.h>
+			#include <sys/sockio.h>
 int
 main ()
 {
 ioctl(0, SIOCGLIFCONF, (char *)0);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_lbl_have_siocglifconf=yes
 else
   ac_cv_lbl_have_siocglifconf=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_have_siocglifconf" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_have_siocglifconf" >&5
 $as_echo "$ac_cv_lbl_have_siocglifconf" >&6; }
-			if test $ac_cv_lbl_have_siocglifconf = yes ; then
-				V_FINDALLDEVS=fad-glifc.c
-			else
-				V_FINDALLDEVS=fad-gifc.c
-			fi
-			;;
-
-		*)
-			#
-			# Assume we just have SIOCGIFCONF.
-			# (XXX - on at least later Linux kernels, there's
-			# another mechanism, and we should be using that
-			# instead.)
-			#
+		if test $ac_cv_lbl_have_siocglifconf = yes ; then
+			V_FINDALLDEVS=fad-glifc.c
+		else
 			V_FINDALLDEVS=fad-gifc.c
-			;;
-		esac
+		fi
+
 fi
 
 fi
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
-$as_echo_n "checking for socklen_t... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#include <sys/types.h>
-	#include <sys/socket.h>
-
-int
-main ()
-{
- socklen_t x;
-  ;
-  return 0;
-}
+case "$host_os" in
+linux*)
+	for ac_header in linux/net_tstamp.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/net_tstamp.h" "ac_cv_header_linux_net_tstamp_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_net_tstamp_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_NET_TSTAMP_H 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  have_socklen_t=yes
-else
-  have_socklen_t=no
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "x$have_socklen_t" = "xyes"; then
 
-$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
+done
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_socklen_t" >&5
-$as_echo "$have_socklen_t" >&6; }
+	;;
+*)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: no hardware timestamp support implemented for $host_os" >&5
+$as_echo "$as_me: no hardware timestamp support implemented for $host_os" >&6;}
+	;;
+esac
 
-# Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
-  enableval=$enable_ipv6;
+# Check whether --enable-packet-ring was given.
+if test "${enable_packet_ring+set}" = set; then :
+  enableval=$enable_packet_ring;
 else
-  enable_ipv6=ifavailable
+  enable_packet_ring=yes
 fi
 
-if test "$enable_ipv6" != "no"; then
-	ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
 
+if test "x$enable_packet_ring" != "xno" ; then
 
-$as_echo "#define INET6 1" >>confdefs.h
+$as_echo "#define PCAP_SUPPORT_PACKET_RING 1" >>confdefs.h
 
 
-else
-
-		if test "$enable_ipv6" != "ifavailable"; then
-			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--enable-ipv6 was given, but getaddrinfo isn't available
-See \`config.log' for more details" "$LINENO" 5; }
-		fi
-
 fi
 
-fi
+#
+# Check for socklen_t.
+#
+ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
+	#include <sys/types.h>
+	#include <sys/socket.h>
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build optimizer debugging code" >&5
-$as_echo_n "checking whether to build optimizer debugging code... " >&6; }
-# Check whether --enable-optimizer-dbg was given.
-if test "${enable_optimizer_dbg+set}" = set; then :
-  enableval=$enable_optimizer_dbg;
-fi
+"
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
-if test "$enable_optimizer_dbg" = "yes"; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
 
-$as_echo "#define BDEBUG 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_optimizer_dbg-no}" >&5
-$as_echo "${enable_optimizer_dbg-no}" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build parser debugging code" >&5
-$as_echo_n "checking whether to build parser debugging code... " >&6; }
-# Check whether --enable-yydebug was given.
-if test "${enable_yydebug+set}" = set; then :
-  enableval=$enable_yydebug;
+
+# Check whether --enable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then :
+  enableval=$enable_ipv6;
+else
+  enable_ipv6=yes
 fi
 
-if test "$enable_yydebug" = "yes"; then
+if test "$enable_ipv6" != "no"; then
+	#
+	# We've already made sure we have getaddrinfo above in
+	# AC_LBL_LIBRARY_NET.
+	#
 
-$as_echo "#define YYDEBUG 1" >>confdefs.h
+$as_echo "#define INET6 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_yydebug-no}" >&5
-$as_echo "${enable_yydebug-no}" >&6; }
 
 # Check for Endace DAG card support.
 
 # Check whether --with-dag was given.
 if test "${with_dag+set}" = set; then :
   withval=$with_dag;
 	if test "$withval" = no
 	then
 		# User doesn't want DAG support.
 		want_dag=no
 	elif test "$withval" = yes
 	then
 		# User wants DAG support but hasn't specified a directory.
 		want_dag=yes
 	else
 		# User wants DAG support and has specified a directory, so use the provided value.
 		want_dag=yes
 		dag_root=$withval
 	fi
 
 else
 
 	if test "$V_PCAP" = dag; then
 		# User requested DAG-only libpcap, so we'd better have
 		# the DAG API.
 		want_dag=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want DAG support.
 		want_dag=no
 	else
 		#
 		# Use DAG API if present, otherwise don't
 		#
 		want_dag=ifpresent
 	fi
 
 fi
 
 
 
 # Check whether --with-dag-includes was given.
 if test "${with_dag_includes+set}" = set; then :
   withval=$with_dag_includes;
 	# User wants DAG support and has specified a header directory, so use the provided value.
 	want_dag=yes
 	dag_include_dir=$withval
 
 fi
 
 
 
 # Check whether --with-dag-libraries was given.
 if test "${with_dag_libraries+set}" = set; then :
   withval=$with_dag_libraries;
 	# User wants DAG support and has specified a library directory, so use the provided value.
 	want_dag=yes
 	dag_lib_dir=$withval
 
 fi
 
 
-ac_cv_lbl_dag_api=no
 if test "$want_dag" != no; then
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have DAG API headers" >&5
-$as_echo_n "checking whether we have DAG API headers... " >&6; }
-
 	# If necessary, set default paths for DAG API headers and libraries.
 	if test -z "$dag_root"; then
 		dag_root=/usr/local
 	fi
 
 	if test -z "$dag_include_dir"; then
 		dag_include_dir="$dag_root/include"
 	fi
 
 	if test -z "$dag_lib_dir"; then
 		dag_lib_dir="$dag_root/lib"
 	fi
 
-	if test -z "$dag_tools_dir"; then
-		dag_tools_dir="$dag_root/tools"
-	fi
+	V_INCLS="$V_INCLS -I$dag_include_dir"
 
-	if test -r $dag_include_dir/dagapi.h; then
-		ac_cv_lbl_dag_api=yes
-	fi
+	for ac_header in dagapi.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dagapi.h" "ac_cv_header_dagapi_h" "$ac_includes_default"
+if test "x$ac_cv_header_dagapi_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DAGAPI_H 1
+_ACEOF
 
-	if test "$ac_cv_lbl_dag_api" = yes; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($dag_include_dir)" >&5
-$as_echo "yes ($dag_include_dir)" >&6; }
+fi
 
-		V_INCLS="$V_INCLS -I$dag_include_dir"
+done
 
+
+	if test "$ac_cv_header_dagapi_h" = yes; then
+
 		if test $V_PCAP != dag ; then
 			 SSRC="$SSRC pcap-dag.c"
 		fi
 
-		# See if we can find a general version string.
+		# Check for various DAG API functions.
 		# Don't need to save and restore LIBS to prevent -ldag being
 		# included if there's a found-action (arg 3).
 		saved_ldflags=$LDFLAGS
 		LDFLAGS="-L$dag_lib_dir"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_attach_stream in -ldag" >&5
 $as_echo_n "checking for dag_attach_stream in -ldag... " >&6; }
 if ${ac_cv_lib_dag_dag_attach_stream+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldag  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dag_attach_stream ();
 int
 main ()
 {
 return dag_attach_stream ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dag_dag_attach_stream=yes
 else
   ac_cv_lib_dag_dag_attach_stream=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_attach_stream" >&5
 $as_echo "$ac_cv_lib_dag_dag_attach_stream" >&6; }
 if test "x$ac_cv_lib_dag_dag_attach_stream" = xyes; then :
-  dag_streams="1"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDAG 1
+_ACEOF
+
+  LIBS="-ldag $LIBS"
+
 else
-  dag_streams="0"
+  as_fn_error $? "DAG library lacks streams support" "$LINENO" 5
 fi
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_attach_stream64 in -ldag" >&5
+$as_echo_n "checking for dag_attach_stream64 in -ldag... " >&6; }
+if ${ac_cv_lib_dag_dag_attach_stream64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldag  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dag_attach_stream64 ();
+int
+main ()
+{
+return dag_attach_stream64 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dag_dag_attach_stream64=yes
+else
+  ac_cv_lib_dag_dag_attach_stream64=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_attach_stream64" >&5
+$as_echo "$ac_cv_lib_dag_dag_attach_stream64" >&6; }
+if test "x$ac_cv_lib_dag_dag_attach_stream64" = xyes; then :
+  dag_large_streams="1"
+else
+  dag_large_streams="0"
+fi
+
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_get_erf_types in -ldag" >&5
 $as_echo_n "checking for dag_get_erf_types in -ldag... " >&6; }
 if ${ac_cv_lib_dag_dag_get_erf_types+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldag  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dag_get_erf_types ();
 int
 main ()
 {
 return dag_get_erf_types ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dag_dag_get_erf_types=yes
 else
   ac_cv_lib_dag_dag_get_erf_types=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_get_erf_types" >&5
 $as_echo "$ac_cv_lib_dag_dag_get_erf_types" >&6; }
 if test "x$ac_cv_lib_dag_dag_get_erf_types" = xyes; then :
 
 
 $as_echo "#define HAVE_DAG_GET_ERF_TYPES 1" >>confdefs.h
 
 fi
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_get_stream_erf_types in -ldag" >&5
 $as_echo_n "checking for dag_get_stream_erf_types in -ldag... " >&6; }
 if ${ac_cv_lib_dag_dag_get_stream_erf_types+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldag  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dag_get_stream_erf_types ();
 int
 main ()
 {
 return dag_get_stream_erf_types ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dag_dag_get_stream_erf_types=yes
 else
   ac_cv_lib_dag_dag_get_stream_erf_types=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_get_stream_erf_types" >&5
 $as_echo "$ac_cv_lib_dag_dag_get_stream_erf_types" >&6; }
 if test "x$ac_cv_lib_dag_dag_get_stream_erf_types" = xyes; then :
 
 
 $as_echo "#define HAVE_DAG_GET_STREAM_ERF_TYPES 1" >>confdefs.h
 
 fi
 
 
 		LDFLAGS=$saved_ldflags
 
-		if test "$dag_streams" = 1; then
+		#
+		# We assume that if we have libdag we have libdagconf,
+		# as they're installed at the same time from the same
+		# package.
+		#
+		LIBS="$LIBS -ldag -ldagconf"
+		LDFLAGS="$LDFLAGS -L$dag_lib_dir"
 
-$as_echo "#define HAVE_DAG_STREAMS_API 1" >>confdefs.h
+		if test "$dag_large_streams" = 1; then
 
-			LIBS="$LIBS -ldag"
-			LDFLAGS="$LDFLAGS -L$dag_lib_dir"
+$as_echo "#define HAVE_DAG_LARGE_STREAMS_API 1" >>confdefs.h
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vdag_set_device_info in -lvdag" >&5
 $as_echo_n "checking for vdag_set_device_info in -lvdag... " >&6; }
 if ${ac_cv_lib_vdag_vdag_set_device_info+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvdag  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char vdag_set_device_info ();
 int
 main ()
 {
 return vdag_set_device_info ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_vdag_vdag_set_device_info=yes
 else
   ac_cv_lib_vdag_vdag_set_device_info=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vdag_vdag_set_device_info" >&5
 $as_echo "$ac_cv_lib_vdag_vdag_set_device_info" >&6; }
 if test "x$ac_cv_lib_vdag_vdag_set_device_info" = xyes; then :
   ac_dag_have_vdag="1"
 else
   ac_dag_have_vdag="0"
 fi
 
 			if test "$ac_dag_have_vdag" = 1; then
 
 $as_echo "#define HAVE_DAG_VDAG 1" >>confdefs.h
 
-				LIBS="$LIBS -lpthread"
+				if test "$ac_lbl_have_pthreads" != "found"; then
+					as_fn_error $? "DAG requires pthreads, but we didn't find them" "$LINENO" 5
+				fi
+				LIBS="$LIBS $PTHREAD_LIBS"
 			fi
 		fi
 
 
 $as_echo "#define HAVE_DAG_API 1" >>confdefs.h
 
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 		if test "$V_PCAP" = dag; then
 			# User requested "dag" capture type but we couldn't
 			# find the DAG API support.
 			as_fn_error $? "DAG support requested with --with-pcap=dag, but the DAG headers weren't found at $dag_include_dir: make sure the DAG support is installed, specify a different path or paths if necessary, or don't request DAG support" "$LINENO" 5
 		fi
 
 		if test "$want_dag" = yes; then
 	        	# User wanted DAG support but we couldn't find it.
 			as_fn_error $? "DAG support requested with --with-dag, but the DAG headers weren't found at $dag_include_dir: make sure the DAG support is installed, specify a different path or paths if necessary, or don't request DAG support" "$LINENO" 5
 		fi
 	fi
 fi
 
 
 # Check whether --with-septel was given.
 if test "${with_septel+set}" = set; then :
   withval=$with_septel;
 	if test "$withval" = no
 	then
 		want_septel=no
 	elif test "$withval" = yes
 	then
 		want_septel=yes
 		septel_root=
 	else
 		want_septel=yes
 		septel_root=$withval
 	fi
 
 else
 
 	if test "$V_PCAP" = septel; then
 		# User requested Septel-only libpcap, so we'd better have
 		# the Septel API.
 		want_septel=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want Septel support.
 		want_septel=no
 	else
 		#
 		# Use Septel API if present, otherwise don't
 		#
 		want_septel=ifpresent
 	fi
 
 fi
 
 
 ac_cv_lbl_septel_api=no
 if test "$with_septel" != no; then
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have Septel API headers" >&5
 $as_echo_n "checking whether we have Septel API headers... " >&6; }
 
 	# If necessary, set default paths for Septel API headers and libraries.
 	if test -z "$septel_root"; then
 		septel_root=$srcdir/../septel
 	fi
 
 	septel_tools_dir="$septel_root"
 	septel_include_dir="$septel_root/INC"
 
 	if test -r "$septel_include_dir/msg.h"; then
 		ac_cv_lbl_septel_api=yes
 	fi
 
 	if test "$ac_cv_lbl_septel_api" = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($septel_include_dir)" >&5
 $as_echo "yes ($septel_include_dir)" >&6; }
 
 		V_INCLS="$V_INCLS -I$septel_include_dir"
 		ADDLOBJS="$ADDLOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o"
 		ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o"
 
 		if test "$V_PCAP" != septel ; then
 			 SSRC="$SSRC pcap-septel.c"
 		fi
 
 
 $as_echo "#define HAVE_SEPTEL_API 1" >>confdefs.h
 
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 		if test "$V_PCAP" = septel; then
 			# User requested "septel" capture type but
 			# we couldn't find the Septel API support.
 			as_fn_error $? "Septel support requested with --with-pcap=septel, but the Septel headers weren't found at $septel_include_dir: make sure the Septel support is installed, specify a different path or paths if necessary, or don't request Septel support" "$LINENO" 5
 		fi
 
 		if test "$want_septel" = yes; then
 	        	# User wanted Septel support but we couldn't find it.
 			as_fn_error $? "Septel support requested with --with-septel, but the Septel headers weren't found at $septel_include_dir: make sure the Septel support is installed, specify a different path or paths if necessary, or don't request Septel support" "$LINENO" 5
 		fi
 	fi
 fi
 
 # Check for Myricom SNF support.
 
 # Check whether --with-snf was given.
 if test "${with_snf+set}" = set; then :
   withval=$with_snf;
 	if test "$withval" = no
 	then
 		# User explicitly doesn't want SNF
 		want_snf=no
 	elif test "$withval" = yes
 	then
 		# User wants SNF support but hasn't specified a directory.
 		want_snf=yes
 	else
 		# User wants SNF support with a specified directory.
 		want_snf=yes
 		snf_root=$withval
 	fi
 
 else
 
 	if test "$V_PCAP" = snf; then
 		# User requested Sniffer-only libpcap, so we'd better have
 		# the Sniffer API.
 		want_snf=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want SNF support.
 		want_snf=no
 	else
 		#
 		# Use Sniffer API if present, otherwise don't
 		#
 		want_snf=ifpresent
 	fi
 
 fi
 
 
 
 # Check whether --with-snf-includes was given.
 if test "${with_snf_includes+set}" = set; then :
   withval=$with_snf_includes;
 	# User wants SNF with specific header directory
 	want_snf=yes
 	snf_include_dir=$withval
 
 fi
 
 
 
 # Check whether --with-snf-libraries was given.
 if test "${with_snf_libraries+set}" = set; then :
   withval=$with_snf_libraries;
 	# User wants SNF with specific lib directory
 	want_snf=yes
 	snf_lib_dir=$withval
 
 fi
 
 
 ac_cv_lbl_snf_api=no
 if test "$with_snf" != no; then
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have Myricom Sniffer API" >&5
 $as_echo_n "checking whether we have Myricom Sniffer API... " >&6; }
 
 	# If necessary, set default paths for Sniffer headers and libraries.
 	if test -z "$snf_root"; then
 		snf_root=/opt/snf
 	fi
 
 	if test -z "$snf_include_dir"; then
 		snf_include_dir="$snf_root/include"
 	fi
 
 	if test -z "$snf_lib_dir"; then
 		snf_lib_dir="$snf_root/lib"
 	fi
 
 	if test -f "$snf_include_dir/snf.h"; then
 		# We found a header; make sure we can link with the library
 		saved_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -L$snf_lib_dir"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snf_init in -lsnf" >&5
 $as_echo_n "checking for snf_init in -lsnf... " >&6; }
 if ${ac_cv_lib_snf_snf_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsnf  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char snf_init ();
 int
 main ()
 {
 return snf_init ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_snf_snf_init=yes
 else
   ac_cv_lib_snf_snf_init=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snf_snf_init" >&5
 $as_echo "$ac_cv_lib_snf_snf_init" >&6; }
 if test "x$ac_cv_lib_snf_snf_init" = xyes; then :
   ac_cv_lbl_snf_api="yes"
 fi
 
 		LDFLAGS="$saved_ldflags"
 		if test "$ac_cv_lbl_snf_api" = no; then
 			as_fn_error $? "SNF API cannot correctly be linked; check config.log" "$LINENO" 5
 		fi
 	fi
 
 	if test "$ac_cv_lbl_snf_api" = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($snf_root)" >&5
 $as_echo "yes ($snf_root)" >&6; }
 
 		V_INCLS="$V_INCLS -I$snf_include_dir"
 		LIBS="$LIBS -lsnf"
 		LDFLAGS="$LDFLAGS -L$snf_lib_dir"
 
 		if test "$V_PCAP" != snf ; then
 			SSRC="$SSRC pcap-snf.c"
 		fi
 
 
 $as_echo "#define HAVE_SNF_API 1" >>confdefs.h
 
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 		if test "$want_snf" = yes; then
 			# User requested "snf" capture type but
 			# we couldn't find the Sniffer API support.
 			as_fn_error $? "Myricom Sniffer support requested with --with-pcap=snf, but the Sniffer headers weren't found at $snf_include_dir: make sure the Sniffer support is installed, specify a different path or paths if necessary, or don't request Sniffer support" "$LINENO" 5
 		fi
 
 		if test "$want_snf" = yes; then
 			as_fn_error $? "Myricom Sniffer support requested with --with-snf, but the Sniffer headers weren't found at $snf_include_dir: make sure the Sniffer support is installed, specify a different path or paths if necessary, or don't request Sniffer support" "$LINENO" 5
 		fi
 	fi
 fi
 
 # Check for Riverbed TurboCap support.
 
 # Check whether --with-turbocap was given.
 if test "${with_turbocap+set}" = set; then :
   withval=$with_turbocap;
 	if test "$withval" = no
 	then
 		# User explicitly doesn't want TurboCap
 		want_turbocap=no
 	elif test "$withval" = yes
 	then
 		# User wants TurboCap support but hasn't specified a directory.
 		want_turbocap=yes
 	else
 		# User wants TurboCap support with a specified directory.
 		want_turbocap=yes
 		turbocap_root=$withval
 	fi
 
 else
 
 	if test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want TurboCap support.
 		want_turbocap=no
 	else
 		#
 		# Use TurboCap API if present, otherwise don't
 		#
 		want_turbocap=ifpresent
 	fi
 
 fi
 
 
 ac_cv_lbl_turbocap_api=no
 if test "$want_turbocap" != no; then
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether TurboCap is supported" >&5
 $as_echo_n "checking whether TurboCap is supported... " >&6; }
 
 	save_CFLAGS="$CFLAGS"
 	save_LIBS="$LIBS"
 	if test ! -z "$turbocap_root"; then
 		TURBOCAP_CFLAGS="-I$turbocap_root/include"
 		TURBOCAP_LIBS="-L$turbocap_root/lib"
 		CFLAGS="$CFLAGS $TURBOCAP_CFLAGS"
 	fi
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #include <TcApi.h>
 
 int
 main ()
 {
 
 	    TC_INSTANCE a; TC_PORT b; TC_BOARD c;
 	    TC_INSTANCE i;
 	    (void)TcInstanceCreateByName("foo", &i);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_lbl_turbocap_api=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 	CFLAGS="$save_CFLAGS"
 	if test $ac_cv_lbl_turbocap_api = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 		SSRC="$SSRC pcap-tc.c"
 		V_INCLS="$V_INCLS $TURBOCAP_CFLAGS"
 		LIBS="$LIBS $TURBOCAP_LIBS -lTcApi -lpthread -lstdc++"
 
 
 $as_echo "#define HAVE_TC_API 1" >>confdefs.h
 
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 		if test "$want_turbocap" = yes; then
 	        	# User wanted Turbo support but we couldn't find it.
 			as_fn_error $? "TurboCap support requested with --with-turbocap, but the TurboCap headers weren't found: make sure the TurboCap support is installed or don't request TurboCap support" "$LINENO" 5
 		fi
 	fi
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable remote packet capture" >&5
+$as_echo_n "checking whether to enable remote packet capture... " >&6; }
+# Check whether --enable-remote was given.
+if test "${enable_remote+set}" = set; then :
+  enableval=$enable_remote;
+else
+  enableval=no
+fi
+
+case "$enableval" in
+yes)	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Remote packet capture may expose libpcap-based applications" >&5
+$as_echo "$as_me: WARNING: Remote packet capture may expose libpcap-based applications" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: to attacks by malicious remote capture servers!" >&5
+$as_echo "$as_me: WARNING: to attacks by malicious remote capture servers!" >&2;}
+	#
+	# rpcapd requires pthreads on UN*X.
+	#
+	if test "$ac_lbl_have_pthreads" != "found"; then
+		as_fn_error $? "rpcapd requires pthreads, but we didn't find them" "$LINENO" 5
+	fi
+	#
+	# It also requires crypt().
+	# Do we have it in the system libraries?
+	#
+	ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
+if test "x$ac_cv_func_crypt" = xyes; then :
+
+else
+
+		#
+		# No.  Do we have it in -lcrypt?
+		#
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypt_crypt=yes
+else
+  ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+
+			#
+			# Yes; add -lcrypt to the libraries for rpcapd.
+			#
+			RPCAPD_LIBS="$RPCAPD_LIBS -lcrypt"
+
+else
+
+			as_fn_error $? "rpcapd requires crypt(), but we didn't find it" "$LINENO" 5
+
+fi
+
+
+fi
+
+
+	#
+	# OK, we have crypt().  Do we have getspnam()?
+	#
+	for ac_func in getspnam
+do :
+  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
+if test "x$ac_cv_func_getspnam" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETSPNAM 1
+_ACEOF
+
+fi
+done
+
+
+	#
+	# Check for various members of struct msghdr.
+	#
+	ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "
+		#include \"ftmacros.h\"
+		#include <sys/socket.h>
+
+"
+if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
+_ACEOF
+
+
+fi
+
+	ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_flags" "ac_cv_member_struct_msghdr_msg_flags" "
+		#include \"ftmacros.h\"
+		#include <sys/socket.h>
+
+"
+if test "x$ac_cv_member_struct_msghdr_msg_flags" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
+_ACEOF
+
+
+fi
+
+
+
+$as_echo "#define ENABLE_REMOTE /**/" >>confdefs.h
+
+	SSRC="$SSRC pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c"
+	BUILD_RPCAPD=build-rpcapd
+	INSTALL_RPCAPD=install-rpcapd
+	;;
+*)	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build optimizer debugging code" >&5
+$as_echo_n "checking whether to build optimizer debugging code... " >&6; }
+# Check whether --enable-optimizer-dbg was given.
+if test "${enable_optimizer_dbg+set}" = set; then :
+  enableval=$enable_optimizer_dbg;
+fi
+
+if test "$enable_optimizer_dbg" = "yes"; then
+
+$as_echo "#define BDEBUG 1" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_optimizer_dbg-no}" >&5
+$as_echo "${enable_optimizer_dbg-no}" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build parser debugging code" >&5
+$as_echo_n "checking whether to build parser debugging code... " >&6; }
+# Check whether --enable-yydebug was given.
+if test "${enable_yydebug+set}" = set; then :
+  enableval=$enable_yydebug;
+fi
+
+if test "$enable_yydebug" = "yes"; then
+
+$as_echo "#define YYDEBUG 1" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_yydebug-no}" >&5
+$as_echo "${enable_yydebug-no}" >&6; }
+
 #
 # Look for {f}lex.
 #
 for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_LEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LEX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
 $as_echo "$LEX" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$LEX" && break
 done
 test -n "$LEX" || LEX=":"
 
 if test "x$LEX" != "x:"; then
   cat >conftest.l <<_ACEOF
 %%
 a { ECHO; }
 b { REJECT; }
 c { yymore (); }
 d { yyless (1); }
 e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
     yyless ((input () != 0)); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 %%
 #ifdef YYTEXT_POINTER
 extern char *yytext;
 #endif
 int
 main (void)
 {
   return ! yylex () + ! yywrap ();
 }
 _ACEOF
 { { ac_try="$LEX conftest.l"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
 $as_echo_n "checking lex output file root... " >&6; }
 if ${ac_cv_prog_lex_root+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 if test -f lex.yy.c; then
   ac_cv_prog_lex_root=lex.yy
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
   as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
 $as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
 $as_echo_n "checking lex library... " >&6; }
 if ${ac_cv_lib_lex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     ac_save_LIBS=$LIBS
     ac_cv_lib_lex='none needed'
     for ac_lib in '' -lfl -ll; do
       LIBS="$ac_lib $ac_save_LIBS"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_lex=$ac_lib
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
     done
     LIBS=$ac_save_LIBS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
 $as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
 $as_echo_n "checking whether yytext is a pointer... " >&6; }
 if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
 # not all implementations provide the %pointer and %array declarations.
 ac_cv_prog_lex_yytext_pointer=no
 ac_save_LIBS=$LIBS
 LIBS="$LEXLIB $ac_save_LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_prog_lex_yytext_pointer=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
 $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
 $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
 fi
 rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
 fi
 if test "$LEX" = ":"; then
 	as_fn_error $? "Neither flex nor lex was found." "$LINENO" 5
 fi
 
 #
 # Make sure {f}lex supports the -P, --header-file, and --nounput flags
 # and supports processing our scanner.l.
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capable lex" >&5
 $as_echo_n "checking for capable lex... " >&6; }
 if ${tcpdump_cv_capable_lex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if $LEX -P pcap_ --header-file=/dev/null --nounput -t $srcdir/scanner.l > /dev/null 2>&1; then
 	    tcpdump_cv_capable_lex=yes
 	else
 	    tcpdump_cv_capable_lex=insufficient
 	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcpdump_cv_capable_lex" >&5
 $as_echo "$tcpdump_cv_capable_lex" >&6; }
 if test $tcpdump_cv_capable_lex = insufficient ; then
 	as_fn_error $? "$LEX is insufficient to compile libpcap.
  libpcap requires Flex 2.5.31 or later, or a compatible version of lex." "$LINENO" 5
 fi
 
 #
 # Look for yacc/bison/byacc.
 #
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_YACC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
 $as_echo "$YACC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 
 
 #
 # Make sure it supports the -p flag and supports processing our
 # grammar.y.
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capable yacc/bison" >&5
 $as_echo_n "checking for capable yacc/bison... " >&6; }
 if ${tcpdump_cv_capable_yacc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if $YACC -p pcap_ -o /dev/null $srcdir/grammar.y >/dev/null 2>&1; then
 	    tcpdump_cv_capable_yacc=yes
 	else
 	    tcpdump_cv_capable_yacc=insufficient
 	fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcpdump_cv_capable_yacc" >&5
 $as_echo "$tcpdump_cv_capable_yacc" >&6; }
 if test $tcpdump_cv_capable_yacc = insufficient ; then
 	as_fn_error $? "$YACC is insufficient to compile libpcap.
  libpcap requires Bison, Berkeley YACC, or another YACC compatible with them." "$LINENO" 5
 fi
 
 #
-# Assume, by default, no support for shared libraries and V7/BSD convention
-# for man pages (file formats in section 5, miscellaneous info in section 7).
+# Do various checks for various OSes and versions of those OSes.
+#
+# Assume, by default, no support for shared libraries and V7/BSD
+# convention for man pages (file formats in section 5, miscellaneous
+# info in section 7, administrative commands and daemons in section 8).
 # Individual cases can override this.
 #
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
+MAN_ADMIN_COMMANDS=8
 case "$host_os" in
 
 aix*)
 
 $as_echo "#define _SUN 1" >>confdefs.h
 
 
 	#
 	# AIX makes it fun to build shared and static libraries,
 	# because they're *both* ".a" archive libraries.  We
 	# build the static library for the benefit of the traditional
 	# scheme of building libpcap and tcpdump in subdirectories of
 	# the same directory, with tcpdump statically linked with the
 	# libpcap in question, but we also build a shared library as
 	# "libpcap.shareda" and install *it*, rather than the static
 	# library, as "libpcap.a".
 	#
 	DYEXT="shareda"
 
 	case "$V_PCAP" in
 
 	dlpi)
 		#
 		# If we're using DLPI, applications will need to
 		# use /lib/pse.exp if present, as we use the
 		# STREAMS routines.
 		#
 		pseexe="/lib/pse.exp"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $pseexe" >&5
 $as_echo_n "checking for $pseexe... " >&6; }
 		if test -f $pseexe ; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			LIBS="-I:$pseexe"
 		fi
 		;;
 
 	bpf)
 		#
 		# If we're using BPF, we need "-lodm" and "-lcfg", as
 		# we use them to load the BPF module.
 		#
 		LIBS="-lodm -lcfg"
 		;;
 	esac
 	;;
 
 darwin*)
 	DYEXT="dylib"
 	V_CCOPT="$V_CCOPT -fno-common"
 	# Check whether --enable-universal was given.
 if test "${enable_universal+set}" = set; then :
   enableval=$enable_universal;
 fi
 
 	if test "$enable_universal" != "no"; then
 		case "$host_os" in
 
 		darwin0-7.*)
 			#
 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
 			# need for any special compiler or linker flags.
 			#
 			;;
 
 		darwin8.0123*)
 			#
 			# Tiger, prior to Intel support.  Build for 32-bit
 			# PowerPC and 64-bit PowerPC, with 32-bit PowerPC
 			# first.  (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64"
 			;;
 
 		darwin8.456*)
 			#
 			# Tiger, subsequent to Intel support but prior to
 			# x86-64 support.  Build for 32-bit PowerPC, 64-bit
 			# PowerPC, and x86, with 32-bit PowerPC first.
 			# (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386"
 			;;
 
 		darwin8.*)
 			#
 			# All other Tiger, so subsequent to x86-64
 			# support. Build for 32-bit PowerPC, 64-bit
 			# PowerPC, x86, and x86-64, and with 32-bit PowerPC
 			# first.  (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			;;
 
 		darwin9.*)
 			#
 			# Leopard.  Build for 32-bit PowerPC, 64-bit
 			# PowerPC, x86, and x86-64, with 32-bit PowerPC
 			# first.  (That's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			;;
 
 		darwin10.*)
 			#
 			# Snow Leopard.  Build for x86-64, x86, and
 			# 32-bit PowerPC, with x86-64 first.  (That's
 			# what Apple does, even though Snow Leopard
 			# doesn't run on PPC, so PPC libpcap runs under
 			# Rosetta, and Rosetta doesn't support BPF
 			# ioctls, so PPC programs can't do live
 			# captures.)
 			#
 			V_CCOPT="$V_CCOPT -arch x86_64 -arch i386 -arch ppc"
 			LDFLAGS="$LDFLAGS -arch x86_64 -arch i386 -arch ppc"
 			;;
 
 		darwin*)
 			#
 			# Post-Snow Leopard.  Build for x86-64 and
 			# x86, with x86-64 first.  (That's probably what
 			# Apple does, given that Rosetta is gone.)
 			# XXX - update if and when Apple drops support
 			# for 32-bit x86 code.
 			#
 			V_CCOPT="$V_CCOPT -arch x86_64 -arch i386"
 			LDFLAGS="$LDFLAGS -arch x86_64 -arch i386"
 			;;
 		esac
 	fi
 	;;
 
 hpux9*)
 
 $as_echo "#define HAVE_HPUX9 1" >>confdefs.h
 
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux10.0*)
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux10.1*)
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux*)
 
 $as_echo "#define HAVE_HPUX10_20_OR_LATER 1" >>confdefs.h
 
 	if test "`uname -m`" = "ia64"; then
 		DYEXT="so"
 	else
 		DYEXT="sl"
 	fi
 
 	#
 	# "-b" builds a shared library; "+h" sets the soname.
 	#
 	SHLIB_OPT="-b"
 	SONAME_OPT="+h"
 
 	#
 	# Use System V conventions for man pages.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 irix*)
 	#
-	# Use System V conventions for man pages.
+	# Use IRIX conventions for man pages; they're the same as the
+	# System V conventions, except that they use section 8 for
+	# administrative commands and daemons.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 linux*|freebsd*|netbsd*|openbsd*|dragonfly*|kfreebsd*|gnu*)
 	DYEXT="so"
 
 	#
 	# Compiler assumed to be GCC; run-time linker may require a -R
 	# flag.
 	#
 	if test "$libdir" != "/usr/lib"; then
 		V_RFLAGS=-Wl,-R$libdir
 	fi
 	;;
 
 osf*)
 	DYEXT="so"
 
 	#
-	# Use System V conventions for man pages.
+	# DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX.
+	# Use Tru64 UNIX conventions for man pages; they're the same as
+	# the System V conventions except that they use section 8 for
+	# administrative commands and daemons.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 sinix*)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SINIX compiler defines sinix" >&5
 $as_echo_n "checking if SINIX compiler defines sinix... " >&6; }
 	if ${ac_cv_cc_sinix_defined+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 int i = sinix;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cc_sinix_defined=yes
 else
   ac_cv_cc_sinix_defined=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_sinix_defined" >&5
 $as_echo "$ac_cv_cc_sinix_defined" >&6; }
 	    if test $ac_cv_cc_sinix_defined = no ; then
 
 $as_echo "#define sinix 1" >>confdefs.h
 
 	    fi
 	;;
 
 solaris*)
 
 $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h
 
 
 	DYEXT="so"
+
 	#
-	# Use System V conventions for man pages.
+	# Make sure errno is thread-safe, in case we're called in
+	# a multithreaded program.  We don't guarantee that two
+	# threads can use the *same* pcap_t safely, but the
+	# current version does guarantee that you can use different
+	# pcap_t's in different threads, and even that pcap_compile()
+	# is thread-safe (it wasn't thread-safe in some older versions).
 	#
-	MAN_FILE_FORMATS=4
-	MAN_MISC_INFO=5
+	V_CCOPT="$V_CCOPT -D_TS_ERRNO"
+
+	case "`uname -r`" in
+
+	5.12)
+		;;
+
+	*)
+		#
+		# Use System V conventions for man pages.
+		#
+		MAN_ADMIN_COMMANDS=1m
+		MAN_FILE_FORMATS=4
+		MAN_MISC_INFO=5
+	esac
 	;;
 esac
 
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;
 fi
 
 test "x$enable_shared" = "xno" && DYEXT="none"
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
     RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
   fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
     AR=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
   fi
 else
   AR="$ac_cv_prog_AR"
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 
 
 rm -f os-proto.h
     if test "${LBL_CFLAGS+set}" = set; then
 	    V_CCOPT="$V_CCOPT ${LBL_CFLAGS}"
     fi
     if test -f .devel ; then
 	    #
 	    # Skip all the warning option stuff on some compilers.
 	    #
 	    if test "$ac_lbl_cc_dont_try_gcc_dashW" != yes; then
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler fails when given an unknown warning option" >&5
 $as_echo_n "checking whether the compiler fails when given an unknown warning option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Wxyzzy-this-will-never-succeed-xyzzy"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		#
 		# We're assuming this is clang, where
 		# -Werror=unknown-warning-option is the appropriate
 		# option to force the compiler to fail.
 		#
 		ac_lbl_unknown_warning_option_error="-Werror=unknown-warning-option"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$save_CFLAGS"
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wall option" >&5
 $as_echo_n "checking whether the compiler supports the -Wall option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wall" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wall"
 	elif expr "x-Wall" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wall"
 	elif expr "x-Wall" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wall"
 	else
 	    CFLAGS="$CFLAGS -Wall"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wall"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wsign-compare option" >&5
 $as_echo_n "checking whether the compiler supports the -Wsign-compare option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wsign-compare" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wsign-compare"
 	elif expr "x-Wsign-compare" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wsign-compare"
 	elif expr "x-Wsign-compare" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wsign-compare"
 	else
 	    CFLAGS="$CFLAGS -Wsign-compare"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wsign-compare"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wmissing-prototypes option" >&5
 $as_echo_n "checking whether the compiler supports the -Wmissing-prototypes option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wmissing-prototypes" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wmissing-prototypes"
 	elif expr "x-Wmissing-prototypes" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wmissing-prototypes"
 	elif expr "x-Wmissing-prototypes" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wmissing-prototypes"
 	else
 	    CFLAGS="$CFLAGS -Wmissing-prototypes"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wmissing-prototypes"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wstrict-prototypes option" >&5
 $as_echo_n "checking whether the compiler supports the -Wstrict-prototypes option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wstrict-prototypes" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wstrict-prototypes"
 	elif expr "x-Wstrict-prototypes" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
 	elif expr "x-Wstrict-prototypes" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
 	else
 	    CFLAGS="$CFLAGS -Wstrict-prototypes"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wstrict-prototypes"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wshadow option" >&5
 $as_echo_n "checking whether the compiler supports the -Wshadow option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wshadow" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wshadow"
 	elif expr "x-Wshadow" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wshadow"
 	elif expr "x-Wshadow" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wshadow"
 	else
 	    CFLAGS="$CFLAGS -Wshadow"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wshadow"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wdeclaration-after-statement option" >&5
 $as_echo_n "checking whether the compiler supports the -Wdeclaration-after-statement option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wdeclaration-after-statement" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wdeclaration-after-statement"
 	elif expr "x-Wdeclaration-after-statement" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wdeclaration-after-statement"
 	elif expr "x-Wdeclaration-after-statement" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wdeclaration-after-statement"
 	else
 	    CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wdeclaration-after-statement"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wused-but-marked-unused option" >&5
 $as_echo_n "checking whether the compiler supports the -Wused-but-marked-unused option... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	if expr "x-Wused-but-marked-unused" : "x-W.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wused-but-marked-unused"
 	elif expr "x-Wused-but-marked-unused" : "x-f.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wused-but-marked-unused"
 	elif expr "x-Wused-but-marked-unused" : "x-m.*" >/dev/null
 	then
 	    CFLAGS="$CFLAGS -Werror -Wused-but-marked-unused"
 	else
 	    CFLAGS="$CFLAGS -Wused-but-marked-unused"
 	fi
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 return 0
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		CFLAGS="$save_CFLAGS"
 		V_CCOPT="$V_CCOPT -Wused-but-marked-unused"
 
 else
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		CFLAGS="$save_CFLAGS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wdocumentation option" >&5
+$as_echo_n "checking whether the compiler supports the -Wdocumentation option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wdocumentation" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wdocumentation"
+	elif expr "x-Wdocumentation" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wdocumentation"
+	elif expr "x-Wdocumentation" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wdocumentation"
+	else
+	    CFLAGS="$CFLAGS -Wdocumentation"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wdocumentation"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wcomma option" >&5
+$as_echo_n "checking whether the compiler supports the -Wcomma option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wcomma" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wcomma"
+	elif expr "x-Wcomma" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wcomma"
+	elif expr "x-Wcomma" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wcomma"
+	else
+	    CFLAGS="$CFLAGS -Wcomma"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wcomma"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wmissing-noreturn option" >&5
+$as_echo_n "checking whether the compiler supports the -Wmissing-noreturn option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wmissing-noreturn" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wmissing-noreturn"
+	elif expr "x-Wmissing-noreturn" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wmissing-noreturn"
+	elif expr "x-Wmissing-noreturn" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wmissing-noreturn"
+	else
+	    CFLAGS="$CFLAGS -Wmissing-noreturn"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wmissing-noreturn"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+		    # Warns about safeguards added in case the enums are
+		    # extended
+		    # AC_LBL_CHECK_COMPILER_OPT(V_CCOPT, -Wcovered-switch-default)
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wmissing-variable-declarations option" >&5
+$as_echo_n "checking whether the compiler supports the -Wmissing-variable-declarations option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wmissing-variable-declarations" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wmissing-variable-declarations"
+	elif expr "x-Wmissing-variable-declarations" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wmissing-variable-declarations"
+	elif expr "x-Wmissing-variable-declarations" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wmissing-variable-declarations"
+	else
+	    CFLAGS="$CFLAGS -Wmissing-variable-declarations"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wmissing-variable-declarations"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wunused-parameter option" >&5
+$as_echo_n "checking whether the compiler supports the -Wunused-parameter option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wunused-parameter" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wunused-parameter"
+	elif expr "x-Wunused-parameter" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wunused-parameter"
+	elif expr "x-Wunused-parameter" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wunused-parameter"
+	else
+	    CFLAGS="$CFLAGS -Wunused-parameter"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wunused-parameter"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wformat-nonliteral option" >&5
+$as_echo_n "checking whether the compiler supports the -Wformat-nonliteral option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wformat-nonliteral" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wformat-nonliteral"
+	elif expr "x-Wformat-nonliteral" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wformat-nonliteral"
+	elif expr "x-Wformat-nonliteral" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wformat-nonliteral"
+	else
+	    CFLAGS="$CFLAGS -Wformat-nonliteral"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wformat-nonliteral"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wunreachable-code option" >&5
+$as_echo_n "checking whether the compiler supports the -Wunreachable-code option... " >&6; }
+	save_CFLAGS="$CFLAGS"
+	if expr "x-Wunreachable-code" : "x-W.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wunreachable-code"
+	elif expr "x-Wunreachable-code" : "x-f.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wunreachable-code"
+	elif expr "x-Wunreachable-code" : "x-m.*" >/dev/null
+	then
+	    CFLAGS="$CFLAGS -Werror -Wunreachable-code"
+	else
+	    CFLAGS="$CFLAGS -Wunreachable-code"
+	fi
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		CFLAGS="$save_CFLAGS"
+		V_CCOPT="$V_CCOPT -Wunreachable-code"
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 	    fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports generating dependencies" >&5
 $as_echo_n "checking whether the compiler supports generating dependencies... " >&6; }
 	if test "$GCC" = yes ; then
 		#
 		# GCC, or a compiler deemed to be GCC by AC_PROG_CC (even
 		# though it's not); we assume that, in this case, the flag
 		# would be -M.
 		#
 		ac_lbl_dependency_flag="-M"
 	else
 		#
 		# Not GCC or a compiler deemed to be GCC; what platform is
 		# this?  (We're assuming that if the compiler isn't GCC
 		# it's the compiler from the vendor of the OS; that won't
 		# necessarily be true for x86 platforms, where it might be
 		# the Intel C compiler.)
 		#
 		case "$host_os" in
 
 		irix*|osf*|darwin*)
 			#
 			# MIPS C for IRIX, DEC C, and clang all use -M.
 			#
 			ac_lbl_dependency_flag="-M"
 			;;
 
 		solaris*)
 			#
 			# Sun C uses -xM.
 			#
 			ac_lbl_dependency_flag="-xM"
 			;;
 
 		hpux*)
 			#
 			# HP's older C compilers don't support this.
 			# HP's newer C compilers support this with
 			# either +M or +Make; the older compilers
 			# interpret +M as something completely
 			# different, so we use +Make so we don't
 			# think it works with the older compilers.
 			#
 			ac_lbl_dependency_flag="+Make"
 			;;
 
 		*)
 			#
 			# Not one of the above; assume no support for
 			# generating dependencies.
 			#
 			ac_lbl_dependency_flag=""
 			;;
 		esac
 	fi
 
 	#
 	# Is ac_lbl_dependency_flag defined and, if so, does the compiler
 	# complain about it?
 	#
 	# Note: clang doesn't seem to exit with an error status when handed
 	# an unknown non-warning error, even if you pass it
 	# -Werror=unknown-warning-option.  However, it always supports
 	# -M, so the fact that this test always succeeds with clang
 	# isn't an issue.
 	#
 	if test ! -z "$ac_lbl_dependency_flag"; then
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return 0; }
 _ACEOF
-		echo "$CC" $ac_lbl_dependency_flag conftest.c >&5
-		if "$CC" $ac_lbl_dependency_flag conftest.c >/dev/null 2>&1; then
+		if { { $as_echo "$as_me:${as_lineno-$LINENO}: eval \"\$CC \$ac_lbl_dependency_flag conftest.c >/dev/null 2>&1\""; } >&5
+  (eval "$CC $ac_lbl_dependency_flag conftest.c >/dev/null 2>&1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $ac_lbl_dependency_flag" >&5
 $as_echo "yes, with $ac_lbl_dependency_flag" >&6; }
 			DEPENDENCY_CFLAG="$ac_lbl_dependency_flag"
 			MKDEP='${srcdir}/mkdep'
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			#
 			# We can't run mkdep, so have "make depend" do
 			# nothing.
 			#
-			MKDEP=:
+			MKDEP='${srcdir}/nomkdep'
 		fi
 		rm -rf conftest*
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		#
 		# We can't run mkdep, so have "make depend" do
 		# nothing.
 		#
-		MKDEP=:
+		MKDEP='${srcdir}/nomkdep'
 	fi
 
 
 
 	    #
 	    # We used to set -n32 for IRIX 6 when not using GCC (presumed
 	    # to mean that we're using MIPS C or MIPSpro C); it specified
 	    # the "new" faster 32-bit ABI, introduced in IRIX 6.2.  I'm
 	    # not sure why that would be something to do *only* with a
 	    # .devel file; why should the ABI for which we produce code
 	    # depend on .devel?
 	    #
 	    os=`echo $host_os | sed -e 's/\([0-9][0-9]*\)[^0-9].*$/\1/'`
 	    name="lbl/os-$os.h"
 	    if test -f $name ; then
 		    ln -s $name os-proto.h
 
 $as_echo "#define HAVE_OS_PROTO_H 1" >>confdefs.h
 
 	    else
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find $name" >&5
 $as_echo "$as_me: WARNING: can't find $name" >&2;}
 	    fi
     fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr struct has the sa_len member" >&5
-$as_echo_n "checking if sockaddr struct has the sa_len member... " >&6; }
-    if ${ac_cv_lbl_sockaddr_has_sa_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+#
+# Check to see if the sockaddr struct has the 4.4 BSD sa_len member.
+#
+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "
+	#include <sys/types.h>
+	#include <sys/socket.h>
 
-#	include <sys/types.h>
-#	include <sys/socket.h>
-int
-main ()
-{
-u_int i = sizeof(((struct sockaddr *)0)->sa_len)
-  ;
-  return 0;
-}
+"
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_sockaddr_has_sa_len=yes
-else
-  ac_cv_lbl_sockaddr_has_sa_len=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_sockaddr_has_sa_len" >&5
-$as_echo "$ac_cv_lbl_sockaddr_has_sa_len" >&6; }
-    if test $ac_cv_lbl_sockaddr_has_sa_len = yes ; then
 
-$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+fi
 
-    fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr_storage struct exists" >&5
-$as_echo_n "checking if sockaddr_storage struct exists... " >&6; }
-    if ${ac_cv_lbl_has_sockaddr_storage+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+#
+# Check to see if there's a sockaddr_storage structure.
+#
+ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "
+	#include <sys/types.h>
+	#include <sys/socket.h>
 
-#	include <sys/types.h>
-#	include <sys/socket.h>
-int
-main ()
-{
-u_int i = sizeof (struct sockaddr_storage)
-  ;
-  return 0;
-}
+"
+if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_has_sockaddr_storage=yes
-else
-  ac_cv_lbl_has_sockaddr_storage=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_has_sockaddr_storage" >&5
-$as_echo "$ac_cv_lbl_has_sockaddr_storage" >&6; }
-    if test $ac_cv_lbl_has_sockaddr_storage = yes ; then
 
-$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
+fi
 
-    fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dl_hp_ppa_info_t struct has dl_module_id_1 member" >&5
-$as_echo_n "checking if dl_hp_ppa_info_t struct has dl_module_id_1 member... " >&6; }
-    if ${ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+#
+# Check to see if the dl_hp_ppa_info_t struct has the HP-UX 11.00
+# dl_module_id_1 member.
+#
+# NOTE: any failure means we conclude that it doesn't have that member,
+# so if we don't have DLPI, don't have a <sys/dlpi_ext.h> header, or
+# have one that doesn't declare a dl_hp_ppa_info_t type, we conclude
+# it doesn't have that member (which is OK, as either we won't be
+# using code that would use that member, or we wouldn't compile in
+# any case).
+#
+ac_fn_c_check_member "$LINENO" "dl_hp_ppa_info_t" "dl_module_id_1" "ac_cv_member_dl_hp_ppa_info_t_dl_module_id_1" "
+	#include <sys/types.h>
+	#include <sys/dlpi.h>
+	#include <sys/dlpi_ext.h>
 
-#	include <sys/types.h>
-#	include <sys/dlpi.h>
-#	include <sys/dlpi_ext.h>
-int
-main ()
-{
-u_int i = sizeof(((dl_hp_ppa_info_t *)0)->dl_module_id_1)
-  ;
-  return 0;
-}
+"
+if test "x$ac_cv_member_dl_hp_ppa_info_t_dl_module_id_1" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=yes
-else
-  ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&5
-$as_echo "$ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&6; }
-    if test $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1 = yes ; then
 
-$as_echo "#define HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 1" >>confdefs.h
+fi
 
-    fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if unaligned accesses fail" >&5
 $as_echo_n "checking if unaligned accesses fail... " >&6; }
     if ${ac_cv_lbl_unaligned_fail+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$host_cpu" in
 
 	#
 	# These are CPU types where:
 	#
 	#	the CPU faults on an unaligned access, but at least some
 	#	OSes that support that CPU catch the fault and simulate
 	#	the unaligned access (e.g., Alpha/{Digital,Tru64} UNIX) -
 	#	the simulation is slow, so we don't want to use it;
 	#
 	#	the CPU, I infer (from the old
 	#
 	# XXX: should also check that they don't do weird things (like on arm)
 	#
 	#	comment) doesn't fault on unaligned accesses, but doesn't
 	#	do a normal unaligned fetch, either (e.g., presumably, ARM);
 	#
 	#	for whatever reason, the test program doesn't work
 	#	(this has been claimed to be the case for several of those
 	#	CPUs - I don't know what the problem is; the problem
 	#	was reported as "the test program dumps core" for SuperH,
 	#	but that's what the test program is *supposed* to do -
 	#	it dumps core before it writes anything, so the test
 	#	for an empty output file should find an empty output
 	#	file and conclude that unaligned accesses don't work).
 	#
 	# This run-time test won't work if you're cross-compiling, so
 	# in order to support cross-compiling for a particular CPU,
 	# we have to wire in the list of CPU types anyway, as far as
 	# I know, so perhaps we should just have a set of CPUs on
 	# which we know it doesn't work, a set of CPUs on which we
 	# know it does work, and have the script just fail on other
 	# cpu types and update it when such a failure occurs.
 	#
 	alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1)
 		ac_cv_lbl_unaligned_fail=yes
 		;;
 
 	*)
 		cat >conftest.c <<EOF
 #		include <sys/types.h>
 #		include <sys/wait.h>
 #		include <stdio.h>
 		unsigned char a[5] = { 1, 2, 3, 4, 5 };
 		main() {
 		unsigned int i;
 		pid_t pid;
 		int status;
 		/* avoid "core dumped" message */
 		pid = fork();
 		if (pid <  0)
 			exit(2);
 		if (pid > 0) {
 			/* parent */
 			pid = waitpid(pid, &status, 0);
 			if (pid < 0)
 				exit(3);
 			exit(!WIFEXITED(status));
 		}
 		/* child */
 		i = *(unsigned int *)&a[1];
 		printf("%d\n", i);
 		exit(0);
 		}
 EOF
 		${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
 		    conftest.c $LIBS >/dev/null 2>&1
 		if test ! -x conftest ; then
 						ac_cv_lbl_unaligned_fail=yes
 		else
 			./conftest >conftest.out
 			if test ! -s conftest.out ; then
 				ac_cv_lbl_unaligned_fail=yes
 			else
 				ac_cv_lbl_unaligned_fail=no
 			fi
 		fi
 		rm -f -r conftest* core core.conftest
 		;;
 	esac
 fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_unaligned_fail" >&5
 $as_echo "$ac_cv_lbl_unaligned_fail" >&6; }
     if test $ac_cv_lbl_unaligned_fail = yes ; then
 
 $as_echo "#define LBL_ALIGN 1" >>confdefs.h
 
     fi
 
-rm -f net
-ln -s ${srcdir}/bpf/net net
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
+
+
+
+
+
+
 # Check whether --enable-usb was given.
 if test "${enable_usb+set}" = set; then :
   enableval=$enable_usb;
 else
   enable_usb=yes
 fi
 
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want USB support.
 	enable_usb=no
 fi
 
 if test "x$enable_usb" != "xno" ; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB sniffing support" >&5
 $as_echo_n "checking for USB sniffing support... " >&6; }
    case "$host_os" in
    linux*)
 
 $as_echo "#define PCAP_SUPPORT_USB 1" >>confdefs.h
 
 	USB_SRC=pcap-usb-linux.c
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
 	if test $? -ne 0 ; then
 	  ac_usb_dev_name="usbmon"
 	fi
 
 cat >>confdefs.h <<_ACEOF
 #define LINUX_USB_MON_DEV "/dev/$ac_usb_dev_name"
 _ACEOF
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Device for USB sniffing is /dev/$ac_usb_dev_name" >&5
 $as_echo "$as_me: Device for USB sniffing is /dev/$ac_usb_dev_name" >&6;}
 	#
 	# Do we have a version of <linux/compiler.h> available?
 	# If so, we might need it for <linux/usbdevice_fs.h>.
 	#
 	for ac_header in linux/compiler.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/compiler.h" "ac_cv_header_linux_compiler_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_compiler_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_COMPILER_H 1
 _ACEOF
 
 fi
 
 done
 
 	if test "$ac_cv_header_linux_compiler_h" = yes; then
 	  #
 	  # Yes - include it when testing for <linux/usbdevice_fs.h>.
 	  #
 	  for ac_header in linux/usbdevice_fs.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "#include <linux/compiler.h>
 "
 if test "x$ac_cv_header_linux_usbdevice_fs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_USBDEVICE_FS_H 1
 _ACEOF
 
 fi
 
 done
 
 	else
 	  for ac_header in linux/usbdevice_fs.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_usbdevice_fs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_USBDEVICE_FS_H 1
 _ACEOF
 
 fi
 
 done
 
 	fi
 	if test "$ac_cv_header_linux_usbdevice_fs_h" = yes; then
 	  #
 	  # OK, does it define bRequestType?  Older versions of the kernel
 	  # define fields with names like "requesttype, "request", and
 	  # "value", rather than "bRequestType", "bRequest", and
 	  # "wValue".
 	  #
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if usbdevfs_ctrltransfer struct has bRequestType member" >&5
-$as_echo_n "checking if usbdevfs_ctrltransfer struct has bRequestType member... " >&6; }
-	  if ${ac_cv_usbdevfs_ctrltransfer_has_bRequestType+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+	  ac_fn_c_check_member "$LINENO" "struct usbdevfs_ctrltransfer" "bRequestType" "ac_cv_member_struct_usbdevfs_ctrltransfer_bRequestType" "
+		  $ac_includes_default
+		  #ifdef HAVE_LINUX_COMPILER_H
+		  #include <linux/compiler.h>
+		  #endif
+		  #include <linux/usbdevice_fs.h>
 
-$ac_includes_default
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_LINUX_COMPILER_H
-#include <linux/compiler.h>
-#endif
-#include <linux/usbdevice_fs.h>
-int
-main ()
-{
-u_int i = sizeof(((struct usbdevfs_ctrltransfer *)0)->bRequestType)
-  ;
-  return 0;
-}
+"
+if test "x$ac_cv_member_struct_usbdevfs_ctrltransfer_bRequestType" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_usbdevfs_ctrltransfer_has_bRequestType=yes
-else
-  ac_cv_usbdevfs_ctrltransfer_has_bRequestType=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&5
-$as_echo "$ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&6; }
-	    if test $ac_cv_usbdevfs_ctrltransfer_has_bRequestType = yes ; then
 
-$as_echo "#define HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1" >>confdefs.h
+fi
 
-	    fi
 	fi
 	;;
     freebsd*)
 	#
 	# This just uses BPF in FreeBSD 8.4 and later; we don't need
 	# to check for anything special for capturing.
 	#
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in FreeBSD 8.4 and later" >&5
 $as_echo "yes, in FreeBSD 8.4 and later" >&6; }
 	;;
 
     *)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	;;
 esac
 fi
 
 
 
 if test "xxx_only" != yes; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the platform could support netfilter sniffing" >&5
 $as_echo_n "checking whether the platform could support netfilter sniffing... " >&6; }
 	case "$host_os" in
 	linux*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 		#
 		# Life's too short to deal with trying to get this to compile
 		# if you don't get the right types defined with
 		# __KERNEL_STRICT_NAMES getting defined by some other include.
 		#
 		# Check whether the includes Just Work.  If not, don't turn on
 		# netfilter support.
 		#
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile the netfilter support" >&5
 $as_echo_n "checking whether we can compile the netfilter support... " >&6; }
 		if ${ac_cv_netfilter_can_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 $ac_includes_default
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <linux/types.h>
 
 #include <linux/netlink.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
 #include <linux/netfilter/nfnetlink_queue.h>
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_netfilter_can_compile=yes
 else
   ac_cv_netfilter_can_compile=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_netfilter_can_compile" >&5
 $as_echo "$ac_cv_netfilter_can_compile" >&6; }
 		if test $ac_cv_netfilter_can_compile = yes ; then
 
 $as_echo "#define PCAP_SUPPORT_NETFILTER 1" >>confdefs.h
 
 		  NETFILTER_SRC=pcap-netfilter-linux.c
 		fi
 		;;
 	*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		;;
 	esac
 fi
 
 
 
+# Check whether --enable-netmap was given.
+if test "${enable_netmap+set}" = set; then :
+  enableval=$enable_netmap;
+else
+  enable_netmap=yes
+fi
+
+
+if test "x$enable_netmap" != "xno" ; then
+	#
+	# Check whether net/netmap_user.h is usable if NETMAP_WITH_LIBS is
+	# defined; it's not usable on DragonFly BSD 4.6 if NETMAP_WITH_LIBS
+	# is defined, for example, as it includes a non-existent malloc.h
+	# header.
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile the netmap support" >&5
+$as_echo_n "checking whether we can compile the netmap support... " >&6; }
+	if ${ac_cv_net_netmap_user_can_compile+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+$ac_includes_default
+#define NETMAP_WITH_LIBS
+#include <net/netmap_user.h>
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_net_netmap_user_can_compile=yes
+else
+  ac_cv_net_netmap_user_can_compile=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_net_netmap_user_can_compile" >&5
+$as_echo "$ac_cv_net_netmap_user_can_compile" >&6; }
+	if test $ac_cv_net_netmap_user_can_compile = yes ; then
+
+$as_echo "#define PCAP_SUPPORT_NETMAP 1" >>confdefs.h
+
+	    NETMAP_SRC=pcap-netmap.c
+	fi
+
+
+fi
+
+
 # Check whether --enable-bluetooth was given.
 if test "${enable_bluetooth+set}" = set; then :
   enableval=$enable_bluetooth;
 else
   enable_bluetooth=ifsupportavailable
 fi
 
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want Bluetooth support.
 	enable_bluetooth=no
 fi
 
 if test "x$enable_bluetooth" != "xno" ; then
 		case "$host_os" in
 	linux*)
 		ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
 if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then :
 
+			#
+			# We have bluetooth.h, so we support Bluetooth
+			# sniffing.
+			#
 
 $as_echo "#define PCAP_SUPPORT_BT 1" >>confdefs.h
 
-		  BT_SRC=pcap-bt-linux.c
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is supported" >&5
+			BT_SRC=pcap-bt-linux.c
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is supported" >&5
 $as_echo "$as_me: Bluetooth sniffing is supported" >&6;}
+			ac_lbl_bluetooth_available=yes
 
-		  #
-		  # OK, does struct sockaddr_hci have an hci_channel
-		  # member?
-		  #
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct sockaddr_hci has hci_channel member" >&5
-$as_echo_n "checking if struct sockaddr_hci has hci_channel member... " >&6; }
-		  if ${ac_cv_lbl_sockaddr_hci_has_hci_channel+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+			#
+			# OK, does struct sockaddr_hci have an hci_channel
+			# member?
+			#
+			ac_fn_c_check_member "$LINENO" "struct sockaddr_hci" "hci_channel" "ac_cv_member_struct_sockaddr_hci_hci_channel" "
+				#include <bluetooth/bluetooth.h>
+				#include <bluetooth/hci.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+"
+if test "x$ac_cv_member_struct_sockaddr_hci_hci_channel" = xyes; then :
 
-int
-main ()
-{
-u_int i = sizeof(((struct sockaddr_hci *)0)->hci_channel)
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_sockaddr_hci_has_hci_channel=yes
-else
-  ac_cv_lbl_sockaddr_hci_has_hci_channel=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_sockaddr_hci_has_hci_channel" >&5
-$as_echo "$ac_cv_lbl_sockaddr_hci_has_hci_channel" >&6; }
-		    if test $ac_cv_lbl_sockaddr_hci_has_hci_channel = yes ; then
 
-$as_echo "#define SOCKADDR_HCI_HAS_HCI_CHANNEL /**/" >>confdefs.h
-
-
-		      #
-		      # OK, is HCI_CHANNEL_MONITOR defined?
-		      #
-		      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if HCI_CHANNEL_MONITOR is defined" >&5
+				#
+				# Yes; is HCI_CHANNEL_MONITOR defined?
+				#
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if HCI_CHANNEL_MONITOR is defined" >&5
 $as_echo_n "checking if HCI_CHANNEL_MONITOR is defined... " >&6; }
-		      if ${ac_cv_lbl_hci_channel_monitor_is_defined+:} false; then :
+				if ${ac_cv_lbl_hci_channel_monitor_is_defined+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+					    #include <bluetooth/bluetooth.h>
+					    #include <bluetooth/hci.h>
 
 int
 main ()
 {
-u_int i = HCI_CHANNEL_MONITOR
+
+					    u_int i = HCI_CHANNEL_MONITOR;
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_lbl_hci_channel_monitor_is_defined=yes
+
+					    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define PCAP_SUPPORT_BT_MONITOR /**/" >>confdefs.h
+
+					    BT_MONITOR_SRC=pcap-bt-monitor-linux.c
+
 else
-  ac_cv_lbl_hci_channel_monitor_is_defined=no
+
+					    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-		      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_hci_channel_monitor_is_defined" >&5
-$as_echo "$ac_cv_lbl_hci_channel_monitor_is_defined" >&6; }
-		      if test $ac_cv_lbl_hci_channel_monitor_is_defined = yes ; then
 
-$as_echo "#define PCAP_SUPPORT_BT_MONITOR /**/" >>confdefs.h
+fi
 
-			BT_MONITOR_SRC=pcap-bt-monitor-linux.c
-		      fi
-		    fi
-		    ac_lbl_bluetooth_available=yes
 
 else
-  ac_lbl_bluetooth_available=no
 
+			#
+			# We don't have bluetooth.h, so we don't support
+			# Bluetooth sniffing.
+			#
+			if test "x$enable_bluetooth" = "xyes" ; then
+				as_fn_error $? "Bluetooth sniffing is not supported; install bluez-lib devel to enable it" "$LINENO" 5
+			else
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&5
+$as_echo "$as_me: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&6;}
+			fi
+
 fi
 
 
-		if test "x$ac_lbl_bluetooth_available" == "xno" ; then
-		    if test "x$enable_bluetooth" = "xyes" ; then
-			as_fn_error $? "Bluetooth sniffing is not supported; install bluez-lib devel to enable it" "$LINENO" 5
-		    else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&5
-$as_echo "$as_me: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&6;}
-		    fi
-		fi
 		;;
 	*)
 		if test "x$enable_bluetooth" = "xyes" ; then
-		    as_fn_error $? "no Bluetooth sniffing support implemented for $host_os" "$LINENO" 5
+			as_fn_error $? "no Bluetooth sniffing support implemented for $host_os" "$LINENO" 5
 		else
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: no Bluetooth sniffing support implemented for $host_os" >&5
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: no Bluetooth sniffing support implemented for $host_os" >&5
 $as_echo "$as_me: no Bluetooth sniffing support implemented for $host_os" >&6;}
 		fi
 		;;
 	esac
 
 
 
 fi
 
 # Check whether --enable-dbus was given.
 if test "${enable_dbus+set}" = set; then :
   enableval=$enable_dbus;
 else
   enable_dbus=ifavailable
 fi
 
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want D-Bus support.
 	enable_dbus=no
 fi
 
 if test "x$enable_dbus" != "xno"; then
 	if test "x$enable_dbus" = "xyes"; then
 		case "$host_os" in
 
 		darwin*)
 			#
-			# We don't support D-Bus sniffing on OS X; see
+			# We don't support D-Bus sniffing on macOS; see
 			#
 			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
 			#
 			# The user requested it, so fail.
 			#
-			as_fn_error $? "Due to freedesktop.org bug 74029, D-Bus capture support is not available on OS X" "$LINENO" 5
+			as_fn_error $? "Due to freedesktop.org bug 74029, D-Bus capture support is not available on macOS" "$LINENO" 5
 		esac
 	else
 		case "$host_os" in
 
 		darwin*)
 			#
-			# We don't support D-Bus sniffing on OS X; see
+			# We don't support D-Bus sniffing on macOS; see
 			#
 			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
 			#
 			# The user dind't explicitly request it, so just
 			# silently refuse to enable it.
 			#
 			enable_dbus="no"
 			;;
 		esac
 	fi
 fi
 
 if test "x$enable_dbus" != "xno"; then
 	# Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_PKGCONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PKGCONFIG"; then
   ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PKGCONFIG="pkg-config"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_PKGCONFIG" && ac_cv_prog_PKGCONFIG="no"
 fi
 fi
 PKGCONFIG=$ac_cv_prog_PKGCONFIG
 if test -n "$PKGCONFIG"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
 $as_echo "$PKGCONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	if test "x$PKGCONFIG" != "xno"; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for D-Bus" >&5
 $as_echo_n "checking for D-Bus... " >&6; }
 		if "$PKGCONFIG" dbus-1; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			DBUS_CFLAGS=`"$PKGCONFIG" --cflags dbus-1`
 			DBUS_LIBS=`"$PKGCONFIG" --libs dbus-1`
 			save_CFLAGS="$CFLAGS"
 			save_LIBS="$LIBS"
 			CFLAGS="$CFLAGS $DBUS_CFLAGS"
 			LIBS="$LIBS $DBUS_LIBS"
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the D-Bus library defines dbus_connection_read_write" >&5
 $as_echo_n "checking whether the D-Bus library defines dbus_connection_read_write... " >&6; }
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 			     #include <time.h>
 			     #include <sys/time.h>
 
 			     #include <dbus/dbus.h>
 int
 main ()
 {
 return dbus_connection_read_write(NULL, 0);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define PCAP_SUPPORT_DBUS 1" >>confdefs.h
 
 				DBUS_SRC=pcap-dbus.c
 				V_INCLS="$V_INCLS $DBUS_CFLAGS"
 
 else
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 				if test "x$enable_dbus" = "xyes"; then
 				    as_fn_error $? "--enable-dbus was given, but the D-Bus library doesn't define dbus_connection_read_write()" "$LINENO" 5
 				fi
 				LIBS="$save_LIBS"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 			CFLAGS="$save_CFLAGS"
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			if test "x$enable_dbus" = "xyes"; then
 				as_fn_error $? "--enable-dbus was given, but the dbus-1 package is not installed" "$LINENO" 5
 			fi
 		fi
 	fi
 
 
 fi
 
-case "$host_os" in
-linux*)
-	for ac_header in linux/net_tstamp.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/net_tstamp.h" "ac_cv_header_linux_net_tstamp_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_net_tstamp_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_NET_TSTAMP_H 1
-_ACEOF
+# Check whether --enable-rdma was given.
+if test "${enable_rdma+set}" = set; then :
+  enableval=$enable_rdma;
+else
+  enable_rdmasniff=ifavailable
+fi
 
+
+if test "xxx_only" = yes; then
+	# User requested something-else-only pcap, so they don't
+	# want RDMA support.
+	enable_rdmasniff=no
 fi
 
-done
+if test "x$enable_rdmasniff" != "xno"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ibv_get_device_list in -libverbs" >&5
+$as_echo_n "checking for ibv_get_device_list in -libverbs... " >&6; }
+if ${ac_cv_lib_ibverbs_ibv_get_device_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-libverbs  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-	;;
-*)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: no hardware timestamp support implemented for $host_os" >&5
-$as_echo "$as_me: no hardware timestamp support implemented for $host_os" >&6;}
-	;;
-esac
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ibv_get_device_list ();
+int
+main ()
+{
+return ibv_get_device_list ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ibverbs_ibv_get_device_list=yes
+else
+  ac_cv_lib_ibverbs_ibv_get_device_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ibverbs_ibv_get_device_list" >&5
+$as_echo "$ac_cv_lib_ibverbs_ibv_get_device_list" >&6; }
+if test "x$ac_cv_lib_ibverbs_ibv_get_device_list" = xyes; then :
 
-# Check whether --enable-packet-ring was given.
-if test "${enable_packet_ring+set}" = set; then :
-  enableval=$enable_packet_ring;
+		ac_fn_c_check_header_mongrel "$LINENO" "infiniband/verbs.h" "ac_cv_header_infiniband_verbs_h" "$ac_includes_default"
+if test "x$ac_cv_header_infiniband_verbs_h" = xyes; then :
+
+			#
+			# ibv_create_flow may be defined as a static inline
+			# function in infiniband/verbs.h, so we can't
+			# use AC_CHECK_LIB.
+			#
+			# Too bad autoconf has no AC_SYMBOL_EXISTS()
+			# macro that works like CMake's check_symbol_exists()
+			# function, to check do a compile check like
+			# this (they do a clever trick to avoid having
+			# to know the function's signature).
+			#
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libibverbs defines ibv_create_flow" >&5
+$as_echo_n "checking whether libibverbs defines ibv_create_flow... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+					#include <infiniband/verbs.h>
+
+int
+main ()
+{
+
+					(void) ibv_create_flow((struct ibv_qp *) NULL,
+							       (struct ibv_flow_attr *) NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define PCAP_SUPPORT_RDMASNIFF /**/" >>confdefs.h
+
+					RDMA_SRC=pcap-rdmasniff.c
+					LIBS="-libverbs $LIBS"
+
 else
-  enable_packet_ring=yes
+
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
+fi
 
-if test "x$enable_packet_ring" != "xno" ; then
 
-$as_echo "#define PCAP_SUPPORT_PACKET_RING 1" >>confdefs.h
 
+fi
 
+
+
 fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
 # AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     # Account for people who put trailing slashes in PATH elements.
 case $as_dir/ in #((
   ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
     # Don't use installbsd from OSF since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
 	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
 	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
 	    rm -rf conftest.one conftest.two conftest.dir
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
 	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
 	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
 
   done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
     # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 ac_config_headers="$ac_config_headers config.h"
 
 
 ac_config_commands="$ac_config_commands default-1"
 
-ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap"
+ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile rpcapd/rpcapd.manadmin testprogs/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
 # It is not useful on other systems.  If it contains results you don't
 # want to keep, you may remove or edit it.
 #
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
 # `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (
   for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
 
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes: double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 ) |
   sed '
      /^ac_cv_env_/b end
      t clear
      :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
         case $cache_file in #(
         */* | ?:*)
 	  mv -f confcache "$cache_file"$$ &&
 	  mv -f "$cache_file"$$ "$cache_file" ;; #(
         *)
 	  mv -f confcache "$cache_file" ;;
 	esac
       fi
     fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
 
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
 cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # 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=:
   # Pre-4.2 versions of Zsh do 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_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 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.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 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
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 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
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # 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
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
 ## ----------------------------------- ##
 ## Main body of $CONFIG_STATUS script. ##
 ## ----------------------------------- ##
 _ASEOF
 test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by pcap $as_me 1.9.0-PRE-GIT, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 "
 
 _ACEOF
 
 case $ac_config_files in *"
 "*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
 
 case $ac_config_headers in *"
 "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
 esac
 
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
 Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
       --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
       --header=FILE[:TEMPLATE]
                    instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
 Configuration headers:
 $config_headers
 
 Configuration commands:
 $config_commands
 
 Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+pcap config.status 1.9.0-PRE-GIT
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
   --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
   --*=)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=
     ac_shift=:
     ;;
   *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
   esac
 
   case $ac_option in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
     $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
   -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
   shift
 done
 
 ac_configure_extra_args=
 
 if $ac_cs_silent; then
   exec 6>/dev/null
   ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
   $as_echo "$ac_log"
 } >&5
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
 
 
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "pcap-filter.manmisc") CONFIG_FILES="$CONFIG_FILES pcap-filter.manmisc" ;;
     "pcap-linktype.manmisc") CONFIG_FILES="$CONFIG_FILES pcap-linktype.manmisc" ;;
     "pcap-tstamp.manmisc") CONFIG_FILES="$CONFIG_FILES pcap-tstamp.manmisc" ;;
     "pcap-savefile.manfile") CONFIG_FILES="$CONFIG_FILES pcap-savefile.manfile" ;;
     "pcap.3pcap") CONFIG_FILES="$CONFIG_FILES pcap.3pcap" ;;
     "pcap_compile.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_compile.3pcap" ;;
     "pcap_datalink.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_datalink.3pcap" ;;
     "pcap_dump_open.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_dump_open.3pcap" ;;
     "pcap_get_tstamp_precision.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_get_tstamp_precision.3pcap" ;;
     "pcap_list_datalinks.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_list_datalinks.3pcap" ;;
     "pcap_list_tstamp_types.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_list_tstamp_types.3pcap" ;;
     "pcap_open_dead.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_open_dead.3pcap" ;;
     "pcap_open_offline.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_open_offline.3pcap" ;;
     "pcap_set_tstamp_precision.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_precision.3pcap" ;;
     "pcap_set_tstamp_type.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_type.3pcap" ;;
+    "rpcapd/Makefile") CONFIG_FILES="$CONFIG_FILES rpcapd/Makefile" ;;
+    "rpcapd/rpcapd.manadmin") CONFIG_FILES="$CONFIG_FILES rpcapd/rpcapd.manadmin" ;;
+    "testprogs/Makefile") CONFIG_FILES="$CONFIG_FILES testprogs/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
 
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
 # simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
   trap 'exit_status=$?
   : "${ac_tmp:=$tmp}"
   { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
 # This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
 ac_cr=`echo X | tr X '\015'`
 # On cygwin, bash can eat \r inside `` if the user requested igncr.
 # But we know of no other shell where ac_cr would be empty at this
 # point, so we can use a bashism as a fallback.
 if test "x$ac_cr" = x; then
   eval ac_cr=\$\'\\r\'
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
 {
   echo "cat >conf$$subs.awk <<_ACEOF" &&
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
 s/^/S["/; s/!.*/"]=/
 p
 g
 s/^[^!]*!//
 :repl
 t repl
 s/'"$ac_delim"'$//
 t delim
 :nl
 h
 s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
 n
 b repl
 :more1
 s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 p
 g
 s/.\{148\}//
 t nl
 :delim
 h
 s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
 b
 :more2
 s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 p
 g
 s/.\{148\}//
 t delim
 ' <conf$$subs.awk | sed '
 /^[^""]/{
   N
   s/\n//
 }
 ' >>$CONFIG_STATUS || ac_write_fail=1
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
 }
 {
   line = $ 0
   nfields = split(line, field, "@")
   substed = 0
   len = length(field[1])
   for (i = 2; i < nfields; i++) {
     key = field[i]
     keylen = length(key)
     if (S_is_set[key]) {
       value = S[key]
       line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
       len += length(value) + length(field[++i])
       substed = 1
     } else
       len += 1 + keylen
   }
 
   print line
 }
 
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
 fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
   ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
 h
 s///
 s/^/:/
 s/[	 ]*$/:/
 s/:\$(srcdir):/:/g
 s/:\${srcdir}:/:/g
 s/:@srcdir@:/:/g
 s/^:*//
 s/:*$//
 x
 s/\(=[	 ]*\).*/\1/
 G
 s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
 # Transform confdefs.h into an awk script `defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
 # Create a delimiter string that does not exist in confdefs.h, to ease
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
   ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
   if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 
 # For the awk script, D is an array of macro values keyed by name,
 # likewise P contains macro parameters if any.  Preserve backslash
 # newline sequences.
 
 ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
 sed -n '
 s/.\{148\}/&'"$ac_delim"'/g
 t rset
 :rset
 s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
 t def
 d
 :def
 s/\\$//
 t bsnl
 s/["\\]/\\&/g
 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 D["\1"]=" \3"/p
 s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
 d
 :bsnl
 s/["\\]/\\&/g
 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 D["\1"]=" \3\\\\\\n"\\/p
 t cont
 s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
 t cont
 d
 :cont
 n
 s/.\{148\}/&'"$ac_delim"'/g
 t clear
 :clear
 s/\\$//
 t bsnlc
 s/["\\]/\\&/g; s/^/"/; s/$/"/p
 d
 :bsnlc
 s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
 "/g' >>$CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
   line = \$ 0
   split(line, arg, " ")
   if (arg[1] == "#") {
     defundef = arg[2]
     mac1 = arg[3]
   } else {
     defundef = substr(arg[1], 2)
     mac1 = arg[2]
   }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
     # in the case of _POSIX_SOURCE, which is predefined and required
     # on some systems where configure will not decide to define it.
     if (defundef == "undef") {
       print "/*", prefix defundef, macro, "*/"
       next
     }
   }
 }
 { print }
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
   ac_save_IFS=$IFS
   IFS=:
   set x $ac_tag
   IFS=$ac_save_IFS
   shift
   ac_file=$1
   shift
 
   case $ac_mode in
   :L) ac_source=$1;;
   :[FH])
     ac_file_inputs=
     for ac_f
     do
       case $ac_f in
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
 	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
       { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
        ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
 
     case $ac_tag in
     *:-:* | *:-) cat >"$ac_tmp/stdin" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
 
   ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
   as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
   esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
 # for backward compatibility:
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
   .)  # We are building in place.
     ac_srcdir=.
     ac_top_srcdir=$ac_top_builddir_sub
     ac_abs_top_srcdir=$ac_pwd ;;
   [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_top_srcdir=$srcdir
     ac_abs_top_srcdir=$srcdir ;;
   *) # Relative name.
     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_build_prefix$srcdir
     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 
   case $ac_mode in
   :F)
   #
   # CONFIG_FILE
   #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 ac_sed_dataroot='
 /datarootdir/ {
   p
   q
 }
 /@datadir@/p
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
   s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
 s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
 s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
   case $ac_file in
   -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
   *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
     "default-1":C) if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi ;;
 
   esac
 done # for ac_tag
 
 
 as_fn_exit 0
 _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
 # by configure, so config.status won't be able to write to it; its
 # output is simply discarded.  So we exec the FD to /dev/null,
 # effectively closing config.log, so it can be properly (re)opened and
 # appended to by config.status.  When coming back to configure, we
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 exit 0
Index: vendor/libpcap/dist/configure.ac
===================================================================
--- vendor/libpcap/dist/configure.ac	(revision 333788)
+++ vendor/libpcap/dist/configure.ac	(revision 333789)
@@ -1,1821 +1,2279 @@
 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
 
 #
 # See
 #
 #	http://ftp.gnu.org/gnu/config/README
 #
 # for the URLs to use to fetch new versions of config.guess and
 # config.sub.
 #
 
-AC_PREREQ(2.61)
-AC_INIT(pcap.c)
+AC_PREREQ(2.64)
 
+AC_INIT(pcap, m4_esyscmd_s([cat VERSION]))
+AC_CONFIG_SRCDIR(pcap.c)
+AC_SUBST(PACKAGE_NAME)
+
 AC_CANONICAL_SYSTEM
 
 AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS)
-AC_PROG_CC
+#
+# Try to enable as many C99 features as we can.
+# At minimum, we want C++/C99-style // comments.
+#
+AC_PROG_CC_C99
 AC_LBL_C_INIT(V_CCOPT, V_INCLS)
 AC_LBL_SHLIBS_INIT
 AC_LBL_C_INLINE
-AC_C___ATTRIBUTE__
-if test "$ac_cv___attribute__" = "yes"; then
-	AC_C___ATTRIBUTE___UNUSED
-	AC_C___ATTRIBUTE___FORMAT
-fi
 
-AC_CHECK_HEADERS(sys/bitypes.h)
-
-AC_CHECK_TYPE([int8_t], ,
-	[AC_DEFINE([int8_t], [signed char],
-	[Define to `signed char' if int8_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([u_int8_t], ,
-	[AC_DEFINE([u_int8_t], [unsigned char],
-	[Define to `unsigned char' if u_int8_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([int16_t], ,
-	[AC_DEFINE([int16_t], [short],
-	[Define to `short' if int16_t not defined.])]
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([u_int16_t], ,
-	[AC_DEFINE([u_int16_t], [unsigned short],
-	[Define to `unsigned short' if u_int16_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([int32_t], ,
-	[AC_DEFINE([int32_t], [int],
-	[Define to `int' if int32_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([u_int32_t], ,
-	[AC_DEFINE([u_int32_t], [unsigned int],
-	[Define to `unsigned int' if u_int32_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([int64_t], ,
-	[AC_DEFINE([int64_t], [long long],
-	[Define to `long long' if int64_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-AC_CHECK_TYPE([u_int64_t], ,
-	[AC_DEFINE([u_int64_t], [unsigned long long],
-	[Define to `unsigned long long' if u_int64_t not defined.])],
-	[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif])
-
 #
 # Try to arrange for large file support.
 #
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
 dnl
 dnl Even if <net/bpf.h> were, on all OSes that support BPF, fixed to
 dnl include <sys/ioccom.h>, and we were to drop support for older
 dnl releases without that fix, so that pcap-bpf.c doesn't need to
 dnl include <sys/ioccom.h>, the test program in "AC_LBL_FIXINCLUDES"
 dnl in "aclocal.m4" uses it, so we would still have to test for it
 dnl and set "HAVE_SYS_IOCCOM_H" if we have it, otherwise
 dnl "AC_LBL_FIXINCLUDES" wouldn't work on some platforms such as Solaris.
 dnl
-AC_CHECK_HEADERS(sys/ioccom.h sys/select.h sys/sockio.h limits.h)
-AC_CHECK_HEADERS(linux/types.h)
-AC_CHECK_HEADERS(linux/if_packet.h netpacket/packet.h netpacket/if_packet.h)
+AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h limits.h)
+AC_CHECK_HEADERS(netpacket/packet.h)
 AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>])
 if test "$ac_cv_header_net_pfvar_h" = yes; then
 	#
 	# Check for various PF actions.
 	#
 	AC_MSG_CHECKING(whether net/pfvar.h defines PF_NAT through PF_NORDR)
 	AC_TRY_COMPILE(
 	    [#include <sys/types.h>
 	    #include <sys/socket.h>
 	    #include <net/if.h>
 	    #include <net/pfvar.h>],
 	    [return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR;],
 	    [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_PF_NAT_THROUGH_PF_NORDR, 1,
 		    [define if net/pfvar.h defines PF_NAT through PF_NORDR])
 	    ],
 	    AC_MSG_RESULT(no))
 fi
-AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
-#include <sys/socket.h>])
-if test "$ac_cv_header_netinet_if_ether_h" != yes; then
-	#
-	# The simple test didn't work.
-	# Do we need to include <net/if.h> first?
-	# Unset ac_cv_header_netinet_if_ether_h so we don't
-	# treat the previous failure as a cached value and
-	# suppress the next test.
-	#
-	AC_MSG_NOTICE([Rechecking with some additional includes])
-	unset ac_cv_header_netinet_if_ether_h
-	AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-struct mbuf;
-struct rtentry;
-#include <net/if.h>])
-fi
 
 case "$host_os" in
 linux*|uclinux*)
 	AC_CHECK_HEADERS(linux/sockios.h linux/if_bonding.h,,,
 	[
 #include <sys/socket.h>
 #include <linux/if.h>
 	])
 	;;
 esac
 
 AC_LBL_FIXINCLUDES
 
-AC_CHECK_FUNCS(strerror strlcpy)
+AC_CHECK_FUNCS(strerror strerror_r strerror_s strlcpy strlcat)
 
 needsnprintf=no
 AC_CHECK_FUNCS(vsnprintf snprintf,,
 	[needsnprintf=yes])
 if test $needsnprintf = yes; then
 	AC_LIBOBJ([snprintf])
 fi
 
 needstrtok_r=no
 AC_CHECK_FUNCS(strtok_r,,
 	[needstrtok_r=yes])
 if test $needstrtok_r = yes; then
 	AC_LIBOBJ([strtok_r])
 fi
 
 #
+# Do we have ffs(), and is it declared in <strings.h>?
+#
+AC_CHECK_FUNCS(ffs)
+if test "$ac_cv_func_ffs" = yes; then
+	#
+	# We have ffs(); is it declared in <strings.h>?
+	#
+	# This test fails if we don't have <strings.h> or if we do
+	# but it doesn't declare ffs().
+	#
+	AC_CHECK_DECL(ffs,
+	    [
+		AC_DEFINE(STRINGS_H_DECLARES_FFS,,
+		    [Define to 1 if strings.h declares `ffs'])
+	    ],,
+	    [
+#include <strings.h>
+	    ])
+fi
+
+#
 # Do this before checking for ether_hostton(), as it's a
-# "gethostbyname() -ish function".
+# "getaddrinfo()-ish function".
 #
 AC_LBL_LIBRARY_NET
 
 #
+# Check for reentrant versions of getnetbyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getnetbyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getnetbyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+AC_CHECK_DECL(getnetbyname_r,
+    [
+	AC_MSG_CHECKING([for the Linux getnetbyname_r()])
+	AC_TRY_LINK(
+	    [#include <netdb.h>],
+	    [
+		struct netent netent_buf;
+		char buf[1024];
+		struct netent *resultp;
+		int h_errnoval;
+
+		return getnetbyname_r((const char *)0, &netent_buf, buf, sizeof buf, &resultp, &h_errnoval);
+	    ],
+	    [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_LINUX_GETNETBYNAME_R, 1,
+		    [define if we have the Linux getnetbyname_r()])
+	    ],
+	    [
+		AC_MSG_RESULT(no)
+
+		AC_MSG_CHECKING([for Solaris/IRIX getnetbyname_r()])
+		AC_TRY_LINK(
+		    [#include <netdb.h>],
+		    [
+			struct netent netent_buf;
+			char buf[1024];
+
+			return getnetbyname_r((const char *)0, &netent_buf, buf, (int)sizeof buf) != NULL;
+		    ],
+		    [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_SOLARIS_IRIX_GETNETBYNAME_R, 1,
+			    [define if we have the Solaris/IRIX getnetbyname_r()])
+		    ],
+		    [
+			AC_MSG_RESULT(no)
+
+			AC_MSG_CHECKING([for AIX getnetbyname_r()])
+			AC_TRY_LINK(
+			    [#include <netdb.h>],
+			    [
+				struct netent netent_buf;
+				struct netent_data net_data;
+
+				return getnetbyname_r((const char *)0, &netent_buf, &net_data);
+			    ],
+			    [
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(HAVE_AIX_GETNETBYNAME_R, 1,
+				    [define if we have the AIX getnetbyname_r()])
+			    ],
+			    [
+				AC_MSG_RESULT(no)
+			    ])
+		    ])
+	    ])
+    ],,[#include <netdb.h>])
+
+#
+# Check for reentrant versions of getprotobyname_r(), as provided by
+# Linux (glibc), Solaris/IRIX, and AIX (with three different APIs!).
+# If we don't find one, we just use getprotobyname(), which uses
+# thread-specific data on many platforms, but doesn't use it on
+# NetBSD or OpenBSD, and may not use it on older versions of other
+# platforms.
+#
+# Only do the check if we have a declaration of getprotobyname_r();
+# without it, we can't check which API it has.  (We assume that
+# if there's a declaration, it has a prototype, so that the API
+# can be checked.)
+#
+AC_CHECK_DECL(getprotobyname_r,
+    [
+	AC_MSG_CHECKING([for the Linux getprotobyname_r()])
+	AC_TRY_LINK(
+	    [#include <netdb.h>],
+	    [
+		struct protoent protoent_buf;
+		char buf[1024];
+		struct protoent *resultp;
+
+		return getprotobyname_r((const char *)0, &protoent_buf, buf, sizeof buf, &resultp);
+	    ],
+	    [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_LINUX_GETPROTOBYNAME_R, 1,
+		    [define if we have the Linux getprotobyname_r()])
+	    ],
+	    [
+		AC_MSG_RESULT(no)
+
+		AC_MSG_CHECKING([for Solaris/IRIX getprotobyname_r()])
+		AC_TRY_LINK(
+		    [#include <netdb.h>],
+		    [
+			struct protoent protoent_buf;
+			char buf[1024];
+
+			return getprotobyname_r((const char *)0, &protoent_buf, buf, (int)sizeof buf) != NULL;
+		    ],
+		    [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R, 1,
+			    [define if we have the Solaris/IRIX getprotobyname_r()])
+		    ],
+		    [
+			AC_MSG_RESULT(no)
+
+			AC_MSG_CHECKING([for AIX getprotobyname_r()])
+			AC_TRY_LINK(
+			    [#include <netdb.h>],
+			    [
+				struct protoent protoent_buf;
+				struct protoent_data proto_data;
+
+				return getprotobyname_r((const char *)0, &protoent_buf, &proto_data);
+			    ],
+			    [
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(HAVE_AIX_GETPROTOBYNAME_R, 1,
+				    [define if we have the AIX getprotobyname_r()])
+			    ],
+			    [
+				AC_MSG_RESULT(no)
+			    ])
+		    ])
+	    ])
+    ],,[#include <netdb.h>])
+
+#
 # You are in a twisty little maze of UN*Xes, all different.
 # Some might not have ether_hostton().
-# Some might have it, but not declare it in any header file.
-# Some might have it, but declare it in <netinet/if_ether.h>.
-# Some might have it, but declare it in <netinet/ether.h>
-# (And some might have it but document it as something declared in
-# <netinet/ethernet.h>, although <netinet/if_ether.h> appears to work.)
+# Some might have it and declare it in <net/ethernet.h>.
+# Some might have it and declare it in <netinet/ether.h>
+# Some might have it and declare it in <sys/ethernet.h>.
+# Some might have it and declare it in <arpa/inet.h>.
+# Some might have it and declare it in <netinet/if_ether.h>.
+# Some might have it and not declare it in any header file.
 #
 # Before you is a C compiler.
 #
 AC_CHECK_FUNCS(ether_hostton)
 if test "$ac_cv_func_ether_hostton" = yes; then
 	#
-	# OK, we have ether_hostton().  Do we have <netinet/if_ether.h>?
+	# OK, we have ether_hostton().  Is it declared in <net/ethernet.h>?
 	#
-	if test "$ac_cv_header_netinet_if_ether_h" = yes; then
+	# This test fails if we don't have <net/ethernet.h> or if we do
+	# but it doesn't declare ether_hostton().
+	#
+	AC_CHECK_DECL(ether_hostton,
+	    [
+		AC_DEFINE(NET_ETHERNET_H_DECLARES_ETHER_HOSTTON,,
+		    [Define to 1 if net/ethernet.h declares `ether_hostton'])
+	    ],,
+	    [
+#include <net/ethernet.h>
+	    ])
+	#
+	# Did that succeed?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# Yes.  Does it declare ether_hostton()?
+		# No, how about <netinet/ether.h>, as on Linux?
 		#
+		# This test fails if we don't have <netinet/ether.h>
+		# or if we do but it doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
 		AC_CHECK_DECL(ether_hostton,
 		    [
-			AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON,,
-			    [Define to 1 if netinet/if_ether.h declares `ether_hostton'])
+			AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON,,
+			    [Define to 1 if netinet/ether.h declares `ether_hostton'])
 		    ],,
 		    [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-#include <netinet/if_ether.h>
+#include <netinet/ether.h>
 		    ])
 	fi
 	#
 	# Did that succeed?
 	#
 	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# No, how about <netinet/ether.h>, as on Linux?
+		# No, how about <sys/ethernet.h>, as on Solaris 10
+		# and later?
 		#
-		AC_CHECK_HEADERS(netinet/ether.h)
-		if test "$ac_cv_header_netinet_ether_h" = yes; then
-			#
-			# We have it - does it declare ether_hostton()?
-			# Unset ac_cv_have_decl_ether_hostton so we don't
-			# treat the previous failure as a cached value and
-			# suppress the next test.
-			#
-			unset ac_cv_have_decl_ether_hostton
-			AC_CHECK_DECL(ether_hostton,
-			    [
-				AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON,,
-				    [Define to 1 if netinet/ether.h declares `ether_hostton'])
-			    ],,
-			    [
-#include <netinet/ether.h>
-			    ])
-		fi
+		# This test fails if we don't have <sys/ethernet.h>
+		# or if we do but it doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		AC_CHECK_DECL(ether_hostton,
+		    [
+			AC_DEFINE(SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON,,
+			    [Define to 1 if sys/ethernet.h declares `ether_hostton'])
+		    ],,
+		    [
+#include <sys/ethernet.h>
+		    ])
 	fi
 	#
-	# Is ether_hostton() declared?
+	# Did that succeed?
 	#
 	if test "$ac_cv_have_decl_ether_hostton" != yes; then
 		#
-		# No, we'll have to declare it ourselves.
-		# Do we have "struct ether_addr"?
+		# No, how about <arpa/inet.h>, as in AIX?
 		#
-		AC_CHECK_TYPES(struct ether_addr,,,
+		# This test fails if we don't have <arpa/inet.h>
+		# (if we have ether_hostton(), we should have
+		# networking, and if we have networking, we should
+		# have <arapa/inet.h>) or if we do but it doesn't
+		# declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		AC_CHECK_DECL(ether_hostton,
 		    [
+			AC_DEFINE(ARPA_INET_H_DECLARES_ETHER_HOSTTON,,
+			    [Define to 1 if arpa/inet.h declares `ether_hostton'])
+		    ],,
+		    [
+#include <arpa/inet.h>
+		    ])
+	fi
+	#
+	# Did that succeed?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" != yes; then
+		#
+		# No, how about <netinet/if_ether.h>?
+		# On some platforms, it requires <net/if.h> and
+		# <netinet/in.h>, and we always include it with
+		# both of them, so test it with both of them.
+		#
+		# This test fails if we don't have <netinet/if_ether.h>
+		# and the headers we include before it, or if we do but
+		# <netinet/if_ether.h> doesn't declare ether_hostton().
+		#
+		# Unset ac_cv_have_decl_ether_hostton so we don't
+		# treat the previous failure as a cached value and
+		# suppress the next test.
+		#
+		unset ac_cv_have_decl_ether_hostton
+		AC_CHECK_DECL(ether_hostton,
+		    [
+			AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON,,
+			    [Define to 1 if netinet/if_ether.h declares `ether_hostton'])
+		    ],,
+		    [
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-struct mbuf;
-struct rtentry;
 #include <net/if.h>
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 		    ])
-		AC_DEFINE(HAVE_DECL_ETHER_HOSTTON, 0,
-		    [Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
-don't.])
-	else
+	fi
+	#
+	# After all that, is ether_hostton() declared?
+	#
+	if test "$ac_cv_have_decl_ether_hostton" = yes; then
+		#
+		# Yes.
+		#
 		AC_DEFINE(HAVE_DECL_ETHER_HOSTTON, 1,
-		    [Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
-don't.])
+		    [Define to 1 if you have the declaration of `ether_hostton'])
+        else
+		#
+		# No, we'll have to declare it ourselves.
+		# Do we have "struct ether_addr" if we include
+		# <netinet/if_ether.h>?
+		#
+		AC_CHECK_TYPES(struct ether_addr,,,
+		    [
+			#include <sys/types.h>
+			#include <sys/socket.h>
+			#include <net/if.h>
+			#include <netinet/in.h>
+			#include <netinet/if_ether.h>
+		    ])
 	fi
 fi
 
+#
+# For various things that might use pthreads.
+#
+AC_CHECK_HEADER(pthread.h,
+    [
+	#
+	# OK, we have pthread.h.  Do we have pthread_create in the
+	# system libraries?
+	#
+	AC_CHECK_FUNC(pthread_create,
+	    [
+		#
+		# Yes.
+		#
+		ac_lbl_have_pthreads="found"
+	    ],
+	    [
+		#
+		# No - do we have it in -lpthreads?
+		#
+		AC_CHECK_LIB(pthreads, pthread_create,
+		    [
+			#
+			# Yes - add -lpthreads.
+			#
+			ac_lbl_have_pthreads="found"
+			PTHREAD_LIBS="$PTHREAD_LIBS -lpthreads"
+		    ],
+		    [
+			#
+			# No - do we have it in -lpthread?
+			#
+			AC_CHECK_LIB(pthread, pthread_create,
+			    [
+				#
+				# Yes - add -lpthread.
+				#
+                                ac_lbl_have_pthreads="found"
+				PTHREAD_LIBS="$PTHREAD_LIBS -lpthread"
+			    ],
+			    [
+				#
+				# No.
+				#
+				ac_lbl_have_pthreads="not found"
+			    ])
+		    ])
+	    ])
+    ],
+    [
+	#
+	# We didn't find pthread.h.
+	#
+	ac_lbl_have_pthreads="not found"
+    ]
+)
+
 dnl to pacify those who hate protochain insn
 AC_MSG_CHECKING(if --disable-protochain option is specified)
 AC_ARG_ENABLE(protochain,
 AC_HELP_STRING([--disable-protochain],[disable \"protochain\" insn]))
 case "x$enable_protochain" in
 xyes)	enable_protochain=enabled	;;
 xno)	enable_protochain=disabled	;;
 x)	enable_protochain=enabled	;;
 esac
 
 if test "$enable_protochain" = "disabled"; then
 	AC_DEFINE(NO_PROTOCHAIN,1,[do not use protochain])
 fi
 AC_MSG_RESULT(${enable_protochain})
 
 #
 # valgrindtest directly uses the native capture mechanism, but
 # only tests with BPF and PF_PACKET sockets; only enable it if
 # we have BPF or PF_PACKET sockets.
 #
-VALGRINDTEST=
+VALGRINDTEST_SRC=
 
 #
 # SITA support is mutually exclusive with native capture support;
 # "--with-sita" selects SITA support.
 #
 AC_ARG_WITH(sita,
 AC_HELP_STRING([--with-sita],[include SITA support]),
 [
 	if test ! "x$withval" = "xno" ; then
 		AC_DEFINE(SITA,1,[include ACN support])
 		AC_MSG_NOTICE(Enabling SITA ACN support)
 		V_PCAP=sita
 	fi
 ],
 [
-dnl
-dnl Not all versions of test support -c (character special) but it's a
-dnl better way of testing since the device might be protected. So we
-dnl check in our normal order using -r and then check the for the /dev
-dnl guys again using -c.
-dnl
-dnl XXX This could be done for cross-compiling, but for now it's not.
-dnl
-if test -z "$with_pcap" && test "$cross_compiling" = yes; then
-	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
-fi
 AC_ARG_WITH(pcap,
 AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
-AC_MSG_CHECKING(packet capture type)
 if test ! -z "$with_pcap" ; then
 	V_PCAP="$withval"
-elif test -r /dev/bpf -o -h /dev/bpf ; then
+else
 	#
-	# Cloning BPF device.
+	# Check for a bunch of headers for various packet
+	# capture mechanisms.
 	#
-	V_PCAP=bpf
-	AC_DEFINE(HAVE_CLONING_BPF,1,[define if you have a cloning BPF device])
+	AC_CHECK_HEADERS(net/bpf.h)
+	if test "$ac_cv_header_net_bpf_h" = yes; then
+		#
+		# Does it define BIOCSETIF?
+		# I.e., is it a header for an LBL/BSD-style capture
+		# mechanism, or is it just a header for a BPF filter
+		# engine?  Some versions of Arch Linux, for example,
+		# have a net/bpf.h that doesn't define BIOCSETIF;
+		# as it's a Linux, it should use packet sockets,
+		# instead.
+		#
+		# We need:
+		#
+		#  sys/types.h, because FreeBSD 10's net/bpf.h
+		#  requires that various BSD-style integer types
+		#  be defined;
+		#
+		#  sys/ioctl.h and, if we have it, sys/ioccom.h,
+		#  because net/bpf.h defines ioctls;
+		#
+		#  net/if.h, because it defines some structures
+		#  used in ioctls defined by net/bpf.h;
+		#
+		#  sys/socket.h, because OpenBSD 5.9's net/bpf.h
+		#  defines some structure fields as being
+		#  struct sockaddrs;
+		#
+		# and net/bpf.h doesn't necessarily include all
+		# of those headers itself.
+		#
+		AC_MSG_CHECKING(if net/bpf.h defines BIOCSETIF)
+		AC_CACHE_VAL(ac_cv_lbl_bpf_h_defines_biocsetif,
+			AC_TRY_COMPILE(
+[
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_IOCCOM_H
+#include <sys/ioccom.h>
+#endif
+#include <net/bpf.h>
+#include <net/if.h>
+],
+			[u_int i = BIOCSETIF;],
+			ac_cv_lbl_bpf_h_defines_biocsetif=yes,
+			ac_cv_lbl_bpf_h_defines_biocsetif=no))
+		AC_MSG_RESULT($ac_cv_lbl_bpf_h_defines_biocsetif)
+	fi
+	AC_CHECK_HEADERS(net/pfilt.h net/enet.h)
+	AC_CHECK_HEADERS(net/nit.h sys/net/nit.h)
+	AC_CHECK_HEADERS(linux/socket.h net/raw.h sys/dlpi.h)
 
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /dev/bpf0 ; then
-	V_PCAP=bpf
+	if test "$ac_cv_lbl_bpf_h_defines_biocsetif" = yes; then
+		#
+		# BPF.
+		# Check this before DLPI, so that we pick BPF on
+		# Solaris 11 and later.
+		#
+		V_PCAP=bpf
 
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/net/pfilt.h ; then
-	V_PCAP=pf
-elif test -r /dev/enet ; then
-	V_PCAP=enet
-elif test -r /dev/nit ; then
-	V_PCAP=snit
-elif test -r /usr/include/sys/net/nit.h ; then
-	V_PCAP=nit
-elif test -r /usr/include/linux/socket.h ; then
-	V_PCAP=linux
+		#
+		# We have BPF, so build valgrindtest with "make test"
+		# on macOS and FreeBSD (add your OS once there's a
+		# valgrind for it).
+		#
+		case "$host_os" in
 
-	#
-	# XXX - this won't work with older kernels that have SOCK_PACKET
-	# sockets but not PF_PACKET sockets.
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/net/raw.h ; then
-	V_PCAP=snoop
-elif test -r /usr/include/odmi.h ; then
-	#
-	# On AIX, the BPF devices might not yet be present - they're
-	# created the first time libpcap runs after booting.
-	# We check for odmi.h instead.
-	#
-	V_PCAP=bpf
-elif test -c /dev/bpf0 ; then		# check again in case not readable
-	V_PCAP=bpf
+		freebsd*|darwin*|linux*)
+			VALGRINDTEST_SRC=valgrindtest.c
+			;;
+		esac
+	elif test "$ac_cv_header_linux_socket_h" = yes; then
+		#
+		# No prizes for guessing this one.
+		#
+		V_PCAP=linux
 
-	#
-	# We have BPF, so build valgrindtest with "make test".
-	#
-	VALGRINDTEST=valgrindtest
-elif test -r /usr/include/sys/dlpi.h ; then
-	V_PCAP=dlpi
-elif test -c /dev/enet ; then		# check again in case not readable
-	V_PCAP=enet
-elif test -c /dev/nit ; then		# check again in case not readable
-	V_PCAP=snit
-else
-	V_PCAP=null
+		#
+		# XXX - this won't work with older kernels that have
+		# SOCK_PACKET sockets but not PF_PACKET sockets.
+		#
+		VALGRINDTEST_SRC=valgrindtest.c
+	elif test "$ac_cv_header_net_pfilt_h" = yes; then
+	        #
+	        # DEC OSF/1, Digital UNIX, Tru64 UNIX
+        	#
+		V_PCAP=pf
+	elif test "$ac_cv_header_net_enet_h" = yes; then
+		#
+		# Stanford Enetfilter.
+		#
+		V_PCAP=enet
+	elif test "$ac_cv_header_net_nit_h" = yes; then
+		#
+		# SunOS 4.x STREAMS NIT.
+		#
+		V_PCAP=snit
+	elif test "$ac_cv_header_sys_net_nit_h" = yes; then
+		#
+		# Pre-SunOS 4.x non-STREAMS NIT.
+		#
+		V_PCAP=nit
+	elif test "$ac_cv_header_net_raw_h" = yes; then
+		#
+		# IRIX snoop.
+		#
+		V_PCAP=snoop
+	elif test "$ac_cv_header_sys_dlpi_h" = yes; then
+		#
+		# DLPI on pre-Solaris 11 SunOS 5, HP-UX, possibly others.
+		#
+		V_PCAP=dlpi
+	else
+		#
+		# Nothing we support.
+		#
+		V_PCAP=null
+		AC_MSG_WARN(cannot determine packet capture interface)
+		AC_MSG_WARN((see the INSTALL doc for more info))
+	fi
 fi
+AC_MSG_CHECKING(packet capture type)
 AC_MSG_RESULT($V_PCAP)
-AC_SUBST(VALGRINDTEST)
+AC_SUBST(VALGRINDTEST_SRC)
 
 #
 # Do capture-mechanism-dependent tests.
 #
 case "$V_PCAP" in
 dlpi)
 	#
 	# Needed for common functions used by pcap-[dlpi,libdlpi].c
 	#
  	SSRC="dlpisubs.c"
 
 	#
 	# Checks for some header files.
 	#
 	AC_CHECK_HEADERS(sys/bufmod.h sys/dlpi_ext.h)
 
 	#
 	# Checks to see if Solaris has the public libdlpi(3LIB) library.
 	# Note: The existence of /usr/include/libdlpi.h does not mean it is the
 	# public libdlpi(3LIB) version. Before libdlpi was made public, a
 	# private version also existed, which did not have the same APIs.
 	# Due to a gcc bug, the default search path for 32-bit libraries does
 	# not include /lib, we add it explicitly here.
 	# [http://bugs.opensolaris.org/view_bug.do?bug_id=6619485].
 	# Also, due to the bug above applications that link to libpcap with
 	# libdlpi will have to add "-L/lib" option to "configure".
 	#
 	saved_ldflags=$LDFLAGS
 	LDFLAGS="$LIBS -L/lib"
 	AC_CHECK_LIB(dlpi, dlpi_walk,
 		[
 			LIBS="-ldlpi $LIBS"
 			V_PCAP=libdlpi
 			AC_DEFINE(HAVE_LIBDLPI,1,[if libdlpi exists])
 		],
 		V_PCAP=dlpi)
 	LDFLAGS=$saved_ldflags
 
 	#
 	# Checks whether <sys/dlpi.h> is usable, to catch weird SCO
 	# versions of DLPI.
 	#
 	AC_MSG_CHECKING(whether <sys/dlpi.h> is usable)
 	AC_CACHE_VAL(ac_cv_sys_dlpi_usable,
 		AC_TRY_COMPILE(
 		    [
 			#include <sys/types.h>
 			#include <sys/time.h>
 			#include <sys/dlpi.h>
 		    ],
 		    [int i = DL_PROMISC_PHYS;],
 		    ac_cv_sys_dlpi_usable=yes,
 		    ac_cv_sys_dlpi_usable=no))
 	AC_MSG_RESULT($ac_cv_sys_dlpi_usable)
 	if test $ac_cv_sys_dlpi_usable = no ; then
 		AC_MSG_ERROR(<sys/dlpi.h> is not usable on this system; it probably has a non-standard DLPI)
 	fi
 
 	#
-	# Check whether we have a /dev/dlpi device or have multiple devices.
-	#
-	AC_MSG_CHECKING(for /dev/dlpi device)
-	if test -c /dev/dlpi ; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_DEV_DLPI, 1, [define if you have a /dev/dlpi])
-	else
-		AC_MSG_RESULT(no)
-		dir="/dev/dlpi"
-		AC_MSG_CHECKING(for $dir directory)
-		if test -d $dir ; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE_UNQUOTED(PCAP_DEV_PREFIX, "$dir", [/dev/dlpi directory])
-		else
-			AC_MSG_RESULT(no)
-		fi
-	fi
-
-	#
-	# This check is for Solaris with DLPI support for passive modes.
+	# Check to see if Solaris has the dl_passive_req_t struct defined
+	# in <sys/dlpi.h>.
+	# This check is for DLPI support for passive modes.
 	# See dlpi(7P) for more details.
 	#
-	AC_LBL_DL_PASSIVE_REQ_T
+	AC_CHECK_TYPES(dl_passive_req_t,,,
+	    [
+		#include <sys/types.h>
+		#include <sys/dlpi.h>
+	    ])
 	;;
 
 linux)
 	#
 	# Do we have the wireless extensions?
 	#
 	AC_CHECK_HEADERS(linux/wireless.h, [], [],
 	[
 #include <sys/socket.h>
 #include <linux/if.h>
 #include <linux/types.h>
 	])
 
 	#
 	# Do we have libnl?
 	#
 	AC_ARG_WITH(libnl,
 	AC_HELP_STRING([--without-libnl],[disable libnl support @<:@default=yes, on Linux, if present@:>@]),
-		with_libnl=$withval,,)
+		with_libnl=$withval,with_libnl=if_available)
 
 	if test x$with_libnl != xno ; then
 		have_any_nl="no"
 
                 incdir=-I/usr/include/libnl3
                 libnldir=
-                if test x$withval != x ; then
-                  libnldir=-L${withval}/lib/.libs
-                  incdir=-I${withval}/include
-                fi
+                case "$with_libnl" in
 
+                yes|if_available)
+                  ;;
+
+                *)
+                  if test -d $withval; then
+                    libnldir=-L${withval}/lib/.libs
+                    incdir=-I${withval}/include
+                  fi
+                  ;;
+                esac
+
 		#
 		# Try libnl 3.x first.
 		#
 		AC_CHECK_LIB(nl-3, nl_socket_alloc,
 		[
 			#
 			# Yes, we have libnl 3.x.
 			#
 			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
 			V_INCLS="$V_INCLS ${incdir}"
 			have_any_nl="yes"
 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
 
 		if test x$have_any_nl = xno ; then
 			#
 			# Try libnl 2.x
 			#
 			AC_CHECK_LIB(nl, nl_socket_alloc,
 			[
 				#
 				# Yes, we have libnl 2.x.
 				#
 				LIBS="${libnldir} -lnl-genl -lnl $LIBS"
 				AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
 				AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
 				AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
 				AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
 				have_any_nl="yes"
 			])
 		fi
 
 		if test x$have_any_nl = xno ; then
 			#
 			# No, we don't; do we have libnl 1.x?
 			#
 			AC_CHECK_LIB(nl, nl_handle_alloc,
 			[
 				#
 				# Yes.
 				#
 				LIBS="${libnldir} -lnl $LIBS"
 				AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
 				have_any_nl="yes"
 			])
 		fi
 
 		if test x$have_any_nl = xno ; then
 			#
 			# No, we don't have libnl at all.
 			#
 			if test x$with_libnl = xyes ; then
 				AC_MSG_ERROR([libnl support requested but libnl not found])
 			fi
 		fi
 	fi
 
 	AC_CHECK_HEADERS(linux/ethtool.h,,,
 	    [
 AC_INCLUDES_DEFAULT
 #include <linux/types.h>
 	    ])
-	AC_LBL_TPACKET_STATS
-	AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI
+
+	#
+	# Check to see if struct tpacket_stats is defined in
+	# <linux/if_packet.h>.  If so, then pcap-linux.c can use this
+	# to report proper statistics.
+	#
+	# -Scott Barron
+	#
+	AC_CHECK_TYPES(struct tpacket_stats,,,
+	    [
+		#include <linux/if_packet.h>
+	    ])
+
+	#
+	# Check to see if the tpacket_auxdata struct has a tp_vlan_tci member.
+	#
+	# NOTE: any failure means we conclude that it doesn't have that
+	# member, so if we don't have tpacket_auxdata, we conclude it
+	# doesn't have that member (which is OK, as either we won't be
+	# using code that would use that member, or we wouldn't compile
+	# in any case).
+	AC_CHECK_MEMBERS([struct tpacket_auxdata.tp_vlan_tci],,,
+	    [
+		#include <sys/types.h>
+		#include <linux/if_packet.h>
+	    ])
 	;;
 
 bpf)
 	#
 	# Check whether we have the *BSD-style ioctls.
 	#
 	AC_CHECK_HEADERS(net/if_media.h)
 
-	AC_MSG_CHECKING(whether the system supports zerocopy BPF)
-	AC_TRY_COMPILE(
-	    [#include <sys/socket.h>
-	    #include <sys/ioctl.h>
-	    #include <net/if.h>
-	    #include <net/bpf.h>],
-	    [return (BIOCROTZBUF + BPF_BUFMODE_ZBUF);],
+	#
+	# Check whether we have struct BPF_TIMEVAL.
+	#
+	AC_CHECK_TYPES(struct BPF_TIMEVAL,,,
 	    [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_ZEROCOPY_BPF, 1,
-		[define if the system supports zerocopy BPF])
-	    ],
-	    AC_MSG_RESULT(no))
-
-	    #
-	    # Check whether we have struct BPF_TIMEVAL.
-	    #
-	    AC_CHECK_TYPES(struct BPF_TIMEVAL,,,
-		[
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
-#include <net/bpf.h>
-		    ])
+		#include <sys/types.h>
+		#include <sys/ioctl.h>
+		#ifdef HAVE_SYS_IOCCOM_H
+		#include <sys/ioccom.h>
+		#endif
+		#include <net/bpf.h>
+	    ])
 	;;
 
 dag)
 	#
 	# --with-pcap=dag is the only way to get here, and it means
 	# "DAG support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DDAG_ONLY"
 	xxx_only=yes
 	;;
 
 septel)
 	#
 	# --with-pcap=septel is the only way to get here, and it means
 	# "Septel support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DSEPTEL_ONLY"
 	xxx_only=yes
 	;;
 
 snf)
 	#
 	# --with-pcap=snf is the only way to get here, and it means
 	# "SNF support but nothing else"
 	#
 	V_DEFS="$V_DEFS -DSNF_ONLY"
 	xxx_only=yes
 	;;
 
 null)
-	AC_MSG_WARN(cannot determine packet capture interface)
-	AC_MSG_WARN((see the INSTALL doc for more info))
 	;;
+
+*)
+	AC_MSG_ERROR($V_PCAP is not a valid pcap type)
+	;;
 esac
 
 dnl
 dnl Now figure out how we get a list of interfaces and addresses,
 dnl if we support capturing.  Don't bother if we don't support
 dnl capturing.
 dnl
 if test "$V_PCAP" != null
 then
 	AC_CHECK_FUNC(getifaddrs,[
 		#
 		# We have "getifaddrs()"; make sure we have <ifaddrs.h>
 		# as well, just in case some platform is really weird.
 		#
 		AC_CHECK_HEADER(ifaddrs.h,[
 		    #
 		    # We have the header, so we use "getifaddrs()" to
 		    # get the list of interfaces.
 		    #
 		    V_FINDALLDEVS=fad-getad.c
 		],[
 		    #
 		    # We don't have the header - give up.
 		    # XXX - we could also fall back on some other
 		    # mechanism, but, for now, this'll catch this
 		    # problem so that we can at least try to figure
 		    # out something to do on systems with "getifaddrs()"
 		    # but without "ifaddrs.h", if there is something
 		    # we can do on those systems.
 		    #
 		    AC_MSG_ERROR([Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>.])
 		])
 	],[
 		#
-		# Well, we don't have "getifaddrs()", so we have to use
-		# some other mechanism; determine what that mechanism is.
+		# Well, we don't have "getifaddrs()", at least not with the
+		# libraries with which we've decided we need to link
+		# libpcap with, so we have to use some other mechanism.
 		#
-		# The first thing we use is the type of capture mechanism,
-		# which is somewhat of a proxy for the OS we're using.
+		# Note that this may happen on Solaris, which has
+		# getifaddrs(), but in -lsocket, not in -lxnet, so we
+		# won't find it if we link with -lxnet, which we want
+		# to do for other reasons.
 		#
-		case "$V_PCAP" in
-
-		dlpi|libdlpi)
-			#
-			# This might be Solaris 8 or later, with
-			# SIOCGLIFCONF, or it might be some other OS
-			# or some older version of Solaris, with
-			# just SIOCGIFCONF.
-			#
-			AC_MSG_CHECKING(whether we have SIOCGLIFCONF)
-			AC_CACHE_VAL(ac_cv_lbl_have_siocglifconf,
-			    AC_TRY_COMPILE(
-				[#include <sys/param.h>
-				#include <sys/file.h>
-				#include <sys/ioctl.h>
-				#include <sys/socket.h>
-				#include <sys/sockio.h>],
-				[ioctl(0, SIOCGLIFCONF, (char *)0);],
-				ac_cv_lbl_have_siocglifconf=yes,
-				ac_cv_lbl_have_siocglifconf=no))
-			AC_MSG_RESULT($ac_cv_lbl_have_siocglifconf)
-			if test $ac_cv_lbl_have_siocglifconf = yes ; then
-				V_FINDALLDEVS=fad-glifc.c
-			else
-				V_FINDALLDEVS=fad-gifc.c
-			fi
-			;;
-
-		*)
-			#
-			# Assume we just have SIOCGIFCONF.
-			# (XXX - on at least later Linux kernels, there's
-			# another mechanism, and we should be using that
-			# instead.)
-			#
+		# For now, we use either the SIOCGIFCONF ioctl or the
+		# SIOCGLIFCONF ioctl, preferring the latter if we have
+		# it; the latter is a Solarisism that first appeared
+		# in Solaris 8.  (Solaris's getifaddrs() appears to
+		# be built atop SIOCGLIFCONF; using it directly
+		# avoids a not-all-that-useful middleman.)
+		#
+		AC_MSG_CHECKING(whether we have SIOCGLIFCONF)
+		AC_CACHE_VAL(ac_cv_lbl_have_siocglifconf,
+		    AC_TRY_COMPILE(
+			[#include <sys/param.h>
+			#include <sys/file.h>
+			#include <sys/ioctl.h>
+			#include <sys/socket.h>
+			#include <sys/sockio.h>],
+			[ioctl(0, SIOCGLIFCONF, (char *)0);],
+			ac_cv_lbl_have_siocglifconf=yes,
+			ac_cv_lbl_have_siocglifconf=no))
+		AC_MSG_RESULT($ac_cv_lbl_have_siocglifconf)
+		if test $ac_cv_lbl_have_siocglifconf = yes ; then
+			V_FINDALLDEVS=fad-glifc.c
+		else
 			V_FINDALLDEVS=fad-gifc.c
-			;;
-		esac])
+		fi
+	])
 fi
 ])
 
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
+dnl check for hardware timestamp support
+case "$host_os" in
+linux*)
+	AC_CHECK_HEADERS([linux/net_tstamp.h])
+	;;
+*)
+	AC_MSG_NOTICE(no hardware timestamp support implemented for $host_os)
+	;;
+esac
+
+AC_ARG_ENABLE([packet-ring],
+[AC_HELP_STRING([--enable-packet-ring],[enable packet ring support on Linux @<:@default=yes@:>@])],
+,enable_packet_ring=yes)
+
+if test "x$enable_packet_ring" != "xno" ; then
+	AC_DEFINE(PCAP_SUPPORT_PACKET_RING, 1, [use packet ring capture support on Linux if available])
+	AC_SUBST(PCAP_SUPPORT_PACKET_RING)
+fi
+
+#
+# Check for socklen_t.
+#
+AC_CHECK_TYPES(socklen_t,,,
+    [
 	#include <sys/types.h>
 	#include <sys/socket.h>
-	],
-	[ socklen_t x; ],
-	have_socklen_t=yes,
-	have_socklen_t=no)
-if test "x$have_socklen_t" = "xyes"; then
-	AC_DEFINE(HAVE_SOCKLEN_T, 1, [define if socklen_t is defined])
-fi
-AC_MSG_RESULT($have_socklen_t)
+    ])
 
 AC_ARG_ENABLE(ipv6,
-AC_HELP_STRING([--enable-ipv6],[build IPv6-capable version @<:@default=yes, if getaddrinfo available@:>@]),
+AC_HELP_STRING([--enable-ipv6],[build IPv6-capable version @<:@default=yes@:>@]),
     [],
-    [enable_ipv6=ifavailable])
+    [enable_ipv6=yes])
 if test "$enable_ipv6" != "no"; then
-	AC_CHECK_FUNC(getaddrinfo,
-	    [
-		AC_DEFINE(INET6,1,[IPv6])
-	    ],
-	    [
-		if test "$enable_ipv6" != "ifavailable"; then
-			AC_MSG_FAILURE([--enable-ipv6 was given, but getaddrinfo isn't available])
-		fi
-	    ])
+	#
+	# We've already made sure we have getaddrinfo above in
+	# AC_LBL_LIBRARY_NET.
+	#
+	AC_DEFINE(INET6,1,[IPv6])
 fi
 
-AC_MSG_CHECKING(whether to build optimizer debugging code)
-AC_ARG_ENABLE(optimizer-dbg,
-AC_HELP_STRING([--enable-optimizer-dbg],[build optimizer debugging code]))
-if test "$enable_optimizer_dbg" = "yes"; then
-	AC_DEFINE(BDEBUG,1,[Enable optimizer debugging])
-fi
-AC_MSG_RESULT(${enable_optimizer_dbg-no})
-
-AC_MSG_CHECKING(whether to build parser debugging code)
-AC_ARG_ENABLE(yydebug,
-AC_HELP_STRING([--enable-yydebug],[build parser debugging code]))
-if test "$enable_yydebug" = "yes"; then
-	AC_DEFINE(YYDEBUG,1,[Enable parser debugging])
-fi
-AC_MSG_RESULT(${enable_yydebug-no})
-
 # Check for Endace DAG card support.
 AC_ARG_WITH([dag],
 AC_HELP_STRING([--with-dag@<:@=DIR@:>@],[include Endace DAG support (located in directory DIR, if supplied).  @<:@default=yes, if present@:>@]),
 [
 	if test "$withval" = no
 	then
 		# User doesn't want DAG support.
 		want_dag=no
 	elif test "$withval" = yes
 	then
 		# User wants DAG support but hasn't specified a directory.
 		want_dag=yes
 	else
 		# User wants DAG support and has specified a directory, so use the provided value.
 		want_dag=yes
 		dag_root=$withval
 	fi
 ],[
 	if test "$V_PCAP" = dag; then
 		# User requested DAG-only libpcap, so we'd better have
 		# the DAG API.
 		want_dag=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want DAG support.
 		want_dag=no
 	else
 		#
 		# Use DAG API if present, otherwise don't
 		#
 		want_dag=ifpresent
 	fi
 ])
 
 AC_ARG_WITH([dag-includes],
 AC_HELP_STRING([--with-dag-includes=IDIR],[Endace DAG include directory, if not DIR/include]),
 [
 	# User wants DAG support and has specified a header directory, so use the provided value.
 	want_dag=yes
 	dag_include_dir=$withval
 ],[])
 
 AC_ARG_WITH([dag-libraries],
 AC_HELP_STRING([--with-dag-libraries=LDIR],[Endace DAG library directory, if not DIR/lib]),
 [
 	# User wants DAG support and has specified a library directory, so use the provided value.
 	want_dag=yes
 	dag_lib_dir=$withval
 ],[])
 
-ac_cv_lbl_dag_api=no
 if test "$want_dag" != no; then
 
-	AC_MSG_CHECKING([whether we have DAG API headers])
-
 	# If necessary, set default paths for DAG API headers and libraries.
 	if test -z "$dag_root"; then
 		dag_root=/usr/local
 	fi
 
 	if test -z "$dag_include_dir"; then
 		dag_include_dir="$dag_root/include"
 	fi
 
 	if test -z "$dag_lib_dir"; then
 		dag_lib_dir="$dag_root/lib"
 	fi
 
-	if test -z "$dag_tools_dir"; then
-		dag_tools_dir="$dag_root/tools"
-	fi
+	V_INCLS="$V_INCLS -I$dag_include_dir"
 
-	if test -r $dag_include_dir/dagapi.h; then
-		ac_cv_lbl_dag_api=yes
-	fi
+	AC_CHECK_HEADERS([dagapi.h])
 
-	if test "$ac_cv_lbl_dag_api" = yes; then
-		AC_MSG_RESULT([yes ($dag_include_dir)])
+	if test "$ac_cv_header_dagapi_h" = yes; then
 
-		V_INCLS="$V_INCLS -I$dag_include_dir"
-
 		if test $V_PCAP != dag ; then
 			 SSRC="$SSRC pcap-dag.c"
 		fi
 
-		# See if we can find a general version string.
+		# Check for various DAG API functions.
 		# Don't need to save and restore LIBS to prevent -ldag being
 		# included if there's a found-action (arg 3).
 		saved_ldflags=$LDFLAGS
 		LDFLAGS="-L$dag_lib_dir"
-		AC_CHECK_LIB([dag], [dag_attach_stream], [dag_streams="1"], [dag_streams="0"])
+		AC_CHECK_LIB([dag], [dag_attach_stream],
+		    [],
+		    [AC_MSG_ERROR(DAG library lacks streams support)])
+		AC_CHECK_LIB([dag], [dag_attach_stream64], [dag_large_streams="1"], [dag_large_streams="0"])
 		AC_CHECK_LIB([dag],[dag_get_erf_types], [
 			AC_DEFINE(HAVE_DAG_GET_ERF_TYPES, 1, [define if you have dag_get_erf_types()])])
 		AC_CHECK_LIB([dag],[dag_get_stream_erf_types], [
 			AC_DEFINE(HAVE_DAG_GET_STREAM_ERF_TYPES, 1, [define if you have dag_get_stream_erf_types()])])
 
 		LDFLAGS=$saved_ldflags
 
-		if test "$dag_streams" = 1; then
-			AC_DEFINE(HAVE_DAG_STREAMS_API, 1, [define if you have streams capable DAG API])
-			LIBS="$LIBS -ldag"
-			LDFLAGS="$LDFLAGS -L$dag_lib_dir"
+		#
+		# We assume that if we have libdag we have libdagconf,
+		# as they're installed at the same time from the same
+		# package.
+		#
+		LIBS="$LIBS -ldag -ldagconf"
+		LDFLAGS="$LDFLAGS -L$dag_lib_dir"
 
+		if test "$dag_large_streams" = 1; then
+			AC_DEFINE(HAVE_DAG_LARGE_STREAMS_API, 1, [define if you have large streams capable DAG API])
 			AC_CHECK_LIB([vdag],[vdag_set_device_info], [ac_dag_have_vdag="1"], [ac_dag_have_vdag="0"])
 			if test "$ac_dag_have_vdag" = 1; then
 				AC_DEFINE(HAVE_DAG_VDAG, 1, [define if you have vdag_set_device_info()])
-				LIBS="$LIBS -lpthread"
+				if test "$ac_lbl_have_pthreads" != "found"; then
+					AC_MSG_ERROR([DAG requires pthreads, but we didn't find them])
+				fi
+				LIBS="$LIBS $PTHREAD_LIBS"
 			fi
 		fi
 
 		AC_DEFINE(HAVE_DAG_API, 1, [define if you have the DAG API])
 	else
-		AC_MSG_RESULT(no)
 
 		if test "$V_PCAP" = dag; then
 			# User requested "dag" capture type but we couldn't
 			# find the DAG API support.
 			AC_MSG_ERROR([DAG support requested with --with-pcap=dag, but the DAG headers weren't found at $dag_include_dir: make sure the DAG support is installed, specify a different path or paths if necessary, or don't request DAG support])
 		fi
 
 		if test "$want_dag" = yes; then
 	        	# User wanted DAG support but we couldn't find it.
 			AC_MSG_ERROR([DAG support requested with --with-dag, but the DAG headers weren't found at $dag_include_dir: make sure the DAG support is installed, specify a different path or paths if necessary, or don't request DAG support])
 		fi
 	fi
 fi
 
 AC_ARG_WITH(septel,
 AC_HELP_STRING([--with-septel@<:@=DIR@:>@],[include Septel support (located in directory DIR, if supplied).  @<:@default=yes, if present@:>@]),
 [
 	if test "$withval" = no
 	then
 		want_septel=no
 	elif test "$withval" = yes
 	then
 		want_septel=yes
 		septel_root=
 	else
 		want_septel=yes
 		septel_root=$withval
 	fi
 ],[
 	if test "$V_PCAP" = septel; then
 		# User requested Septel-only libpcap, so we'd better have
 		# the Septel API.
 		want_septel=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want Septel support.
 		want_septel=no
 	else
 		#
 		# Use Septel API if present, otherwise don't
 		#
 		want_septel=ifpresent
 	fi
 ])
 
 ac_cv_lbl_septel_api=no
 if test "$with_septel" != no; then
 
 	AC_MSG_CHECKING([whether we have Septel API headers])
 
 	# If necessary, set default paths for Septel API headers and libraries.
 	if test -z "$septel_root"; then
 		septel_root=$srcdir/../septel
 	fi
 
 	septel_tools_dir="$septel_root"
 	septel_include_dir="$septel_root/INC"
 
 	if test -r "$septel_include_dir/msg.h"; then
 		ac_cv_lbl_septel_api=yes
 	fi
 
 	if test "$ac_cv_lbl_septel_api" = yes; then
 		AC_MSG_RESULT([yes ($septel_include_dir)])
 
 		V_INCLS="$V_INCLS -I$septel_include_dir"
 		ADDLOBJS="$ADDLOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o"
 		ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o"
 
 		if test "$V_PCAP" != septel ; then
 			 SSRC="$SSRC pcap-septel.c"
 		fi
 
 		AC_DEFINE(HAVE_SEPTEL_API, 1, [define if you have the Septel API])
 	else
 		AC_MSG_RESULT(no)
 
 		if test "$V_PCAP" = septel; then
 			# User requested "septel" capture type but
 			# we couldn't find the Septel API support.
 			AC_MSG_ERROR([Septel support requested with --with-pcap=septel, but the Septel headers weren't found at $septel_include_dir: make sure the Septel support is installed, specify a different path or paths if necessary, or don't request Septel support])
 		fi
 
 		if test "$want_septel" = yes; then
 	        	# User wanted Septel support but we couldn't find it.
 			AC_MSG_ERROR([Septel support requested with --with-septel, but the Septel headers weren't found at $septel_include_dir: make sure the Septel support is installed, specify a different path or paths if necessary, or don't request Septel support])
 		fi
 	fi
 fi
 
 # Check for Myricom SNF support.
 AC_ARG_WITH([snf],
 AC_HELP_STRING([--with-snf@<:@=DIR@:>@],[include Myricom SNF support (located in directory DIR, if supplied).  @<:@default=yes, if present@:>@]),
 [
 	if test "$withval" = no
 	then
 		# User explicitly doesn't want SNF
 		want_snf=no
 	elif test "$withval" = yes
 	then
 		# User wants SNF support but hasn't specified a directory.
 		want_snf=yes
 	else
 		# User wants SNF support with a specified directory.
 		want_snf=yes
 		snf_root=$withval
 	fi
 ],[
 	if test "$V_PCAP" = snf; then
 		# User requested Sniffer-only libpcap, so we'd better have
 		# the Sniffer API.
 		want_snf=yes
 	elif test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want SNF support.
 		want_snf=no
 	else
 		#
 		# Use Sniffer API if present, otherwise don't
 		#
 		want_snf=ifpresent
 	fi
 ])
 
 AC_ARG_WITH([snf-includes],
 AC_HELP_STRING([--with-snf-includes=IDIR],[Myricom SNF include directory, if not DIR/include]),
 [
 	# User wants SNF with specific header directory
 	want_snf=yes
 	snf_include_dir=$withval
 ],[])
 
 AC_ARG_WITH([snf-libraries],
 AC_HELP_STRING([--with-snf-libraries=LDIR],[Myricom SNF library directory, if not DIR/lib]),
 [
 	# User wants SNF with specific lib directory
 	want_snf=yes
 	snf_lib_dir=$withval
 ],[])
 
 ac_cv_lbl_snf_api=no
 if test "$with_snf" != no; then
 
 	AC_MSG_CHECKING(whether we have Myricom Sniffer API)
 
 	# If necessary, set default paths for Sniffer headers and libraries.
 	if test -z "$snf_root"; then
 		snf_root=/opt/snf
 	fi
 
 	if test -z "$snf_include_dir"; then
 		snf_include_dir="$snf_root/include"
 	fi
 
 	if test -z "$snf_lib_dir"; then
 		snf_lib_dir="$snf_root/lib"
 	fi
 
 	if test -f "$snf_include_dir/snf.h"; then
 		# We found a header; make sure we can link with the library
 		saved_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -L$snf_lib_dir"
 		AC_CHECK_LIB([snf], [snf_init], [ac_cv_lbl_snf_api="yes"])
 		LDFLAGS="$saved_ldflags"
 		if test "$ac_cv_lbl_snf_api" = no; then
 			AC_MSG_ERROR(SNF API cannot correctly be linked; check config.log)
 		fi
 	fi
 
 	if test "$ac_cv_lbl_snf_api" = yes; then
 		AC_MSG_RESULT([yes ($snf_root)])
 
 		V_INCLS="$V_INCLS -I$snf_include_dir"
 		LIBS="$LIBS -lsnf"
 		LDFLAGS="$LDFLAGS -L$snf_lib_dir"
 
 		if test "$V_PCAP" != snf ; then
 			SSRC="$SSRC pcap-snf.c"
 		fi
 
 		AC_DEFINE(HAVE_SNF_API, 1, [define if you have the Myricom SNF API])
 	else
 		AC_MSG_RESULT(no)
 
 		if test "$want_snf" = yes; then
 			# User requested "snf" capture type but
 			# we couldn't find the Sniffer API support.
 			AC_MSG_ERROR([Myricom Sniffer support requested with --with-pcap=snf, but the Sniffer headers weren't found at $snf_include_dir: make sure the Sniffer support is installed, specify a different path or paths if necessary, or don't request Sniffer support])
 		fi
 
 		if test "$want_snf" = yes; then
 			AC_MSG_ERROR([Myricom Sniffer support requested with --with-snf, but the Sniffer headers weren't found at $snf_include_dir: make sure the Sniffer support is installed, specify a different path or paths if necessary, or don't request Sniffer support])
 		fi
 	fi
 fi
 
 # Check for Riverbed TurboCap support.
 AC_ARG_WITH([turbocap],
 AC_HELP_STRING([--with-turbocap@<:@=DIR@:>@],[include Riverbed TurboCap support (located in directory DIR, if supplied).  @<:@default=yes, if present@:>@]),
 [
 	if test "$withval" = no
 	then
 		# User explicitly doesn't want TurboCap
 		want_turbocap=no
 	elif test "$withval" = yes
 	then
 		# User wants TurboCap support but hasn't specified a directory.
 		want_turbocap=yes
 	else
 		# User wants TurboCap support with a specified directory.
 		want_turbocap=yes
 		turbocap_root=$withval
 	fi
 ],[
 	if test "xxx_only" = yes; then
 		# User requested something-else-only pcap, so they don't
 		# want TurboCap support.
 		want_turbocap=no
 	else
 		#
 		# Use TurboCap API if present, otherwise don't
 		#
 		want_turbocap=ifpresent
 	fi
 ])
 
 ac_cv_lbl_turbocap_api=no
 if test "$want_turbocap" != no; then
 
 	AC_MSG_CHECKING(whether TurboCap is supported)
 
 	save_CFLAGS="$CFLAGS"
 	save_LIBS="$LIBS"
 	if test ! -z "$turbocap_root"; then
 		TURBOCAP_CFLAGS="-I$turbocap_root/include"
 		TURBOCAP_LIBS="-L$turbocap_root/lib"
 		CFLAGS="$CFLAGS $TURBOCAP_CFLAGS"
 	fi
 
 	AC_TRY_COMPILE(
 	[
 	    #include <TcApi.h>
 	],
 	[
 	    TC_INSTANCE a; TC_PORT b; TC_BOARD c;
 	    TC_INSTANCE i;
 	    (void)TcInstanceCreateByName("foo", &i);
 	],
 	ac_cv_lbl_turbocap_api=yes)
 
 	CFLAGS="$save_CFLAGS"
 	if test $ac_cv_lbl_turbocap_api = yes; then
 		AC_MSG_RESULT(yes)
 
 		SSRC="$SSRC pcap-tc.c"
 		V_INCLS="$V_INCLS $TURBOCAP_CFLAGS"
 		LIBS="$LIBS $TURBOCAP_LIBS -lTcApi -lpthread -lstdc++"
 
 		AC_DEFINE(HAVE_TC_API, 1, [define if you have the TurboCap API])
 	else
 		AC_MSG_RESULT(no)
 
 		if test "$want_turbocap" = yes; then
 	        	# User wanted Turbo support but we couldn't find it.
 			AC_MSG_ERROR([TurboCap support requested with --with-turbocap, but the TurboCap headers weren't found: make sure the TurboCap support is installed or don't request TurboCap support])
 		fi
 	fi
 fi
 
+dnl
+dnl Allow the user to enable remote capture.
+dnl It's off by default, as that increases the attack surface of
+dnl libpcap, exposing it to malicious servers.
+dnl
+AC_MSG_CHECKING([whether to enable remote packet capture])
+AC_ARG_ENABLE(remote,
+[  --enable-remote         enable remote packet capture @<:@default=no@:>@
+  --disable-remote        disable remote packet capture],,
+   enableval=no)
+case "$enableval" in
+yes)	AC_MSG_RESULT(yes)
+	AC_WARN([Remote packet capture may expose libpcap-based applications])
+	AC_WARN([to attacks by malicious remote capture servers!])
+	#
+	# rpcapd requires pthreads on UN*X.
+	#
+	if test "$ac_lbl_have_pthreads" != "found"; then
+		AC_MSG_ERROR([rpcapd requires pthreads, but we didn't find them])
+	fi
+	#
+	# It also requires crypt().
+	# Do we have it in the system libraries?
+	#
+	AC_CHECK_FUNC(crypt,,
+	    [
+		#
+		# No.  Do we have it in -lcrypt?
+		#
+		AC_CHECK_LIB(crypt, crypt,
+		    [
+			#
+			# Yes; add -lcrypt to the libraries for rpcapd.
+			#
+			RPCAPD_LIBS="$RPCAPD_LIBS -lcrypt"
+		    ],
+		    [
+			AC_MSG_ERROR([rpcapd requires crypt(), but we didn't find it])
+		    ])
+	    ])
+
+	#
+	# OK, we have crypt().  Do we have getspnam()?
+	#
+	AC_CHECK_FUNCS(getspnam)
+
+	#
+	# Check for various members of struct msghdr.
+	#
+	AC_CHECK_MEMBERS([struct msghdr.msg_control],,,
+	    [
+		#include "ftmacros.h"
+		#include <sys/socket.h>
+	    ])
+	AC_CHECK_MEMBERS([struct msghdr.msg_flags],,,
+	    [
+		#include "ftmacros.h"
+		#include <sys/socket.h>
+	    ])
+
+	AC_DEFINE(ENABLE_REMOTE,,
+	    [Define to 1 if remote packet capture is to be supported])
+	SSRC="$SSRC pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c"
+	BUILD_RPCAPD=build-rpcapd
+	INSTALL_RPCAPD=install-rpcapd
+	;;
+*)	AC_MSG_RESULT(no)
+	;;
+esac
+
+AC_MSG_CHECKING(whether to build optimizer debugging code)
+AC_ARG_ENABLE(optimizer-dbg,
+AC_HELP_STRING([--enable-optimizer-dbg],[build optimizer debugging code]))
+if test "$enable_optimizer_dbg" = "yes"; then
+	AC_DEFINE(BDEBUG,1,[Enable optimizer debugging])
+fi
+AC_MSG_RESULT(${enable_optimizer_dbg-no})
+
+AC_MSG_CHECKING(whether to build parser debugging code)
+AC_ARG_ENABLE(yydebug,
+AC_HELP_STRING([--enable-yydebug],[build parser debugging code]))
+if test "$enable_yydebug" = "yes"; then
+	AC_DEFINE(YYDEBUG,1,[Enable parser debugging])
+fi
+AC_MSG_RESULT(${enable_yydebug-no})
+
 #
 # Look for {f}lex.
 #
 AC_PROG_LEX
 if test "$LEX" = ":"; then
 	AC_MSG_ERROR([Neither flex nor lex was found.])
 fi
 
 #
 # Make sure {f}lex supports the -P, --header-file, and --nounput flags
 # and supports processing our scanner.l.
 #
 AC_CACHE_CHECK([for capable lex], tcpdump_cv_capable_lex,
 	if $LEX -P pcap_ --header-file=/dev/null --nounput -t $srcdir/scanner.l > /dev/null 2>&1; then
 	    tcpdump_cv_capable_lex=yes
 	else
 	    tcpdump_cv_capable_lex=insufficient
 	fi)
 if test $tcpdump_cv_capable_lex = insufficient ; then
 	AC_MSG_ERROR([$LEX is insufficient to compile libpcap.
  libpcap requires Flex 2.5.31 or later, or a compatible version of lex.])
 fi
 
 #
 # Look for yacc/bison/byacc.
 #
 AC_PROG_YACC
 
 #
 # Make sure it supports the -p flag and supports processing our
 # grammar.y.
 #
 AC_CACHE_CHECK([for capable yacc/bison], tcpdump_cv_capable_yacc,
 	if $YACC -p pcap_ -o /dev/null $srcdir/grammar.y >/dev/null 2>&1; then
 	    tcpdump_cv_capable_yacc=yes
 	else
 	    tcpdump_cv_capable_yacc=insufficient
 	fi)
 if test $tcpdump_cv_capable_yacc = insufficient ; then
 	AC_MSG_ERROR([$YACC is insufficient to compile libpcap.
  libpcap requires Bison, Berkeley YACC, or another YACC compatible with them.])
 fi
 
 #
-# Assume, by default, no support for shared libraries and V7/BSD convention
-# for man pages (file formats in section 5, miscellaneous info in section 7).
+# Do various checks for various OSes and versions of those OSes.
+#
+# Assume, by default, no support for shared libraries and V7/BSD
+# convention for man pages (file formats in section 5, miscellaneous
+# info in section 7, administrative commands and daemons in section 8).
 # Individual cases can override this.
 #
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
+MAN_ADMIN_COMMANDS=8
 case "$host_os" in
 
 aix*)
 	dnl Workaround to enable certain features
 	AC_DEFINE(_SUN,1,[define on AIX to get certain functions])
 
 	#
 	# AIX makes it fun to build shared and static libraries,
 	# because they're *both* ".a" archive libraries.  We
 	# build the static library for the benefit of the traditional
 	# scheme of building libpcap and tcpdump in subdirectories of
 	# the same directory, with tcpdump statically linked with the
 	# libpcap in question, but we also build a shared library as
 	# "libpcap.shareda" and install *it*, rather than the static
 	# library, as "libpcap.a".
 	#
 	DYEXT="shareda"
 
 	case "$V_PCAP" in
 
 	dlpi)
 		#
 		# If we're using DLPI, applications will need to
 		# use /lib/pse.exp if present, as we use the
 		# STREAMS routines.
 		#
 		pseexe="/lib/pse.exp"
 		AC_MSG_CHECKING(for $pseexe)
 		if test -f $pseexe ; then
 			AC_MSG_RESULT(yes)
 			LIBS="-I:$pseexe"
 		fi
 		;;
 
 	bpf)
 		#
 		# If we're using BPF, we need "-lodm" and "-lcfg", as
 		# we use them to load the BPF module.
 		#
 		LIBS="-lodm -lcfg"
 		;;
 	esac
 	;;
 
 darwin*)
 	DYEXT="dylib"
 	V_CCOPT="$V_CCOPT -fno-common"
 	AC_ARG_ENABLE(universal,
-	AC_HELP_STRING([--disable-universal],[don't build universal on OS X]))
+	AC_HELP_STRING([--disable-universal],[don't build universal on macOS]))
 	if test "$enable_universal" != "no"; then
 		case "$host_os" in
 
 		darwin[0-7].*)
 			#
 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
 			# need for any special compiler or linker flags.
 			#
 			;;
 
 		darwin8.[0123]*)
 			#
 			# Tiger, prior to Intel support.  Build for 32-bit
 			# PowerPC and 64-bit PowerPC, with 32-bit PowerPC
 			# first.  (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64"
 			;;
 
 		darwin8.[456]*)
 			#
 			# Tiger, subsequent to Intel support but prior to
 			# x86-64 support.  Build for 32-bit PowerPC, 64-bit
 			# PowerPC, and x86, with 32-bit PowerPC first.
 			# (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386"
 			;;
 
 		darwin8.*)
 			#
 			# All other Tiger, so subsequent to x86-64
 			# support. Build for 32-bit PowerPC, 64-bit
 			# PowerPC, x86, and x86-64, and with 32-bit PowerPC
 			# first.  (I'm guessing that's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			;;
 
 		darwin9.*)
 			#
 			# Leopard.  Build for 32-bit PowerPC, 64-bit
 			# PowerPC, x86, and x86-64, with 32-bit PowerPC
 			# first.  (That's what Apple does.)
 			#
 			V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
 			;;
 
 		darwin10.*)
 			#
 			# Snow Leopard.  Build for x86-64, x86, and
 			# 32-bit PowerPC, with x86-64 first.  (That's
 			# what Apple does, even though Snow Leopard
 			# doesn't run on PPC, so PPC libpcap runs under
 			# Rosetta, and Rosetta doesn't support BPF
 			# ioctls, so PPC programs can't do live
 			# captures.)
 			#
 			V_CCOPT="$V_CCOPT -arch x86_64 -arch i386 -arch ppc"
 			LDFLAGS="$LDFLAGS -arch x86_64 -arch i386 -arch ppc"
 			;;
 
 		darwin*)
 			#
 			# Post-Snow Leopard.  Build for x86-64 and
 			# x86, with x86-64 first.  (That's probably what
 			# Apple does, given that Rosetta is gone.)
 			# XXX - update if and when Apple drops support
 			# for 32-bit x86 code.
 			#
 			V_CCOPT="$V_CCOPT -arch x86_64 -arch i386"
 			LDFLAGS="$LDFLAGS -arch x86_64 -arch i386"
 			;;
 		esac
 	fi
 	;;
 
 hpux9*)
 	AC_DEFINE(HAVE_HPUX9,1,[on HP-UX 9.x])
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux10.0*)
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux10.1*)
 
 	#
 	# Use System V conventions for man pages.
 	#
+	MAN_ADMIN_COMMANDS=1m
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 hpux*)
 	dnl HPUX 10.20 and above is similar to HPUX 9, but
 	dnl not the same....
 	dnl
 	dnl XXX - DYEXT should be set to "sl" if this is building
 	dnl for 32-bit PA-RISC, but should be left as "so" for
 	dnl 64-bit PA-RISC or, I suspect, IA-64.
 	AC_DEFINE(HAVE_HPUX10_20_OR_LATER,1,[on HP-UX 10.20 or later])
 	if test "`uname -m`" = "ia64"; then
 		DYEXT="so"
 	else
 		DYEXT="sl"
 	fi
 
 	#
 	# "-b" builds a shared library; "+h" sets the soname.
 	#
 	SHLIB_OPT="-b"
 	SONAME_OPT="+h"
 
 	#
 	# Use System V conventions for man pages.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 irix*)
 	#
-	# Use System V conventions for man pages.
+	# Use IRIX conventions for man pages; they're the same as the
+	# System V conventions, except that they use section 8 for
+	# administrative commands and daemons.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 linux*|freebsd*|netbsd*|openbsd*|dragonfly*|kfreebsd*|gnu*)
 	DYEXT="so"
 
 	#
 	# Compiler assumed to be GCC; run-time linker may require a -R
 	# flag.
 	#
 	if test "$libdir" != "/usr/lib"; then
 		V_RFLAGS=-Wl,-R$libdir
 	fi
 	;;
 
 osf*)
 	DYEXT="so"
 
 	#
-	# Use System V conventions for man pages.
+	# DEC OSF/1, a/k/a Digial UNIX, a/k/a Tru64 UNIX.
+	# Use Tru64 UNIX conventions for man pages; they're the same as
+	# the System V conventions except that they use section 8 for
+	# administrative commands and daemons.
 	#
 	MAN_FILE_FORMATS=4
 	MAN_MISC_INFO=5
 	;;
 
 sinix*)
 	AC_MSG_CHECKING(if SINIX compiler defines sinix)
 	AC_CACHE_VAL(ac_cv_cc_sinix_defined,
 		AC_TRY_COMPILE(
 		    [],
 		    [int i = sinix;],
 		    ac_cv_cc_sinix_defined=yes,
 		    ac_cv_cc_sinix_defined=no))
 	    AC_MSG_RESULT($ac_cv_cc_sinix_defined)
 	    if test $ac_cv_cc_sinix_defined = no ; then
 		    AC_DEFINE(sinix,1,[on sinix])
 	    fi
 	;;
 
 solaris*)
 	AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
 
 	DYEXT="so"
+
 	#
-	# Use System V conventions for man pages.
+	# Make sure errno is thread-safe, in case we're called in
+	# a multithreaded program.  We don't guarantee that two
+	# threads can use the *same* pcap_t safely, but the
+	# current version does guarantee that you can use different
+	# pcap_t's in different threads, and even that pcap_compile()
+	# is thread-safe (it wasn't thread-safe in some older versions).
 	#
-	MAN_FILE_FORMATS=4
-	MAN_MISC_INFO=5
+	V_CCOPT="$V_CCOPT -D_TS_ERRNO"
+
+	case "`uname -r`" in
+
+	5.12)
+		;;
+
+	*)
+		#
+		# Use System V conventions for man pages.
+		#
+		MAN_ADMIN_COMMANDS=1m
+		MAN_FILE_FORMATS=4
+		MAN_MISC_INFO=5
+	esac
 	;;
 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])
 
 AC_PROG_LN_S
 AC_SUBST(LN_S)
 
 AC_LBL_DEVEL(V_CCOPT)
 
-AC_LBL_SOCKADDR_SA_LEN
+#
+# Check to see if the sockaddr struct has the 4.4 BSD sa_len member.
+#
+AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,
+    [
+	#include <sys/types.h>
+	#include <sys/socket.h>
+    ])
 
-AC_LBL_SOCKADDR_STORAGE
+#
+# Check to see if there's a sockaddr_storage structure.
+#
+AC_CHECK_TYPES(struct sockaddr_storage,,,
+    [
+	#include <sys/types.h>
+	#include <sys/socket.h>
+    ])
 
-AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1
+#
+# Check to see if the dl_hp_ppa_info_t struct has the HP-UX 11.00
+# dl_module_id_1 member.
+#
+# NOTE: any failure means we conclude that it doesn't have that member,
+# so if we don't have DLPI, don't have a <sys/dlpi_ext.h> header, or
+# have one that doesn't declare a dl_hp_ppa_info_t type, we conclude
+# it doesn't have that member (which is OK, as either we won't be
+# using code that would use that member, or we wouldn't compile in
+# any case).
+#
+AC_CHECK_MEMBERS([dl_hp_ppa_info_t.dl_module_id_1],,,
+    [
+	#include <sys/types.h>
+	#include <sys/dlpi.h>
+	#include <sys/dlpi_ext.h>
+    ])
 
 AC_LBL_UNALIGNED_ACCESS
 
-rm -f net
-ln -s ${srcdir}/bpf/net net
-
 AC_SUBST(V_CCOPT)
 AC_SUBST(V_DEFS)
 AC_SUBST(V_FINDALLDEVS)
 AC_SUBST(V_INCLS)
 AC_SUBST(V_LEX)
 AC_SUBST(V_PCAP)
+AC_SUBST(V_SHLIB_CCOPT)
 AC_SUBST(V_SHLIB_CMD)
 AC_SUBST(V_SHLIB_OPT)
 AC_SUBST(V_SONAME_OPT)
 AC_SUBST(V_RPATH_OPT)
 AC_SUBST(V_YACC)
 AC_SUBST(ADDLOBJS)
 AC_SUBST(ADDLARCHIVEOBJS)
 AC_SUBST(SSRC)
 AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
+AC_SUBST(MAN_ADMIN_COMMANDS)
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(BUILD_RPCAPD)
+AC_SUBST(INSTALL_RPCAPD)
+AC_SUBST(RPCAPD_LIBS)
+AC_SUBST(EXTRA_NETWORK_LIBS)
 
 AC_ARG_ENABLE([usb],
-[AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],
+[AC_HELP_STRING([--enable-usb],[enable USB capture support @<:@default=yes, if support available@:>@])],
     [],
     [enable_usb=yes])
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want USB support.
 	enable_usb=no
 fi
 
 if test "x$enable_usb" != "xno" ; then
    dnl check for USB sniffing support
    AC_MSG_CHECKING(for USB sniffing support)
    case "$host_os" in
    linux*)
 	AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
 	USB_SRC=pcap-usb-linux.c
 	AC_MSG_RESULT(yes)
 	ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
 	if test $? -ne 0 ; then
 	  ac_usb_dev_name="usbmon"
 	fi
 	AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
 	AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
 	#
 	# Do we have a version of <linux/compiler.h> available?
 	# If so, we might need it for <linux/usbdevice_fs.h>.
 	#
 	AC_CHECK_HEADERS(linux/compiler.h)
 	if test "$ac_cv_header_linux_compiler_h" = yes; then
 	  #
 	  # Yes - include it when testing for <linux/usbdevice_fs.h>.
 	  #
 	  AC_CHECK_HEADERS(linux/usbdevice_fs.h,,,[#include <linux/compiler.h>])
 	else
 	  AC_CHECK_HEADERS(linux/usbdevice_fs.h)
 	fi
 	if test "$ac_cv_header_linux_usbdevice_fs_h" = yes; then
 	  #
 	  # OK, does it define bRequestType?  Older versions of the kernel
 	  # define fields with names like "requesttype, "request", and
 	  # "value", rather than "bRequestType", "bRequest", and
 	  # "wValue".
 	  #
-	  AC_MSG_CHECKING(if usbdevfs_ctrltransfer struct has bRequestType member)
-	  AC_CACHE_VAL(ac_cv_usbdevfs_ctrltransfer_has_bRequestType,
-	    AC_TRY_COMPILE([
-AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_LINUX_COMPILER_H
-#include <linux/compiler.h>
-#endif
-#include <linux/usbdevice_fs.h>],
-	      [u_int i = sizeof(((struct usbdevfs_ctrltransfer *)0)->bRequestType)],
-	      ac_cv_usbdevfs_ctrltransfer_has_bRequestType=yes,
-	      ac_cv_usbdevfs_ctrltransfer_has_bRequestType=no))
-	    AC_MSG_RESULT($ac_cv_usbdevfs_ctrltransfer_has_bRequestType)
-	    if test $ac_cv_usbdevfs_ctrltransfer_has_bRequestType = yes ; then
-	      AC_DEFINE(HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE,1,
-	        [if struct usbdevfs_ctrltransfer has bRequestType])
-	    fi
+	  AC_CHECK_MEMBERS([struct usbdevfs_ctrltransfer.bRequestType],,,
+	      [
+		  AC_INCLUDES_DEFAULT
+		  #ifdef HAVE_LINUX_COMPILER_H
+		  #include <linux/compiler.h>
+		  #endif
+		  #include <linux/usbdevice_fs.h>
+	      ])
 	fi
 	;;
     freebsd*)
 	#
 	# This just uses BPF in FreeBSD 8.4 and later; we don't need
 	# to check for anything special for capturing.
 	#
 	AC_MSG_RESULT([yes, in FreeBSD 8.4 and later])
 	;;
 
     *)
 	AC_MSG_RESULT(no)
 	;;
 esac
 fi
 AC_SUBST(PCAP_SUPPORT_USB)
 AC_SUBST(USB_SRC)
 
 dnl check for netfilter sniffing support
 if test "xxx_only" != yes; then
 	AC_MSG_CHECKING(whether the platform could support netfilter sniffing)
 	case "$host_os" in
 	linux*)
 		AC_MSG_RESULT(yes)
 		#
 		# Life's too short to deal with trying to get this to compile
 		# if you don't get the right types defined with
 		# __KERNEL_STRICT_NAMES getting defined by some other include.
 		#
 		# Check whether the includes Just Work.  If not, don't turn on
 		# netfilter support.
 		#
 		AC_MSG_CHECKING(whether we can compile the netfilter support)
 		AC_CACHE_VAL(ac_cv_netfilter_can_compile,
 		  AC_TRY_COMPILE([
 AC_INCLUDES_DEFAULT
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <linux/types.h>
 
 #include <linux/netlink.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
 #include <linux/netfilter/nfnetlink_queue.h>],
-	    [],
-	    ac_cv_netfilter_can_compile=yes,
-	    ac_cv_netfilter_can_compile=no))
+		    [],
+		    ac_cv_netfilter_can_compile=yes,
+		    ac_cv_netfilter_can_compile=no))
 		AC_MSG_RESULT($ac_cv_netfilter_can_compile)
 		if test $ac_cv_netfilter_can_compile = yes ; then
 		  AC_DEFINE(PCAP_SUPPORT_NETFILTER, 1,
 		    [target host supports netfilter sniffing])
 		  NETFILTER_SRC=pcap-netfilter-linux.c
 		fi
 		;;
 	*)
 		AC_MSG_RESULT(no)
 		;;
 	esac
 fi
 AC_SUBST(PCAP_SUPPORT_NETFILTER)
 AC_SUBST(NETFILTER_SRC)
 
+AC_ARG_ENABLE([netmap],
+[AC_HELP_STRING([--enable-netmap],[enable netmap support @<:@default=yes, if support available@:>@])],
+    [],
+    [enable_netmap=yes])
+
+if test "x$enable_netmap" != "xno" ; then
+	#
+	# Check whether net/netmap_user.h is usable if NETMAP_WITH_LIBS is
+	# defined; it's not usable on DragonFly BSD 4.6 if NETMAP_WITH_LIBS
+	# is defined, for example, as it includes a non-existent malloc.h
+	# header.
+	#
+	AC_MSG_CHECKING(whether we can compile the netmap support)
+	AC_CACHE_VAL(ac_cv_net_netmap_user_can_compile,
+	  AC_TRY_COMPILE([
+AC_INCLUDES_DEFAULT
+#define NETMAP_WITH_LIBS
+#include <net/netmap_user.h>],
+	    [],
+	    ac_cv_net_netmap_user_can_compile=yes,
+	    ac_cv_net_netmap_user_can_compile=no))
+	AC_MSG_RESULT($ac_cv_net_netmap_user_can_compile)
+	if test $ac_cv_net_netmap_user_can_compile = yes ; then
+	  AC_DEFINE(PCAP_SUPPORT_NETMAP, 1,
+	    [target host supports netmap])
+	    NETMAP_SRC=pcap-netmap.c
+	fi
+	AC_SUBST(PCAP_SUPPORT_NETMAP)
+	AC_SUBST(NETMAP_SRC)
+fi
+
+
 AC_ARG_ENABLE([bluetooth],
 [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])],
     [],
     [enable_bluetooth=ifsupportavailable])
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want Bluetooth support.
 	enable_bluetooth=no
 fi
 
 if test "x$enable_bluetooth" != "xno" ; then
 	dnl check for Bluetooth sniffing support
 	case "$host_os" in
 	linux*)
 		AC_CHECK_HEADER(bluetooth/bluetooth.h,
-		[
-		  AC_DEFINE(PCAP_SUPPORT_BT, 1, [target host supports Bluetooth sniffing])
-		  BT_SRC=pcap-bt-linux.c
-		  AC_MSG_NOTICE(Bluetooth sniffing is supported)
+		    [
+			#
+			# We have bluetooth.h, so we support Bluetooth
+			# sniffing.
+			#
+			AC_DEFINE(PCAP_SUPPORT_BT, 1, [target host supports Bluetooth sniffing])
+			BT_SRC=pcap-bt-linux.c
+			AC_MSG_NOTICE(Bluetooth sniffing is supported)
+			ac_lbl_bluetooth_available=yes
 
-		  #
-		  # OK, does struct sockaddr_hci have an hci_channel
-		  # member?
-		  #
-		  AC_MSG_CHECKING(if struct sockaddr_hci has hci_channel member)
-		  AC_CACHE_VAL(ac_cv_lbl_sockaddr_hci_has_hci_channel,
-		    AC_TRY_COMPILE(
-[
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-],
-		      [u_int i = sizeof(((struct sockaddr_hci *)0)->hci_channel)],
-		      ac_cv_lbl_sockaddr_hci_has_hci_channel=yes,
-		      ac_cv_lbl_sockaddr_hci_has_hci_channel=no))
-		    AC_MSG_RESULT($ac_cv_lbl_sockaddr_hci_has_hci_channel)
-		    if test $ac_cv_lbl_sockaddr_hci_has_hci_channel = yes ; then
-		      AC_DEFINE(SOCKADDR_HCI_HAS_HCI_CHANNEL,,
-			[if struct sockaddr_hci has hci_channel member])
-
-		      #
-		      # OK, is HCI_CHANNEL_MONITOR defined?
-		      #
-		      AC_MSG_CHECKING(if HCI_CHANNEL_MONITOR is defined)
-		      AC_CACHE_VAL(ac_cv_lbl_hci_channel_monitor_is_defined,
-		      AC_TRY_COMPILE(
-[
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-],
-			[u_int i = HCI_CHANNEL_MONITOR],
-			ac_cv_lbl_hci_channel_monitor_is_defined=yes,
-			ac_cv_lbl_hci_channel_monitor_is_defined=no))
-		      AC_MSG_RESULT($ac_cv_lbl_hci_channel_monitor_is_defined)
-		      if test $ac_cv_lbl_hci_channel_monitor_is_defined = yes ; then
-			AC_DEFINE(PCAP_SUPPORT_BT_MONITOR,,
-			  [target host supports Bluetooth Monitor])
-			BT_MONITOR_SRC=pcap-bt-monitor-linux.c
-		      fi
-		    fi
-		    ac_lbl_bluetooth_available=yes
-		],
-		ac_lbl_bluetooth_available=no
-		)
-		if test "x$ac_lbl_bluetooth_available" == "xno" ; then
-		    if test "x$enable_bluetooth" = "xyes" ; then
-			AC_MSG_ERROR(Bluetooth sniffing is not supported; install bluez-lib devel to enable it)
-		    else
-			AC_MSG_NOTICE(Bluetooth sniffing is not supported; install bluez-lib devel to enable it)
-		    fi
-		fi
+			#
+			# OK, does struct sockaddr_hci have an hci_channel
+			# member?
+			#
+			AC_CHECK_MEMBERS([struct sockaddr_hci.hci_channel],
+			    [
+				#
+				# Yes; is HCI_CHANNEL_MONITOR defined?
+				#
+				AC_MSG_CHECKING(if HCI_CHANNEL_MONITOR is defined)
+				AC_CACHE_VAL(ac_cv_lbl_hci_channel_monitor_is_defined,
+				    AC_TRY_COMPILE(
+					[
+					    #include <bluetooth/bluetooth.h>
+					    #include <bluetooth/hci.h>
+					],
+					[
+					    u_int i = HCI_CHANNEL_MONITOR;
+					],
+					[
+					    AC_MSG_RESULT(yes)
+					    AC_DEFINE(PCAP_SUPPORT_BT_MONITOR,,
+					      [target host supports Bluetooth Monitor])
+					    BT_MONITOR_SRC=pcap-bt-monitor-linux.c
+					],
+					[
+					    AC_MSG_RESULT(no)
+					]))
+			    ],,
+			    [
+				#include <bluetooth/bluetooth.h>
+				#include <bluetooth/hci.h>
+			    ])
+		    ],
+		    [
+			#
+			# We don't have bluetooth.h, so we don't support
+			# Bluetooth sniffing.
+			#
+			if test "x$enable_bluetooth" = "xyes" ; then
+				AC_MSG_ERROR(Bluetooth sniffing is not supported; install bluez-lib devel to enable it)
+			else
+				AC_MSG_NOTICE(Bluetooth sniffing is not supported; install bluez-lib devel to enable it)
+			fi
+		    ])
 		;;
 	*)
 		if test "x$enable_bluetooth" = "xyes" ; then
-		    AC_MSG_ERROR(no Bluetooth sniffing support implemented for $host_os)
+			AC_MSG_ERROR(no Bluetooth sniffing support implemented for $host_os)
 		else
-		    AC_MSG_NOTICE(no Bluetooth sniffing support implemented for $host_os)
+			AC_MSG_NOTICE(no Bluetooth sniffing support implemented for $host_os)
 		fi
 		;;
 	esac
 	AC_SUBST(PCAP_SUPPORT_BT)
 	AC_SUBST(BT_SRC)
 	AC_SUBST(BT_MONITOR_SRC)
 fi
 
 AC_ARG_ENABLE([dbus],
 [AC_HELP_STRING([--enable-dbus],[enable D-Bus capture support @<:@default=yes, if support available@:>@])],
     [],
     [enable_dbus=ifavailable])
 
 if test "xxx_only" = yes; then
 	# User requested something-else-only pcap, so they don't
 	# want D-Bus support.
 	enable_dbus=no
 fi
 
 if test "x$enable_dbus" != "xno"; then
 	if test "x$enable_dbus" = "xyes"; then
 		case "$host_os" in
 
 		darwin*)
 			#
-			# We don't support D-Bus sniffing on OS X; see
+			# We don't support D-Bus sniffing on macOS; see
 			#
 			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
 			#
 			# The user requested it, so fail.
 			#
-			AC_MSG_ERROR([Due to freedesktop.org bug 74029, D-Bus capture support is not available on OS X])
+			AC_MSG_ERROR([Due to freedesktop.org bug 74029, D-Bus capture support is not available on macOS])
 		esac
 	else
 		case "$host_os" in
 
 		darwin*)
 			#
-			# We don't support D-Bus sniffing on OS X; see
+			# We don't support D-Bus sniffing on macOS; see
 			#
 			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
 			#
 			# The user dind't explicitly request it, so just
 			# silently refuse to enable it.
 			#
 			enable_dbus="no"
 			;;
 		esac
 	fi
 fi
 
 if test "x$enable_dbus" != "xno"; then
 	AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config], [no])
 	if test "x$PKGCONFIG" != "xno"; then
 		AC_MSG_CHECKING([for D-Bus])
 		if "$PKGCONFIG" dbus-1; then
 			AC_MSG_RESULT([yes])
 			DBUS_CFLAGS=`"$PKGCONFIG" --cflags dbus-1`
 			DBUS_LIBS=`"$PKGCONFIG" --libs dbus-1`
 			save_CFLAGS="$CFLAGS"
 			save_LIBS="$LIBS"
 			CFLAGS="$CFLAGS $DBUS_CFLAGS"
 			LIBS="$LIBS $DBUS_LIBS"
 			AC_MSG_CHECKING(whether the D-Bus library defines dbus_connection_read_write)
 			AC_TRY_LINK(
 			    [#include <string.h>
 
 			     #include <time.h>
 			     #include <sys/time.h>
 
 			     #include <dbus/dbus.h>],
 			    [return dbus_connection_read_write(NULL, 0);],
 			    [
 				AC_MSG_RESULT([yes])
 				AC_DEFINE(PCAP_SUPPORT_DBUS, 1, [support D-Bus sniffing])
 				DBUS_SRC=pcap-dbus.c
 				V_INCLS="$V_INCLS $DBUS_CFLAGS"
 			    ],
 			    [
 				AC_MSG_RESULT([no])
 				if test "x$enable_dbus" = "xyes"; then
 				    AC_MSG_ERROR([--enable-dbus was given, but the D-Bus library doesn't define dbus_connection_read_write()])
 				fi
 				LIBS="$save_LIBS"
 			     ])
 			CFLAGS="$save_CFLAGS"
 		else
 			AC_MSG_RESULT([no])
 			if test "x$enable_dbus" = "xyes"; then
 				AC_MSG_ERROR([--enable-dbus was given, but the dbus-1 package is not installed])
 			fi
 		fi
 	fi
 	AC_SUBST(PCAP_SUPPORT_DBUS)
 	AC_SUBST(DBUS_SRC)
 fi
 
-dnl check for hardware timestamp support
-case "$host_os" in
-linux*)
-	AC_CHECK_HEADERS([linux/net_tstamp.h])
-	;;
-*)
-	AC_MSG_NOTICE(no hardware timestamp support implemented for $host_os)
-	;;
-esac
+AC_ARG_ENABLE([rdma],
+[AC_HELP_STRING([--enable-rdma],[enable RDMA capture support @<:@default=yes, if support available@:>@])],
+    [],
+    [enable_rdmasniff=ifavailable])
 
-dnl The packet ring capture facility of Linux, described in
-dnl Documentation/networking/packet_mmap.txt, is not 32/64-bit compatible before
-dnl version 2.6.27. A 32-bit kernel requires a 32-bit userland, and likewise for
-dnl 64-bit. The effect of this is that a 32-bit libpcap binary will not run
-dnl correctly on a 64-bit kernel (the binary will use the wrong offsets into a
-dnl kernel struct). This problem was solved in Linux 2.6.27. Use
-dnl --disable-packet-ring whenever a 32-bit application must run on a 64-bit
-dnl target host, and either the build host or the target host run Linux 2.6.26
-dnl or earlier.
-AC_ARG_ENABLE([packet-ring],
-[AC_HELP_STRING([--enable-packet-ring],[enable Linux packet ring support @<:@default=yes@:>@])],
-,enable_packet_ring=yes)
+if test "xxx_only" = yes; then
+	# User requested something-else-only pcap, so they don't
+	# want RDMA support.
+	enable_rdmasniff=no
+fi
 
-if test "x$enable_packet_ring" != "xno" ; then
-	AC_DEFINE(PCAP_SUPPORT_PACKET_RING, 1, [use Linux packet ring capture if available])
-	AC_SUBST(PCAP_SUPPORT_PACKET_RING)
+if test "x$enable_rdmasniff" != "xno"; then
+	AC_CHECK_LIB(ibverbs, ibv_get_device_list, [
+		AC_CHECK_HEADER(infiniband/verbs.h, [
+			#
+			# ibv_create_flow may be defined as a static inline
+			# function in infiniband/verbs.h, so we can't
+			# use AC_CHECK_LIB.
+			#
+			# Too bad autoconf has no AC_SYMBOL_EXISTS()
+			# macro that works like CMake's check_symbol_exists()
+			# function, to check do a compile check like
+			# this (they do a clever trick to avoid having
+			# to know the function's signature).
+			#
+			AC_MSG_CHECKING(whether libibverbs defines ibv_create_flow)
+			AC_TRY_LINK(
+				[
+					#include <infiniband/verbs.h>
+				],
+				[
+					(void) ibv_create_flow((struct ibv_qp *) NULL,
+							       (struct ibv_flow_attr *) NULL);
+				],
+				[
+					AC_MSG_RESULT([yes])
+					AC_DEFINE(PCAP_SUPPORT_RDMASNIFF, , [target host supports RDMA sniffing])
+					RDMA_SRC=pcap-rdmasniff.c
+					LIBS="-libverbs $LIBS"
+				],
+				[
+					AC_MSG_RESULT([no])
+				]
+			)
+		])
+	])
+	AC_SUBST(PCAP_SUPPORT_RDMASNIFF)
+	AC_SUBST(RDMA_SRC)
 fi
 
 AC_PROG_INSTALL
 
 AC_CONFIG_HEADER(config.h)
 
 AC_OUTPUT_COMMANDS([if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi])
 AC_OUTPUT(Makefile pcap-filter.manmisc pcap-linktype.manmisc
 	pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap
 	pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap
 	pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap
 	pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap
 	pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap
-	pcap_set_tstamp_type.3pcap)
+	pcap_set_tstamp_type.3pcap rpcapd/Makefile rpcapd/rpcapd.manadmin
+	testprogs/Makefile)
 exit 0
Index: vendor/libpcap/dist/diag-control.h
===================================================================
--- vendor/libpcap/dist/diag-control.h	(nonexistent)
+++ vendor/libpcap/dist/diag-control.h	(revision 333789)
@@ -0,0 +1,215 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _diag_control_h
+#define _diag_control_h
+
+#include "pcap/compiler-tests.h"
+
+#ifndef _MSC_VER
+  /*
+   * Clang and GCC both support this way of putting pragmas into #defines.
+   * We don't use it unless we have a compiler that supports it; the
+   * warning-suppressing pragmas differ between Clang and GCC, so we test
+   * for both of those separately.
+   */
+  #define PCAP_DO_PRAGMA(x) _Pragma (#x)
+#endif
+
+/*
+ * Suppress Flex warnings.
+ */
+#if defined(_MSC_VER)
+  /*
+   * This is Microsoft Visual Studio; we can use __pragma(warning(disable:XXXX))
+   * and __pragma(warning(push/pop)).
+   *
+   * Suppress signed-vs-unsigned comparison, narrowing, and unreachable
+   * code warnings.
+   */
+  #define DIAG_OFF_FLEX \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4127)) \
+    __pragma(warning(disable:4242)) \
+    __pragma(warning(disable:4244)) \
+    __pragma(warning(disable:4702))
+  #define DIAG_ON_FLEX  __pragma(warning(pop))
+#elif PCAP_IS_AT_LEAST_CLANG_VERSION(2,8)
+  /*
+   * This is Clang 2.8 or later; we can use "clang diagnostic
+   * ignored -Wxxx" and "clang diagnostic push/pop".
+   *
+   * Suppress -Wdocumentation warnings; GCC doesn't support -Wdocumentation,
+   * at least according to the GCC 7.3 documentation.  Apparently, Flex
+   * generates code that upsets at least some versions of Clang's
+   * -Wdocumentation.
+   */
+  #define DIAG_OFF_FLEX \
+    PCAP_DO_PRAGMA(clang diagnostic push) \
+    PCAP_DO_PRAGMA(clang diagnostic ignored "-Wsign-compare") \
+    PCAP_DO_PRAGMA(clang diagnostic ignored "-Wdocumentation") \
+    PCAP_DO_PRAGMA(clang diagnostic ignored "-Wmissing-noreturn") \
+    PCAP_DO_PRAGMA(clang diagnostic ignored "-Wunused-parameter") \
+    PCAP_DO_PRAGMA(clang diagnostic ignored "-Wunreachable-code")
+  #define DIAG_ON_FLEX \
+    PCAP_DO_PRAGMA(clang diagnostic pop)
+#elif PCAP_IS_AT_LEAST_GNUC_VERSION(4,6)
+  /*
+   * This is GCC 4.6 or later, or a compiler claiming to be that.
+   * We can use "GCC diagnostic ignored -Wxxx" (introduced in 4.2)
+   * and "GCC diagnostic push/pop" (introduced in 4.6).
+   */
+  #define DIAG_OFF_FLEX \
+    PCAP_DO_PRAGMA(GCC diagnostic push) \
+    PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wsign-compare") \
+    PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wunused-parameter") \
+    PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wunreachable-code")
+  #define DIAG_ON_FLEX \
+    PCAP_DO_PRAGMA(GCC diagnostic pop)
+#else
+  /*
+   * Neither Visual Studio, nor Clang 2.8 or later, nor GCC 4.6 or later
+   * or a compiler claiming to be that; there's nothing we know of that
+   * we can do.
+   */
+  #define DIAG_OFF_FLEX
+  #define DIAG_ON_FLEX
+#endif
+
+#ifdef YYBYACC
+  /*
+   * Berkeley YACC.
+   *
+   * It generates a global declaration of yylval, or the appropriately
+   * prefixed version of yylval, in grammar.h, *even though it's been
+   * told to generate a pure parser, meaning it doesn't have any global
+   * variables*.  Bison doesn't do this.
+   *
+   * That causes a warning due to the local declaration in the parser
+   * shadowing the global declaration.
+   *
+   * So, if the compiler warns about that, we turn off -Wshadow warnings.
+   */
+  #if defined(_MSC_VER)
+    /*
+     * This is Microsoft Visual Studio; we can use
+     * __pragma(warning(disable:XXXX)) and __pragma(warning(push/pop)).
+     *
+     * Suppress unreachable code warnings.
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      __pragma(warning(push)) \
+      __pragma(warning(disable:4702))
+    #define DIAG_ON_BISON_BYACC  __pragma(warning(pop))
+  #elif PCAP_IS_AT_LEAST_CLANG_VERSION(2,8)
+    /*
+     * This is Clang 2.8 or later; we can use "clang diagnostic
+     * ignored -Wxxx" and "clang diagnostic push/pop".
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      PCAP_DO_PRAGMA(clang diagnostic push) \
+      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wshadow") \
+      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wunreachable-code")
+    #define DIAG_ON_BISON_BYACC \
+      PCAP_DO_PRAGMA(clang diagnostic pop)
+  #elif PCAP_IS_AT_LEAST_GNUC_VERSION(4,6)
+    /*
+     * This is GCC 4.6 or later, or a compiler claiming to be that.
+     * We can use "GCC diagnostic ignored -Wxxx" (introduced in 4.2)
+     * and "GCC diagnostic push/pop" (introduced in 4.6).
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      PCAP_DO_PRAGMA(GCC diagnostic push) \
+      PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wshadow") \
+      PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wunreachable-code")
+    #define DIAG_ON_BISON_BYACC \
+      PCAP_DO_PRAGMA(GCC diagnostic pop)
+  #else
+    /*
+     * Neither Clang 2.8 or later nor GCC 4.6 or later or a compiler
+     * claiming to be that; there's nothing we know of that we can do.
+     */
+    #define DIAG_OFF_BISON_BYACC
+    #define DIAG_ON_BISON_BYACC
+  #endif
+#else
+  /*
+   * Bison.
+   */
+  #if defined(_MSC_VER)
+    /*
+     * This is Microsoft Visual Studio; we can use
+     * __pragma(warning(disable:XXXX)) and __pragma(warning(push/pop)).
+     *
+     * Suppress some /Wall warnings.
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      __pragma(warning(push)) \
+      __pragma(warning(disable:4127)) \
+      __pragma(warning(disable:4242)) \
+      __pragma(warning(disable:4244)) \
+      __pragma(warning(disable:4702))
+    #define DIAG_ON_BISON_BYACC  __pragma(warning(pop))
+  #elif PCAP_IS_AT_LEAST_CLANG_VERSION(2,8)
+    /*
+     * This is Clang 2.8 or later; we can use "clang diagnostic
+     * ignored -Wxxx" and "clang diagnostic push/pop".
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      PCAP_DO_PRAGMA(clang diagnostic push) \
+      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wunreachable-code")
+    #define DIAG_ON_BISON_BYACC \
+      PCAP_DO_PRAGMA(clang diagnostic pop)
+  #elif PCAP_IS_AT_LEAST_GNUC_VERSION(4,6)
+    /*
+     * This is GCC 4.6 or later, or a compiler claiming to be that.
+     * We can use "GCC diagnostic ignored -Wxxx" (introduced in 4.2)
+     * and "GCC diagnostic push/pop" (introduced in 4.6).
+     */
+    #define DIAG_OFF_BISON_BYACC \
+      PCAP_DO_PRAGMA(GCC diagnostic push) \
+      PCAP_DO_PRAGMA(GCC diagnostic ignored "-Wunreachable-code")
+    #define DIAG_ON_BISON_BYACC \
+      PCAP_DO_PRAGMA(GCC diagnostic pop)
+  #else
+    /*
+     * Neither Clang 2.8 or later nor GCC 4.6 or later or a compiler
+     * claiming to be that; there's nothing we know of that we can do.
+     */
+    #define DIAG_OFF_BISON_BYACC
+    #define DIAG_ON_BISON_BYACC
+  #endif
+#endif
+
+#endif /* _diag_control_h */

Property changes on: vendor/libpcap/dist/diag-control.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/dlpisubs.c
===================================================================
--- vendor/libpcap/dist/dlpisubs.c	(revision 333788)
+++ vendor/libpcap/dist/dlpisubs.c	(revision 333789)
@@ -1,388 +1,398 @@
 /*
  * This code is derived from code formerly in pcap-dlpi.c, originally
  * contributed by Atanu Ghosh (atanu@cs.ucl.ac.uk), University College
  * London, and subsequently modified by Guy Harris (guy@alum.mit.edu),
  * Mark Pizzolato <List-tcpdump-workers@subscriptions.pizzolato.net>,
  * Mark C. Brown (mbrown@hp.com), and Sagun Shakya <Sagun.Shakya@Sun.COM>.
  */
 
 /*
  * This file contains dlpi/libdlpi related common functions used
  * by pcap-[dlpi,libdlpi].c.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifndef DL_IPATM
 #define DL_IPATM	0x12	/* ATM Classical IP interface */
 #endif
 
 #ifdef HAVE_SYS_BUFMOD_H
 	/*
 	 * Size of a bufmod chunk to pass upstream; that appears to be the
 	 * biggest value to which you can set it, and setting it to that value
 	 * (which is bigger than what appears to be the Solaris default of 8192)
 	 * reduces the number of packet drops.
 	 */
 #define	CHUNKSIZE	65536
 
 	/*
 	 * Size of the buffer to allocate for packet data we read; it must be
 	 * large enough to hold a chunk.
 	 */
 #define	PKTBUFSIZE	CHUNKSIZE
 
 #else /* HAVE_SYS_BUFMOD_H */
 
 	/*
 	 * Size of the buffer to allocate for packet data we read; this is
 	 * what the value used to be - there's no particular reason why it
 	 * should be tied to MAXDLBUF, but we'll leave it as this for now.
 	 */
 #define	MAXDLBUF	8192
 #define	PKTBUFSIZE	(MAXDLBUF * sizeof(bpf_u_int32))
 
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #ifdef HAVE_SYS_BUFMOD_H
 #include <sys/bufmod.h>
 #endif
 #include <sys/dlpi.h>
 #include <sys/stream.h>
 
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stropts.h>
 #include <unistd.h>
 
 #ifdef HAVE_LIBDLPI
 #include <libdlpi.h>
 #endif
 
 #include "pcap-int.h"
 #include "dlpisubs.h"
 
 #ifdef HAVE_SYS_BUFMOD_H
 static void pcap_stream_err(const char *, int, char *);
 #endif
 
 /*
  * Get the packet statistics.
  */
 int
 pcap_stats_dlpi(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_dlpi *pd = p->priv;
 
 	/*
 	 * "ps_recv" counts packets handed to the filter, not packets
 	 * that passed the filter.  As filtering is done in userland,
 	 * this would not include packets dropped because we ran out
 	 * of buffer space; in order to make this more like other
 	 * platforms (Linux 2.4 and later, BSDs with BPF), where the
 	 * "packets received" count includes packets received but dropped
 	 * due to running out of buffer space, and to keep from confusing
 	 * applications that, for example, compute packet drop percentages,
 	 * we also make it count packets dropped by "bufmod" (otherwise we
 	 * might run the risk of the packet drop count being bigger than
 	 * the received-packet count).
 	 *
 	 * "ps_drop" counts packets dropped by "bufmod" because of
 	 * flow control requirements or resource exhaustion; it doesn't
 	 * count packets dropped by the interface driver, or packets
 	 * dropped upstream.  As filtering is done in userland, it counts
 	 * packets regardless of whether they would've passed the filter.
 	 *
 	 * These statistics don't include packets not yet read from
 	 * the kernel by libpcap, but they may include packets not
 	 * yet read from libpcap by the application.
 	 */
 	*ps = pd->stat;
 
 	/*
 	 * Add in the drop count, as per the above comment.
 	 */
 	ps->ps_recv += ps->ps_drop;
 	return (0);
 }
 
 /*
  * Loop through the packets and call the callback for each packet.
  * Return the number of packets read.
  */
 int
 pcap_process_pkts(pcap_t *p, pcap_handler callback, u_char *user,
 	int count, u_char *bufp, int len)
 {
 	struct pcap_dlpi *pd = p->priv;
 	int n, caplen, origlen;
 	u_char *ep, *pk;
 	struct pcap_pkthdr pkthdr;
 #ifdef HAVE_SYS_BUFMOD_H
 	struct sb_hdr *sbp;
 #ifdef LBL_ALIGN
 	struct sb_hdr sbhdr;
 #endif
 #endif
 
 	/* Loop through packets */
 	ep = bufp + len;
 	n = 0;
 
 #ifdef HAVE_SYS_BUFMOD_H
 	while (bufp < ep) {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (p->break_loop) {
 			if (n == 0) {
 				p->break_loop = 0;
 				return (-2);
 			} else {
 				p->bp = bufp;
 				p->cc = ep - bufp;
 				return (n);
 			}
 		}
 #ifdef LBL_ALIGN
 		if ((long)bufp & 3) {
 			sbp = &sbhdr;
 			memcpy(sbp, bufp, sizeof(*sbp));
 		} else
 #endif
 			sbp = (struct sb_hdr *)bufp;
 		pd->stat.ps_drop = sbp->sbh_drops;
 		pk = bufp + sizeof(*sbp);
 		bufp += sbp->sbh_totlen;
 		origlen = sbp->sbh_origlen;
 		caplen = sbp->sbh_msglen;
 #else
 		origlen = len;
 		caplen = min(p->snapshot, len);
 		pk = bufp;
 		bufp += caplen;
 #endif
 		++pd->stat.ps_recv;
 		if (bpf_filter(p->fcode.bf_insns, pk, origlen, caplen)) {
 #ifdef HAVE_SYS_BUFMOD_H
 			pkthdr.ts.tv_sec = sbp->sbh_timestamp.tv_sec;
 			pkthdr.ts.tv_usec = sbp->sbh_timestamp.tv_usec;
 #else
 			(void) gettimeofday(&pkthdr.ts, NULL);
 #endif
 			pkthdr.len = origlen;
 			pkthdr.caplen = caplen;
 			/* Insure caplen does not exceed snapshot */
 			if (pkthdr.caplen > (bpf_u_int32)p->snapshot)
 				pkthdr.caplen = (bpf_u_int32)p->snapshot;
 			(*callback)(user, &pkthdr, pk);
 			if (++n >= count && !PACKET_COUNT_IS_UNLIMITED(count)) {
 				p->cc = ep - bufp;
 				p->bp = bufp;
 				return (n);
 			}
 		}
 #ifdef HAVE_SYS_BUFMOD_H
 	}
 #endif
 	p->cc = 0;
 	return (n);
 }
 
 /*
  * Process the mac type. Returns -1 if no matching mac type found, otherwise 0.
  */
 int
 pcap_process_mactype(pcap_t *p, u_int mactype)
 {
 	int retv = 0;
 
 	switch (mactype) {
 
 	case DL_CSMACD:
 	case DL_ETHER:
 		p->linktype = DLT_EN10MB;
 		p->offset = 2;
 		/*
 		 * This is (presumably) a real Ethernet capture; give it a
 		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 		 * that an application can let you choose it, in case you're
 		 * capturing DOCSIS traffic that a Cisco Cable Modem
 		 * Termination System is putting out onto an Ethernet (it
 		 * doesn't put an Ethernet header onto the wire, it puts raw
 		 * DOCSIS frames out on the wire inside the low-level
 		 * Ethernet framing).
 		 */
 		p->dlt_list = (u_int *)malloc(sizeof(u_int) * 2);
 		/*
 		 * If that fails, just leave the list empty.
 		 */
 		if (p->dlt_list != NULL) {
 			p->dlt_list[0] = DLT_EN10MB;
 			p->dlt_list[1] = DLT_DOCSIS;
 			p->dlt_count = 2;
 		}
 		break;
 
 	case DL_FDDI:
 		p->linktype = DLT_FDDI;
 		p->offset = 3;
 		break;
 
 	case DL_TPR:
 		/* XXX - what about DL_TPB?  Is that Token Bus?  */
 		p->linktype = DLT_IEEE802;
 		p->offset = 2;
 		break;
 
 #ifdef HAVE_SOLARIS
 	case DL_IPATM:
 		p->linktype = DLT_SUNATM;
 		p->offset = 0;  /* works for LANE and LLC encapsulation */
 		break;
 #endif
 
 #ifdef DL_IPV4
 	case DL_IPV4:
 		p->linktype = DLT_IPV4;
 		p->offset = 0;
 		break;
 #endif
 
 #ifdef DL_IPV6
 	case DL_IPV6:
 		p->linktype = DLT_IPV6;
 		p->offset = 0;
 		break;
 #endif
 
 #ifdef DL_IPNET
 	case DL_IPNET:
-		p->linktype = DLT_IPNET;
+		/*
+		 * XXX - DL_IPNET devices default to "raw IP" rather than
+		 * "IPNET header"; see
+		 *
+		 *    http://seclists.org/tcpdump/2009/q1/202
+		 *
+		 * We'd have to do DL_IOC_IPNET_INFO to enable getting
+		 * the IPNET header.
+		 */
+		p->linktype = DLT_RAW;
 		p->offset = 0;
 		break;
 #endif
 
 	default:
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "unknown mactype 0x%x",
 		    mactype);
 		retv = -1;
 	}
 
 	return (retv);
 }
 
 #ifdef HAVE_SYS_BUFMOD_H
 /*
  * Push and configure the buffer module. Returns -1 for error, otherwise 0.
  */
 int
 pcap_conf_bufmod(pcap_t *p, int snaplen)
 {
 	struct timeval to;
 	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, p->errbuf);
 		return (-1);
 	}
 
 	ss = snaplen;
 	if (ss > 0 &&
 	    strioctl(p->fd, SBIOCSSNAP, sizeof(ss), (char *)&ss) != 0) {
 		pcap_stream_err("SBIOCSSNAP", errno, p->errbuf);
 		return (-1);
 	}
 
 	if (p->opt.immediate) {
 		/* Set the timeout to zero, for immediate delivery. */
 		to.tv_sec = 0;
 		to.tv_usec = 0;
 		if (strioctl(p->fd, SBIOCSTIME, sizeof(to), (char *)&to) != 0) {
 			pcap_stream_err("SBIOCSTIME", errno, p->errbuf);
 			return (-1);
 		}
 	} else {
 		/* Set up the bufmod timeout. */
 		if (p->opt.timeout != 0) {
 			to.tv_sec = p->opt.timeout / 1000;
 			to.tv_usec = (p->opt.timeout * 1000) % 1000000;
 			if (strioctl(p->fd, SBIOCSTIME, sizeof(to), (char *)&to) != 0) {
 				pcap_stream_err("SBIOCSTIME", errno, p->errbuf);
 				return (-1);
 			}
 		}
 
 		/* Set the chunk length. */
 		chunksize = CHUNKSIZE;
 		if (strioctl(p->fd, SBIOCSCHUNK, sizeof(chunksize), (char *)&chunksize)
 		    != 0) {
 			pcap_stream_err("SBIOCSCHUNKP", errno, p->errbuf);
 			return (-1);
 		}
 	}
 
 	return (0);
 }
 #endif /* HAVE_SYS_BUFMOD_H */
 
 /*
  * Allocate data buffer. Returns -1 if memory allocation fails, else 0.
  */
 int
 pcap_alloc_databuf(pcap_t *p)
 {
 	p->bufsize = PKTBUFSIZE;
 	p->buffer = malloc(p->bufsize + p->offset);
 	if (p->buffer == NULL) {
-		strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		return (-1);
 	}
 
 	return (0);
 }
 
 /*
  * Issue a STREAMS I_STR ioctl. Returns -1 on error, otherwise
  * length of returned data on success.
  */
 int
 strioctl(int fd, int cmd, int len, char *dp)
 {
 	struct strioctl str;
 	int retv;
 
 	str.ic_cmd = cmd;
 	str.ic_timout = -1;
 	str.ic_len = len;
 	str.ic_dp = dp;
 	if ((retv = ioctl(fd, I_STR, &str)) < 0)
 		return (retv);
 
 	return (str.ic_len);
 }
 
 #ifdef HAVE_SYS_BUFMOD_H
 /*
  * Write stream error message to errbuf.
  */
 static void
 pcap_stream_err(const char *func, int err, char *errbuf)
 {
-	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", func, pcap_strerror(err));
+	pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, err, "%s", func);
 }
 #endif
Index: vendor/libpcap/dist/etherent.c
===================================================================
--- vendor/libpcap/dist/etherent.c	(revision 333788)
+++ vendor/libpcap/dist/etherent.c	(revision 333789)
@@ -1,169 +1,168 @@
 /*
  * Copyright (c) 1990, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#endif /* _WIN32 */
+#include <pcap-types.h>
 
 #include <ctype.h>
 #include <memory.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "pcap-int.h"
 
 #include <pcap/namedb.h>
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
-static inline int xdtoi(int);
 static inline int skip_space(FILE *);
 static inline int skip_line(FILE *);
 
 /* Hex digit to integer. */
-static inline int
-xdtoi(c)
-	register int c;
+static inline u_char
+xdtoi(u_char c)
 {
 	if (isdigit(c))
-		return c - '0';
+		return (u_char)(c - '0');
 	else if (islower(c))
-		return c - 'a' + 10;
+		return (u_char)(c - 'a' + 10);
 	else
-		return c - 'A' + 10;
+		return (u_char)(c - 'A' + 10);
 }
 
 static inline int
-skip_space(f)
-	FILE *f;
+skip_space(FILE *f)
 {
 	int c;
 
 	do {
 		c = getc(f);
 	} while (isspace(c) && c != '\n');
 
 	return c;
 }
 
 static inline int
-skip_line(f)
-	FILE *f;
+skip_line(FILE *f)
 {
 	int c;
 
 	do
 		c = getc(f);
 	while (c != '\n' && c != EOF);
 
 	return c;
 }
 
 struct pcap_etherent *
 pcap_next_etherent(FILE *fp)
 {
-	register int c, d, i;
+	register int c, i;
+	u_char d;
 	char *bp;
+	size_t namesize;
 	static struct pcap_etherent e;
 
 	memset((char *)&e, 0, sizeof(e));
-	do {
+	for (;;) {
 		/* Find addr */
 		c = skip_space(fp);
+		if (c == EOF)
+			return (NULL);
 		if (c == '\n')
 			continue;
 
 		/* If this is a comment, or first thing on line
-		   cannot be etehrnet address, skip the line. */
+		   cannot be Ethernet address, skip the line. */
 		if (!isxdigit(c)) {
 			c = skip_line(fp);
+			if (c == EOF)
+				return (NULL);
 			continue;
 		}
 
 		/* must be the start of an address */
 		for (i = 0; i < 6; i += 1) {
-			d = xdtoi(c);
+			d = xdtoi((u_char)c);
 			c = getc(fp);
+			if (c == EOF)
+				return (NULL);
 			if (isxdigit(c)) {
 				d <<= 4;
-				d |= xdtoi(c);
+				d |= xdtoi((u_char)c);
 				c = getc(fp);
+				if (c == EOF)
+					return (NULL);
 			}
 			e.addr[i] = d;
 			if (c != ':')
 				break;
 			c = getc(fp);
+			if (c == EOF)
+				return (NULL);
 		}
-		if (c == EOF)
-			break;
 
 		/* Must be whitespace */
 		if (!isspace(c)) {
 			c = skip_line(fp);
+			if (c == EOF)
+				return (NULL);
 			continue;
 		}
 		c = skip_space(fp);
+		if (c == EOF)
+			return (NULL);
 
 		/* hit end of line... */
 		if (c == '\n')
 			continue;
 
 		if (c == '#') {
 			c = skip_line(fp);
+			if (c == EOF)
+				return (NULL);
 			continue;
 		}
 
 		/* pick up name */
 		bp = e.name;
-		/* Use 'd' to prevent buffer overflow. */
-		d = sizeof(e.name) - 1;
+		/* Use 'namesize' to prevent buffer overflow. */
+		namesize = sizeof(e.name) - 1;
 		do {
-			*bp++ = c;
+			*bp++ = (u_char)c;
 			c = getc(fp);
-		} while (!isspace(c) && c != EOF && --d > 0);
+			if (c == EOF)
+				return (NULL);
+		} while (!isspace(c) && --namesize != 0);
 		*bp = '\0';
 
 		/* Eat trailing junk */
 		if (c != '\n')
 			(void)skip_line(fp);
 
 		return &e;
-
-	} while (c != EOF);
-
-	return (NULL);
+	}
 }
Index: vendor/libpcap/dist/extract.h
===================================================================
--- vendor/libpcap/dist/extract.h	(revision 333788)
+++ vendor/libpcap/dist/extract.h	(revision 333789)
@@ -1,221 +1,225 @@
 /*
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifndef _WIN32
 #include <arpa/inet.h>
 #endif
 
+#include <pcap/pcap-inttypes.h>
+#include <pcap/compiler-tests.h>
+
 /*
  * Macros to extract possibly-unaligned big-endian integral values.
  */
 #ifdef LBL_ALIGN
 /*
  * The processor doesn't natively handle unaligned loads.
  */
-#if defined(__GNUC__) && defined(HAVE___ATTRIBUTE__) && \
+#if PCAP_IS_AT_LEAST_GNUC_VERSION(2,0) && \
     (defined(__alpha) || defined(__alpha__) || \
      defined(__mips) || defined(__mips__))
-
 /*
- * This is a GCC-compatible compiler and we have __attribute__, which
- * we assume that mean we have __attribute__((packed)), and this is
- * MIPS or Alpha, which has instructions that can help when doing
- * unaligned loads.
+ * This is MIPS or Alpha, which don't natively handle unaligned loads,
+ * but which have instructions that can help when doing unaligned
+ * loads, and this is GCC 2.0 or later or a compiler that claims to
+ * be GCC 2.0 or later, which we assume that mean we have
+ * __attribute__((packed)), which we can use to convince the compiler
+ * to generate those instructions.
  *
  * Declare packed structures containing a uint16_t and a uint32_t,
  * cast the pointer to point to one of those, and fetch through it;
  * the GCC manual doesn't appear to explicitly say that
  * __attribute__((packed)) causes the compiler to generate unaligned-safe
  * code, but it apppears to do so.
  *
  * We do this in case the compiler can generate code using those
  * instructions to do an unaligned load and pass stuff to "ntohs()" or
  * "ntohl()", which might be better than than the code to fetch the
  * bytes one at a time and assemble them.  (That might not be the
  * case on a little-endian platform, such as DEC's MIPS machines and
  * Alpha machines, where "ntohs()" and "ntohl()" might not be done
  * inline.)
  *
  * We do this only for specific architectures because, for example,
  * at least some versions of GCC, when compiling for 64-bit SPARC,
  * generate code that assumes alignment if we do this.
  *
  * XXX - add other architectures and compilers as possible and
  * appropriate.
  *
  * HP's C compiler, indicated by __HP_cc being defined, supports
  * "#pragma unaligned N" in version A.05.50 and later, where "N"
  * specifies a number of bytes at which the typedef on the next
  * line is aligned, e.g.
  *
  *	#pragma unalign 1
  *	typedef uint16_t unaligned_uint16_t;
  *
  * to define unaligned_uint16_t as a 16-bit unaligned data type.
  * This could be presumably used, in sufficiently recent versions of
  * the compiler, with macros similar to those below.  This would be
  * useful only if that compiler could generate better code for PA-RISC
  * or Itanium than would be generated by a bunch of shifts-and-ORs.
  *
  * DEC C, indicated by __DECC being defined, has, at least on Alpha,
  * an __unaligned qualifier that can be applied to pointers to get the
  * compiler to generate code that does unaligned loads and stores when
  * dereferencing the pointer in question.
  *
  * XXX - what if the native C compiler doesn't support
  * __attribute__((packed))?  How can we get it to generate unaligned
  * accesses for *specific* items?
  */
 typedef struct {
 	uint16_t	val;
 } __attribute__((packed)) unaligned_uint16_t;
 
 typedef struct {
 	uint32_t	val;
 } __attribute__((packed)) unaligned_uint32_t;
 
 static inline uint16_t
 EXTRACT_16BITS(const void *p)
 {
 	return ((uint16_t)ntohs(((const unaligned_uint16_t *)(p))->val));
 }
 
 static inline uint32_t
 EXTRACT_32BITS(const void *p)
 {
 	return ((uint32_t)ntohl(((const unaligned_uint32_t *)(p))->val));
 }
 
 static inline uint64_t
 EXTRACT_64BITS(const void *p)
 {
 	return ((uint64_t)(((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 0)->val)) << 32 | \
 		((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 1)->val)) << 0));
 }
 
 #else /* have to do it a byte at a time */
 /*
  * This isn't a GCC-compatible compiler, we don't have __attribute__,
  * or we do but we don't know of any better way with this instruction
  * set to do unaligned loads, so do unaligned loads of big-endian
  * quantities the hard way - fetch the bytes one at a time and
  * assemble them.
  */
 #define EXTRACT_16BITS(p) \
 	((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
 	            ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))
 #define EXTRACT_32BITS(p) \
 	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 24) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 16) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 8) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 3)) << 0)))
 #define EXTRACT_64BITS(p) \
 	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 56) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 48) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 40) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 32) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 24) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))
 #endif /* must special-case unaligned accesses */
 #else /* LBL_ALIGN */
 /*
  * The processor natively handles unaligned loads, so we can just
  * cast the pointer and fetch through it.
  */
 static inline uint16_t
 EXTRACT_16BITS(const void *p)
 {
 	return ((uint16_t)ntohs(*(const uint16_t *)(p)));
 }
 
 static inline uint32_t
 EXTRACT_32BITS(const void *p)
 {
 	return ((uint32_t)ntohl(*(const uint32_t *)(p)));
 }
 
 static inline uint64_t
 EXTRACT_64BITS(const void *p)
 {
 	return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 | \
 		((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }
 
 #endif /* LBL_ALIGN */
 
 #define EXTRACT_24BITS(p) \
 	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 16) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 0)))
 
 #define EXTRACT_40BITS(p) \
 	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0)))
 
 #define EXTRACT_48BITS(p) \
 	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0)))
 
 #define EXTRACT_56BITS(p) \
 	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 16) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0)))
 
 /*
  * Macros to extract possibly-unaligned little-endian integral values.
  * XXX - do loads on little-endian machines that support unaligned loads?
  */
 #define EXTRACT_LE_8BITS(p) (*(p))
 #define EXTRACT_LE_16BITS(p) \
 	((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
 	            ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_32BITS(p) \
 	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 3)) << 24) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_24BITS(p) \
 	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
 	            ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_64BITS(p) \
 	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 7)) << 56) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 48) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 40) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 32) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 8) | \
 	            ((uint64_t)(*((const uint8_t *)(p) + 0)) << 0)))
Index: vendor/libpcap/dist/fad-getad.c
===================================================================
--- vendor/libpcap/dist/fad-getad.c	(revision 333788)
+++ vendor/libpcap/dist/fad-getad.c	(revision 333789)
@@ -1,292 +1,280 @@
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
 /*
  * Copyright (c) 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
 #include <net/if.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ifaddrs.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * We don't do this on Solaris 11 and later, as it appears there aren't
  * any AF_PACKET addresses on interfaces, so we don't need this, and
  * we end up including both the OS's <net/bpf.h> and our <pcap/bpf.h>,
  * and their definitions of some data structures collide.
  */
 #if (defined(linux) || defined(__Lynx__)) && defined(AF_PACKET)
 # ifdef HAVE_NETPACKET_PACKET_H
 /* Linux distributions with newer glibc */
 #  include <netpacket/packet.h>
 # else /* HAVE_NETPACKET_PACKET_H */
 /* LynxOS, Linux distributions with older glibc */
 # ifdef __Lynx__
 /* LynxOS */
 #  include <netpacket/if_packet.h>
 # else /* __Lynx__ */
 /* Linux */
 #  include <linux/types.h>
 #  include <linux/if_packet.h>
 # endif /* __Lynx__ */
 # endif /* HAVE_NETPACKET_PACKET_H */
 #endif /* (defined(linux) || defined(__Lynx__)) && defined(AF_PACKET) */
 
 /*
  * This is fun.
  *
  * In older BSD systems, socket addresses were fixed-length, and
  * "sizeof (struct sockaddr)" gave the size of the structure.
  * All addresses fit within a "struct sockaddr".
  *
  * In newer BSD systems, the socket address is variable-length, and
  * there's an "sa_len" field giving the length of the structure;
  * this allows socket addresses to be longer than 2 bytes of family
  * and 14 bytes of data.
  *
  * Some commercial UNIXes use the old BSD scheme, some use the RFC 2553
  * variant of the old BSD scheme (with "struct sockaddr_storage" rather
  * than "struct sockaddr"), and some use the new BSD scheme.
  *
  * Some versions of GNU libc use neither scheme, but has an "SA_LEN()"
  * macro that determines the size based on the address family.  Other
  * versions don't have "SA_LEN()" (as it was in drafts of RFC 2553
  * but not in the final version).  On the latter systems, we explicitly
  * check the AF_ type to determine the length; we assume that on
  * all those systems we have "struct sockaddr_storage".
  */
 #ifndef SA_LEN
-#ifdef HAVE_SOCKADDR_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 #define SA_LEN(addr)	((addr)->sa_len)
-#else /* HAVE_SOCKADDR_SA_LEN */
-#ifdef HAVE_SOCKADDR_STORAGE
+#else /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
 static size_t
 get_sa_len(struct sockaddr *addr)
 {
 	switch (addr->sa_family) {
 
 #ifdef AF_INET
 	case AF_INET:
 		return (sizeof (struct sockaddr_in));
 #endif
 
 #ifdef AF_INET6
 	case AF_INET6:
 		return (sizeof (struct sockaddr_in6));
 #endif
 
 #if (defined(linux) || defined(__Lynx__)) && defined(AF_PACKET)
 	case AF_PACKET:
 		return (sizeof (struct sockaddr_ll));
 #endif
 
 	default:
 		return (sizeof (struct sockaddr));
 	}
 }
 #define SA_LEN(addr)	(get_sa_len(addr))
-#else /* HAVE_SOCKADDR_STORAGE */
+#else /* HAVE_STRUCT_SOCKADDR_STORAGE */
 #define SA_LEN(addr)	(sizeof (struct sockaddr))
-#endif /* HAVE_SOCKADDR_STORAGE */
-#endif /* HAVE_SOCKADDR_SA_LEN */
+#endif /* HAVE_STRUCT_SOCKADDR_STORAGE */
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
 #endif /* SA_LEN */
 
 /*
  * Get a list of all interfaces that are up and that we can open.
  * Returns -1 on error, 0 otherwise.
  * The list, as returned through "alldevsp", may be null if no interfaces
  * could be opened.
  */
 int
-pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf,
-    int (*check_usable)(const char *))
+pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
+    int (*check_usable)(const char *), get_if_flags_func get_flags_func)
 {
-	pcap_if_t *devlist = NULL;
 	struct ifaddrs *ifap, *ifa;
 	struct sockaddr *addr, *netmask, *broadaddr, *dstaddr;
 	size_t addr_size, broadaddr_size, dstaddr_size;
 	int ret = 0;
 	char *p, *q;
 
 	/*
 	 * Get the list of interface addresses.
 	 *
 	 * Note: this won't return information about interfaces
 	 * with no addresses, so, if a platform has interfaces
 	 * with no interfaces on which traffic can be captured,
 	 * we must check for those interfaces as well (see, for
 	 * example, what's done on Linux).
 	 *
 	 * LAN interfaces will probably have link-layer
 	 * addresses; I don't know whether all implementations
 	 * of "getifaddrs()" now, or in the future, will return
 	 * those.
 	 */
 	if (getifaddrs(&ifap) != 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "getifaddrs: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "getifaddrs");
 		return (-1);
 	}
 	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
 		/*
 		 * If this entry has a colon followed by a number at
 		 * the end, we assume it's a logical interface.  Those
 		 * are just the way you assign multiple IP addresses to
 		 * a real interface on Linux, so an entry for a logical
 		 * interface should be treated like the entry for the
 		 * real interface; we do that by stripping off the ":"
 		 * and the number.
 		 *
 		 * XXX - should we do this only on Linux?
 		 */
 		p = strchr(ifa->ifa_name, ':');
 		if (p != NULL) {
 			/*
 			 * We have a ":"; is it followed by a number?
 			 */
 			q = p + 1;
 			while (isdigit((unsigned char)*q))
 				q++;
 			if (*q == '\0') {
 				/*
 				 * All digits after the ":" until the end.
 				 * Strip off the ":" and everything after
 				 * it.
 				 */
 			       *p = '\0';
 			}
 		}
 
 		/*
 		 * Can we capture on this device?
 		 */
 		if (!(*check_usable)(ifa->ifa_name)) {
 			/*
 			 * No.
 			 */
 			continue;
 		}
 
 		/*
 		 * "ifa_addr" was apparently null on at least one
 		 * interface on some system.  Therefore, we supply
 		 * the address and netmask only if "ifa_addr" is
 		 * non-null (if there's no address, there's obviously
 		 * no netmask).
 		 */
 		if (ifa->ifa_addr != NULL) {
 			addr = ifa->ifa_addr;
 			addr_size = SA_LEN(addr);
 			netmask = ifa->ifa_netmask;
 		} else {
 			addr = NULL;
 			addr_size = 0;
 			netmask = NULL;
 		}
 
 		/*
 		 * Note that, on some platforms, ifa_broadaddr and
 		 * ifa_dstaddr could be the same field (true on at
-		 * least some versions of *BSD and OS X), so we
+		 * least some versions of *BSD and macOS), so we
 		 * can't just check whether the broadcast address
 		 * is null and add it if so and check whether the
 		 * destination address is null and add it if so.
 		 *
 		 * Therefore, we must also check the IFF_BROADCAST
 		 * flag, and only add a broadcast address if it's
 		 * set, and check the IFF_POINTTOPOINT flag, and
 		 * only add a destination address if it's set (as
 		 * per man page recommendations on some of those
 		 * platforms).
 		 */
 		if (ifa->ifa_flags & IFF_BROADCAST &&
 		    ifa->ifa_broadaddr != NULL) {
 			broadaddr = ifa->ifa_broadaddr;
 			broadaddr_size = SA_LEN(broadaddr);
 		} else {
 			broadaddr = NULL;
 			broadaddr_size = 0;
 		}
 		if (ifa->ifa_flags & IFF_POINTOPOINT &&
 		    ifa->ifa_dstaddr != NULL) {
 			dstaddr = ifa->ifa_dstaddr;
 			dstaddr_size = SA_LEN(ifa->ifa_dstaddr);
 		} else {
 			dstaddr = NULL;
 			dstaddr_size = 0;
 		}
 
 		/*
 		 * Add information for this address to the list.
 		 */
-		if (add_addr_to_iflist(&devlist, ifa->ifa_name,
-		    if_flags_to_pcap_flags(ifa->ifa_name, ifa->ifa_flags),
+		if (add_addr_to_if(devlistp, ifa->ifa_name, ifa->ifa_flags,
+		    get_flags_func,
 		    addr, addr_size, netmask, addr_size,
 		    broadaddr, broadaddr_size, dstaddr, dstaddr_size,
 		    errbuf) < 0) {
 			ret = -1;
 			break;
 		}
 	}
 
 	freeifaddrs(ifap);
 
-	if (ret == -1) {
-		/*
-		 * We had an error; free the list we've been constructing.
-		 */
-		if (devlist != NULL) {
-			pcap_freealldevs(devlist);
-			devlist = NULL;
-		}
-	}
-
-	*alldevsp = devlist;
 	return (ret);
 }
Index: vendor/libpcap/dist/fad-gifc.c
===================================================================
--- vendor/libpcap/dist/fad-gifc.c	(revision 333788)
+++ vendor/libpcap/dist/fad-gifc.c	(revision 333789)
@@ -1,428 +1,431 @@
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
 /*
  * Copyright (c) 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
 #include <sys/time.h>				/* concession to AIX */
 
 struct mbuf;		/* Squelch compiler warnings on some platforms for */
 struct rtentry;		/* declarations in <net/if.h> */
 #include <net/if.h>
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#else
+#define INT_MAX		2147483647
+#endif
+
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * This is fun.
  *
  * In older BSD systems, socket addresses were fixed-length, and
  * "sizeof (struct sockaddr)" gave the size of the structure.
  * All addresses fit within a "struct sockaddr".
  *
  * In newer BSD systems, the socket address is variable-length, and
  * there's an "sa_len" field giving the length of the structure;
  * this allows socket addresses to be longer than 2 bytes of family
  * and 14 bytes of data.
  *
  * Some commercial UNIXes use the old BSD scheme, some use the RFC 2553
  * variant of the old BSD scheme (with "struct sockaddr_storage" rather
  * than "struct sockaddr"), and some use the new BSD scheme.
  *
  * Some versions of GNU libc use neither scheme, but has an "SA_LEN()"
  * macro that determines the size based on the address family.  Other
  * versions don't have "SA_LEN()" (as it was in drafts of RFC 2553
  * but not in the final version).
  *
  * We assume that a UNIX that doesn't have "getifaddrs()" and doesn't have
  * SIOCGLIFCONF, but has SIOCGIFCONF, uses "struct sockaddr" for the
  * address in an entry returned by SIOCGIFCONF.
  */
 #ifndef SA_LEN
-#ifdef HAVE_SOCKADDR_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 #define SA_LEN(addr)	((addr)->sa_len)
-#else /* HAVE_SOCKADDR_SA_LEN */
+#else /* HAVE_STRUCT_SOCKADDR_SA_LEN */
 #define SA_LEN(addr)	(sizeof (struct sockaddr))
-#endif /* HAVE_SOCKADDR_SA_LEN */
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
 #endif /* SA_LEN */
 
 /*
  * This is also fun.
  *
  * There is no ioctl that returns the amount of space required for all
  * the data that SIOCGIFCONF could return, and if a buffer is supplied
  * that's not large enough for all the data SIOCGIFCONF could return,
  * on at least some platforms it just returns the data that'd fit with
  * no indication that there wasn't enough room for all the data, much
  * less an indication of how much more room is required.
  *
  * The only way to ensure that we got all the data is to pass a buffer
  * large enough that the amount of space in the buffer *not* filled in
  * is greater than the largest possible entry.
  *
  * We assume that's "sizeof(ifreq.ifr_name)" plus 255, under the assumption
  * that no address is more than 255 bytes (on systems where the "sa_len"
  * field in a "struct sockaddr" is 1 byte, e.g. newer BSDs, that's the
  * case, and addresses are unlikely to be bigger than that in any case).
  */
 #define MAX_SA_LEN	255
 
 /*
  * Get a list of all interfaces that are up and that we can open.
  * Returns -1 on error, 0 otherwise.
  * The list, as returned through "alldevsp", may be null if no interfaces
  * were up and could be opened.
  *
  * This is the implementation used on platforms that have SIOCGIFCONF but
  * don't have any other mechanism for getting a list of interfaces.
  *
  * XXX - or platforms that have other, better mechanisms but for which
  * we don't yet have code to use that mechanism; I think there's a better
  * way on Linux, for example, but if that better way is "getifaddrs()",
  * we already have that.
  */
 int
-pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf,
-    int (*check_usable)(const char *))
+pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
+    int (*check_usable)(const char *), get_if_flags_func get_flags_func)
 {
-	pcap_if_t *devlist = NULL;
 	register int fd;
 	register struct ifreq *ifrp, *ifend, *ifnext;
 	size_t n;
 	struct ifconf ifc;
 	char *buf = NULL;
 	unsigned buf_size;
 #if defined (HAVE_SOLARIS) || defined (HAVE_HPUX10_20_OR_LATER)
 	char *p, *q;
 #endif
 	struct ifreq ifrflags, ifrnetmask, ifrbroadaddr, ifrdstaddr;
 	struct sockaddr *netmask, *broadaddr, *dstaddr;
 	size_t netmask_size, broadaddr_size, dstaddr_size;
 	int ret = 0;
 
 	/*
 	 * Create a socket from which to fetch the list of interfaces.
 	 */
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (fd < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		return (-1);
 	}
 
 	/*
 	 * Start with an 8K buffer, and keep growing the buffer until
 	 * we have more than "sizeof(ifrp->ifr_name) + MAX_SA_LEN"
 	 * bytes left over in the buffer or we fail to get the
 	 * interface list for some reason other than EINVAL (which is
 	 * presumed here to mean "buffer is too small").
 	 */
 	buf_size = 8192;
 	for (;;) {
+		/*
+		 * Don't let the buffer size get bigger than INT_MAX.
+		 */
+		if (buf_size > INT_MAX) {
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "interface information requires more than %u bytes",
+			    INT_MAX);
+			(void)close(fd);
+			return (-1);
+		}
 		buf = malloc(buf_size);
 		if (buf == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
 			(void)close(fd);
 			return (-1);
 		}
 
 		ifc.ifc_len = buf_size;
 		ifc.ifc_buf = buf;
 		memset(buf, 0, buf_size);
 		if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0
 		    && errno != EINVAL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "SIOCGIFCONF: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "SIOCGIFCONF");
 			(void)close(fd);
 			free(buf);
 			return (-1);
 		}
-		if (ifc.ifc_len < buf_size &&
+		if (ifc.ifc_len < (int)buf_size &&
 		    (buf_size - ifc.ifc_len) > sizeof(ifrp->ifr_name) + MAX_SA_LEN)
 			break;
 		free(buf);
 		buf_size *= 2;
 	}
 
 	ifrp = (struct ifreq *)buf;
 	ifend = (struct ifreq *)(buf + ifc.ifc_len);
 
 	for (; ifrp < ifend; ifrp = ifnext) {
 		/*
 		 * XXX - what if this isn't an IPv4 address?  Can
 		 * we still get the netmask, etc. with ioctls on
 		 * an IPv4 socket?
 		 *
 		 * The answer is probably platform-dependent, and
 		 * if the answer is "no" on more than one platform,
 		 * the way you work around it is probably platform-
 		 * dependent as well.
 		 */
 		n = SA_LEN(&ifrp->ifr_addr) + sizeof(ifrp->ifr_name);
 		if (n < sizeof(*ifrp))
 			ifnext = ifrp + 1;
 		else
 			ifnext = (struct ifreq *)((char *)ifrp + n);
 
 		/*
 		 * XXX - The 32-bit compatibility layer for Linux on IA-64
 		 * is slightly broken. It correctly converts the structures
 		 * to and from kernel land from 64 bit to 32 bit but
 		 * doesn't update ifc.ifc_len, leaving it larger than the
 		 * amount really used. This means we read off the end
 		 * of the buffer and encounter an interface with an
 		 * "empty" name. Since this is highly unlikely to ever
 		 * occur in a valid case we can just finish looking for
 		 * interfaces if we see an empty name.
 		 */
 		if (!(*ifrp->ifr_name))
 			break;
 
 		/*
 		 * Skip entries that begin with "dummy".
 		 * XXX - what are these?  Is this Linux-specific?
 		 * Are there platforms on which we shouldn't do this?
 		 */
 		if (strncmp(ifrp->ifr_name, "dummy", 5) == 0)
 			continue;
 
 		/*
 		 * Can we capture on this device?
 		 */
 		if (!(*check_usable)(ifrp->ifr_name)) {
 			/*
 			 * No.
 			 */
 			continue;
 		}
 
 		/*
 		 * Get the flags for this interface.
 		 */
 		strncpy(ifrflags.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrflags.ifr_name));
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "SIOCGIFFLAGS: %.*s: %s",
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "SIOCGIFFLAGS: %.*s",
 			    (int)sizeof(ifrflags.ifr_name),
-			    ifrflags.ifr_name,
-			    pcap_strerror(errno));
+			    ifrflags.ifr_name);
 			ret = -1;
 			break;
 		}
 
 		/*
 		 * Get the netmask for this address on this interface.
 		 */
 		strncpy(ifrnetmask.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrnetmask.ifr_name));
 		memcpy(&ifrnetmask.ifr_addr, &ifrp->ifr_addr,
 		    sizeof(ifrnetmask.ifr_addr));
 		if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifrnetmask) < 0) {
 			if (errno == EADDRNOTAVAIL) {
 				/*
 				 * Not available.
 				 */
 				netmask = NULL;
 				netmask_size = 0;
 			} else {
-				(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "SIOCGIFNETMASK: %.*s: %s",
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "SIOCGIFNETMASK: %.*s",
 				    (int)sizeof(ifrnetmask.ifr_name),
-				    ifrnetmask.ifr_name,
-				    pcap_strerror(errno));
+				    ifrnetmask.ifr_name);
 				ret = -1;
 				break;
 			}
 		} else {
 			netmask = &ifrnetmask.ifr_addr;
 			netmask_size = SA_LEN(netmask);
 		}
 
 		/*
 		 * Get the broadcast address for this address on this
 		 * interface (if any).
 		 */
 		if (ifrflags.ifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrbroadaddr.ifr_name));
 			memcpy(&ifrbroadaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrbroadaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFBRDADDR,
 			    (char *)&ifrbroadaddr) < 0) {
 				if (errno == EADDRNOTAVAIL) {
 					/*
 					 * Not available.
 					 */
 					broadaddr = NULL;
 					broadaddr_size = 0;
 				} else {
-					(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "SIOCGIFBRDADDR: %.*s: %s",
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "SIOCGIFBRDADDR: %.*s",
 					    (int)sizeof(ifrbroadaddr.ifr_name),
-					    ifrbroadaddr.ifr_name,
-					    pcap_strerror(errno));
+					    ifrbroadaddr.ifr_name);
 					ret = -1;
 					break;
 				}
 			} else {
 				broadaddr = &ifrbroadaddr.ifr_broadaddr;
 				broadaddr_size = SA_LEN(broadaddr);
 			}
 		} else {
 			/*
 			 * Not a broadcast interface, so no broadcast
 			 * address.
 			 */
 			broadaddr = NULL;
 			broadaddr_size = 0;
 		}
 
 		/*
 		 * Get the destination address for this address on this
 		 * interface (if any).
 		 */
 		if (ifrflags.ifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrdstaddr.ifr_name));
 			memcpy(&ifrdstaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrdstaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFDSTADDR,
 			    (char *)&ifrdstaddr) < 0) {
 				if (errno == EADDRNOTAVAIL) {
 					/*
 					 * Not available.
 					 */
 					dstaddr = NULL;
 					dstaddr_size = 0;
 				} else {
-					(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "SIOCGIFDSTADDR: %.*s: %s",
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "SIOCGIFDSTADDR: %.*s",
 					    (int)sizeof(ifrdstaddr.ifr_name),
-					    ifrdstaddr.ifr_name,
-					    pcap_strerror(errno));
+					    ifrdstaddr.ifr_name);
 					ret = -1;
 					break;
 				}
 			} else {
 				dstaddr = &ifrdstaddr.ifr_dstaddr;
 				dstaddr_size = SA_LEN(dstaddr);
 			}
 		} else {
 			/*
 			 * Not a point-to-point interface, so no destination
 			 * address.
 			 */
 			dstaddr = NULL;
 			dstaddr_size = 0;
 		}
 
 #if defined (HAVE_SOLARIS) || defined (HAVE_HPUX10_20_OR_LATER)
 		/*
 		 * If this entry has a colon followed by a number at
 		 * the end, it's a logical interface.  Those are just
 		 * the way you assign multiple IP addresses to a real
 		 * interface, so an entry for a logical interface should
 		 * be treated like the entry for the real interface;
 		 * we do that by stripping off the ":" and the number.
 		 */
 		p = strchr(ifrp->ifr_name, ':');
 		if (p != NULL) {
 			/*
 			 * We have a ":"; is it followed by a number?
 			 */
 			q = p + 1;
 			while (isdigit((unsigned char)*q))
 				q++;
 			if (*q == '\0') {
 				/*
 				 * All digits after the ":" until the end.
 				 * Strip off the ":" and everything after
 				 * it.
 				 */
 				*p = '\0';
 			}
 		}
 #endif
 
 		/*
 		 * Add information for this address to the list.
 		 */
-		if (add_addr_to_iflist(&devlist, ifrp->ifr_name,
-		    if_flags_to_pcap_flags(ifrp->ifr_name, ifrflags.ifr_flags),
+		if (add_addr_to_if(devlistp, ifrp->ifr_name,
+		    ifrflags.ifr_flags, get_flags_func,
 		    &ifrp->ifr_addr, SA_LEN(&ifrp->ifr_addr),
 		    netmask, netmask_size, broadaddr, broadaddr_size,
 		    dstaddr, dstaddr_size, errbuf) < 0) {
 			ret = -1;
 			break;
 		}
 	}
 	free(buf);
 	(void)close(fd);
 
-	if (ret == -1) {
-		/*
-		 * We had an error; free the list we've been constructing.
-		 */
-		if (devlist != NULL) {
-			pcap_freealldevs(devlist);
-			devlist = NULL;
-		}
-	}
-
-	*alldevsp = devlist;
 	return (ret);
 }
Index: vendor/libpcap/dist/fad-glifc.c
===================================================================
--- vendor/libpcap/dist/fad-glifc.c	(revision 333788)
+++ vendor/libpcap/dist/fad-glifc.c	(revision 333789)
@@ -1,359 +1,346 @@
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
 /*
  * Copyright (c) 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
 #include <sys/time.h>				/* concession to AIX */
 
 struct mbuf;		/* Squelch compiler warnings on some platforms for */
 struct rtentry;		/* declarations in <net/if.h> */
 #include <net/if.h>
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * Get a list of all interfaces that are up and that we can open.
  * Returns -1 on error, 0 otherwise.
  * The list, as returned through "alldevsp", may be null if no interfaces
  * were up and could be opened.
  *
  * This is the implementation used on platforms that have SIOCGLIFCONF
  * but don't have "getifaddrs()".  (Solaris 8 and later; we use
  * SIOCGLIFCONF rather than SIOCGIFCONF in order to get IPv6 addresses.)
  */
 int
-pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf,
-    int (*check_usable)(const char *))
+pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
+    int (*check_usable)(const char *), get_if_flags_func get_flags_func)
 {
-	pcap_if_t *devlist = NULL;
 	register int fd4, fd6, fd;
 	register struct lifreq *ifrp, *ifend;
 	struct lifnum ifn;
 	struct lifconf ifc;
 	char *buf = NULL;
 	unsigned buf_size;
 #ifdef HAVE_SOLARIS
 	char *p, *q;
 #endif
 	struct lifreq ifrflags, ifrnetmask, ifrbroadaddr, ifrdstaddr;
 	struct sockaddr *netmask, *broadaddr, *dstaddr;
 	int ret = 0;
 
 	/*
 	 * Create a socket from which to fetch the list of interfaces,
 	 * and from which to fetch IPv4 information.
 	 */
 	fd4 = socket(AF_INET, SOCK_DGRAM, 0);
 	if (fd4 < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket: AF_INET");
 		return (-1);
 	}
 
 	/*
 	 * Create a socket from which to fetch IPv6 information.
 	 */
 	fd6 = socket(AF_INET6, SOCK_DGRAM, 0);
 	if (fd6 < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket: AF_INET6");
 		(void)close(fd4);
 		return (-1);
 	}
 
 	/*
 	 * How many entries will SIOCGLIFCONF return?
 	 */
 	ifn.lifn_family = AF_UNSPEC;
 	ifn.lifn_flags = 0;
 	ifn.lifn_count = 0;
 	if (ioctl(fd4, SIOCGLIFNUM, (char *)&ifn) < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "SIOCGLIFNUM: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGLIFNUM");
 		(void)close(fd6);
 		(void)close(fd4);
 		return (-1);
 	}
 
 	/*
 	 * Allocate a buffer for those entries.
 	 */
 	buf_size = ifn.lifn_count * sizeof (struct lifreq);
 	buf = malloc(buf_size);
 	if (buf == NULL) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		(void)close(fd6);
 		(void)close(fd4);
 		return (-1);
 	}
 
 	/*
 	 * Get the entries.
 	 */
 	ifc.lifc_len = buf_size;
 	ifc.lifc_buf = buf;
 	ifc.lifc_family = AF_UNSPEC;
 	ifc.lifc_flags = 0;
 	memset(buf, 0, buf_size);
 	if (ioctl(fd4, SIOCGLIFCONF, (char *)&ifc) < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "SIOCGLIFCONF: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGLIFCONF");
 		(void)close(fd6);
 		(void)close(fd4);
 		free(buf);
 		return (-1);
 	}
 
 	/*
 	 * Loop over the entries.
 	 */
 	ifrp = (struct lifreq *)buf;
 	ifend = (struct lifreq *)(buf + ifc.lifc_len);
 
 	for (; ifrp < ifend; ifrp++) {
 		/*
 		 * Skip entries that begin with "dummy".
 		 * XXX - what are these?  Is this Linux-specific?
 		 * Are there platforms on which we shouldn't do this?
 		 */
 		if (strncmp(ifrp->lifr_name, "dummy", 5) == 0)
 			continue;
 
 		/*
 		 * Can we capture on this device?
 		 */
 		if (!(*check_usable)(ifrp->lifr_name)) {
 			/*
 			 * No.
 			 */
 			continue;
 		}
 
 		/*
 		 * IPv6 or not?
 		 */
 		if (((struct sockaddr *)&ifrp->lifr_addr)->sa_family == AF_INET6)
 			fd = fd6;
 		else
 			fd = fd4;
 
 		/*
 		 * Get the flags for this interface.
 		 */
 		strncpy(ifrflags.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrflags.lifr_name));
 		if (ioctl(fd, SIOCGLIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "SIOCGLIFFLAGS: %.*s: %s",
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "SIOCGLIFFLAGS: %.*s",
 			    (int)sizeof(ifrflags.lifr_name),
-			    ifrflags.lifr_name,
-			    pcap_strerror(errno));
+			    ifrflags.lifr_name);
 			ret = -1;
 			break;
 		}
 
 		/*
 		 * Get the netmask for this address on this interface.
 		 */
 		strncpy(ifrnetmask.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrnetmask.lifr_name));
 		memcpy(&ifrnetmask.lifr_addr, &ifrp->lifr_addr,
 		    sizeof(ifrnetmask.lifr_addr));
 		if (ioctl(fd, SIOCGLIFNETMASK, (char *)&ifrnetmask) < 0) {
 			if (errno == EADDRNOTAVAIL) {
 				/*
 				 * Not available.
 				 */
 				netmask = NULL;
 			} else {
-				(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "SIOCGLIFNETMASK: %.*s: %s",
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "SIOCGLIFNETMASK: %.*s",
 				    (int)sizeof(ifrnetmask.lifr_name),
-				    ifrnetmask.lifr_name,
-				    pcap_strerror(errno));
+				    ifrnetmask.lifr_name);
 				ret = -1;
 				break;
 			}
 		} else
 			netmask = (struct sockaddr *)&ifrnetmask.lifr_addr;
 
 		/*
 		 * Get the broadcast address for this address on this
 		 * interface (if any).
 		 */
 		if (ifrflags.lifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrbroadaddr.lifr_name));
 			memcpy(&ifrbroadaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrbroadaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFBRDADDR,
 			    (char *)&ifrbroadaddr) < 0) {
 				if (errno == EADDRNOTAVAIL) {
 					/*
 					 * Not available.
 					 */
 					broadaddr = NULL;
 				} else {
-					(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "SIOCGLIFBRDADDR: %.*s: %s",
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "SIOCGLIFBRDADDR: %.*s",
 					    (int)sizeof(ifrbroadaddr.lifr_name),
-					    ifrbroadaddr.lifr_name,
-					    pcap_strerror(errno));
+					    ifrbroadaddr.lifr_name);
 					ret = -1;
 					break;
 				}
 			} else
 				broadaddr = (struct sockaddr *)&ifrbroadaddr.lifr_broadaddr;
 		} else {
 			/*
 			 * Not a broadcast interface, so no broadcast
 			 * address.
 			 */
 			broadaddr = NULL;
 		}
 
 		/*
 		 * Get the destination address for this address on this
 		 * interface (if any).
 		 */
 		if (ifrflags.lifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrdstaddr.lifr_name));
 			memcpy(&ifrdstaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrdstaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFDSTADDR,
 			    (char *)&ifrdstaddr) < 0) {
 				if (errno == EADDRNOTAVAIL) {
 					/*
 					 * Not available.
 					 */
 					dstaddr = NULL;
 				} else {
-					(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-					    "SIOCGLIFDSTADDR: %.*s: %s",
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "SIOCGLIFDSTADDR: %.*s",
 					    (int)sizeof(ifrdstaddr.lifr_name),
-					    ifrdstaddr.lifr_name,
-					    pcap_strerror(errno));
+					    ifrdstaddr.lifr_name);
 					ret = -1;
 					break;
 				}
 			} else
 				dstaddr = (struct sockaddr *)&ifrdstaddr.lifr_dstaddr;
 		} else
 			dstaddr = NULL;
 
 #ifdef HAVE_SOLARIS
 		/*
 		 * If this entry has a colon followed by a number at
 		 * the end, it's a logical interface.  Those are just
 		 * the way you assign multiple IP addresses to a real
 		 * interface, so an entry for a logical interface should
 		 * be treated like the entry for the real interface;
 		 * we do that by stripping off the ":" and the number.
 		 */
 		p = strchr(ifrp->lifr_name, ':');
 		if (p != NULL) {
 			/*
 			 * We have a ":"; is it followed by a number?
 			 */
 			q = p + 1;
 			while (isdigit((unsigned char)*q))
 				q++;
 			if (*q == '\0') {
 				/*
 				 * All digits after the ":" until the end.
 				 * Strip off the ":" and everything after
 				 * it.
 				 */
 				*p = '\0';
 			}
 		}
 #endif
 
 		/*
 		 * Add information for this address to the list.
 		 */
-		if (add_addr_to_iflist(&devlist, ifrp->lifr_name,
-		    if_flags_to_pcap_flags(ifrp->lifr_name, ifrflags.lifr_flags),
+		if (add_addr_to_if(devlistp, ifrp->lifr_name,
+		    ifrflags.lifr_flags, get_flags_func,
 		    (struct sockaddr *)&ifrp->lifr_addr,
 		    sizeof (struct sockaddr_storage),
 		    netmask, sizeof (struct sockaddr_storage),
 		    broadaddr, sizeof (struct sockaddr_storage),
 		    dstaddr, sizeof (struct sockaddr_storage), errbuf) < 0) {
 			ret = -1;
 			break;
 		}
 	}
 	free(buf);
 	(void)close(fd6);
 	(void)close(fd4);
 
-	if (ret == -1) {
-		/*
-		 * We had an error; free the list we've been constructing.
-		 */
-		if (devlist != NULL) {
-			pcap_freealldevs(devlist);
-			devlist = NULL;
-		}
-	}
-
-	*alldevsp = devlist;
 	return (ret);
 }
Index: vendor/libpcap/dist/fmtutils.c
===================================================================
--- vendor/libpcap/dist/fmtutils.c	(nonexistent)
+++ vendor/libpcap/dist/fmtutils.c	(revision 333789)
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Utilities for message formatting used both by libpcap and rpcapd.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "ftmacros.h"
+
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <pcap/pcap.h>
+
+#include "portability.h"
+
+#include "fmtutils.h"
+
+/*
+ * Generate an error message based on a format, arguments, and an
+ * errno, with a message for the errno after the formatted output.
+ */
+void
+pcap_fmt_errmsg_for_errno(char *errbuf, size_t errbuflen, int errnum,
+    const char *fmt, ...)
+{
+	va_list ap;
+	size_t msglen;
+	char *p;
+	size_t errbuflen_remaining;
+#if defined(HAVE_STRERROR_S)
+	errno_t err;
+#elif defined(HAVE_STRERROR_R)
+	int err;
+#endif
+
+	va_start(ap, fmt);
+	pcap_vsnprintf(errbuf, errbuflen, fmt, ap);
+	va_end(ap);
+	msglen = strlen(errbuf);
+
+	/*
+	 * Do we have enough space to append ": "?
+	 * Including the terminating '\0', that's 3 bytes.
+	 */
+	if (msglen + 3 > errbuflen) {
+		/* No - just give them what we've produced. */
+		return;
+	}
+	p = errbuf + msglen;
+	errbuflen_remaining = errbuflen - msglen;
+	*p++ = ':';
+	*p++ = ' ';
+	*p = '\0';
+	msglen += 2;
+	errbuflen_remaining -= 2;
+
+	/*
+	 * Now append the string for the error code.
+	 */
+#if defined(HAVE_STRERROR_S)
+	err = strerror_s(p, errbuflen_remaining, errnum);
+	if (err != 0) {
+		/*
+		 * It doesn't appear to be documented anywhere obvious
+		 * what the error returns from strerror_s().
+		 */
+		pcap_snprintf(p, errbuflen_remaining, "Error %d", errnum);
+	}
+#elif defined(HAVE_STRERROR_R)
+	err = strerror_r(errnum, p, errbuflen_remaining);
+	if (err == EINVAL) {
+		/*
+		 * UNIX 03 says this isn't guaranteed to produce a
+		 * fallback error message.
+		 */
+		pcap_snprintf(p, errbuflen_remaining, "Unknown error: %d",
+		    errnum);
+	} else if (err == ERANGE) {
+		/*
+		 * UNIX 03 says this isn't guaranteed to produce a
+		 * fallback error message.
+		 */
+		pcap_snprintf(p, errbuflen_remaining,
+		    "Message for error %d is too long", errnum);
+	}
+#else
+	/*
+	 * We have neither strerror_s() nor strerror_r(), so we're
+	 * stuck with using pcap_strerror().
+	 */
+	pcap_snprintf(p, errbuflen_remaining, "%s", pcap_strerror(errnum));
+#endif
+}

Property changes on: vendor/libpcap/dist/fmtutils.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/fmtutils.h
===================================================================
--- vendor/libpcap/dist/fmtutils.h	(nonexistent)
+++ vendor/libpcap/dist/fmtutils.h	(revision 333789)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1994, 1995, 1996
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef fmtutils_h
+#define	fmtutils_h
+
+#include "pcap/funcattrs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void	pcap_fmt_errmsg_for_errno(char *, size_t, int,
+    PCAP_FORMAT_STRING(const char *), ...) PCAP_PRINTFLIKE(4, 5);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Property changes on: vendor/libpcap/dist/fmtutils.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/ftmacros.h
===================================================================
--- vendor/libpcap/dist/ftmacros.h	(nonexistent)
+++ vendor/libpcap/dist/ftmacros.h	(revision 333789)
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 1994, 1995, 1996
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ftmacros_h
+#define	ftmacros_h
+
+/*
+ * Define some feature test macros to make sure that everything we want
+ * to be declared gets declared.
+ *
+ * On some UN*Xes we need to force strtok_r() to be declared.
+ * We do *NOT* want to define _POSIX_C_SOURCE, as that tends
+ * to make non-POSIX APIs that we use unavailable.
+ * XXX - is there no portable way to say "please pollute the
+ * namespace to the maximum extent possible"?
+ */
+#if defined(sun) || defined(__sun)
+  #define __EXTENSIONS__
+
+  /*
+   * We also need to define _XPG4_2 in order to get
+   * the Single UNIX Specification version of
+   * recvmsg().
+   */
+  #define _XPG4_2
+#elif defined(_hpux) || defined(hpux) || defined(__hpux)
+  #define _REENTRANT
+
+  /*
+   * We need this to get the versions of socket functions that
+   * use socklen_t.  Define it only if it's not already defined,
+   * so we don't get redefiniton warnings.
+   */
+  #ifndef _XOPEN_SOURCE_EXTENDED
+    #define _XOPEN_SOURCE_EXTENDED
+  #endif
+
+  /*
+   * XXX - the list of PA-RISC options for GCC makes it sound as if
+   * building code that uses a particular vintage of UNIX API/ABI
+   * is complicated:
+   *
+   *    https://gcc.gnu.org/onlinedocs/gcc/HPPA-Options.html
+   *
+   * See the description of the -munix flag.
+   *
+   * We probably want libpcap to work with programs built for any
+   * UN*X standard.  I'm not sure whether that's possible and, if
+   * it is, what sort of stuff it'd have to do.
+   *
+   * It might also be a requirement that we build with a special
+   * flag to allow the library to be used with threaded code, at
+   * least with HP's C compiler; hopefully doing so won't make it
+   * *not* work with *un*-threaded code.
+   */
+#elif defined(__linux__) || defined(linux) || defined(__linux)
+  /*
+   * We can't turn _GNU_SOURCE on because some versions of GNU Libc
+   * will give the GNU version of strerror_r(), which returns a
+   * string pointer and doesn't necessarily fill in the buffer,
+   * rather than the standard version of strerror_r(), which
+   * returns 0 or an errno and always fills in the buffer.  We
+   * require both of the latter behaviors.
+   *
+   * So we try turning everything else on that we can.  This includes
+   * defining _XOPEN_SOURCE as 600, because we want to force crypt()
+   * to be declared on systems that use GNU libc, such as most Linux
+   * distributions.
+   */
+  #define _POSIX_C_SOURCE 200809L
+  #define _XOPEN_SOURCE 600
+
+  /*
+   * We turn on both _DEFAULT_SOURCE and _BSD_SOURCE to try to get
+   * the BSD u_XXX types, such as u_int and u_short, defined.  We
+   * define _DEFAULT_SOURCE first, so that newer versions of GNU libc
+   * don't whine about _BSD_SOURCE being deprecated; we still have
+   * to define _BSD_SOURCE to handle older versions of GNU libc that
+   * don't support _DEFAULT_SOURCE.
+   */
+  #define _DEFAULT_SOURCE
+  #define _BSD_SOURCE
+#endif
+
+#endif

Property changes on: vendor/libpcap/dist/ftmacros.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/gencode.c
===================================================================
--- vendor/libpcap/dist/gencode.c	(revision 333788)
+++ vendor/libpcap/dist/gencode.c	(revision 333789)
@@ -1,8977 +1,9242 @@
 /*#define CHASE_CHAIN*/
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#include <pcap-types.h>
 #ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif /* _WIN32 */
+  #include <ws2tcpip.h>
+#else
+  #include <sys/socket.h>
 
-#ifndef _WIN32
+  #ifdef __NetBSD__
+    #include <sys/param.h>
+  #endif
 
-#ifdef __NetBSD__
-#include <sys/param.h>
-#endif
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
 #endif /* _WIN32 */
 
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
 #include <setjmp.h>
 #include <stdarg.h>
 
 #ifdef MSDOS
 #include "pcap-dos.h"
 #endif
 
 #include "pcap-int.h"
 
 #include "ethertype.h"
 #include "nlpid.h"
 #include "llc.h"
 #include "gencode.h"
 #include "ieee80211.h"
 #include "atmuni31.h"
 #include "sunatmpos.h"
 #include "ppp.h"
 #include "pcap/sll.h"
 #include "pcap/ipnet.h"
 #include "arcnet.h"
 
 #include "grammar.h"
 #include "scanner.h"
 
 #if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 #include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/filter.h>
 #endif
 
 #ifdef HAVE_NET_PFVAR_H
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 #endif
 
 #ifndef offsetof
 #define offsetof(s, e) ((size_t)&((s *)0)->e)
 #endif
 
-#ifdef INET6
 #ifdef _WIN32
-#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
+  #ifdef INET6
+    #if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
 /* IPv6 address */
 struct in6_addr
   {
     union
       {
-	u_int8_t		u6_addr8[16];
-	u_int16_t	u6_addr16[8];
-	u_int32_t	u6_addr32[4];
+	uint8_t		u6_addr8[16];
+	uint16_t	u6_addr16[8];
+	uint32_t	u6_addr32[4];
       } in6_u;
 #define s6_addr			in6_u.u6_addr8
 #define s6_addr16		in6_u.u6_addr16
 #define s6_addr32		in6_u.u6_addr32
 #define s6_addr64		in6_u.u6_addr64
   };
 
 typedef unsigned short	sa_family_t;
 
 #define	__SOCKADDR_COMMON(sa_prefix) \
   sa_family_t sa_prefix##family
 
 /* Ditto, for IPv6.  */
 struct sockaddr_in6
   {
     __SOCKADDR_COMMON (sin6_);
-    u_int16_t sin6_port;		/* Transport layer port # */
-    u_int32_t sin6_flowinfo;	/* IPv6 flow information */
+    uint16_t sin6_port;		/* Transport layer port # */
+    uint32_t sin6_flowinfo;	/* IPv6 flow information */
     struct in6_addr sin6_addr;	/* IPv6 address */
   };
 
-#ifndef EAI_ADDRFAMILY
+      #ifndef EAI_ADDRFAMILY
 struct addrinfo {
 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
 	int	ai_family;	/* PF_xxx */
 	int	ai_socktype;	/* SOCK_xxx */
 	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
 	size_t	ai_addrlen;	/* length of ai_addr */
 	char	*ai_canonname;	/* canonical name for hostname */
 	struct sockaddr *ai_addr;	/* binary address */
 	struct addrinfo *ai_next;	/* next structure in linked list */
 };
-#endif /* EAI_ADDRFAMILY */
-#endif /* defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) */
+      #endif /* EAI_ADDRFAMILY */
+    #endif /* defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) */
+  #endif /* INET6 */
 #else /* _WIN32 */
-#include <netdb.h>	/* for "struct addrinfo" */
+  #include <netdb.h>	/* for "struct addrinfo" */
 #endif /* _WIN32 */
-#endif /* INET6 */
 #include <pcap/namedb.h>
 
 #include "nametoaddr.h"
 
 #define ETHERMTU	1500
 
 #ifndef ETHERTYPE_TEB
 #define ETHERTYPE_TEB 0x6558
 #endif
 
 #ifndef IPPROTO_HOPOPTS
 #define IPPROTO_HOPOPTS 0
 #endif
 #ifndef IPPROTO_ROUTING
 #define IPPROTO_ROUTING 43
 #endif
 #ifndef IPPROTO_FRAGMENT
 #define IPPROTO_FRAGMENT 44
 #endif
 #ifndef IPPROTO_DSTOPTS
 #define IPPROTO_DSTOPTS 60
 #endif
 #ifndef IPPROTO_SCTP
 #define IPPROTO_SCTP 132
 #endif
 
 #define GENEVE_PORT 6081
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #define JMP(c) ((c)|BPF_JMP|BPF_K)
 
 /*
  * "Push" the current value of the link-layer header type and link-layer
  * header offset onto a "stack", and set a new value.  (It's not a
  * full-blown stack; we keep only the top two items.)
  */
 #define PUSH_LINKHDR(cs, new_linktype, new_is_variable, new_constant_part, new_reg) \
 { \
 	(cs)->prevlinktype = (cs)->linktype; \
 	(cs)->off_prevlinkhdr = (cs)->off_linkhdr; \
 	(cs)->linktype = (new_linktype); \
 	(cs)->off_linkhdr.is_variable = (new_is_variable); \
 	(cs)->off_linkhdr.constant_part = (new_constant_part); \
 	(cs)->off_linkhdr.reg = (new_reg); \
 	(cs)->is_geneve = 0; \
 }
 
 /*
  * Offset "not set" value.
  */
 #define OFFSET_NOT_SET	0xffffffffU
 
 /*
  * Absolute offsets, which are offsets from the beginning of the raw
  * packet data, are, in the general case, the sum of a variable value
  * and a constant value; the variable value may be absent, in which
  * case the offset is only the constant value, and the constant value
  * may be zero, in which case the offset is only the variable value.
  *
  * bpf_abs_offset is a structure containing all that information:
  *
  *   is_variable is 1 if there's a variable part.
  *
  *   constant_part is the constant part of the value, possibly zero;
  *
  *   if is_variable is 1, reg is the register number for a register
  *   containing the variable value if the register has been assigned,
  *   and -1 otherwise.
  */
 typedef struct {
 	int	is_variable;
 	u_int	constant_part;
 	int	reg;
 } bpf_abs_offset;
 
 /*
  * Value passed to gen_load_a() to indicate what the offset argument
  * is relative to the beginning of.
  */
 enum e_offrel {
 	OR_PACKET,		/* full packet data */
 	OR_LINKHDR,		/* link-layer header */
 	OR_PREVLINKHDR,		/* previous link-layer header */
 	OR_LLC,			/* 802.2 LLC header */
 	OR_PREVMPLSHDR,		/* previous MPLS header */
 	OR_LINKTYPE,		/* link-layer type */
 	OR_LINKPL,		/* link-layer payload */
 	OR_LINKPL_NOSNAP,	/* link-layer payload, with no SNAP header at the link layer */
 	OR_TRAN_IPV4,		/* transport-layer header, with IPv4 network layer */
 	OR_TRAN_IPV6		/* transport-layer header, with IPv6 network layer */
 };
 
 /*
  * We divy out chunks of memory rather than call malloc each time so
  * we don't have to worry about leaking memory.  It's probably
  * not a big deal if all this memory was wasted but if this ever
  * goes into a library that would probably not be a good idea.
  *
  * XXX - this *is* in a library....
  */
 #define NCHUNKS 16
 #define CHUNK0SIZE 1024
 struct chunk {
 	size_t n_left;
 	void *m;
 };
 
 /* Code generator state */
 
 struct _compiler_state {
 	jmp_buf top_ctx;
 	pcap_t *bpf_pcap;
 
 	struct icode ic;
 
 	int snaplen;
 
 	int linktype;
 	int prevlinktype;
 	int outermostlinktype;
 
 	bpf_u_int32 netmask;
 	int no_optimize;
 
 	/* Hack for handling VLAN and MPLS stacks. */
 	u_int label_stack_depth;
 	u_int vlan_stack_depth;
 
 	/* XXX */
 	u_int pcap_fddipad;
 
-#ifdef INET6
 	/*
 	 * As errors are handled by a longjmp, anything allocated must
 	 * be freed in the longjmp handler, so it must be reachable
 	 * from that handler.
 	 *
 	 * One thing that's allocated is the result of pcap_nametoaddrinfo();
 	 * it must be freed with freeaddrinfo().  This variable points to
 	 * any addrinfo structure that would need to be freed.
 	 */
 	struct addrinfo *ai;
-#endif
 
 	/*
 	 * Various code constructs need to know the layout of the packet.
 	 * These values give the necessary offsets from the beginning
 	 * of the packet data.
 	 */
 
 	/*
 	 * Absolute offset of the beginning of the link-layer header.
 	 */
 	bpf_abs_offset off_linkhdr;
 
 	/*
 	 * If we're checking a link-layer header for a packet encapsulated
 	 * in another protocol layer, this is the equivalent information
 	 * for the previous layers' link-layer header from the beginning
 	 * of the raw packet data.
 	 */
 	bpf_abs_offset off_prevlinkhdr;
 
 	/*
 	 * This is the equivalent information for the outermost layers'
 	 * link-layer header.
 	 */
 	bpf_abs_offset off_outermostlinkhdr;
 
 	/*
 	 * Absolute offset of the beginning of the link-layer payload.
 	 */
 	bpf_abs_offset off_linkpl;
 
 	/*
 	 * "off_linktype" is the offset to information in the link-layer
 	 * header giving the packet type. This is an absolute offset
 	 * from the beginning of the packet.
 	 *
 	 * For Ethernet, it's the offset of the Ethernet type field; this
 	 * means that it must have a value that skips VLAN tags.
 	 *
 	 * For link-layer types that always use 802.2 headers, it's the
 	 * offset of the LLC header; this means that it must have a value
 	 * that skips VLAN tags.
 	 *
 	 * For PPP, it's the offset of the PPP type field.
 	 *
 	 * For Cisco HDLC, it's the offset of the CHDLC type field.
 	 *
 	 * For BSD loopback, it's the offset of the AF_ value.
 	 *
 	 * For Linux cooked sockets, it's the offset of the type field.
 	 *
 	 * off_linktype.constant_part is set to OFFSET_NOT_SET for no
 	 * encapsulation, in which case, IP is assumed.
 	 */
 	bpf_abs_offset off_linktype;
 
 	/*
 	 * TRUE if the link layer includes an ATM pseudo-header.
 	 */
 	int is_atm;
 
 	/*
 	 * TRUE if "geneve" appeared in the filter; it causes us to
 	 * generate code that checks for a Geneve header and assume
 	 * that later filters apply to the encapsulated payload.
 	 */
 	int is_geneve;
 
 	/*
+	 * TRUE if we need variable length part of VLAN offset
+	 */
+	int is_vlan_vloffset;
+
+	/*
 	 * These are offsets for the ATM pseudo-header.
 	 */
 	u_int off_vpi;
 	u_int off_vci;
 	u_int off_proto;
 
 	/*
 	 * These are offsets for the MTP2 fields.
 	 */
 	u_int off_li;
 	u_int off_li_hsl;
 
 	/*
 	 * These are offsets for the MTP3 fields.
 	 */
 	u_int off_sio;
 	u_int off_opc;
 	u_int off_dpc;
 	u_int off_sls;
 
 	/*
 	 * This is the offset of the first byte after the ATM pseudo_header,
 	 * or -1 if there is no ATM pseudo-header.
 	 */
 	u_int off_payload;
 
 	/*
 	 * These are offsets to the beginning of the network-layer header.
 	 * They are relative to the beginning of the link-layer payload
 	 * (i.e., they don't include off_linkhdr.constant_part or
 	 * off_linkpl.constant_part).
 	 *
 	 * If the link layer never uses 802.2 LLC:
 	 *
 	 *	"off_nl" and "off_nl_nosnap" are the same.
 	 *
 	 * If the link layer always uses 802.2 LLC:
 	 *
 	 *	"off_nl" is the offset if there's a SNAP header following
 	 *	the 802.2 header;
 	 *
 	 *	"off_nl_nosnap" is the offset if there's no SNAP header.
 	 *
 	 * If the link layer is Ethernet:
 	 *
 	 *	"off_nl" is the offset if the packet is an Ethernet II packet
 	 *	(we assume no 802.3+802.2+SNAP);
 	 *
 	 *	"off_nl_nosnap" is the offset if the packet is an 802.3 packet
 	 *	with an 802.2 header following it.
 	 */
 	u_int off_nl;
 	u_int off_nl_nosnap;
 
 	/*
 	 * Here we handle simple allocation of the scratch registers.
 	 * If too many registers are alloc'd, the allocator punts.
 	 */
 	int regused[BPF_MEMWORDS];
 	int curreg;
 
 	/*
 	 * Memory chunks.
 	 */
 	struct chunk chunks[NCHUNKS];
 	int cur_chunk;
 };
 
-void
+void PCAP_NORETURN
 bpf_syntax_error(compiler_state_t *cstate, const char *msg)
 {
 	bpf_error(cstate, "syntax error in filter expression: %s", msg);
 	/* NOTREACHED */
 }
 
 /* VARARGS */
-void
+void PCAP_NORETURN
 bpf_error(compiler_state_t *cstate, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
 	if (cstate->bpf_pcap != NULL)
 		(void)pcap_vsnprintf(pcap_geterr(cstate->bpf_pcap),
 		    PCAP_ERRBUF_SIZE, fmt, ap);
 	va_end(ap);
 	longjmp(cstate->top_ctx, 1);
 	/* NOTREACHED */
 }
 
 static void init_linktype(compiler_state_t *, pcap_t *);
 
 static void init_regs(compiler_state_t *);
 static int alloc_reg(compiler_state_t *);
 static void free_reg(compiler_state_t *, int);
 
 static void initchunks(compiler_state_t *cstate);
 static void *newchunk(compiler_state_t *cstate, size_t);
 static void freechunks(compiler_state_t *cstate);
 static inline struct block *new_block(compiler_state_t *cstate, int);
 static inline struct slist *new_stmt(compiler_state_t *cstate, int);
 static struct block *gen_retblk(compiler_state_t *cstate, int);
 static inline void syntax(compiler_state_t *cstate);
 
 static void backpatch(struct block *, struct block *);
 static void merge(struct block *, struct block *);
 static struct block *gen_cmp(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32);
 static struct block *gen_cmp_gt(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32);
 static struct block *gen_cmp_ge(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32);
 static struct block *gen_cmp_lt(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32);
 static struct block *gen_cmp_le(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32);
 static struct block *gen_mcmp(compiler_state_t *, enum e_offrel, u_int,
     u_int, bpf_int32, bpf_u_int32);
 static struct block *gen_bcmp(compiler_state_t *, enum e_offrel, u_int,
     u_int, const u_char *);
 static struct block *gen_ncmp(compiler_state_t *, enum e_offrel, bpf_u_int32,
     bpf_u_int32, bpf_u_int32, bpf_u_int32, int, bpf_int32);
 static struct slist *gen_load_absoffsetrel(compiler_state_t *, bpf_abs_offset *,
     u_int, u_int);
 static struct slist *gen_load_a(compiler_state_t *, enum e_offrel, u_int,
     u_int);
 static struct slist *gen_loadx_iphdrlen(compiler_state_t *);
 static struct block *gen_uncond(compiler_state_t *, int);
 static inline struct block *gen_true(compiler_state_t *);
 static inline struct block *gen_false(compiler_state_t *);
 static struct block *gen_ether_linktype(compiler_state_t *, int);
 static struct block *gen_ipnet_linktype(compiler_state_t *, int);
 static struct block *gen_linux_sll_linktype(compiler_state_t *, int);
 static struct slist *gen_load_prism_llprefixlen(compiler_state_t *);
 static struct slist *gen_load_avs_llprefixlen(compiler_state_t *);
 static struct slist *gen_load_radiotap_llprefixlen(compiler_state_t *);
 static struct slist *gen_load_ppi_llprefixlen(compiler_state_t *);
 static void insert_compute_vloffsets(compiler_state_t *, struct block *);
 static struct slist *gen_abs_offset_varpart(compiler_state_t *,
     bpf_abs_offset *);
 static int ethertype_to_ppptype(int);
 static struct block *gen_linktype(compiler_state_t *, int);
 static struct block *gen_snap(compiler_state_t *, bpf_u_int32, bpf_u_int32);
 static struct block *gen_llc_linktype(compiler_state_t *, int);
 static struct block *gen_hostop(compiler_state_t *, bpf_u_int32, bpf_u_int32,
     int, int, u_int, u_int);
 #ifdef INET6
 static struct block *gen_hostop6(compiler_state_t *, struct in6_addr *,
     struct in6_addr *, int, int, u_int, u_int);
 #endif
 static struct block *gen_ahostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_ehostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_fhostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_thostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_wlanhostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_ipfchostop(compiler_state_t *, const u_char *, int);
 static struct block *gen_dnhostop(compiler_state_t *, bpf_u_int32, int);
 static struct block *gen_mpls_linktype(compiler_state_t *, int);
 static struct block *gen_host(compiler_state_t *, bpf_u_int32, bpf_u_int32,
     int, int, int);
 #ifdef INET6
 static struct block *gen_host6(compiler_state_t *, struct in6_addr *,
     struct in6_addr *, int, int, int);
 #endif
 #ifndef INET6
 static struct block *gen_gateway(compiler_state_t *, const u_char *,
-    bpf_u_int32 **, int, int);
+    struct addrinfo *, int, int);
 #endif
 static struct block *gen_ipfrag(compiler_state_t *);
 static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
 static struct block *gen_portrangeatom(compiler_state_t *, int, bpf_int32,
     bpf_int32);
 static struct block *gen_portatom6(compiler_state_t *, int, bpf_int32);
 static struct block *gen_portrangeatom6(compiler_state_t *, int, bpf_int32,
     bpf_int32);
 struct block *gen_portop(compiler_state_t *, int, int, int);
 static struct block *gen_port(compiler_state_t *, int, int, int);
 struct block *gen_portrangeop(compiler_state_t *, int, int, int, int);
 static struct block *gen_portrange(compiler_state_t *, int, int, int, int);
 struct block *gen_portop6(compiler_state_t *, int, int, int);
 static struct block *gen_port6(compiler_state_t *, int, int, int);
 struct block *gen_portrangeop6(compiler_state_t *, int, int, int, int);
 static struct block *gen_portrange6(compiler_state_t *, int, int, int, int);
 static int lookup_proto(compiler_state_t *, const char *, int);
 static struct block *gen_protochain(compiler_state_t *, int, int, int);
 static struct block *gen_proto(compiler_state_t *, int, int, int);
 static struct slist *xfer_to_x(compiler_state_t *, struct arth *);
 static struct slist *xfer_to_a(compiler_state_t *, struct arth *);
 static struct block *gen_mac_multicast(compiler_state_t *, int);
 static struct block *gen_len(compiler_state_t *, int, int);
 static struct block *gen_check_802_11_data_frame(compiler_state_t *);
 static struct block *gen_geneve_ll_check(compiler_state_t *cstate);
 
 static struct block *gen_ppi_dlt_check(compiler_state_t *);
 static struct block *gen_msg_abbrev(compiler_state_t *, int type);
 
 static void
 initchunks(compiler_state_t *cstate)
 {
 	int i;
 
 	for (i = 0; i < NCHUNKS; i++) {
 		cstate->chunks[i].n_left = 0;
 		cstate->chunks[i].m = NULL;
 	}
 	cstate->cur_chunk = 0;
 }
 
 static void *
 newchunk(compiler_state_t *cstate, size_t n)
 {
 	struct chunk *cp;
 	int k;
 	size_t size;
 
 #ifndef __NetBSD__
 	/* XXX Round up to nearest long. */
 	n = (n + sizeof(long) - 1) & ~(sizeof(long) - 1);
 #else
 	/* XXX Round up to structure boundary. */
 	n = ALIGN(n);
 #endif
 
 	cp = &cstate->chunks[cstate->cur_chunk];
 	if (n > cp->n_left) {
-		++cp, k = ++cstate->cur_chunk;
+		++cp;
+		k = ++cstate->cur_chunk;
 		if (k >= NCHUNKS)
 			bpf_error(cstate, "out of memory");
 		size = CHUNK0SIZE << k;
 		cp->m = (void *)malloc(size);
 		if (cp->m == NULL)
 			bpf_error(cstate, "out of memory");
 		memset((char *)cp->m, 0, size);
 		cp->n_left = size;
 		if (n > size)
 			bpf_error(cstate, "out of memory");
 	}
 	cp->n_left -= n;
 	return (void *)((char *)cp->m + cp->n_left);
 }
 
 static void
 freechunks(compiler_state_t *cstate)
 {
 	int i;
 
 	for (i = 0; i < NCHUNKS; ++i)
 		if (cstate->chunks[i].m != NULL)
 			free(cstate->chunks[i].m);
 }
 
 /*
  * A strdup whose allocations are freed after code generation is over.
  */
 char *
 sdup(compiler_state_t *cstate, const char *s)
 {
 	size_t n = strlen(s) + 1;
 	char *cp = newchunk(cstate, n);
 
 	strlcpy(cp, s, n);
 	return (cp);
 }
 
 static inline struct block *
 new_block(compiler_state_t *cstate, int code)
 {
 	struct block *p;
 
 	p = (struct block *)newchunk(cstate, sizeof(*p));
 	p->s.code = code;
 	p->head = p;
 
 	return p;
 }
 
 static inline struct slist *
 new_stmt(compiler_state_t *cstate, int code)
 {
 	struct slist *p;
 
 	p = (struct slist *)newchunk(cstate, sizeof(*p));
 	p->s.code = code;
 
 	return p;
 }
 
 static struct block *
 gen_retblk(compiler_state_t *cstate, int v)
 {
 	struct block *b = new_block(cstate, BPF_RET|BPF_K);
 
 	b->s.k = v;
 	return b;
 }
 
-static inline void
+static inline PCAP_NORETURN_DEF void
 syntax(compiler_state_t *cstate)
 {
 	bpf_error(cstate, "syntax error in filter expression");
 }
 
 int
 pcap_compile(pcap_t *p, struct bpf_program *program,
 	     const char *buf, int optimize, bpf_u_int32 mask)
 {
+#ifdef _WIN32
+	static int done = 0;
+#endif
 	compiler_state_t cstate;
 	const char * volatile xbuf = buf;
 	yyscan_t scanner = NULL;
 	YY_BUFFER_STATE in_buffer = NULL;
 	u_int len;
 	int  rc;
 
-#ifdef _WIN32
-	static int done = 0;
-
-	if (!done)
-		pcap_wsockinit();
-	done = 1;
-#endif
-
 	/*
 	 * If this pcap_t hasn't been activated, it doesn't have a
 	 * link-layer type, so we can't use it.
 	 */
 	if (!p->activated) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "not-yet-activated pcap_t passed to pcap_compile");
-		rc = -1;
-		goto quit;
+		return (-1);
 	}
+
+#ifdef _WIN32
+	if (!done)
+		pcap_wsockinit();
+	done = 1;
+#endif
+
+#ifdef ENABLE_REMOTE
+	/*
+	 * If the device on which we're capturing need to be notified
+	 * that a new filter is being compiled, do so.
+	 *
+	 * This allows them to save a copy of it, in case, for example,
+	 * they're implementing a form of remote packet capture, and
+	 * want the remote machine to filter out the packets in which
+	 * it's sending the packets it's captured.
+	 *
+	 * XXX - the fact that we happen to be compiling a filter
+	 * doesn't necessarily mean we'll be installing it as the
+	 * filter for this pcap_t; we might be running it from userland
+	 * on captured packets to do packet classification.  We really
+	 * need a better way of handling this, but this is all that
+	 * the WinPcap code did.
+	 */
+	if (p->save_current_filter_op != NULL)
+		(p->save_current_filter_op)(p, buf);
+#endif
+
 	initchunks(&cstate);
 	cstate.no_optimize = 0;
 #ifdef INET6
 	cstate.ai = NULL;
 #endif
 	cstate.ic.root = NULL;
 	cstate.ic.cur_mark = 0;
 	cstate.bpf_pcap = p;
 	init_regs(&cstate);
 
 	if (setjmp(cstate.top_ctx)) {
 #ifdef INET6
 		if (cstate.ai != NULL)
 			freeaddrinfo(cstate.ai);
 #endif
 		rc = -1;
 		goto quit;
 	}
 
 	cstate.netmask = mask;
 
 	cstate.snaplen = pcap_snapshot(p);
 	if (cstate.snaplen == 0) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			 "snaplen of 0 rejects all packets");
 		rc = -1;
 		goto quit;
 	}
 
 	if (pcap_lex_init(&scanner) != 0)
-		bpf_error(&cstate, "can't initialize scanner: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't initialize scanner");
 	in_buffer = pcap__scan_string(xbuf ? xbuf : "", scanner);
 
 	/*
 	 * Associate the compiler state with the lexical analyzer
 	 * state.
 	 */
 	pcap_set_extra(&cstate, scanner);
 
 	init_linktype(&cstate, p);
 	(void)pcap_parse(scanner, &cstate);
 
 	if (cstate.ic.root == NULL)
 		cstate.ic.root = gen_retblk(&cstate, cstate.snaplen);
 
 	if (optimize && !cstate.no_optimize) {
 		bpf_optimize(&cstate, &cstate.ic);
 		if (cstate.ic.root == NULL ||
 		    (cstate.ic.root->s.code == (BPF_RET|BPF_K) && cstate.ic.root->s.k == 0))
 			bpf_error(&cstate, "expression rejects all packets");
 	}
 	program->bf_insns = icode_to_fcode(&cstate, &cstate.ic, cstate.ic.root, &len);
 	program->bf_len = len;
 
 	rc = 0;  /* We're all okay */
 
 quit:
 	/*
 	 * Clean up everything for the lexical analyzer.
 	 */
 	if (in_buffer != NULL)
 		pcap__delete_buffer(in_buffer, scanner);
 	if (scanner != NULL)
 		pcap_lex_destroy(scanner);
 
 	/*
 	 * Clean up our own allocated memory.
 	 */
 	freechunks(&cstate);
 
 	return (rc);
 }
 
 /*
  * entry point for using the compiler with no pcap open
  * pass in all the stuff that is needed explicitly instead.
  */
 int
 pcap_compile_nopcap(int snaplen_arg, int linktype_arg,
 		    struct bpf_program *program,
 	     const char *buf, int optimize, bpf_u_int32 mask)
 {
 	pcap_t *p;
 	int ret;
 
 	p = pcap_open_dead(linktype_arg, snaplen_arg);
 	if (p == NULL)
 		return (-1);
 	ret = pcap_compile(p, program, buf, optimize, mask);
 	pcap_close(p);
 	return (ret);
 }
 
 /*
  * Clean up a "struct bpf_program" by freeing all the memory allocated
  * in it.
  */
 void
 pcap_freecode(struct bpf_program *program)
 {
 	program->bf_len = 0;
 	if (program->bf_insns != NULL) {
 		free((char *)program->bf_insns);
 		program->bf_insns = NULL;
 	}
 }
 
 /*
  * Backpatch the blocks in 'list' to 'target'.  The 'sense' field indicates
  * which of the jt and jf fields has been resolved and which is a pointer
  * back to another unresolved block (or nil).  At least one of the fields
  * in each block is already resolved.
  */
 static void
-backpatch(list, target)
-	struct block *list, *target;
+backpatch(struct block *list, struct block *target)
 {
 	struct block *next;
 
 	while (list) {
 		if (!list->sense) {
 			next = JT(list);
 			JT(list) = target;
 		} else {
 			next = JF(list);
 			JF(list) = target;
 		}
 		list = next;
 	}
 }
 
 /*
  * Merge the lists in b0 and b1, using the 'sense' field to indicate
  * which of jt and jf is the link.
  */
 static void
-merge(b0, b1)
-	struct block *b0, *b1;
+merge(struct block *b0, struct block *b1)
 {
 	register struct block **p = &b0;
 
 	/* Find end of list. */
 	while (*p)
 		p = !((*p)->sense) ? &JT(*p) : &JF(*p);
 
 	/* Concatenate the lists. */
 	*p = b1;
 }
 
 void
 finish_parse(compiler_state_t *cstate, struct block *p)
 {
 	struct block *ppi_dlt_check;
 
 	/*
 	 * Insert before the statements of the first (root) block any
 	 * statements needed to load the lengths of any variable-length
 	 * headers into registers.
 	 *
 	 * XXX - a fancier strategy would be to insert those before the
 	 * statements of all blocks that use those lengths and that
 	 * have no predecessors that use them, so that we only compute
 	 * the lengths if we need them.  There might be even better
 	 * approaches than that.
 	 *
 	 * However, those strategies would be more complicated, and
 	 * as we don't generate code to compute a length if the
 	 * program has no tests that use the length, and as most
 	 * tests will probably use those lengths, we would just
 	 * postpone computing the lengths so that it's not done
 	 * for tests that fail early, and it's not clear that's
 	 * worth the effort.
 	 */
 	insert_compute_vloffsets(cstate, p->head);
 
 	/*
 	 * For DLT_PPI captures, generate a check of the per-packet
 	 * DLT value to make sure it's DLT_IEEE802_11.
 	 *
 	 * XXX - TurboCap cards use DLT_PPI for Ethernet.
 	 * Can we just define some DLT_ETHERNET_WITH_PHDR pseudo-header
 	 * with appropriate Ethernet information and use that rather
 	 * than using something such as DLT_PPI where you don't know
 	 * the link-layer header type until runtime, which, in the
 	 * general case, would force us to generate both Ethernet *and*
 	 * 802.11 code (*and* anything else for which PPI is used)
 	 * and choose between them early in the BPF program?
 	 */
 	ppi_dlt_check = gen_ppi_dlt_check(cstate);
 	if (ppi_dlt_check != NULL)
 		gen_and(ppi_dlt_check, p);
 
 	backpatch(p, gen_retblk(cstate, cstate->snaplen));
 	p->sense = !p->sense;
 	backpatch(p, gen_retblk(cstate, 0));
 	cstate->ic.root = p->head;
 }
 
 void
-gen_and(b0, b1)
-	struct block *b0, *b1;
+gen_and(struct block *b0, struct block *b1)
 {
 	backpatch(b0, b1->head);
 	b0->sense = !b0->sense;
 	b1->sense = !b1->sense;
 	merge(b1, b0);
 	b1->sense = !b1->sense;
 	b1->head = b0->head;
 }
 
 void
-gen_or(b0, b1)
-	struct block *b0, *b1;
+gen_or(struct block *b0, struct block *b1)
 {
 	b0->sense = !b0->sense;
 	backpatch(b0, b1->head);
 	b0->sense = !b0->sense;
 	merge(b1, b0);
 	b1->head = b0->head;
 }
 
 void
-gen_not(b)
-	struct block *b;
+gen_not(struct block *b)
 {
 	b->sense = !b->sense;
 }
 
 static struct block *
 gen_cmp(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v)
 {
 	return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JEQ, 0, v);
 }
 
 static struct block *
 gen_cmp_gt(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v)
 {
 	return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JGT, 0, v);
 }
 
 static struct block *
 gen_cmp_ge(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v)
 {
 	return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JGE, 0, v);
 }
 
 static struct block *
 gen_cmp_lt(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v)
 {
 	return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JGE, 1, v);
 }
 
 static struct block *
 gen_cmp_le(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v)
 {
 	return gen_ncmp(cstate, offrel, offset, size, 0xffffffff, BPF_JGT, 1, v);
 }
 
 static struct block *
 gen_mcmp(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, bpf_int32 v, bpf_u_int32 mask)
 {
 	return gen_ncmp(cstate, offrel, offset, size, mask, BPF_JEQ, 0, v);
 }
 
 static struct block *
 gen_bcmp(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size, const u_char *v)
 {
 	register struct block *b, *tmp;
 
 	b = NULL;
 	while (size >= 4) {
 		register const u_char *p = &v[size - 4];
 		bpf_int32 w = ((bpf_int32)p[0] << 24) |
 		    ((bpf_int32)p[1] << 16) | ((bpf_int32)p[2] << 8) | p[3];
 
 		tmp = gen_cmp(cstate, offrel, offset + size - 4, BPF_W, w);
 		if (b != NULL)
 			gen_and(b, tmp);
 		b = tmp;
 		size -= 4;
 	}
 	while (size >= 2) {
 		register const u_char *p = &v[size - 2];
 		bpf_int32 w = ((bpf_int32)p[0] << 8) | p[1];
 
 		tmp = gen_cmp(cstate, offrel, offset + size - 2, BPF_H, w);
 		if (b != NULL)
 			gen_and(b, tmp);
 		b = tmp;
 		size -= 2;
 	}
 	if (size > 0) {
 		tmp = gen_cmp(cstate, offrel, offset, BPF_B, (bpf_int32)v[0]);
 		if (b != NULL)
 			gen_and(b, tmp);
 		b = tmp;
 	}
 	return b;
 }
 
 /*
  * AND the field of size "size" at offset "offset" relative to the header
  * specified by "offrel" with "mask", and compare it with the value "v"
  * with the test specified by "jtype"; if "reverse" is true, the test
  * should test the opposite of "jtype".
  */
 static struct block *
 gen_ncmp(compiler_state_t *cstate, enum e_offrel offrel, bpf_u_int32 offset,
     bpf_u_int32 size, bpf_u_int32 mask, bpf_u_int32 jtype, int reverse,
     bpf_int32 v)
 {
 	struct slist *s, *s2;
 	struct block *b;
 
 	s = gen_load_a(cstate, offrel, offset, size);
 
 	if (mask != 0xffffffff) {
 		s2 = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_K);
 		s2->s.k = mask;
 		sappend(s, s2);
 	}
 
 	b = new_block(cstate, JMP(jtype));
 	b->stmts = s;
 	b->s.k = v;
 	if (reverse && (jtype == BPF_JGT || jtype == BPF_JGE))
 		gen_not(b);
 	return b;
 }
 
 static void
 init_linktype(compiler_state_t *cstate, pcap_t *p)
 {
 	cstate->pcap_fddipad = p->fddipad;
 
 	/*
 	 * We start out with only one link-layer header.
 	 */
 	cstate->outermostlinktype = pcap_datalink(p);
 	cstate->off_outermostlinkhdr.constant_part = 0;
 	cstate->off_outermostlinkhdr.is_variable = 0;
 	cstate->off_outermostlinkhdr.reg = -1;
 
 	cstate->prevlinktype = cstate->outermostlinktype;
 	cstate->off_prevlinkhdr.constant_part = 0;
 	cstate->off_prevlinkhdr.is_variable = 0;
 	cstate->off_prevlinkhdr.reg = -1;
 
 	cstate->linktype = cstate->outermostlinktype;
 	cstate->off_linkhdr.constant_part = 0;
 	cstate->off_linkhdr.is_variable = 0;
 	cstate->off_linkhdr.reg = -1;
 
 	/*
 	 * XXX
 	 */
 	cstate->off_linkpl.constant_part = 0;
 	cstate->off_linkpl.is_variable = 0;
 	cstate->off_linkpl.reg = -1;
 
 	cstate->off_linktype.constant_part = 0;
 	cstate->off_linktype.is_variable = 0;
 	cstate->off_linktype.reg = -1;
 
 	/*
 	 * Assume it's not raw ATM with a pseudo-header, for now.
 	 */
 	cstate->is_atm = 0;
-	cstate->off_vpi = -1;
-	cstate->off_vci = -1;
-	cstate->off_proto = -1;
-	cstate->off_payload = -1;
+	cstate->off_vpi = OFFSET_NOT_SET;
+	cstate->off_vci = OFFSET_NOT_SET;
+	cstate->off_proto = OFFSET_NOT_SET;
+	cstate->off_payload = OFFSET_NOT_SET;
 
 	/*
 	 * And not Geneve.
 	 */
 	cstate->is_geneve = 0;
 
 	/*
+	 * No variable length VLAN offset by default
+	 */
+	cstate->is_vlan_vloffset = 0;
+
+	/*
 	 * And assume we're not doing SS7.
 	 */
-	cstate->off_li = -1;
-	cstate->off_li_hsl = -1;
-	cstate->off_sio = -1;
-	cstate->off_opc = -1;
-	cstate->off_dpc = -1;
-	cstate->off_sls = -1;
+	cstate->off_li = OFFSET_NOT_SET;
+	cstate->off_li_hsl = OFFSET_NOT_SET;
+	cstate->off_sio = OFFSET_NOT_SET;
+	cstate->off_opc = OFFSET_NOT_SET;
+	cstate->off_dpc = OFFSET_NOT_SET;
+	cstate->off_sls = OFFSET_NOT_SET;
 
 	cstate->label_stack_depth = 0;
 	cstate->vlan_stack_depth = 0;
 
 	switch (cstate->linktype) {
 
 	case DLT_ARCNET:
 		cstate->off_linktype.constant_part = 2;
 		cstate->off_linkpl.constant_part = 6;
-		cstate->off_nl = 0;	/* XXX in reality, variable! */
+		cstate->off_nl = 0;		/* XXX in reality, variable! */
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_ARCNET_LINUX:
 		cstate->off_linktype.constant_part = 4;
 		cstate->off_linkpl.constant_part = 8;
 		cstate->off_nl = 0;		/* XXX in reality, variable! */
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_EN10MB:
 		cstate->off_linktype.constant_part = 12;
 		cstate->off_linkpl.constant_part = 14;	/* Ethernet header length */
 		cstate->off_nl = 0;		/* Ethernet II */
 		cstate->off_nl_nosnap = 3;	/* 802.3+802.2 */
 		break;
 
 	case DLT_SLIP:
 		/*
 		 * SLIP doesn't have a link level type.  The 16 byte
 		 * header is hacked into our SLIP driver.
 		 */
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 16;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_SLIP_BSDOS:
 		/* XXX this may be the same as the DLT_PPP_BSDOS case */
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		/* XXX end */
 		cstate->off_linkpl.constant_part = 24;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_NULL:
 	case DLT_LOOP:
 		cstate->off_linktype.constant_part = 0;
 		cstate->off_linkpl.constant_part = 4;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_ENC:
 		cstate->off_linktype.constant_part = 0;
 		cstate->off_linkpl.constant_part = 12;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_PPP:
 	case DLT_PPP_PPPD:
 	case DLT_C_HDLC:		/* BSD/OS Cisco HDLC */
 	case DLT_PPP_SERIAL:		/* NetBSD sync/async serial PPP */
 		cstate->off_linktype.constant_part = 2;	/* skip HDLC-like framing */
 		cstate->off_linkpl.constant_part = 4;	/* skip HDLC-like framing and protocol field */
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_PPP_ETHER:
 		/*
 		 * This does no include the Ethernet header, and
 		 * only covers session state.
 		 */
 		cstate->off_linktype.constant_part = 6;
 		cstate->off_linkpl.constant_part = 8;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_PPP_BSDOS:
 		cstate->off_linktype.constant_part = 5;
 		cstate->off_linkpl.constant_part = 24;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_FDDI:
 		/*
 		 * FDDI doesn't really have a link-level type field.
 		 * We set "off_linktype" to the offset of the LLC header.
 		 *
 		 * To check for Ethernet types, we assume that SSAP = SNAP
 		 * is being used and pick out the encapsulated Ethernet type.
 		 * XXX - should we generate code to check for SNAP?
 		 */
 		cstate->off_linktype.constant_part = 13;
 		cstate->off_linktype.constant_part += cstate->pcap_fddipad;
 		cstate->off_linkpl.constant_part = 13;	/* FDDI MAC header length */
 		cstate->off_linkpl.constant_part += cstate->pcap_fddipad;
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_IEEE802:
 		/*
 		 * Token Ring doesn't really have a link-level type field.
 		 * We set "off_linktype" to the offset of the LLC header.
 		 *
 		 * To check for Ethernet types, we assume that SSAP = SNAP
 		 * is being used and pick out the encapsulated Ethernet type.
 		 * XXX - should we generate code to check for SNAP?
 		 *
 		 * XXX - the header is actually variable-length.
 		 * Some various Linux patched versions gave 38
 		 * as "off_linktype" and 40 as "off_nl"; however,
 		 * if a token ring packet has *no* routing
 		 * information, i.e. is not source-routed, the correct
 		 * values are 20 and 22, as they are in the vanilla code.
 		 *
 		 * A packet is source-routed iff the uppermost bit
 		 * of the first byte of the source address, at an
 		 * offset of 8, has the uppermost bit set.  If the
 		 * packet is source-routed, the total number of bytes
 		 * of routing information is 2 plus bits 0x1F00 of
 		 * the 16-bit value at an offset of 14 (shifted right
 		 * 8 - figure out which byte that is).
 		 */
 		cstate->off_linktype.constant_part = 14;
 		cstate->off_linkpl.constant_part = 14;	/* Token Ring MAC header length */
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 		cstate->off_linkhdr.is_variable = 1;
 		/* Fall through, 802.11 doesn't have a variable link
 		 * prefix but is otherwise the same. */
 
 	case DLT_IEEE802_11:
 		/*
 		 * 802.11 doesn't really have a link-level type field.
 		 * We set "off_linktype.constant_part" to the offset of
 		 * the LLC header.
 		 *
 		 * To check for Ethernet types, we assume that SSAP = SNAP
 		 * is being used and pick out the encapsulated Ethernet type.
 		 * XXX - should we generate code to check for SNAP?
 		 *
 		 * We also handle variable-length radio headers here.
 		 * The Prism header is in theory variable-length, but in
 		 * practice it's always 144 bytes long.  However, some
 		 * drivers on Linux use ARPHRD_IEEE80211_PRISM, but
 		 * sometimes or always supply an AVS header, so we
 		 * have to check whether the radio header is a Prism
 		 * header or an AVS header, so, in practice, it's
 		 * variable-length.
 		 */
 		cstate->off_linktype.constant_part = 24;
 		cstate->off_linkpl.constant_part = 0;	/* link-layer header is variable-length */
 		cstate->off_linkpl.is_variable = 1;
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_PPI:
 		/*
 		 * At the moment we treat PPI the same way that we treat
 		 * normal Radiotap encoded packets. The difference is in
 		 * the function that generates the code at the beginning
 		 * to compute the header length.  Since this code generator
 		 * of PPI supports bare 802.11 encapsulation only (i.e.
 		 * the encapsulated DLT should be DLT_IEEE802_11) we
 		 * generate code to check for this too.
 		 */
 		cstate->off_linktype.constant_part = 24;
 		cstate->off_linkpl.constant_part = 0;	/* link-layer header is variable-length */
 		cstate->off_linkpl.is_variable = 1;
 		cstate->off_linkhdr.is_variable = 1;
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_ATM_RFC1483:
 	case DLT_ATM_CLIP:	/* Linux ATM defines this */
 		/*
 		 * assume routed, non-ISO PDUs
 		 * (i.e., LLC = 0xAA-AA-03, OUT = 0x00-00-00)
 		 *
 		 * XXX - what about ISO PDUs, e.g. CLNP, ISIS, ESIS,
 		 * or PPP with the PPP NLPID (e.g., PPPoA)?  The
 		 * latter would presumably be treated the way PPPoE
 		 * should be, so you can do "pppoe and udp port 2049"
 		 * or "pppoa and tcp port 80" and have it check for
 		 * PPPo{A,E} and a PPP protocol of IP and....
 		 */
 		cstate->off_linktype.constant_part = 0;
 		cstate->off_linkpl.constant_part = 0;	/* packet begins with LLC header */
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_SUNATM:
 		/*
 		 * Full Frontal ATM; you get AALn PDUs with an ATM
 		 * pseudo-header.
 		 */
 		cstate->is_atm = 1;
 		cstate->off_vpi = SUNATM_VPI_POS;
 		cstate->off_vci = SUNATM_VCI_POS;
 		cstate->off_proto = PROTO_POS;
 		cstate->off_payload = SUNATM_PKT_BEGIN_POS;
 		cstate->off_linktype.constant_part = cstate->off_payload;
 		cstate->off_linkpl.constant_part = cstate->off_payload;	/* if LLC-encapsulated */
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_RAW:
 	case DLT_IPV4:
 	case DLT_IPV6:
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 0;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_LINUX_SLL:	/* fake header for Linux cooked socket */
 		cstate->off_linktype.constant_part = 14;
 		cstate->off_linkpl.constant_part = 16;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_LTALK:
 		/*
 		 * LocalTalk does have a 1-byte type field in the LLAP header,
 		 * but really it just indicates whether there is a "short" or
 		 * "long" DDP packet following.
 		 */
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 0;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_IP_OVER_FC:
 		/*
 		 * RFC 2625 IP-over-Fibre-Channel doesn't really have a
 		 * link-level type field.  We set "off_linktype" to the
 		 * offset of the LLC header.
 		 *
 		 * To check for Ethernet types, we assume that SSAP = SNAP
 		 * is being used and pick out the encapsulated Ethernet type.
 		 * XXX - should we generate code to check for SNAP? RFC
 		 * 2625 says SNAP should be used.
 		 */
 		cstate->off_linktype.constant_part = 16;
 		cstate->off_linkpl.constant_part = 16;
 		cstate->off_nl = 8;		/* 802.2+SNAP */
 		cstate->off_nl_nosnap = 3;	/* 802.2 */
 		break;
 
 	case DLT_FRELAY:
 		/*
 		 * XXX - we should set this to handle SNAP-encapsulated
 		 * frames (NLPID of 0x80).
 		 */
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 0;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
                 /*
                  * the only BPF-interesting FRF.16 frames are non-control frames;
                  * Frame Relay has a variable length link-layer
                  * so lets start with offset 4 for now and increments later on (FIXME);
                  */
 	case DLT_MFR:
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 0;
 		cstate->off_nl = 4;
 		cstate->off_nl_nosnap = 0;	/* XXX - for now -> no 802.2 LLC */
 		break;
 
 	case DLT_APPLE_IP_OVER_IEEE1394:
 		cstate->off_linktype.constant_part = 16;
 		cstate->off_linkpl.constant_part = 18;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 
 	case DLT_SYMANTEC_FIREWALL:
 		cstate->off_linktype.constant_part = 6;
 		cstate->off_linkpl.constant_part = 44;
 		cstate->off_nl = 0;		/* Ethernet II */
 		cstate->off_nl_nosnap = 0;	/* XXX - what does it do with 802.3 packets? */
 		break;
 
 #ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		cstate->off_linktype.constant_part = 0;
 		cstate->off_linkpl.constant_part = PFLOG_HDRLEN;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 		break;
 #endif
 
         case DLT_JUNIPER_MFR:
         case DLT_JUNIPER_MLFR:
         case DLT_JUNIPER_MLPPP:
         case DLT_JUNIPER_PPP:
         case DLT_JUNIPER_CHDLC:
         case DLT_JUNIPER_FRELAY:
 		cstate->off_linktype.constant_part = 4;
 		cstate->off_linkpl.constant_part = 4;
 		cstate->off_nl = 0;
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
                 break;
 
 	case DLT_JUNIPER_ATM1:
 		cstate->off_linktype.constant_part = 4;		/* in reality variable between 4-8 */
 		cstate->off_linkpl.constant_part = 4;	/* in reality variable between 4-8 */
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 10;
 		break;
 
 	case DLT_JUNIPER_ATM2:
 		cstate->off_linktype.constant_part = 8;		/* in reality variable between 8-12 */
 		cstate->off_linkpl.constant_part = 8;	/* in reality variable between 8-12 */
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 10;
 		break;
 
 		/* frames captured on a Juniper PPPoE service PIC
 		 * contain raw ethernet frames */
 	case DLT_JUNIPER_PPPOE:
         case DLT_JUNIPER_ETHER:
 		cstate->off_linkpl.constant_part = 14;
 		cstate->off_linktype.constant_part = 16;
 		cstate->off_nl = 18;		/* Ethernet II */
 		cstate->off_nl_nosnap = 21;	/* 802.3+802.2 */
 		break;
 
 	case DLT_JUNIPER_PPPOE_ATM:
 		cstate->off_linktype.constant_part = 4;
 		cstate->off_linkpl.constant_part = 6;
 		cstate->off_nl = 0;
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_JUNIPER_GGSN:
 		cstate->off_linktype.constant_part = 6;
 		cstate->off_linkpl.constant_part = 12;
 		cstate->off_nl = 0;
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_JUNIPER_ES:
 		cstate->off_linktype.constant_part = 6;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;	/* not really a network layer but raw IP addresses */
-		cstate->off_nl = -1;		/* not really a network layer but raw IP addresses */
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl = OFFSET_NOT_SET;	/* not really a network layer but raw IP addresses */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_JUNIPER_MONITOR:
 		cstate->off_linktype.constant_part = 12;
 		cstate->off_linkpl.constant_part = 12;
-		cstate->off_nl = 0;		/* raw IP/IP6 header */
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl = 0;			/* raw IP/IP6 header */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_BACNET_MS_TP:
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_JUNIPER_SERVICES:
 		cstate->off_linktype.constant_part = 12;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;	/* L3 proto location dep. on cookie type */
-		cstate->off_nl = -1;		/* L3 proto location dep. on cookie type */
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl = OFFSET_NOT_SET;	/* L3 proto location dep. on cookie type */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_JUNIPER_VP:
 		cstate->off_linktype.constant_part = 18;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_JUNIPER_ST:
 		cstate->off_linktype.constant_part = 18;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_JUNIPER_ISM:
 		cstate->off_linktype.constant_part = 8;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_JUNIPER_VS:
 	case DLT_JUNIPER_SRX_E2E:
 	case DLT_JUNIPER_FIBRECHANNEL:
 	case DLT_JUNIPER_ATM_CEMIC:
 		cstate->off_linktype.constant_part = 8;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_MTP2:
 		cstate->off_li = 2;
 		cstate->off_li_hsl = 4;
 		cstate->off_sio = 3;
 		cstate->off_opc = 4;
 		cstate->off_dpc = 4;
 		cstate->off_sls = 7;
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_MTP2_WITH_PHDR:
 		cstate->off_li = 6;
 		cstate->off_li_hsl = 8;
 		cstate->off_sio = 7;
 		cstate->off_opc = 8;
 		cstate->off_dpc = 8;
 		cstate->off_sls = 11;
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_ERF:
 		cstate->off_li = 22;
 		cstate->off_li_hsl = 24;
 		cstate->off_sio = 23;
 		cstate->off_opc = 24;
 		cstate->off_dpc = 24;
 		cstate->off_sls = 27;
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl = OFFSET_NOT_SET;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_PFSYNC:
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 		cstate->off_linkpl.constant_part = 4;
 		cstate->off_nl = 0;
 		cstate->off_nl_nosnap = 0;
 		break;
 
 	case DLT_AX25_KISS:
 		/*
 		 * Currently, only raw "link[N:M]" filtering is supported.
 		 */
 		cstate->off_linktype.constant_part = OFFSET_NOT_SET;	/* variable, min 15, max 71 steps of 7 */
 		cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-		cstate->off_nl = -1;		/* variable, min 16, max 71 steps of 7 */
-		cstate->off_nl_nosnap = -1;	/* no 802.2 LLC */
+		cstate->off_nl = OFFSET_NOT_SET;	/* variable, min 16, max 71 steps of 7 */
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;	/* no 802.2 LLC */
 		break;
 
 	case DLT_IPNET:
 		cstate->off_linktype.constant_part = 1;
 		cstate->off_linkpl.constant_part = 24;	/* ipnet header length */
 		cstate->off_nl = 0;
-		cstate->off_nl_nosnap = -1;
+		cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		break;
 
 	case DLT_NETANALYZER:
 		cstate->off_linkhdr.constant_part = 4;	/* Ethernet header is past 4-byte pseudo-header */
 		cstate->off_linktype.constant_part = cstate->off_linkhdr.constant_part + 12;
 		cstate->off_linkpl.constant_part = cstate->off_linkhdr.constant_part + 14;	/* pseudo-header+Ethernet header length */
 		cstate->off_nl = 0;		/* Ethernet II */
 		cstate->off_nl_nosnap = 3;	/* 802.3+802.2 */
 		break;
 
 	case DLT_NETANALYZER_TRANSPARENT:
 		cstate->off_linkhdr.constant_part = 12;	/* MAC header is past 4-byte pseudo-header, preamble, and SFD */
 		cstate->off_linktype.constant_part = cstate->off_linkhdr.constant_part + 12;
 		cstate->off_linkpl.constant_part = cstate->off_linkhdr.constant_part + 14;	/* pseudo-header+preamble+SFD+Ethernet header length */
 		cstate->off_nl = 0;		/* Ethernet II */
 		cstate->off_nl_nosnap = 3;	/* 802.3+802.2 */
 		break;
 
 	default:
 		/*
 		 * For values in the range in which we've assigned new
 		 * DLT_ values, only raw "link[N:M]" filtering is supported.
 		 */
 		if (cstate->linktype >= DLT_MATCHING_MIN &&
 		    cstate->linktype <= DLT_MATCHING_MAX) {
 			cstate->off_linktype.constant_part = OFFSET_NOT_SET;
 			cstate->off_linkpl.constant_part = OFFSET_NOT_SET;
-			cstate->off_nl = -1;
-			cstate->off_nl_nosnap = -1;
+			cstate->off_nl = OFFSET_NOT_SET;
+			cstate->off_nl_nosnap = OFFSET_NOT_SET;
 		} else {
 			bpf_error(cstate, "unknown data link type %d", cstate->linktype);
 		}
 		break;
 	}
 
 	cstate->off_outermostlinkhdr = cstate->off_prevlinkhdr = cstate->off_linkhdr;
 }
 
 /*
  * Load a value relative to the specified absolute offset.
  */
 static struct slist *
 gen_load_absoffsetrel(compiler_state_t *cstate, bpf_abs_offset *abs_offset,
     u_int offset, u_int size)
 {
 	struct slist *s, *s2;
 
 	s = gen_abs_offset_varpart(cstate, abs_offset);
 
 	/*
 	 * If "s" is non-null, it has code to arrange that the X register
 	 * contains the variable part of the absolute offset, so we
 	 * generate a load relative to that, with an offset of
 	 * abs_offset->constant_part + offset.
 	 *
 	 * Otherwise, we can do an absolute load with an offset of
 	 * abs_offset->constant_part + offset.
 	 */
 	if (s != NULL) {
 		/*
 		 * "s" points to a list of statements that puts the
 		 * variable part of the absolute offset into the X register.
 		 * Do an indirect load, to use the X register as an offset.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_IND|size);
 		s2->s.k = abs_offset->constant_part + offset;
 		sappend(s, s2);
 	} else {
 		/*
 		 * There is no variable part of the absolute offset, so
 		 * just do an absolute load.
 		 */
 		s = new_stmt(cstate, BPF_LD|BPF_ABS|size);
 		s->s.k = abs_offset->constant_part + offset;
 	}
 	return s;
 }
 
 /*
  * Load a value relative to the beginning of the specified header.
  */
 static struct slist *
 gen_load_a(compiler_state_t *cstate, enum e_offrel offrel, u_int offset,
     u_int size)
 {
 	struct slist *s, *s2;
 
 	switch (offrel) {
 
 	case OR_PACKET:
                 s = new_stmt(cstate, BPF_LD|BPF_ABS|size);
                 s->s.k = offset;
 		break;
 
 	case OR_LINKHDR:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkhdr, offset, size);
 		break;
 
 	case OR_PREVLINKHDR:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_prevlinkhdr, offset, size);
 		break;
 
 	case OR_LLC:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkpl, offset, size);
 		break;
 
 	case OR_PREVMPLSHDR:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkpl, cstate->off_nl - 4 + offset, size);
 		break;
 
 	case OR_LINKPL:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkpl, cstate->off_nl + offset, size);
 		break;
 
 	case OR_LINKPL_NOSNAP:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkpl, cstate->off_nl_nosnap + offset, size);
 		break;
 
 	case OR_LINKTYPE:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linktype, offset, size);
 		break;
 
 	case OR_TRAN_IPV4:
 		/*
 		 * Load the X register with the length of the IPv4 header
 		 * (plus the offset of the link-layer header, if it's
 		 * preceded by a variable-length header such as a radio
 		 * header), in bytes.
 		 */
 		s = gen_loadx_iphdrlen(cstate);
 
 		/*
 		 * Load the item at {offset of the link-layer payload} +
 		 * {offset, relative to the start of the link-layer
 		 * paylod, of the IPv4 header} + {length of the IPv4 header} +
 		 * {specified offset}.
 		 *
 		 * If the offset of the link-layer payload is variable,
 		 * the variable part of that offset is included in the
 		 * value in the X register, and we include the constant
 		 * part in the offset of the load.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_IND|size);
 		s2->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + offset;
 		sappend(s, s2);
 		break;
 
 	case OR_TRAN_IPV6:
 		s = gen_load_absoffsetrel(cstate, &cstate->off_linkpl, cstate->off_nl + 40 + offset, size);
 		break;
 
 	default:
 		abort();
-		return NULL;
+		/* NOTREACHED */
 	}
 	return s;
 }
 
 /*
  * Generate code to load into the X register the sum of the length of
  * the IPv4 header and the variable part of the offset of the link-layer
  * payload.
  */
 static struct slist *
 gen_loadx_iphdrlen(compiler_state_t *cstate)
 {
 	struct slist *s, *s2;
 
 	s = gen_abs_offset_varpart(cstate, &cstate->off_linkpl);
 	if (s != NULL) {
 		/*
 		 * The offset of the link-layer payload has a variable
 		 * part.  "s" points to a list of statements that put
 		 * the variable part of that offset into the X register.
 		 *
 		 * The 4*([k]&0xf) addressing mode can't be used, as we
 		 * don't have a constant offset, so we have to load the
 		 * value in question into the A register and add to it
 		 * the value from the X register.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 		s2->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 		sappend(s, s2);
 		s2 = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_K);
 		s2->s.k = 0xf;
 		sappend(s, s2);
 		s2 = new_stmt(cstate, BPF_ALU|BPF_LSH|BPF_K);
 		s2->s.k = 2;
 		sappend(s, s2);
 
 		/*
 		 * The A register now contains the length of the IP header.
 		 * We need to add to it the variable part of the offset of
 		 * the link-layer payload, which is still in the X
 		 * register, and move the result into the X register.
 		 */
 		sappend(s, new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X));
 		sappend(s, new_stmt(cstate, BPF_MISC|BPF_TAX));
 	} else {
 		/*
 		 * The offset of the link-layer payload is a constant,
 		 * so no code was generated to load the (non-existent)
 		 * variable part of that offset.
 		 *
 		 * This means we can use the 4*([k]&0xf) addressing
 		 * mode.  Load the length of the IPv4 header, which
 		 * is at an offset of cstate->off_nl from the beginning of
 		 * the link-layer payload, and thus at an offset of
 		 * cstate->off_linkpl.constant_part + cstate->off_nl from the beginning
 		 * of the raw packet data, using that addressing mode.
 		 */
 		s = new_stmt(cstate, BPF_LDX|BPF_MSH|BPF_B);
 		s->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 	}
 	return s;
 }
 
+
 static struct block *
 gen_uncond(compiler_state_t *cstate, int rsense)
 {
 	struct block *b;
 	struct slist *s;
 
 	s = new_stmt(cstate, BPF_LD|BPF_IMM);
 	s->s.k = !rsense;
 	b = new_block(cstate, JMP(BPF_JEQ));
 	b->stmts = s;
 
 	return b;
 }
 
 static inline struct block *
 gen_true(compiler_state_t *cstate)
 {
 	return gen_uncond(cstate, 1);
 }
 
 static inline struct block *
 gen_false(compiler_state_t *cstate)
 {
 	return gen_uncond(cstate, 0);
 }
 
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
  * big-endian platforms.)
  */
 #define	SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 /*
  * Generate code to match a particular packet type.
  *
  * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
  * value, if <= ETHERMTU.  We use that to determine whether to
  * match the type/length field or to check the type/length field for
  * a value <= ETHERMTU to see whether it's a type field and then do
  * the appropriate test.
  */
 static struct block *
 gen_ether_linktype(compiler_state_t *cstate, int proto)
 {
 	struct block *b0, *b1;
 
 	switch (proto) {
 
 	case LLCSAP_ISONS:
 	case LLCSAP_IP:
 	case LLCSAP_NETBEUI:
 		/*
 		 * OSI protocols and NetBEUI always use 802.2 encapsulation,
 		 * so we check the DSAP and SSAP.
 		 *
 		 * LLCSAP_IP checks for IP-over-802.2, rather
 		 * than IP-over-Ethernet or IP-over-SNAP.
 		 *
 		 * XXX - should we check both the DSAP and the
 		 * SSAP, like this, or should we check just the
 		 * DSAP, as we do for other types <= ETHERMTU
 		 * (i.e., other SAP values)?
 		 */
 		b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
 		gen_not(b0);
 		b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, (bpf_int32)
 			     ((proto << 8) | proto));
 		gen_and(b0, b1);
 		return b1;
 
 	case LLCSAP_IPX:
 		/*
 		 * Check for;
 		 *
 		 *	Ethernet_II frames, which are Ethernet
 		 *	frames with a frame type of ETHERTYPE_IPX;
 		 *
 		 *	Ethernet_802.3 frames, which are 802.3
 		 *	frames (i.e., the type/length field is
 		 *	a length field, <= ETHERMTU, rather than
 		 *	a type field) with the first two bytes
 		 *	after the Ethernet/802.3 header being
 		 *	0xFFFF;
 		 *
 		 *	Ethernet_802.2 frames, which are 802.3
 		 *	frames with an 802.2 LLC header and
 		 *	with the IPX LSAP as the DSAP in the LLC
 		 *	header;
 		 *
 		 *	Ethernet_SNAP frames, which are 802.3
 		 *	frames with an LLC header and a SNAP
 		 *	header and with an OUI of 0x000000
 		 *	(encapsulated Ethernet) and a protocol
 		 *	ID of ETHERTYPE_IPX in the SNAP header.
 		 *
 		 * XXX - should we generate the same code both
 		 * for tests for LLCSAP_IPX and for ETHERTYPE_IPX?
 		 */
 
 		/*
 		 * This generates code to check both for the
 		 * IPX LSAP (Ethernet_802.2) and for Ethernet_802.3.
 		 */
 		b0 = gen_cmp(cstate, OR_LLC, 0, BPF_B, (bpf_int32)LLCSAP_IPX);
 		b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, (bpf_int32)0xFFFF);
 		gen_or(b0, b1);
 
 		/*
 		 * Now we add code to check for SNAP frames with
 		 * ETHERTYPE_IPX, i.e. Ethernet_SNAP.
 		 */
 		b0 = gen_snap(cstate, 0x000000, ETHERTYPE_IPX);
 		gen_or(b0, b1);
 
 		/*
 		 * Now we generate code to check for 802.3
 		 * frames in general.
 		 */
 		b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
 		gen_not(b0);
 
 		/*
 		 * Now add the check for 802.3 frames before the
 		 * check for Ethernet_802.2 and Ethernet_802.3,
 		 * as those checks should only be done on 802.3
 		 * frames, not on Ethernet frames.
 		 */
 		gen_and(b0, b1);
 
 		/*
 		 * Now add the check for Ethernet_II frames, and
 		 * do that before checking for the other frame
 		 * types.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)ETHERTYPE_IPX);
 		gen_or(b0, b1);
 		return b1;
 
 	case ETHERTYPE_ATALK:
 	case ETHERTYPE_AARP:
 		/*
 		 * EtherTalk (AppleTalk protocols on Ethernet link
 		 * layer) may use 802.2 encapsulation.
 		 */
 
 		/*
 		 * Check for 802.2 encapsulation (EtherTalk phase 2?);
 		 * we check for an Ethernet type field less than
 		 * 1500, which means it's an 802.3 length field.
 		 */
 		b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
 		gen_not(b0);
 
 		/*
 		 * 802.2-encapsulated ETHERTYPE_ATALK packets are
 		 * SNAP packets with an organization code of
 		 * 0x080007 (Apple, for Appletalk) and a protocol
 		 * type of ETHERTYPE_ATALK (Appletalk).
 		 *
 		 * 802.2-encapsulated ETHERTYPE_AARP packets are
 		 * SNAP packets with an organization code of
 		 * 0x000000 (encapsulated Ethernet) and a protocol
 		 * type of ETHERTYPE_AARP (Appletalk ARP).
 		 */
 		if (proto == ETHERTYPE_ATALK)
 			b1 = gen_snap(cstate, 0x080007, ETHERTYPE_ATALK);
 		else	/* proto == ETHERTYPE_AARP */
 			b1 = gen_snap(cstate, 0x000000, ETHERTYPE_AARP);
 		gen_and(b0, b1);
 
 		/*
 		 * Check for Ethernet encapsulation (Ethertalk
 		 * phase 1?); we just check for the Ethernet
 		 * protocol type.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 
 		gen_or(b0, b1);
 		return b1;
 
 	default:
 		if (proto <= ETHERMTU) {
 			/*
 			 * This is an LLC SAP value, so the frames
 			 * that match would be 802.2 frames.
 			 * Check that the frame is an 802.2 frame
 			 * (i.e., that the length/type field is
 			 * a length field, <= ETHERMTU) and
 			 * then check the DSAP.
 			 */
 			b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
 			gen_not(b0);
 			b1 = gen_cmp(cstate, OR_LINKTYPE, 2, BPF_B, (bpf_int32)proto);
 			gen_and(b0, b1);
 			return b1;
 		} else {
 			/*
 			 * This is an Ethernet type, so compare
 			 * the length/type field with it (if
 			 * the frame is an 802.2 frame, the length
 			 * field will be <= ETHERMTU, and, as
 			 * "proto" is > ETHERMTU, this test
 			 * will fail and the frame won't match,
 			 * which is what we want).
 			 */
 			return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H,
 			    (bpf_int32)proto);
 		}
 	}
 }
 
 static struct block *
 gen_loopback_linktype(compiler_state_t *cstate, int proto)
 {
 	/*
 	 * For DLT_NULL, the link-layer header is a 32-bit word
 	 * containing an AF_ value in *host* byte order, and for
 	 * DLT_ENC, the link-layer header begins with a 32-bit
 	 * word containing an AF_ value in host byte order.
 	 *
 	 * In addition, if we're reading a saved capture file,
 	 * the host byte order in the capture may not be the
 	 * same as the host byte order on this machine.
 	 *
 	 * For DLT_LOOP, the link-layer header is a 32-bit
 	 * word containing an AF_ value in *network* byte order.
 	 */
 	if (cstate->linktype == DLT_NULL || cstate->linktype == DLT_ENC) {
 		/*
 		 * The AF_ value is in host byte order, but the BPF
 		 * interpreter will convert it to network byte order.
 		 *
 		 * If this is a save file, and it's from a machine
 		 * with the opposite byte order to ours, we byte-swap
 		 * the AF_ value.
 		 *
 		 * Then we run it through "htonl()", and generate
 		 * code to compare against the result.
 		 */
 		if (cstate->bpf_pcap->rfile != NULL && cstate->bpf_pcap->swapped)
 			proto = SWAPLONG(proto);
 		proto = htonl(proto);
 	}
 	return (gen_cmp(cstate, OR_LINKHDR, 0, BPF_W, (bpf_int32)proto));
 }
 
 /*
  * "proto" is an Ethernet type value and for IPNET, if it is not IPv4
  * or IPv6 then we have an error.
  */
 static struct block *
 gen_ipnet_linktype(compiler_state_t *cstate, int proto)
 {
 	switch (proto) {
 
 	case ETHERTYPE_IP:
 		return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B, (bpf_int32)IPH_AF_INET);
 		/* NOTREACHED */
 
 	case ETHERTYPE_IPV6:
 		return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 		    (bpf_int32)IPH_AF_INET6);
 		/* NOTREACHED */
 
 	default:
 		break;
 	}
 
 	return gen_false(cstate);
 }
 
 /*
  * Generate code to match a particular packet type.
  *
  * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
  * value, if <= ETHERMTU.  We use that to determine whether to
  * match the type field or to check the type field for the special
  * LINUX_SLL_P_802_2 value and then do the appropriate test.
  */
 static struct block *
 gen_linux_sll_linktype(compiler_state_t *cstate, int proto)
 {
 	struct block *b0, *b1;
 
 	switch (proto) {
 
 	case LLCSAP_ISONS:
 	case LLCSAP_IP:
 	case LLCSAP_NETBEUI:
 		/*
 		 * OSI protocols and NetBEUI always use 802.2 encapsulation,
 		 * so we check the DSAP and SSAP.
 		 *
 		 * LLCSAP_IP checks for IP-over-802.2, rather
 		 * than IP-over-Ethernet or IP-over-SNAP.
 		 *
 		 * XXX - should we check both the DSAP and the
 		 * SSAP, like this, or should we check just the
 		 * DSAP, as we do for other types <= ETHERMTU
 		 * (i.e., other SAP values)?
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, LINUX_SLL_P_802_2);
 		b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, (bpf_int32)
 			     ((proto << 8) | proto));
 		gen_and(b0, b1);
 		return b1;
 
 	case LLCSAP_IPX:
 		/*
 		 *	Ethernet_II frames, which are Ethernet
 		 *	frames with a frame type of ETHERTYPE_IPX;
 		 *
 		 *	Ethernet_802.3 frames, which have a frame
 		 *	type of LINUX_SLL_P_802_3;
 		 *
 		 *	Ethernet_802.2 frames, which are 802.3
 		 *	frames with an 802.2 LLC header (i.e, have
 		 *	a frame type of LINUX_SLL_P_802_2) and
 		 *	with the IPX LSAP as the DSAP in the LLC
 		 *	header;
 		 *
 		 *	Ethernet_SNAP frames, which are 802.3
 		 *	frames with an LLC header and a SNAP
 		 *	header and with an OUI of 0x000000
 		 *	(encapsulated Ethernet) and a protocol
 		 *	ID of ETHERTYPE_IPX in the SNAP header.
 		 *
 		 * First, do the checks on LINUX_SLL_P_802_2
 		 * frames; generate the check for either
 		 * Ethernet_802.2 or Ethernet_SNAP frames, and
 		 * then put a check for LINUX_SLL_P_802_2 frames
 		 * before it.
 		 */
 		b0 = gen_cmp(cstate, OR_LLC, 0, BPF_B, (bpf_int32)LLCSAP_IPX);
 		b1 = gen_snap(cstate, 0x000000, ETHERTYPE_IPX);
 		gen_or(b0, b1);
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, LINUX_SLL_P_802_2);
 		gen_and(b0, b1);
 
 		/*
 		 * Now check for 802.3 frames and OR that with
 		 * the previous test.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, LINUX_SLL_P_802_3);
 		gen_or(b0, b1);
 
 		/*
 		 * Now add the check for Ethernet_II frames, and
 		 * do that before checking for the other frame
 		 * types.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)ETHERTYPE_IPX);
 		gen_or(b0, b1);
 		return b1;
 
 	case ETHERTYPE_ATALK:
 	case ETHERTYPE_AARP:
 		/*
 		 * EtherTalk (AppleTalk protocols on Ethernet link
 		 * layer) may use 802.2 encapsulation.
 		 */
 
 		/*
 		 * Check for 802.2 encapsulation (EtherTalk phase 2?);
 		 * we check for the 802.2 protocol type in the
 		 * "Ethernet type" field.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, LINUX_SLL_P_802_2);
 
 		/*
 		 * 802.2-encapsulated ETHERTYPE_ATALK packets are
 		 * SNAP packets with an organization code of
 		 * 0x080007 (Apple, for Appletalk) and a protocol
 		 * type of ETHERTYPE_ATALK (Appletalk).
 		 *
 		 * 802.2-encapsulated ETHERTYPE_AARP packets are
 		 * SNAP packets with an organization code of
 		 * 0x000000 (encapsulated Ethernet) and a protocol
 		 * type of ETHERTYPE_AARP (Appletalk ARP).
 		 */
 		if (proto == ETHERTYPE_ATALK)
 			b1 = gen_snap(cstate, 0x080007, ETHERTYPE_ATALK);
 		else	/* proto == ETHERTYPE_AARP */
 			b1 = gen_snap(cstate, 0x000000, ETHERTYPE_AARP);
 		gen_and(b0, b1);
 
 		/*
 		 * Check for Ethernet encapsulation (Ethertalk
 		 * phase 1?); we just check for the Ethernet
 		 * protocol type.
 		 */
 		b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 
 		gen_or(b0, b1);
 		return b1;
 
 	default:
 		if (proto <= ETHERMTU) {
 			/*
 			 * This is an LLC SAP value, so the frames
 			 * that match would be 802.2 frames.
 			 * Check for the 802.2 protocol type
 			 * in the "Ethernet type" field, and
 			 * then check the DSAP.
 			 */
 			b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, LINUX_SLL_P_802_2);
 			b1 = gen_cmp(cstate, OR_LINKHDR, cstate->off_linkpl.constant_part, BPF_B,
 			     (bpf_int32)proto);
 			gen_and(b0, b1);
 			return b1;
 		} else {
 			/*
 			 * This is an Ethernet type, so compare
 			 * the length/type field with it (if
 			 * the frame is an 802.2 frame, the length
 			 * field will be <= ETHERMTU, and, as
 			 * "proto" is > ETHERMTU, this test
 			 * will fail and the frame won't match,
 			 * which is what we want).
 			 */
 			return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 		}
 	}
 }
 
 static struct slist *
 gen_load_prism_llprefixlen(compiler_state_t *cstate)
 {
 	struct slist *s1, *s2;
 	struct slist *sjeq_avs_cookie;
 	struct slist *sjcommon;
 
 	/*
 	 * This code is not compatible with the optimizer, as
 	 * we are generating jmp instructions within a normal
 	 * slist of instructions
 	 */
 	cstate->no_optimize = 1;
 
 	/*
 	 * Generate code to load the length of the radio header into
 	 * the register assigned to hold that length, if one has been
 	 * assigned.  (If one hasn't been assigned, no code we've
 	 * generated uses that prefix, so we don't need to generate any
 	 * code to load it.)
 	 *
 	 * Some Linux drivers use ARPHRD_IEEE80211_PRISM but sometimes
 	 * or always use the AVS header rather than the Prism header.
 	 * We load a 4-byte big-endian value at the beginning of the
 	 * raw packet data, and see whether, when masked with 0xFFFFF000,
 	 * it's equal to 0x80211000.  If so, that indicates that it's
 	 * an AVS header (the masked-out bits are the version number).
 	 * Otherwise, it's a Prism header.
 	 *
 	 * XXX - the Prism header is also, in theory, variable-length,
 	 * but no known software generates headers that aren't 144
 	 * bytes long.
 	 */
 	if (cstate->off_linkhdr.reg != -1) {
 		/*
 		 * Load the cookie.
 		 */
 		s1 = new_stmt(cstate, BPF_LD|BPF_W|BPF_ABS);
 		s1->s.k = 0;
 
 		/*
 		 * AND it with 0xFFFFF000.
 		 */
 		s2 = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_K);
 		s2->s.k = 0xFFFFF000;
 		sappend(s1, s2);
 
 		/*
 		 * Compare with 0x80211000.
 		 */
 		sjeq_avs_cookie = new_stmt(cstate, JMP(BPF_JEQ));
 		sjeq_avs_cookie->s.k = 0x80211000;
 		sappend(s1, sjeq_avs_cookie);
 
 		/*
 		 * If it's AVS:
 		 *
 		 * The 4 bytes at an offset of 4 from the beginning of
 		 * the AVS header are the length of the AVS header.
 		 * That field is big-endian.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_W|BPF_ABS);
 		s2->s.k = 4;
 		sappend(s1, s2);
 		sjeq_avs_cookie->s.jt = s2;
 
 		/*
 		 * Now jump to the code to allocate a register
 		 * into which to save the header length and
 		 * store the length there.  (The "jump always"
 		 * instruction needs to have the k field set;
 		 * it's added to the PC, so, as we're jumping
 		 * over a single instruction, it should be 1.)
 		 */
 		sjcommon = new_stmt(cstate, JMP(BPF_JA));
 		sjcommon->s.k = 1;
 		sappend(s1, sjcommon);
 
 		/*
 		 * Now for the code that handles the Prism header.
 		 * Just load the length of the Prism header (144)
 		 * into the A register.  Have the test for an AVS
 		 * header branch here if we don't have an AVS header.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_W|BPF_IMM);
 		s2->s.k = 144;
 		sappend(s1, s2);
 		sjeq_avs_cookie->s.jf = s2;
 
 		/*
 		 * Now allocate a register to hold that value and store
 		 * it.  The code for the AVS header will jump here after
 		 * loading the length of the AVS header.
 		 */
 		s2 = new_stmt(cstate, BPF_ST);
 		s2->s.k = cstate->off_linkhdr.reg;
 		sappend(s1, s2);
 		sjcommon->s.jf = s2;
 
 		/*
 		 * Now move it into the X register.
 		 */
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		return (s1);
 	} else
 		return (NULL);
 }
 
 static struct slist *
 gen_load_avs_llprefixlen(compiler_state_t *cstate)
 {
 	struct slist *s1, *s2;
 
 	/*
 	 * Generate code to load the length of the AVS header into
 	 * the register assigned to hold that length, if one has been
 	 * assigned.  (If one hasn't been assigned, no code we've
 	 * generated uses that prefix, so we don't need to generate any
 	 * code to load it.)
 	 */
 	if (cstate->off_linkhdr.reg != -1) {
 		/*
 		 * The 4 bytes at an offset of 4 from the beginning of
 		 * the AVS header are the length of the AVS header.
 		 * That field is big-endian.
 		 */
 		s1 = new_stmt(cstate, BPF_LD|BPF_W|BPF_ABS);
 		s1->s.k = 4;
 
 		/*
 		 * Now allocate a register to hold that value and store
 		 * it.
 		 */
 		s2 = new_stmt(cstate, BPF_ST);
 		s2->s.k = cstate->off_linkhdr.reg;
 		sappend(s1, s2);
 
 		/*
 		 * Now move it into the X register.
 		 */
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		return (s1);
 	} else
 		return (NULL);
 }
 
 static struct slist *
 gen_load_radiotap_llprefixlen(compiler_state_t *cstate)
 {
 	struct slist *s1, *s2;
 
 	/*
 	 * Generate code to load the length of the radiotap header into
 	 * the register assigned to hold that length, if one has been
 	 * assigned.  (If one hasn't been assigned, no code we've
 	 * generated uses that prefix, so we don't need to generate any
 	 * code to load it.)
 	 */
 	if (cstate->off_linkhdr.reg != -1) {
 		/*
 		 * The 2 bytes at offsets of 2 and 3 from the beginning
 		 * of the radiotap header are the length of the radiotap
 		 * header; unfortunately, it's little-endian, so we have
 		 * to load it a byte at a time and construct the value.
 		 */
 
 		/*
 		 * Load the high-order byte, at an offset of 3, shift it
 		 * left a byte, and put the result in the X register.
 		 */
 		s1 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
 		s1->s.k = 3;
 		s2 = new_stmt(cstate, BPF_ALU|BPF_LSH|BPF_K);
 		sappend(s1, s2);
 		s2->s.k = 8;
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		/*
 		 * Load the next byte, at an offset of 2, and OR the
 		 * value from the X register into it.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
 		sappend(s1, s2);
 		s2->s.k = 2;
 		s2 = new_stmt(cstate, BPF_ALU|BPF_OR|BPF_X);
 		sappend(s1, s2);
 
 		/*
 		 * Now allocate a register to hold that value and store
 		 * it.
 		 */
 		s2 = new_stmt(cstate, BPF_ST);
 		s2->s.k = cstate->off_linkhdr.reg;
 		sappend(s1, s2);
 
 		/*
 		 * Now move it into the X register.
 		 */
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		return (s1);
 	} else
 		return (NULL);
 }
 
 /*
  * At the moment we treat PPI as normal Radiotap encoded
  * packets. The difference is in the function that generates
  * the code at the beginning to compute the header length.
  * Since this code generator of PPI supports bare 802.11
  * encapsulation only (i.e. the encapsulated DLT should be
  * DLT_IEEE802_11) we generate code to check for this too;
  * that's done in finish_parse().
  */
 static struct slist *
 gen_load_ppi_llprefixlen(compiler_state_t *cstate)
 {
 	struct slist *s1, *s2;
 
 	/*
 	 * Generate code to load the length of the radiotap header
 	 * into the register assigned to hold that length, if one has
 	 * been assigned.
 	 */
 	if (cstate->off_linkhdr.reg != -1) {
 		/*
 		 * The 2 bytes at offsets of 2 and 3 from the beginning
 		 * of the radiotap header are the length of the radiotap
 		 * header; unfortunately, it's little-endian, so we have
 		 * to load it a byte at a time and construct the value.
 		 */
 
 		/*
 		 * Load the high-order byte, at an offset of 3, shift it
 		 * left a byte, and put the result in the X register.
 		 */
 		s1 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
 		s1->s.k = 3;
 		s2 = new_stmt(cstate, BPF_ALU|BPF_LSH|BPF_K);
 		sappend(s1, s2);
 		s2->s.k = 8;
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		/*
 		 * Load the next byte, at an offset of 2, and OR the
 		 * value from the X register into it.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
 		sappend(s1, s2);
 		s2->s.k = 2;
 		s2 = new_stmt(cstate, BPF_ALU|BPF_OR|BPF_X);
 		sappend(s1, s2);
 
 		/*
 		 * Now allocate a register to hold that value and store
 		 * it.
 		 */
 		s2 = new_stmt(cstate, BPF_ST);
 		s2->s.k = cstate->off_linkhdr.reg;
 		sappend(s1, s2);
 
 		/*
 		 * Now move it into the X register.
 		 */
 		s2 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		sappend(s1, s2);
 
 		return (s1);
 	} else
 		return (NULL);
 }
 
 /*
  * Load a value relative to the beginning of the link-layer header after the 802.11
  * header, i.e. LLC_SNAP.
  * The link-layer header doesn't necessarily begin at the beginning
  * of the packet data; there might be a variable-length prefix containing
  * radio information.
  */
 static struct slist *
 gen_load_802_11_header_len(compiler_state_t *cstate, struct slist *s, struct slist *snext)
 {
 	struct slist *s2;
 	struct slist *sjset_data_frame_1;
 	struct slist *sjset_data_frame_2;
 	struct slist *sjset_qos;
 	struct slist *sjset_radiotap_flags_present;
 	struct slist *sjset_radiotap_ext_present;
 	struct slist *sjset_radiotap_tsft_present;
 	struct slist *sjset_tsft_datapad, *sjset_notsft_datapad;
 	struct slist *s_roundup;
 
 	if (cstate->off_linkpl.reg == -1) {
 		/*
 		 * No register has been assigned to the offset of
 		 * the link-layer payload, which means nobody needs
 		 * it; don't bother computing it - just return
 		 * what we already have.
 		 */
 		return (s);
 	}
 
 	/*
 	 * This code is not compatible with the optimizer, as
 	 * we are generating jmp instructions within a normal
 	 * slist of instructions
 	 */
 	cstate->no_optimize = 1;
 
 	/*
 	 * If "s" is non-null, it has code to arrange that the X register
 	 * contains the length of the prefix preceding the link-layer
 	 * header.
 	 *
 	 * Otherwise, the length of the prefix preceding the link-layer
 	 * header is "off_outermostlinkhdr.constant_part".
 	 */
 	if (s == NULL) {
 		/*
 		 * There is no variable-length header preceding the
 		 * link-layer header.
 		 *
 		 * Load the length of the fixed-length prefix preceding
 		 * the link-layer header (if any) into the X register,
 		 * and store it in the cstate->off_linkpl.reg register.
 		 * That length is off_outermostlinkhdr.constant_part.
 		 */
 		s = new_stmt(cstate, BPF_LDX|BPF_IMM);
 		s->s.k = cstate->off_outermostlinkhdr.constant_part;
 	}
 
 	/*
 	 * The X register contains the offset of the beginning of the
 	 * link-layer header; add 24, which is the minimum length
 	 * of the MAC header for a data frame, to that, and store it
 	 * in cstate->off_linkpl.reg, and then load the Frame Control field,
 	 * which is at the offset in the X register, with an indexed load.
 	 */
 	s2 = new_stmt(cstate, BPF_MISC|BPF_TXA);
 	sappend(s, s2);
 	s2 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s2->s.k = 24;
 	sappend(s, s2);
 	s2 = new_stmt(cstate, BPF_ST);
 	s2->s.k = cstate->off_linkpl.reg;
 	sappend(s, s2);
 
 	s2 = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 	s2->s.k = 0;
 	sappend(s, s2);
 
 	/*
 	 * Check the Frame Control field to see if this is a data frame;
 	 * a data frame has the 0x08 bit (b3) in that field set and the
 	 * 0x04 bit (b2) clear.
 	 */
 	sjset_data_frame_1 = new_stmt(cstate, JMP(BPF_JSET));
 	sjset_data_frame_1->s.k = 0x08;
 	sappend(s, sjset_data_frame_1);
 
 	/*
 	 * If b3 is set, test b2, otherwise go to the first statement of
 	 * the rest of the program.
 	 */
 	sjset_data_frame_1->s.jt = sjset_data_frame_2 = new_stmt(cstate, JMP(BPF_JSET));
 	sjset_data_frame_2->s.k = 0x04;
 	sappend(s, sjset_data_frame_2);
 	sjset_data_frame_1->s.jf = snext;
 
 	/*
 	 * If b2 is not set, this is a data frame; test the QoS bit.
 	 * Otherwise, go to the first statement of the rest of the
 	 * program.
 	 */
 	sjset_data_frame_2->s.jt = snext;
 	sjset_data_frame_2->s.jf = sjset_qos = new_stmt(cstate, JMP(BPF_JSET));
 	sjset_qos->s.k = 0x80;	/* QoS bit */
 	sappend(s, sjset_qos);
 
 	/*
 	 * If it's set, add 2 to cstate->off_linkpl.reg, to skip the QoS
 	 * field.
 	 * Otherwise, go to the first statement of the rest of the
 	 * program.
 	 */
 	sjset_qos->s.jt = s2 = new_stmt(cstate, BPF_LD|BPF_MEM);
 	s2->s.k = cstate->off_linkpl.reg;
 	sappend(s, s2);
 	s2 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_IMM);
 	s2->s.k = 2;
 	sappend(s, s2);
 	s2 = new_stmt(cstate, BPF_ST);
 	s2->s.k = cstate->off_linkpl.reg;
 	sappend(s, s2);
 
 	/*
 	 * If we have a radiotap header, look at it to see whether
 	 * there's Atheros padding between the MAC-layer header
 	 * and the payload.
 	 *
 	 * Note: all of the fields in the radiotap header are
 	 * little-endian, so we byte-swap all of the values
 	 * we test against, as they will be loaded as big-endian
 	 * values.
 	 *
 	 * XXX - in the general case, we would have to scan through
 	 * *all* the presence bits, if there's more than one word of
 	 * presence bits.  That would require a loop, meaning that
 	 * we wouldn't be able to run the filter in the kernel.
 	 *
 	 * We assume here that the Atheros adapters that insert the
 	 * annoying padding don't have multiple antennae and therefore
 	 * do not generate radiotap headers with multiple presence words.
 	 */
 	if (cstate->linktype == DLT_IEEE802_11_RADIO) {
 		/*
 		 * Is the IEEE80211_RADIOTAP_FLAGS bit (0x0000002) set
 		 * in the first presence flag word?
 		 */
 		sjset_qos->s.jf = s2 = new_stmt(cstate, BPF_LD|BPF_ABS|BPF_W);
 		s2->s.k = 4;
 		sappend(s, s2);
 
 		sjset_radiotap_flags_present = new_stmt(cstate, JMP(BPF_JSET));
 		sjset_radiotap_flags_present->s.k = SWAPLONG(0x00000002);
 		sappend(s, sjset_radiotap_flags_present);
 
 		/*
 		 * If not, skip all of this.
 		 */
 		sjset_radiotap_flags_present->s.jf = snext;
 
 		/*
 		 * Otherwise, is the "extension" bit set in that word?
 		 */
 		sjset_radiotap_ext_present = new_stmt(cstate, JMP(BPF_JSET));
 		sjset_radiotap_ext_present->s.k = SWAPLONG(0x80000000);
 		sappend(s, sjset_radiotap_ext_present);
 		sjset_radiotap_flags_present->s.jt = sjset_radiotap_ext_present;
 
 		/*
 		 * If so, skip all of this.
 		 */
 		sjset_radiotap_ext_present->s.jt = snext;
 
 		/*
 		 * Otherwise, is the IEEE80211_RADIOTAP_TSFT bit set?
 		 */
 		sjset_radiotap_tsft_present = new_stmt(cstate, JMP(BPF_JSET));
 		sjset_radiotap_tsft_present->s.k = SWAPLONG(0x00000001);
 		sappend(s, sjset_radiotap_tsft_present);
 		sjset_radiotap_ext_present->s.jf = sjset_radiotap_tsft_present;
 
 		/*
 		 * If IEEE80211_RADIOTAP_TSFT is set, the flags field is
 		 * at an offset of 16 from the beginning of the raw packet
 		 * data (8 bytes for the radiotap header and 8 bytes for
 		 * the TSFT field).
 		 *
 		 * Test whether the IEEE80211_RADIOTAP_F_DATAPAD bit (0x20)
 		 * is set.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_ABS|BPF_B);
 		s2->s.k = 16;
 		sappend(s, s2);
 		sjset_radiotap_tsft_present->s.jt = s2;
 
 		sjset_tsft_datapad = new_stmt(cstate, JMP(BPF_JSET));
 		sjset_tsft_datapad->s.k = 0x20;
 		sappend(s, sjset_tsft_datapad);
 
 		/*
 		 * If IEEE80211_RADIOTAP_TSFT is not set, the flags field is
 		 * at an offset of 8 from the beginning of the raw packet
 		 * data (8 bytes for the radiotap header).
 		 *
 		 * Test whether the IEEE80211_RADIOTAP_F_DATAPAD bit (0x20)
 		 * is set.
 		 */
 		s2 = new_stmt(cstate, BPF_LD|BPF_ABS|BPF_B);
 		s2->s.k = 8;
 		sappend(s, s2);
 		sjset_radiotap_tsft_present->s.jf = s2;
 
 		sjset_notsft_datapad = new_stmt(cstate, JMP(BPF_JSET));
 		sjset_notsft_datapad->s.k = 0x20;
 		sappend(s, sjset_notsft_datapad);
 
 		/*
 		 * In either case, if IEEE80211_RADIOTAP_F_DATAPAD is
 		 * set, round the length of the 802.11 header to
 		 * a multiple of 4.  Do that by adding 3 and then
 		 * dividing by and multiplying by 4, which we do by
 		 * ANDing with ~3.
 		 */
 		s_roundup = new_stmt(cstate, BPF_LD|BPF_MEM);
 		s_roundup->s.k = cstate->off_linkpl.reg;
 		sappend(s, s_roundup);
 		s2 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_IMM);
 		s2->s.k = 3;
 		sappend(s, s2);
 		s2 = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_IMM);
 		s2->s.k = ~3;
 		sappend(s, s2);
 		s2 = new_stmt(cstate, BPF_ST);
 		s2->s.k = cstate->off_linkpl.reg;
 		sappend(s, s2);
 
 		sjset_tsft_datapad->s.jt = s_roundup;
 		sjset_tsft_datapad->s.jf = snext;
 		sjset_notsft_datapad->s.jt = s_roundup;
 		sjset_notsft_datapad->s.jf = snext;
 	} else
 		sjset_qos->s.jf = snext;
 
 	return s;
 }
 
 static void
 insert_compute_vloffsets(compiler_state_t *cstate, struct block *b)
 {
 	struct slist *s;
 
 	/* There is an implicit dependency between the link
 	 * payload and link header since the payload computation
 	 * includes the variable part of the header. Therefore,
 	 * if nobody else has allocated a register for the link
 	 * header and we need it, do it now. */
 	if (cstate->off_linkpl.reg != -1 && cstate->off_linkhdr.is_variable &&
 	    cstate->off_linkhdr.reg == -1)
 		cstate->off_linkhdr.reg = alloc_reg(cstate);
 
 	/*
 	 * For link-layer types that have a variable-length header
 	 * preceding the link-layer header, generate code to load
 	 * the offset of the link-layer header into the register
 	 * assigned to that offset, if any.
 	 *
 	 * XXX - this, and the next switch statement, won't handle
 	 * encapsulation of 802.11 or 802.11+radio information in
 	 * some other protocol stack.  That's significantly more
 	 * complicated.
 	 */
 	switch (cstate->outermostlinktype) {
 
 	case DLT_PRISM_HEADER:
 		s = gen_load_prism_llprefixlen(cstate);
 		break;
 
 	case DLT_IEEE802_11_RADIO_AVS:
 		s = gen_load_avs_llprefixlen(cstate);
 		break;
 
 	case DLT_IEEE802_11_RADIO:
 		s = gen_load_radiotap_llprefixlen(cstate);
 		break;
 
 	case DLT_PPI:
 		s = gen_load_ppi_llprefixlen(cstate);
 		break;
 
 	default:
 		s = NULL;
 		break;
 	}
 
 	/*
 	 * For link-layer types that have a variable-length link-layer
 	 * header, generate code to load the offset of the link-layer
 	 * payload into the register assigned to that offset, if any.
 	 */
 	switch (cstate->outermostlinktype) {
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 	case DLT_PPI:
 		s = gen_load_802_11_header_len(cstate, s, b->stmts);
 		break;
 	}
 
 	/*
+	 * If there there is no initialization yet and we need variable
+	 * length offsets for VLAN, initialize them to zero
+	 */
+	if (s == NULL && cstate->is_vlan_vloffset) {
+		struct slist *s2;
+
+		if (cstate->off_linkpl.reg == -1)
+			cstate->off_linkpl.reg = alloc_reg(cstate);
+		if (cstate->off_linktype.reg == -1)
+			cstate->off_linktype.reg = alloc_reg(cstate);
+
+		s = new_stmt(cstate, BPF_LD|BPF_W|BPF_IMM);
+		s->s.k = 0;
+		s2 = new_stmt(cstate, BPF_ST);
+		s2->s.k = cstate->off_linkpl.reg;
+		sappend(s, s2);
+		s2 = new_stmt(cstate, BPF_ST);
+		s2->s.k = cstate->off_linktype.reg;
+		sappend(s, s2);
+	}
+
+	/*
 	 * If we have any offset-loading code, append all the
 	 * existing statements in the block to those statements,
 	 * and make the resulting list the list of statements
 	 * for the block.
 	 */
 	if (s != NULL) {
 		sappend(s, b->stmts);
 		b->stmts = s;
 	}
 }
 
 static struct block *
 gen_ppi_dlt_check(compiler_state_t *cstate)
 {
 	struct slist *s_load_dlt;
 	struct block *b;
 
 	if (cstate->linktype == DLT_PPI)
 	{
 		/* Create the statements that check for the DLT
 		 */
 		s_load_dlt = new_stmt(cstate, BPF_LD|BPF_W|BPF_ABS);
 		s_load_dlt->s.k = 4;
 
 		b = new_block(cstate, JMP(BPF_JEQ));
 
 		b->stmts = s_load_dlt;
 		b->s.k = SWAPLONG(DLT_IEEE802_11);
 	}
 	else
 	{
 		b = NULL;
 	}
 
 	return b;
 }
 
 /*
  * Take an absolute offset, and:
  *
  *    if it has no variable part, return NULL;
  *
  *    if it has a variable part, generate code to load the register
  *    containing that variable part into the X register, returning
  *    a pointer to that code - if no register for that offset has
  *    been allocated, allocate it first.
  *
  * (The code to set that register will be generated later, but will
  * be placed earlier in the code sequence.)
  */
 static struct slist *
 gen_abs_offset_varpart(compiler_state_t *cstate, bpf_abs_offset *off)
 {
 	struct slist *s;
 
 	if (off->is_variable) {
 		if (off->reg == -1) {
 			/*
 			 * We haven't yet assigned a register for the
 			 * variable part of the offset of the link-layer
 			 * header; allocate one.
 			 */
 			off->reg = alloc_reg(cstate);
 		}
 
 		/*
 		 * Load the register containing the variable part of the
 		 * offset of the link-layer header into the X register.
 		 */
 		s = new_stmt(cstate, BPF_LDX|BPF_MEM);
 		s->s.k = off->reg;
 		return s;
 	} else {
 		/*
 		 * That offset isn't variable, there's no variable part,
 		 * so we don't need to generate any code.
 		 */
 		return NULL;
 	}
 }
 
 /*
  * Map an Ethernet type to the equivalent PPP type.
  */
 static int
-ethertype_to_ppptype(proto)
-	int proto;
+ethertype_to_ppptype(int proto)
 {
 	switch (proto) {
 
 	case ETHERTYPE_IP:
 		proto = PPP_IP;
 		break;
 
 	case ETHERTYPE_IPV6:
 		proto = PPP_IPV6;
 		break;
 
 	case ETHERTYPE_DN:
 		proto = PPP_DECNET;
 		break;
 
 	case ETHERTYPE_ATALK:
 		proto = PPP_APPLE;
 		break;
 
 	case ETHERTYPE_NS:
 		proto = PPP_NS;
 		break;
 
 	case LLCSAP_ISONS:
 		proto = PPP_OSI;
 		break;
 
 	case LLCSAP_8021D:
 		/*
 		 * I'm assuming the "Bridging PDU"s that go
 		 * over PPP are Spanning Tree Protocol
 		 * Bridging PDUs.
 		 */
 		proto = PPP_BRPDU;
 		break;
 
 	case LLCSAP_IPX:
 		proto = PPP_IPX;
 		break;
 	}
 	return (proto);
 }
 
 /*
  * Generate any tests that, for encapsulation of a link-layer packet
  * inside another protocol stack, need to be done to check for those
  * link-layer packets (and that haven't already been done by a check
  * for that encapsulation).
  */
 static struct block *
 gen_prevlinkhdr_check(compiler_state_t *cstate)
 {
 	struct block *b0;
 
 	if (cstate->is_geneve)
 		return gen_geneve_ll_check(cstate);
 
 	switch (cstate->prevlinktype) {
 
 	case DLT_SUNATM:
 		/*
 		 * This is LANE-encapsulated Ethernet; check that the LANE
 		 * packet doesn't begin with an LE Control marker, i.e.
 		 * that it's data, not a control message.
 		 *
 		 * (We've already generated a test for LANE.)
 		 */
 		b0 = gen_cmp(cstate, OR_PREVLINKHDR, SUNATM_PKT_BEGIN_POS, BPF_H, 0xFF00);
 		gen_not(b0);
 		return b0;
 
 	default:
 		/*
 		 * No such tests are necessary.
 		 */
 		return NULL;
 	}
 	/*NOTREACHED*/
 }
 
 /*
  * The three different values we should check for when checking for an
  * IPv6 packet with DLT_NULL.
  */
 #define BSD_AFNUM_INET6_BSD	24	/* NetBSD, OpenBSD, BSD/OS, Npcap */
 #define BSD_AFNUM_INET6_FREEBSD	28	/* FreeBSD */
-#define BSD_AFNUM_INET6_DARWIN	30	/* OS X, iOS, other Darwin-based OSes */
+#define BSD_AFNUM_INET6_DARWIN	30	/* macOS, iOS, other Darwin-based OSes */
 
 /*
  * Generate code to match a particular packet type by matching the
  * link-layer type field or fields in the 802.2 LLC header.
  *
  * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
  * value, if <= ETHERMTU.
  */
 static struct block *
 gen_linktype(compiler_state_t *cstate, int proto)
 {
 	struct block *b0, *b1, *b2;
 	const char *description;
 
 	/* are we checking MPLS-encapsulated packets? */
 	if (cstate->label_stack_depth > 0) {
 		switch (proto) {
 		case ETHERTYPE_IP:
 		case PPP_IP:
 			/* FIXME add other L3 proto IDs */
 			return gen_mpls_linktype(cstate, Q_IP);
 
 		case ETHERTYPE_IPV6:
 		case PPP_IPV6:
 			/* FIXME add other L3 proto IDs */
 			return gen_mpls_linktype(cstate, Q_IPV6);
 
 		default:
 			bpf_error(cstate, "unsupported protocol over mpls");
 			/* NOTREACHED */
 		}
 	}
 
 	switch (cstate->linktype) {
 
 	case DLT_EN10MB:
 	case DLT_NETANALYZER:
 	case DLT_NETANALYZER_TRANSPARENT:
 		/* Geneve has an EtherType regardless of whether there is an
 		 * L2 header. */
 		if (!cstate->is_geneve)
 			b0 = gen_prevlinkhdr_check(cstate);
 		else
 			b0 = NULL;
 
 		b1 = gen_ether_linktype(cstate, proto);
 		if (b0 != NULL)
 			gen_and(b0, b1);
 		return b1;
 		/*NOTREACHED*/
 		break;
 
 	case DLT_C_HDLC:
 		switch (proto) {
 
 		case LLCSAP_ISONS:
 			proto = (proto << 8 | LLCSAP_ISONS);
 			/* fall through */
 
 		default:
 			return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 			/*NOTREACHED*/
 			break;
 		}
 		break;
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 	case DLT_PPI:
 		/*
 		 * Check that we have a data frame.
 		 */
 		b0 = gen_check_802_11_data_frame(cstate);
 
 		/*
 		 * Now check for the specified link-layer type.
 		 */
 		b1 = gen_llc_linktype(cstate, proto);
 		gen_and(b0, b1);
 		return b1;
 		/*NOTREACHED*/
 		break;
 
 	case DLT_FDDI:
 		/*
 		 * XXX - check for LLC frames.
 		 */
 		return gen_llc_linktype(cstate, proto);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_IEEE802:
 		/*
 		 * XXX - check for LLC PDUs, as per IEEE 802.5.
 		 */
 		return gen_llc_linktype(cstate, proto);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_ATM_RFC1483:
 	case DLT_ATM_CLIP:
 	case DLT_IP_OVER_FC:
 		return gen_llc_linktype(cstate, proto);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_SUNATM:
 		/*
 		 * Check for an LLC-encapsulated version of this protocol;
 		 * if we were checking for LANE, linktype would no longer
 		 * be DLT_SUNATM.
 		 *
 		 * Check for LLC encapsulation and then check the protocol.
 		 */
 		b0 = gen_atmfield_code(cstate, A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);
 		b1 = gen_llc_linktype(cstate, proto);
 		gen_and(b0, b1);
 		return b1;
 		/*NOTREACHED*/
 		break;
 
 	case DLT_LINUX_SLL:
 		return gen_linux_sll_linktype(cstate, proto);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_SLIP:
 	case DLT_SLIP_BSDOS:
 	case DLT_RAW:
 		/*
 		 * These types don't provide any type field; packets
 		 * are always IPv4 or IPv6.
 		 *
 		 * XXX - for IPv4, check for a version number of 4, and,
 		 * for IPv6, check for a version number of 6?
 		 */
 		switch (proto) {
 
 		case ETHERTYPE_IP:
 			/* Check for a version number of 4. */
 			return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, 0x40, 0xF0);
 
 		case ETHERTYPE_IPV6:
 			/* Check for a version number of 6. */
 			return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, 0x60, 0xF0);
 
 		default:
 			return gen_false(cstate);	/* always false */
 		}
 		/*NOTREACHED*/
 		break;
 
 	case DLT_IPV4:
 		/*
 		 * Raw IPv4, so no type field.
 		 */
 		if (proto == ETHERTYPE_IP)
 			return gen_true(cstate);	/* always true */
 
 		/* Checking for something other than IPv4; always false */
 		return gen_false(cstate);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_IPV6:
 		/*
 		 * Raw IPv6, so no type field.
 		 */
 		if (proto == ETHERTYPE_IPV6)
 			return gen_true(cstate);	/* always true */
 
 		/* Checking for something other than IPv6; always false */
 		return gen_false(cstate);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_PPP:
 	case DLT_PPP_PPPD:
 	case DLT_PPP_SERIAL:
 	case DLT_PPP_ETHER:
 		/*
 		 * We use Ethernet protocol types inside libpcap;
 		 * map them to the corresponding PPP protocol types.
 		 */
 		proto = ethertype_to_ppptype(proto);
 		return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 		/*NOTREACHED*/
 		break;
 
 	case DLT_PPP_BSDOS:
 		/*
 		 * We use Ethernet protocol types inside libpcap;
 		 * map them to the corresponding PPP protocol types.
 		 */
 		switch (proto) {
 
 		case ETHERTYPE_IP:
 			/*
 			 * Also check for Van Jacobson-compressed IP.
 			 * XXX - do this for other forms of PPP?
 			 */
 			b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, PPP_IP);
 			b1 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, PPP_VJC);
 			gen_or(b0, b1);
 			b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, PPP_VJNC);
 			gen_or(b1, b0);
 			return b0;
 
 		default:
 			proto = ethertype_to_ppptype(proto);
 			return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H,
 				(bpf_int32)proto);
 		}
 		/*NOTREACHED*/
 		break;
 
 	case DLT_NULL:
 	case DLT_LOOP:
 	case DLT_ENC:
 		switch (proto) {
 
 		case ETHERTYPE_IP:
 			return (gen_loopback_linktype(cstate, AF_INET));
 
 		case ETHERTYPE_IPV6:
 			/*
 			 * AF_ values may, unfortunately, be platform-
 			 * dependent; AF_INET isn't, because everybody
 			 * used 4.2BSD's value, but AF_INET6 is, because
 			 * 4.2BSD didn't have a value for it (given that
 			 * IPv6 didn't exist back in the early 1980's),
 			 * and they all picked their own values.
 			 *
 			 * This means that, if we're reading from a
 			 * savefile, we need to check for all the
 			 * possible values.
 			 *
 			 * If we're doing a live capture, we only need
 			 * to check for this platform's value; however,
 			 * Npcap uses 24, which isn't Windows's AF_INET6
 			 * value.  (Given the multiple different values,
 			 * programs that read pcap files shouldn't be
 			 * checking for their platform's AF_INET6 value
 			 * anyway, they should check for all of the
 			 * possible values. and they might as well do
 			 * that even for live captures.)
 			 */
 			if (cstate->bpf_pcap->rfile != NULL) {
 				/*
 				 * Savefile - check for all three
 				 * possible IPv6 values.
 				 */
 				b0 = gen_loopback_linktype(cstate, BSD_AFNUM_INET6_BSD);
 				b1 = gen_loopback_linktype(cstate, BSD_AFNUM_INET6_FREEBSD);
 				gen_or(b0, b1);
 				b0 = gen_loopback_linktype(cstate, BSD_AFNUM_INET6_DARWIN);
 				gen_or(b0, b1);
 				return (b1);
 			} else {
 				/*
 				 * Live capture, so we only need to
 				 * check for the value used on this
 				 * platform.
 				 */
 #ifdef _WIN32
 				/*
 				 * Npcap doesn't use Windows's AF_INET6,
 				 * as that collides with AF_IPX on
 				 * some BSDs (both have the value 23).
 				 * Instead, it uses 24.
 				 */
 				return (gen_loopback_linktype(cstate, 24));
 #else /* _WIN32 */
 #ifdef AF_INET6
 				return (gen_loopback_linktype(cstate, AF_INET6));
 #else /* AF_INET6 */
 				/*
 				 * I guess this platform doesn't support
 				 * IPv6, so we just reject all packets.
 				 */
 				return gen_false(cstate);
 #endif /* AF_INET6 */
 #endif /* _WIN32 */
 			}
 
 		default:
 			/*
 			 * Not a type on which we support filtering.
 			 * XXX - support those that have AF_ values
 			 * #defined on this platform, at least?
 			 */
 			return gen_false(cstate);
 		}
 
 #ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		/*
 		 * af field is host byte order in contrast to the rest of
 		 * the packet.
 		 */
 		if (proto == ETHERTYPE_IP)
 			return (gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, af),
 			    BPF_B, (bpf_int32)AF_INET));
 		else if (proto == ETHERTYPE_IPV6)
 			return (gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, af),
 			    BPF_B, (bpf_int32)AF_INET6));
 		else
 			return gen_false(cstate);
 		/*NOTREACHED*/
 		break;
 #endif /* HAVE_NET_PFVAR_H */
 
 	case DLT_ARCNET:
 	case DLT_ARCNET_LINUX:
 		/*
 		 * XXX should we check for first fragment if the protocol
 		 * uses PHDS?
 		 */
 		switch (proto) {
 
 		default:
 			return gen_false(cstate);
 
 		case ETHERTYPE_IPV6:
 			return (gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 				(bpf_int32)ARCTYPE_INET6));
 
 		case ETHERTYPE_IP:
 			b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 				     (bpf_int32)ARCTYPE_IP);
 			b1 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 				     (bpf_int32)ARCTYPE_IP_OLD);
 			gen_or(b0, b1);
 			return (b1);
 
 		case ETHERTYPE_ARP:
 			b0 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 				     (bpf_int32)ARCTYPE_ARP);
 			b1 = gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 				     (bpf_int32)ARCTYPE_ARP_OLD);
 			gen_or(b0, b1);
 			return (b1);
 
 		case ETHERTYPE_REVARP:
 			return (gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 					(bpf_int32)ARCTYPE_REVARP));
 
 		case ETHERTYPE_ATALK:
 			return (gen_cmp(cstate, OR_LINKTYPE, 0, BPF_B,
 					(bpf_int32)ARCTYPE_ATALK));
 		}
 		/*NOTREACHED*/
 		break;
 
 	case DLT_LTALK:
 		switch (proto) {
 		case ETHERTYPE_ATALK:
 			return gen_true(cstate);
 		default:
 			return gen_false(cstate);
 		}
 		/*NOTREACHED*/
 		break;
 
 	case DLT_FRELAY:
 		/*
 		 * XXX - assumes a 2-byte Frame Relay header with
 		 * DLCI and flags.  What if the address is longer?
 		 */
 		switch (proto) {
 
 		case ETHERTYPE_IP:
 			/*
 			 * Check for the special NLPID for IP.
 			 */
 			return gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | 0xcc);
 
 		case ETHERTYPE_IPV6:
 			/*
 			 * Check for the special NLPID for IPv6.
 			 */
 			return gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | 0x8e);
 
 		case LLCSAP_ISONS:
 			/*
 			 * Check for several OSI protocols.
 			 *
 			 * Frame Relay packets typically have an OSI
 			 * NLPID at the beginning; we check for each
 			 * of them.
 			 *
 			 * What we check for is the NLPID and a frame
 			 * control field of UI, i.e. 0x03 followed
 			 * by the NLPID.
 			 */
 			b0 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | ISO8473_CLNP);
 			b1 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | ISO9542_ESIS);
 			b2 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | ISO10589_ISIS);
 			gen_or(b1, b2);
 			gen_or(b0, b2);
 			return b2;
 
 		default:
 			return gen_false(cstate);
 		}
 		/*NOTREACHED*/
 		break;
 
 	case DLT_MFR:
 		bpf_error(cstate, "Multi-link Frame Relay link-layer type filtering not implemented");
 
         case DLT_JUNIPER_MFR:
         case DLT_JUNIPER_MLFR:
         case DLT_JUNIPER_MLPPP:
 	case DLT_JUNIPER_ATM1:
 	case DLT_JUNIPER_ATM2:
 	case DLT_JUNIPER_PPPOE:
 	case DLT_JUNIPER_PPPOE_ATM:
         case DLT_JUNIPER_GGSN:
         case DLT_JUNIPER_ES:
         case DLT_JUNIPER_MONITOR:
         case DLT_JUNIPER_SERVICES:
         case DLT_JUNIPER_ETHER:
         case DLT_JUNIPER_PPP:
         case DLT_JUNIPER_FRELAY:
         case DLT_JUNIPER_CHDLC:
         case DLT_JUNIPER_VP:
         case DLT_JUNIPER_ST:
         case DLT_JUNIPER_ISM:
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:
 	case DLT_JUNIPER_ATM_CEMIC:
 
 		/* just lets verify the magic number for now -
 		 * on ATM we may have up to 6 different encapsulations on the wire
 		 * and need a lot of heuristics to figure out that the payload
 		 * might be;
 		 *
 		 * FIXME encapsulation specific BPF_ filters
 		 */
 		return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_W, 0x4d474300, 0xffffff00); /* compare the magic number */
 
 	case DLT_BACNET_MS_TP:
 		return gen_mcmp(cstate, OR_LINKHDR, 0, BPF_W, 0x55FF0000, 0xffff0000);
 
 	case DLT_IPNET:
 		return gen_ipnet_linktype(cstate, proto);
 
 	case DLT_LINUX_IRDA:
 		bpf_error(cstate, "IrDA link-layer type filtering not implemented");
 
 	case DLT_DOCSIS:
 		bpf_error(cstate, "DOCSIS link-layer type filtering not implemented");
 
 	case DLT_MTP2:
 	case DLT_MTP2_WITH_PHDR:
 		bpf_error(cstate, "MTP2 link-layer type filtering not implemented");
 
 	case DLT_ERF:
 		bpf_error(cstate, "ERF link-layer type filtering not implemented");
 
 	case DLT_PFSYNC:
 		bpf_error(cstate, "PFSYNC link-layer type filtering not implemented");
 
 	case DLT_LINUX_LAPD:
 		bpf_error(cstate, "LAPD link-layer type filtering not implemented");
 
 	case DLT_USB_FREEBSD:
 	case DLT_USB_LINUX:
 	case DLT_USB_LINUX_MMAPPED:
 	case DLT_USBPCAP:
 		bpf_error(cstate, "USB link-layer type filtering not implemented");
 
 	case DLT_BLUETOOTH_HCI_H4:
 	case DLT_BLUETOOTH_HCI_H4_WITH_PHDR:
 		bpf_error(cstate, "Bluetooth link-layer type filtering not implemented");
 
 	case DLT_CAN20B:
 	case DLT_CAN_SOCKETCAN:
 		bpf_error(cstate, "CAN link-layer type filtering not implemented");
 
 	case DLT_IEEE802_15_4:
 	case DLT_IEEE802_15_4_LINUX:
 	case DLT_IEEE802_15_4_NONASK_PHY:
 	case DLT_IEEE802_15_4_NOFCS:
 		bpf_error(cstate, "IEEE 802.15.4 link-layer type filtering not implemented");
 
 	case DLT_IEEE802_16_MAC_CPS_RADIO:
 		bpf_error(cstate, "IEEE 802.16 link-layer type filtering not implemented");
 
 	case DLT_SITA:
 		bpf_error(cstate, "SITA link-layer type filtering not implemented");
 
 	case DLT_RAIF1:
 		bpf_error(cstate, "RAIF1 link-layer type filtering not implemented");
 
 	case DLT_IPMB:
 		bpf_error(cstate, "IPMB link-layer type filtering not implemented");
 
 	case DLT_AX25_KISS:
 		bpf_error(cstate, "AX.25 link-layer type filtering not implemented");
 
 	case DLT_NFLOG:
 		/* Using the fixed-size NFLOG header it is possible to tell only
 		 * the address family of the packet, other meaningful data is
 		 * either missing or behind TLVs.
 		 */
 		bpf_error(cstate, "NFLOG link-layer type filtering not implemented");
 
 	default:
 		/*
 		 * Does this link-layer header type have a field
 		 * indicating the type of the next protocol?  If
 		 * so, off_linktype.constant_part will be the offset of that
 		 * field in the packet; if not, it will be OFFSET_NOT_SET.
 		 */
 		if (cstate->off_linktype.constant_part != OFFSET_NOT_SET) {
 			/*
 			 * Yes; assume it's an Ethernet type.  (If
 			 * it's not, it needs to be handled specially
 			 * above.)
 			 */
 			return gen_cmp(cstate, OR_LINKTYPE, 0, BPF_H, (bpf_int32)proto);
 		} else {
 			/*
 			 * No; report an error.
 			 */
 			description = pcap_datalink_val_to_description(cstate->linktype);
 			if (description != NULL) {
 				bpf_error(cstate, "%s link-layer type filtering not implemented",
 				    description);
 			} else {
 				bpf_error(cstate, "DLT %u link-layer type filtering not implemented",
 				    cstate->linktype);
 			}
 		}
 		break;
 	}
 }
 
 /*
  * Check for an LLC SNAP packet with a given organization code and
  * protocol type; we check the entire contents of the 802.2 LLC and
  * snap headers, checking for DSAP and SSAP of SNAP and a control
  * field of 0x03 in the LLC header, and for the specified organization
  * code and protocol type in the SNAP header.
  */
 static struct block *
 gen_snap(compiler_state_t *cstate, bpf_u_int32 orgcode, bpf_u_int32 ptype)
 {
 	u_char snapblock[8];
 
-	snapblock[0] = LLCSAP_SNAP;	/* DSAP = SNAP */
-	snapblock[1] = LLCSAP_SNAP;	/* SSAP = SNAP */
-	snapblock[2] = 0x03;		/* control = UI */
-	snapblock[3] = (orgcode >> 16);	/* upper 8 bits of organization code */
-	snapblock[4] = (orgcode >> 8);	/* middle 8 bits of organization code */
-	snapblock[5] = (orgcode >> 0);	/* lower 8 bits of organization code */
-	snapblock[6] = (ptype >> 8);	/* upper 8 bits of protocol type */
-	snapblock[7] = (ptype >> 0);	/* lower 8 bits of protocol type */
+	snapblock[0] = LLCSAP_SNAP;		/* DSAP = SNAP */
+	snapblock[1] = LLCSAP_SNAP;		/* SSAP = SNAP */
+	snapblock[2] = 0x03;			/* control = UI */
+	snapblock[3] = (u_char)(orgcode >> 16);	/* upper 8 bits of organization code */
+	snapblock[4] = (u_char)(orgcode >> 8);	/* middle 8 bits of organization code */
+	snapblock[5] = (u_char)(orgcode >> 0);	/* lower 8 bits of organization code */
+	snapblock[6] = (u_char)(ptype >> 8);	/* upper 8 bits of protocol type */
+	snapblock[7] = (u_char)(ptype >> 0);	/* lower 8 bits of protocol type */
 	return gen_bcmp(cstate, OR_LLC, 0, 8, snapblock);
 }
 
 /*
  * Generate code to match frames with an LLC header.
  */
 struct block *
 gen_llc(compiler_state_t *cstate)
 {
 	struct block *b0, *b1;
 
 	switch (cstate->linktype) {
 
 	case DLT_EN10MB:
 		/*
 		 * We check for an Ethernet type field less than
 		 * 1500, which means it's an 802.3 length field.
 		 */
 		b0 = gen_cmp_gt(cstate, OR_LINKTYPE, 0, BPF_H, ETHERMTU);
 		gen_not(b0);
 
 		/*
 		 * Now check for the purported DSAP and SSAP not being
 		 * 0xFF, to rule out NetWare-over-802.3.
 		 */
 		b1 = gen_cmp(cstate, OR_LLC, 0, BPF_H, (bpf_int32)0xFFFF);
 		gen_not(b1);
 		gen_and(b0, b1);
 		return b1;
 
 	case DLT_SUNATM:
 		/*
 		 * We check for LLC traffic.
 		 */
 		b0 = gen_atmtype_abbrev(cstate, A_LLC);
 		return b0;
 
 	case DLT_IEEE802:	/* Token Ring */
 		/*
 		 * XXX - check for LLC frames.
 		 */
 		return gen_true(cstate);
 
 	case DLT_FDDI:
 		/*
 		 * XXX - check for LLC frames.
 		 */
 		return gen_true(cstate);
 
 	case DLT_ATM_RFC1483:
 		/*
 		 * For LLC encapsulation, these are defined to have an
 		 * 802.2 LLC header.
 		 *
 		 * For VC encapsulation, they don't, but there's no
 		 * way to check for that; the protocol used on the VC
 		 * is negotiated out of band.
 		 */
 		return gen_true(cstate);
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_PPI:
 		/*
 		 * Check that we have a data frame.
 		 */
 		b0 = gen_check_802_11_data_frame(cstate);
 		return b0;
 
 	default:
 		bpf_error(cstate, "'llc' not supported for linktype %d", cstate->linktype);
 		/* NOTREACHED */
 	}
 }
 
 struct block *
 gen_llc_i(compiler_state_t *cstate)
 {
 	struct block *b0, *b1;
 	struct slist *s;
 
 	/*
 	 * Check whether this is an LLC frame.
 	 */
 	b0 = gen_llc(cstate);
 
 	/*
 	 * Load the control byte and test the low-order bit; it must
 	 * be clear for I frames.
 	 */
 	s = gen_load_a(cstate, OR_LLC, 2, BPF_B);
 	b1 = new_block(cstate, JMP(BPF_JSET));
 	b1->s.k = 0x01;
 	b1->stmts = s;
 	gen_not(b1);
 	gen_and(b0, b1);
 	return b1;
 }
 
 struct block *
 gen_llc_s(compiler_state_t *cstate)
 {
 	struct block *b0, *b1;
 
 	/*
 	 * Check whether this is an LLC frame.
 	 */
 	b0 = gen_llc(cstate);
 
 	/*
 	 * Now compare the low-order 2 bit of the control byte against
 	 * the appropriate value for S frames.
 	 */
 	b1 = gen_mcmp(cstate, OR_LLC, 2, BPF_B, LLC_S_FMT, 0x03);
 	gen_and(b0, b1);
 	return b1;
 }
 
 struct block *
 gen_llc_u(compiler_state_t *cstate)
 {
 	struct block *b0, *b1;
 
 	/*
 	 * Check whether this is an LLC frame.
 	 */
 	b0 = gen_llc(cstate);
 
 	/*
 	 * Now compare the low-order 2 bit of the control byte against
 	 * the appropriate value for U frames.
 	 */
 	b1 = gen_mcmp(cstate, OR_LLC, 2, BPF_B, LLC_U_FMT, 0x03);
 	gen_and(b0, b1);
 	return b1;
 }
 
 struct block *
 gen_llc_s_subtype(compiler_state_t *cstate, bpf_u_int32 subtype)
 {
 	struct block *b0, *b1;
 
 	/*
 	 * Check whether this is an LLC frame.
 	 */
 	b0 = gen_llc(cstate);
 
 	/*
 	 * Now check for an S frame with the appropriate type.
 	 */
 	b1 = gen_mcmp(cstate, OR_LLC, 2, BPF_B, subtype, LLC_S_CMD_MASK);
 	gen_and(b0, b1);
 	return b1;
 }
 
 struct block *
 gen_llc_u_subtype(compiler_state_t *cstate, bpf_u_int32 subtype)
 {
 	struct block *b0, *b1;
 
 	/*
 	 * Check whether this is an LLC frame.
 	 */
 	b0 = gen_llc(cstate);
 
 	/*
 	 * Now check for a U frame with the appropriate type.
 	 */
 	b1 = gen_mcmp(cstate, OR_LLC, 2, BPF_B, subtype, LLC_U_CMD_MASK);
 	gen_and(b0, b1);
 	return b1;
 }
 
 /*
  * Generate code to match a particular packet type, for link-layer types
  * using 802.2 LLC headers.
  *
  * This is *NOT* used for Ethernet; "gen_ether_linktype()" is used
  * for that - it handles the D/I/X Ethernet vs. 802.3+802.2 issues.
  *
  * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
  * value, if <= ETHERMTU.  We use that to determine whether to
  * match the DSAP or both DSAP and LSAP or to check the OUI and
  * protocol ID in a SNAP header.
  */
 static struct block *
 gen_llc_linktype(compiler_state_t *cstate, int proto)
 {
 	/*
 	 * XXX - handle token-ring variable-length header.
 	 */
 	switch (proto) {
 
 	case LLCSAP_IP:
 	case LLCSAP_ISONS:
 	case LLCSAP_NETBEUI:
 		/*
 		 * XXX - should we check both the DSAP and the
 		 * SSAP, like this, or should we check just the
 		 * DSAP, as we do for other SAP values?
 		 */
 		return gen_cmp(cstate, OR_LLC, 0, BPF_H, (bpf_u_int32)
 			     ((proto << 8) | proto));
 
 	case LLCSAP_IPX:
 		/*
 		 * XXX - are there ever SNAP frames for IPX on
 		 * non-Ethernet 802.x networks?
 		 */
 		return gen_cmp(cstate, OR_LLC, 0, BPF_B,
 		    (bpf_int32)LLCSAP_IPX);
 
 	case ETHERTYPE_ATALK:
 		/*
 		 * 802.2-encapsulated ETHERTYPE_ATALK packets are
 		 * SNAP packets with an organization code of
 		 * 0x080007 (Apple, for Appletalk) and a protocol
 		 * type of ETHERTYPE_ATALK (Appletalk).
 		 *
 		 * XXX - check for an organization code of
 		 * encapsulated Ethernet as well?
 		 */
 		return gen_snap(cstate, 0x080007, ETHERTYPE_ATALK);
 
 	default:
 		/*
 		 * XXX - we don't have to check for IPX 802.3
 		 * here, but should we check for the IPX Ethertype?
 		 */
 		if (proto <= ETHERMTU) {
 			/*
 			 * This is an LLC SAP value, so check
 			 * the DSAP.
 			 */
 			return gen_cmp(cstate, OR_LLC, 0, BPF_B, (bpf_int32)proto);
 		} else {
 			/*
 			 * This is an Ethernet type; we assume that it's
 			 * unlikely that it'll appear in the right place
 			 * at random, and therefore check only the
 			 * location that would hold the Ethernet type
 			 * in a SNAP frame with an organization code of
 			 * 0x000000 (encapsulated Ethernet).
 			 *
 			 * XXX - if we were to check for the SNAP DSAP and
 			 * LSAP, as per XXX, and were also to check for an
 			 * organization code of 0x000000 (encapsulated
 			 * Ethernet), we'd do
 			 *
 			 *	return gen_snap(cstate, 0x000000, proto);
 			 *
 			 * here; for now, we don't, as per the above.
 			 * I don't know whether it's worth the extra CPU
 			 * time to do the right check or not.
 			 */
 			return gen_cmp(cstate, OR_LLC, 6, BPF_H, (bpf_int32)proto);
 		}
 	}
 }
 
 static struct block *
 gen_hostop(compiler_state_t *cstate, bpf_u_int32 addr, bpf_u_int32 mask,
     int dir, int proto, u_int src_off, u_int dst_off)
 {
 	struct block *b0, *b1;
 	u_int offset;
 
 	switch (dir) {
 
 	case Q_SRC:
 		offset = src_off;
 		break;
 
 	case Q_DST:
 		offset = dst_off;
 		break;
 
 	case Q_AND:
 		b0 = gen_hostop(cstate, addr, mask, Q_SRC, proto, src_off, dst_off);
 		b1 = gen_hostop(cstate, addr, mask, Q_DST, proto, src_off, dst_off);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		b0 = gen_hostop(cstate, addr, mask, Q_SRC, proto, src_off, dst_off);
 		b1 = gen_hostop(cstate, addr, mask, Q_DST, proto, src_off, dst_off);
 		gen_or(b0, b1);
 		return b1;
 
+	case Q_ADDR1:
+		bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR2:
+		bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR3:
+		bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR4:
+		bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_RA:
+		bpf_error(cstate, "'ra' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_TA:
+		bpf_error(cstate, "'ta' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+		break;
+
 	default:
 		abort();
 	}
 	b0 = gen_linktype(cstate, proto);
 	b1 = gen_mcmp(cstate, OR_LINKPL, offset, BPF_W, (bpf_int32)addr, mask);
 	gen_and(b0, b1);
 	return b1;
 }
 
 #ifdef INET6
 static struct block *
 gen_hostop6(compiler_state_t *cstate, struct in6_addr *addr,
     struct in6_addr *mask, int dir, int proto, u_int src_off, u_int dst_off)
 {
 	struct block *b0, *b1;
 	u_int offset;
-	u_int32_t *a, *m;
+	uint32_t *a, *m;
 
 	switch (dir) {
 
 	case Q_SRC:
 		offset = src_off;
 		break;
 
 	case Q_DST:
 		offset = dst_off;
 		break;
 
 	case Q_AND:
 		b0 = gen_hostop6(cstate, addr, mask, Q_SRC, proto, src_off, dst_off);
 		b1 = gen_hostop6(cstate, addr, mask, Q_DST, proto, src_off, dst_off);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		b0 = gen_hostop6(cstate, addr, mask, Q_SRC, proto, src_off, dst_off);
 		b1 = gen_hostop6(cstate, addr, mask, Q_DST, proto, src_off, dst_off);
 		gen_or(b0, b1);
 		return b1;
 
+	case Q_ADDR1:
+		bpf_error(cstate, "'addr1' and 'address1' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR2:
+		bpf_error(cstate, "'addr2' and 'address2' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR3:
+		bpf_error(cstate, "'addr3' and 'address3' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_ADDR4:
+		bpf_error(cstate, "'addr4' and 'address4' are not valid qualifiers for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_RA:
+		bpf_error(cstate, "'ra' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+		break;
+
+	case Q_TA:
+		bpf_error(cstate, "'ta' is not a valid qualifier for addresses other than 802.11 MAC addresses");
+		break;
+
 	default:
 		abort();
 	}
 	/* this order is important */
-	a = (u_int32_t *)addr;
-	m = (u_int32_t *)mask;
+	a = (uint32_t *)addr;
+	m = (uint32_t *)mask;
 	b1 = gen_mcmp(cstate, OR_LINKPL, offset + 12, BPF_W, ntohl(a[3]), ntohl(m[3]));
 	b0 = gen_mcmp(cstate, OR_LINKPL, offset + 8, BPF_W, ntohl(a[2]), ntohl(m[2]));
 	gen_and(b0, b1);
 	b0 = gen_mcmp(cstate, OR_LINKPL, offset + 4, BPF_W, ntohl(a[1]), ntohl(m[1]));
 	gen_and(b0, b1);
 	b0 = gen_mcmp(cstate, OR_LINKPL, offset + 0, BPF_W, ntohl(a[0]), ntohl(m[0]));
 	gen_and(b0, b1);
 	b0 = gen_linktype(cstate, proto);
 	gen_and(b0, b1);
 	return b1;
 }
 #endif
 
 static struct block *
 gen_ehostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	register struct block *b0, *b1;
 
 	switch (dir) {
 	case Q_SRC:
 		return gen_bcmp(cstate, OR_LINKHDR, 6, 6, eaddr);
 
 	case Q_DST:
 		return gen_bcmp(cstate, OR_LINKHDR, 0, 6, eaddr);
 
 	case Q_AND:
 		b0 = gen_ehostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ehostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_ehostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ehostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ADDR1:
-		bpf_error(cstate, "'addr1' is only supported on 802.11 with 802.11 headers");
+		bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11 with 802.11 headers");
 		break;
 
 	case Q_ADDR2:
-		bpf_error(cstate, "'addr2' is only supported on 802.11 with 802.11 headers");
+		bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11 with 802.11 headers");
 		break;
 
 	case Q_ADDR3:
-		bpf_error(cstate, "'addr3' is only supported on 802.11 with 802.11 headers");
+		bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11 with 802.11 headers");
 		break;
 
 	case Q_ADDR4:
-		bpf_error(cstate, "'addr4' is only supported on 802.11 with 802.11 headers");
+		bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11 with 802.11 headers");
 		break;
 
 	case Q_RA:
 		bpf_error(cstate, "'ra' is only supported on 802.11 with 802.11 headers");
 		break;
 
 	case Q_TA:
 		bpf_error(cstate, "'ta' is only supported on 802.11 with 802.11 headers");
 		break;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * Like gen_ehostop, but for DLT_FDDI
  */
 static struct block *
 gen_fhostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	struct block *b0, *b1;
 
 	switch (dir) {
 	case Q_SRC:
 		return gen_bcmp(cstate, OR_LINKHDR, 6 + 1 + cstate->pcap_fddipad, 6, eaddr);
 
 	case Q_DST:
 		return gen_bcmp(cstate, OR_LINKHDR, 0 + 1 + cstate->pcap_fddipad, 6, eaddr);
 
 	case Q_AND:
 		b0 = gen_fhostop(cstate, eaddr, Q_SRC);
 		b1 = gen_fhostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_fhostop(cstate, eaddr, Q_SRC);
 		b1 = gen_fhostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ADDR1:
-		bpf_error(cstate, "'addr1' is only supported on 802.11");
+		bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
 		break;
 
 	case Q_ADDR2:
-		bpf_error(cstate, "'addr2' is only supported on 802.11");
+		bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
 		break;
 
 	case Q_ADDR3:
-		bpf_error(cstate, "'addr3' is only supported on 802.11");
+		bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
 		break;
 
 	case Q_ADDR4:
-		bpf_error(cstate, "'addr4' is only supported on 802.11");
+		bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
 		break;
 
 	case Q_RA:
 		bpf_error(cstate, "'ra' is only supported on 802.11");
 		break;
 
 	case Q_TA:
 		bpf_error(cstate, "'ta' is only supported on 802.11");
 		break;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * Like gen_ehostop, but for DLT_IEEE802 (Token Ring)
  */
 static struct block *
 gen_thostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	register struct block *b0, *b1;
 
 	switch (dir) {
 	case Q_SRC:
 		return gen_bcmp(cstate, OR_LINKHDR, 8, 6, eaddr);
 
 	case Q_DST:
 		return gen_bcmp(cstate, OR_LINKHDR, 2, 6, eaddr);
 
 	case Q_AND:
 		b0 = gen_thostop(cstate, eaddr, Q_SRC);
 		b1 = gen_thostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_thostop(cstate, eaddr, Q_SRC);
 		b1 = gen_thostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ADDR1:
-		bpf_error(cstate, "'addr1' is only supported on 802.11");
+		bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
 		break;
 
 	case Q_ADDR2:
-		bpf_error(cstate, "'addr2' is only supported on 802.11");
+		bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
 		break;
 
 	case Q_ADDR3:
-		bpf_error(cstate, "'addr3' is only supported on 802.11");
+		bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
 		break;
 
 	case Q_ADDR4:
-		bpf_error(cstate, "'addr4' is only supported on 802.11");
+		bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
 		break;
 
 	case Q_RA:
 		bpf_error(cstate, "'ra' is only supported on 802.11");
 		break;
 
 	case Q_TA:
 		bpf_error(cstate, "'ta' is only supported on 802.11");
 		break;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * Like gen_ehostop, but for DLT_IEEE802_11 (802.11 wireless LAN) and
  * various 802.11 + radio headers.
  */
 static struct block *
 gen_wlanhostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	register struct block *b0, *b1, *b2;
 	register struct slist *s;
 
 #ifdef ENABLE_WLAN_FILTERING_PATCH
 	/*
 	 * TODO GV 20070613
 	 * We need to disable the optimizer because the optimizer is buggy
 	 * and wipes out some LD instructions generated by the below
 	 * code to validate the Frame Control bits
 	 */
 	cstate->no_optimize = 1;
 #endif /* ENABLE_WLAN_FILTERING_PATCH */
 
 	switch (dir) {
 	case Q_SRC:
 		/*
 		 * Oh, yuk.
 		 *
 		 *	For control frames, there is no SA.
 		 *
 		 *	For management frames, SA is at an
 		 *	offset of 10 from the beginning of
 		 *	the packet.
 		 *
 		 *	For data frames, SA is at an offset
 		 *	of 10 from the beginning of the packet
 		 *	if From DS is clear, at an offset of
 		 *	16 from the beginning of the packet
 		 *	if From DS is set and To DS is clear,
 		 *	and an offset of 24 from the beginning
 		 *	of the packet if From DS is set and To DS
 		 *	is set.
 		 */
 
 		/*
 		 * Generate the tests to be done for data frames
 		 * with From DS set.
 		 *
 		 * First, check for To DS set, i.e. check "link[1] & 0x01".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x01;	/* To DS */
 		b1->stmts = s;
 
 		/*
 		 * If To DS is set, the SA is at 24.
 		 */
 		b0 = gen_bcmp(cstate, OR_LINKHDR, 24, 6, eaddr);
 		gen_and(b1, b0);
 
 		/*
 		 * Now, check for To DS not set, i.e. check
 		 * "!(link[1] & 0x01)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b2 = new_block(cstate, JMP(BPF_JSET));
 		b2->s.k = 0x01;	/* To DS */
 		b2->stmts = s;
 		gen_not(b2);
 
 		/*
 		 * If To DS is not set, the SA is at 16.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 16, 6, eaddr);
 		gen_and(b2, b1);
 
 		/*
 		 * Now OR together the last two checks.  That gives
 		 * the complete set of checks for data frames with
 		 * From DS set.
 		 */
 		gen_or(b1, b0);
 
 		/*
 		 * Now check for From DS being set, and AND that with
 		 * the ORed-together checks.
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x02;	/* From DS */
 		b1->stmts = s;
 		gen_and(b1, b0);
 
 		/*
 		 * Now check for data frames with From DS not set.
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b2 = new_block(cstate, JMP(BPF_JSET));
 		b2->s.k = 0x02;	/* From DS */
 		b2->stmts = s;
 		gen_not(b2);
 
 		/*
 		 * If From DS isn't set, the SA is at 10.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
 		gen_and(b2, b1);
 
 		/*
 		 * Now OR together the checks for data frames with
 		 * From DS not set and for data frames with From DS
 		 * set; that gives the checks done for data frames.
 		 */
 		gen_or(b1, b0);
 
 		/*
 		 * Now check for a data frame.
 		 * I.e, check "link[0] & 0x08".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x08;
 		b1->stmts = s;
 
 		/*
 		 * AND that with the checks done for data frames.
 		 */
 		gen_and(b1, b0);
 
 		/*
 		 * If the high-order bit of the type value is 0, this
 		 * is a management frame.
 		 * I.e, check "!(link[0] & 0x08)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b2 = new_block(cstate, JMP(BPF_JSET));
 		b2->s.k = 0x08;
 		b2->stmts = s;
 		gen_not(b2);
 
 		/*
 		 * For management frames, the SA is at 10.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
 		gen_and(b2, b1);
 
 		/*
 		 * OR that with the checks done for data frames.
 		 * That gives the checks done for management and
 		 * data frames.
 		 */
 		gen_or(b1, b0);
 
 		/*
 		 * If the low-order bit of the type value is 1,
 		 * this is either a control frame or a frame
 		 * with a reserved type, and thus not a
 		 * frame with an SA.
 		 *
 		 * I.e., check "!(link[0] & 0x04)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x04;
 		b1->stmts = s;
 		gen_not(b1);
 
 		/*
 		 * AND that with the checks for data and management
 		 * frames.
 		 */
 		gen_and(b1, b0);
 		return b0;
 
 	case Q_DST:
 		/*
 		 * Oh, yuk.
 		 *
 		 *	For control frames, there is no DA.
 		 *
 		 *	For management frames, DA is at an
 		 *	offset of 4 from the beginning of
 		 *	the packet.
 		 *
 		 *	For data frames, DA is at an offset
 		 *	of 4 from the beginning of the packet
 		 *	if To DS is clear and at an offset of
 		 *	16 from the beginning of the packet
 		 *	if To DS is set.
 		 */
 
 		/*
 		 * Generate the tests to be done for data frames.
 		 *
 		 * First, check for To DS set, i.e. "link[1] & 0x01".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x01;	/* To DS */
 		b1->stmts = s;
 
 		/*
 		 * If To DS is set, the DA is at 16.
 		 */
 		b0 = gen_bcmp(cstate, OR_LINKHDR, 16, 6, eaddr);
 		gen_and(b1, b0);
 
 		/*
 		 * Now, check for To DS not set, i.e. check
 		 * "!(link[1] & 0x01)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 		b2 = new_block(cstate, JMP(BPF_JSET));
 		b2->s.k = 0x01;	/* To DS */
 		b2->stmts = s;
 		gen_not(b2);
 
 		/*
 		 * If To DS is not set, the DA is at 4.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 4, 6, eaddr);
 		gen_and(b2, b1);
 
 		/*
 		 * Now OR together the last two checks.  That gives
 		 * the complete set of checks for data frames.
 		 */
 		gen_or(b1, b0);
 
 		/*
 		 * Now check for a data frame.
 		 * I.e, check "link[0] & 0x08".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x08;
 		b1->stmts = s;
 
 		/*
 		 * AND that with the checks done for data frames.
 		 */
 		gen_and(b1, b0);
 
 		/*
 		 * If the high-order bit of the type value is 0, this
 		 * is a management frame.
 		 * I.e, check "!(link[0] & 0x08)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b2 = new_block(cstate, JMP(BPF_JSET));
 		b2->s.k = 0x08;
 		b2->stmts = s;
 		gen_not(b2);
 
 		/*
 		 * For management frames, the DA is at 4.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 4, 6, eaddr);
 		gen_and(b2, b1);
 
 		/*
 		 * OR that with the checks done for data frames.
 		 * That gives the checks done for management and
 		 * data frames.
 		 */
 		gen_or(b1, b0);
 
 		/*
 		 * If the low-order bit of the type value is 1,
 		 * this is either a control frame or a frame
 		 * with a reserved type, and thus not a
 		 * frame with an SA.
 		 *
 		 * I.e., check "!(link[0] & 0x04)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x04;
 		b1->stmts = s;
 		gen_not(b1);
 
 		/*
 		 * AND that with the checks for data and management
 		 * frames.
 		 */
 		gen_and(b1, b0);
 		return b0;
 
 	case Q_RA:
 		/*
 		 * Not present in management frames; addr1 in other
 		 * frames.
 		 */
 
 		/*
 		 * If the high-order bit of the type value is 0, this
 		 * is a management frame.
 		 * I.e, check "(link[0] & 0x08)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x08;
 		b1->stmts = s;
 
 		/*
 		 * Check addr1.
 		 */
 		b0 = gen_bcmp(cstate, OR_LINKHDR, 4, 6, eaddr);
 
 		/*
 		 * AND that with the check of addr1.
 		 */
 		gen_and(b1, b0);
 		return (b0);
 
 	case Q_TA:
 		/*
 		 * Not present in management frames; addr2, if present,
 		 * in other frames.
 		 */
 
 		/*
 		 * Not present in CTS or ACK control frames.
 		 */
 		b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
 			IEEE80211_FC0_TYPE_MASK);
 		gen_not(b0);
 		b1 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
 			IEEE80211_FC0_SUBTYPE_MASK);
 		gen_not(b1);
 		b2 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
 			IEEE80211_FC0_SUBTYPE_MASK);
 		gen_not(b2);
 		gen_and(b1, b2);
 		gen_or(b0, b2);
 
 		/*
 		 * If the high-order bit of the type value is 0, this
 		 * is a management frame.
 		 * I.e, check "(link[0] & 0x08)".
 		 */
 		s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 		b1 = new_block(cstate, JMP(BPF_JSET));
 		b1->s.k = 0x08;
 		b1->stmts = s;
 
 		/*
 		 * AND that with the check for frames other than
 		 * CTS and ACK frames.
 		 */
 		gen_and(b1, b2);
 
 		/*
 		 * Check addr2.
 		 */
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
 		gen_and(b2, b1);
 		return b1;
 
 	/*
 	 * XXX - add BSSID keyword?
 	 */
 	case Q_ADDR1:
 		return (gen_bcmp(cstate, OR_LINKHDR, 4, 6, eaddr));
 
 	case Q_ADDR2:
 		/*
 		 * Not present in CTS or ACK control frames.
 		 */
 		b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
 			IEEE80211_FC0_TYPE_MASK);
 		gen_not(b0);
 		b1 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_CTS,
 			IEEE80211_FC0_SUBTYPE_MASK);
 		gen_not(b1);
 		b2 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_SUBTYPE_ACK,
 			IEEE80211_FC0_SUBTYPE_MASK);
 		gen_not(b2);
 		gen_and(b1, b2);
 		gen_or(b0, b2);
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
 		gen_and(b2, b1);
 		return b1;
 
 	case Q_ADDR3:
 		/*
 		 * Not present in control frames.
 		 */
 		b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, IEEE80211_FC0_TYPE_CTL,
 			IEEE80211_FC0_TYPE_MASK);
 		gen_not(b0);
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 16, 6, eaddr);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_ADDR4:
 		/*
 		 * Present only if the direction mask has both "From DS"
 		 * and "To DS" set.  Neither control frames nor management
 		 * frames should have both of those set, so we don't
 		 * check the frame type.
 		 */
 		b0 = gen_mcmp(cstate, OR_LINKHDR, 1, BPF_B,
 			IEEE80211_FC1_DIR_DSTODS, IEEE80211_FC1_DIR_MASK);
 		b1 = gen_bcmp(cstate, OR_LINKHDR, 24, 6, eaddr);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_AND:
 		b0 = gen_wlanhostop(cstate, eaddr, Q_SRC);
 		b1 = gen_wlanhostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_wlanhostop(cstate, eaddr, Q_SRC);
 		b1 = gen_wlanhostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * Like gen_ehostop, but for RFC 2625 IP-over-Fibre-Channel.
  * (We assume that the addresses are IEEE 48-bit MAC addresses,
  * as the RFC states.)
  */
 static struct block *
 gen_ipfchostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	register struct block *b0, *b1;
 
 	switch (dir) {
 	case Q_SRC:
 		return gen_bcmp(cstate, OR_LINKHDR, 10, 6, eaddr);
 
 	case Q_DST:
 		return gen_bcmp(cstate, OR_LINKHDR, 2, 6, eaddr);
 
 	case Q_AND:
 		b0 = gen_ipfchostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ipfchostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_ipfchostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ipfchostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ADDR1:
-		bpf_error(cstate, "'addr1' is only supported on 802.11");
+		bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
 		break;
 
 	case Q_ADDR2:
-		bpf_error(cstate, "'addr2' is only supported on 802.11");
+		bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
 		break;
 
 	case Q_ADDR3:
-		bpf_error(cstate, "'addr3' is only supported on 802.11");
+		bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
 		break;
 
 	case Q_ADDR4:
-		bpf_error(cstate, "'addr4' is only supported on 802.11");
+		bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
 		break;
 
 	case Q_RA:
 		bpf_error(cstate, "'ra' is only supported on 802.11");
 		break;
 
 	case Q_TA:
 		bpf_error(cstate, "'ta' is only supported on 802.11");
 		break;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * This is quite tricky because there may be pad bytes in front of the
  * DECNET header, and then there are two possible data packet formats that
  * carry both src and dst addresses, plus 5 packet types in a format that
  * carries only the src node, plus 2 types that use a different format and
  * also carry just the src node.
  *
  * Yuck.
  *
  * Instead of doing those all right, we just look for data packets with
  * 0 or 1 bytes of padding.  If you want to look at other packets, that
  * will require a lot more hacking.
  *
  * To add support for filtering on DECNET "areas" (network numbers)
  * one would want to add a "mask" argument to this routine.  That would
  * make the filter even more inefficient, although one could be clever
  * and not generate masking instructions if the mask is 0xFFFF.
  */
 static struct block *
 gen_dnhostop(compiler_state_t *cstate, bpf_u_int32 addr, int dir)
 {
 	struct block *b0, *b1, *b2, *tmp;
 	u_int offset_lh;	/* offset if long header is received */
 	u_int offset_sh;	/* offset if short header is received */
 
 	switch (dir) {
 
 	case Q_DST:
 		offset_sh = 1;	/* follows flags */
 		offset_lh = 7;	/* flgs,darea,dsubarea,HIORD */
 		break;
 
 	case Q_SRC:
 		offset_sh = 3;	/* follows flags, dstnode */
 		offset_lh = 15;	/* flgs,darea,dsubarea,did,sarea,ssub,HIORD */
 		break;
 
 	case Q_AND:
 		/* Inefficient because we do our Calvinball dance twice */
 		b0 = gen_dnhostop(cstate, addr, Q_SRC);
 		b1 = gen_dnhostop(cstate, addr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		/* Inefficient because we do our Calvinball dance twice */
 		b0 = gen_dnhostop(cstate, addr, Q_SRC);
 		b1 = gen_dnhostop(cstate, addr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ISO:
 		bpf_error(cstate, "ISO host filtering not implemented");
 
 	default:
 		abort();
 	}
 	b0 = gen_linktype(cstate, ETHERTYPE_DN);
 	/* Check for pad = 1, long header case */
 	tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H,
 	    (bpf_int32)ntohs(0x0681), (bpf_int32)ntohs(0x07FF));
 	b1 = gen_cmp(cstate, OR_LINKPL, 2 + 1 + offset_lh,
 	    BPF_H, (bpf_int32)ntohs((u_short)addr));
 	gen_and(tmp, b1);
 	/* Check for pad = 0, long header case */
 	tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, (bpf_int32)0x06, (bpf_int32)0x7);
 	b2 = gen_cmp(cstate, OR_LINKPL, 2 + offset_lh, BPF_H, (bpf_int32)ntohs((u_short)addr));
 	gen_and(tmp, b2);
 	gen_or(b2, b1);
 	/* Check for pad = 1, short header case */
 	tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_H,
 	    (bpf_int32)ntohs(0x0281), (bpf_int32)ntohs(0x07FF));
 	b2 = gen_cmp(cstate, OR_LINKPL, 2 + 1 + offset_sh, BPF_H, (bpf_int32)ntohs((u_short)addr));
 	gen_and(tmp, b2);
 	gen_or(b2, b1);
 	/* Check for pad = 0, short header case */
 	tmp = gen_mcmp(cstate, OR_LINKPL, 2, BPF_B, (bpf_int32)0x02, (bpf_int32)0x7);
 	b2 = gen_cmp(cstate, OR_LINKPL, 2 + offset_sh, BPF_H, (bpf_int32)ntohs((u_short)addr));
 	gen_and(tmp, b2);
 	gen_or(b2, b1);
 
 	/* Combine with test for cstate->linktype */
 	gen_and(b0, b1);
 	return b1;
 }
 
 /*
  * Generate a check for IPv4 or IPv6 for MPLS-encapsulated packets;
  * test the bottom-of-stack bit, and then check the version number
  * field in the IP header.
  */
 static struct block *
 gen_mpls_linktype(compiler_state_t *cstate, int proto)
 {
 	struct block *b0, *b1;
 
         switch (proto) {
 
         case Q_IP:
                 /* match the bottom-of-stack bit */
-                b0 = gen_mcmp(cstate, OR_LINKPL, -2, BPF_B, 0x01, 0x01);
+                b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
                 /* match the IPv4 version number */
                 b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x40, 0xf0);
                 gen_and(b0, b1);
                 return b1;
 
        case Q_IPV6:
                 /* match the bottom-of-stack bit */
-                b0 = gen_mcmp(cstate, OR_LINKPL, -2, BPF_B, 0x01, 0x01);
+                b0 = gen_mcmp(cstate, OR_LINKPL, (u_int)-2, BPF_B, 0x01, 0x01);
                 /* match the IPv4 version number */
                 b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_B, 0x60, 0xf0);
                 gen_and(b0, b1);
                 return b1;
 
        default:
                 abort();
         }
 }
 
 static struct block *
 gen_host(compiler_state_t *cstate, bpf_u_int32 addr, bpf_u_int32 mask,
     int proto, int dir, int type)
 {
 	struct block *b0, *b1;
 	const char *typestr;
 
 	if (type == Q_NET)
 		typestr = "net";
 	else
 		typestr = "host";
 
 	switch (proto) {
 
 	case Q_DEFAULT:
 		b0 = gen_host(cstate, addr, mask, Q_IP, dir, type);
 		/*
 		 * Only check for non-IPv4 addresses if we're not
 		 * checking MPLS-encapsulated packets.
 		 */
 		if (cstate->label_stack_depth == 0) {
 			b1 = gen_host(cstate, addr, mask, Q_ARP, dir, type);
 			gen_or(b0, b1);
 			b0 = gen_host(cstate, addr, mask, Q_RARP, dir, type);
 			gen_or(b1, b0);
 		}
 		return b0;
 
 	case Q_IP:
 		return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_IP, 12, 16);
 
 	case Q_RARP:
 		return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_REVARP, 14, 24);
 
 	case Q_ARP:
 		return gen_hostop(cstate, addr, mask, dir, ETHERTYPE_ARP, 14, 24);
 
 	case Q_TCP:
 		bpf_error(cstate, "'tcp' modifier applied to %s", typestr);
 
 	case Q_SCTP:
 		bpf_error(cstate, "'sctp' modifier applied to %s", typestr);
 
 	case Q_UDP:
 		bpf_error(cstate, "'udp' modifier applied to %s", typestr);
 
 	case Q_ICMP:
 		bpf_error(cstate, "'icmp' modifier applied to %s", typestr);
 
 	case Q_IGMP:
 		bpf_error(cstate, "'igmp' modifier applied to %s", typestr);
 
 	case Q_IGRP:
 		bpf_error(cstate, "'igrp' modifier applied to %s", typestr);
 
 	case Q_PIM:
 		bpf_error(cstate, "'pim' modifier applied to %s", typestr);
 
 	case Q_VRRP:
 		bpf_error(cstate, "'vrrp' modifier applied to %s", typestr);
 
 	case Q_CARP:
 		bpf_error(cstate, "'carp' modifier applied to %s", typestr);
 
 	case Q_ATALK:
 		bpf_error(cstate, "ATALK host filtering not implemented");
 
 	case Q_AARP:
 		bpf_error(cstate, "AARP host filtering not implemented");
 
 	case Q_DECNET:
 		return gen_dnhostop(cstate, addr, dir);
 
 	case Q_SCA:
 		bpf_error(cstate, "SCA host filtering not implemented");
 
 	case Q_LAT:
 		bpf_error(cstate, "LAT host filtering not implemented");
 
 	case Q_MOPDL:
 		bpf_error(cstate, "MOPDL host filtering not implemented");
 
 	case Q_MOPRC:
 		bpf_error(cstate, "MOPRC host filtering not implemented");
 
 	case Q_IPV6:
 		bpf_error(cstate, "'ip6' modifier applied to ip host");
 
 	case Q_ICMPV6:
 		bpf_error(cstate, "'icmp6' modifier applied to %s", typestr);
 
 	case Q_AH:
 		bpf_error(cstate, "'ah' modifier applied to %s", typestr);
 
 	case Q_ESP:
 		bpf_error(cstate, "'esp' modifier applied to %s", typestr);
 
 	case Q_ISO:
 		bpf_error(cstate, "ISO host filtering not implemented");
 
 	case Q_ESIS:
 		bpf_error(cstate, "'esis' modifier applied to %s", typestr);
 
 	case Q_ISIS:
 		bpf_error(cstate, "'isis' modifier applied to %s", typestr);
 
 	case Q_CLNP:
 		bpf_error(cstate, "'clnp' modifier applied to %s", typestr);
 
 	case Q_STP:
 		bpf_error(cstate, "'stp' modifier applied to %s", typestr);
 
 	case Q_IPX:
 		bpf_error(cstate, "IPX host filtering not implemented");
 
 	case Q_NETBEUI:
 		bpf_error(cstate, "'netbeui' modifier applied to %s", typestr);
 
 	case Q_RADIO:
 		bpf_error(cstate, "'radio' modifier applied to %s", typestr);
 
 	default:
 		abort();
 	}
 	/* NOTREACHED */
 }
 
 #ifdef INET6
 static struct block *
 gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
     struct in6_addr *mask, int proto, int dir, int type)
 {
 	const char *typestr;
 
 	if (type == Q_NET)
 		typestr = "net";
 	else
 		typestr = "host";
 
 	switch (proto) {
 
 	case Q_DEFAULT:
 		return gen_host6(cstate, addr, mask, Q_IPV6, dir, type);
 
 	case Q_LINK:
 		bpf_error(cstate, "link-layer modifier applied to ip6 %s", typestr);
 
 	case Q_IP:
 		bpf_error(cstate, "'ip' modifier applied to ip6 %s", typestr);
 
 	case Q_RARP:
 		bpf_error(cstate, "'rarp' modifier applied to ip6 %s", typestr);
 
 	case Q_ARP:
 		bpf_error(cstate, "'arp' modifier applied to ip6 %s", typestr);
 
 	case Q_SCTP:
 		bpf_error(cstate, "'sctp' modifier applied to %s", typestr);
 
 	case Q_TCP:
 		bpf_error(cstate, "'tcp' modifier applied to %s", typestr);
 
 	case Q_UDP:
 		bpf_error(cstate, "'udp' modifier applied to %s", typestr);
 
 	case Q_ICMP:
 		bpf_error(cstate, "'icmp' modifier applied to %s", typestr);
 
 	case Q_IGMP:
 		bpf_error(cstate, "'igmp' modifier applied to %s", typestr);
 
 	case Q_IGRP:
 		bpf_error(cstate, "'igrp' modifier applied to %s", typestr);
 
 	case Q_PIM:
 		bpf_error(cstate, "'pim' modifier applied to %s", typestr);
 
 	case Q_VRRP:
 		bpf_error(cstate, "'vrrp' modifier applied to %s", typestr);
 
 	case Q_CARP:
 		bpf_error(cstate, "'carp' modifier applied to %s", typestr);
 
 	case Q_ATALK:
 		bpf_error(cstate, "ATALK host filtering not implemented");
 
 	case Q_AARP:
 		bpf_error(cstate, "AARP host filtering not implemented");
 
 	case Q_DECNET:
 		bpf_error(cstate, "'decnet' modifier applied to ip6 %s", typestr);
 
 	case Q_SCA:
 		bpf_error(cstate, "SCA host filtering not implemented");
 
 	case Q_LAT:
 		bpf_error(cstate, "LAT host filtering not implemented");
 
 	case Q_MOPDL:
 		bpf_error(cstate, "MOPDL host filtering not implemented");
 
 	case Q_MOPRC:
 		bpf_error(cstate, "MOPRC host filtering not implemented");
 
 	case Q_IPV6:
 		return gen_hostop6(cstate, addr, mask, dir, ETHERTYPE_IPV6, 8, 24);
 
 	case Q_ICMPV6:
 		bpf_error(cstate, "'icmp6' modifier applied to %s", typestr);
 
 	case Q_AH:
 		bpf_error(cstate, "'ah' modifier applied to %s", typestr);
 
 	case Q_ESP:
 		bpf_error(cstate, "'esp' modifier applied to %s", typestr);
 
 	case Q_ISO:
 		bpf_error(cstate, "ISO host filtering not implemented");
 
 	case Q_ESIS:
 		bpf_error(cstate, "'esis' modifier applied to %s", typestr);
 
 	case Q_ISIS:
 		bpf_error(cstate, "'isis' modifier applied to %s", typestr);
 
 	case Q_CLNP:
 		bpf_error(cstate, "'clnp' modifier applied to %s", typestr);
 
 	case Q_STP:
 		bpf_error(cstate, "'stp' modifier applied to %s", typestr);
 
 	case Q_IPX:
 		bpf_error(cstate, "IPX host filtering not implemented");
 
 	case Q_NETBEUI:
 		bpf_error(cstate, "'netbeui' modifier applied to %s", typestr);
 
 	case Q_RADIO:
 		bpf_error(cstate, "'radio' modifier applied to %s", typestr);
 
 	default:
 		abort();
 	}
 	/* NOTREACHED */
 }
 #endif
 
 #ifndef INET6
 static struct block *
-gen_gateway(compiler_state_t *cstate, const u_char *eaddr, bpf_u_int32 **alist,
-    int proto, int dir)
+gen_gateway(compiler_state_t *cstate, const u_char *eaddr,
+    struct addrinfo *alist, int proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
+	struct addrinfo *ai;
+	struct sockaddr_in *sin;
 
 	if (dir != 0)
 		bpf_error(cstate, "direction applied to 'gateway'");
 
 	switch (proto) {
 	case Q_DEFAULT:
 	case Q_IP:
 	case Q_ARP:
 	case Q_RARP:
 		switch (cstate->linktype) {
 		case DLT_EN10MB:
 		case DLT_NETANALYZER:
 		case DLT_NETANALYZER_TRANSPARENT:
 			b1 = gen_prevlinkhdr_check(cstate);
 			b0 = gen_ehostop(cstate, eaddr, Q_OR);
 			if (b1 != NULL)
 				gen_and(b1, b0);
 			break;
 		case DLT_FDDI:
 			b0 = gen_fhostop(cstate, eaddr, Q_OR);
 			break;
 		case DLT_IEEE802:
 			b0 = gen_thostop(cstate, eaddr, Q_OR);
 			break;
 		case DLT_IEEE802_11:
 		case DLT_PRISM_HEADER:
 		case DLT_IEEE802_11_RADIO_AVS:
 		case DLT_IEEE802_11_RADIO:
 		case DLT_PPI:
 			b0 = gen_wlanhostop(cstate, eaddr, Q_OR);
 			break;
 		case DLT_SUNATM:
 			/*
 			 * This is LLC-multiplexed traffic; if it were
 			 * LANE, cstate->linktype would have been set to
 			 * DLT_EN10MB.
 			 */
 			bpf_error(cstate,
 			    "'gateway' supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
 			break;
 		case DLT_IP_OVER_FC:
 			b0 = gen_ipfchostop(cstate, eaddr, Q_OR);
 			break;
 		default:
 			bpf_error(cstate,
 			    "'gateway' supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
 		}
-		b1 = gen_host(cstate, **alist++, 0xffffffff, proto, Q_OR, Q_HOST);
-		while (*alist) {
-			tmp = gen_host(cstate, **alist++, 0xffffffff, proto, Q_OR,
-			    Q_HOST);
-			gen_or(b1, tmp);
-			b1 = tmp;
+		b1 = NULL;
+		for (ai = alist; ai != NULL; ai = ai->ai_next) {
+			/*
+			 * Does it have an address?
+			 */
+			if (ai->ai_addr != NULL) {
+				/*
+				 * Yes.  Is it an IPv4 address?
+				 */
+				if (ai->ai_addr->sa_family == AF_INET) {
+					/*
+					 * Generate an entry for it.
+					 */
+					sin = (struct sockaddr_in *)ai->ai_addr;
+					tmp = gen_host(cstate,
+					    ntohl(sin->sin_addr.s_addr),
+					    0xffffffff, proto, Q_OR, Q_HOST);
+					/*
+					 * Is it the *first* IPv4 address?
+					 */
+					if (b1 == NULL) {
+						/*
+						 * Yes, so start with it.
+						 */
+						b1 = tmp;
+					} else {
+						/*
+						 * No, so OR it into the
+						 * existing set of
+						 * addresses.
+						 */
+						gen_or(b1, tmp);
+						b1 = tmp;
+					}
+				}
+			}
 		}
+		if (b1 == NULL) {
+			/*
+			 * No IPv4 addresses found.
+			 */
+			return (NULL);
+		}
 		gen_not(b1);
 		gen_and(b0, b1);
 		return b1;
 	}
 	bpf_error(cstate, "illegal modifier of 'gateway'");
 	/* NOTREACHED */
 }
 #endif
 
 struct block *
 gen_proto_abbrev(compiler_state_t *cstate, int proto)
 {
 	struct block *b0;
 	struct block *b1;
 
 	switch (proto) {
 
 	case Q_SCTP:
 		b1 = gen_proto(cstate, IPPROTO_SCTP, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_SCTP, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_TCP:
 		b1 = gen_proto(cstate, IPPROTO_TCP, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_TCP, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_UDP:
 		b1 = gen_proto(cstate, IPPROTO_UDP, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_UDP, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ICMP:
 		b1 = gen_proto(cstate, IPPROTO_ICMP, Q_IP, Q_DEFAULT);
 		break;
 
 #ifndef	IPPROTO_IGMP
 #define	IPPROTO_IGMP	2
 #endif
 
 	case Q_IGMP:
 		b1 = gen_proto(cstate, IPPROTO_IGMP, Q_IP, Q_DEFAULT);
 		break;
 
 #ifndef	IPPROTO_IGRP
 #define	IPPROTO_IGRP	9
 #endif
 	case Q_IGRP:
 		b1 = gen_proto(cstate, IPPROTO_IGRP, Q_IP, Q_DEFAULT);
 		break;
 
 #ifndef IPPROTO_PIM
 #define IPPROTO_PIM	103
 #endif
 
 	case Q_PIM:
 		b1 = gen_proto(cstate, IPPROTO_PIM, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_PIM, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 #ifndef IPPROTO_VRRP
 #define IPPROTO_VRRP	112
 #endif
 
 	case Q_VRRP:
 		b1 = gen_proto(cstate, IPPROTO_VRRP, Q_IP, Q_DEFAULT);
 		break;
 
 #ifndef IPPROTO_CARP
 #define IPPROTO_CARP	112
 #endif
 
 	case Q_CARP:
 		b1 = gen_proto(cstate, IPPROTO_CARP, Q_IP, Q_DEFAULT);
 		break;
 
 	case Q_IP:
 		b1 = gen_linktype(cstate, ETHERTYPE_IP);
 		break;
 
 	case Q_ARP:
 		b1 = gen_linktype(cstate, ETHERTYPE_ARP);
 		break;
 
 	case Q_RARP:
 		b1 = gen_linktype(cstate, ETHERTYPE_REVARP);
 		break;
 
 	case Q_LINK:
 		bpf_error(cstate, "link layer applied in wrong context");
 
 	case Q_ATALK:
 		b1 = gen_linktype(cstate, ETHERTYPE_ATALK);
 		break;
 
 	case Q_AARP:
 		b1 = gen_linktype(cstate, ETHERTYPE_AARP);
 		break;
 
 	case Q_DECNET:
 		b1 = gen_linktype(cstate, ETHERTYPE_DN);
 		break;
 
 	case Q_SCA:
 		b1 = gen_linktype(cstate, ETHERTYPE_SCA);
 		break;
 
 	case Q_LAT:
 		b1 = gen_linktype(cstate, ETHERTYPE_LAT);
 		break;
 
 	case Q_MOPDL:
 		b1 = gen_linktype(cstate, ETHERTYPE_MOPDL);
 		break;
 
 	case Q_MOPRC:
 		b1 = gen_linktype(cstate, ETHERTYPE_MOPRC);
 		break;
 
 	case Q_IPV6:
 		b1 = gen_linktype(cstate, ETHERTYPE_IPV6);
 		break;
 
 #ifndef IPPROTO_ICMPV6
 #define IPPROTO_ICMPV6	58
 #endif
 	case Q_ICMPV6:
 		b1 = gen_proto(cstate, IPPROTO_ICMPV6, Q_IPV6, Q_DEFAULT);
 		break;
 
 #ifndef IPPROTO_AH
 #define IPPROTO_AH	51
 #endif
 	case Q_AH:
 		b1 = gen_proto(cstate, IPPROTO_AH, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_AH, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 #ifndef IPPROTO_ESP
 #define IPPROTO_ESP	50
 #endif
 	case Q_ESP:
 		b1 = gen_proto(cstate, IPPROTO_ESP, Q_IP, Q_DEFAULT);
 		b0 = gen_proto(cstate, IPPROTO_ESP, Q_IPV6, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISO:
 		b1 = gen_linktype(cstate, LLCSAP_ISONS);
 		break;
 
 	case Q_ESIS:
 		b1 = gen_proto(cstate, ISO9542_ESIS, Q_ISO, Q_DEFAULT);
 		break;
 
 	case Q_ISIS:
 		b1 = gen_proto(cstate, ISO10589_ISIS, Q_ISO, Q_DEFAULT);
 		break;
 
 	case Q_ISIS_L1: /* all IS-IS Level1 PDU-Types */
 		b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT); /* FIXME extract the circuit-type bits */
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_L2: /* all IS-IS Level2 PDU-Types */
 		b0 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT); /* FIXME extract the circuit-type bits */
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_IIH: /* all IS-IS Hello PDU-Types */
 		b0 = gen_proto(cstate, ISIS_L1_LAN_IIH, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_L2_LAN_IIH, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_PTP_IIH, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_LSP:
 		b0 = gen_proto(cstate, ISIS_L1_LSP, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_L2_LSP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_SNP:
 		b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		b0 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_CSNP:
 		b0 = gen_proto(cstate, ISIS_L1_CSNP, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_L2_CSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_ISIS_PSNP:
 		b0 = gen_proto(cstate, ISIS_L1_PSNP, Q_ISIS, Q_DEFAULT);
 		b1 = gen_proto(cstate, ISIS_L2_PSNP, Q_ISIS, Q_DEFAULT);
 		gen_or(b0, b1);
 		break;
 
 	case Q_CLNP:
 		b1 = gen_proto(cstate, ISO8473_CLNP, Q_ISO, Q_DEFAULT);
 		break;
 
 	case Q_STP:
 		b1 = gen_linktype(cstate, LLCSAP_8021D);
 		break;
 
 	case Q_IPX:
 		b1 = gen_linktype(cstate, LLCSAP_IPX);
 		break;
 
 	case Q_NETBEUI:
 		b1 = gen_linktype(cstate, LLCSAP_NETBEUI);
 		break;
 
 	case Q_RADIO:
 		bpf_error(cstate, "'radio' is not a valid protocol type");
 
 	default:
 		abort();
 	}
 	return b1;
 }
 
 static struct block *
 gen_ipfrag(compiler_state_t *cstate)
 {
 	struct slist *s;
 	struct block *b;
 
 	/* not IPv4 frag other than the first frag */
 	s = gen_load_a(cstate, OR_LINKPL, 6, BPF_H);
 	b = new_block(cstate, JMP(BPF_JSET));
 	b->s.k = 0x1fff;
 	b->stmts = s;
 	gen_not(b);
 
 	return b;
 }
 
 /*
  * Generate a comparison to a port value in the transport-layer header
  * at the specified offset from the beginning of that header.
  *
  * XXX - this handles a variable-length prefix preceding the link-layer
  * header, such as the radiotap or AVS radio prefix, but doesn't handle
  * variable-length link-layer headers (such as Token Ring or 802.11
  * headers).
  */
 static struct block *
 gen_portatom(compiler_state_t *cstate, int off, bpf_int32 v)
 {
 	return gen_cmp(cstate, OR_TRAN_IPV4, off, BPF_H, v);
 }
 
 static struct block *
 gen_portatom6(compiler_state_t *cstate, int off, bpf_int32 v)
 {
 	return gen_cmp(cstate, OR_TRAN_IPV6, off, BPF_H, v);
 }
 
 struct block *
 gen_portop(compiler_state_t *cstate, int port, int proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* ip proto 'proto' and not a fragment other than the first fragment */
 	tmp = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, (bpf_int32)proto);
 	b0 = gen_ipfrag(cstate);
 	gen_and(tmp, b0);
 
 	switch (dir) {
 	case Q_SRC:
 		b1 = gen_portatom(cstate, 0, (bpf_int32)port);
 		break;
 
 	case Q_DST:
 		b1 = gen_portatom(cstate, 2, (bpf_int32)port);
 		break;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		tmp = gen_portatom(cstate, 0, (bpf_int32)port);
 		b1 = gen_portatom(cstate, 2, (bpf_int32)port);
 		gen_or(tmp, b1);
 		break;
 
 	case Q_AND:
 		tmp = gen_portatom(cstate, 0, (bpf_int32)port);
 		b1 = gen_portatom(cstate, 2, (bpf_int32)port);
 		gen_and(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 static struct block *
 gen_port(compiler_state_t *cstate, int port, int ip_proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/*
 	 * ether proto ip
 	 *
 	 * For FDDI, RFC 1188 says that SNAP encapsulation is used,
 	 * not LLC encapsulation with LLCSAP_IP.
 	 *
 	 * For IEEE 802 networks - which includes 802.5 token ring
 	 * (which is what DLT_IEEE802 means) and 802.11 - RFC 1042
 	 * says that SNAP encapsulation is used, not LLC encapsulation
 	 * with LLCSAP_IP.
 	 *
 	 * For LLC-encapsulated ATM/"Classical IP", RFC 1483 and
 	 * RFC 2225 say that SNAP encapsulation is used, not LLC
 	 * encapsulation with LLCSAP_IP.
 	 *
 	 * So we always check for ETHERTYPE_IP.
 	 */
 	b0 = gen_linktype(cstate, ETHERTYPE_IP);
 
 	switch (ip_proto) {
 	case IPPROTO_UDP:
 	case IPPROTO_TCP:
 	case IPPROTO_SCTP:
 		b1 = gen_portop(cstate, port, ip_proto, dir);
 		break;
 
 	case PROTO_UNDEF:
 		tmp = gen_portop(cstate, port, IPPROTO_TCP, dir);
 		b1 = gen_portop(cstate, port, IPPROTO_UDP, dir);
 		gen_or(tmp, b1);
 		tmp = gen_portop(cstate, port, IPPROTO_SCTP, dir);
 		gen_or(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 	return b1;
 }
 
 struct block *
 gen_portop6(compiler_state_t *cstate, int port, int proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* ip6 proto 'proto' */
 	/* XXX - catch the first fragment of a fragmented packet? */
 	b0 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, (bpf_int32)proto);
 
 	switch (dir) {
 	case Q_SRC:
 		b1 = gen_portatom6(cstate, 0, (bpf_int32)port);
 		break;
 
 	case Q_DST:
 		b1 = gen_portatom6(cstate, 2, (bpf_int32)port);
 		break;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		tmp = gen_portatom6(cstate, 0, (bpf_int32)port);
 		b1 = gen_portatom6(cstate, 2, (bpf_int32)port);
 		gen_or(tmp, b1);
 		break;
 
 	case Q_AND:
 		tmp = gen_portatom6(cstate, 0, (bpf_int32)port);
 		b1 = gen_portatom6(cstate, 2, (bpf_int32)port);
 		gen_and(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 static struct block *
 gen_port6(compiler_state_t *cstate, int port, int ip_proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* link proto ip6 */
 	b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
 
 	switch (ip_proto) {
 	case IPPROTO_UDP:
 	case IPPROTO_TCP:
 	case IPPROTO_SCTP:
 		b1 = gen_portop6(cstate, port, ip_proto, dir);
 		break;
 
 	case PROTO_UNDEF:
 		tmp = gen_portop6(cstate, port, IPPROTO_TCP, dir);
 		b1 = gen_portop6(cstate, port, IPPROTO_UDP, dir);
 		gen_or(tmp, b1);
 		tmp = gen_portop6(cstate, port, IPPROTO_SCTP, dir);
 		gen_or(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 	return b1;
 }
 
 /* gen_portrange code */
 static struct block *
 gen_portrangeatom(compiler_state_t *cstate, int off, bpf_int32 v1,
     bpf_int32 v2)
 {
 	struct block *b1, *b2;
 
 	if (v1 > v2) {
 		/*
 		 * Reverse the order of the ports, so v1 is the lower one.
 		 */
 		bpf_int32 vtemp;
 
 		vtemp = v1;
 		v1 = v2;
 		v2 = vtemp;
 	}
 
 	b1 = gen_cmp_ge(cstate, OR_TRAN_IPV4, off, BPF_H, v1);
 	b2 = gen_cmp_le(cstate, OR_TRAN_IPV4, off, BPF_H, v2);
 
 	gen_and(b1, b2);
 
 	return b2;
 }
 
 struct block *
 gen_portrangeop(compiler_state_t *cstate, int port1, int port2, int proto,
     int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* ip proto 'proto' and not a fragment other than the first fragment */
 	tmp = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, (bpf_int32)proto);
 	b0 = gen_ipfrag(cstate);
 	gen_and(tmp, b0);
 
 	switch (dir) {
 	case Q_SRC:
 		b1 = gen_portrangeatom(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		break;
 
 	case Q_DST:
 		b1 = gen_portrangeatom(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		break;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		tmp = gen_portrangeatom(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		b1 = gen_portrangeatom(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		gen_or(tmp, b1);
 		break;
 
 	case Q_AND:
 		tmp = gen_portrangeatom(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		b1 = gen_portrangeatom(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		gen_and(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 static struct block *
 gen_portrange(compiler_state_t *cstate, int port1, int port2, int ip_proto,
     int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* link proto ip */
 	b0 = gen_linktype(cstate, ETHERTYPE_IP);
 
 	switch (ip_proto) {
 	case IPPROTO_UDP:
 	case IPPROTO_TCP:
 	case IPPROTO_SCTP:
 		b1 = gen_portrangeop(cstate, port1, port2, ip_proto, dir);
 		break;
 
 	case PROTO_UNDEF:
 		tmp = gen_portrangeop(cstate, port1, port2, IPPROTO_TCP, dir);
 		b1 = gen_portrangeop(cstate, port1, port2, IPPROTO_UDP, dir);
 		gen_or(tmp, b1);
 		tmp = gen_portrangeop(cstate, port1, port2, IPPROTO_SCTP, dir);
 		gen_or(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 	return b1;
 }
 
 static struct block *
 gen_portrangeatom6(compiler_state_t *cstate, int off, bpf_int32 v1,
     bpf_int32 v2)
 {
 	struct block *b1, *b2;
 
 	if (v1 > v2) {
 		/*
 		 * Reverse the order of the ports, so v1 is the lower one.
 		 */
 		bpf_int32 vtemp;
 
 		vtemp = v1;
 		v1 = v2;
 		v2 = vtemp;
 	}
 
 	b1 = gen_cmp_ge(cstate, OR_TRAN_IPV6, off, BPF_H, v1);
 	b2 = gen_cmp_le(cstate, OR_TRAN_IPV6, off, BPF_H, v2);
 
 	gen_and(b1, b2);
 
 	return b2;
 }
 
 struct block *
 gen_portrangeop6(compiler_state_t *cstate, int port1, int port2, int proto,
     int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* ip6 proto 'proto' */
 	/* XXX - catch the first fragment of a fragmented packet? */
 	b0 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, (bpf_int32)proto);
 
 	switch (dir) {
 	case Q_SRC:
 		b1 = gen_portrangeatom6(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		break;
 
 	case Q_DST:
 		b1 = gen_portrangeatom6(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		break;
 
 	case Q_OR:
 	case Q_DEFAULT:
 		tmp = gen_portrangeatom6(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		b1 = gen_portrangeatom6(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		gen_or(tmp, b1);
 		break;
 
 	case Q_AND:
 		tmp = gen_portrangeatom6(cstate, 0, (bpf_int32)port1, (bpf_int32)port2);
 		b1 = gen_portrangeatom6(cstate, 2, (bpf_int32)port1, (bpf_int32)port2);
 		gen_and(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 static struct block *
 gen_portrange6(compiler_state_t *cstate, int port1, int port2, int ip_proto,
     int dir)
 {
 	struct block *b0, *b1, *tmp;
 
 	/* link proto ip6 */
 	b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
 
 	switch (ip_proto) {
 	case IPPROTO_UDP:
 	case IPPROTO_TCP:
 	case IPPROTO_SCTP:
 		b1 = gen_portrangeop6(cstate, port1, port2, ip_proto, dir);
 		break;
 
 	case PROTO_UNDEF:
 		tmp = gen_portrangeop6(cstate, port1, port2, IPPROTO_TCP, dir);
 		b1 = gen_portrangeop6(cstate, port1, port2, IPPROTO_UDP, dir);
 		gen_or(tmp, b1);
 		tmp = gen_portrangeop6(cstate, port1, port2, IPPROTO_SCTP, dir);
 		gen_or(tmp, b1);
 		break;
 
 	default:
 		abort();
 	}
 	gen_and(b0, b1);
 	return b1;
 }
 
 static int
 lookup_proto(compiler_state_t *cstate, const char *name, int proto)
 {
 	register int v;
 
 	switch (proto) {
 
 	case Q_DEFAULT:
 	case Q_IP:
 	case Q_IPV6:
 		v = pcap_nametoproto(name);
 		if (v == PROTO_UNDEF)
 			bpf_error(cstate, "unknown ip proto '%s'", name);
 		break;
 
 	case Q_LINK:
 		/* XXX should look up h/w protocol type based on cstate->linktype */
 		v = pcap_nametoeproto(name);
 		if (v == PROTO_UNDEF) {
 			v = pcap_nametollc(name);
 			if (v == PROTO_UNDEF)
 				bpf_error(cstate, "unknown ether proto '%s'", name);
 		}
 		break;
 
 	case Q_ISO:
 		if (strcmp(name, "esis") == 0)
 			v = ISO9542_ESIS;
 		else if (strcmp(name, "isis") == 0)
 			v = ISO10589_ISIS;
 		else if (strcmp(name, "clnp") == 0)
 			v = ISO8473_CLNP;
 		else
 			bpf_error(cstate, "unknown osi proto '%s'", name);
 		break;
 
 	default:
 		v = PROTO_UNDEF;
 		break;
 	}
 	return v;
 }
 
 #if 0
 struct stmt *
-gen_joinsp(s, n)
-	struct stmt **s;
-	int n;
+gen_joinsp(struct stmt **s, int n)
 {
 	return NULL;
 }
 #endif
 
 static struct block *
 gen_protochain(compiler_state_t *cstate, int v, int proto, int dir)
 {
 #ifdef NO_PROTOCHAIN
 	return gen_proto(cstate, v, proto, dir);
 #else
 	struct block *b0, *b;
 	struct slist *s[100];
 	int fix2, fix3, fix4, fix5;
 	int ahcheck, again, end;
 	int i, max;
 	int reg2 = alloc_reg(cstate);
 
 	memset(s, 0, sizeof(s));
 	fix3 = fix4 = fix5 = 0;
 
 	switch (proto) {
 	case Q_IP:
 	case Q_IPV6:
 		break;
 	case Q_DEFAULT:
 		b0 = gen_protochain(cstate, v, Q_IP, dir);
 		b = gen_protochain(cstate, v, Q_IPV6, dir);
 		gen_or(b0, b);
 		return b;
 	default:
 		bpf_error(cstate, "bad protocol applied for 'protochain'");
 		/*NOTREACHED*/
 	}
 
 	/*
 	 * We don't handle variable-length prefixes before the link-layer
 	 * header, or variable-length link-layer headers, here yet.
 	 * We might want to add BPF instructions to do the protochain
 	 * work, to simplify that and, on platforms that have a BPF
 	 * interpreter with the new instructions, let the filtering
 	 * be done in the kernel.  (We already require a modified BPF
 	 * engine to do the protochain stuff, to support backward
 	 * branches, and backward branch support is unlikely to appear
 	 * in kernel BPF engines.)
 	 */
 	if (cstate->off_linkpl.is_variable)
 		bpf_error(cstate, "'protochain' not supported with variable length headers");
 
-	cstate->no_optimize = 1; /*this code is not compatible with optimzer yet */
+	cstate->no_optimize = 1; /* this code is not compatible with optimizer yet */
 
 	/*
 	 * s[0] is a dummy entry to protect other BPF insn from damage
 	 * by s[fix] = foo with uninitialized variable "fix".  It is somewhat
 	 * hard to find interdependency made by jump table fixup.
 	 */
 	i = 0;
 	s[i] = new_stmt(cstate, 0);	/*dummy*/
 	i++;
 
 	switch (proto) {
 	case Q_IP:
 		b0 = gen_linktype(cstate, ETHERTYPE_IP);
 
 		/* A = ip->ip_p */
 		s[i] = new_stmt(cstate, BPF_LD|BPF_ABS|BPF_B);
 		s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 9;
 		i++;
 		/* X = ip->ip_hl << 2 */
 		s[i] = new_stmt(cstate, BPF_LDX|BPF_MSH|BPF_B);
 		s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 		i++;
 		break;
 
 	case Q_IPV6:
 		b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
 
 		/* A = ip6->ip_nxt */
 		s[i] = new_stmt(cstate, BPF_LD|BPF_ABS|BPF_B);
 		s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 6;
 		i++;
 		/* X = sizeof(struct ip6_hdr) */
 		s[i] = new_stmt(cstate, BPF_LDX|BPF_IMM);
 		s[i]->s.k = 40;
 		i++;
 		break;
 
 	default:
 		bpf_error(cstate, "unsupported proto to gen_protochain");
 		/*NOTREACHED*/
 	}
 
 	/* again: if (A == v) goto end; else fall through; */
 	again = i;
 	s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 	s[i]->s.k = v;
 	s[i]->s.jt = NULL;		/*later*/
 	s[i]->s.jf = NULL;		/*update in next stmt*/
 	fix5 = i;
 	i++;
 
 #ifndef IPPROTO_NONE
 #define IPPROTO_NONE	59
 #endif
 	/* if (A == IPPROTO_NONE) goto end */
 	s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 	s[i]->s.jt = NULL;	/*later*/
 	s[i]->s.jf = NULL;	/*update in next stmt*/
 	s[i]->s.k = IPPROTO_NONE;
 	s[fix5]->s.jf = s[i];
 	fix2 = i;
 	i++;
 
 	if (proto == Q_IPV6) {
 		int v6start, v6end, v6advance, j;
 
 		v6start = i;
 		/* if (A == IPPROTO_HOPOPTS) goto v6advance */
 		s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 		s[i]->s.jt = NULL;	/*later*/
 		s[i]->s.jf = NULL;	/*update in next stmt*/
 		s[i]->s.k = IPPROTO_HOPOPTS;
 		s[fix2]->s.jf = s[i];
 		i++;
 		/* if (A == IPPROTO_DSTOPTS) goto v6advance */
 		s[i - 1]->s.jf = s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 		s[i]->s.jt = NULL;	/*later*/
 		s[i]->s.jf = NULL;	/*update in next stmt*/
 		s[i]->s.k = IPPROTO_DSTOPTS;
 		i++;
 		/* if (A == IPPROTO_ROUTING) goto v6advance */
 		s[i - 1]->s.jf = s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 		s[i]->s.jt = NULL;	/*later*/
 		s[i]->s.jf = NULL;	/*update in next stmt*/
 		s[i]->s.k = IPPROTO_ROUTING;
 		i++;
 		/* if (A == IPPROTO_FRAGMENT) goto v6advance; else goto ahcheck; */
 		s[i - 1]->s.jf = s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 		s[i]->s.jt = NULL;	/*later*/
 		s[i]->s.jf = NULL;	/*later*/
 		s[i]->s.k = IPPROTO_FRAGMENT;
 		fix3 = i;
 		v6end = i;
 		i++;
 
 		/* v6advance: */
 		v6advance = i;
 
 		/*
 		 * in short,
 		 * A = P[X + packet head];
 		 * X = X + (P[X + packet head + 1] + 1) * 8;
 		 */
 		/* A = P[X + packet head] */
 		s[i] = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 		s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 		i++;
 		/* MEM[reg2] = A */
 		s[i] = new_stmt(cstate, BPF_ST);
 		s[i]->s.k = reg2;
 		i++;
 		/* A = P[X + packet head + 1]; */
 		s[i] = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 		s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 1;
 		i++;
 		/* A += 1 */
 		s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 		s[i]->s.k = 1;
 		i++;
 		/* A *= 8 */
 		s[i] = new_stmt(cstate, BPF_ALU|BPF_MUL|BPF_K);
 		s[i]->s.k = 8;
 		i++;
 		/* A += X */
 		s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X);
 		s[i]->s.k = 0;
 		i++;
 		/* X = A; */
 		s[i] = new_stmt(cstate, BPF_MISC|BPF_TAX);
 		i++;
 		/* A = MEM[reg2] */
 		s[i] = new_stmt(cstate, BPF_LD|BPF_MEM);
 		s[i]->s.k = reg2;
 		i++;
 
 		/* goto again; (must use BPF_JA for backward jump) */
 		s[i] = new_stmt(cstate, BPF_JMP|BPF_JA);
 		s[i]->s.k = again - i - 1;
 		s[i - 1]->s.jf = s[i];
 		i++;
 
 		/* fixup */
 		for (j = v6start; j <= v6end; j++)
 			s[j]->s.jt = s[v6advance];
 	} else {
 		/* nop */
 		s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 		s[i]->s.k = 0;
 		s[fix2]->s.jf = s[i];
 		i++;
 	}
 
 	/* ahcheck: */
 	ahcheck = i;
 	/* if (A == IPPROTO_AH) then fall through; else goto end; */
 	s[i] = new_stmt(cstate, BPF_JMP|BPF_JEQ|BPF_K);
 	s[i]->s.jt = NULL;	/*later*/
 	s[i]->s.jf = NULL;	/*later*/
 	s[i]->s.k = IPPROTO_AH;
 	if (fix3)
 		s[fix3]->s.jf = s[ahcheck];
 	fix4 = i;
 	i++;
 
 	/*
 	 * in short,
 	 * A = P[X];
 	 * X = X + (P[X + 1] + 2) * 4;
 	 */
 	/* A = X */
 	s[i - 1]->s.jt = s[i] = new_stmt(cstate, BPF_MISC|BPF_TXA);
 	i++;
 	/* A = P[X + packet head]; */
 	s[i] = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 	s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 	i++;
 	/* MEM[reg2] = A */
 	s[i] = new_stmt(cstate, BPF_ST);
 	s[i]->s.k = reg2;
 	i++;
 	/* A = X */
 	s[i - 1]->s.jt = s[i] = new_stmt(cstate, BPF_MISC|BPF_TXA);
 	i++;
 	/* A += 1 */
 	s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s[i]->s.k = 1;
 	i++;
 	/* X = A */
 	s[i] = new_stmt(cstate, BPF_MISC|BPF_TAX);
 	i++;
 	/* A = P[X + packet head] */
 	s[i] = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 	s[i]->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 	i++;
 	/* A += 2 */
 	s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s[i]->s.k = 2;
 	i++;
 	/* A *= 4 */
 	s[i] = new_stmt(cstate, BPF_ALU|BPF_MUL|BPF_K);
 	s[i]->s.k = 4;
 	i++;
 	/* X = A; */
 	s[i] = new_stmt(cstate, BPF_MISC|BPF_TAX);
 	i++;
 	/* A = MEM[reg2] */
 	s[i] = new_stmt(cstate, BPF_LD|BPF_MEM);
 	s[i]->s.k = reg2;
 	i++;
 
 	/* goto again; (must use BPF_JA for backward jump) */
 	s[i] = new_stmt(cstate, BPF_JMP|BPF_JA);
 	s[i]->s.k = again - i - 1;
 	i++;
 
 	/* end: nop */
 	end = i;
 	s[i] = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s[i]->s.k = 0;
 	s[fix2]->s.jt = s[end];
 	s[fix4]->s.jf = s[end];
 	s[fix5]->s.jt = s[end];
 	i++;
 
 	/*
 	 * make slist chain
 	 */
 	max = i;
 	for (i = 0; i < max - 1; i++)
 		s[i]->next = s[i + 1];
 	s[max - 1]->next = NULL;
 
 	/*
 	 * emit final check
 	 */
 	b = new_block(cstate, JMP(BPF_JEQ));
 	b->stmts = s[1];	/*remember, s[0] is dummy*/
 	b->s.k = v;
 
 	free_reg(cstate, reg2);
 
 	gen_and(b0, b);
 	return b;
 #endif
 }
 
 static struct block *
 gen_check_802_11_data_frame(compiler_state_t *cstate)
 {
 	struct slist *s;
 	struct block *b0, *b1;
 
 	/*
 	 * A data frame has the 0x08 bit (b3) in the frame control field set
 	 * and the 0x04 bit (b2) clear.
 	 */
 	s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 	b0 = new_block(cstate, JMP(BPF_JSET));
 	b0->s.k = 0x08;
 	b0->stmts = s;
 
 	s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 	b1 = new_block(cstate, JMP(BPF_JSET));
 	b1->s.k = 0x04;
 	b1->stmts = s;
 	gen_not(b1);
 
 	gen_and(b1, b0);
 
 	return b0;
 }
 
 /*
  * Generate code that checks whether the packet is a packet for protocol
  * <proto> and whether the type field in that protocol's header has
  * the value <v>, e.g. if <proto> is Q_IP, it checks whether it's an
  * IP packet and checks the protocol number in the IP header against <v>.
  *
  * If <proto> is Q_DEFAULT, i.e. just "proto" was specified, it checks
  * against Q_IP and Q_IPV6.
  */
 static struct block *
 gen_proto(compiler_state_t *cstate, int v, int proto, int dir)
 {
 	struct block *b0, *b1;
 #ifndef CHASE_CHAIN
 	struct block *b2;
 #endif
 
 	if (dir != Q_DEFAULT)
 		bpf_error(cstate, "direction applied to 'proto'");
 
 	switch (proto) {
 	case Q_DEFAULT:
 		b0 = gen_proto(cstate, v, Q_IP, dir);
 		b1 = gen_proto(cstate, v, Q_IPV6, dir);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_IP:
 		/*
 		 * For FDDI, RFC 1188 says that SNAP encapsulation is used,
 		 * not LLC encapsulation with LLCSAP_IP.
 		 *
 		 * For IEEE 802 networks - which includes 802.5 token ring
 		 * (which is what DLT_IEEE802 means) and 802.11 - RFC 1042
 		 * says that SNAP encapsulation is used, not LLC encapsulation
 		 * with LLCSAP_IP.
 		 *
 		 * For LLC-encapsulated ATM/"Classical IP", RFC 1483 and
 		 * RFC 2225 say that SNAP encapsulation is used, not LLC
 		 * encapsulation with LLCSAP_IP.
 		 *
 		 * So we always check for ETHERTYPE_IP.
 		 */
 		b0 = gen_linktype(cstate, ETHERTYPE_IP);
 #ifndef CHASE_CHAIN
 		b1 = gen_cmp(cstate, OR_LINKPL, 9, BPF_B, (bpf_int32)v);
 #else
 		b1 = gen_protochain(cstate, v, Q_IP);
 #endif
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_ISO:
 		switch (cstate->linktype) {
 
 		case DLT_FRELAY:
 			/*
 			 * Frame Relay packets typically have an OSI
 			 * NLPID at the beginning; "gen_linktype(cstate, LLCSAP_ISONS)"
 			 * generates code to check for all the OSI
 			 * NLPIDs, so calling it and then adding a check
 			 * for the particular NLPID for which we're
 			 * looking is bogus, as we can just check for
 			 * the NLPID.
 			 *
 			 * What we check for is the NLPID and a frame
 			 * control field value of UI, i.e. 0x03 followed
 			 * by the NLPID.
 			 *
 			 * XXX - assumes a 2-byte Frame Relay header with
 			 * DLCI and flags.  What if the address is longer?
 			 *
 			 * XXX - what about SNAP-encapsulated frames?
 			 */
 			return gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, (0x03<<8) | v);
 			/*NOTREACHED*/
 			break;
 
 		case DLT_C_HDLC:
 			/*
 			 * Cisco uses an Ethertype lookalike - for OSI,
 			 * it's 0xfefe.
 			 */
 			b0 = gen_linktype(cstate, LLCSAP_ISONS<<8 | LLCSAP_ISONS);
 			/* OSI in C-HDLC is stuffed with a fudge byte */
 			b1 = gen_cmp(cstate, OR_LINKPL_NOSNAP, 1, BPF_B, (long)v);
 			gen_and(b0, b1);
 			return b1;
 
 		default:
 			b0 = gen_linktype(cstate, LLCSAP_ISONS);
 			b1 = gen_cmp(cstate, OR_LINKPL_NOSNAP, 0, BPF_B, (long)v);
 			gen_and(b0, b1);
 			return b1;
 		}
 
 	case Q_ISIS:
 		b0 = gen_proto(cstate, ISO10589_ISIS, Q_ISO, Q_DEFAULT);
 		/*
 		 * 4 is the offset of the PDU type relative to the IS-IS
 		 * header.
 		 */
 		b1 = gen_cmp(cstate, OR_LINKPL_NOSNAP, 4, BPF_B, (long)v);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_ARP:
 		bpf_error(cstate, "arp does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_RARP:
 		bpf_error(cstate, "rarp does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_ATALK:
 		bpf_error(cstate, "atalk encapsulation is not specifiable");
 		/* NOTREACHED */
 
 	case Q_DECNET:
 		bpf_error(cstate, "decnet encapsulation is not specifiable");
 		/* NOTREACHED */
 
 	case Q_SCA:
 		bpf_error(cstate, "sca does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_LAT:
 		bpf_error(cstate, "lat does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_MOPRC:
 		bpf_error(cstate, "moprc does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_MOPDL:
 		bpf_error(cstate, "mopdl does not encapsulate another protocol");
 		/* NOTREACHED */
 
 	case Q_LINK:
 		return gen_linktype(cstate, v);
 
 	case Q_UDP:
 		bpf_error(cstate, "'udp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_TCP:
 		bpf_error(cstate, "'tcp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_SCTP:
 		bpf_error(cstate, "'sctp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_ICMP:
 		bpf_error(cstate, "'icmp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_IGMP:
 		bpf_error(cstate, "'igmp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_IGRP:
 		bpf_error(cstate, "'igrp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_PIM:
 		bpf_error(cstate, "'pim proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_VRRP:
 		bpf_error(cstate, "'vrrp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_CARP:
 		bpf_error(cstate, "'carp proto' is bogus");
 		/* NOTREACHED */
 
 	case Q_IPV6:
 		b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
 #ifndef CHASE_CHAIN
 		/*
 		 * Also check for a fragment header before the final
 		 * header.
 		 */
 		b2 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, IPPROTO_FRAGMENT);
 		b1 = gen_cmp(cstate, OR_LINKPL, 40, BPF_B, (bpf_int32)v);
 		gen_and(b2, b1);
 		b2 = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, (bpf_int32)v);
 		gen_or(b2, b1);
 #else
 		b1 = gen_protochain(cstate, v, Q_IPV6);
 #endif
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_ICMPV6:
 		bpf_error(cstate, "'icmp6 proto' is bogus");
 
 	case Q_AH:
 		bpf_error(cstate, "'ah proto' is bogus");
 
 	case Q_ESP:
 		bpf_error(cstate, "'ah proto' is bogus");
 
 	case Q_STP:
 		bpf_error(cstate, "'stp proto' is bogus");
 
 	case Q_IPX:
 		bpf_error(cstate, "'ipx proto' is bogus");
 
 	case Q_NETBEUI:
 		bpf_error(cstate, "'netbeui proto' is bogus");
 
 	case Q_RADIO:
 		bpf_error(cstate, "'radio proto' is bogus");
 
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 	/* NOTREACHED */
 }
 
 struct block *
 gen_scode(compiler_state_t *cstate, const char *name, struct qual q)
 {
 	int proto = q.proto;
 	int dir = q.dir;
 	int tproto;
 	u_char *eaddr;
 	bpf_u_int32 mask, addr;
-#ifndef INET6
-	bpf_u_int32 **alist;
-#else
-	int tproto6;
+	struct addrinfo *res, *res0;
 	struct sockaddr_in *sin4;
+#ifdef INET6
+	int tproto6;
 	struct sockaddr_in6 *sin6;
-	struct addrinfo *res, *res0;
 	struct in6_addr mask128;
 #endif /*INET6*/
 	struct block *b, *tmp;
 	int port, real_proto;
 	int port1, port2;
 
 	switch (q.addr) {
 
 	case Q_NET:
 		addr = pcap_nametonetaddr(name);
 		if (addr == 0)
 			bpf_error(cstate, "unknown network '%s'", name);
 		/* Left justify network addr and calculate its network mask */
 		mask = 0xffffffff;
 		while (addr && (addr & 0xff000000) == 0) {
 			addr <<= 8;
 			mask <<= 8;
 		}
 		return gen_host(cstate, addr, mask, proto, dir, q.addr);
 
 	case Q_DEFAULT:
 	case Q_HOST:
 		if (proto == Q_LINK) {
 			switch (cstate->linktype) {
 
 			case DLT_EN10MB:
 			case DLT_NETANALYZER:
 			case DLT_NETANALYZER_TRANSPARENT:
 				eaddr = pcap_ether_hostton(name);
 				if (eaddr == NULL)
 					bpf_error(cstate,
 					    "unknown ether host '%s'", name);
 				tmp = gen_prevlinkhdr_check(cstate);
 				b = gen_ehostop(cstate, eaddr, dir);
 				if (tmp != NULL)
 					gen_and(tmp, b);
 				free(eaddr);
 				return b;
 
 			case DLT_FDDI:
 				eaddr = pcap_ether_hostton(name);
 				if (eaddr == NULL)
 					bpf_error(cstate,
 					    "unknown FDDI host '%s'", name);
 				b = gen_fhostop(cstate, eaddr, dir);
 				free(eaddr);
 				return b;
 
 			case DLT_IEEE802:
 				eaddr = pcap_ether_hostton(name);
 				if (eaddr == NULL)
 					bpf_error(cstate,
 					    "unknown token ring host '%s'", name);
 				b = gen_thostop(cstate, eaddr, dir);
 				free(eaddr);
 				return b;
 
 			case DLT_IEEE802_11:
 			case DLT_PRISM_HEADER:
 			case DLT_IEEE802_11_RADIO_AVS:
 			case DLT_IEEE802_11_RADIO:
 			case DLT_PPI:
 				eaddr = pcap_ether_hostton(name);
 				if (eaddr == NULL)
 					bpf_error(cstate,
 					    "unknown 802.11 host '%s'", name);
 				b = gen_wlanhostop(cstate, eaddr, dir);
 				free(eaddr);
 				return b;
 
 			case DLT_IP_OVER_FC:
 				eaddr = pcap_ether_hostton(name);
 				if (eaddr == NULL)
 					bpf_error(cstate,
 					    "unknown Fibre Channel host '%s'", name);
 				b = gen_ipfchostop(cstate, eaddr, dir);
 				free(eaddr);
 				return b;
 			}
 
 			bpf_error(cstate, "only ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel supports link-level host name");
 		} else if (proto == Q_DECNET) {
 			unsigned short dn_addr;
 
 			if (!__pcap_nametodnaddr(name, &dn_addr)) {
 #ifdef	DECNETLIB
 				bpf_error(cstate, "unknown decnet host name '%s'\n", name);
 #else
 				bpf_error(cstate, "decnet name support not included, '%s' cannot be translated\n",
 					name);
 #endif
 			}
 			/*
 			 * I don't think DECNET hosts can be multihomed, so
 			 * there is no need to build up a list of addresses
 			 */
 			return (gen_host(cstate, dn_addr, 0, proto, dir, q.addr));
 		} else {
-#ifndef INET6
-			alist = pcap_nametoaddr(name);
-			if (alist == NULL || *alist == NULL)
-				bpf_error(cstate, "unknown host '%s'", name);
-			tproto = proto;
-			if (cstate->off_linktype.constant_part == OFFSET_NOT_SET &&
-			    tproto == Q_DEFAULT)
-				tproto = Q_IP;
-			b = gen_host(cstate, **alist++, 0xffffffff, tproto, dir, q.addr);
-			while (*alist) {
-				tmp = gen_host(cstate, **alist++, 0xffffffff,
-					       tproto, dir, q.addr);
-				gen_or(b, tmp);
-				b = tmp;
-			}
-			return b;
-#else
+#ifdef INET6
 			memset(&mask128, 0xff, sizeof(mask128));
+#endif
 			res0 = res = pcap_nametoaddrinfo(name);
 			if (res == NULL)
 				bpf_error(cstate, "unknown host '%s'", name);
 			cstate->ai = res;
 			b = tmp = NULL;
-			tproto = tproto6 = proto;
+			tproto = proto;
+#ifdef INET6
+			tproto6 = proto;
+#endif
 			if (cstate->off_linktype.constant_part == OFFSET_NOT_SET &&
 			    tproto == Q_DEFAULT) {
 				tproto = Q_IP;
+#ifdef INET6
 				tproto6 = Q_IPV6;
+#endif
 			}
 			for (res = res0; res; res = res->ai_next) {
 				switch (res->ai_family) {
 				case AF_INET:
+#ifdef INET6
 					if (tproto == Q_IPV6)
 						continue;
+#endif
 
 					sin4 = (struct sockaddr_in *)
 						res->ai_addr;
 					tmp = gen_host(cstate, ntohl(sin4->sin_addr.s_addr),
 						0xffffffff, tproto, dir, q.addr);
 					break;
+#ifdef INET6
 				case AF_INET6:
 					if (tproto6 == Q_IP)
 						continue;
 
 					sin6 = (struct sockaddr_in6 *)
 						res->ai_addr;
 					tmp = gen_host6(cstate, &sin6->sin6_addr,
 						&mask128, tproto6, dir, q.addr);
 					break;
+#endif
 				default:
 					continue;
 				}
 				if (b)
 					gen_or(b, tmp);
 				b = tmp;
 			}
 			cstate->ai = NULL;
 			freeaddrinfo(res0);
 			if (b == NULL) {
 				bpf_error(cstate, "unknown host '%s'%s", name,
 				    (proto == Q_DEFAULT)
 					? ""
 					: " for specified address family");
 			}
 			return b;
-#endif /*INET6*/
 		}
 
 	case Q_PORT:
 		if (proto != Q_DEFAULT &&
 		    proto != Q_UDP && proto != Q_TCP && proto != Q_SCTP)
 			bpf_error(cstate, "illegal qualifier of 'port'");
 		if (pcap_nametoport(name, &port, &real_proto) == 0)
 			bpf_error(cstate, "unknown port '%s'", name);
 		if (proto == Q_UDP) {
 			if (real_proto == IPPROTO_TCP)
 				bpf_error(cstate, "port '%s' is tcp", name);
 			else if (real_proto == IPPROTO_SCTP)
 				bpf_error(cstate, "port '%s' is sctp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_UDP;
 		}
 		if (proto == Q_TCP) {
 			if (real_proto == IPPROTO_UDP)
 				bpf_error(cstate, "port '%s' is udp", name);
 
 			else if (real_proto == IPPROTO_SCTP)
 				bpf_error(cstate, "port '%s' is sctp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_TCP;
 		}
 		if (proto == Q_SCTP) {
 			if (real_proto == IPPROTO_UDP)
 				bpf_error(cstate, "port '%s' is udp", name);
 
 			else if (real_proto == IPPROTO_TCP)
 				bpf_error(cstate, "port '%s' is tcp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_SCTP;
 		}
 		if (port < 0)
 			bpf_error(cstate, "illegal port number %d < 0", port);
 		if (port > 65535)
 			bpf_error(cstate, "illegal port number %d > 65535", port);
 		b = gen_port(cstate, port, real_proto, dir);
 		gen_or(gen_port6(cstate, port, real_proto, dir), b);
 		return b;
 
 	case Q_PORTRANGE:
 		if (proto != Q_DEFAULT &&
 		    proto != Q_UDP && proto != Q_TCP && proto != Q_SCTP)
 			bpf_error(cstate, "illegal qualifier of 'portrange'");
 		if (pcap_nametoportrange(name, &port1, &port2, &real_proto) == 0)
 			bpf_error(cstate, "unknown port in range '%s'", name);
 		if (proto == Q_UDP) {
 			if (real_proto == IPPROTO_TCP)
 				bpf_error(cstate, "port in range '%s' is tcp", name);
 			else if (real_proto == IPPROTO_SCTP)
 				bpf_error(cstate, "port in range '%s' is sctp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_UDP;
 		}
 		if (proto == Q_TCP) {
 			if (real_proto == IPPROTO_UDP)
 				bpf_error(cstate, "port in range '%s' is udp", name);
 			else if (real_proto == IPPROTO_SCTP)
 				bpf_error(cstate, "port in range '%s' is sctp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_TCP;
 		}
 		if (proto == Q_SCTP) {
 			if (real_proto == IPPROTO_UDP)
 				bpf_error(cstate, "port in range '%s' is udp", name);
 			else if (real_proto == IPPROTO_TCP)
 				bpf_error(cstate, "port in range '%s' is tcp", name);
 			else
 				/* override PROTO_UNDEF */
 				real_proto = IPPROTO_SCTP;
 		}
 		if (port1 < 0)
 			bpf_error(cstate, "illegal port number %d < 0", port1);
 		if (port1 > 65535)
 			bpf_error(cstate, "illegal port number %d > 65535", port1);
 		if (port2 < 0)
 			bpf_error(cstate, "illegal port number %d < 0", port2);
 		if (port2 > 65535)
 			bpf_error(cstate, "illegal port number %d > 65535", port2);
 
 		b = gen_portrange(cstate, port1, port2, real_proto, dir);
 		gen_or(gen_portrange6(cstate, port1, port2, real_proto, dir), b);
 		return b;
 
 	case Q_GATEWAY:
 #ifndef INET6
 		eaddr = pcap_ether_hostton(name);
 		if (eaddr == NULL)
 			bpf_error(cstate, "unknown ether host: %s", name);
 
-		alist = pcap_nametoaddr(name);
-		if (alist == NULL || *alist == NULL)
+		res = pcap_nametoaddrinfo(name);
+		cstate->ai = res;
+		if (res == NULL)
 			bpf_error(cstate, "unknown host '%s'", name);
-		b = gen_gateway(cstate, eaddr, alist, proto, dir);
-		free(eaddr);
+		b = gen_gateway(cstate, eaddr, res, proto, dir);
+		cstate->ai = NULL;
+		freeaddrinfo(res);
+		if (b == NULL)
+			bpf_error(cstate, "unknown host '%s'", name);
 		return b;
 #else
 		bpf_error(cstate, "'gateway' not supported in this configuration");
 #endif /*INET6*/
 
 	case Q_PROTO:
 		real_proto = lookup_proto(cstate, name, proto);
 		if (real_proto >= 0)
 			return gen_proto(cstate, real_proto, proto, dir);
 		else
 			bpf_error(cstate, "unknown protocol: %s", name);
 
 	case Q_PROTOCHAIN:
 		real_proto = lookup_proto(cstate, name, proto);
 		if (real_proto >= 0)
 			return gen_protochain(cstate, real_proto, proto, dir);
 		else
 			bpf_error(cstate, "unknown protocol: %s", name);
 
 	case Q_UNDEF:
 		syntax(cstate);
 		/* NOTREACHED */
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 struct block *
 gen_mcode(compiler_state_t *cstate, const char *s1, const char *s2,
     unsigned int masklen, struct qual q)
 {
 	register int nlen, mlen;
 	bpf_u_int32 n, m;
 
 	nlen = __pcap_atoin(s1, &n);
 	/* Promote short ipaddr */
 	n <<= 32 - nlen;
 
 	if (s2 != NULL) {
 		mlen = __pcap_atoin(s2, &m);
 		/* Promote short ipaddr */
 		m <<= 32 - mlen;
 		if ((n & ~m) != 0)
 			bpf_error(cstate, "non-network bits set in \"%s mask %s\"",
 			    s1, s2);
 	} else {
 		/* Convert mask len to mask */
 		if (masklen > 32)
 			bpf_error(cstate, "mask length must be <= 32");
 		if (masklen == 0) {
 			/*
 			 * X << 32 is not guaranteed by C to be 0; it's
 			 * undefined.
 			 */
 			m = 0;
 		} else
 			m = 0xffffffff << (32 - masklen);
 		if ((n & ~m) != 0)
 			bpf_error(cstate, "non-network bits set in \"%s/%d\"",
 			    s1, masklen);
 	}
 
 	switch (q.addr) {
 
 	case Q_NET:
 		return gen_host(cstate, n, m, q.proto, q.dir, q.addr);
 
 	default:
 		bpf_error(cstate, "Mask syntax for networks only");
 		/* NOTREACHED */
 	}
 	/* NOTREACHED */
-	return NULL;
 }
 
 struct block *
 gen_ncode(compiler_state_t *cstate, const char *s, bpf_u_int32 v, struct qual q)
 {
 	bpf_u_int32 mask;
 	int proto = q.proto;
 	int dir = q.dir;
 	register int vlen;
 
 	if (s == NULL)
 		vlen = 32;
 	else if (q.proto == Q_DECNET) {
 		vlen = __pcap_atodn(s, &v);
 		if (vlen == 0)
 			bpf_error(cstate, "malformed decnet address '%s'", s);
 	} else
 		vlen = __pcap_atoin(s, &v);
 
 	switch (q.addr) {
 
 	case Q_DEFAULT:
 	case Q_HOST:
 	case Q_NET:
 		if (proto == Q_DECNET)
 			return gen_host(cstate, v, 0, proto, dir, q.addr);
 		else if (proto == Q_LINK) {
 			bpf_error(cstate, "illegal link layer address");
 		} else {
 			mask = 0xffffffff;
 			if (s == NULL && q.addr == Q_NET) {
 				/* Promote short net number */
 				while (v && (v & 0xff000000) == 0) {
 					v <<= 8;
 					mask <<= 8;
 				}
 			} else {
 				/* Promote short ipaddr */
 				v <<= 32 - vlen;
 				mask <<= 32 - vlen ;
 			}
 			return gen_host(cstate, v, mask, proto, dir, q.addr);
 		}
 
 	case Q_PORT:
 		if (proto == Q_UDP)
 			proto = IPPROTO_UDP;
 		else if (proto == Q_TCP)
 			proto = IPPROTO_TCP;
 		else if (proto == Q_SCTP)
 			proto = IPPROTO_SCTP;
 		else if (proto == Q_DEFAULT)
 			proto = PROTO_UNDEF;
 		else
 			bpf_error(cstate, "illegal qualifier of 'port'");
 
 		if (v > 65535)
 			bpf_error(cstate, "illegal port number %u > 65535", v);
 
 	    {
 		struct block *b;
 		b = gen_port(cstate, (int)v, proto, dir);
 		gen_or(gen_port6(cstate, (int)v, proto, dir), b);
 		return b;
 	    }
 
 	case Q_PORTRANGE:
 		if (proto == Q_UDP)
 			proto = IPPROTO_UDP;
 		else if (proto == Q_TCP)
 			proto = IPPROTO_TCP;
 		else if (proto == Q_SCTP)
 			proto = IPPROTO_SCTP;
 		else if (proto == Q_DEFAULT)
 			proto = PROTO_UNDEF;
 		else
 			bpf_error(cstate, "illegal qualifier of 'portrange'");
 
 		if (v > 65535)
 			bpf_error(cstate, "illegal port number %u > 65535", v);
 
 	    {
 		struct block *b;
 		b = gen_portrange(cstate, (int)v, (int)v, proto, dir);
 		gen_or(gen_portrange6(cstate, (int)v, (int)v, proto, dir), b);
 		return b;
 	    }
 
 	case Q_GATEWAY:
 		bpf_error(cstate, "'gateway' requires a name");
 		/* NOTREACHED */
 
 	case Q_PROTO:
 		return gen_proto(cstate, (int)v, proto, dir);
 
 	case Q_PROTOCHAIN:
 		return gen_protochain(cstate, (int)v, proto, dir);
 
 	case Q_UNDEF:
 		syntax(cstate);
 		/* NOTREACHED */
 
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 	/* NOTREACHED */
 }
 
 #ifdef INET6
 struct block *
 gen_mcode6(compiler_state_t *cstate, const char *s1, const char *s2,
     unsigned int masklen, struct qual q)
 {
 	struct addrinfo *res;
 	struct in6_addr *addr;
 	struct in6_addr mask;
 	struct block *b;
-	u_int32_t *a, *m;
+	uint32_t *a, *m;
 
 	if (s2)
 		bpf_error(cstate, "no mask %s supported", s2);
 
 	res = pcap_nametoaddrinfo(s1);
 	if (!res)
 		bpf_error(cstate, "invalid ip6 address %s", s1);
 	cstate->ai = res;
 	if (res->ai_next)
 		bpf_error(cstate, "%s resolved to multiple address", s1);
 	addr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
 
 	if (sizeof(mask) * 8 < masklen)
 		bpf_error(cstate, "mask length must be <= %u", (unsigned int)(sizeof(mask) * 8));
 	memset(&mask, 0, sizeof(mask));
 	memset(&mask, 0xff, masklen / 8);
 	if (masklen % 8) {
 		mask.s6_addr[masklen / 8] =
 			(0xff << (8 - masklen % 8)) & 0xff;
 	}
 
-	a = (u_int32_t *)addr;
-	m = (u_int32_t *)&mask;
+	a = (uint32_t *)addr;
+	m = (uint32_t *)&mask;
 	if ((a[0] & ~m[0]) || (a[1] & ~m[1])
 	 || (a[2] & ~m[2]) || (a[3] & ~m[3])) {
 		bpf_error(cstate, "non-network bits set in \"%s/%d\"", s1, masklen);
 	}
 
 	switch (q.addr) {
 
 	case Q_DEFAULT:
 	case Q_HOST:
 		if (masklen != 128)
 			bpf_error(cstate, "Mask syntax for networks only");
 		/* FALLTHROUGH */
 
 	case Q_NET:
 		b = gen_host6(cstate, addr, &mask, q.proto, q.dir, q.addr);
 		cstate->ai = NULL;
 		freeaddrinfo(res);
 		return b;
 
 	default:
 		bpf_error(cstate, "invalid qualifier against IPv6 address");
 		/* NOTREACHED */
 	}
-	return NULL;
 }
 #endif /*INET6*/
 
 struct block *
 gen_ecode(compiler_state_t *cstate, const u_char *eaddr, struct qual q)
 {
 	struct block *b, *tmp;
 
 	if ((q.addr == Q_HOST || q.addr == Q_DEFAULT) && q.proto == Q_LINK) {
 		switch (cstate->linktype) {
 		case DLT_EN10MB:
 		case DLT_NETANALYZER:
 		case DLT_NETANALYZER_TRANSPARENT:
 			tmp = gen_prevlinkhdr_check(cstate);
 			b = gen_ehostop(cstate, eaddr, (int)q.dir);
 			if (tmp != NULL)
 				gen_and(tmp, b);
 			return b;
 		case DLT_FDDI:
 			return gen_fhostop(cstate, eaddr, (int)q.dir);
 		case DLT_IEEE802:
 			return gen_thostop(cstate, eaddr, (int)q.dir);
 		case DLT_IEEE802_11:
 		case DLT_PRISM_HEADER:
 		case DLT_IEEE802_11_RADIO_AVS:
 		case DLT_IEEE802_11_RADIO:
 		case DLT_PPI:
 			return gen_wlanhostop(cstate, eaddr, (int)q.dir);
 		case DLT_IP_OVER_FC:
 			return gen_ipfchostop(cstate, eaddr, (int)q.dir);
 		default:
 			bpf_error(cstate, "ethernet addresses supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel");
 			break;
 		}
 	}
 	bpf_error(cstate, "ethernet address used in non-ether expression");
 	/* NOTREACHED */
-	return NULL;
 }
 
 void
-sappend(s0, s1)
-	struct slist *s0, *s1;
+sappend(struct slist *s0, struct slist *s1)
 {
 	/*
 	 * This is definitely not the best way to do this, but the
 	 * lists will rarely get long.
 	 */
 	while (s0->next)
 		s0 = s0->next;
 	s0->next = s1;
 }
 
 static struct slist *
 xfer_to_x(compiler_state_t *cstate, struct arth *a)
 {
 	struct slist *s;
 
 	s = new_stmt(cstate, BPF_LDX|BPF_MEM);
 	s->s.k = a->regno;
 	return s;
 }
 
 static struct slist *
 xfer_to_a(compiler_state_t *cstate, struct arth *a)
 {
 	struct slist *s;
 
 	s = new_stmt(cstate, BPF_LD|BPF_MEM);
 	s->s.k = a->regno;
 	return s;
 }
 
 /*
  * Modify "index" to use the value stored into its register as an
  * offset relative to the beginning of the header for the protocol
  * "proto", and allocate a register and put an item "size" bytes long
  * (1, 2, or 4) at that offset into that register, making it the register
  * for "index".
  */
 struct arth *
 gen_load(compiler_state_t *cstate, int proto, struct arth *inst, int size)
 {
 	struct slist *s, *tmp;
 	struct block *b;
 	int regno = alloc_reg(cstate);
 
 	free_reg(cstate, inst->regno);
 	switch (size) {
 
 	default:
 		bpf_error(cstate, "data size must be 1, 2, or 4");
 
 	case 1:
 		size = BPF_B;
 		break;
 
 	case 2:
 		size = BPF_H;
 		break;
 
 	case 4:
 		size = BPF_W;
 		break;
 	}
 	switch (proto) {
 	default:
 		bpf_error(cstate, "unsupported index operation");
 
 	case Q_RADIO:
 		/*
 		 * The offset is relative to the beginning of the packet
 		 * data, if we have a radio header.  (If we don't, this
 		 * is an error.)
 		 */
 		if (cstate->linktype != DLT_IEEE802_11_RADIO_AVS &&
 		    cstate->linktype != DLT_IEEE802_11_RADIO &&
 		    cstate->linktype != DLT_PRISM_HEADER)
 			bpf_error(cstate, "radio information not present in capture");
 
 		/*
 		 * Load into the X register the offset computed into the
 		 * register specified by "index".
 		 */
 		s = xfer_to_x(cstate, inst);
 
 		/*
 		 * Load the item at that offset.
 		 */
 		tmp = new_stmt(cstate, BPF_LD|BPF_IND|size);
 		sappend(s, tmp);
 		sappend(inst->s, s);
 		break;
 
 	case Q_LINK:
 		/*
 		 * The offset is relative to the beginning of
 		 * the link-layer header.
 		 *
 		 * XXX - what about ATM LANE?  Should the index be
 		 * relative to the beginning of the AAL5 frame, so
 		 * that 0 refers to the beginning of the LE Control
 		 * field, or relative to the beginning of the LAN
 		 * frame, so that 0 refers, for Ethernet LANE, to
 		 * the beginning of the destination address?
 		 */
 		s = gen_abs_offset_varpart(cstate, &cstate->off_linkhdr);
 
 		/*
 		 * If "s" is non-null, it has code to arrange that the
 		 * X register contains the length of the prefix preceding
 		 * the link-layer header.  Add to it the offset computed
 		 * into the register specified by "index", and move that
 		 * into the X register.  Otherwise, just load into the X
 		 * register the offset computed into the register specified
 		 * by "index".
 		 */
 		if (s != NULL) {
 			sappend(s, xfer_to_a(cstate, inst));
 			sappend(s, new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X));
 			sappend(s, new_stmt(cstate, BPF_MISC|BPF_TAX));
 		} else
 			s = xfer_to_x(cstate, inst);
 
 		/*
 		 * Load the item at the sum of the offset we've put in the
 		 * X register and the offset of the start of the link
 		 * layer header (which is 0 if the radio header is
 		 * variable-length; that header length is what we put
 		 * into the X register and then added to the index).
 		 */
 		tmp = new_stmt(cstate, BPF_LD|BPF_IND|size);
 		tmp->s.k = cstate->off_linkhdr.constant_part;
 		sappend(s, tmp);
 		sappend(inst->s, s);
 		break;
 
 	case Q_IP:
 	case Q_ARP:
 	case Q_RARP:
 	case Q_ATALK:
 	case Q_DECNET:
 	case Q_SCA:
 	case Q_LAT:
 	case Q_MOPRC:
 	case Q_MOPDL:
 	case Q_IPV6:
 		/*
 		 * The offset is relative to the beginning of
 		 * the network-layer header.
 		 * XXX - are there any cases where we want
 		 * cstate->off_nl_nosnap?
 		 */
 		s = gen_abs_offset_varpart(cstate, &cstate->off_linkpl);
 
 		/*
 		 * If "s" is non-null, it has code to arrange that the
 		 * X register contains the variable part of the offset
 		 * of the link-layer payload.  Add to it the offset
 		 * computed into the register specified by "index",
 		 * and move that into the X register.  Otherwise, just
 		 * load into the X register the offset computed into
 		 * the register specified by "index".
 		 */
 		if (s != NULL) {
 			sappend(s, xfer_to_a(cstate, inst));
 			sappend(s, new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X));
 			sappend(s, new_stmt(cstate, BPF_MISC|BPF_TAX));
 		} else
 			s = xfer_to_x(cstate, inst);
 
 		/*
 		 * Load the item at the sum of the offset we've put in the
 		 * X register, the offset of the start of the network
 		 * layer header from the beginning of the link-layer
 		 * payload, and the constant part of the offset of the
 		 * start of the link-layer payload.
 		 */
 		tmp = new_stmt(cstate, BPF_LD|BPF_IND|size);
 		tmp->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 		sappend(s, tmp);
 		sappend(inst->s, s);
 
 		/*
 		 * Do the computation only if the packet contains
 		 * the protocol in question.
 		 */
 		b = gen_proto_abbrev(cstate, proto);
 		if (inst->b)
 			gen_and(inst->b, b);
 		inst->b = b;
 		break;
 
 	case Q_SCTP:
 	case Q_TCP:
 	case Q_UDP:
 	case Q_ICMP:
 	case Q_IGMP:
 	case Q_IGRP:
 	case Q_PIM:
 	case Q_VRRP:
 	case Q_CARP:
 		/*
 		 * The offset is relative to the beginning of
 		 * the transport-layer header.
 		 *
 		 * Load the X register with the length of the IPv4 header
 		 * (plus the offset of the link-layer header, if it's
 		 * a variable-length header), in bytes.
 		 *
 		 * XXX - are there any cases where we want
 		 * cstate->off_nl_nosnap?
 		 * XXX - we should, if we're built with
 		 * IPv6 support, generate code to load either
 		 * IPv4, IPv6, or both, as appropriate.
 		 */
 		s = gen_loadx_iphdrlen(cstate);
 
 		/*
 		 * The X register now contains the sum of the variable
 		 * part of the offset of the link-layer payload and the
 		 * length of the network-layer header.
 		 *
 		 * Load into the A register the offset relative to
 		 * the beginning of the transport layer header,
 		 * add the X register to that, move that to the
 		 * X register, and load with an offset from the
 		 * X register equal to the sum of the constant part of
 		 * the offset of the link-layer payload and the offset,
 		 * relative to the beginning of the link-layer payload,
 		 * of the network-layer header.
 		 */
 		sappend(s, xfer_to_a(cstate, inst));
 		sappend(s, new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X));
 		sappend(s, new_stmt(cstate, BPF_MISC|BPF_TAX));
 		sappend(s, tmp = new_stmt(cstate, BPF_LD|BPF_IND|size));
 		tmp->s.k = cstate->off_linkpl.constant_part + cstate->off_nl;
 		sappend(inst->s, s);
 
 		/*
 		 * Do the computation only if the packet contains
 		 * the protocol in question - which is true only
 		 * if this is an IP datagram and is the first or
 		 * only fragment of that datagram.
 		 */
 		gen_and(gen_proto_abbrev(cstate, proto), b = gen_ipfrag(cstate));
 		if (inst->b)
 			gen_and(inst->b, b);
 		gen_and(gen_proto_abbrev(cstate, Q_IP), b);
 		inst->b = b;
 		break;
 	case Q_ICMPV6:
-		bpf_error(cstate, "IPv6 upper-layer protocol is not supported by proto[x]");
-		/*NOTREACHED*/
+        /*
+        * Do the computation only if the packet contains
+        * the protocol in question.
+        */
+        b = gen_proto_abbrev(cstate, Q_IPV6);
+        if (inst->b) {
+            gen_and(inst->b, b);
+        }
+        inst->b = b;
+
+        /*
+        * Check if we have an icmp6 next header
+        */
+        b = gen_cmp(cstate, OR_LINKPL, 6, BPF_B, 58);
+        if (inst->b) {
+            gen_and(inst->b, b);
+        }
+        inst->b = b;
+
+
+        s = gen_abs_offset_varpart(cstate, &cstate->off_linkpl);
+        /*
+        * If "s" is non-null, it has code to arrange that the
+        * X register contains the variable part of the offset
+        * of the link-layer payload.  Add to it the offset
+        * computed into the register specified by "index",
+        * and move that into the X register.  Otherwise, just
+        * load into the X register the offset computed into
+        * the register specified by "index".
+        */
+        if (s != NULL) {
+            sappend(s, xfer_to_a(cstate, inst));
+            sappend(s, new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X));
+            sappend(s, new_stmt(cstate, BPF_MISC|BPF_TAX));
+        } else {
+            s = xfer_to_x(cstate, inst);
+        }
+
+        /*
+        * Load the item at the sum of the offset we've put in the
+        * X register, the offset of the start of the network
+        * layer header from the beginning of the link-layer
+        * payload, and the constant part of the offset of the
+        * start of the link-layer payload.
+        */
+        tmp = new_stmt(cstate, BPF_LD|BPF_IND|size);
+        tmp->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 40;
+
+        sappend(s, tmp);
+        sappend(inst->s, s);
+
+        break;
 	}
 	inst->regno = regno;
 	s = new_stmt(cstate, BPF_ST);
 	s->s.k = regno;
 	sappend(inst->s, s);
 
 	return inst;
 }
 
 struct block *
 gen_relation(compiler_state_t *cstate, int code, struct arth *a0,
     struct arth *a1, int reversed)
 {
 	struct slist *s0, *s1, *s2;
 	struct block *b, *tmp;
 
 	s0 = xfer_to_x(cstate, a1);
 	s1 = xfer_to_a(cstate, a0);
 	if (code == BPF_JEQ) {
 		s2 = new_stmt(cstate, BPF_ALU|BPF_SUB|BPF_X);
 		b = new_block(cstate, JMP(code));
 		sappend(s1, s2);
 	}
 	else
 		b = new_block(cstate, BPF_JMP|code|BPF_X);
 	if (reversed)
 		gen_not(b);
 
 	sappend(s0, s1);
 	sappend(a1->s, s0);
 	sappend(a0->s, a1->s);
 
 	b->stmts = a0->s;
 
 	free_reg(cstate, a0->regno);
 	free_reg(cstate, a1->regno);
 
 	/* 'and' together protocol checks */
 	if (a0->b) {
 		if (a1->b) {
 			gen_and(a0->b, tmp = a1->b);
 		}
 		else
 			tmp = a0->b;
 	} else
 		tmp = a1->b;
 
 	if (tmp)
 		gen_and(tmp, b);
 
 	return b;
 }
 
 struct arth *
 gen_loadlen(compiler_state_t *cstate)
 {
 	int regno = alloc_reg(cstate);
 	struct arth *a = (struct arth *)newchunk(cstate, sizeof(*a));
 	struct slist *s;
 
 	s = new_stmt(cstate, BPF_LD|BPF_LEN);
 	s->next = new_stmt(cstate, BPF_ST);
 	s->next->s.k = regno;
 	a->s = s;
 	a->regno = regno;
 
 	return a;
 }
 
 struct arth *
 gen_loadi(compiler_state_t *cstate, int val)
 {
 	struct arth *a;
 	struct slist *s;
 	int reg;
 
 	a = (struct arth *)newchunk(cstate, sizeof(*a));
 
 	reg = alloc_reg(cstate);
 
 	s = new_stmt(cstate, BPF_LD|BPF_IMM);
 	s->s.k = val;
 	s->next = new_stmt(cstate, BPF_ST);
 	s->next->s.k = reg;
 	a->s = s;
 	a->regno = reg;
 
 	return a;
 }
 
 struct arth *
 gen_neg(compiler_state_t *cstate, struct arth *a)
 {
 	struct slist *s;
 
 	s = xfer_to_a(cstate, a);
 	sappend(a->s, s);
 	s = new_stmt(cstate, BPF_ALU|BPF_NEG);
 	s->s.k = 0;
 	sappend(a->s, s);
 	s = new_stmt(cstate, BPF_ST);
 	s->s.k = a->regno;
 	sappend(a->s, s);
 
 	return a;
 }
 
 struct arth *
 gen_arth(compiler_state_t *cstate, int code, struct arth *a0,
     struct arth *a1)
 {
 	struct slist *s0, *s1, *s2;
 
 	/*
 	 * Disallow division by, or modulus by, zero; we do this here
 	 * so that it gets done even if the optimizer is disabled.
 	 */
 	if (code == BPF_DIV) {
 		if (a1->s->s.code == (BPF_LD|BPF_IMM) && a1->s->s.k == 0)
 			bpf_error(cstate, "division by zero");
 	} else if (code == BPF_MOD) {
 		if (a1->s->s.code == (BPF_LD|BPF_IMM) && a1->s->s.k == 0)
 			bpf_error(cstate, "modulus by zero");
 	}
 	s0 = xfer_to_x(cstate, a1);
 	s1 = xfer_to_a(cstate, a0);
 	s2 = new_stmt(cstate, BPF_ALU|BPF_X|code);
 
 	sappend(s1, s2);
 	sappend(s0, s1);
 	sappend(a1->s, s0);
 	sappend(a0->s, a1->s);
 
 	free_reg(cstate, a0->regno);
 	free_reg(cstate, a1->regno);
 
 	s0 = new_stmt(cstate, BPF_ST);
 	a0->regno = s0->s.k = alloc_reg(cstate);
 	sappend(a0->s, s0);
 
 	return a0;
 }
 
 /*
  * Initialize the table of used registers and the current register.
  */
 static void
 init_regs(compiler_state_t *cstate)
 {
 	cstate->curreg = 0;
 	memset(cstate->regused, 0, sizeof cstate->regused);
 }
 
 /*
  * Return the next free register.
  */
 static int
 alloc_reg(compiler_state_t *cstate)
 {
 	int n = BPF_MEMWORDS;
 
 	while (--n >= 0) {
 		if (cstate->regused[cstate->curreg])
 			cstate->curreg = (cstate->curreg + 1) % BPF_MEMWORDS;
 		else {
 			cstate->regused[cstate->curreg] = 1;
 			return cstate->curreg;
 		}
 	}
 	bpf_error(cstate, "too many registers needed to evaluate expression");
 	/* NOTREACHED */
-	return 0;
 }
 
 /*
  * Return a register to the table so it can
  * be used later.
  */
 static void
 free_reg(compiler_state_t *cstate, int n)
 {
 	cstate->regused[n] = 0;
 }
 
 static struct block *
 gen_len(compiler_state_t *cstate, int jmp, int n)
 {
 	struct slist *s;
 	struct block *b;
 
 	s = new_stmt(cstate, BPF_LD|BPF_LEN);
 	b = new_block(cstate, JMP(jmp));
 	b->stmts = s;
 	b->s.k = n;
 
 	return b;
 }
 
 struct block *
 gen_greater(compiler_state_t *cstate, int n)
 {
 	return gen_len(cstate, BPF_JGE, n);
 }
 
 /*
  * Actually, this is less than or equal.
  */
 struct block *
 gen_less(compiler_state_t *cstate, int n)
 {
 	struct block *b;
 
 	b = gen_len(cstate, BPF_JGT, n);
 	gen_not(b);
 
 	return b;
 }
 
 /*
  * This is for "byte {idx} {op} {val}"; "idx" is treated as relative to
  * the beginning of the link-layer header.
  * XXX - that means you can't test values in the radiotap header, but
  * as that header is difficult if not impossible to parse generally
  * without a loop, that might not be a severe problem.  A new keyword
  * "radio" could be added for that, although what you'd really want
  * would be a way of testing particular radio header values, which
  * would generate code appropriate to the radio header in question.
  */
 struct block *
 gen_byteop(compiler_state_t *cstate, int op, int idx, int val)
 {
 	struct block *b;
 	struct slist *s;
 
 	switch (op) {
 	default:
 		abort();
 
 	case '=':
 		return gen_cmp(cstate, OR_LINKHDR, (u_int)idx, BPF_B, (bpf_int32)val);
 
 	case '<':
 		b = gen_cmp_lt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, (bpf_int32)val);
 		return b;
 
 	case '>':
 		b = gen_cmp_gt(cstate, OR_LINKHDR, (u_int)idx, BPF_B, (bpf_int32)val);
 		return b;
 
 	case '|':
 		s = new_stmt(cstate, BPF_ALU|BPF_OR|BPF_K);
 		break;
 
 	case '&':
 		s = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_K);
 		break;
 	}
 	s->s.k = val;
 	b = new_block(cstate, JMP(BPF_JEQ));
 	b->stmts = s;
 	gen_not(b);
 
 	return b;
 }
 
 static const u_char abroadcast[] = { 0x0 };
 
 struct block *
 gen_broadcast(compiler_state_t *cstate, int proto)
 {
 	bpf_u_int32 hostmask;
 	struct block *b0, *b1, *b2;
 	static const u_char ebroadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 	switch (proto) {
 
 	case Q_DEFAULT:
 	case Q_LINK:
 		switch (cstate->linktype) {
 		case DLT_ARCNET:
 		case DLT_ARCNET_LINUX:
 			return gen_ahostop(cstate, abroadcast, Q_DST);
 		case DLT_EN10MB:
 		case DLT_NETANALYZER:
 		case DLT_NETANALYZER_TRANSPARENT:
 			b1 = gen_prevlinkhdr_check(cstate);
 			b0 = gen_ehostop(cstate, ebroadcast, Q_DST);
 			if (b1 != NULL)
 				gen_and(b1, b0);
 			return b0;
 		case DLT_FDDI:
 			return gen_fhostop(cstate, ebroadcast, Q_DST);
 		case DLT_IEEE802:
 			return gen_thostop(cstate, ebroadcast, Q_DST);
 		case DLT_IEEE802_11:
 		case DLT_PRISM_HEADER:
 		case DLT_IEEE802_11_RADIO_AVS:
 		case DLT_IEEE802_11_RADIO:
 		case DLT_PPI:
 			return gen_wlanhostop(cstate, ebroadcast, Q_DST);
 		case DLT_IP_OVER_FC:
 			return gen_ipfchostop(cstate, ebroadcast, Q_DST);
 		default:
 			bpf_error(cstate, "not a broadcast link");
 		}
 		break;
 
 	case Q_IP:
 		/*
 		 * We treat a netmask of PCAP_NETMASK_UNKNOWN (0xffffffff)
 		 * as an indication that we don't know the netmask, and fail
 		 * in that case.
 		 */
 		if (cstate->netmask == PCAP_NETMASK_UNKNOWN)
 			bpf_error(cstate, "netmask not known, so 'ip broadcast' not supported");
 		b0 = gen_linktype(cstate, ETHERTYPE_IP);
 		hostmask = ~cstate->netmask;
 		b1 = gen_mcmp(cstate, OR_LINKPL, 16, BPF_W, (bpf_int32)0, hostmask);
 		b2 = gen_mcmp(cstate, OR_LINKPL, 16, BPF_W,
 			      (bpf_int32)(~0 & hostmask), hostmask);
 		gen_or(b1, b2);
 		gen_and(b0, b2);
 		return b2;
 	}
 	bpf_error(cstate, "only link-layer/IP broadcast filters supported");
 	/* NOTREACHED */
-	return NULL;
 }
 
 /*
  * Generate code to test the low-order bit of a MAC address (that's
  * the bottom bit of the *first* byte).
  */
 static struct block *
 gen_mac_multicast(compiler_state_t *cstate, int offset)
 {
 	register struct block *b0;
 	register struct slist *s;
 
 	/* link[offset] & 1 != 0 */
 	s = gen_load_a(cstate, OR_LINKHDR, offset, BPF_B);
 	b0 = new_block(cstate, JMP(BPF_JSET));
 	b0->s.k = 1;
 	b0->stmts = s;
 	return b0;
 }
 
 struct block *
 gen_multicast(compiler_state_t *cstate, int proto)
 {
 	register struct block *b0, *b1, *b2;
 	register struct slist *s;
 
 	switch (proto) {
 
 	case Q_DEFAULT:
 	case Q_LINK:
 		switch (cstate->linktype) {
 		case DLT_ARCNET:
 		case DLT_ARCNET_LINUX:
 			/* all ARCnet multicasts use the same address */
 			return gen_ahostop(cstate, abroadcast, Q_DST);
 		case DLT_EN10MB:
 		case DLT_NETANALYZER:
 		case DLT_NETANALYZER_TRANSPARENT:
 			b1 = gen_prevlinkhdr_check(cstate);
 			/* ether[0] & 1 != 0 */
 			b0 = gen_mac_multicast(cstate, 0);
 			if (b1 != NULL)
 				gen_and(b1, b0);
 			return b0;
 		case DLT_FDDI:
 			/*
 			 * XXX TEST THIS: MIGHT NOT PORT PROPERLY XXX
 			 *
 			 * XXX - was that referring to bit-order issues?
 			 */
 			/* fddi[1] & 1 != 0 */
 			return gen_mac_multicast(cstate, 1);
 		case DLT_IEEE802:
 			/* tr[2] & 1 != 0 */
 			return gen_mac_multicast(cstate, 2);
 		case DLT_IEEE802_11:
 		case DLT_PRISM_HEADER:
 		case DLT_IEEE802_11_RADIO_AVS:
 		case DLT_IEEE802_11_RADIO:
 		case DLT_PPI:
 			/*
 			 * Oh, yuk.
 			 *
 			 *	For control frames, there is no DA.
 			 *
 			 *	For management frames, DA is at an
 			 *	offset of 4 from the beginning of
 			 *	the packet.
 			 *
 			 *	For data frames, DA is at an offset
 			 *	of 4 from the beginning of the packet
 			 *	if To DS is clear and at an offset of
 			 *	16 from the beginning of the packet
 			 *	if To DS is set.
 			 */
 
 			/*
 			 * Generate the tests to be done for data frames.
 			 *
 			 * First, check for To DS set, i.e. "link[1] & 0x01".
 			 */
 			s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 			b1 = new_block(cstate, JMP(BPF_JSET));
 			b1->s.k = 0x01;	/* To DS */
 			b1->stmts = s;
 
 			/*
 			 * If To DS is set, the DA is at 16.
 			 */
 			b0 = gen_mac_multicast(cstate, 16);
 			gen_and(b1, b0);
 
 			/*
 			 * Now, check for To DS not set, i.e. check
 			 * "!(link[1] & 0x01)".
 			 */
 			s = gen_load_a(cstate, OR_LINKHDR, 1, BPF_B);
 			b2 = new_block(cstate, JMP(BPF_JSET));
 			b2->s.k = 0x01;	/* To DS */
 			b2->stmts = s;
 			gen_not(b2);
 
 			/*
 			 * If To DS is not set, the DA is at 4.
 			 */
 			b1 = gen_mac_multicast(cstate, 4);
 			gen_and(b2, b1);
 
 			/*
 			 * Now OR together the last two checks.  That gives
 			 * the complete set of checks for data frames.
 			 */
 			gen_or(b1, b0);
 
 			/*
 			 * Now check for a data frame.
 			 * I.e, check "link[0] & 0x08".
 			 */
 			s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 			b1 = new_block(cstate, JMP(BPF_JSET));
 			b1->s.k = 0x08;
 			b1->stmts = s;
 
 			/*
 			 * AND that with the checks done for data frames.
 			 */
 			gen_and(b1, b0);
 
 			/*
 			 * If the high-order bit of the type value is 0, this
 			 * is a management frame.
 			 * I.e, check "!(link[0] & 0x08)".
 			 */
 			s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 			b2 = new_block(cstate, JMP(BPF_JSET));
 			b2->s.k = 0x08;
 			b2->stmts = s;
 			gen_not(b2);
 
 			/*
 			 * For management frames, the DA is at 4.
 			 */
 			b1 = gen_mac_multicast(cstate, 4);
 			gen_and(b2, b1);
 
 			/*
 			 * OR that with the checks done for data frames.
 			 * That gives the checks done for management and
 			 * data frames.
 			 */
 			gen_or(b1, b0);
 
 			/*
 			 * If the low-order bit of the type value is 1,
 			 * this is either a control frame or a frame
 			 * with a reserved type, and thus not a
 			 * frame with an SA.
 			 *
 			 * I.e., check "!(link[0] & 0x04)".
 			 */
 			s = gen_load_a(cstate, OR_LINKHDR, 0, BPF_B);
 			b1 = new_block(cstate, JMP(BPF_JSET));
 			b1->s.k = 0x04;
 			b1->stmts = s;
 			gen_not(b1);
 
 			/*
 			 * AND that with the checks for data and management
 			 * frames.
 			 */
 			gen_and(b1, b0);
 			return b0;
 		case DLT_IP_OVER_FC:
 			b0 = gen_mac_multicast(cstate, 2);
 			return b0;
 		default:
 			break;
 		}
 		/* Link not known to support multicasts */
 		break;
 
 	case Q_IP:
 		b0 = gen_linktype(cstate, ETHERTYPE_IP);
 		b1 = gen_cmp_ge(cstate, OR_LINKPL, 16, BPF_B, (bpf_int32)224);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_IPV6:
 		b0 = gen_linktype(cstate, ETHERTYPE_IPV6);
 		b1 = gen_cmp(cstate, OR_LINKPL, 24, BPF_B, (bpf_int32)255);
 		gen_and(b0, b1);
 		return b1;
 	}
 	bpf_error(cstate, "link-layer multicast filters supported only on ethernet/FDDI/token ring/ARCNET/802.11/ATM LANE/Fibre Channel");
 	/* NOTREACHED */
-	return NULL;
 }
 
 /*
  * Filter on inbound (dir == 0) or outbound (dir == 1) traffic.
  * Outbound traffic is sent by this machine, while inbound traffic is
  * sent by a remote machine (and may include packets destined for a
  * unicast or multicast link-layer address we are not subscribing to).
  * These are the same definitions implemented by pcap_setdirection().
  * Capturing only unicast traffic destined for this host is probably
  * better accomplished using a higher-layer filter.
  */
 struct block *
 gen_inbound(compiler_state_t *cstate, int dir)
 {
 	register struct block *b0;
 
 	/*
 	 * Only some data link types support inbound/outbound qualifiers.
 	 */
 	switch (cstate->linktype) {
 	case DLT_SLIP:
 		b0 = gen_relation(cstate, BPF_JEQ,
 			  gen_load(cstate, Q_LINK, gen_loadi(cstate, 0), 1),
 			  gen_loadi(cstate, 0),
 			  dir);
 		break;
 
 	case DLT_IPNET:
 		if (dir) {
 			/* match outgoing packets */
 			b0 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, IPNET_OUTBOUND);
 		} else {
 			/* match incoming packets */
 			b0 = gen_cmp(cstate, OR_LINKHDR, 2, BPF_H, IPNET_INBOUND);
 		}
 		break;
 
 	case DLT_LINUX_SLL:
 		/* match outgoing packets */
 		b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_H, LINUX_SLL_OUTGOING);
 		if (!dir) {
 			/* to filter on inbound traffic, invert the match */
 			gen_not(b0);
 		}
 		break;
 
 #ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, dir), BPF_B,
 		    (bpf_int32)((dir == 0) ? PF_IN : PF_OUT));
 		break;
 #endif
 
 	case DLT_PPP_PPPD:
 		if (dir) {
 			/* match outgoing packets */
 			b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, PPP_PPPD_OUT);
 		} else {
 			/* match incoming packets */
 			b0 = gen_cmp(cstate, OR_LINKHDR, 0, BPF_B, PPP_PPPD_IN);
 		}
 		break;
 
         case DLT_JUNIPER_MFR:
         case DLT_JUNIPER_MLFR:
         case DLT_JUNIPER_MLPPP:
 	case DLT_JUNIPER_ATM1:
 	case DLT_JUNIPER_ATM2:
 	case DLT_JUNIPER_PPPOE:
 	case DLT_JUNIPER_PPPOE_ATM:
         case DLT_JUNIPER_GGSN:
         case DLT_JUNIPER_ES:
         case DLT_JUNIPER_MONITOR:
         case DLT_JUNIPER_SERVICES:
         case DLT_JUNIPER_ETHER:
         case DLT_JUNIPER_PPP:
         case DLT_JUNIPER_FRELAY:
         case DLT_JUNIPER_CHDLC:
         case DLT_JUNIPER_VP:
         case DLT_JUNIPER_ST:
         case DLT_JUNIPER_ISM:
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:
 	case DLT_JUNIPER_ATM_CEMIC:
 
 		/* juniper flags (including direction) are stored
 		 * the byte after the 3-byte magic number */
 		if (dir) {
 			/* match outgoing packets */
 			b0 = gen_mcmp(cstate, OR_LINKHDR, 3, BPF_B, 0, 0x01);
 		} else {
 			/* match incoming packets */
 			b0 = gen_mcmp(cstate, OR_LINKHDR, 3, BPF_B, 1, 0x01);
 		}
 		break;
 
 	default:
 		/*
 		 * If we have packet meta-data indicating a direction,
-		 * check it, otherwise give up as this link-layer type
-		 * has nothing in the packet data.
+		 * and that metadata can be checked by BPF code, check
+		 * it.  Otherwise, give up, as this link-layer type has
+		 * nothing in the packet data.
+		 *
+		 * Currently, the only platform where a BPF filter can
+		 * check that metadata is Linux with the in-kernel
+		 * BPF interpreter.  If other packet capture mechanisms
+		 * and BPF filters also supported this, it would be
+		 * nice.  It would be even better if they made that
+		 * metadata available so that we could provide it
+		 * with newer capture APIs, allowing it to be saved
+		 * in pcapng files.
 		 */
 #if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 		/*
 		 * This is Linux with PF_PACKET support.
 		 * If this is a *live* capture, we can look at
 		 * special meta-data in the filter expression;
 		 * if it's a savefile, we can't.
 		 */
 		if (cstate->bpf_pcap->rfile != NULL) {
 			/* We have a FILE *, so this is a savefile */
 			bpf_error(cstate, "inbound/outbound not supported on linktype %d when reading savefiles",
 			    cstate->linktype);
 			b0 = NULL;
 			/* NOTREACHED */
 		}
 		/* match outgoing packets */
 		b0 = gen_cmp(cstate, OR_LINKHDR, SKF_AD_OFF + SKF_AD_PKTTYPE, BPF_H,
 		             PACKET_OUTGOING);
 		if (!dir) {
 			/* to filter on inbound traffic, invert the match */
 			gen_not(b0);
 		}
 #else /* defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER) */
 		bpf_error(cstate, "inbound/outbound not supported on linktype %d",
 		    cstate->linktype);
-		b0 = NULL;
 		/* NOTREACHED */
 #endif /* defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER) */
 	}
 	return (b0);
 }
 
 #ifdef HAVE_NET_PFVAR_H
 /* PF firewall log matched interface */
 struct block *
 gen_pf_ifname(compiler_state_t *cstate, const char *ifname)
 {
 	struct block *b0;
 	u_int len, off;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "ifname supported only on PF linktype");
 		/* NOTREACHED */
 	}
 	len = sizeof(((struct pfloghdr *)0)->ifname);
 	off = offsetof(struct pfloghdr, ifname);
 	if (strlen(ifname) >= len) {
 		bpf_error(cstate, "ifname interface names can only be %d characters",
 		    len-1);
 		/* NOTREACHED */
 	}
 	b0 = gen_bcmp(cstate, OR_LINKHDR, off, strlen(ifname), (const u_char *)ifname);
 	return (b0);
 }
 
 /* PF firewall log ruleset name */
 struct block *
 gen_pf_ruleset(compiler_state_t *cstate, char *ruleset)
 {
 	struct block *b0;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "ruleset supported only on PF linktype");
 		/* NOTREACHED */
 	}
 
 	if (strlen(ruleset) >= sizeof(((struct pfloghdr *)0)->ruleset)) {
 		bpf_error(cstate, "ruleset names can only be %ld characters",
 		    (long)(sizeof(((struct pfloghdr *)0)->ruleset) - 1));
 		/* NOTREACHED */
 	}
 
 	b0 = gen_bcmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, ruleset),
 	    strlen(ruleset), (const u_char *)ruleset);
 	return (b0);
 }
 
 /* PF firewall log rule number */
 struct block *
 gen_pf_rnr(compiler_state_t *cstate, int rnr)
 {
 	struct block *b0;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "rnr supported only on PF linktype");
 		/* NOTREACHED */
 	}
 
 	b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, rulenr), BPF_W,
 		 (bpf_int32)rnr);
 	return (b0);
 }
 
 /* PF firewall log sub-rule number */
 struct block *
 gen_pf_srnr(compiler_state_t *cstate, int srnr)
 {
 	struct block *b0;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "srnr supported only on PF linktype");
 		/* NOTREACHED */
 	}
 
 	b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, subrulenr), BPF_W,
 	    (bpf_int32)srnr);
 	return (b0);
 }
 
 /* PF firewall log reason code */
 struct block *
 gen_pf_reason(compiler_state_t *cstate, int reason)
 {
 	struct block *b0;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "reason supported only on PF linktype");
 		/* NOTREACHED */
 	}
 
 	b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, reason), BPF_B,
 	    (bpf_int32)reason);
 	return (b0);
 }
 
 /* PF firewall log action */
 struct block *
 gen_pf_action(compiler_state_t *cstate, int action)
 {
 	struct block *b0;
 
 	if (cstate->linktype != DLT_PFLOG) {
 		bpf_error(cstate, "action supported only on PF linktype");
 		/* NOTREACHED */
 	}
 
 	b0 = gen_cmp(cstate, OR_LINKHDR, offsetof(struct pfloghdr, action), BPF_B,
 	    (bpf_int32)action);
 	return (b0);
 }
 #else /* !HAVE_NET_PFVAR_H */
 struct block *
-gen_pf_ifname(compiler_state_t *cstate, const char *ifname)
+gen_pf_ifname(compiler_state_t *cstate, const char *ifname _U_)
 {
 	bpf_error(cstate, "libpcap was compiled without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 
 struct block *
-gen_pf_ruleset(compiler_state_t *cstate, char *ruleset)
+gen_pf_ruleset(compiler_state_t *cstate, char *ruleset _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 
 struct block *
-gen_pf_rnr(compiler_state_t *cstate, int rnr)
+gen_pf_rnr(compiler_state_t *cstate, int rnr _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 
 struct block *
-gen_pf_srnr(compiler_state_t *cstate, int srnr)
+gen_pf_srnr(compiler_state_t *cstate, int srnr _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 
 struct block *
-gen_pf_reason(compiler_state_t *cstate, int reason)
+gen_pf_reason(compiler_state_t *cstate, int reason _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 
 struct block *
-gen_pf_action(compiler_state_t *cstate, int action)
+gen_pf_action(compiler_state_t *cstate, int action _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/* NOTREACHED */
-	return (NULL);
 }
 #endif /* HAVE_NET_PFVAR_H */
 
 /* IEEE 802.11 wireless header */
 struct block *
 gen_p80211_type(compiler_state_t *cstate, int type, int mask)
 {
 	struct block *b0;
 
 	switch (cstate->linktype) {
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 		b0 = gen_mcmp(cstate, OR_LINKHDR, 0, BPF_B, (bpf_int32)type,
 		    (bpf_int32)mask);
 		break;
 
 	default:
 		bpf_error(cstate, "802.11 link-layer types supported only on 802.11");
 		/* NOTREACHED */
 	}
 
 	return (b0);
 }
 
 struct block *
 gen_p80211_fcdir(compiler_state_t *cstate, int fcdir)
 {
 	struct block *b0;
 
 	switch (cstate->linktype) {
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 		break;
 
 	default:
 		bpf_error(cstate, "frame direction supported only with 802.11 headers");
 		/* NOTREACHED */
 	}
 
 	b0 = gen_mcmp(cstate, OR_LINKHDR, 1, BPF_B, (bpf_int32)fcdir,
 		(bpf_u_int32)IEEE80211_FC1_DIR_MASK);
 
 	return (b0);
 }
 
 struct block *
 gen_acode(compiler_state_t *cstate, const u_char *eaddr, struct qual q)
 {
 	switch (cstate->linktype) {
 
 	case DLT_ARCNET:
 	case DLT_ARCNET_LINUX:
 		if ((q.addr == Q_HOST || q.addr == Q_DEFAULT) &&
 		    q.proto == Q_LINK)
 			return (gen_ahostop(cstate, eaddr, (int)q.dir));
 		else {
 			bpf_error(cstate, "ARCnet address used in non-arc expression");
 			/* NOTREACHED */
 		}
 		break;
 
 	default:
 		bpf_error(cstate, "aid supported only on ARCnet");
 		/* NOTREACHED */
 	}
-	bpf_error(cstate, "ARCnet address used in non-arc expression");
-	/* NOTREACHED */
-	return NULL;
 }
 
 static struct block *
 gen_ahostop(compiler_state_t *cstate, const u_char *eaddr, int dir)
 {
 	register struct block *b0, *b1;
 
 	switch (dir) {
 	/* src comes first, different from Ethernet */
 	case Q_SRC:
 		return gen_bcmp(cstate, OR_LINKHDR, 0, 1, eaddr);
 
 	case Q_DST:
 		return gen_bcmp(cstate, OR_LINKHDR, 1, 1, eaddr);
 
 	case Q_AND:
 		b0 = gen_ahostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ahostop(cstate, eaddr, Q_DST);
 		gen_and(b0, b1);
 		return b1;
 
 	case Q_DEFAULT:
 	case Q_OR:
 		b0 = gen_ahostop(cstate, eaddr, Q_SRC);
 		b1 = gen_ahostop(cstate, eaddr, Q_DST);
 		gen_or(b0, b1);
 		return b1;
 
 	case Q_ADDR1:
-		bpf_error(cstate, "'addr1' is only supported on 802.11");
+		bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11");
 		break;
 
 	case Q_ADDR2:
-		bpf_error(cstate, "'addr2' is only supported on 802.11");
+		bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11");
 		break;
 
 	case Q_ADDR3:
-		bpf_error(cstate, "'addr3' is only supported on 802.11");
+		bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11");
 		break;
 
 	case Q_ADDR4:
-		bpf_error(cstate, "'addr4' is only supported on 802.11");
+		bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11");
 		break;
 
 	case Q_RA:
 		bpf_error(cstate, "'ra' is only supported on 802.11");
 		break;
 
 	case Q_TA:
 		bpf_error(cstate, "'ta' is only supported on 802.11");
 		break;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
-#if defined(SKF_AD_VLAN_TAG) && defined(SKF_AD_VLAN_TAG_PRESENT)
 static struct block *
-gen_vlan_bpf_extensions(compiler_state_t *cstate, int vlan_num)
+gen_vlan_tpid_test(compiler_state_t *cstate)
 {
-        struct block *b0, *b1;
-        struct slist *s;
+	struct block *b0, *b1;
 
-        /* generate new filter code based on extracting packet
-         * metadata */
-        s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
-        s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT;
+	/* check for VLAN, including QinQ */
+	b0 = gen_linktype(cstate, ETHERTYPE_8021Q);
+	b1 = gen_linktype(cstate, ETHERTYPE_8021AD);
+	gen_or(b0,b1);
+	b0 = b1;
+	b1 = gen_linktype(cstate, ETHERTYPE_8021QINQ);
+	gen_or(b0,b1);
 
-        b0 = new_block(cstate, JMP(BPF_JEQ));
-        b0->stmts = s;
-        b0->s.k = 1;
+	return b1;
+}
 
-        if (vlan_num >= 0) {
-                s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
-                s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG;
-
-                b1 = new_block(cstate, JMP(BPF_JEQ));
-                b1->stmts = s;
-                b1->s.k = (bpf_int32) vlan_num;
-
-                gen_and(b0,b1);
-                b0 = b1;
-        }
-
-        return b0;
+static struct block *
+gen_vlan_vid_test(compiler_state_t *cstate, int vlan_num)
+{
+	return gen_mcmp(cstate, OR_LINKPL, 0, BPF_H, (bpf_int32)vlan_num, 0x0fff);
 }
-#endif
 
 static struct block *
 gen_vlan_no_bpf_extensions(compiler_state_t *cstate, int vlan_num)
 {
-        struct block *b0, *b1;
+	struct block *b0, *b1;
 
-        /* check for VLAN, including QinQ */
-        b0 = gen_linktype(cstate, ETHERTYPE_8021Q);
-        b1 = gen_linktype(cstate, ETHERTYPE_8021AD);
-        gen_or(b0,b1);
-        b0 = b1;
-        b1 = gen_linktype(cstate, ETHERTYPE_8021QINQ);
-        gen_or(b0,b1);
-        b0 = b1;
+	b0 = gen_vlan_tpid_test(cstate);
 
-        /* If a specific VLAN is requested, check VLAN id */
-        if (vlan_num >= 0) {
-                b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_H,
-                              (bpf_int32)vlan_num, 0x0fff);
-                gen_and(b0, b1);
-                b0 = b1;
-        }
+	if (vlan_num >= 0) {
+		b1 = gen_vlan_vid_test(cstate, vlan_num);
+		gen_and(b0, b1);
+		b0 = b1;
+	}
 
 	/*
-	 * The payload follows the full header, including the
-	 * VLAN tags, so skip past this VLAN tag.
+	 * Both payload and link header type follow the VLAN tags so that
+	 * both need to be updated.
 	 */
-        cstate->off_linkpl.constant_part += 4;
+	cstate->off_linkpl.constant_part += 4;
+	cstate->off_linktype.constant_part += 4;
 
+	return b0;
+}
+
+#if defined(SKF_AD_VLAN_TAG_PRESENT)
+/* add v to variable part of off */
+static void
+gen_vlan_vloffset_add(compiler_state_t *cstate, bpf_abs_offset *off, int v, struct slist *s)
+{
+	struct slist *s2;
+
+	if (!off->is_variable)
+		off->is_variable = 1;
+	if (off->reg == -1)
+		off->reg = alloc_reg(cstate);
+
+	s2 = new_stmt(cstate, BPF_LD|BPF_MEM);
+	s2->s.k = off->reg;
+	sappend(s, s2);
+	s2 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_IMM);
+	s2->s.k = v;
+	sappend(s, s2);
+	s2 = new_stmt(cstate, BPF_ST);
+	s2->s.k = off->reg;
+	sappend(s, s2);
+}
+
+/*
+ * patch block b_tpid (VLAN TPID test) to update variable parts of link payload
+ * and link type offsets first
+ */
+static void
+gen_vlan_patch_tpid_test(compiler_state_t *cstate, struct block *b_tpid)
+{
+	struct slist s;
+
+	/* offset determined at run time, shift variable part */
+	s.next = NULL;
+	cstate->is_vlan_vloffset = 1;
+	gen_vlan_vloffset_add(cstate, &cstate->off_linkpl, 4, &s);
+	gen_vlan_vloffset_add(cstate, &cstate->off_linktype, 4, &s);
+
+	/* we get a pointer to a chain of or-ed blocks, patch first of them */
+	sappend(s.next, b_tpid->head->stmts);
+	b_tpid->head->stmts = s.next;
+}
+
+/*
+ * patch block b_vid (VLAN id test) to load VID value either from packet
+ * metadata (using BPF extensions) if SKF_AD_VLAN_TAG_PRESENT is true
+ */
+static void
+gen_vlan_patch_vid_test(compiler_state_t *cstate, struct block *b_vid)
+{
+	struct slist *s, *s2, *sjeq;
+	unsigned cnt;
+
+	s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
+	s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT;
+
+	/* true -> next instructions, false -> beginning of b_vid */
+	sjeq = new_stmt(cstate, JMP(BPF_JEQ));
+	sjeq->s.k = 1;
+	sjeq->s.jf = b_vid->stmts;
+	sappend(s, sjeq);
+
+	s2 = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
+	s2->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG;
+	sappend(s, s2);
+	sjeq->s.jt = s2;
+
+	/* jump to the test in b_vid (bypass loading VID from packet data) */
+	cnt = 0;
+	for (s2 = b_vid->stmts; s2; s2 = s2->next)
+		cnt++;
+	s2 = new_stmt(cstate, JMP(BPF_JA));
+	s2->s.k = cnt;
+	sappend(s, s2);
+
+	/* insert our statements at the beginning of b_vid */
+	sappend(s, b_vid->stmts);
+	b_vid->stmts = s;
+}
+
+/*
+ * Generate check for "vlan" or "vlan <id>" on systems with support for BPF
+ * extensions.  Even if kernel supports VLAN BPF extensions, (outermost) VLAN
+ * tag can be either in metadata or in packet data; therefore if the
+ * SKF_AD_VLAN_TAG_PRESENT test is negative, we need to check link
+ * header for VLAN tag. As the decision is done at run time, we need
+ * update variable part of the offsets
+ */
+static struct block *
+gen_vlan_bpf_extensions(compiler_state_t *cstate, int vlan_num)
+{
+        struct block *b0, *b_tpid, *b_vid = NULL;
+        struct slist *s;
+
+        /* generate new filter code based on extracting packet
+         * metadata */
+        s = new_stmt(cstate, BPF_LD|BPF_B|BPF_ABS);
+        s->s.k = SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT;
+
+        b0 = new_block(cstate, JMP(BPF_JEQ));
+        b0->stmts = s;
+        b0->s.k = 1;
+
 	/*
-	 * The link-layer type information follows the VLAN tags, so
-	 * skip past this VLAN tag.
+	 * This is tricky. We need to insert the statements updating variable
+	 * parts of offsets before the the traditional TPID and VID tests so
+	 * that they are called whenever SKF_AD_VLAN_TAG_PRESENT fails but
+	 * we do not want this update to affect those checks. That's why we
+	 * generate both test blocks first and insert the statements updating
+	 * variable parts of both offsets after that. This wouldn't work if
+	 * there already were variable length link header when entering this
+	 * function but gen_vlan_bpf_extensions() isn't called in that case.
 	 */
-        cstate->off_linktype.constant_part += 4;
+	b_tpid = gen_vlan_tpid_test(cstate);
+	if (vlan_num >= 0)
+		b_vid = gen_vlan_vid_test(cstate, vlan_num);
 
+	gen_vlan_patch_tpid_test(cstate, b_tpid);
+	gen_or(b0, b_tpid);
+	b0 = b_tpid;
+
+	if (vlan_num >= 0) {
+		gen_vlan_patch_vid_test(cstate, b_vid);
+		gen_and(b0, b_vid);
+		b0 = b_vid;
+	}
+
         return b0;
 }
+#endif
 
 /*
  * support IEEE 802.1Q VLAN trunk over ethernet
  */
 struct block *
 gen_vlan(compiler_state_t *cstate, int vlan_num)
 {
 	struct	block	*b0;
 
 	/* can't check for VLAN-encapsulated packets inside MPLS */
 	if (cstate->label_stack_depth > 0)
 		bpf_error(cstate, "no VLAN match after MPLS");
 
 	/*
 	 * Check for a VLAN packet, and then change the offsets to point
 	 * to the type and data fields within the VLAN packet.  Just
 	 * increment the offsets, so that we can support a hierarchy, e.g.
 	 * "vlan 300 && vlan 200" to capture VLAN 200 encapsulated within
 	 * VLAN 100.
 	 *
 	 * XXX - this is a bit of a kludge.  If we were to split the
 	 * compiler into a parser that parses an expression and
 	 * generates an expression tree, and a code generator that
 	 * takes an expression tree (which could come from our
 	 * parser or from some other parser) and generates BPF code,
 	 * we could perhaps make the offsets parameters of routines
 	 * and, in the handler for an "AND" node, pass to subnodes
 	 * other than the VLAN node the adjusted offsets.
 	 *
 	 * This would mean that "vlan" would, instead of changing the
 	 * behavior of *all* tests after it, change only the behavior
 	 * of tests ANDed with it.  That would change the documented
 	 * semantics of "vlan", which might break some expressions.
 	 * However, it would mean that "(vlan and ip) or ip" would check
 	 * both for VLAN-encapsulated IP and IP-over-Ethernet, rather than
 	 * checking only for VLAN-encapsulated IP, so that could still
 	 * be considered worth doing; it wouldn't break expressions
 	 * that are of the form "vlan and ..." or "vlan N and ...",
 	 * which I suspect are the most common expressions involving
 	 * "vlan".  "vlan or ..." doesn't necessarily do what the user
 	 * would really want, now, as all the "or ..." tests would
 	 * be done assuming a VLAN, even though the "or" could be viewed
 	 * as meaning "or, if this isn't a VLAN packet...".
 	 */
 	switch (cstate->linktype) {
 
 	case DLT_EN10MB:
 	case DLT_NETANALYZER:
 	case DLT_NETANALYZER_TRANSPARENT:
-#if defined(SKF_AD_VLAN_TAG) && defined(SKF_AD_VLAN_TAG_PRESENT)
+#if defined(SKF_AD_VLAN_TAG_PRESENT)
 		/* Verify that this is the outer part of the packet and
 		 * not encapsulated somehow. */
 		if (cstate->vlan_stack_depth == 0 && !cstate->off_linkhdr.is_variable &&
 		    cstate->off_linkhdr.constant_part ==
 		    cstate->off_outermostlinkhdr.constant_part) {
 			/*
 			 * Do we need special VLAN handling?
 			 */
 			if (cstate->bpf_pcap->bpf_codegen_flags & BPF_SPECIAL_VLAN_HANDLING)
 				b0 = gen_vlan_bpf_extensions(cstate, vlan_num);
 			else
 				b0 = gen_vlan_no_bpf_extensions(cstate, vlan_num);
 		} else
 #endif
 			b0 = gen_vlan_no_bpf_extensions(cstate, vlan_num);
                 break;
 
 	case DLT_IEEE802_11:
 	case DLT_PRISM_HEADER:
 	case DLT_IEEE802_11_RADIO_AVS:
 	case DLT_IEEE802_11_RADIO:
 		b0 = gen_vlan_no_bpf_extensions(cstate, vlan_num);
 		break;
 
 	default:
 		bpf_error(cstate, "no VLAN support for data link type %d",
 		      cstate->linktype);
 		/*NOTREACHED*/
 	}
 
         cstate->vlan_stack_depth++;
 
 	return (b0);
 }
 
 /*
  * support for MPLS
  */
 struct block *
 gen_mpls(compiler_state_t *cstate, int label_num)
 {
 	struct	block	*b0, *b1;
 
         if (cstate->label_stack_depth > 0) {
             /* just match the bottom-of-stack bit clear */
             b0 = gen_mcmp(cstate, OR_PREVMPLSHDR, 2, BPF_B, 0, 0x01);
         } else {
             /*
              * We're not in an MPLS stack yet, so check the link-layer
              * type against MPLS.
              */
             switch (cstate->linktype) {
 
             case DLT_C_HDLC: /* fall through */
             case DLT_EN10MB:
             case DLT_NETANALYZER:
             case DLT_NETANALYZER_TRANSPARENT:
                     b0 = gen_linktype(cstate, ETHERTYPE_MPLS);
                     break;
 
             case DLT_PPP:
                     b0 = gen_linktype(cstate, PPP_MPLS_UCAST);
                     break;
 
                     /* FIXME add other DLT_s ...
                      * for Frame-Relay/and ATM this may get messy due to SNAP headers
                      * leave it for now */
 
             default:
                     bpf_error(cstate, "no MPLS support for data link type %d",
                           cstate->linktype);
-                    b0 = NULL;
                     /*NOTREACHED*/
                     break;
             }
         }
 
 	/* If a specific MPLS label is requested, check it */
 	if (label_num >= 0) {
 		label_num = label_num << 12; /* label is shifted 12 bits on the wire */
 		b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_W, (bpf_int32)label_num,
 		    0xfffff000); /* only compare the first 20 bits */
 		gen_and(b0, b1);
 		b0 = b1;
 	}
 
         /*
          * Change the offsets to point to the type and data fields within
          * the MPLS packet.  Just increment the offsets, so that we
          * can support a hierarchy, e.g. "mpls 100000 && mpls 1024" to
          * capture packets with an outer label of 100000 and an inner
          * label of 1024.
          *
          * Increment the MPLS stack depth as well; this indicates that
          * we're checking MPLS-encapsulated headers, to make sure higher
          * level code generators don't try to match against IP-related
          * protocols such as Q_ARP, Q_RARP etc.
          *
          * XXX - this is a bit of a kludge.  See comments in gen_vlan().
          */
         cstate->off_nl_nosnap += 4;
         cstate->off_nl += 4;
         cstate->label_stack_depth++;
 	return (b0);
 }
 
 /*
  * Support PPPOE discovery and session.
  */
 struct block *
 gen_pppoed(compiler_state_t *cstate)
 {
 	/* check for PPPoE discovery */
 	return gen_linktype(cstate, (bpf_int32)ETHERTYPE_PPPOED);
 }
 
 struct block *
 gen_pppoes(compiler_state_t *cstate, int sess_num)
 {
 	struct block *b0, *b1;
 
 	/*
 	 * Test against the PPPoE session link-layer type.
 	 */
 	b0 = gen_linktype(cstate, (bpf_int32)ETHERTYPE_PPPOES);
 
 	/* If a specific session is requested, check PPPoE session id */
 	if (sess_num >= 0) {
 		b1 = gen_mcmp(cstate, OR_LINKPL, 0, BPF_W,
 		    (bpf_int32)sess_num, 0x0000ffff);
 		gen_and(b0, b1);
 		b0 = b1;
 	}
 
 	/*
 	 * Change the offsets to point to the type and data fields within
 	 * the PPP packet, and note that this is PPPoE rather than
 	 * raw PPP.
 	 *
 	 * XXX - this is a bit of a kludge.  If we were to split the
 	 * compiler into a parser that parses an expression and
 	 * generates an expression tree, and a code generator that
 	 * takes an expression tree (which could come from our
 	 * parser or from some other parser) and generates BPF code,
 	 * we could perhaps make the offsets parameters of routines
 	 * and, in the handler for an "AND" node, pass to subnodes
 	 * other than the PPPoE node the adjusted offsets.
 	 *
 	 * This would mean that "pppoes" would, instead of changing the
 	 * behavior of *all* tests after it, change only the behavior
 	 * of tests ANDed with it.  That would change the documented
 	 * semantics of "pppoes", which might break some expressions.
 	 * However, it would mean that "(pppoes and ip) or ip" would check
 	 * both for VLAN-encapsulated IP and IP-over-Ethernet, rather than
 	 * checking only for VLAN-encapsulated IP, so that could still
 	 * be considered worth doing; it wouldn't break expressions
 	 * that are of the form "pppoes and ..." which I suspect are the
 	 * most common expressions involving "pppoes".  "pppoes or ..."
 	 * doesn't necessarily do what the user would really want, now,
 	 * as all the "or ..." tests would be done assuming PPPoE, even
 	 * though the "or" could be viewed as meaning "or, if this isn't
 	 * a PPPoE packet...".
 	 *
 	 * The "network-layer" protocol is PPPoE, which has a 6-byte
 	 * PPPoE header, followed by a PPP packet.
 	 *
 	 * There is no HDLC encapsulation for the PPP packet (it's
 	 * encapsulated in PPPoES instead), so the link-layer type
 	 * starts at the first byte of the PPP packet.  For PPPoE,
 	 * that offset is relative to the beginning of the total
 	 * link-layer payload, including any 802.2 LLC header, so
 	 * it's 6 bytes past cstate->off_nl.
 	 */
 	PUSH_LINKHDR(cstate, DLT_PPP, cstate->off_linkpl.is_variable,
 	    cstate->off_linkpl.constant_part + cstate->off_nl + 6, /* 6 bytes past the PPPoE header */
 	    cstate->off_linkpl.reg);
 
 	cstate->off_linktype = cstate->off_linkhdr;
 	cstate->off_linkpl.constant_part = cstate->off_linkhdr.constant_part + 2;
 
 	cstate->off_nl = 0;
 	cstate->off_nl_nosnap = 0;	/* no 802.2 LLC */
 
 	return b0;
 }
 
 /* Check that this is Geneve and the VNI is correct if
  * specified. Parameterized to handle both IPv4 and IPv6. */
 static struct block *
 gen_geneve_check(compiler_state_t *cstate,
     struct block *(*gen_portfn)(compiler_state_t *, int, int, int),
     enum e_offrel offrel, int vni)
 {
 	struct block *b0, *b1;
 
 	b0 = gen_portfn(cstate, GENEVE_PORT, IPPROTO_UDP, Q_DST);
 
 	/* Check that we are operating on version 0. Otherwise, we
 	 * can't decode the rest of the fields. The version is 2 bits
 	 * in the first byte of the Geneve header. */
 	b1 = gen_mcmp(cstate, offrel, 8, BPF_B, (bpf_int32)0, 0xc0);
 	gen_and(b0, b1);
 	b0 = b1;
 
 	if (vni >= 0) {
 		vni <<= 8; /* VNI is in the upper 3 bytes */
 		b1 = gen_mcmp(cstate, offrel, 12, BPF_W, (bpf_int32)vni,
 			      0xffffff00);
 		gen_and(b0, b1);
 		b0 = b1;
 	}
 
 	return b0;
 }
 
 /* The IPv4 and IPv6 Geneve checks need to do two things:
  * - Verify that this actually is Geneve with the right VNI.
  * - Place the IP header length (plus variable link prefix if
  *   needed) into register A to be used later to compute
  *   the inner packet offsets. */
 static struct block *
 gen_geneve4(compiler_state_t *cstate, int vni)
 {
 	struct block *b0, *b1;
 	struct slist *s, *s1;
 
 	b0 = gen_geneve_check(cstate, gen_port, OR_TRAN_IPV4, vni);
 
 	/* Load the IP header length into A. */
 	s = gen_loadx_iphdrlen(cstate);
 
 	s1 = new_stmt(cstate, BPF_MISC|BPF_TXA);
 	sappend(s, s1);
 
 	/* Forcibly append these statements to the true condition
 	 * of the protocol check by creating a new block that is
 	 * always true and ANDing them. */
 	b1 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
 	b1->stmts = s;
 	b1->s.k = 0;
 
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 static struct block *
 gen_geneve6(compiler_state_t *cstate, int vni)
 {
 	struct block *b0, *b1;
 	struct slist *s, *s1;
 
 	b0 = gen_geneve_check(cstate, gen_port6, OR_TRAN_IPV6, vni);
 
 	/* Load the IP header length. We need to account for a
 	 * variable length link prefix if there is one. */
 	s = gen_abs_offset_varpart(cstate, &cstate->off_linkpl);
 	if (s) {
 		s1 = new_stmt(cstate, BPF_LD|BPF_IMM);
 		s1->s.k = 40;
 		sappend(s, s1);
 
 		s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X);
 		s1->s.k = 0;
 		sappend(s, s1);
 	} else {
 		s = new_stmt(cstate, BPF_LD|BPF_IMM);
 		s->s.k = 40;
 	}
 
 	/* Forcibly append these statements to the true condition
 	 * of the protocol check by creating a new block that is
 	 * always true and ANDing them. */
 	s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 	sappend(s, s1);
 
 	b1 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
 	b1->stmts = s;
 	b1->s.k = 0;
 
 	gen_and(b0, b1);
 
 	return b1;
 }
 
 /* We need to store three values based on the Geneve header::
  * - The offset of the linktype.
  * - The offset of the end of the Geneve header.
  * - The offset of the end of the encapsulated MAC header. */
 static struct slist *
 gen_geneve_offsets(compiler_state_t *cstate)
 {
 	struct slist *s, *s1, *s_proto;
 
 	/* First we need to calculate the offset of the Geneve header
 	 * itself. This is composed of the IP header previously calculated
 	 * (include any variable link prefix) and stored in A plus the
 	 * fixed sized headers (fixed link prefix, MAC length, and UDP
 	 * header). */
 	s = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s->s.k = cstate->off_linkpl.constant_part + cstate->off_nl + 8;
 
 	/* Stash this in X since we'll need it later. */
 	s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 	sappend(s, s1);
 
 	/* The EtherType in Geneve is 2 bytes in. Calculate this and
 	 * store it. */
 	s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s1->s.k = 2;
 	sappend(s, s1);
 
 	cstate->off_linktype.reg = alloc_reg(cstate);
 	cstate->off_linktype.is_variable = 1;
 	cstate->off_linktype.constant_part = 0;
 
 	s1 = new_stmt(cstate, BPF_ST);
 	s1->s.k = cstate->off_linktype.reg;
 	sappend(s, s1);
 
 	/* Load the Geneve option length and mask and shift to get the
 	 * number of bytes. It is stored in the first byte of the Geneve
 	 * header. */
 	s1 = new_stmt(cstate, BPF_LD|BPF_IND|BPF_B);
 	s1->s.k = 0;
 	sappend(s, s1);
 
 	s1 = new_stmt(cstate, BPF_ALU|BPF_AND|BPF_K);
 	s1->s.k = 0x3f;
 	sappend(s, s1);
 
 	s1 = new_stmt(cstate, BPF_ALU|BPF_MUL|BPF_K);
 	s1->s.k = 4;
 	sappend(s, s1);
 
 	/* Add in the rest of the Geneve base header. */
 	s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s1->s.k = 8;
 	sappend(s, s1);
 
 	/* Add the Geneve header length to its offset and store. */
 	s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_X);
 	s1->s.k = 0;
 	sappend(s, s1);
 
 	/* Set the encapsulated type as Ethernet. Even though we may
 	 * not actually have Ethernet inside there are two reasons this
 	 * is useful:
 	 * - The linktype field is always in EtherType format regardless
 	 *   of whether it is in Geneve or an inner Ethernet frame.
 	 * - The only link layer that we have specific support for is
 	 *   Ethernet. We will confirm that the packet actually is
 	 *   Ethernet at runtime before executing these checks. */
 	PUSH_LINKHDR(cstate, DLT_EN10MB, 1, 0, alloc_reg(cstate));
 
 	s1 = new_stmt(cstate, BPF_ST);
 	s1->s.k = cstate->off_linkhdr.reg;
 	sappend(s, s1);
 
 	/* Calculate whether we have an Ethernet header or just raw IP/
 	 * MPLS/etc. If we have Ethernet, advance the end of the MAC offset
 	 * and linktype by 14 bytes so that the network header can be found
 	 * seamlessly. Otherwise, keep what we've calculated already. */
 
 	/* We have a bare jmp so we can't use the optimizer. */
 	cstate->no_optimize = 1;
 
 	/* Load the EtherType in the Geneve header, 2 bytes in. */
 	s1 = new_stmt(cstate, BPF_LD|BPF_IND|BPF_H);
 	s1->s.k = 2;
 	sappend(s, s1);
 
 	/* Load X with the end of the Geneve header. */
 	s1 = new_stmt(cstate, BPF_LDX|BPF_MEM);
 	s1->s.k = cstate->off_linkhdr.reg;
 	sappend(s, s1);
 
 	/* Check if the EtherType is Transparent Ethernet Bridging. At the
 	 * end of this check, we should have the total length in X. In
 	 * the non-Ethernet case, it's already there. */
 	s_proto = new_stmt(cstate, JMP(BPF_JEQ));
 	s_proto->s.k = ETHERTYPE_TEB;
 	sappend(s, s_proto);
 
 	s1 = new_stmt(cstate, BPF_MISC|BPF_TXA);
 	sappend(s, s1);
 	s_proto->s.jt = s1;
 
 	/* Since this is Ethernet, use the EtherType of the payload
 	 * directly as the linktype. Overwrite what we already have. */
 	s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s1->s.k = 12;
 	sappend(s, s1);
 
 	s1 = new_stmt(cstate, BPF_ST);
 	s1->s.k = cstate->off_linktype.reg;
 	sappend(s, s1);
 
 	/* Advance two bytes further to get the end of the Ethernet
 	 * header. */
 	s1 = new_stmt(cstate, BPF_ALU|BPF_ADD|BPF_K);
 	s1->s.k = 2;
 	sappend(s, s1);
 
 	/* Move the result to X. */
 	s1 = new_stmt(cstate, BPF_MISC|BPF_TAX);
 	sappend(s, s1);
 
 	/* Store the final result of our linkpl calculation. */
 	cstate->off_linkpl.reg = alloc_reg(cstate);
 	cstate->off_linkpl.is_variable = 1;
 	cstate->off_linkpl.constant_part = 0;
 
 	s1 = new_stmt(cstate, BPF_STX);
 	s1->s.k = cstate->off_linkpl.reg;
 	sappend(s, s1);
 	s_proto->s.jf = s1;
 
 	cstate->off_nl = 0;
 
 	return s;
 }
 
 /* Check to see if this is a Geneve packet. */
 struct block *
 gen_geneve(compiler_state_t *cstate, int vni)
 {
 	struct block *b0, *b1;
 	struct slist *s;
 
 	b0 = gen_geneve4(cstate, vni);
 	b1 = gen_geneve6(cstate, vni);
 
 	gen_or(b0, b1);
 	b0 = b1;
 
 	/* Later filters should act on the payload of the Geneve frame,
 	 * update all of the header pointers. Attach this code so that
 	 * it gets executed in the event that the Geneve filter matches. */
 	s = gen_geneve_offsets(cstate);
 
 	b1 = gen_true(cstate);
 	sappend(s, b1->stmts);
 	b1->stmts = s;
 
 	gen_and(b0, b1);
 
 	cstate->is_geneve = 1;
 
 	return b1;
 }
 
 /* Check that the encapsulated frame has a link layer header
  * for Ethernet filters. */
 static struct block *
 gen_geneve_ll_check(compiler_state_t *cstate)
 {
 	struct block *b0;
 	struct slist *s, *s1;
 
 	/* The easiest way to see if there is a link layer present
 	 * is to check if the link layer header and payload are not
 	 * the same. */
 
 	/* Geneve always generates pure variable offsets so we can
 	 * compare only the registers. */
 	s = new_stmt(cstate, BPF_LD|BPF_MEM);
 	s->s.k = cstate->off_linkhdr.reg;
 
 	s1 = new_stmt(cstate, BPF_LDX|BPF_MEM);
 	s1->s.k = cstate->off_linkpl.reg;
 	sappend(s, s1);
 
 	b0 = new_block(cstate, BPF_JMP|BPF_JEQ|BPF_X);
 	b0->stmts = s;
 	b0->s.k = 0;
 	gen_not(b0);
 
 	return b0;
 }
 
 struct block *
 gen_atmfield_code(compiler_state_t *cstate, int atmfield, bpf_int32 jvalue,
     bpf_u_int32 jtype, int reverse)
 {
 	struct block *b0;
 
 	switch (atmfield) {
 
 	case A_VPI:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'vpi' supported only on raw ATM");
-		if (cstate->off_vpi == (u_int)-1)
+		if (cstate->off_vpi == OFFSET_NOT_SET)
 			abort();
 		b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_vpi, BPF_B, 0xffffffff, jtype,
 		    reverse, jvalue);
 		break;
 
 	case A_VCI:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'vci' supported only on raw ATM");
-		if (cstate->off_vci == (u_int)-1)
+		if (cstate->off_vci == OFFSET_NOT_SET)
 			abort();
 		b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_vci, BPF_H, 0xffffffff, jtype,
 		    reverse, jvalue);
 		break;
 
 	case A_PROTOTYPE:
-		if (cstate->off_proto == (u_int)-1)
+		if (cstate->off_proto == OFFSET_NOT_SET)
 			abort();	/* XXX - this isn't on FreeBSD */
 		b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B, 0x0f, jtype,
 		    reverse, jvalue);
 		break;
 
 	case A_MSGTYPE:
-		if (cstate->off_payload == (u_int)-1)
+		if (cstate->off_payload == OFFSET_NOT_SET)
 			abort();
 		b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_payload + MSG_TYPE_POS, BPF_B,
 		    0xffffffff, jtype, reverse, jvalue);
 		break;
 
 	case A_CALLREFTYPE:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'callref' supported only on raw ATM");
-		if (cstate->off_proto == (u_int)-1)
+		if (cstate->off_proto == OFFSET_NOT_SET)
 			abort();
 		b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B, 0xffffffff,
 		    jtype, reverse, jvalue);
 		break;
 
 	default:
 		abort();
 	}
 	return b0;
 }
 
 struct block *
 gen_atmtype_abbrev(compiler_state_t *cstate, int type)
 {
 	struct block *b0, *b1;
 
 	switch (type) {
 
 	case A_METAC:
 		/* Get all packets in Meta signalling Circuit */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'metac' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 1, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_BCC:
 		/* Get all packets in Broadcast Circuit*/
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'bcc' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 2, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_OAMF4SC:
 		/* Get all cells in Segment OAM F4 circuit*/
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'oam4sc' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 3, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_OAMF4EC:
 		/* Get all cells in End-to-End OAM F4 Circuit*/
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'oam4ec' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 4, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_SC:
 		/*  Get all packets in connection Signalling Circuit */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'sc' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 5, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_ILMIC:
 		/* Get all packets in ILMI Circuit */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'ilmic' supported only on raw ATM");
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 16, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_LANE:
 		/* Get all LANE packets */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'lane' supported only on raw ATM");
 		b1 = gen_atmfield_code(cstate, A_PROTOTYPE, PT_LANE, BPF_JEQ, 0);
 
 		/*
 		 * Arrange that all subsequent tests assume LANE
 		 * rather than LLC-encapsulated packets, and set
 		 * the offsets appropriately for LANE-encapsulated
 		 * Ethernet.
 		 *
 		 * We assume LANE means Ethernet, not Token Ring.
 		 */
 		PUSH_LINKHDR(cstate, DLT_EN10MB, 0,
 		    cstate->off_payload + 2,	/* Ethernet header */
 		    -1);
 		cstate->off_linktype.constant_part = cstate->off_linkhdr.constant_part + 12;
 		cstate->off_linkpl.constant_part = cstate->off_linkhdr.constant_part + 14;	/* Ethernet */
 		cstate->off_nl = 0;			/* Ethernet II */
 		cstate->off_nl_nosnap = 3;		/* 802.3+802.2 */
 		break;
 
 	case A_LLC:
 		/* Get all LLC-encapsulated packets */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'llc' supported only on raw ATM");
 		b1 = gen_atmfield_code(cstate, A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);
 		cstate->linktype = cstate->prevlinktype;
 		break;
 
 	default:
 		abort();
 	}
 	return b1;
 }
 
 /*
  * Filtering for MTP2 messages based on li value
  * FISU, length is null
  * LSSU, length is 1 or 2
  * MSU, length is 3 or more
  * For MTP2_HSL, sequences are on 2 bytes, and length on 9 bits
  */
 struct block *
 gen_mtp2type_abbrev(compiler_state_t *cstate, int type)
 {
 	struct block *b0, *b1;
 
 	switch (type) {
 
 	case M_FISU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'fisu' supported only on MTP2");
 		/* gen_ncmp(cstate, offrel, offset, size, mask, jtype, reverse, value) */
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B, 0x3f, BPF_JEQ, 0, 0);
 		break;
 
 	case M_LSSU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'lssu' supported only on MTP2");
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B, 0x3f, BPF_JGT, 1, 2);
 		b1 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B, 0x3f, BPF_JGT, 0, 0);
 		gen_and(b1, b0);
 		break;
 
 	case M_MSU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'msu' supported only on MTP2");
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li, BPF_B, 0x3f, BPF_JGT, 0, 2);
 		break;
 
 	case MH_FISU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'hfisu' supported only on MTP2_HSL");
 		/* gen_ncmp(cstate, offrel, offset, size, mask, jtype, reverse, value) */
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H, 0xff80, BPF_JEQ, 0, 0);
 		break;
 
 	case MH_LSSU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'hlssu' supported only on MTP2_HSL");
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H, 0xff80, BPF_JGT, 1, 0x0100);
 		b1 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H, 0xff80, BPF_JGT, 0, 0);
 		gen_and(b1, b0);
 		break;
 
 	case MH_MSU:
 		if ( (cstate->linktype != DLT_MTP2) &&
 		     (cstate->linktype != DLT_ERF) &&
 		     (cstate->linktype != DLT_MTP2_WITH_PHDR) )
 			bpf_error(cstate, "'hmsu' supported only on MTP2_HSL");
 		b0 = gen_ncmp(cstate, OR_PACKET, cstate->off_li_hsl, BPF_H, 0xff80, BPF_JGT, 0, 0x0100);
 		break;
 
 	default:
 		abort();
 	}
 	return b0;
 }
 
 struct block *
 gen_mtp3field_code(compiler_state_t *cstate, int mtp3field, bpf_u_int32 jvalue,
     bpf_u_int32 jtype, int reverse)
 {
 	struct block *b0;
 	bpf_u_int32 val1 , val2 , val3;
 	u_int newoff_sio = cstate->off_sio;
 	u_int newoff_opc = cstate->off_opc;
 	u_int newoff_dpc = cstate->off_dpc;
 	u_int newoff_sls = cstate->off_sls;
 
 	switch (mtp3field) {
 
 	case MH_SIO:
 		newoff_sio += 3; /* offset for MTP2_HSL */
 		/* FALLTHROUGH */
 
 	case M_SIO:
-		if (cstate->off_sio == (u_int)-1)
+		if (cstate->off_sio == OFFSET_NOT_SET)
 			bpf_error(cstate, "'sio' supported only on SS7");
 		/* sio coded on 1 byte so max value 255 */
 		if(jvalue > 255)
 		        bpf_error(cstate, "sio value %u too big; max value = 255",
 		            jvalue);
 		b0 = gen_ncmp(cstate, OR_PACKET, newoff_sio, BPF_B, 0xffffffff,
 		    (u_int)jtype, reverse, (u_int)jvalue);
 		break;
 
 	case MH_OPC:
 		newoff_opc+=3;
         case M_OPC:
-	        if (cstate->off_opc == (u_int)-1)
+	        if (cstate->off_opc == OFFSET_NOT_SET)
 			bpf_error(cstate, "'opc' supported only on SS7");
 		/* opc coded on 14 bits so max value 16383 */
 		if (jvalue > 16383)
 		        bpf_error(cstate, "opc value %u too big; max value = 16383",
 		            jvalue);
 		/* the following instructions are made to convert jvalue
 		 * to the form used to write opc in an ss7 message*/
 		val1 = jvalue & 0x00003c00;
 		val1 = val1 >>10;
 		val2 = jvalue & 0x000003fc;
 		val2 = val2 <<6;
 		val3 = jvalue & 0x00000003;
 		val3 = val3 <<22;
 		jvalue = val1 + val2 + val3;
 		b0 = gen_ncmp(cstate, OR_PACKET, newoff_opc, BPF_W, 0x00c0ff0f,
 		    (u_int)jtype, reverse, (u_int)jvalue);
 		break;
 
 	case MH_DPC:
 		newoff_dpc += 3;
 		/* FALLTHROUGH */
 
 	case M_DPC:
-	        if (cstate->off_dpc == (u_int)-1)
+	        if (cstate->off_dpc == OFFSET_NOT_SET)
 			bpf_error(cstate, "'dpc' supported only on SS7");
 		/* dpc coded on 14 bits so max value 16383 */
 		if (jvalue > 16383)
 		        bpf_error(cstate, "dpc value %u too big; max value = 16383",
 		            jvalue);
 		/* the following instructions are made to convert jvalue
 		 * to the forme used to write dpc in an ss7 message*/
 		val1 = jvalue & 0x000000ff;
 		val1 = val1 << 24;
 		val2 = jvalue & 0x00003f00;
 		val2 = val2 << 8;
 		jvalue = val1 + val2;
 		b0 = gen_ncmp(cstate, OR_PACKET, newoff_dpc, BPF_W, 0xff3f0000,
 		    (u_int)jtype, reverse, (u_int)jvalue);
 		break;
 
 	case MH_SLS:
 	  newoff_sls+=3;
 	case M_SLS:
-	        if (cstate->off_sls == (u_int)-1)
+	        if (cstate->off_sls == OFFSET_NOT_SET)
 			bpf_error(cstate, "'sls' supported only on SS7");
 		/* sls coded on 4 bits so max value 15 */
 		if (jvalue > 15)
 		         bpf_error(cstate, "sls value %u too big; max value = 15",
 		             jvalue);
 		/* the following instruction is made to convert jvalue
 		 * to the forme used to write sls in an ss7 message*/
 		jvalue = jvalue << 4;
 		b0 = gen_ncmp(cstate, OR_PACKET, newoff_sls, BPF_B, 0xf0,
 		    (u_int)jtype,reverse, (u_int)jvalue);
 		break;
 
 	default:
 		abort();
 	}
 	return b0;
 }
 
 static struct block *
 gen_msg_abbrev(compiler_state_t *cstate, int type)
 {
 	struct block *b1;
 
 	/*
 	 * Q.2931 signalling protocol messages for handling virtual circuits
 	 * establishment and teardown
 	 */
 	switch (type) {
 
 	case A_SETUP:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, SETUP, BPF_JEQ, 0);
 		break;
 
 	case A_CALLPROCEED:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, CALL_PROCEED, BPF_JEQ, 0);
 		break;
 
 	case A_CONNECT:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, CONNECT, BPF_JEQ, 0);
 		break;
 
 	case A_CONNECTACK:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, CONNECT_ACK, BPF_JEQ, 0);
 		break;
 
 	case A_RELEASE:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, RELEASE, BPF_JEQ, 0);
 		break;
 
 	case A_RELEASE_DONE:
 		b1 = gen_atmfield_code(cstate, A_MSGTYPE, RELEASE_DONE, BPF_JEQ, 0);
 		break;
 
 	default:
 		abort();
 	}
 	return b1;
 }
 
 struct block *
 gen_atmmulti_abbrev(compiler_state_t *cstate, int type)
 {
 	struct block *b0, *b1;
 
 	switch (type) {
 
 	case A_OAM:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'oam' supported only on raw ATM");
 		b1 = gen_atmmulti_abbrev(cstate, A_OAMF4);
 		break;
 
 	case A_OAMF4:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'oamf4' supported only on raw ATM");
 		/* OAM F4 type */
 		b0 = gen_atmfield_code(cstate, A_VCI, 3, BPF_JEQ, 0);
 		b1 = gen_atmfield_code(cstate, A_VCI, 4, BPF_JEQ, 0);
 		gen_or(b0, b1);
 		b0 = gen_atmfield_code(cstate, A_VPI, 0, BPF_JEQ, 0);
 		gen_and(b0, b1);
 		break;
 
 	case A_CONNECTMSG:
 		/*
 		 * Get Q.2931 signalling messages for switched
 		 * virtual connection
 		 */
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'connectmsg' supported only on raw ATM");
 		b0 = gen_msg_abbrev(cstate, A_SETUP);
 		b1 = gen_msg_abbrev(cstate, A_CALLPROCEED);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_CONNECT);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_CONNECTACK);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_RELEASE);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_RELEASE_DONE);
 		gen_or(b0, b1);
 		b0 = gen_atmtype_abbrev(cstate, A_SC);
 		gen_and(b0, b1);
 		break;
 
 	case A_METACONNECT:
 		if (!cstate->is_atm)
 			bpf_error(cstate, "'metaconnect' supported only on raw ATM");
 		b0 = gen_msg_abbrev(cstate, A_SETUP);
 		b1 = gen_msg_abbrev(cstate, A_CALLPROCEED);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_CONNECT);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_RELEASE);
 		gen_or(b0, b1);
 		b0 = gen_msg_abbrev(cstate, A_RELEASE_DONE);
 		gen_or(b0, b1);
 		b0 = gen_atmtype_abbrev(cstate, A_METAC);
 		gen_and(b0, b1);
 		break;
 
 	default:
 		abort();
 	}
 	return b1;
 }
Index: vendor/libpcap/dist/gencode.h
===================================================================
--- vendor/libpcap/dist/gencode.h	(revision 333788)
+++ vendor/libpcap/dist/gencode.h	(revision 333789)
@@ -1,395 +1,409 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
+#include "pcap/funcattrs.h"
+
 /*
  * ATM support:
  *
  * Copyright (c) 1997 Yen Yen Lim and North Dakota State University
  * All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Yen Yen Lim and
  *      North Dakota State University
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef HAVE___ATTRIBUTE__
-#define __attribute__(x)
-#endif /* HAVE___ATTRIBUTE__ */
-
 /* Address qualifiers. */
 
 #define Q_HOST		1
 #define Q_NET		2
 #define Q_PORT		3
 #define Q_GATEWAY	4
 #define Q_PROTO		5
 #define Q_PROTOCHAIN	6
 #define Q_PORTRANGE	7
 
 /* Protocol qualifiers. */
 
 #define Q_LINK		1
 #define Q_IP		2
 #define Q_ARP		3
 #define Q_RARP		4
 #define Q_SCTP		5
 #define Q_TCP		6
 #define Q_UDP		7
 #define Q_ICMP		8
 #define Q_IGMP		9
 #define Q_IGRP		10
 
 
 #define	Q_ATALK		11
 #define	Q_DECNET	12
 #define	Q_LAT		13
 #define Q_SCA		14
 #define	Q_MOPRC		15
 #define	Q_MOPDL		16
 
 
 #define Q_IPV6		17
 #define Q_ICMPV6	18
 #define Q_AH		19
 #define Q_ESP		20
 
 #define Q_PIM		21
 #define Q_VRRP		22
 
 #define Q_AARP		23
 
 #define Q_ISO		24
 #define Q_ESIS		25
 #define Q_ISIS		26
 #define Q_CLNP		27
 
 #define Q_STP		28
 
 #define Q_IPX		29
 
 #define Q_NETBEUI	30
 
 /* IS-IS Levels */
 #define Q_ISIS_L1       31
 #define Q_ISIS_L2       32
 /* PDU types */
 #define Q_ISIS_IIH      33
 #define Q_ISIS_LAN_IIH  34
 #define Q_ISIS_PTP_IIH  35
 #define Q_ISIS_SNP      36
 #define Q_ISIS_CSNP     37
 #define Q_ISIS_PSNP     38
 #define Q_ISIS_LSP      39
 
 #define Q_RADIO		40
 
 #define Q_CARP		41
 
 /* Directional qualifiers. */
 
 #define Q_SRC		1
 #define Q_DST		2
 #define Q_OR		3
 #define Q_AND		4
 #define Q_ADDR1		5
 #define Q_ADDR2		6
 #define Q_ADDR3		7
 #define Q_ADDR4		8
 #define Q_RA		9
 #define Q_TA		10
 
 #define Q_DEFAULT	0
 #define Q_UNDEF		255
 
 /* ATM types */
 #define A_METAC		22	/* Meta signalling Circuit */
 #define A_BCC		23	/* Broadcast Circuit */
 #define A_OAMF4SC	24	/* Segment OAM F4 Circuit */
 #define A_OAMF4EC	25	/* End-to-End OAM F4 Circuit */
 #define A_SC		26	/* Signalling Circuit*/
 #define A_ILMIC		27	/* ILMI Circuit */
 #define A_OAM		28	/* OAM cells : F4 only */
 #define A_OAMF4		29	/* OAM F4 cells: Segment + End-to-end */
 #define A_LANE		30	/* LANE traffic */
 #define A_LLC		31	/* LLC-encapsulated traffic */
 
 /* Based on Q.2931 signalling protocol */
 #define A_SETUP		41	/* Setup message */
 #define A_CALLPROCEED	42	/* Call proceeding message */
 #define A_CONNECT	43	/* Connect message */
 #define A_CONNECTACK	44	/* Connect Ack message */
 #define A_RELEASE	45	/* Release message */
 #define A_RELEASE_DONE	46	/* Release message */
 
 /* ATM field types */
 #define A_VPI		51
 #define A_VCI		52
 #define A_PROTOTYPE	53
 #define A_MSGTYPE	54
 #define A_CALLREFTYPE	55
 
 #define A_CONNECTMSG	70	/* returns Q.2931 signalling messages for
 				   establishing and destroying switched
 				   virtual connection */
 #define A_METACONNECT	71	/* returns Q.2931 signalling messages for
 				   establishing and destroying predefined
 				   virtual circuits, such as broadcast
 				   circuit, oamf4 segment circuit, oamf4
 				   end-to-end circuits, ILMI circuits or
 				   connection signalling circuit. */
 
 /* MTP2 types */
 #define M_FISU		22	/* FISU */
 #define M_LSSU		23	/* LSSU */
 #define M_MSU		24	/* MSU */
 
 /* MTP2 HSL types */
 #define MH_FISU		25	/* FISU for HSL */
 #define MH_LSSU		26	/* LSSU */
 #define MH_MSU		27	/* MSU */
 
 /* MTP3 field types */
 #define M_SIO		1
 #define M_OPC		2
 #define M_DPC		3
 #define M_SLS		4
 
 /* MTP3 field types in case of MTP2 HSL */
 #define MH_SIO		5
 #define MH_OPC		6
 #define MH_DPC		7
 #define MH_SLS		8
 
 
 struct slist;
 
 struct stmt {
 	int code;
 	struct slist *jt;	/*only for relative jump in block*/
 	struct slist *jf;	/*only for relative jump in block*/
 	bpf_int32 k;
 };
 
 struct slist {
 	struct stmt s;
 	struct slist *next;
 };
 
 /*
  * A bit vector to represent definition sets.  We assume TOT_REGISTERS
  * is smaller than 8*sizeof(atomset).
  */
 typedef bpf_u_int32 atomset;
 #define ATOMMASK(n) (1 << (n))
 #define ATOMELEM(d, n) (d & ATOMMASK(n))
 
 /*
  * An unbounded set.
  */
 typedef bpf_u_int32 *uset;
 
 /*
  * Total number of atomic entities, including accumulator (A) and index (X).
  * We treat all these guys similarly during flow analysis.
  */
 #define N_ATOMS (BPF_MEMWORDS+2)
 
 struct edge {
 	int id;
 	int code;
 	uset edom;
 	struct block *succ;
 	struct block *pred;
 	struct edge *next;	/* link list of incoming edges for a node */
 };
 
 struct block {
 	int id;
 	struct slist *stmts;	/* side effect stmts */
 	struct stmt s;		/* branch stmt */
 	int mark;
 	u_int longjt;		/* jt branch requires long jump */
 	u_int longjf;		/* jf branch requires long jump */
 	int level;
 	int offset;
 	int sense;
 	struct edge et;
 	struct edge ef;
 	struct block *head;
 	struct block *link;	/* link field used by optimizer */
 	uset dom;
 	uset closure;
 	struct edge *in_edges;
 	atomset def, kill;
 	atomset in_use;
 	atomset out_use;
 	int oval;
 	int val[N_ATOMS];
 };
 
+/*
+ * A value of 0 for val[i] means the value is unknown.
+ */
+#define VAL_UNKNOWN	0
+
 struct arth {
 	struct block *b;	/* protocol checks */
 	struct slist *s;	/* stmt list */
 	int regno;		/* virtual register number of result */
 };
 
 struct qual {
 	unsigned char addr;
 	unsigned char proto;
 	unsigned char dir;
 	unsigned char pad;
 };
 
 struct _compiler_state;
 
 typedef struct _compiler_state compiler_state_t;
 
 struct arth *gen_loadi(compiler_state_t *, int);
 struct arth *gen_load(compiler_state_t *, int, struct arth *, int);
 struct arth *gen_loadlen(compiler_state_t *);
 struct arth *gen_neg(compiler_state_t *, struct arth *);
 struct arth *gen_arth(compiler_state_t *, int, struct arth *, struct arth *);
 
 void gen_and(struct block *, struct block *);
 void gen_or(struct block *, struct block *);
 void gen_not(struct block *);
 
 struct block *gen_scode(compiler_state_t *, const char *, struct qual);
 struct block *gen_ecode(compiler_state_t *, const u_char *, struct qual);
 struct block *gen_acode(compiler_state_t *, const u_char *, struct qual);
 struct block *gen_mcode(compiler_state_t *, const char *, const char *,
     unsigned int, struct qual);
 #ifdef INET6
 struct block *gen_mcode6(compiler_state_t *, const char *, const char *,
     unsigned int, struct qual);
 #endif
 struct block *gen_ncode(compiler_state_t *, const char *, bpf_u_int32,
     struct qual);
 struct block *gen_proto_abbrev(compiler_state_t *, int);
 struct block *gen_relation(compiler_state_t *, int, struct arth *,
     struct arth *, int);
 struct block *gen_less(compiler_state_t *, int);
 struct block *gen_greater(compiler_state_t *, int);
 struct block *gen_byteop(compiler_state_t *, int, int, int);
 struct block *gen_broadcast(compiler_state_t *, int);
 struct block *gen_multicast(compiler_state_t *, int);
 struct block *gen_inbound(compiler_state_t *, int);
 
 struct block *gen_llc(compiler_state_t *);
 struct block *gen_llc_i(compiler_state_t *);
 struct block *gen_llc_s(compiler_state_t *);
 struct block *gen_llc_u(compiler_state_t *);
 struct block *gen_llc_s_subtype(compiler_state_t *, bpf_u_int32);
 struct block *gen_llc_u_subtype(compiler_state_t *, bpf_u_int32);
 
 struct block *gen_vlan(compiler_state_t *, int);
 struct block *gen_mpls(compiler_state_t *, int);
 
 struct block *gen_pppoed(compiler_state_t *);
 struct block *gen_pppoes(compiler_state_t *, int);
 
 struct block *gen_geneve(compiler_state_t *, int);
 
 struct block *gen_atmfield_code(compiler_state_t *, int, bpf_int32,
     bpf_u_int32, int);
 struct block *gen_atmtype_abbrev(compiler_state_t *, int type);
 struct block *gen_atmmulti_abbrev(compiler_state_t *, int type);
 
 struct block *gen_mtp2type_abbrev(compiler_state_t *, int type);
 struct block *gen_mtp3field_code(compiler_state_t *, int, bpf_u_int32,
     bpf_u_int32, int);
 
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_ifname(compiler_state_t *, const char *);
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_rnr(compiler_state_t *, int);
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_srnr(compiler_state_t *, int);
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_ruleset(compiler_state_t *, char *);
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_reason(compiler_state_t *, int);
+#ifndef HAVE_NET_PFVAR_H
+PCAP_NORETURN
+#endif
 struct block *gen_pf_action(compiler_state_t *, int);
 
 struct block *gen_p80211_type(compiler_state_t *, int, int);
 struct block *gen_p80211_fcdir(compiler_state_t *, int);
 
 /*
  * Representation of a program as a tree of blocks, plus current mark.
  * A block is marked if only if its mark equals the current mark.
  * Rather than traverse the code array, marking each item, 'cur_mark'
  * is incremented.  This automatically makes each element unmarked.
  */
 #define isMarked(icp, p) ((p)->mark == (icp)->cur_mark)
 #define unMarkAll(icp) (icp)->cur_mark += 1
 #define Mark(icp, p) ((p)->mark = (icp)->cur_mark)
 
 struct icode {
 	struct block *root;
 	int cur_mark;
 };
 
 void bpf_optimize(compiler_state_t *, struct icode *ic);
-void bpf_syntax_error(compiler_state_t *, const char *);
-void bpf_error(compiler_state_t *, const char *, ...)
-    __attribute__((noreturn))
-#ifdef __ATTRIBUTE___FORMAT_OK
-    __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-    ;
+void PCAP_NORETURN bpf_syntax_error(compiler_state_t *, const char *);
+void PCAP_NORETURN bpf_error(compiler_state_t *, const char *, ...)
+    PCAP_PRINTFLIKE(2, 3);
 
 void finish_parse(compiler_state_t *, struct block *);
 char *sdup(compiler_state_t *, const char *);
-
-struct _opt_state;
-typedef struct _opt_state opt_state_t;
 
 struct bpf_insn *icode_to_fcode(compiler_state_t *, struct icode *,
     struct block *, u_int *);
 void sappend(struct slist *, struct slist *);
 
 /*
  * Older versions of Bison don't put this declaration in
  * grammar.h.
  */
 int pcap_parse(void *, compiler_state_t *);
 
 /* XXX */
 #define JT(b)  ((b)->et.succ)
 #define JF(b)  ((b)->ef.succ)
Index: vendor/libpcap/dist/grammar.y
===================================================================
--- vendor/libpcap/dist/grammar.y	(revision 333788)
+++ vendor/libpcap/dist/grammar.y	(revision 333789)
@@ -1,768 +1,783 @@
 /*
  * We want a reentrant parser.
  */
 %pure-parser
 
 /*
  * We also want a reentrant scanner, so we have to pass the
  * handle for the reentrant scanner to the parser, and the
  * parser has to pass it to the lexical analyzer.
  *
  * We use void * rather than yyscan_t because, at least with some
  * versions of Flex and Bison, if you use yyscan_t in %parse-param and
  * %lex-param, you have to include scanner.h before grammar.h to get
  * yyscan_t declared, and you have to include grammar.h before scanner.h
  * to get YYSTYPE declared.  Using void * breaks the cycle; the Flex
  * documentation says yyscan_t is just a void *.
  */
 %parse-param   {void *yyscanner}
 %lex-param   {void *yyscanner}
 
 /*
  * And we need to pass the compiler state to the scanner.
  */
-%parse-param {compiler_state_t *cstate}
+%parse-param { compiler_state_t *cstate }
 
 %{
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif /* _WIN32 */
-
 #include <stdlib.h>
 
 #ifndef _WIN32
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #if __STDC__
 struct mbuf;
 struct rtentry;
 #endif
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif /* _WIN32 */
 
 #include <stdio.h>
 
+#include "diag-control.h"
+
 #include "pcap-int.h"
 
 #include "gencode.h"
 #include "grammar.h"
 #include "scanner.h"
 
 #ifdef HAVE_NET_PFVAR_H
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 #endif
 #include "llc.h"
 #include "ieee80211.h"
 #include <pcap/namedb.h>
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
-#define QSET(q, p, d, a) (q).proto = (p),\
-			 (q).dir = (d),\
-			 (q).addr = (a)
+#ifdef YYBYACC
+/*
+ * Both Berkeley YACC and Bison define yydebug (under whatever name
+ * it has) as a global, but Bison does so only if YYDEBUG is defined.
+ * Berkeley YACC define it even if YYDEBUG isn't defined; declare it
+ * here to suppress a warning.
+ */
+#if !defined(YYDEBUG)
+extern int yydebug;
+#endif
 
+/*
+ * In Berkeley YACC, yynerrs (under whatever name it has) is global,
+ * even if it's building a reentrant parser.  In Bison, it's local
+ * in reentrant parsers.
+ *
+ * Declare it to squelch a warning.
+ */
+extern int yynerrs;
+#endif
+
+#define QSET(q, p, d, a) (q).proto = (unsigned char)(p),\
+			 (q).dir = (unsigned char)(d),\
+			 (q).addr = (unsigned char)(a)
+
 struct tok {
 	int v;			/* value */
 	const char *s;		/* string */
 };
 
 static const struct tok ieee80211_types[] = {
 	{ IEEE80211_FC0_TYPE_DATA, "data" },
 	{ IEEE80211_FC0_TYPE_MGT, "mgt" },
 	{ IEEE80211_FC0_TYPE_MGT, "management" },
 	{ IEEE80211_FC0_TYPE_CTL, "ctl" },
 	{ IEEE80211_FC0_TYPE_CTL, "control" },
 	{ 0, NULL }
 };
 static const struct tok ieee80211_mgt_subtypes[] = {
 	{ IEEE80211_FC0_SUBTYPE_ASSOC_REQ, "assocreq" },
 	{ IEEE80211_FC0_SUBTYPE_ASSOC_REQ, "assoc-req" },
 	{ IEEE80211_FC0_SUBTYPE_ASSOC_RESP, "assocresp" },
 	{ IEEE80211_FC0_SUBTYPE_ASSOC_RESP, "assoc-resp" },
 	{ IEEE80211_FC0_SUBTYPE_REASSOC_REQ, "reassocreq" },
 	{ IEEE80211_FC0_SUBTYPE_REASSOC_REQ, "reassoc-req" },
 	{ IEEE80211_FC0_SUBTYPE_REASSOC_RESP, "reassocresp" },
 	{ IEEE80211_FC0_SUBTYPE_REASSOC_RESP, "reassoc-resp" },
 	{ IEEE80211_FC0_SUBTYPE_PROBE_REQ, "probereq" },
 	{ IEEE80211_FC0_SUBTYPE_PROBE_REQ, "probe-req" },
 	{ IEEE80211_FC0_SUBTYPE_PROBE_RESP, "proberesp" },
 	{ IEEE80211_FC0_SUBTYPE_PROBE_RESP, "probe-resp" },
 	{ IEEE80211_FC0_SUBTYPE_BEACON, "beacon" },
 	{ IEEE80211_FC0_SUBTYPE_ATIM, "atim" },
 	{ IEEE80211_FC0_SUBTYPE_DISASSOC, "disassoc" },
 	{ IEEE80211_FC0_SUBTYPE_DISASSOC, "disassociation" },
 	{ IEEE80211_FC0_SUBTYPE_AUTH, "auth" },
 	{ IEEE80211_FC0_SUBTYPE_AUTH, "authentication" },
 	{ IEEE80211_FC0_SUBTYPE_DEAUTH, "deauth" },
 	{ IEEE80211_FC0_SUBTYPE_DEAUTH, "deauthentication" },
 	{ 0, NULL }
 };
 static const struct tok ieee80211_ctl_subtypes[] = {
 	{ IEEE80211_FC0_SUBTYPE_PS_POLL, "ps-poll" },
 	{ IEEE80211_FC0_SUBTYPE_RTS, "rts" },
 	{ IEEE80211_FC0_SUBTYPE_CTS, "cts" },
 	{ IEEE80211_FC0_SUBTYPE_ACK, "ack" },
 	{ IEEE80211_FC0_SUBTYPE_CF_END, "cf-end" },
 	{ IEEE80211_FC0_SUBTYPE_CF_END_ACK, "cf-end-ack" },
 	{ 0, NULL }
 };
 static const struct tok ieee80211_data_subtypes[] = {
 	{ IEEE80211_FC0_SUBTYPE_DATA, "data" },
 	{ IEEE80211_FC0_SUBTYPE_CF_ACK, "data-cf-ack" },
 	{ IEEE80211_FC0_SUBTYPE_CF_POLL, "data-cf-poll" },
 	{ IEEE80211_FC0_SUBTYPE_CF_ACPL, "data-cf-ack-poll" },
 	{ IEEE80211_FC0_SUBTYPE_NODATA, "null" },
 	{ IEEE80211_FC0_SUBTYPE_NODATA_CF_ACK, "cf-ack" },
 	{ IEEE80211_FC0_SUBTYPE_NODATA_CF_POLL, "cf-poll"  },
 	{ IEEE80211_FC0_SUBTYPE_NODATA_CF_ACPL, "cf-ack-poll" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_DATA, "qos-data" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_ACK, "qos-data-cf-ack" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_POLL, "qos-data-cf-poll" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_ACPL, "qos-data-cf-ack-poll" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA, "qos" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA_CF_POLL, "qos-cf-poll" },
 	{ IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA_CF_ACPL, "qos-cf-ack-poll" },
 	{ 0, NULL }
 };
 static const struct tok llc_s_subtypes[] = {
 	{ LLC_RR, "rr" },
 	{ LLC_RNR, "rnr" },
 	{ LLC_REJ, "rej" },
 	{ 0, NULL }
 };
 static const struct tok llc_u_subtypes[] = {
 	{ LLC_UI, "ui" },
 	{ LLC_UA, "ua" },
 	{ LLC_DISC, "disc" },
 	{ LLC_DM, "dm" },
 	{ LLC_SABME, "sabme" },
 	{ LLC_TEST, "test" },
 	{ LLC_XID, "xid" },
 	{ LLC_FRMR, "frmr" },
 	{ 0, NULL }
 };
 struct type2tok {
 	int type;
 	const struct tok *tok;
 };
 static const struct type2tok ieee80211_type_subtypes[] = {
 	{ IEEE80211_FC0_TYPE_MGT, ieee80211_mgt_subtypes },
 	{ IEEE80211_FC0_TYPE_CTL, ieee80211_ctl_subtypes },
 	{ IEEE80211_FC0_TYPE_DATA, ieee80211_data_subtypes },
 	{ 0, NULL }
 };
 
 static int
 str2tok(const char *str, const struct tok *toks)
 {
 	int i;
 
 	for (i = 0; toks[i].s != NULL; i++) {
 		if (pcap_strcasecmp(toks[i].s, str) == 0)
 			return (toks[i].v);
 	}
 	return (-1);
 }
 
 static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
 
-static void
-yyerror(void *yyscanner, compiler_state_t *cstate, const char *msg)
+static PCAP_NORETURN_DEF void
+yyerror(void *yyscanner _U_, compiler_state_t *cstate, const char *msg)
 {
 	bpf_syntax_error(cstate, msg);
 	/* NOTREACHED */
 }
 
 #ifdef HAVE_NET_PFVAR_H
 static int
 pfreason_to_num(compiler_state_t *cstate, const char *reason)
 {
 	const char *reasons[] = PFRES_NAMES;
 	int i;
 
 	for (i = 0; reasons[i]; i++) {
 		if (pcap_strcasecmp(reason, reasons[i]) == 0)
 			return (i);
 	}
 	bpf_error(cstate, "unknown PF reason");
 	/*NOTREACHED*/
 }
 
 static int
 pfaction_to_num(compiler_state_t *cstate, const char *action)
 {
 	if (pcap_strcasecmp(action, "pass") == 0 ||
 	    pcap_strcasecmp(action, "accept") == 0)
 		return (PF_PASS);
 	else if (pcap_strcasecmp(action, "drop") == 0 ||
 		pcap_strcasecmp(action, "block") == 0)
 		return (PF_DROP);
 #if HAVE_PF_NAT_THROUGH_PF_NORDR
 	else if (pcap_strcasecmp(action, "rdr") == 0)
 		return (PF_RDR);
 	else if (pcap_strcasecmp(action, "nat") == 0)
 		return (PF_NAT);
 	else if (pcap_strcasecmp(action, "binat") == 0)
 		return (PF_BINAT);
 	else if (pcap_strcasecmp(action, "nordr") == 0)
 		return (PF_NORDR);
 #endif
 	else {
 		bpf_error(cstate, "unknown PF action");
 		/*NOTREACHED*/
 	}
 }
 #else /* !HAVE_NET_PFVAR_H */
-static int
-pfreason_to_num(compiler_state_t *cstate, const char *reason)
+static PCAP_NORETURN_DEF int
+pfreason_to_num(compiler_state_t *cstate, const char *reason _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/*NOTREACHED*/
-
-	/* this is to make the VC compiler happy */
-	return -1;
 }
 
-static int
-pfaction_to_num(compiler_state_t *cstate, const char *action)
+static PCAP_NORETURN_DEF int
+pfaction_to_num(compiler_state_t *cstate, const char *action _U_)
 {
 	bpf_error(cstate, "libpcap was compiled on a machine without pf support");
 	/*NOTREACHED*/
-
-	/* this is to make the VC compiler happy */
-	return -1;
 }
 #endif /* HAVE_NET_PFVAR_H */
+
+DIAG_OFF_BISON_BYACC
 %}
 
 %union {
 	int i;
 	bpf_u_int32 h;
 	u_char *e;
 	char *s;
 	struct stmt *stmt;
 	struct arth *a;
 	struct {
 		struct qual q;
 		int atmfieldtype;
 		int mtp3fieldtype;
 		struct block *b;
 	} blk;
 	struct block *rblk;
 }
 
 %type	<blk>	expr id nid pid term rterm qid
 %type	<blk>	head
 %type	<i>	pqual dqual aqual ndaqual
 %type	<a>	arth narth
 %type	<i>	byteop pname pnum relop irelop
 %type	<blk>	and or paren not null prog
 %type	<rblk>	other pfvar p80211 pllc
 %type	<i>	atmtype atmmultitype
 %type	<blk>	atmfield
 %type	<blk>	atmfieldvalue atmvalue atmlistvalue
 %type	<i>	mtp2type
 %type	<blk>	mtp3field
 %type	<blk>	mtp3fieldvalue mtp3value mtp3listvalue
 
 
 %token  DST SRC HOST GATEWAY
 %token  NET NETMASK PORT PORTRANGE LESS GREATER PROTO PROTOCHAIN CBYTE
 %token  ARP RARP IP SCTP TCP UDP ICMP IGMP IGRP PIM VRRP CARP
 %token  ATALK AARP DECNET LAT SCA MOPRC MOPDL
 %token  TK_BROADCAST TK_MULTICAST
 %token  NUM INBOUND OUTBOUND
 %token  PF_IFNAME PF_RSET PF_RNR PF_SRNR PF_REASON PF_ACTION
 %token	TYPE SUBTYPE DIR ADDR1 ADDR2 ADDR3 ADDR4 RA TA
 %token  LINK
 %token	GEQ LEQ NEQ
 %token	ID EID HID HID6 AID
 %token	LSH RSH
 %token  LEN
 %token  IPV6 ICMPV6 AH ESP
 %token	VLAN MPLS
 %token	PPPOED PPPOES GENEVE
 %token  ISO ESIS CLNP ISIS L1 L2 IIH LSP SNP CSNP PSNP
 %token  STP
 %token  IPX
 %token  NETBEUI
 %token	LANE LLC METAC BCC SC ILMIC OAMF4EC OAMF4SC
 %token	OAM OAMF4 CONNECTMSG METACONNECT
 %token	VPI VCI
 %token	RADIO
 %token	FISU LSSU MSU HFISU HLSSU HMSU
 %token	SIO OPC DPC SLS HSIO HOPC HDPC HSLS
 
 
 %type	<s> ID
 %type	<e> EID
 %type	<e> AID
 %type	<s> HID HID6
 %type	<i> NUM action reason type subtype type_subtype dir
 
 %left OR AND
 %nonassoc  '!'
 %left '|'
 %left '&'
 %left LSH RSH
 %left '+' '-'
 %left '*' '/'
 %nonassoc UMINUS
 %%
 prog:	  null expr
 {
 	finish_parse(cstate, $2.b);
 }
 	| null
 	;
 null:	  /* null */		{ $$.q = qerr; }
 	;
 expr:	  term
 	| expr and term		{ gen_and($1.b, $3.b); $$ = $3; }
 	| expr and id		{ gen_and($1.b, $3.b); $$ = $3; }
 	| expr or term		{ gen_or($1.b, $3.b); $$ = $3; }
 	| expr or id		{ gen_or($1.b, $3.b); $$ = $3; }
 	;
 and:	  AND			{ $$ = $<blk>0; }
 	;
 or:	  OR			{ $$ = $<blk>0; }
 	;
 id:	  nid
 	| pnum			{ $$.b = gen_ncode(cstate, NULL, (bpf_u_int32)$1,
 						   $$.q = $<blk>0.q); }
 	| paren pid ')'		{ $$ = $2; }
 	;
 nid:	  ID			{ $$.b = gen_scode(cstate, $1, $$.q = $<blk>0.q); }
 	| HID '/' NUM		{ $$.b = gen_mcode(cstate, $1, NULL, $3,
 				    $$.q = $<blk>0.q); }
 	| HID NETMASK HID	{ $$.b = gen_mcode(cstate, $1, $3, 0,
 				    $$.q = $<blk>0.q); }
 	| HID			{
 				  /* Decide how to parse HID based on proto */
 				  $$.q = $<blk>0.q;
 				  if ($$.q.addr == Q_PORT)
 				  	bpf_error(cstate, "'port' modifier applied to ip host");
 				  else if ($$.q.addr == Q_PORTRANGE)
 				  	bpf_error(cstate, "'portrange' modifier applied to ip host");
 				  else if ($$.q.addr == Q_PROTO)
 				  	bpf_error(cstate, "'proto' modifier applied to ip host");
 				  else if ($$.q.addr == Q_PROTOCHAIN)
 				  	bpf_error(cstate, "'protochain' modifier applied to ip host");
 				  $$.b = gen_ncode(cstate, $1, 0, $$.q);
 				}
 	| HID6 '/' NUM		{
 #ifdef INET6
 				  $$.b = gen_mcode6(cstate, $1, NULL, $3,
 				    $$.q = $<blk>0.q);
 #else
 				  bpf_error(cstate, "'ip6addr/prefixlen' not supported "
 					"in this configuration");
 #endif /*INET6*/
 				}
 	| HID6			{
 #ifdef INET6
 				  $$.b = gen_mcode6(cstate, $1, 0, 128,
 				    $$.q = $<blk>0.q);
 #else
 				  bpf_error(cstate, "'ip6addr' not supported "
 					"in this configuration");
 #endif /*INET6*/
 				}
 	| EID			{
 				  $$.b = gen_ecode(cstate, $1, $$.q = $<blk>0.q);
 				  /*
 				   * $1 was allocated by "pcap_ether_aton()",
 				   * so we must free it now that we're done
 				   * with it.
 				   */
 				  free($1);
 				}
 	| AID			{
 				  $$.b = gen_acode(cstate, $1, $$.q = $<blk>0.q);
 				  /*
 				   * $1 was allocated by "pcap_ether_aton()",
 				   * so we must free it now that we're done
 				   * with it.
 				   */
 				  free($1);
 				}
 	| not id		{ gen_not($2.b); $$ = $2; }
 	;
 not:	  '!'			{ $$ = $<blk>0; }
 	;
 paren:	  '('			{ $$ = $<blk>0; }
 	;
 pid:	  nid
 	| qid and id		{ gen_and($1.b, $3.b); $$ = $3; }
 	| qid or id		{ gen_or($1.b, $3.b); $$ = $3; }
 	;
 qid:	  pnum			{ $$.b = gen_ncode(cstate, NULL, (bpf_u_int32)$1,
 						   $$.q = $<blk>0.q); }
 	| pid
 	;
 term:	  rterm
 	| not term		{ gen_not($2.b); $$ = $2; }
 	;
 head:	  pqual dqual aqual	{ QSET($$.q, $1, $2, $3); }
 	| pqual dqual		{ QSET($$.q, $1, $2, Q_DEFAULT); }
 	| pqual aqual		{ QSET($$.q, $1, Q_DEFAULT, $2); }
 	| pqual PROTO		{ QSET($$.q, $1, Q_DEFAULT, Q_PROTO); }
 	| pqual PROTOCHAIN	{ QSET($$.q, $1, Q_DEFAULT, Q_PROTOCHAIN); }
 	| pqual ndaqual		{ QSET($$.q, $1, Q_DEFAULT, $2); }
 	;
 rterm:	  head id		{ $$ = $2; }
 	| paren expr ')'	{ $$.b = $2.b; $$.q = $1.q; }
 	| pname			{ $$.b = gen_proto_abbrev(cstate, $1); $$.q = qerr; }
 	| arth relop arth	{ $$.b = gen_relation(cstate, $2, $1, $3, 0);
 				  $$.q = qerr; }
 	| arth irelop arth	{ $$.b = gen_relation(cstate, $2, $1, $3, 1);
 				  $$.q = qerr; }
 	| other			{ $$.b = $1; $$.q = qerr; }
 	| atmtype		{ $$.b = gen_atmtype_abbrev(cstate, $1); $$.q = qerr; }
 	| atmmultitype		{ $$.b = gen_atmmulti_abbrev(cstate, $1); $$.q = qerr; }
 	| atmfield atmvalue	{ $$.b = $2.b; $$.q = qerr; }
 	| mtp2type		{ $$.b = gen_mtp2type_abbrev(cstate, $1); $$.q = qerr; }
 	| mtp3field mtp3value	{ $$.b = $2.b; $$.q = qerr; }
 	;
 /* protocol level qualifiers */
 pqual:	  pname
 	|			{ $$ = Q_DEFAULT; }
 	;
 /* 'direction' qualifiers */
 dqual:	  SRC			{ $$ = Q_SRC; }
 	| DST			{ $$ = Q_DST; }
 	| SRC OR DST		{ $$ = Q_OR; }
 	| DST OR SRC		{ $$ = Q_OR; }
 	| SRC AND DST		{ $$ = Q_AND; }
 	| DST AND SRC		{ $$ = Q_AND; }
 	| ADDR1			{ $$ = Q_ADDR1; }
 	| ADDR2			{ $$ = Q_ADDR2; }
 	| ADDR3			{ $$ = Q_ADDR3; }
 	| ADDR4			{ $$ = Q_ADDR4; }
 	| RA			{ $$ = Q_RA; }
 	| TA			{ $$ = Q_TA; }
 	;
 /* address type qualifiers */
 aqual:	  HOST			{ $$ = Q_HOST; }
 	| NET			{ $$ = Q_NET; }
 	| PORT			{ $$ = Q_PORT; }
 	| PORTRANGE		{ $$ = Q_PORTRANGE; }
 	;
 /* non-directional address type qualifiers */
 ndaqual:  GATEWAY		{ $$ = Q_GATEWAY; }
 	;
 pname:	  LINK			{ $$ = Q_LINK; }
 	| IP			{ $$ = Q_IP; }
 	| ARP			{ $$ = Q_ARP; }
 	| RARP			{ $$ = Q_RARP; }
 	| SCTP			{ $$ = Q_SCTP; }
 	| TCP			{ $$ = Q_TCP; }
 	| UDP			{ $$ = Q_UDP; }
 	| ICMP			{ $$ = Q_ICMP; }
 	| IGMP			{ $$ = Q_IGMP; }
 	| IGRP			{ $$ = Q_IGRP; }
 	| PIM			{ $$ = Q_PIM; }
 	| VRRP			{ $$ = Q_VRRP; }
 	| CARP 			{ $$ = Q_CARP; }
 	| ATALK			{ $$ = Q_ATALK; }
 	| AARP			{ $$ = Q_AARP; }
 	| DECNET		{ $$ = Q_DECNET; }
 	| LAT			{ $$ = Q_LAT; }
 	| SCA			{ $$ = Q_SCA; }
 	| MOPDL			{ $$ = Q_MOPDL; }
 	| MOPRC			{ $$ = Q_MOPRC; }
 	| IPV6			{ $$ = Q_IPV6; }
 	| ICMPV6		{ $$ = Q_ICMPV6; }
 	| AH			{ $$ = Q_AH; }
 	| ESP			{ $$ = Q_ESP; }
 	| ISO			{ $$ = Q_ISO; }
 	| ESIS			{ $$ = Q_ESIS; }
 	| ISIS			{ $$ = Q_ISIS; }
 	| L1			{ $$ = Q_ISIS_L1; }
 	| L2			{ $$ = Q_ISIS_L2; }
 	| IIH			{ $$ = Q_ISIS_IIH; }
 	| LSP			{ $$ = Q_ISIS_LSP; }
 	| SNP			{ $$ = Q_ISIS_SNP; }
 	| PSNP			{ $$ = Q_ISIS_PSNP; }
 	| CSNP			{ $$ = Q_ISIS_CSNP; }
 	| CLNP			{ $$ = Q_CLNP; }
 	| STP			{ $$ = Q_STP; }
 	| IPX			{ $$ = Q_IPX; }
 	| NETBEUI		{ $$ = Q_NETBEUI; }
 	| RADIO			{ $$ = Q_RADIO; }
 	;
 other:	  pqual TK_BROADCAST	{ $$ = gen_broadcast(cstate, $1); }
 	| pqual TK_MULTICAST	{ $$ = gen_multicast(cstate, $1); }
 	| LESS NUM		{ $$ = gen_less(cstate, $2); }
 	| GREATER NUM		{ $$ = gen_greater(cstate, $2); }
 	| CBYTE NUM byteop NUM	{ $$ = gen_byteop(cstate, $3, $2, $4); }
 	| INBOUND		{ $$ = gen_inbound(cstate, 0); }
 	| OUTBOUND		{ $$ = gen_inbound(cstate, 1); }
 	| VLAN pnum		{ $$ = gen_vlan(cstate, $2); }
 	| VLAN			{ $$ = gen_vlan(cstate, -1); }
 	| MPLS pnum		{ $$ = gen_mpls(cstate, $2); }
 	| MPLS			{ $$ = gen_mpls(cstate, -1); }
 	| PPPOED		{ $$ = gen_pppoed(cstate); }
 	| PPPOES pnum		{ $$ = gen_pppoes(cstate, $2); }
 	| PPPOES		{ $$ = gen_pppoes(cstate, -1); }
 	| GENEVE pnum		{ $$ = gen_geneve(cstate, $2); }
 	| GENEVE		{ $$ = gen_geneve(cstate, -1); }
 	| pfvar			{ $$ = $1; }
 	| pqual p80211		{ $$ = $2; }
 	| pllc			{ $$ = $1; }
 	;
 
 pfvar:	  PF_IFNAME ID		{ $$ = gen_pf_ifname(cstate, $2); }
 	| PF_RSET ID		{ $$ = gen_pf_ruleset(cstate, $2); }
 	| PF_RNR NUM		{ $$ = gen_pf_rnr(cstate, $2); }
 	| PF_SRNR NUM		{ $$ = gen_pf_srnr(cstate, $2); }
 	| PF_REASON reason	{ $$ = gen_pf_reason(cstate, $2); }
 	| PF_ACTION action	{ $$ = gen_pf_action(cstate, $2); }
 	;
 
 p80211:   TYPE type SUBTYPE subtype
 				{ $$ = gen_p80211_type(cstate, $2 | $4,
 					IEEE80211_FC0_TYPE_MASK |
 					IEEE80211_FC0_SUBTYPE_MASK);
 				}
 	| TYPE type		{ $$ = gen_p80211_type(cstate, $2,
 					IEEE80211_FC0_TYPE_MASK);
 				}
 	| SUBTYPE type_subtype	{ $$ = gen_p80211_type(cstate, $2,
 					IEEE80211_FC0_TYPE_MASK |
 					IEEE80211_FC0_SUBTYPE_MASK);
 				}
 	| DIR dir		{ $$ = gen_p80211_fcdir(cstate, $2); }
 	;
 
 type:	  NUM
 	| ID			{ $$ = str2tok($1, ieee80211_types);
 				  if ($$ == -1)
 				  	bpf_error(cstate, "unknown 802.11 type name");
 				}
 	;
 
 subtype:  NUM
 	| ID			{ const struct tok *types = NULL;
 				  int i;
 				  for (i = 0;; i++) {
 				  	if (ieee80211_type_subtypes[i].tok == NULL) {
 				  		/* Ran out of types */
 						bpf_error(cstate, "unknown 802.11 type");
 						break;
 					}
 					if ($<i>-1 == ieee80211_type_subtypes[i].type) {
 						types = ieee80211_type_subtypes[i].tok;
 						break;
 					}
 				  }
 
 				  $$ = str2tok($1, types);
 				  if ($$ == -1)
 					bpf_error(cstate, "unknown 802.11 subtype name");
 				}
 	;
 
 type_subtype:	ID		{ int i;
 				  for (i = 0;; i++) {
 				  	if (ieee80211_type_subtypes[i].tok == NULL) {
 				  		/* Ran out of types */
 						bpf_error(cstate, "unknown 802.11 type name");
 						break;
 					}
 					$$ = str2tok($1, ieee80211_type_subtypes[i].tok);
 					if ($$ != -1) {
 						$$ |= ieee80211_type_subtypes[i].type;
 						break;
 					}
 				  }
 				}
 		;
 
 pllc:	LLC			{ $$ = gen_llc(cstate); }
 	| LLC ID		{ if (pcap_strcasecmp($2, "i") == 0)
 					$$ = gen_llc_i(cstate);
 				  else if (pcap_strcasecmp($2, "s") == 0)
 					$$ = gen_llc_s(cstate);
 				  else if (pcap_strcasecmp($2, "u") == 0)
 					$$ = gen_llc_u(cstate);
 				  else {
 					int subtype;
 
 					subtype = str2tok($2, llc_s_subtypes);
 					if (subtype != -1)
 						$$ = gen_llc_s_subtype(cstate, subtype);
 					else {
 						subtype = str2tok($2, llc_u_subtypes);
 						if (subtype == -1)
 					  		bpf_error(cstate, "unknown LLC type name \"%s\"", $2);
 						$$ = gen_llc_u_subtype(cstate, subtype);
 					}
 				  }
 				}
 				/* sigh, "rnr" is already a keyword for PF */
 	| LLC PF_RNR		{ $$ = gen_llc_s_subtype(cstate, LLC_RNR); }
 	;
 
 dir:	  NUM
 	| ID			{ if (pcap_strcasecmp($1, "nods") == 0)
 					$$ = IEEE80211_FC1_DIR_NODS;
 				  else if (pcap_strcasecmp($1, "tods") == 0)
 					$$ = IEEE80211_FC1_DIR_TODS;
 				  else if (pcap_strcasecmp($1, "fromds") == 0)
 					$$ = IEEE80211_FC1_DIR_FROMDS;
 				  else if (pcap_strcasecmp($1, "dstods") == 0)
 					$$ = IEEE80211_FC1_DIR_DSTODS;
 				  else
 					bpf_error(cstate, "unknown 802.11 direction");
 				}
 	;
 
 reason:	  NUM			{ $$ = $1; }
 	| ID			{ $$ = pfreason_to_num(cstate, $1); }
 	;
 
 action:	  ID			{ $$ = pfaction_to_num(cstate, $1); }
 	;
 
 relop:	  '>'			{ $$ = BPF_JGT; }
 	| GEQ			{ $$ = BPF_JGE; }
 	| '='			{ $$ = BPF_JEQ; }
 	;
 irelop:	  LEQ			{ $$ = BPF_JGT; }
 	| '<'			{ $$ = BPF_JGE; }
 	| NEQ			{ $$ = BPF_JEQ; }
 	;
 arth:	  pnum			{ $$ = gen_loadi(cstate, $1); }
 	| narth
 	;
 narth:	  pname '[' arth ']'		{ $$ = gen_load(cstate, $1, $3, 1); }
 	| pname '[' arth ':' NUM ']'	{ $$ = gen_load(cstate, $1, $3, $5); }
 	| arth '+' arth			{ $$ = gen_arth(cstate, BPF_ADD, $1, $3); }
 	| arth '-' arth			{ $$ = gen_arth(cstate, BPF_SUB, $1, $3); }
 	| arth '*' arth			{ $$ = gen_arth(cstate, BPF_MUL, $1, $3); }
 	| arth '/' arth			{ $$ = gen_arth(cstate, BPF_DIV, $1, $3); }
 	| arth '%' arth			{ $$ = gen_arth(cstate, BPF_MOD, $1, $3); }
 	| arth '&' arth			{ $$ = gen_arth(cstate, BPF_AND, $1, $3); }
 	| arth '|' arth			{ $$ = gen_arth(cstate, BPF_OR, $1, $3); }
 	| arth '^' arth			{ $$ = gen_arth(cstate, BPF_XOR, $1, $3); }
 	| arth LSH arth			{ $$ = gen_arth(cstate, BPF_LSH, $1, $3); }
 	| arth RSH arth			{ $$ = gen_arth(cstate, BPF_RSH, $1, $3); }
 	| '-' arth %prec UMINUS		{ $$ = gen_neg(cstate, $2); }
 	| paren narth ')'		{ $$ = $2; }
 	| LEN				{ $$ = gen_loadlen(cstate); }
 	;
 byteop:	  '&'			{ $$ = '&'; }
 	| '|'			{ $$ = '|'; }
 	| '<'			{ $$ = '<'; }
 	| '>'			{ $$ = '>'; }
 	| '='			{ $$ = '='; }
 	;
 pnum:	  NUM
 	| paren pnum ')'	{ $$ = $2; }
 	;
 atmtype: LANE			{ $$ = A_LANE; }
 	| METAC			{ $$ = A_METAC;	}
 	| BCC			{ $$ = A_BCC; }
 	| OAMF4EC		{ $$ = A_OAMF4EC; }
 	| OAMF4SC		{ $$ = A_OAMF4SC; }
 	| SC			{ $$ = A_SC; }
 	| ILMIC			{ $$ = A_ILMIC; }
 	;
 atmmultitype: OAM		{ $$ = A_OAM; }
 	| OAMF4			{ $$ = A_OAMF4; }
 	| CONNECTMSG		{ $$ = A_CONNECTMSG; }
 	| METACONNECT		{ $$ = A_METACONNECT; }
 	;
 	/* ATM field types quantifier */
 atmfield: VPI			{ $$.atmfieldtype = A_VPI; }
 	| VCI			{ $$.atmfieldtype = A_VCI; }
 	;
 atmvalue: atmfieldvalue
 	| relop NUM		{ $$.b = gen_atmfield_code(cstate, $<blk>0.atmfieldtype, (bpf_int32)$2, (bpf_u_int32)$1, 0); }
 	| irelop NUM		{ $$.b = gen_atmfield_code(cstate, $<blk>0.atmfieldtype, (bpf_int32)$2, (bpf_u_int32)$1, 1); }
 	| paren atmlistvalue ')' { $$.b = $2.b; $$.q = qerr; }
 	;
 atmfieldvalue: NUM {
 	$$.atmfieldtype = $<blk>0.atmfieldtype;
 	if ($$.atmfieldtype == A_VPI ||
 	    $$.atmfieldtype == A_VCI)
 		$$.b = gen_atmfield_code(cstate, $$.atmfieldtype, (bpf_int32) $1, BPF_JEQ, 0);
 	}
 	;
 atmlistvalue: atmfieldvalue
 	| atmlistvalue or atmfieldvalue { gen_or($1.b, $3.b); $$ = $3; }
 	;
 	/* MTP2 types quantifier */
 mtp2type: FISU			{ $$ = M_FISU; }
 	| LSSU			{ $$ = M_LSSU; }
 	| MSU			{ $$ = M_MSU; }
 	| HFISU			{ $$ = MH_FISU; }
 	| HLSSU			{ $$ = MH_LSSU; }
 	| HMSU			{ $$ = MH_MSU; }
 	;
 	/* MTP3 field types quantifier */
 mtp3field: SIO			{ $$.mtp3fieldtype = M_SIO; }
 	| OPC			{ $$.mtp3fieldtype = M_OPC; }
 	| DPC			{ $$.mtp3fieldtype = M_DPC; }
 	| SLS                   { $$.mtp3fieldtype = M_SLS; }
 	| HSIO			{ $$.mtp3fieldtype = MH_SIO; }
 	| HOPC			{ $$.mtp3fieldtype = MH_OPC; }
 	| HDPC			{ $$.mtp3fieldtype = MH_DPC; }
 	| HSLS                  { $$.mtp3fieldtype = MH_SLS; }
 	;
 mtp3value: mtp3fieldvalue
 	| relop NUM		{ $$.b = gen_mtp3field_code(cstate, $<blk>0.mtp3fieldtype, (u_int)$2, (u_int)$1, 0); }
 	| irelop NUM		{ $$.b = gen_mtp3field_code(cstate, $<blk>0.mtp3fieldtype, (u_int)$2, (u_int)$1, 1); }
 	| paren mtp3listvalue ')' { $$.b = $2.b; $$.q = qerr; }
 	;
 mtp3fieldvalue: NUM {
 	$$.mtp3fieldtype = $<blk>0.mtp3fieldtype;
 	if ($$.mtp3fieldtype == M_SIO ||
 	    $$.mtp3fieldtype == M_OPC ||
 	    $$.mtp3fieldtype == M_DPC ||
 	    $$.mtp3fieldtype == M_SLS ||
 	    $$.mtp3fieldtype == MH_SIO ||
 	    $$.mtp3fieldtype == MH_OPC ||
 	    $$.mtp3fieldtype == MH_DPC ||
 	    $$.mtp3fieldtype == MH_SLS)
 		$$.b = gen_mtp3field_code(cstate, $$.mtp3fieldtype, (u_int) $1, BPF_JEQ, 0);
 	}
 	;
 mtp3listvalue: mtp3fieldvalue
 	| mtp3listvalue or mtp3fieldvalue { gen_or($1.b, $3.b); $$ = $3; }
 	;
 %%
Index: vendor/libpcap/dist/libpcap.pc.in
===================================================================
--- vendor/libpcap/dist/libpcap.pc.in	(nonexistent)
+++ vendor/libpcap/dist/libpcap.pc.in	(revision 333789)
@@ -0,0 +1,18 @@
+#
+# pkg-config file for libpcap.
+#
+# These variables come from the configure script, so includedir and
+# libdir may be defined in terms of prefix and exec_prefix, so the
+# latter must be defined as well.
+#
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+includedir="@includedir@"
+libdir="@libdir@"
+
+Name: libpcap
+Description: Platform-independent network traffic capture library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -l@PACKAGE_NAME@
+Libs.private: @LIBS@
+Cflags: -I${includedir}

Property changes on: vendor/libpcap/dist/libpcap.pc.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/missing/getopt.c
===================================================================
--- vendor/libpcap/dist/missing/getopt.c	(revision 333788)
+++ vendor/libpcap/dist/missing/getopt.c	(revision 333789)
@@ -1,126 +1,123 @@
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "getopt.h"
 
 int	opterr = 1,		/* if error message should be printed */
 	optind = 1,		/* index into parent argv vector */
 	optopt,			/* character checked for validity */
 	optreset;		/* reset getopt */
 char	*optarg;		/* argument associated with option */
 
 #define	BADCH	(int)'?'
 #define	BADARG	(int)':'
 #define	EMSG	""
 
 /*
  * getopt --
  *	Parse argc/argv argument vector.
  */
 int
-getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const *nargv;
-	const char *ostr;
+getopt(int nargc, char * const *nargv, const char *ostr)
 {
 	char *cp;
 	static char *__progname;
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */
 
 	if (__progname == NULL) {
 		if ((cp = strrchr(nargv[0], '/')) != NULL)
 			__progname = cp + 1;
 		else
 			__progname = nargv[0];
 	}
 	if (optreset || !*place) {		/* update scanning pointer */
 		optreset = 0;
 		if (optind >= nargc || *(place = nargv[optind]) != '-') {
 			place = EMSG;
 			return (-1);
 		}
 		if (place[1] && *++place == '-') {	/* found "--" */
 			++optind;
 			place = EMSG;
 			return (-1);
 		}
 	}					/* option letter okay? */
 	if ((optopt = (int)*place++) == (int)':' ||
 	    !(oli = strchr(ostr, optopt))) {
 		/*
 		 * if the user didn't specify '-' as an option,
 		 * assume it means -1.
 		 */
 		if (optopt == (int)'-')
 			return (-1);
 		if (!*place)
 			++optind;
 		if (opterr && *ostr != ':')
 			(void)fprintf(stderr,
 			    "%s: illegal option -- %c\n", __progname, optopt);
 		return (BADCH);
 	}
 	if (*++oli != ':') {			/* don't need argument */
 		optarg = NULL;
 		if (!*place)
 			++optind;
 	}
 	else {					/* need an argument */
 		if (*place)			/* no white space */
 			optarg = place;
 		else if (nargc <= ++optind) {	/* no arg */
 			place = EMSG;
 			if (*ostr == ':')
 				return (BADARG);
 			if (opterr)
 				(void)fprintf(stderr,
 				    "%s: option requires an argument -- %c\n",
 				    __progname, optopt);
 			return (BADCH);
 		}
 	 	else				/* white space */
 			optarg = nargv[optind];
 		place = EMSG;
 		++optind;
 	}
 	return (optopt);			/* dump back option letter */
 }
Index: vendor/libpcap/dist/missing/getopt.h
===================================================================
--- vendor/libpcap/dist/missing/getopt.h	(revision 333788)
+++ vendor/libpcap/dist/missing/getopt.h	(revision 333789)
@@ -1,7 +1,7 @@
 /*
  * Header for the getopt() we supply if the platform doesn't supply it.
  */
 extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
+extern int optind, opterr, optreset, optopt;
 
 extern int getopt(int nargc, char * const *nargv, const char *ostr);
Index: vendor/libpcap/dist/missing/strtok_r.c
===================================================================
--- vendor/libpcap/dist/missing/strtok_r.c	(revision 333788)
+++ vendor/libpcap/dist/missing/strtok_r.c	(revision 333789)
@@ -1,87 +1,87 @@
 /*-
  * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
  *
  * strtok_r, from Berkeley strtok
  * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
  *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notices, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notices, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY SOFTWEYR LLC, THE REGENTS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SOFTWEYR LLC, THE
  * REGENTS, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
  * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * From: @(#)strtok.c	8.1 (Berkeley) 6/4/93
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "portability.h"
 
 char *
 pcap_strtok_r(char *s, const char *delim, char **last)
 {
 	char *spanp, *tok;
 	int c, sc;
 
 	if (s == NULL && (s = *last) == NULL)
 		return (NULL);
 
 	/*
 	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
 	 */
 cont:
 	c = *s++;
 	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
 		if (c == sc)
 			goto cont;
 	}
 
 	if (c == 0) {		/* no non-delimiter characters */
 		*last = NULL;
 		return (NULL);
 	}
 	tok = s - 1;
 
 	/*
 	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
 	 * Note that delim must have one NUL; we stop if we see that, too.
 	 */
 	for (;;) {
 		c = *s++;
 		spanp = (char *)delim;
 		do {
 			if ((sc = *spanp++) == c) {
 				if (c == 0)
 					s = NULL;
 				else
 					s[-1] = '\0';
 				*last = s;
 				return (tok);
 			}
 		} while (sc != 0);
 	}
 	/* NOTREACHED */
 }
Index: vendor/libpcap/dist/msdos/ndis2.c
===================================================================
--- vendor/libpcap/dist/msdos/ndis2.c	(revision 333788)
+++ vendor/libpcap/dist/msdos/ndis2.c	(nonexistent)
@@ -1,860 +0,0 @@
-/*
- * Copyright (c) 1993,1994
- *      Texas A&M University.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Texas A&M University
- *      and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Developers:
- *             David K. Hess, Douglas Lee Schales, David R. Safford
- *
- * Heavily modified for Metaware HighC + GNU C 2.8+
- *             Gisle Vanem 1998
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dos.h>
-#include <io.h>
-#include <fcntl.h>
-#include <malloc.h>
-#include <string.h>
-
-#include "pcap-dos.h"
-#include "pcap-int.h"
-#include "msdos/ndis2.h"
-
-#if defined(USE_NDIS2)
-
-/*
- *  Packet buffer handling
- */
-extern int     FreePktBuf  (PktBuf *buf);
-extern int     EnquePktBuf (PktBuf *buf);
-extern PktBuf* AllocPktBuf (void);
-
-/*
- *  Various defines
- */
-#define MAX_NUM_DEBUG_STRINGS 90
-#define DEBUG_STRING_LENGTH   80
-#define STACK_POOL_SIZE       6
-#define STACK_SIZE            256
-
-#define MEDIA_FDDI            1
-#define MEDIA_ETHERNET        2
-#define MEDIA_TOKEN           3
-
-static int     startDebug     = 0;
-static int     stopDebug      = 0;
-
-static DWORD   droppedPackets = 0L;
-static WORD    frameSize      = 0;
-static WORD    headerSize     = 0;
-static int     mediaType      = 0;
-static char   *lastErr        = NULL;
-
-static BYTE    debugStrings [MAX_NUM_DEBUG_STRINGS][DEBUG_STRING_LENGTH];
-static BYTE   *freeStacks   [STACK_POOL_SIZE];
-static int     freeStackPtr = STACK_POOL_SIZE - 1;
-
-static ProtMan protManEntry = NULL;
-static WORD    protManDS    = 0;
-static volatile int xmitPending;
-
-static struct _PktBuf        *txBufPending;
-static struct _CardHandle    *handle;
-static struct _CommonChars    common;
-static struct _ProtocolChars  protChars;
-static struct _ProtDispatch   lowerTable;
-
-static struct _FailingModules failingModules;
-static struct _BindingsList   bindings;
-
-static struct {
-         WORD  err_num;
-         char *err_text;
-       } ndis_errlist[] = {
-
-  { ERR_SUCCESS,
-    "The function completed successfully.\n"  },
-
-  { ERR_WAIT_FOR_RELEASE,
-    "The ReceiveChain completed successfully but the protocol has\n"
-    "retained control of the buffer.\n"  },
-
-  { ERR_REQUEST_QUEUED,
-    "The current request has been queued.\n"  },
-
-  { ERR_FRAME_NOT_RECOGNIZED,
-    "Frame not recognized.\n"  },
-
-  { ERR_FRAME_REJECTED,
-    "Frame was discarded.\n"  },
-
-  { ERR_FORWARD_FRAME,
-    "Protocol wishes to forward frame to another protocol.\n"  },
-
-  { ERR_OUT_OF_RESOURCE,
-    "Out of resource.\n"  },
-
-  { ERR_INVALID_PARAMETER,
-    "Invalid parameter.\n"  },
-
-  { ERR_INVALID_FUNCTION,
-    "Invalid function.\n"  },
-
-  { ERR_NOT_SUPPORTED,
-    "Not supported.\n"  },
-
-  { ERR_HARDWARE_ERROR,
-    "Hardware error.\n"  },
-
-  { ERR_TRANSMIT_ERROR,
-    "The packet was not transmitted due to an error.\n"  },
-
-  { ERR_NO_SUCH_DESTINATION,
-    "Token ring packet was not recognized when transmitted.\n"  },
-
-  { ERR_BUFFER_TOO_SMALL,
-    "Provided buffer was too small.\n"  },
-
-  { ERR_ALREADY_STARTED,
-    "Network drivers already started.\n"  },
-
-  { ERR_INCOMPLETE_BINDING,
-    "Protocol driver could not complete its bindings.\n"  },
-
-  { ERR_DRIVER_NOT_INITIALIZED,
-    "MAC did not initialize properly.\n"  },
-
-  { ERR_HARDWARE_NOT_FOUND,
-    "Hardware not found.\n"  },
-
-  { ERR_HARDWARE_FAILURE,
-    "Hardware failure.\n"  },
-
-  { ERR_CONFIGURATION_FAILURE,
-    "Configuration failure.\n"  },
-
-  { ERR_INTERRUPT_CONFLICT,
-    "Interrupt conflict.\n"  },
-
-  { ERR_INCOMPATIBLE_MAC,
-    "The MAC is not compatible with the protocol.\n"  },
-
-  { ERR_INITIALIZATION_FAILED,
-    "Initialization failed.\n"  },
-
-  { ERR_NO_BINDING,
-    "Binding did not occur.\n"  },
-
-  { ERR_NETWORK_MAY_NOT_BE_CONNECTED,
-    "The network may not be connected to the adapter.\n"  },
-
-  { ERR_INCOMPATIBLE_OS_VERSION,
-    "The version of the operating system is incompatible with the protocol.\n"  },
-
-  { ERR_ALREADY_REGISTERED,
-    "The protocol is already registered.\n"  },
-
-  { ERR_PATH_NOT_FOUND,
-    "PROTMAN.EXE could not be found.\n"  },
-
-  { ERR_INSUFFICIENT_MEMORY,
-    "Insufficient memory.\n"  },
-
-  { ERR_INFO_NOT_FOUND,
-    "Protocol Mananger info structure is lost or corrupted.\n"  },
-
-  { ERR_GENERAL_FAILURE,
-    "General failure.\n"  }
-};
-
-/*
- *  Some handy macros
- */
-#define PERROR(str)    printf("%s (%d): %s\n", __FILE__,__LINE__,str)
-#define DEBUG_RING()   (debugStrings[stopDebug+1 == MAX_NUM_DEBUG_STRINGS ? \
-                        stopDebug = 0 : ++stopDebug])
-
-/*
- * needs rewrite for DOSX
- */
-#define MAC_DISPATCH(hnd)  ((struct _MacUpperDispatch*)(hnd)->common->upperDispatchTable)
-#define MAC_STATUS(hnd)    ((struct _MacStatusTable*)  (hnd)->common->serviceStatus)
-#define MAC_CHAR(hnd)      ((struct _MacChars*)        (hnd)->common->serviceChars)
-
-#ifdef NDIS_DEBUG
-  #define DEBUG0(str)      printf (str)
-  #define DEBUG1(fmt,a)    printf (fmt,a)
-  #define DEBUG2(fmt,a,b)  printf (fmt,a,b)
-  #define TRACE0(str)      sprintf (DEBUG_RING(),str)
-  #define TRACE1(fmt,a)    sprintf (DEBUG_RING(),fmt,a)
-#else
-  #define DEBUG0(str)      ((void)0)
-  #define DEBUG1(fmt,a)    ((void)0)
-  #define DEBUG2(fmt,a,b)  ((void)0)
-  #define TRACE0(str)      ((void)0)
-  #define TRACE1(fmt,a)    ((void)0)
-#endif
-
-/*
- * This routine is called from both threads
- */
-void NdisFreeStack (BYTE *aStack)
-{
-  GUARD();
-
-  if (freeStackPtr == STACK_POOL_SIZE - 1)
-     PERROR ("tried to free too many stacks");
-
-  freeStacks[++freeStackPtr] = aStack;
-
-  if (freeStackPtr == 0)
-     TRACE0 ("freeStackPtr went positive\n");
-
-  UNGUARD();
-}
-
-/*
- * This routine is called from callbacks to allocate local data
- */
-BYTE *NdisAllocStack (void)
-{
-  BYTE *stack;
-
-  GUARD();
-
-  if (freeStackPtr < 0)
-  {
-    /* Ran out of stack buffers. Return NULL which will start
-     * dropping packets
-     */
-    TRACE0 ("freeStackPtr went negative\n");
-    stack = 0;
-  }
-  else
-    stack = freeStacks[freeStackPtr--];
-
-  UNGUARD();
-  return (stack);
-}
-
-CALLBACK (NdisSystemRequest (DWORD param1, DWORD param2, WORD param3,
-                             WORD opcode, WORD targetDS))
-{
-  static int            bindEntry = 0;
-  struct _CommonChars  *macCommon;
-  volatile WORD result;
-
-  switch (opcode)
-  {
-    case REQ_INITIATE_BIND:
-         macCommon = (struct _CommonChars*) param2;
-         if (macCommon == NULL)
-	 {
-           printf ("There is an NDIS misconfiguration.\n");
-           result = ERR_GENERAL_FAILURE;
-	   break;
-	 }
-         DEBUG2 ("module name %s\n"
-                 "module type %s\n",
-                 macCommon->moduleName,
-                 ((MacChars*) macCommon->serviceChars)->macName);
-
-         /* Binding to the MAC */
-         result = macCommon->systemRequest ((DWORD)&common, (DWORD)&macCommon,
-                                            0, REQ_BIND,
-                                            macCommon->moduleDS);
-
-         if (!strcmp(bindings.moduleName[bindEntry], handle->moduleName))
-              handle->common = macCommon;
-         else PERROR ("unknown module");
-         ++bindEntry;
-	 break;
-
-    case REQ_INITIATE_UNBIND:
-         macCommon = (struct _CommonChars*) param2;
-         result = macCommon->systemRequest ((DWORD)&common, 0,
-                                            0, REQ_UNBIND,
-                                            macCommon->moduleDS);
-         break;
-
-    default:
-         result = ERR_GENERAL_FAILURE;
-	 break;
-  }
-  ARGSUSED (param1);
-  ARGSUSED (param3);
-  ARGSUSED (targetDS);
-  return (result);
-}
-
-CALLBACK (NdisRequestConfirm (WORD protId, WORD macId,   WORD reqHandle,
-                              WORD status, WORD request, WORD protDS))
-{
-  ARGSUSED (protId);    ARGSUSED (macId);
-  ARGSUSED (reqHandle); ARGSUSED (status);
-  ARGSUSED (request);   ARGSUSED (protDS);
-  return (ERR_SUCCESS);
-}
-
-CALLBACK (NdisTransmitConfirm (WORD protId, WORD macId, WORD reqHandle,
-                               WORD status, WORD protDS))
-{
-  xmitPending--;
-  FreePktBuf (txBufPending);  /* Add passed ECB back to the free list */
-
-  ARGSUSED (reqHandle);
-  ARGSUSED (status);
-  ARGSUSED (protDS);
-  return (ERR_SUCCESS);
-}
-
-
-/*
- * The primary function for receiving packets
- */
-CALLBACK (NdisReceiveLookahead (WORD  macId,      WORD  frameSize,
-                                WORD  bytesAvail, BYTE *buffer,
-                                BYTE *indicate,   WORD  protDS))
-{
-  int     result;
-  PktBuf *pktBuf;
-  WORD    bytesCopied;
-  struct _TDBufDescr tDBufDescr;
-
-#if 0
-  TRACE1 ("lookahead length = %d, ", bytesAvail);
-  TRACE1 ("ecb = %08lX, ",          *ecb);
-  TRACE1 ("count = %08lX\n",         count);
-  TRACE1 ("offset = %08lX, ",        offset);
-  TRACE1 ("timesAllowed = %d, ",     timesAllowed);
-  TRACE1 ("packet size = %d\n",      look->dataLookAheadLen);
-#endif
-
-  /* Allocate a buffer for the packet
-   */
-  if ((pktBuf = AllocPktBuf()) == NULL)
-  {
-    droppedPackets++;
-    return (ERR_FRAME_REJECTED);
-  }
-
-  /*
-   * Now kludge things. Note we will have to undo this later. This will
-   * make the packet contiguous after the MLID has done the requested copy.
-   */
-
-  tDBufDescr.tDDataCount = 1;
-  tDBufDescr.tDBufDescrRec[0].tDPtrType = NDIS_PTR_PHYSICAL;
-  tDBufDescr.tDBufDescrRec[0].tDDataPtr = pktBuf->buffer;
-  tDBufDescr.tDBufDescrRec[0].tDDataLen = pktBuf->length;
-  tDBufDescr.tDBufDescrRec[0].dummy     = 0;
-
-  result = MAC_DISPATCH(handle)->transferData (&bytesCopied, 0, &tDBufDescr,
-                                               handle->common->moduleDS);
-  pktBuf->packetLength = bytesCopied;
-
-  if (result == ERR_SUCCESS)
-       EnquePktBuf(pktBuf);
-  else FreePktBuf (pktBuf);
-
-  ARGSUSED (frameSize);
-  ARGSUSED (bytesAvail);
-  ARGSUSED (indicate);
-  ARGSUSED (protDS);
-
-  return (ERR_SUCCESS);
-}
-
-CALLBACK (NdisIndicationComplete (WORD macId, WORD protDS))
-{
-  ARGSUSED (macId);
-  ARGSUSED (protDS);
-
-  /* We don't give a hoot about these. Just return
-   */
-  return (ERR_SUCCESS);
-}
-
-/*
- * This is the OTHER way we may receive packets
- */
-CALLBACK (NdisReceiveChain (WORD macId, WORD frameSize, WORD reqHandle,
-                            struct _RxBufDescr *rxBufDescr,
-                            BYTE *indicate, WORD protDS))
-{
-  struct _PktBuf *pktBuf;
-  int     i;
-
-  /*
-   * For now we copy the entire packet over to a PktBuf structure. This may be
-   * a performance hit but this routine probably isn't called very much, and
-   * it is a lot of work to do it otherwise. Also if it is a filter protocol
-   * packet we could end up sucking up MAC buffes.
-   */
-
-  if ((pktBuf = AllocPktBuf()) == NULL)
-  {
-    droppedPackets++;
-    return (ERR_FRAME_REJECTED);
-  }
-  pktBuf->packetLength = 0;
-
-  /* Copy the packet to the buffer
-   */
-  for (i = 0; i < rxBufDescr->rxDataCount; ++i)
-  {
-    struct _RxBufDescrRec *rxDescr = &rxBufDescr->rxBufDescrRec[i];
-
-    memcpy (pktBuf->buffer + pktBuf->packetLength,
-            rxDescr->rxDataPtr, rxDescr->rxDataLen);
-    pktBuf->packetLength += rxDescr->rxDataLen;
-  }
-
-  EnquePktBuf (pktBuf);
-
-  ARGSUSED (frameSize);
-  ARGSUSED (reqHandle);
-  ARGSUSED (indicate);
-  ARGSUSED (protDS);
-
-  /* This frees up the buffer for the MAC to use
-   */
-  return (ERR_SUCCESS);
-}
-
-CALLBACK (NdisStatusProc (WORD macId,  WORD param1, BYTE *indicate,
-                          WORD opcode, WORD protDS))
-{
-  switch (opcode)
-  {
-    case STATUS_RING_STATUS:
-	 break;
-    case STATUS_ADAPTER_CHECK:
-	 break;
-    case STATUS_START_RESET:
-	 break;
-    case STATUS_INTERRUPT:
-	 break;
-    case STATUS_END_RESET:
-	 break;
-    default:
-	 break;
-  }
-  ARGSUSED (macId);
-  ARGSUSED (param1);
-  ARGSUSED (indicate);
-  ARGSUSED (opcode);
-  ARGSUSED (protDS);
-
-  /* We don't need to do anything about this stuff yet
-   */
-  return (ERR_SUCCESS);
-}
-
-/*
- * Tell the NDIS driver to start the delivery of the packet
- */
-int NdisSendPacket (struct _PktBuf *pktBuf, int macId)
-{
-  struct _TxBufDescr txBufDescr;
-  int     result;
-
-  xmitPending++;
-  txBufPending = pktBuf;    /* we only have 1 pending Tx at a time */
-
-  txBufDescr.txImmedLen  = 0;
-  txBufDescr.txImmedPtr  = NULL;
-  txBufDescr.txDataCount = 1;
-  txBufDescr.txBufDescrRec[0].txPtrType = NDIS_PTR_PHYSICAL;
-  txBufDescr.txBufDescrRec[0].dummy     = 0;
-  txBufDescr.txBufDescrRec[0].txDataLen = pktBuf->packetLength;
-  txBufDescr.txBufDescrRec[0].txDataPtr = pktBuf->buffer;
-
-  result = MAC_DISPATCH(handle)->transmitChain (common.moduleId,
-                                                pktBuf->handle,
-                                                &txBufDescr,
-                                                handle->common->moduleDS);
-  switch (result)
-  {
-    case ERR_OUT_OF_RESOURCE:
-         /* Note that this should not happen but if it does there is not
-          * much we can do about it
-          */
-         printf ("ERROR: transmit queue overflowed\n");
-         return (0);
-
-    case ERR_SUCCESS:
-         /* Everything was hunky dory and synchronous. Free up the
-          * packet buffer
-          */
-         xmitPending--;
-         FreePktBuf (pktBuf);
-         return (1);
-
-    case ERR_REQUEST_QUEUED:
-         /* Everything was hunky dory and asynchronous. Do nothing
-          */
-         return (1);
-
-    default:
-         printf ("Tx fail, code = %04X\n", result);
-         return (0);
-  }
-}
-
-
-
-static int ndis_nerr = sizeof(ndis_errlist) / sizeof(ndis_errlist[0]);
-
-static char *Ndis_strerror (WORD errorCode)
-{
-  static char buf[30];
-  int    i;
-
-  for (i = 0; i < ndis_nerr; i++)
-      if (errorCode == ndis_errlist[i].err_num)
-         return (ndis_errlist[i].err_text);
-
-  sprintf (buf,"unknown error %d",errorCode);
-  return (buf);
-}
-
-
-char *NdisLastError (void)
-{
-  char *errStr = lastErr;
-  lastErr = NULL;
-  return (errStr);
-}
-
-int NdisOpen (void)
-{
-  struct _ReqBlock reqBlock;
-  int     result;
-  int     ndisFd = open (NDIS_PATH, O_RDONLY);
-
-  if (ndisFd < 0)
-  {
-    printf ("Could not open NDIS Protocol Manager device.\n");
-    return (0);
-  }
-
-  memset (&reqBlock, 0, sizeof(ReqBlock));
-
-  reqBlock.opcode = PM_GET_PROTOCOL_MANAGER_LINKAGE;
-
-  result = NdisGetLinkage (ndisFd, (char*)&reqBlock, sizeof(ReqBlock));
-  if (result != 0)
-  {
-    printf ("Could not get Protocol Manager linkage.\n");
-    close (ndisFd);
-    return (0);
-  }
-
-  close (ndisFd);
-  protManEntry = (ProtMan) reqBlock.pointer1;
-  protManDS    = reqBlock.word1;
-
-  DEBUG2 ("Entry Point = %04X:%04X\n", FP_SEG(protManEntry),FP_OFF(protManEntry));
-  DEBUG1 ("ProtMan DS  = %04X\n", protManDS);
-  return (1);
-}
-
-
-int NdisRegisterAndBind (int promis)
-{
-  struct _ReqBlock reqBlock;
-  WORD    result;
-
-  memset (&common,0,sizeof(common));
-
-  common.tableSize = sizeof (common);
-
-  common.majorNdisVersion   = 2;
-  common.minorNdisVersion   = 0;
-  common.majorModuleVersion = 2;
-  common.minorModuleVersion = 0;
-
-  /* Indicates binding from below and dynamically loaded
-   */
-  common.moduleFlags = 0x00000006L;
-
-  strcpy (common.moduleName, "PCAP");
-
-  common.protocolLevelUpper = 0xFF;
-  common.protocolLevelLower = 1;
-  common.interfaceLower     = 1;
-#ifdef __DJGPP__
-  common.moduleDS           = _dos_ds; /* the callback data segment */
-#else
-  common.moduleDS           = _DS;
-#endif
-
-  common.systemRequest      = (SystemRequest) systemRequestGlue;
-  common.serviceChars       = (BYTE*) &protChars;
-  common.serviceStatus      = NULL;
-  common.upperDispatchTable = NULL;
-  common.lowerDispatchTable = (BYTE*) &lowerTable;
-
-  protChars.length  = sizeof (protChars);
-  protChars.name[0] = 0;
-  protChars.type    = 0;
-
-  lowerTable.backPointer        = &common;
-  lowerTable.requestConfirm     = requestConfirmGlue;
-  lowerTable.transmitConfirm    = transmitConfirmGlue;
-  lowerTable.receiveLookahead   = receiveLookaheadGlue;
-  lowerTable.indicationComplete = indicationCompleteGlue;
-  lowerTable.receiveChain       = receiveChainGlue;
-  lowerTable.status             = statusGlue;
-  lowerTable.flags              = 3;
-  if (promis)
-     lowerTable.flags |= 4;   /* promiscous mode (receive everything) */
-
-  bindings.numBindings = 1;
-  strcpy (bindings.moduleName[0], handle->moduleName);
-
-  /* Register ourselves with NDIS
-   */
-  reqBlock.opcode   = PM_REGISTER_MODULE;
-  reqBlock.pointer1 = (BYTE FAR*) &common;
-  reqBlock.pointer2 = (BYTE FAR*) &bindings;
-
-  result = (*protManEntry) (&reqBlock, protManDS);
-  if (result)
-  {
-    printf ("Protman registering failed: %s\n", Ndis_strerror(result));
-    return (0);
-  }
-
-  /* Start the binding process
-   */
-  reqBlock.opcode   = PM_BIND_AND_START;
-  reqBlock.pointer1 = (BYTE FAR*) &failingModules;
-
-  result = (*protManEntry) (&reqBlock, protManDS);
-  if (result)
-  {
-    printf ("Start binding failed: %s\n", Ndis_strerror(result));
-    return (0);
-  }
-  return (1);
-}
-
-static int CheckMacFeatures (CardHandle *card)
-{
-  DWORD      serviceFlags;
-  BYTE _far *mediaString;
-  BYTE _far *mac_addr;
-
-  DEBUG2 ("checking card features\n"
-          "common table address = %08lX, macId = %d\n",
-          card->common, card->common->moduleId);
-
-  serviceFlags = MAC_CHAR (handle)->serviceFlags;
-
-  if ((serviceFlags & SF_PROMISCUOUS) == 0)
-  {
-    printf ("The MAC %s does not support promiscuous mode.\n",
-            card->moduleName);
-    return (0);
-  }
-
-  mediaString = MAC_CHAR (handle)->macName;
-
-  DEBUG1 ("media type = %s\n",mediaString);
-
-  /* Get the media type. And set the header size
-   */
-  if (!strncmp(mediaString,"802.3",5) ||
-      !strncmp(mediaString,"DIX",3)   ||
-      !strncmp(mediaString,"DIX+802.3",9))
-       headerSize = sizeof (EthernetIIHeader);
-
-  else if (!strncmp(mediaString,"FDDI",4))
-       headerSize = sizeof (FddiHeader) +
-                    sizeof (Ieee802Dot2SnapHeader);
-  else
-  {
-    printf ("Unsupported MAC type: `%s'\n", mediaString);
-    return (0);
-  }
-
-  frameSize = MAC_CHAR (handle)->maxFrameSize;
-  mac_addr  = MAC_CHAR (handle)->currentAddress;
-
-  printf ("Hardware address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-          mac_addr[0], mac_addr[1], mac_addr[2],
-          mac_addr[3], mac_addr[4], mac_addr[5]);
-  return (1);
-}
-
-static int NdisStartMac (CardHandle *card)
-{
-  WORD result;
-
-  /* Set the lookahead length
-   */
-  result = MAC_DISPATCH(handle)->request (common.moduleId, 0,
-                                          headerSize, 0,
-                                          REQ_SET_LOOKAHEAD,
-                                          card->common->moduleDS);
-
-  /* We assume that if we got INVALID PARAMETER then either this
-   * is not supported or will work anyway. NE2000 does this.
-   */
-  if (result != ERR_SUCCESS && result != ERR_INVALID_PARAMETER)
-  {
-    DEBUG1 ("Set lookahead failed: %s\n", Ndis_strerror(result));
-    return (0);
-  }
-
-  /* Set the packet filter. Note that for some medias and drivers we
-   * must specify all three flags or the card(s) will not operate correctly.
-   */
-  result = MAC_DISPATCH(handle)->request (common.moduleId, 0,
-                      /* all packets */   FILTER_PROMISCUOUS |
-                      /* packets to us */ FILTER_DIRECTED    |
-                      /* broadcasts */    FILTER_BROADCAST,
-                                          0, REQ_SET_PACKET_FILTER,
-                                          card->common->moduleDS);
-  if (result != ERR_SUCCESS)
-  {
-    DEBUG1 ("Set packet filter failed: %s\n", Ndis_strerror(result));
-    return (0);
-  }
-
-  /* If OPEN/CLOSE supported then open the adapter
-   */
-  if (MAC_CHAR(handle)->serviceFlags & SF_OPEN_CLOSE)
-  {
-    result = MAC_DISPATCH(handle)->request (common.moduleId, 0, 0, NULL,
-                                            REQ_OPEN_ADAPTER,
-                                            card->common->moduleDS);
-    if (result != ERR_SUCCESS)
-    {
-      DEBUG1 ("Opening the MAC failed: %s\n", Ndis_strerror(result));
-      return (0);
-    }
-  }
-  return (1);
-}
-
-void NdisShutdown (void)
-{
-  struct _ReqBlock reqBlock;
-  int     result, i;
-
-  if (!handle)
-     return;
-
-  /* If the adapters support open and are open then close them
-   */
-  if ((MAC_CHAR(handle)->serviceFlags & SF_OPEN_CLOSE) &&
-      (MAC_STATUS(handle)->macStatus & MAC_OPEN))
-  {
-    result = MAC_DISPATCH(handle)->request (common.moduleId, 0, 0, 0,
-                                            REQ_CLOSE_ADAPTER,
-                                            handle->common->moduleDS);
-    if (result != ERR_SUCCESS)
-    {
-      printf ("Closing the MAC failed: %s\n", Ndis_strerror(result));
-      return;
-    }
-  }
-
-  /* Tell the Protocol Manager to unbind and stop
-   */
-  reqBlock.opcode   = PM_UNBIND_AND_STOP;
-  reqBlock.pointer1 = (BYTE FAR*) &failingModules;
-  reqBlock.pointer2 = NULL;
-
-  result = (*protManEntry) (&reqBlock, protManDS);
-  if (result)
-     printf ("Unbind failed: %s\n",  Ndis_strerror(result));
-
-  for (i = 0; i < STACK_POOL_SIZE; ++i)
-     free (freeStacks[i] - STACK_SIZE);
-
-  handle = NULL;
-}
-
-int NdisInit (int promis)
-{
-  int i, result;
-
-  /* Allocate the real mode stacks used for NDIS callbacks
-   */
-  for (i = 0; i < STACK_POOL_SIZE; ++i)
-  {
-    freeStacks[i] = malloc (STACK_SIZE);
-    if (!freeStacks[i])
-       return (0);
-    freeStacks[i] += STACK_SIZE;
-  }
-
-  if (!NdisOpen())
-     return (0);
-
-  if (!NdisRegisterAndBind(promis))
-     return (0);
-
-  DEBUG1 ("My module id: %d\n", common.moduleId);
-  DEBUG1 ("Handle id;    %d\n", handle->common->moduleId);
-  DEBUG1 ("MAC card:     %-16s - ", handle->moduleName);
-
-  atexit (NdisShutdown);
-
-  if (!CheckMacFeatures(&handle))
-     return (0);
-
-  switch (mediaType)
-  {
-    case MEDIA_FDDI:
-         DEBUG0 ("Media type: FDDI");
-	 break;
-    case MEDIA_ETHERNET:
-         DEBUG0 ("Media type: ETHERNET");
-	 break;
-    default:
-         DEBUG0 ("Unsupported media.\n");
-         return (0);
-  }
-
-  DEBUG1 (" - Frame size: %d\n", frameSize);
-
-  if (!NdisStartMac(&handle))
-     return (0);
-  return (1);
-}
-#endif  /* USE_NDIS2 */
-

Property changes on: vendor/libpcap/dist/msdos/ndis2.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/msdos/ndis_0.asm
===================================================================
--- vendor/libpcap/dist/msdos/ndis_0.asm	(revision 333788)
+++ vendor/libpcap/dist/msdos/ndis_0.asm	(nonexistent)
@@ -1,188 +0,0 @@
-PAGE 60,132
-NAME NDIS_0
-
-ifdef DOSX
-  .386
-  _TEXT   SEGMENT PUBLIC DWORD USE16 'CODE'
-  _TEXT   ENDS
-  _DATA   SEGMENT PUBLIC DWORD USE16 'CODE'
-  _DATA   ENDS
-  _TEXT32 SEGMENT PUBLIC BYTE  USE32 'CODE'
-  _TEXT32 ENDS
-  CB_DSEG EQU <CS>                          ; DOSX is tiny-model
-  D_SEG   EQU <_TEXT SEGMENT>
-  D_END   EQU <_TEXT ENDS>
-  ASSUME  CS:_TEXT,DS:_TEXT
-
-  PUSHREGS equ <pushad>
-  POPREGS  equ <popad>
-
-  PUBPROC macro name
-          align 4
-          public @&name
-          @&name label near
-          endm
-else
-  .286
-  _TEXT   SEGMENT PUBLIC DWORD 'CODE'
-  _TEXT   ENDS
-  _DATA   SEGMENT PUBLIC DWORD 'DATA'
-  _DATA   ENDS
-  CB_DSEG EQU <SEG _DATA>                   ; 16bit is small/large model
-  D_SEG   EQU <_DATA SEGMENT>
-  D_END   EQU <_DATA ENDS>
-  ASSUME  CS:_TEXT,DS:_DATA
-
-  PUSHREGS equ <pusha>
-  POPREGS  equ <popa>
-
-  PUBPROC  macro name
-           public _&name
-           _&name label far
-           endm
-endif
-
-;-------------------------------------------
-
-D_SEG
-
-D_END
-
-
-_TEXT SEGMENT
-
-EXTRN _NdisSystemRequest      : near
-EXTRN _NdisRequestConfirm     : near
-EXTRN _NdisTransmitConfirm    : near
-EXTRN _NdisReceiveLookahead   : near
-EXTRN _NdisIndicationComplete : near
-EXTRN _NdisReceiveChain       : near
-EXTRN _NdisStatusProc         : near
-EXTRN _NdisAllocStack         : near
-EXTRN _NdisFreeStack          : near
-
-;
-; *ALL* interrupt threads come through this macro.
-;
-CALLBACK macro callbackProc, argsSize
-
-     pushf
-     PUSHREGS                ;; Save the registers
-
-     push es
-     push ds
-     mov  ax,CB_DSEG         ;; Load DS
-     mov  ds,ax
-     call _NdisAllocStack    ;; Get and install a stack.
-
-     mov  bx,ss              ;; Save off the old stack in other regs
-     mov  cx,sp
-     mov  ss,dx              ;; Install the new one
-     mov  sp,ax
-     push bx                 ;; Save the old one on to the new stack
-     push cx
-     sub  sp,&argsSize       ;; Allocate space for arguments on the stack
-
-     mov  ax,ss              ;; Set up the destination for the move
-     mov  es,ax
-     mov  di,sp
-     mov  ds,bx              ;; Set up the source for the move.
-     mov  si,cx
-     add  si,4+6+32
-
-     mov  cx,&argsSize       ;; Move the arguments to the stack.
-     shr  cx,1
-     cld
-     rep  movsw
-
-     mov  ax,CB_DSEG         ;; Set my data segment again.
-     mov  ds,ax
-
-     call &callbackProc      ;; Call the real callback.
-     pop  di                 ;; Pop off the old stack
-     pop  si
-     mov  bx,ss              ;; Save off the current allocated stack.
-     mov  cx,sp
-     mov  ss,si              ;; Restore the old stack
-     mov  sp,di
-     push ax                 ;; Save the return code
-     push bx                 ;; Free the stack. Push the pointer to it
-     push cx
-     call _NdisFreeStack
-     add  sp,4
-     pop  ax                 ;; Get the return code back
-     add  di,32              ;; Get a pointer to ax on the stack
-     mov  word ptr ss:[di],ax
-     pop  ds
-     pop  es
-
-     POPREGS
-     popf
-endm
-
-;
-; Define all of the callbacks for the NDIS procs.
-;
-
-PUBPROC systemRequestGlue
-CALLBACK _NdisSystemRequest,14
-RETF
-
-PUBPROC requestConfirmGlue
-CALLBACK _NdisRequestConfirm,12
-RETF
-
-PUBPROC transmitConfirmGlue
-CALLBACK _NdisTransmitConfirm,10
-RETF
-
-PUBPROC receiveLookaheadGlue
-CALLBACK _NdisReceiveLookahead,16
-RETF
-
-PUBPROC indicationCompleteGlue
-CALLBACK _NdisIndicationComplete,4
-RETF
-
-PUBPROC receiveChainGlue
-CALLBACK _NdisReceiveChain,16
-RETF
-
-PUBPROC statusGlue
-CALLBACK _NdisStatusProc,12
-RETF
-
-;
-; int FAR NdisGetLinkage (int handle, char *data, int size);
-;
-
-ifdef DOSX
-  PUBPROC NdisGetLinkage
-          push ebx
-          mov ebx, [esp+8]              ; device handle
-          mov eax, 4402h                ; IOCTRL read function
-          mov edx, [esp+12]             ; DS:EDX -> result data
-          mov ecx, [esp+16]             ; ECX = length
-          int 21h
-          pop ebx
-          jc  @fail
-          xor eax, eax
-  @fail:  ret
-
-else
-  PUBPROC NdisGetLinkage
-          enter 0, 0
-          mov bx, [bp+6]
-          mov ax, 4402h
-          mov dx, [bp+8]
-          mov cx, [bp+12]
-          int 21h
-          jc  @fail
-          xor ax, ax
-  @fail:  leave
-          retf
-endif
-
-ENDS
-
-END
Index: vendor/libpcap/dist/msdos/common.dj
===================================================================
--- vendor/libpcap/dist/msdos/common.dj	(revision 333788)
+++ vendor/libpcap/dist/msdos/common.dj	(nonexistent)
@@ -1,86 +0,0 @@
-#
-# Common defines for libpcap and 16/32-bit network drivers (djgpp)
-#
-
-.SUFFIXES: .exe .wlm .dxe .l .y
-.PHONY:    check_gcclib
-
-default: check_gcclib all
-
-#
-# This value is normally not important. Used by 'dxe3gen' in
-# msdos/pm_drvr/makefile.dj to make "dynamically loaded modules".
-# But this is not finished.
-#
-#GCC_LIB  = $(shell gcc -print-libgcc-file-name)
-GCC_LIB  = .
-MAKEFILE = Makefile.dj
-
-#
-# DLX 2.91+ lib. Change path to suite.
-# Not used anymore. Uses DXE3 now.
-#
-# DLX_LIB  = $(DJDIR)/contrib/dlx.291/libdlx.a
-# DLX_LINK = $(DJDIR)/bin/dlxgen.exe
-
-WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
-
-OBJ_DIR = djgpp.obj
-
-ifeq ($(wildcard $(GCC_LIB)),)
-check_gcclib:
-	@echo libgcc.a not found. Set \"$(GCC_LIB)\" to \"/djgpp/lib/gcc/djgpp/4.X/libgcc.a\"
-endif
-
-
-#
-# Include 32-bit driver support
-#
-USE_32BIT_DRIVERS = 0
-
-#
-# Use loadable driver modules instead of statically linking
-# all drivers.
-#
-USE_32BIT_MODULES = 0
-
-#
-# Put interrupt sensitive code/data in locked sections
-# Do `make clean' in all affected directories after changing this.
-#
-USE_SECTION_LOCKING = 0
-
-#
-# Set to 1 to use exception handler lib (only for me)
-#
-USE_EXCEPT = 0
-
-CC   = gcc.exe
-LD   = ld.exe
-ASM  = nasm.exe -fbin -dDEBUG
-YACC = bison.exe
-LEX  = flex.exe
-
-CFLAGS = -g -O2 -Wall -I. -I$(WATT32_ROOT)/inc
-
-ifeq ($(USE_EXCEPT),1)
-  CFLAGS += -DUSE_EXCEPT
-  EXC_LIB = d:/prog/mw/except/lib/libexc.a
-endif
-
-ifeq ($(USE_SECTION_LOCKING),1)
-  CFLAGS += -DUSE_SECTION_LOCKING
-endif
-
-ifeq ($(USE_32BIT_DRIVERS),1)
-  CFLAGS += -DUSE_32BIT_DRIVERS
-endif
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) -o $@ $<
-	@echo
-
-%.o: %.s
-	$(CC) -c $(CFLAGS) -x assembler-with-cpp -o $@ $<
-	@echo
-
Index: vendor/libpcap/dist/msdos/ndis2.h
===================================================================
--- vendor/libpcap/dist/msdos/ndis2.h	(revision 333788)
+++ vendor/libpcap/dist/msdos/ndis2.h	(nonexistent)
@@ -1,559 +0,0 @@
-/*
- * Copyright (c) 1993,1994
- *      Texas A&M University.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Texas A&M University
- *      and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Developers:
- *             David K. Hess, Douglas Lee Schales, David R. Safford
- *
- * Heavily modified for Metaware HighC + GNU C 2.8+
- *             Gisle Vanem 1998
- */
-
-#ifndef __PCAP_NDIS_H
-#define __PCAP_NDIS_H
-
-#if defined (__HIGHC__)
-  #define pascal          _CC(_CALLEE_POPS_STACK & ~_REVERSE_PARMS) /* calling convention */
-  #define CALLBACK(foo)   pascal WORD foo
-  #define PAS_PTR(x,arg)  typedef FAR WORD pascal (*x) arg
-  #define GUARD()         _inline (0x9C,0xFA)   /* pushfd, cli */
-  #define UNGUARD()       _inline (0x9D)        /* popfd */
-  #define FAR             _far
-
-#elif defined(__GNUC__)
-  #define CALLBACK(foo)   WORD foo __attribute__((stdcall))
-  #define PAS_PTR(x,arg)  typedef WORD (*x) arg __attribute__((stdcall))
-  #define GUARD()         __asm__ __volatile__ ("pushfd; cli")
-  #define UNGUARD()       __asm__ __volatile__ ("popfd")
-  #define FAR
-
-#elif defined (__TURBOC__)
-  #define CALLBACK(foo)   WORD pascal foo
-  #define PAS_PTR(x,arg)  typedef WORD pascal (_far *x) arg
-  #define GUARD()         _asm { pushf; cli }
-  #define UNGUARD()       _asm { popf }
-  #define FAR             _far
-
-#elif defined (__WATCOMC__)
-  #define CALLBACK(foo)   WORD pascal foo
-  #define PAS_PTR(x,arg)  typedef WORD pascal (_far *x) arg
-  #define GUARD()         _disable()
-  #define UNGUARD()       _enable()
-  #define FAR             _far
-
-#else
-  #error Unsupported compiler
-#endif
-
-
-/*
- *  Forwards
- */
-struct _ReqBlock;
-struct _TxBufDescr;
-struct _TDBufDescr;
-
-/*
- * Protocol Manager API
- */
-PAS_PTR (ProtMan, (struct _ReqBlock FAR*, WORD));
-
-/*
- * System request
- */
-PAS_PTR (SystemRequest, (DWORD, DWORD, WORD, WORD, WORD));
-
-/*
- * MAC API
- */
-PAS_PTR (TransmitChain, (WORD, WORD, struct _TxBufDescr FAR*, WORD));
-PAS_PTR (TransferData,  (WORD*,WORD, struct _TDBufDescr FAR*, WORD));
-PAS_PTR (Request,       (WORD, WORD, WORD, DWORD, WORD, WORD));
-PAS_PTR (ReceiveRelease,(WORD, WORD));
-PAS_PTR (IndicationOn,  (WORD));
-PAS_PTR (IndicationOff, (WORD));
-
-
-typedef enum {
-        HARDWARE_NOT_INSTALLED  = 0,
-        HARDWARE_FAILED_DIAG    = 1,
-        HARDWARE_FAILED_CONFIG  = 2,
-        HARDWARE_HARD_FAULT     = 3,
-        HARDWARE_SOFT_FAULT     = 4,
-        HARDWARE_OK             = 7,
-        HARDWARE_MASK           = 0x0007,
-        MAC_BOUND               = 0x0008,
-        MAC_OPEN                = 0x0010,
-        DIAG_IN_PROGRESS        = 0x0020
-      } NdisMacStatus;
-
-typedef enum {
-        STATUS_RING_STATUS      = 1,
-        STATUS_ADAPTER_CHECK    = 2,
-        STATUS_START_RESET      = 3,
-        STATUS_INTERRUPT        = 4,
-        STATUS_END_RESET        = 5
-      } NdisStatus;
-
-typedef enum {
-        FILTER_DIRECTED         = 1,
-        FILTER_BROADCAST        = 2,
-        FILTER_PROMISCUOUS      = 4,
-        FILTER_SOURCE_ROUTE     = 8
-      } NdisPacketFilter;
-
-typedef enum {
-        REQ_INITIATE_DIAGNOSTICS     = 1,
-        REQ_READ_ERROR_LOG           = 2,
-        REQ_SET_STATION_ADDRESS      = 3,
-        REQ_OPEN_ADAPTER             = 4,
-        REQ_CLOSE_ADAPTER            = 5,
-        REQ_RESET_MAC                = 6,
-        REQ_SET_PACKET_FILTER        = 7,
-        REQ_ADD_MULTICAST_ADDRESS    = 8,
-        REQ_DELETE_MULTICAST_ADDRESS = 9,
-        REQ_UPDATE_STATISTICS        = 10,
-        REQ_CLEAR_STATISTICS         = 11,
-        REQ_INTERRUPT_REQUEST        = 12,
-        REQ_SET_FUNCTIONAL_ADDRESS   = 13,
-        REQ_SET_LOOKAHEAD            = 14
-      } NdisGeneralRequest;
-
-typedef enum {
-        SF_BROADCAST             = 0x00000001L,
-        SF_MULTICAST             = 0x00000002L,
-        SF_FUNCTIONAL            = 0x00000004L,
-        SF_PROMISCUOUS           = 0x00000008L,
-        SF_SOFT_ADDRESS          = 0x00000010L,
-        SF_STATS_CURRENT         = 0x00000020L,
-        SF_INITIATE_DIAGS        = 0x00000040L,
-        SF_LOOPBACK              = 0x00000080L,
-        SF_RECEIVE_CHAIN         = 0x00000100L,
-        SF_SOURCE_ROUTING        = 0x00000200L,
-        SF_RESET_MAC             = 0x00000400L,
-        SF_OPEN_CLOSE            = 0x00000800L,
-        SF_INTERRUPT_REQUEST     = 0x00001000L,
-        SF_SOURCE_ROUTING_BRIDGE = 0x00002000L,
-        SF_VIRTUAL_ADDRESSES     = 0x00004000L
-      } NdisMacServiceFlags;
-
-typedef enum {
-        REQ_INITIATE_BIND        = 1,
-        REQ_BIND                 = 2,
-        REQ_INITIATE_PREBIND     = 3,
-        REQ_INITIATE_UNBIND      = 4,
-        REQ_UNBIND               = 5
-      } NdisSysRequest;
-
-typedef enum  {
-        PM_GET_PROTOCOL_MANAGER_INFO      = 1,
-        PM_REGISTER_MODULE                = 2,
-        PM_BIND_AND_START                 = 3,
-        PM_GET_PROTOCOL_MANAGER_LINKAGE   = 4,
-        PM_GET_PROTOCOL_INI_PATH          = 5,
-        PM_REGISTER_PROTOCOL_MANAGER_INFO = 6,
-        PM_INIT_AND_REGISTER              = 7,
-        PM_UNBIND_AND_STOP                = 8,
-        PM_BIND_STATUS                    = 9,
-        PM_REGISTER_STATUS                = 10
-      } NdisProtManager;
-
-
-typedef enum {
-        ERR_SUCCESS                      = 0x00,
-        ERR_WAIT_FOR_RELEASE             = 0x01,
-        ERR_REQUEST_QUEUED               = 0x02,
-        ERR_FRAME_NOT_RECOGNIZED         = 0x03,
-        ERR_FRAME_REJECTED               = 0x04,
-        ERR_FORWARD_FRAME                = 0x05,
-        ERR_OUT_OF_RESOURCE              = 0x06,
-        ERR_INVALID_PARAMETER            = 0x07,
-        ERR_INVALID_FUNCTION             = 0x08,
-        ERR_NOT_SUPPORTED                = 0x09,
-        ERR_HARDWARE_ERROR               = 0x0A,
-        ERR_TRANSMIT_ERROR               = 0x0B,
-        ERR_NO_SUCH_DESTINATION          = 0x0C,
-        ERR_BUFFER_TOO_SMALL             = 0x0D,
-        ERR_ALREADY_STARTED              = 0x20,
-        ERR_INCOMPLETE_BINDING           = 0x21,
-        ERR_DRIVER_NOT_INITIALIZED       = 0x22,
-        ERR_HARDWARE_NOT_FOUND           = 0x23,
-        ERR_HARDWARE_FAILURE             = 0x24,
-        ERR_CONFIGURATION_FAILURE        = 0x25,
-        ERR_INTERRUPT_CONFLICT           = 0x26,
-        ERR_INCOMPATIBLE_MAC             = 0x27,
-        ERR_INITIALIZATION_FAILED        = 0x28,
-        ERR_NO_BINDING                   = 0x29,
-        ERR_NETWORK_MAY_NOT_BE_CONNECTED = 0x2A,
-        ERR_INCOMPATIBLE_OS_VERSION      = 0x2B,
-        ERR_ALREADY_REGISTERED           = 0x2C,
-        ERR_PATH_NOT_FOUND               = 0x2D,
-        ERR_INSUFFICIENT_MEMORY          = 0x2E,
-        ERR_INFO_NOT_FOUND               = 0x2F,
-        ERR_GENERAL_FAILURE              = 0xFF
-      } NdisError;
-
-#define NDIS_PARAM_INTEGER   0
-#define NDIS_PARAM_STRING    1
-
-#define NDIS_TX_BUF_LENGTH   8
-#define NDIS_TD_BUF_LENGTH   1
-#define NDIS_RX_BUF_LENGTH   8
-
-#define NDIS_PTR_PHYSICAL    0
-#define NDIS_PTR_VIRTUAL     2
-
-#define NDIS_PATH    "PROTMAN$"
-
-
-typedef struct _CommonChars {
-        WORD  tableSize;
-        BYTE  majorNdisVersion;        /* 2 - Latest version */
-        BYTE  minorNdisVersion;        /* 0                  */
-        WORD  reserved1;
-        BYTE  majorModuleVersion;
-        BYTE  minorModuleVersion;
-        DWORD moduleFlags;
-        /* 0 - Binding at upper boundary supported
-         * 1 - Binding at lower boundary supported
-         * 2 - Dynamically bound.
-         * 3-31 - Reserved, must be zero.
-         */
-        BYTE  moduleName[16];
-        BYTE  protocolLevelUpper;
-        /* 1 - MAC
-         * 2 - Data Link
-         * 3 - Network
-         * 4 - Transport
-         * 5 - Session
-         * -1 - Not specified
-         */
-        BYTE  interfaceUpper;
-        BYTE  protocolLevelLower;
-        /* 0 - Physical
-         * 1 - MAC
-         * 2 - Data Link
-         * 3 - Network
-         * 4 - Transport
-         * 5 - Session
-         * -1 - Not specified
-         */
-        BYTE  interfaceLower;
-        WORD  moduleId;
-        WORD  moduleDS;
-        SystemRequest systemRequest;
-        BYTE *serviceChars;
-        BYTE *serviceStatus;
-        BYTE *upperDispatchTable;
-        BYTE *lowerDispatchTable;
-        BYTE *reserved2;            /* Must be NULL */
-        BYTE *reserved3;            /* Must be NULL */
-      } CommonChars;
-
-
-typedef struct _MulticastList {
-        WORD   maxMulticastAddresses;
-        WORD   numberMulticastAddresses;
-        BYTE   multicastAddress[16][16];
-      } MulticastList;
-
-
-typedef struct _MacChars {
-        WORD   tableSize;
-        BYTE   macName[16];
-        WORD   addressLength;
-        BYTE   permanentAddress[16];
-        BYTE   currentAddress[16];
-        DWORD  currentFunctionalAddress;
-        MulticastList *multicastList;
-        DWORD  linkSpeed;
-        DWORD  serviceFlags;
-        WORD   maxFrameSize;
-        DWORD  txBufferSize;
-        WORD   txBufferAllocSize;
-        DWORD  rxBufferSize;
-        WORD   rxBufferAllocSize;
-        BYTE   ieeeVendor[3];
-        BYTE   vendorAdapter;
-        BYTE  *vendorAdapterDescription;
-        WORD   interruptLevel;
-        WORD   txQueueDepth;
-        WORD   maxDataBlocks;
-      } MacChars;
-
-
-typedef struct _ProtocolChars {
-        WORD   length;
-        BYTE   name[16];
-        WORD   type;
-      } ProtocolChars;
-
-
-typedef struct _MacUpperDispatch {
-        CommonChars      *backPointer;
-        Request           request;
-        TransmitChain     transmitChain;
-        TransferData      transferData;
-        ReceiveRelease    receiveRelease;
-        IndicationOn      indicationOn;
-        IndicationOff     indicationOff;
-      } MacUpperDispatch;
-
-
-typedef struct _MacStatusTable {
-        WORD   tableSize;
-        DWORD  lastDiag;
-        DWORD  macStatus;
-        WORD   packetFilter;
-        BYTE  *mediaSpecificStats;
-        DWORD  lastClear;
-        DWORD  totalFramesRx;
-        DWORD  totalFramesCrc;
-        DWORD  totalBytesRx;
-        DWORD  totalDiscardBufSpaceRx;
-        DWORD  totalMulticastRx;
-        DWORD  totalBroadcastRx;
-        DWORD  obsolete1[5];
-        DWORD  totalDiscardHwErrorRx;
-        DWORD  totalFramesTx;
-        DWORD  totalBytesTx;
-        DWORD  totalMulticastTx;
-        DWORD  totalBroadcastTx;
-        DWORD  obsolete2[2];
-        DWORD  totalDiscardTimeoutTx;
-        DWORD  totalDiscardHwErrorTx;
-      } MacStatusTable;
-
-
-typedef struct _ProtDispatch {
-        CommonChars *backPointer;
-        DWORD        flags;
-        /* 0 - handles non-LLC frames
-         * 1 - handles specific-LSAP LLC frames
-         * 2 - handles specific-LSAP LLC frames
-         * 3-31 - reserved must be 0
-         */
-        void  (*requestConfirm) (void);
-        void  (*transmitConfirm) (void);
-        void  (*receiveLookahead) (void);
-        void  (*indicationComplete) (void);
-        void  (*receiveChain) (void);
-        void  (*status) (void);
-      } ProtDispatch;
-
-
-typedef struct _ReqBlock {
-        WORD      opcode;
-        WORD      status;
-        BYTE FAR *pointer1;
-        BYTE FAR *pointer2;
-        WORD      word1;
-      } ReqBlock;
-
-
-typedef struct _TxBufDescrRec {
-        BYTE   txPtrType;
-        BYTE   dummy;
-        WORD   txDataLen;
-        BYTE  *txDataPtr;
-      } TxBufDescrRec;
-
-
-typedef struct _TxBufDescr {
-        WORD          txImmedLen;
-        BYTE         *txImmedPtr;
-        WORD          txDataCount;
-        TxBufDescrRec txBufDescrRec[NDIS_TX_BUF_LENGTH];
-      } TxBufDescr;
-
-
-typedef struct _TDBufDescrRec {
-        BYTE   tDPtrType;
-        BYTE   dummy;
-        WORD   tDDataLen;
-        BYTE  *tDDataPtr;
-      } TDBufDescrRec;
-
-
-typedef struct _TDBufDescr {
-        WORD          tDDataCount;
-        TDBufDescrRec tDBufDescrRec[NDIS_TD_BUF_LENGTH];
-      } TDBufDescr;
-
-
-typedef struct _RxBufDescrRec {
-        WORD   rxDataLen;
-        BYTE  *rxDataPtr;
-      } RxBufDescrRec;
-
-
-typedef struct _RxBufDescr {
-        WORD          rxDataCount;
-        RxBufDescrRec rxBufDescrRec[NDIS_RX_BUF_LENGTH];
-      } RxBufDescr;
-
-
-typedef struct _PktBuf {
-	struct _PktBuf *nextLink;
-	struct _PktBuf *prevLink;
-        int    handle;
-        int    length;
-        int    packetLength;
-        DWORD  sequence;
-        BYTE  *buffer;
-      } PktBuf;
-
-
-typedef struct _CardHandle {
-        BYTE         moduleName[16];
-        CommonChars *common;
-      } CardHandle;
-
-
-typedef struct _BindingsList {
-        WORD  numBindings;
-        BYTE  moduleName[2][16];
-      } BindingsList;
-
-
-typedef struct _FailingModules {
-        BYTE  upperModuleName[16];
-        BYTE  lowerModuleName[16];
-      } FailingModules;
-
-
-typedef union _HardwareAddress {
-        BYTE  bytes[6];
-        WORD  words[3];
-        struct {
-          BYTE bytes[6];
-        } addr;
-      } HardwareAddress;
-
-
-typedef struct _FddiHeader {
-        BYTE             frameControl;
-        HardwareAddress  etherDestHost;
-        HardwareAddress  etherSrcHost;
-      } FddiHeader;
-
-
-typedef struct _EthernetIIHeader {
-        HardwareAddress  etherDestHost;
-        HardwareAddress  etherSrcHost;
-        WORD             etherType;
-      } EthernetIIHeader;
-
-
-typedef struct _Ieee802Dot5Header {
-        HardwareAddress  etherDestHost;
-        HardwareAddress  etherSrcHost;
-        BYTE             routeInfo[30];
-      } Ieee802Dot5Header;
-
-
-typedef struct _Ieee802Dot2SnapHeader {
-        BYTE  dsap;                      /* 0xAA */
-        BYTE  ssap;                      /* 0xAA */
-        BYTE  control;                   /* 3    */
-        BYTE protocolId[5];
-      } Ieee802Dot2SnapHeader;
-
-
-/*
- *  Prototypes
- */
-extern char *NdisLastError        (void);
-extern int   NdisOpen             (void);
-extern int   NdisInit             (int promis);
-extern int   NdisRegisterAndBind  (int promis);
-extern void  NdisShutdown         (void);
-extern void  NdisCheckMacFeatures (struct _CardHandle *card);
-extern int   NdisSendPacket       (struct _PktBuf *pktBuf, int macId);
-
-/*
- *  Assembly "glue" functions
- */
-extern int systemRequestGlue();
-extern int requestConfirmGlue();
-extern int transmitConfirmGlue();
-extern int receiveLookaheadGlue();
-extern int indicationCompleteGlue();
-extern int receiveChainGlue();
-extern int statusGlue();
-
-/*
- *  IOCTL function
- */
-#ifdef __SMALL__
-extern int _far NdisGetLinkage (int handle, char *data, int size);
-#else
-extern int NdisGetLinkage (int handle, char *data, int size);
-#endif
-
-/*
- *  NDIS callback handlers
- */
-CALLBACK (NdisSystemRequest     (DWORD,DWORD, WORD, WORD, WORD));
-CALLBACK (NdisRequestConfirm    ( WORD, WORD, WORD, WORD, WORD,WORD));
-CALLBACK (NdisTransmitConfirm   ( WORD, WORD, WORD, WORD, WORD));
-CALLBACK (NdisReceiveLookahead  ( WORD, WORD, WORD, BYTE*, BYTE*, WORD));
-CALLBACK (NdisReceiveChain      ( WORD, WORD, WORD, struct _RxBufDescr*, BYTE*, WORD));
-CALLBACK (NdisStatusProc        ( WORD, WORD, BYTE*, WORD,WORD));
-CALLBACK (NdisIndicationComplete( WORD, WORD));
-
-BYTE *NdisAllocStack (void);
-void  NdisFreeStack  (BYTE*);
-
-#ifdef __HIGHC__
-  #define RENAME_ASM_SYM(x) pragma Alias(x,"@" #x "")  /* prepend `@' */
-  #define RENAME_C_SYM(x)   pragma Alias(x,"_" #x "")  /* prepend `_' */
-
-  RENAME_ASM_SYM (systemRequestGlue);
-  RENAME_ASM_SYM (requestConfirmGlue);
-  RENAME_ASM_SYM (transmitConfirmGlue);
-  RENAME_ASM_SYM (receiveLookaheadGlue);
-  RENAME_ASM_SYM (indicationCompleteGlue);
-  RENAME_ASM_SYM (receiveChainGlue);
-  RENAME_ASM_SYM (statusGlue);
-  RENAME_ASM_SYM (NdisGetLinkage);
-  RENAME_C_SYM   (NdisSystemRequest);
-  RENAME_C_SYM   (NdisRequestConfirm);
-  RENAME_C_SYM   (NdisTransmitConfirm);
-  RENAME_C_SYM   (NdisReceiveLookahead);
-  RENAME_C_SYM   (NdisIndicationComplete);
-  RENAME_C_SYM   (NdisReceiveChain);
-  RENAME_C_SYM   (NdisStatusProc);
-  RENAME_C_SYM   (NdisAllocStack);
-  RENAME_C_SYM   (NdisFreeStack);
-#endif
-
-#endif

Property changes on: vendor/libpcap/dist/msdos/ndis2.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/msdos/makefile
===================================================================
--- vendor/libpcap/dist/msdos/makefile	(revision 333788)
+++ vendor/libpcap/dist/msdos/makefile	(revision 333789)
@@ -1,184 +1,180 @@
 #
 #  Makefile for dos-libpcap. NB. This makefile requires a Borland
 #  compatible make tool.
 #
 #  Targets:
 #    Borland C 4.0+      (DOS large model)
 #    Metaware HighC 3.3+ (PharLap 386|DosX)
 #
 
 .AUTODEPEND
 .SWAP
 
 !if "$(WATT_ROOT)" == ""
 !error Environment variable "WATT_ROOT" not set.
 !endif
 
 WATT_INC = $(WATT_ROOT)\inc
 
 DEFS   = -DMSDOS -DDEBUG -DNDIS_DEBUG -D_U_= -Dinline= \
          -DHAVE_STRERROR -DHAVE_LIMITS_H
 
 ASM    = tasm.exe -t -l -mx -m2 -DDEBUG
 
 SOURCE = grammar.c  scanner.c bpf_filt.c bpf_imag.c bpf_dump.c \
          etherent.c gencode.c nametoad.c pcap-dos.c optimize.c \
-         savefile.c pcap.c inet.c msdos\ndis2.c msdos\pktdrvr.c \
+         savefile.c pcap.c msdos\ndis2.c msdos\pktdrvr.c \
          missing\snprintf.c
 
 BORLAND_OBJ = $(SOURCE:.c=.obj) msdos\pkt_rx0.obj msdos\ndis_0.obj
 
 HIGHC_OBJ   = $(SOURCE:.c=.o32) msdos\pkt_rx0.o32
 
 all:
             @echo Usage: make pcap_bc.lib or pcap_hc.lib
 
 
 pcap_bc.lib: bcc.arg $(BORLAND_OBJ) pcap_bc
 
 
 pcap_hc.lib: hc386.arg $(HIGHC_OBJ)
             386lib $< @&&|
                -nowarn -nobackup -twocase -replace $(HIGHC_OBJ)
 |
 
 pcap_bc:    $(BORLAND_OBJ)
             @tlib pcap_bc.lib /C @&&|
                -+$(**:.obj=-+)
 |
 
 .c.obj:
             bcc.exe @bcc.arg -o$*.obj $*.c
 
 .c.o32:
             hc386.exe @hc386.arg -o $*.o32 $*.c
 
 .asm.obj:
             $(ASM) $*.asm, $*.obj
 
 .asm.o32:
             $(ASM) -DDOSX=1 $*.asm, $*.o32
 
 scanner.c: scanner.l
             flex -Ppcap_ -7 -oscanner.c scanner.l
 
 grammar.c tokdefs.h: grammar.y
             bison --name-prefix=pcap_ --yacc --defines grammar.y
             - @del grammar.c
             - @del tokdefs.h
             ren y_tab.c grammar.c
             ren y_tab.h tokdefs.h
 
 bcc.arg:    msdos\Makefile
             @copy &&|
               $(DEFS) -ml -c -v -3 -O2 -po -RT- -w-
               -I$(WATT_INC) -I. -I.\msdos\pm_drvr -H=$(TEMP)\bcc.sym
 | $<
 
 hc386.arg:  msdos\Makefile
             @copy &&|
             # -DUSE_32BIT_DRIVERS
               $(DEFS) -DDOSX=1 -w3 -c -g -O5
               -I$(WATT_INC) -I. -I.\msdos\pm_drvr
               -Hsuffix=.o32
               -Hnocopyr
               -Hpragma=Offwarn(491,553,572)
               -Hon=Recognize_library  # make memcpy/strlen etc. inline
               -Hoff=Behaved           # turn off some optimiser warnings
 | $<
 
 clean:
             @del *.obj
             @del *.o32
             @del *.lst
             @del *.map
             @del bcc.arg
             @del hc386.arg
             @del grammar.c
             @del tokdefs.h
             @del scanner.c
             @echo Cleaned
 
 #
 # dependencies
 #
 pkt_rx0.obj:  msdos\pkt_rx0.asm
 
 bpf_filt.obj: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h gnuc.h
 
 bpf_imag.obj: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h
 
 bpf_dump.obj: bpf_dump.c pcap.h pcap-bpf.h
 
 etherent.obj: etherent.c pcap-int.h pcap.h pcap-bpf.h pcap-namedb.h
 
 optimize.obj: optimize.c pcap-int.h pcap.h pcap-bpf.h gencode.h
 
 savefile.obj: savefile.c pcap-int.h pcap.h pcap-bpf.h
 
 pcap.obj: pcap.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h
 
-inet.obj: inet.c pcap-int.h pcap.h pcap-bpf.h
-
 grammar.obj: grammar.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pf.h pcap-namedb.h
 
 scanner.obj: scanner.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pcap-namedb.h tokdefs.h
 
 gencode.obj: gencode.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \
   ethertype.h nlpid.h llc.h gencode.h atmuni31.h sunatmpos.h ppp.h sll.h \
   arcnet.h pf.h pcap-namedb.h
 
 nametoad.obj: nametoad.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pcap-namedb.h ethertype.h
 
 pcap-dos.obj: pcap-dos.c pcap.h pcap-bpf.h pcap-dos.h pcap-int.h \
   msdos\pktdrvr.h
 
 pktdrvr.obj: msdos\pktdrvr.c gnuc.h pcap-dos.h pcap-int.h \
   pcap.h pcap-bpf.h msdos\pktdrvr.h msdos\pkt_stub.inc
 
 ndis2.obj: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \
   msdos\ndis2.h
 
 pkt_rx0.o32:  msdos\pkt_rx0.asm
 
 bpf_filt.o32: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h gnuc.h
 
 bpf_imag.o32: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h
 
 bpf_dump.o32: bpf_dump.c pcap.h pcap-bpf.h
 
 etherent.o32: etherent.c pcap-int.h pcap.h pcap-bpf.h pcap-namedb.h
 
 optimize.o32: optimize.c pcap-int.h pcap.h pcap-bpf.h gencode.h
 
 savefile.o32: savefile.c pcap-int.h pcap.h pcap-bpf.h
 
 pcap.o32: pcap.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h
-
-inet.o32: inet.c pcap-int.h pcap.h pcap-bpf.h
 
 grammar.o32: grammar.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pf.h pcap-namedb.h
 
 scanner.o32: scanner.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pcap-namedb.h tokdefs.h
 
 gencode.o32: gencode.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \
   ethertype.h nlpid.h llc.h gencode.h atmuni31.h sunatmpos.h ppp.h sll.h \
   arcnet.h pf.h pcap-namedb.h
 
 nametoad.o32: nametoad.c pcap-int.h pcap.h pcap-bpf.h gencode.h \
   pcap-namedb.h ethertype.h
 
 pcap-dos.o32: pcap-dos.c pcap.h pcap-bpf.h pcap-dos.h pcap-int.h \
   msdos\pktdrvr.h
 
 pktdrvr.o32: msdos\pktdrvr.c gnuc.h pcap-dos.h pcap-int.h \
   pcap.h pcap-bpf.h msdos\pktdrvr.h msdos\pkt_stub.inc
 
 ndis2.o32: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \
   msdos\ndis2.h
 
Index: vendor/libpcap/dist/msdos/makefile.dj
===================================================================
--- vendor/libpcap/dist/msdos/makefile.dj	(revision 333788)
+++ vendor/libpcap/dist/msdos/makefile.dj	(revision 333789)
@@ -1,127 +1,127 @@
 #
 # GNU Makefile for DOS-libpcap. djgpp version.
 #
 # Use this makefile from the libpcap root directory.
 # E.g. like this:
 #
 #  c:\net\pcap> make -f msdos/makefile.dj
 #
 # Note: you should do a "set LFN=y" before running this makefile.
 #
 
 VPATH = missing msdos bpf/net
 
 PREREQUISITES = scanner.c grammar.c tokdefs.h version.h msdos/pkt_stub.inc
 
 include ./msdos/common.dj
 
 DRIVER_DIR = ./msdos/pm_drvr
 
 CFLAGS += -DDEBUG -DNDIS_DEBUG -DHAVE_LIMITS_H -DHAVE_STRERROR -DHAVE_SNPRINTF -DHAVE_VSNPRINTF\
           -D_U_='__attribute__((unused))'
 
 CFLAGS += -Dyylval=pcap_lval # -DBDEBUG -DNDEBUG
 
 SOURCES = grammar.c scanner.c bpf/net/bpf_filter.c bpf_image.c bpf_dump.c \
           etherent.c gencode.c nametoaddr.c pcap-common.c pcap-dos.c optimize.c \
-          savefile.c pcap.c sf-pcap.c sf-pcap-ng.c inet.c \
+          savefile.c pcap.c sf-pcap.c sf-pcapng.c \
           msdos/pktdrvr.c msdos/ndis2.c # missing/snprintf.c
 
 OBJECTS = $(addprefix $(OBJ_DIR)/, $(notdir $(SOURCES:.c=.o)))
 TEMPBIN = tmp.bin
 
 ifeq ($(USE_32BIT_DRIVERS),1)
   PM_OBJECTS = $(addprefix $(OBJ_DIR)/, \
                  printk.o pci.o pci-scan.o bios32.o dma.o irq.o intwrap.o \
                  lock.o kmalloc.o quirks.o timer.o net_init.o)
   #
   # Static link of drivers
   #
   ifeq ($(USE_32BIT_MODULES),0)
     PM_OBJECTS += $(addprefix $(OBJ_DIR)/, \
                     accton.o 8390.o 3c503.o 3c509.o 3c59x.o 3c515.o \
                     3c575_cb.o 3c90x.o ne.o wd.o cs89x0.o rtl8139.o)
   endif
 endif
 
 TARGETS = msdos/bin2c.exe libpcap.a filtertest.exe findalldevstest.exe \
           nonblocktest.exe opentest.exe
 
 all: $(TARGETS)
 	@echo 'Welcome to libpcap/djgpp with samples.'
 
 ifeq ($(USE_32BIT_DRIVERS),1)
 $(PM_OBJECTS):
 	$(MAKE) -f Makefile.dj -C $(DRIVER_DIR) $(notdir $@)
 endif
 
 libpcap.a: version.h $(OBJECTS) $(PM_OBJECTS)
 	rm -f $@
 	ar rs $@ $^
 
 filtertest.exe: tests/filtertest.c libpcap.a
 	$(CC) $(CFLAGS) -Din_addr_t=u_long -o $@ $^ $(WATT32_ROOT)/lib/libwatt.a
 	@echo
 
 findalldevstest.exe: tests/findalldevstest.c libpcap.a
 	$(CC) $(CFLAGS) -o $@ $^ $(WATT32_ROOT)/lib/libwatt.a
 	@echo
 
 nonblocktest.exe: tests/nonblocktest.c libpcap.a
 	$(CC) $(CFLAGS) -o $@ $^ $(WATT32_ROOT)/lib/libwatt.a
 	@echo
 
 opentest.exe: tests/opentest.c libpcap.a
 	$(CC) $(CFLAGS) -o $@ $^ $(WATT32_ROOT)/lib/libwatt.a
 	@echo
 
 msdos/pkt_stub.inc: msdos/bin2c.exe msdos/pkt_rx1.S
 	$(ASM) -o $(TEMPBIN) -lmsdos/pkt_rx1.lst msdos/pkt_rx1.S
 	./msdos/bin2c $(TEMPBIN) > $@
 	rm -f $(TEMPBIN)
 
 grammar.c tokdefs.h: grammar.y
 	rm -f grammar.c tokdefs.h
 	$(YACC) --name-prefix=pcap_ --yacc --defines grammar.y
 	mv -f y.tab.c grammar.c
 	mv -f y.tab.h tokdefs.h
 
 version.h: ./VERSION
 	@echo '/* Generated from VERSION. Do not edit */' > $@
 	sed -e 's/.*/static char pcap_version_string[] = "libpcap (&)";/' ./VERSION >> $@
 
 scanner.c: scanner.l
 	$(LEX) -Ppcap_ -7 -t $^ > $@
 	@echo
 
 msdos/bin2c.exe: msdos/bin2c.c
 	$(CC) $*.c -o $*.exe
 
 clean:
 	rm -f $(OBJECTS) msdos/pkt_rx1.lst Makefile.bak .depend.dj $(PREREQUISITES)
 #	$(MAKE) -f Makefile.dj -C $(DRIVER_DIR) clean
 
 vclean: clean
 	rm -f $(TARGETS)
 	-rmdir $(OBJ_DIR)
 
 #
 # Manually generated dependencies
 #
 msdos/pktdrvr.c: msdos/pkt_stub.inc
 scanner.c: scanner.l
 grammar.c tokdefs.h: grammar.y
 grammar.h: grammar.y
 scanner.l: pcap-int.h pcap-namedb.h gencode.h grammar.h
 grammar.y: pcap-int.h gencode.h pcap-namedb.h
 
 #
 # Generate dependencies.
 #
 REPLACE = sed -e 's/\(.*\)\.o: /\n$$(OBJ_DIR)\/\1.o: /'
 
 depend: $(PREREQUISITES)
 	$(CC) -MM $(CFLAGS) $(SOURCES) | $(REPLACE) > .depend.dj
 
 -include .depend.dj
 
Index: vendor/libpcap/dist/msdos/makefile.wc
===================================================================
--- vendor/libpcap/dist/msdos/makefile.wc	(revision 333788)
+++ vendor/libpcap/dist/msdos/makefile.wc	(revision 333789)
@@ -1,134 +1,132 @@
 #
 #  Watcom Makefile for dos-libpcap.
 #
 # Specify MODEL = `3r' or `3s'
 # Specify TARGET = `pharlap' or `dos4g'
 #
 # Use this makefile from the libpcap root directory.
 # E.g. like this:
 #
 #  c:\net\pcap> wmake -f msdos\makefile.wc
 #
 
 MODEL  = 3s
 TARGET = dos4g
 
 OBJDIR = msdos\$(TARGET).w$(MODEL)
 LIB    = $(OBJDIR)\pcap.lib
 
 .EXTENSIONS: .l .y
 
 DEFS = -dDEBUG -dNDIS_DEBUG -d_U_= -dHAVE_LIMITS_H -dHAVE_STRERROR &
        -dHAVE_SNPRINTF -dHAVE_VSNPRINTF
 
 CC  = wcc386.exe
 ASM = wasm.exe -$(MODEL) $(DEFS) -dDOSX -dDOS4GW -zq -bt=dos -fr=nul -d3 -s
 
 OBJS = $(OBJDIR)\grammar.obj    $(OBJDIR)\scanner.obj  $(OBJDIR)\pcap.obj     &
        $(OBJDIR)\bpf_filter.obj $(OBJDIR)\bpf_imag.obj $(OBJDIR)\bpf_dump.obj &
        $(OBJDIR)\etherent.obj   $(OBJDIR)\gencode.obj  $(OBJDIR)\nametoad.obj &
        $(OBJDIR)\pcap-dos.obj   $(OBJDIR)\pktdrvr.obj  $(OBJDIR)\optimize.obj &
-       $(OBJDIR)\savefile.obj   $(OBJDIR)\inet.obj     $(OBJDIR)\ndis2.obj
+       $(OBJDIR)\savefile.obj   $(OBJDIR)\ndis2.obj
 
 CFLAGS = $(DEFS) $(YYDEFS) -I. -I$(%watt_root)\inc -I.\msdos\pm_drvr &
          -$(MODEL) -mf -zff -zgf -zq -bt=dos -fr=nul -w6 -fpi        &
          -oilrtf -zm
 
 TEMPBIN = tmp.bin
 
 all: $(OBJDIR) $(OBJDIR)\pcap.lib
 
 $(OBJDIR):
           - mkdir $(OBJDIR)
 
 $(OBJDIR)\pcap.lib: $(OBJS) wlib.arg
           wlib -q -b -c $(OBJDIR)\pcap.lib @wlib.arg
 
 wlib.arg: msdos\makefile.wc
           %create $^@
           for %f in ($(OBJS)) do %append $^@ +- %f
 
 $(OBJDIR)\pktdrvr.obj: msdos\pkt_stub.inc msdos\pktdrvr.c &
   pcap-dos.h pcap-int.h pcap.h msdos\pktdrvr.h
           *$(CC) $(CFLAGS) msdos\pktdrvr.c -fo=$@
 
 $(OBJDIR)\bpf_filter.obj: bpf\net\bpf_filter.c
           *$(CC) $(CFLAGS) bpf\net\bpf_filter.c -fo=$@
 
 $(OBJDIR)\ndis2.obj: msdos\ndis2.c
           *$(CC) $(CFLAGS) msdos\ndis2.c -fo=$@
 
 .ERASE
 .c{$(OBJDIR)}.obj:
           *$(CC) $(CFLAGS) $[@ -fo=$@
 
 grammar.c tokdefs.h: grammar.y
           bison --name-prefix=pcap_ --yacc --defines $[@
           - @del grammar.c
           - @del tokdefs.h
           ren y_tab.c grammar.c
           ren y_tab.h tokdefs.h
 
 scanner.c: scanner.l
           flex -Ppcap_ -7 -o$@ $[@
 
 msdos\pkt_stub.inc: bin2c.exe msdos\pkt_rx1.S
           nasm -fbin -dDEBUG -o $(TEMPBIN) -lmsdos\pkt_rx1.lst msdos\pkt_rx1.S
           bin2c.exe  $(TEMPBIN) > $@
           @del $(TEMPBIN)
 
 bin2c.exe: msdos\bin2c.c
           wcl $[@
 
 clean realclean vclean: .SYMBOLIC
           for %f in (dos4g.w3r dos4g.w3s pharlap.w3r pharlap.w3s) do &
             @del %f\*.obj
           @del grammar.c
           @del tokdefs.h
           @del scanner.c
           @del bin2c.exe
           @del bin2c.obj
           @del msdos\pkt_stub.inc
           @echo Cleaned
 
 #
 # dependencies
 #
 $(OBJDIR)\bpf_filter.obj: bpf\net\bpf_filter.c pcap-int.h pcap.h pcap-bpf.h
 
 $(OBJDIR)\bpf_imag.obj: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h
 
 $(OBJDIR)\bpf_dump.obj: bpf_dump.c pcap.h pcap-bpf.h
 
 $(OBJDIR)\etherent.obj: etherent.c pcap-int.h pcap.h pcap-bpf.h pcap-namedb.h
 
 $(OBJDIR)\optimize.obj: optimize.c pcap-int.h pcap.h pcap-bpf.h gencode.h
 
 $(OBJDIR)\savefile.obj: savefile.c pcap-int.h pcap.h pcap-bpf.h
 
 $(OBJDIR)\pcap.obj: pcap.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h
-
-$(OBJDIR)\inet.obj: inet.c pcap-int.h pcap.h pcap-bpf.h
 
 $(OBJDIR)\grammar.obj: grammar.c pcap-int.h pcap.h pcap-bpf.h gencode.h &
   pcap-namedb.h
 
 $(OBJDIR)\scanner.obj: scanner.c pcap-int.h pcap.h pcap-bpf.h gencode.h &
   pcap-namedb.h tokdefs.h
 
 $(OBJDIR)\gencode.obj: gencode.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h &
   ethertyp.h nlpid.h llc.h gencode.h atmuni31.h sunatmpo.h ppp.h sll.h &
   arcnet.h pcap-namedb.h
 
 $(OBJDIR)\nametoad.obj: nametoad.c pcap-int.h pcap.h pcap-bpf.h gencode.h &
   pcap-namedb.h ethertyp.h
 
 $(OBJDIR)\pcap-dos.obj: pcap-dos.c pcap.h pcap-bpf.h pcap-dos.h pcap-int.h &
   msdos\pktdrvr.h
 
 $(OBJDIR)\pktdrvr.obj: msdos\pktdrvr.c pcap-dos.h pcap-int.h &
   pcap.h pcap-bpf.h msdos\pktdrvr.h msdos\pkt_stub.inc
 
 $(OBJDIR)\ndis2.obj: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h &
   msdos\ndis2.h
 
Index: vendor/libpcap/dist/nametoaddr.c
===================================================================
--- vendor/libpcap/dist/nametoaddr.c	(revision 333788)
+++ vendor/libpcap/dist/nametoaddr.c	(revision 333789)
@@ -1,548 +1,783 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * Name to id translation routines used by the scanner.
  * These functions are not time critical.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef DECNETLIB
 #include <sys/types.h>
 #include <netdnet/dnetdb.h>
 #endif
 
 #ifdef _WIN32
-#include <pcap-stdinc.h>
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
 
-#ifdef INET6
-/*
- * To quote the MSDN page for getaddrinfo() at
- *
- *    https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520(v=vs.85).aspx
- *
- * "Support for getaddrinfo on Windows 2000 and older versions
- * The getaddrinfo function was added to the Ws2_32.dll on Windows XP and
- * later. To execute an application that uses this function on earlier
- * versions of Windows, then you need to include the Ws2tcpip.h and
- * Wspiapi.h files. When the Wspiapi.h include file is added, the
- * getaddrinfo function is defined to the WspiapiGetAddrInfo inline
- * function in the Wspiapi.h file. At runtime, the WspiapiGetAddrInfo
- * function is implemented in such a way that if the Ws2_32.dll or the
- * Wship6.dll (the file containing getaddrinfo in the IPv6 Technology
- * Preview for Windows 2000) does not include getaddrinfo, then a
- * version of getaddrinfo is implemented inline based on code in the
- * Wspiapi.h header file. This inline code will be used on older Windows
- * platforms that do not natively support the getaddrinfo function."
- *
- * We use getaddrinfo(), so we include Wspiapi.h here.  pcap-stdinc.h
- * includes Ws2tcpip.h, so we don't need to include it ourselves.
- */
-#include <Wspiapi.h>
-#endif
-
+  #ifdef INET6
+    /*
+     * To quote the MSDN page for getaddrinfo() at
+     *
+     *    https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520(v=vs.85).aspx
+     *
+     * "Support for getaddrinfo on Windows 2000 and older versions
+     * The getaddrinfo function was added to the Ws2_32.dll on Windows XP and
+     * later. To execute an application that uses this function on earlier
+     * versions of Windows, then you need to include the Ws2tcpip.h and
+     * Wspiapi.h files. When the Wspiapi.h include file is added, the
+     * getaddrinfo function is defined to the WspiapiGetAddrInfo inline
+     * function in the Wspiapi.h file. At runtime, the WspiapiGetAddrInfo
+     * function is implemented in such a way that if the Ws2_32.dll or the
+     * Wship6.dll (the file containing getaddrinfo in the IPv6 Technology
+     * Preview for Windows 2000) does not include getaddrinfo, then a
+     * version of getaddrinfo is implemented inline based on code in the
+     * Wspiapi.h header file. This inline code will be used on older Windows
+     * platforms that do not natively support the getaddrinfo function."
+     *
+     * We use getaddrinfo(), so we include Wspiapi.h here.
+     */
+    #include <wspiapi.h>
+  #endif /* INET6 */
 #else /* _WIN32 */
+  #include <sys/param.h>
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/time.h>
 
-#include <sys/param.h>
-#include <sys/types.h>				/* concession to AIX */
-#include <sys/socket.h>
-#include <sys/time.h>
+  #include <netinet/in.h>
 
-#include <netinet/in.h>
-#endif /* _WIN32 */
+  #ifdef HAVE_ETHER_HOSTTON
+    #if defined(NET_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+      /*
+       * OK, just include <net/ethernet.h>.
+       */
+      #include <net/ethernet.h>
+    #elif defined(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON)
+      /*
+       * OK, just include <netinet/ether.h>
+       */
+      #include <netinet/ether.h>
+    #elif defined(SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON)
+      /*
+       * OK, just include <sys/ethernet.h>
+       */
+      #include <sys/ethernet.h>
+    #elif defined(ARPA_INET_H_DECLARES_ETHER_HOSTTON)
+      /*
+       * OK, just include <arpa/inet.h>
+       */
+      #include <arpa/inet.h>
+    #elif defined(NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON)
+      /*
+       * OK, include <netinet/if_ether.h>, after all the other stuff we
+       * need to include or define for its benefit.
+       */
+      #define NEED_NETINET_IF_ETHER_H
+    #else
+      /*
+       * We'll have to declare it ourselves.
+       * If <netinet/if_ether.h> defines struct ether_addr, include
+       * it.  Otherwise, define it ourselves.
+       */
+      #ifdef HAVE_STRUCT_ETHER_ADDR
+        #define NEED_NETINET_IF_ETHER_H
+      #else /* HAVE_STRUCT_ETHER_ADDR */
+	struct ether_addr {
+		unsigned char ether_addr_octet[6];
+	};
+      #endif /* HAVE_STRUCT_ETHER_ADDR */
+    #endif /* what declares ether_hostton() */
 
-#ifndef _WIN32
-#ifdef HAVE_ETHER_HOSTTON
-/*
- * XXX - do we need any of this if <netinet/if_ether.h> doesn't declare
- * ether_hostton()?
- */
-#ifdef HAVE_NETINET_IF_ETHER_H
-struct mbuf;		/* Squelch compiler warnings on some platforms for */
-struct rtentry;		/* declarations in <net/if.h> */
-#include <net/if.h>	/* for "struct ifnet" in "struct arpcom" on Solaris */
-#include <netinet/if_ether.h>
-#endif /* HAVE_NETINET_IF_ETHER_H */
-#ifdef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON
-#include <netinet/ether.h>
-#endif /* NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */
-#endif /* HAVE_ETHER_HOSTTON */
-#include <arpa/inet.h>
-#include <netdb.h>
+    #ifdef NEED_NETINET_IF_ETHER_H
+      #include <net/if.h>	/* Needed on some platforms */
+      #include <netinet/in.h>	/* Needed on some platforms */
+      #include <netinet/if_ether.h>
+    #endif /* NEED_NETINET_IF_ETHER_H */
+
+    #ifndef HAVE_DECL_ETHER_HOSTTON
+      /*
+       * No header declares it, so declare it ourselves.
+       */
+      extern int ether_hostton(const char *, struct ether_addr *);
+    #endif /* !defined(HAVE_DECL_ETHER_HOSTTON) */
+  #endif /* HAVE_ETHER_HOSTTON */
+
+  #include <arpa/inet.h>
+  #include <netdb.h>
 #endif /* _WIN32 */
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "pcap-int.h"
 
 #include "gencode.h"
 #include <pcap/namedb.h>
 #include "nametoaddr.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #ifndef NTOHL
 #define NTOHL(x) (x) = ntohl(x)
 #define NTOHS(x) (x) = ntohs(x)
 #endif
 
-static inline int xdtoi(int);
-
 /*
  *  Convert host name to internet address.
  *  Return 0 upon failure.
+ *  XXX - not thread-safe; don't use it inside libpcap.
  */
 bpf_u_int32 **
 pcap_nametoaddr(const char *name)
 {
 #ifndef h_addr
 	static bpf_u_int32 *hlist[2];
 #endif
 	bpf_u_int32 **p;
 	struct hostent *hp;
 
 	if ((hp = gethostbyname(name)) != NULL) {
 #ifndef h_addr
 		hlist[0] = (bpf_u_int32 *)hp->h_addr;
 		NTOHL(hp->h_addr);
 		return hlist;
 #else
 		for (p = (bpf_u_int32 **)hp->h_addr_list; *p; ++p)
 			NTOHL(**p);
 		return (bpf_u_int32 **)hp->h_addr_list;
 #endif
 	}
 	else
 		return 0;
 }
 
-#ifdef INET6
 struct addrinfo *
 pcap_nametoaddrinfo(const char *name)
 {
 	struct addrinfo hints, *res;
 	int error;
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = PF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;	/*not really*/
 	hints.ai_protocol = IPPROTO_TCP;	/*not really*/
 	error = getaddrinfo(name, NULL, &hints, &res);
 	if (error)
 		return NULL;
 	else
 		return res;
 }
-#endif /*INET6*/
 
 /*
  *  Convert net name to internet address.
  *  Return 0 upon failure.
+ *  XXX - not guaranteed to be thread-safe!  See below for platforms
+ *  on which it is thread-safe and on which it isn't.
  */
 bpf_u_int32
 pcap_nametonetaddr(const char *name)
 {
-#ifndef _WIN32
-	struct netent *np;
-
-	if ((np = getnetbyname(name)) != NULL)
-		return np->n_net;
-	else
-		return 0;
-#else
+#ifdef _WIN32
 	/*
 	 * There's no "getnetbyname()" on Windows.
 	 *
 	 * XXX - I guess we could use the BSD code to read
 	 * C:\Windows\System32\drivers\etc/networks, assuming
 	 * that's its home on all the versions of Windows
 	 * we use, but that file probably just has the loopback
 	 * network on 127/24 on 99 44/100% of Windows machines.
 	 *
 	 * (Heck, these days it probably just has that on 99 44/100%
 	 * of *UN*X* machines.)
 	 */
 	return 0;
-#endif
+#else
+	/*
+	 * UN*X.
+	 */
+	struct netent *np;
+  #if defined(HAVE_LINUX_GETNETBYNAME_R)
+	/*
+	 * We have Linux's reentrant getnetbyname_r().
+	 */
+	struct netent result_buf;
+	char buf[1024];	/* arbitrary size */
+	int h_errnoval;
+	int err;
+
+	err = getnetbyname_r(name, &result_buf, buf, sizeof buf, &np,
+	    &h_errnoval);
+	if (err != 0) {
+		/*
+		 * XXX - dynamically allocate the buffer, and make it
+		 * bigger if we get ERANGE back?
+		 */
+		return 0;
+	}
+  #elif defined(HAVE_SOLARIS_IRIX_GETNETBYNAME_R)
+	/*
+	 * We have Solaris's and IRIX's reentrant getnetbyname_r().
+	 */
+	struct netent result_buf;
+	char buf[1024];	/* arbitrary size */
+
+	np = getnetbyname_r(name, &result_buf, buf, (int)sizeof buf);
+  #elif defined(HAVE_AIX_GETNETBYNAME_R)
+	/*
+	 * We have AIX's reentrant getnetbyname_r().
+	 */
+	struct netent result_buf;
+	struct netent_data net_data;
+
+	if (getnetbyname_r(name, &result_buf, &net_data) == -1)
+		np = NULL;
+	else
+		np = &result_buf;
+  #else
+ 	/*
+ 	 * We don't have any getnetbyname_r(); either we have a
+ 	 * getnetbyname() that uses thread-specific data, in which
+ 	 * case we're thread-safe (sufficiently recent FreeBSD,
+ 	 * sufficiently recent Darwin-based OS, sufficiently recent
+ 	 * HP-UX, sufficiently recent Tru64 UNIX), or we have the
+ 	 * traditional getnetbyname() (everything else, including
+ 	 * current NetBSD and OpenBSD), in which case we're not
+ 	 * thread-safe.
+ 	 */
+	np = getnetbyname(name);
+  #endif
+	if (np != NULL)
+		return np->n_net;
+	else
+		return 0;
+#endif /* _WIN32 */
 }
 
 /*
  * Convert a port name to its port and protocol numbers.
  * We assume only TCP or UDP.
  * Return 0 upon failure.
  */
 int
 pcap_nametoport(const char *name, int *port, int *proto)
 {
-	struct servent *sp;
+	struct addrinfo hints, *res, *ai;
+	int error;
+	struct sockaddr_in *in4;
+#ifdef INET6
+	struct sockaddr_in6 *in6;
+#endif
 	int tcp_port = -1;
 	int udp_port = -1;
 
 	/*
+	 * We check for both TCP and UDP in case there are
+	 * ambiguous entries.
+	 */
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	error = getaddrinfo(NULL, name, &hints, &res);
+	if (error != 0) {
+		if (error != EAI_NONAME) {
+			/*
+			 * This is a real error, not just "there's
+			 * no such service name".
+			 * XXX - this doesn't return an error string.
+			 */
+			return 0;
+		}
+	} else {
+		/*
+		 * OK, we found it.  Did it find anything?
+		 */
+		for (ai = res; ai != NULL; ai = ai->ai_next) {
+			/*
+			 * Does it have an address?
+			 */
+			if (ai->ai_addr != NULL) {
+				/*
+				 * Yes.  Get a port number; we're done.
+				 */
+				if (ai->ai_addr->sa_family == AF_INET) {
+					in4 = (struct sockaddr_in *)ai->ai_addr;
+					tcp_port = ntohs(in4->sin_port);
+					break;
+				}
+#ifdef INET6
+				if (ai->ai_addr->sa_family == AF_INET6) {
+					in6 = (struct sockaddr_in6 *)ai->ai_addr;
+					tcp_port = ntohs(in6->sin6_port);
+					break;
+				}
+#endif
+			}
+		}
+		freeaddrinfo(res);
+	}
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_DGRAM;
+	hints.ai_protocol = IPPROTO_UDP;
+	error = getaddrinfo(NULL, name, &hints, &res);
+	if (error != 0) {
+		if (error != EAI_NONAME) {
+			/*
+			 * This is a real error, not just "there's
+			 * no such service name".
+			 * XXX - this doesn't return an error string.
+			 */
+			return 0;
+		}
+	} else {
+		/*
+		 * OK, we found it.  Did it find anything?
+		 */
+		for (ai = res; ai != NULL; ai = ai->ai_next) {
+			/*
+			 * Does it have an address?
+			 */
+			if (ai->ai_addr != NULL) {
+				/*
+				 * Yes.  Get a port number; we're done.
+				 */
+				if (ai->ai_addr->sa_family == AF_INET) {
+					in4 = (struct sockaddr_in *)ai->ai_addr;
+					udp_port = ntohs(in4->sin_port);
+					break;
+				}
+#ifdef INET6
+				if (ai->ai_addr->sa_family == AF_INET6) {
+					in6 = (struct sockaddr_in6 *)ai->ai_addr;
+					udp_port = ntohs(in6->sin6_port);
+					break;
+				}
+#endif
+			}
+		}
+		freeaddrinfo(res);
+	}
+
+	/*
 	 * We need to check /etc/services for ambiguous entries.
-	 * If we find the ambiguous entry, and it has the
+	 * If we find an ambiguous entry, and it has the
 	 * same port number, change the proto to PROTO_UNDEF
 	 * so both TCP and UDP will be checked.
 	 */
-	sp = getservbyname(name, "tcp");
-	if (sp != NULL) tcp_port = ntohs(sp->s_port);
-	sp = getservbyname(name, "udp");
-	if (sp != NULL) udp_port = ntohs(sp->s_port);
 	if (tcp_port >= 0) {
 		*port = tcp_port;
 		*proto = IPPROTO_TCP;
 		if (udp_port >= 0) {
 			if (udp_port == tcp_port)
 				*proto = PROTO_UNDEF;
 #ifdef notdef
 			else
 				/* Can't handle ambiguous names that refer
 				   to different port numbers. */
 				warning("ambiguous port %s in /etc/services",
 					name);
 #endif
 		}
 		return 1;
 	}
 	if (udp_port >= 0) {
 		*port = udp_port;
 		*proto = IPPROTO_UDP;
 		return 1;
 	}
 #if defined(ultrix) || defined(__osf__)
 	/* Special hack in case NFS isn't in /etc/services */
 	if (strcmp(name, "nfs") == 0) {
 		*port = 2049;
 		*proto = PROTO_UNDEF;
 		return 1;
 	}
 #endif
 	return 0;
 }
 
 /*
  * Convert a string in the form PPP-PPP, where correspond to ports, to
  * a starting and ending port in a port range.
  * Return 0 on failure.
  */
 int
 pcap_nametoportrange(const char *name, int *port1, int *port2, int *proto)
 {
 	u_int p1, p2;
 	char *off, *cpy;
 	int save_proto;
 
 	if (sscanf(name, "%d-%d", &p1, &p2) != 2) {
 		if ((cpy = strdup(name)) == NULL)
 			return 0;
 
 		if ((off = strchr(cpy, '-')) == NULL) {
 			free(cpy);
 			return 0;
 		}
 
 		*off = '\0';
 
 		if (pcap_nametoport(cpy, port1, proto) == 0) {
 			free(cpy);
 			return 0;
 		}
 		save_proto = *proto;
 
 		if (pcap_nametoport(off + 1, port2, proto) == 0) {
 			free(cpy);
 			return 0;
 		}
 		free(cpy);
 
 		if (*proto != save_proto)
 			*proto = PROTO_UNDEF;
 	} else {
 		*port1 = p1;
 		*port2 = p2;
 		*proto = PROTO_UNDEF;
 	}
 
 	return 1;
 }
 
+/*
+ * XXX - not guaranteed to be thread-safe!  See below for platforms
+ * on which it is thread-safe and on which it isn't.
+ */
 int
 pcap_nametoproto(const char *str)
 {
 	struct protoent *p;
+  #if defined(HAVE_LINUX_GETNETBYNAME_R)
+	/*
+	 * We have Linux's reentrant getprotobyname_r().
+	 */
+	struct protoent result_buf;
+	char buf[1024];	/* arbitrary size */
+	int err;
 
+	err = getprotobyname_r(str, &result_buf, buf, sizeof buf, &p);
+	if (err != 0) {
+		/*
+		 * XXX - dynamically allocate the buffer, and make it
+		 * bigger if we get ERANGE back?
+		 */
+		return 0;
+	}
+  #elif defined(HAVE_SOLARIS_IRIX_GETNETBYNAME_R)
+	/*
+	 * We have Solaris's and IRIX's reentrant getprotobyname_r().
+	 */
+	struct protoent result_buf;
+	char buf[1024];	/* arbitrary size */
+
+	p = getprotobyname_r(str, &result_buf, buf, (int)sizeof buf);
+  #elif defined(HAVE_AIX_GETNETBYNAME_R)
+	/*
+	 * We have AIX's reentrant getprotobyname_r().
+	 */
+	struct protoent result_buf;
+	struct protoent_data proto_data;
+
+	if (getprotobyname_r(str, &result_buf, &proto_data) == -1)
+		p = NULL;
+	else
+		p = &result_buf;
+  #else
+ 	/*
+ 	 * We don't have any getprotobyname_r(); either we have a
+ 	 * getprotobyname() that uses thread-specific data, in which
+ 	 * case we're thread-safe (sufficiently recent FreeBSD,
+ 	 * sufficiently recent Darwin-based OS, sufficiently recent
+ 	 * HP-UX, sufficiently recent Tru64 UNIX, Windows), or we have
+	 * the traditional getprotobyname() (everything else, including
+ 	 * current NetBSD and OpenBSD), in which case we're not
+ 	 * thread-safe.
+ 	 */
 	p = getprotobyname(str);
+  #endif
 	if (p != 0)
 		return p->p_proto;
 	else
 		return PROTO_UNDEF;
 }
 
 #include "ethertype.h"
 
 struct eproto {
 	const char *s;
 	u_short p;
 };
 
 /*
  * Static data base of ether protocol types.
  * tcpdump used to import this, and it's declared as an export on
  * Debian, at least, so make it a public symbol, even though we
  * don't officially export it by declaring it in a header file.
  * (Programs *should* do this themselves, as tcpdump now does.)
+ *
+ * We declare it here, right before defining it, to squelch any
+ * warnings we might get from compilers about the lack of a
+ * declaration.
  */
+PCAP_API struct eproto eproto_db[];
 PCAP_API_DEF struct eproto eproto_db[] = {
 	{ "pup", ETHERTYPE_PUP },
 	{ "xns", ETHERTYPE_NS },
 	{ "ip", ETHERTYPE_IP },
 #ifdef INET6
 	{ "ip6", ETHERTYPE_IPV6 },
 #endif
 	{ "arp", ETHERTYPE_ARP },
 	{ "rarp", ETHERTYPE_REVARP },
 	{ "sprite", ETHERTYPE_SPRITE },
 	{ "mopdl", ETHERTYPE_MOPDL },
 	{ "moprc", ETHERTYPE_MOPRC },
 	{ "decnet", ETHERTYPE_DN },
 	{ "lat", ETHERTYPE_LAT },
 	{ "sca", ETHERTYPE_SCA },
 	{ "lanbridge", ETHERTYPE_LANBRIDGE },
 	{ "vexp", ETHERTYPE_VEXP },
 	{ "vprod", ETHERTYPE_VPROD },
 	{ "atalk", ETHERTYPE_ATALK },
 	{ "atalkarp", ETHERTYPE_AARP },
 	{ "loopback", ETHERTYPE_LOOPBACK },
 	{ "decdts", ETHERTYPE_DECDTS },
 	{ "decdns", ETHERTYPE_DECDNS },
 	{ (char *)0, 0 }
 };
 
 int
 pcap_nametoeproto(const char *s)
 {
 	struct eproto *p = eproto_db;
 
 	while (p->s != 0) {
 		if (strcmp(p->s, s) == 0)
 			return p->p;
 		p += 1;
 	}
 	return PROTO_UNDEF;
 }
 
 #include "llc.h"
 
 /* Static data base of LLC values. */
 static struct eproto llc_db[] = {
 	{ "iso", LLCSAP_ISONS },
 	{ "stp", LLCSAP_8021D },
 	{ "ipx", LLCSAP_IPX },
 	{ "netbeui", LLCSAP_NETBEUI },
 	{ (char *)0, 0 }
 };
 
 int
 pcap_nametollc(const char *s)
 {
 	struct eproto *p = llc_db;
 
 	while (p->s != 0) {
 		if (strcmp(p->s, s) == 0)
 			return p->p;
 		p += 1;
 	}
 	return PROTO_UNDEF;
 }
 
-/* Hex digit to integer. */
-static inline int
-xdtoi(c)
-	register int c;
+/* Hex digit to 8-bit unsigned integer. */
+static inline u_char
+xdtoi(u_char c)
 {
 	if (isdigit(c))
-		return c - '0';
+		return (u_char)(c - '0');
 	else if (islower(c))
-		return c - 'a' + 10;
+		return (u_char)(c - 'a' + 10);
 	else
-		return c - 'A' + 10;
+		return (u_char)(c - 'A' + 10);
 }
 
 int
 __pcap_atoin(const char *s, bpf_u_int32 *addr)
 {
 	u_int n;
 	int len;
 
 	*addr = 0;
 	len = 0;
-	while (1) {
+	for (;;) {
 		n = 0;
 		while (*s && *s != '.')
 			n = n * 10 + *s++ - '0';
 		*addr <<= 8;
 		*addr |= n & 0xff;
 		len += 8;
 		if (*s == '\0')
 			return len;
 		++s;
 	}
 	/* NOTREACHED */
 }
 
 int
 __pcap_atodn(const char *s, bpf_u_int32 *addr)
 {
 #define AREASHIFT 10
 #define AREAMASK 0176000
 #define NODEMASK 01777
 
 	u_int node, area;
 
 	if (sscanf(s, "%d.%d", &area, &node) != 2)
 		return(0);
 
 	*addr = (area << AREASHIFT) & AREAMASK;
 	*addr |= (node & NODEMASK);
 
 	return(32);
 }
 
 /*
  * Convert 's', which can have the one of the forms:
  *
  *	"xx:xx:xx:xx:xx:xx"
  *	"xx.xx.xx.xx.xx.xx"
  *	"xx-xx-xx-xx-xx-xx"
  *	"xxxx.xxxx.xxxx"
  *	"xxxxxxxxxxxx"
  *
  * (or various mixes of ':', '.', and '-') into a new
  * ethernet address.  Assumes 's' is well formed.
  */
 u_char *
 pcap_ether_aton(const char *s)
 {
 	register u_char *ep, *e;
-	register u_int d;
+	register u_char d;
 
 	e = ep = (u_char *)malloc(6);
 	if (e == NULL)
 		return (NULL);
 
 	while (*s) {
 		if (*s == ':' || *s == '.' || *s == '-')
 			s += 1;
 		d = xdtoi(*s++);
 		if (isxdigit((unsigned char)*s)) {
 			d <<= 4;
 			d |= xdtoi(*s++);
 		}
 		*ep++ = d;
 	}
 
 	return (e);
 }
 
 #ifndef HAVE_ETHER_HOSTTON
-/* Roll our own */
+/*
+ * Roll our own.
+ * XXX - not thread-safe, because pcap_next_etherent() isn't thread-
+ * safe!  Needs a mutex or a thread-safe pcap_next_etherent().
+ */
 u_char *
 pcap_ether_hostton(const char *name)
 {
 	register struct pcap_etherent *ep;
 	register u_char *ap;
 	static FILE *fp = NULL;
 	static int init = 0;
 
 	if (!init) {
 		fp = fopen(PCAP_ETHERS_FILE, "r");
 		++init;
 		if (fp == NULL)
 			return (NULL);
 	} else if (fp == NULL)
 		return (NULL);
 	else
 		rewind(fp);
 
 	while ((ep = pcap_next_etherent(fp)) != NULL) {
 		if (strcmp(ep->name, name) == 0) {
 			ap = (u_char *)malloc(6);
 			if (ap != NULL) {
 				memcpy(ap, ep->addr, 6);
 				return (ap);
 			}
 			break;
 		}
 	}
 	return (NULL);
 }
 #else
-
-#if !defined(HAVE_DECL_ETHER_HOSTTON) || !HAVE_DECL_ETHER_HOSTTON
-#ifndef HAVE_STRUCT_ETHER_ADDR
-struct ether_addr {
-	unsigned char ether_addr_octet[6];
-};
-#endif
-extern int ether_hostton(const char *, struct ether_addr *);
-#endif
-
-/* Use the os supplied routines */
+/*
+ * Use the OS-supplied routine.
+ * This *should* be thread-safe; the API doesn't have a static buffer.
+ */
 u_char *
 pcap_ether_hostton(const char *name)
 {
 	register u_char *ap;
 	u_char a[6];
 
 	ap = NULL;
 	if (ether_hostton(name, (struct ether_addr *)a) == 0) {
 		ap = (u_char *)malloc(6);
 		if (ap != NULL)
 			memcpy((char *)ap, (char *)a, 6);
 	}
 	return (ap);
 }
 #endif
 
+/*
+ * XXX - not guaranteed to be thread-safe!
+ */
 int
+#ifdef	DECNETLIB
 __pcap_nametodnaddr(const char *name, u_short *res)
 {
-#ifdef	DECNETLIB
 	struct nodeent *getnodebyname();
 	struct nodeent *nep;
 
 	nep = getnodebyname(name);
 	if (nep == ((struct nodeent *)0))
 		return(0);
 
 	memcpy((char *)res, (char *)nep->n_addr, sizeof(unsigned short));
 	return(1);
 #else
+__pcap_nametodnaddr(const char *name _U_, u_short *res _U_)
+{
 	return(0);
 #endif
 }
Index: vendor/libpcap/dist/nomkdep
===================================================================
--- vendor/libpcap/dist/nomkdep	(nonexistent)
+++ vendor/libpcap/dist/nomkdep	(revision 333789)
@@ -0,0 +1,6 @@
+#!/bin/sh -
+#
+# Does nothing; used if we don't have a command-line flag to the compiler
+# to get it to generate dependencies.
+#
+exit 0
Index: vendor/libpcap/dist/optimize.c
===================================================================
--- vendor/libpcap/dist/optimize.c	(revision 333788)
+++ vendor/libpcap/dist/optimize.c	(revision 333789)
@@ -1,2384 +1,2498 @@
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
- *  Optimization module for tcpdump intermediate representation.
+ *  Optimization module for BPF code intermediate representation.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#endif /* _WIN32 */
+#include <pcap-types.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
 #include <string.h>
 
 #include <errno.h>
 
 #include "pcap-int.h"
 
 #include "gencode.h"
+#include "optimize.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #ifdef BDEBUG
-int pcap_optimizer_debug;
-#endif
+/*
+ * The internal "debug printout" flag for the filter expression optimizer.
+ * The code to print that stuff is present only if BDEBUG is defined, so
+ * the flag, and the routine to set it, are defined only if BDEBUG is
+ * defined.
+ */
+static int pcap_optimizer_debug;
 
-#if defined(MSDOS) && !defined(__DJGPP__)
-extern int _w32_ffs (int mask);
-#define ffs _w32_ffs
-#endif
+/*
+ * Routine to set that flag.
+ *
+ * This is intended for libpcap developers, not for general use.
+ * If you want to set these in a program, you'll have to declare this
+ * routine yourself, with the appropriate DLL import attribute on Windows;
+ * it's not declared in any header file, and won't be declared in any
+ * header file provided by libpcap.
+ */
+PCAP_API void pcap_set_optimizer_debug(int value);
 
+PCAP_API_DEF void
+pcap_set_optimizer_debug(int value)
+{
+	pcap_optimizer_debug = value;
+}
+
 /*
- * So is the check for _MSC_VER done because MinGW has this?
+ * The internal "print dot graph" flag for the filter expression optimizer.
+ * The code to print that stuff is present only if BDEBUG is defined, so
+ * the flag, and the routine to set it, are defined only if BDEBUG is
+ * defined.
  */
-#if defined(_WIN32) && defined (_MSC_VER)
+static int pcap_print_dot_graph;
+
 /*
- * ffs -- vax ffs instruction
+ * Routine to set that flag.
  *
- * XXX - with versions of VS that have it, use _BitScanForward()?
+ * This is intended for libpcap developers, not for general use.
+ * If you want to set these in a program, you'll have to declare this
+ * routine yourself, with the appropriate DLL import attribute on Windows;
+ * it's not declared in any header file, and won't be declared in any
+ * header file provided by libpcap.
  */
+PCAP_API void pcap_set_print_dot_graph(int value);
+
+PCAP_API_DEF void
+pcap_set_print_dot_graph(int value)
+{
+	pcap_print_dot_graph = value;
+}
+
+#endif
+
+/*
+ * lowest_set_bit().
+ *
+ * Takes a 32-bit integer as an argument.
+ *
+ * If handed a non-zero value, returns the index of the lowest set bit,
+ * counting upwards fro zero.
+ *
+ * If handed zero, the results are platform- and compiler-dependent.
+ * Keep it out of the light, don't give it any water, don't feed it
+ * after midnight, and don't pass zero to it.
+ *
+ * This is the same as the count of trailing zeroes in the word.
+ */
+#if PCAP_IS_AT_LEAST_GNUC_VERSION(3,4)
+  /*
+   * GCC 3.4 and later; we have __builtin_ctz().
+   */
+  #define lowest_set_bit(mask) __builtin_ctz(mask)
+#elif defined(_MSC_VER)
+  /*
+   * Visual Studio; we support only 2005 and later, so use
+   * _BitScanForward().
+   */
+#include <intrin.h>
+
+#ifndef __clang__
+#pragma intrinsic(_BitScanForward)
+#endif
+
+static __forceinline int
+lowest_set_bit(int mask)
+{
+	unsigned long bit;
+
+	/*
+	 * Don't sign-extend mask if long is longer than int.
+	 * (It's currently not, in MSVC, even on 64-bit platforms, but....)
+	 */
+	if (_BitScanForward(&bit, (unsigned int)mask) == 0)
+		return -1;	/* mask is zero */
+	return (int)bit;
+}
+#elif defined(MSDOS) && defined(__DJGPP__)
+  /*
+   * MS-DOS with DJGPP, which declares ffs() in <string.h>, which
+   * we've already included.
+   */
+  #define lowest_set_bit(mask)	(ffs((mask)) - 1)
+#elif (defined(MSDOS) && defined(__WATCOMC__)) || defined(STRINGS_H_DECLARES_FFS)
+  /*
+   * MS-DOS with Watcom C, which has <strings.h> and declares ffs() there,
+   * or some other platform (UN*X conforming to a sufficient recent version
+   * of the Single UNIX Specification).
+   */
+  #include <strings.h>
+  #define lowest_set_bit(mask)	(ffs((mask)) - 1)
+#else
+/*
+ * None of the above.
+ * Use a perfect-hash-function-based function.
+ */
 static int
-ffs(int mask)
+lowest_set_bit(int mask)
 {
-	int bit;
+	unsigned int v = (unsigned int)mask;
 
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask >>= 1;
-	return(bit);
+	static const int MultiplyDeBruijnBitPosition[32] = {
+		0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+		31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+	};
+
+	/*
+	 * We strip off all but the lowermost set bit (v & ~v),
+	 * and perform a minimal perfect hash on it to look up the
+	 * number of low-order zero bits in a table.
+	 *
+	 * See:
+	 *
+	 *	http://7ooo.mooo.com/text/ComputingTrailingZerosHOWTO.pdf
+	 *
+	 *	http://supertech.csail.mit.edu/papers/debruijn.pdf
+	 */
+	return (MultiplyDeBruijnBitPosition[((v & -v) * 0x077CB531U) >> 27]);
 }
 #endif
 
 /*
  * Represents a deleted instruction.
  */
 #define NOP -1
 
 /*
  * Register numbers for use-def values.
  * 0 through BPF_MEMWORDS-1 represent the corresponding scratch memory
  * location.  A_ATOM is the accumulator and X_ATOM is the index
  * register.
  */
 #define A_ATOM BPF_MEMWORDS
 #define X_ATOM (BPF_MEMWORDS+1)
 
 /*
  * This define is used to represent *both* the accumulator and
  * x register in use-def computations.
  * Currently, the use-def code assumes only one definition per instruction.
  */
 #define AX_ATOM N_ATOMS
 
 /*
  * These data structures are used in a Cocke and Shwarz style
  * value numbering scheme.  Since the flowgraph is acyclic,
  * exit values can be propagated from a node's predecessors
  * provided it is uniquely defined.
  */
 struct valnode {
 	int code;
 	int v0, v1;
 	int val;
 	struct valnode *next;
 };
 
 /* Integer constants mapped with the load immediate opcode. */
 #define K(i) F(opt_state, BPF_LD|BPF_IMM|BPF_W, i, 0L)
 
 struct vmapinfo {
 	int is_const;
 	bpf_int32 const_val;
 };
 
-struct _opt_state {
+typedef struct {
 	/*
 	 * A flag to indicate that further optimization is needed.
 	 * Iterative passes are continued until a given pass yields no
 	 * branch movement.
 	 */
 	int done;
 
 	int n_blocks;
 	struct block **blocks;
 	int n_edges;
 	struct edge **edges;
 
 	/*
 	 * A bit vector set representation of the dominators.
 	 * We round up the set size to the next power of two.
 	 */
 	int nodewords;
 	int edgewords;
 	struct block **levels;
 	bpf_u_int32 *space;
 
 #define BITS_PER_WORD (8*sizeof(bpf_u_int32))
 /*
  * True if a is in uset {p}
  */
 #define SET_MEMBER(p, a) \
 ((p)[(unsigned)(a) / BITS_PER_WORD] & (1 << ((unsigned)(a) % BITS_PER_WORD)))
 
 /*
  * Add 'a' to uset p.
  */
 #define SET_INSERT(p, a) \
 (p)[(unsigned)(a) / BITS_PER_WORD] |= (1 << ((unsigned)(a) % BITS_PER_WORD))
 
 /*
  * Delete 'a' from uset p.
  */
 #define SET_DELETE(p, a) \
 (p)[(unsigned)(a) / BITS_PER_WORD] &= ~(1 << ((unsigned)(a) % BITS_PER_WORD))
 
 /*
  * a := a intersect b
  */
 #define SET_INTERSECT(a, b, n)\
 {\
 	register bpf_u_int32 *_x = a, *_y = b;\
 	register int _n = n;\
 	while (--_n >= 0) *_x++ &= *_y++;\
 }
 
 /*
  * a := a - b
  */
 #define SET_SUBTRACT(a, b, n)\
 {\
 	register bpf_u_int32 *_x = a, *_y = b;\
 	register int _n = n;\
 	while (--_n >= 0) *_x++ &=~ *_y++;\
 }
 
 /*
  * a := a union b
  */
 #define SET_UNION(a, b, n)\
 {\
 	register bpf_u_int32 *_x = a, *_y = b;\
 	register int _n = n;\
 	while (--_n >= 0) *_x++ |= *_y++;\
 }
 
 	uset all_dom_sets;
 	uset all_closure_sets;
 	uset all_edge_sets;
 
 #define MODULUS 213
 	struct valnode *hashtbl[MODULUS];
 	int curval;
 	int maxval;
 
 	struct vmapinfo *vmap;
 	struct valnode *vnode_base;
 	struct valnode *next_vnode;
-};
+} opt_state_t;
 
 typedef struct {
 	/*
 	 * Some pointers used to convert the basic block form of the code,
 	 * into the array form that BPF requires.  'fstart' will point to
 	 * the malloc'd array while 'ftail' is used during the recursive
 	 * traversal.
 	 */
 	struct bpf_insn *fstart;
 	struct bpf_insn *ftail;
 } conv_state_t;
 
 static void opt_init(compiler_state_t *, opt_state_t *, struct icode *);
 static void opt_cleanup(opt_state_t *);
 
 static void intern_blocks(opt_state_t *, struct icode *);
 
 static void find_inedges(opt_state_t *, struct block *);
 #ifdef BDEBUG
 static void opt_dump(compiler_state_t *, struct icode *);
 #endif
 
 #ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
 static void
 find_levels_r(opt_state_t *opt_state, struct icode *ic, struct block *b)
 {
 	int level;
 
 	if (isMarked(ic, b))
 		return;
 
 	Mark(ic, b);
 	b->link = 0;
 
 	if (JT(b)) {
 		find_levels_r(opt_state, ic, JT(b));
 		find_levels_r(opt_state, ic, JF(b));
 		level = MAX(JT(b)->level, JF(b)->level) + 1;
 	} else
 		level = 0;
 	b->level = level;
 	b->link = opt_state->levels[level];
 	opt_state->levels[level] = b;
 }
 
 /*
  * Level graph.  The levels go from 0 at the leaves to
  * N_LEVELS at the root.  The opt_state->levels[] array points to the
  * first node of the level list, whose elements are linked
  * with the 'link' field of the struct block.
  */
 static void
 find_levels(opt_state_t *opt_state, struct icode *ic)
 {
 	memset((char *)opt_state->levels, 0, opt_state->n_blocks * sizeof(*opt_state->levels));
 	unMarkAll(ic);
 	find_levels_r(opt_state, ic, ic->root);
 }
 
 /*
  * Find dominator relationships.
  * Assumes graph has been leveled.
  */
 static void
 find_dom(opt_state_t *opt_state, struct block *root)
 {
 	int i;
 	struct block *b;
 	bpf_u_int32 *x;
 
 	/*
 	 * Initialize sets to contain all nodes.
 	 */
 	x = opt_state->all_dom_sets;
 	i = opt_state->n_blocks * opt_state->nodewords;
 	while (--i >= 0)
-		*x++ = ~0;
+		*x++ = 0xFFFFFFFFU;
 	/* Root starts off empty. */
 	for (i = opt_state->nodewords; --i >= 0;)
 		root->dom[i] = 0;
 
 	/* root->level is the highest level no found. */
 	for (i = root->level; i >= 0; --i) {
 		for (b = opt_state->levels[i]; b; b = b->link) {
 			SET_INSERT(b->dom, b->id);
 			if (JT(b) == 0)
 				continue;
 			SET_INTERSECT(JT(b)->dom, b->dom, opt_state->nodewords);
 			SET_INTERSECT(JF(b)->dom, b->dom, opt_state->nodewords);
 		}
 	}
 }
 
 static void
 propedom(opt_state_t *opt_state, struct edge *ep)
 {
 	SET_INSERT(ep->edom, ep->id);
 	if (ep->succ) {
 		SET_INTERSECT(ep->succ->et.edom, ep->edom, opt_state->edgewords);
 		SET_INTERSECT(ep->succ->ef.edom, ep->edom, opt_state->edgewords);
 	}
 }
 
 /*
  * Compute edge dominators.
  * Assumes graph has been leveled and predecessors established.
  */
 static void
 find_edom(opt_state_t *opt_state, struct block *root)
 {
 	int i;
 	uset x;
 	struct block *b;
 
 	x = opt_state->all_edge_sets;
 	for (i = opt_state->n_edges * opt_state->edgewords; --i >= 0; )
-		x[i] = ~0;
+		x[i] = 0xFFFFFFFFU;
 
 	/* root->level is the highest level no found. */
 	memset(root->et.edom, 0, opt_state->edgewords * sizeof(*(uset)0));
 	memset(root->ef.edom, 0, opt_state->edgewords * sizeof(*(uset)0));
 	for (i = root->level; i >= 0; --i) {
 		for (b = opt_state->levels[i]; b != 0; b = b->link) {
 			propedom(opt_state, &b->et);
 			propedom(opt_state, &b->ef);
 		}
 	}
 }
 
 /*
  * Find the backwards transitive closure of the flow graph.  These sets
  * are backwards in the sense that we find the set of nodes that reach
  * a given node, not the set of nodes that can be reached by a node.
  *
  * Assumes graph has been leveled.
  */
 static void
 find_closure(opt_state_t *opt_state, struct block *root)
 {
 	int i;
 	struct block *b;
 
 	/*
 	 * Initialize sets to contain no nodes.
 	 */
 	memset((char *)opt_state->all_closure_sets, 0,
 	      opt_state->n_blocks * opt_state->nodewords * sizeof(*opt_state->all_closure_sets));
 
 	/* root->level is the highest level no found. */
 	for (i = root->level; i >= 0; --i) {
 		for (b = opt_state->levels[i]; b; b = b->link) {
 			SET_INSERT(b->closure, b->id);
 			if (JT(b) == 0)
 				continue;
 			SET_UNION(JT(b)->closure, b->closure, opt_state->nodewords);
 			SET_UNION(JF(b)->closure, b->closure, opt_state->nodewords);
 		}
 	}
 }
 
 /*
  * Return the register number that is used by s.  If A and X are both
  * used, return AX_ATOM.  If no register is used, return -1.
  *
  * The implementation should probably change to an array access.
  */
 static int
 atomuse(struct stmt *s)
 {
 	register int c = s->code;
 
 	if (c == NOP)
 		return -1;
 
 	switch (BPF_CLASS(c)) {
 
 	case BPF_RET:
 		return (BPF_RVAL(c) == BPF_A) ? A_ATOM :
 			(BPF_RVAL(c) == BPF_X) ? X_ATOM : -1;
 
 	case BPF_LD:
 	case BPF_LDX:
 		return (BPF_MODE(c) == BPF_IND) ? X_ATOM :
 			(BPF_MODE(c) == BPF_MEM) ? s->k : -1;
 
 	case BPF_ST:
 		return A_ATOM;
 
 	case BPF_STX:
 		return X_ATOM;
 
 	case BPF_JMP:
 	case BPF_ALU:
 		if (BPF_SRC(c) == BPF_X)
 			return AX_ATOM;
 		return A_ATOM;
 
 	case BPF_MISC:
 		return BPF_MISCOP(c) == BPF_TXA ? X_ATOM : A_ATOM;
 	}
 	abort();
 	/* NOTREACHED */
 }
 
 /*
  * Return the register number that is defined by 's'.  We assume that
  * a single stmt cannot define more than one register.  If no register
  * is defined, return -1.
  *
  * The implementation should probably change to an array access.
  */
 static int
 atomdef(struct stmt *s)
 {
 	if (s->code == NOP)
 		return -1;
 
 	switch (BPF_CLASS(s->code)) {
 
 	case BPF_LD:
 	case BPF_ALU:
 		return A_ATOM;
 
 	case BPF_LDX:
 		return X_ATOM;
 
 	case BPF_ST:
 	case BPF_STX:
 		return s->k;
 
 	case BPF_MISC:
 		return BPF_MISCOP(s->code) == BPF_TAX ? X_ATOM : A_ATOM;
 	}
 	return -1;
 }
 
 /*
  * Compute the sets of registers used, defined, and killed by 'b'.
  *
  * "Used" means that a statement in 'b' uses the register before any
  * statement in 'b' defines it, i.e. it uses the value left in
  * that register by a predecessor block of this block.
  * "Defined" means that a statement in 'b' defines it.
  * "Killed" means that a statement in 'b' defines it before any
  * statement in 'b' uses it, i.e. it kills the value left in that
  * register by a predecessor block of this block.
  */
 static void
 compute_local_ud(struct block *b)
 {
 	struct slist *s;
 	atomset def = 0, use = 0, killed = 0;
 	int atom;
 
 	for (s = b->stmts; s; s = s->next) {
 		if (s->s.code == NOP)
 			continue;
 		atom = atomuse(&s->s);
 		if (atom >= 0) {
 			if (atom == AX_ATOM) {
 				if (!ATOMELEM(def, X_ATOM))
 					use |= ATOMMASK(X_ATOM);
 				if (!ATOMELEM(def, A_ATOM))
 					use |= ATOMMASK(A_ATOM);
 			}
 			else if (atom < N_ATOMS) {
 				if (!ATOMELEM(def, atom))
 					use |= ATOMMASK(atom);
 			}
 			else
 				abort();
 		}
 		atom = atomdef(&s->s);
 		if (atom >= 0) {
 			if (!ATOMELEM(use, atom))
 				killed |= ATOMMASK(atom);
 			def |= ATOMMASK(atom);
 		}
 	}
 	if (BPF_CLASS(b->s.code) == BPF_JMP) {
 		/*
 		 * XXX - what about RET?
 		 */
 		atom = atomuse(&b->s);
 		if (atom >= 0) {
 			if (atom == AX_ATOM) {
 				if (!ATOMELEM(def, X_ATOM))
 					use |= ATOMMASK(X_ATOM);
 				if (!ATOMELEM(def, A_ATOM))
 					use |= ATOMMASK(A_ATOM);
 			}
 			else if (atom < N_ATOMS) {
 				if (!ATOMELEM(def, atom))
 					use |= ATOMMASK(atom);
 			}
 			else
 				abort();
 		}
 	}
 
 	b->def = def;
 	b->kill = killed;
 	b->in_use = use;
 }
 
 /*
  * Assume graph is already leveled.
  */
 static void
 find_ud(opt_state_t *opt_state, struct block *root)
 {
 	int i, maxlevel;
 	struct block *p;
 
 	/*
 	 * root->level is the highest level no found;
 	 * count down from there.
 	 */
 	maxlevel = root->level;
 	for (i = maxlevel; i >= 0; --i)
 		for (p = opt_state->levels[i]; p; p = p->link) {
 			compute_local_ud(p);
 			p->out_use = 0;
 		}
 
 	for (i = 1; i <= maxlevel; ++i) {
 		for (p = opt_state->levels[i]; p; p = p->link) {
 			p->out_use |= JT(p)->in_use | JF(p)->in_use;
 			p->in_use |= p->out_use &~ p->kill;
 		}
 	}
 }
 static void
 init_val(opt_state_t *opt_state)
 {
 	opt_state->curval = 0;
 	opt_state->next_vnode = opt_state->vnode_base;
 	memset((char *)opt_state->vmap, 0, opt_state->maxval * sizeof(*opt_state->vmap));
 	memset((char *)opt_state->hashtbl, 0, sizeof opt_state->hashtbl);
 }
 
 /* Because we really don't have an IR, this stuff is a little messy. */
 static int
 F(opt_state_t *opt_state, int code, int v0, int v1)
 {
 	u_int hash;
 	int val;
 	struct valnode *p;
 
 	hash = (u_int)code ^ (v0 << 4) ^ (v1 << 8);
 	hash %= MODULUS;
 
 	for (p = opt_state->hashtbl[hash]; p; p = p->next)
 		if (p->code == code && p->v0 == v0 && p->v1 == v1)
 			return p->val;
 
 	val = ++opt_state->curval;
 	if (BPF_MODE(code) == BPF_IMM &&
 	    (BPF_CLASS(code) == BPF_LD || BPF_CLASS(code) == BPF_LDX)) {
 		opt_state->vmap[val].const_val = v0;
 		opt_state->vmap[val].is_const = 1;
 	}
 	p = opt_state->next_vnode++;
 	p->val = val;
 	p->code = code;
 	p->v0 = v0;
 	p->v1 = v1;
 	p->next = opt_state->hashtbl[hash];
 	opt_state->hashtbl[hash] = p;
 
 	return val;
 }
 
 static inline void
 vstore(struct stmt *s, int *valp, int newval, int alter)
 {
-	if (alter && *valp == newval)
+	if (alter && newval != VAL_UNKNOWN && *valp == newval)
 		s->code = NOP;
 	else
 		*valp = newval;
 }
 
 /*
  * Do constant-folding on binary operators.
  * (Unary operators are handled elsewhere.)
  */
 static void
-fold_op(compiler_state_t *cstate, struct icode *ic, opt_state_t *opt_state,
+fold_op(compiler_state_t *cstate, opt_state_t *opt_state,
     struct stmt *s, int v0, int v1)
 {
 	bpf_u_int32 a, b;
 
 	a = opt_state->vmap[v0].const_val;
 	b = opt_state->vmap[v1].const_val;
 
 	switch (BPF_OP(s->code)) {
 	case BPF_ADD:
 		a += b;
 		break;
 
 	case BPF_SUB:
 		a -= b;
 		break;
 
 	case BPF_MUL:
 		a *= b;
 		break;
 
 	case BPF_DIV:
 		if (b == 0)
 			bpf_error(cstate, "division by zero");
 		a /= b;
 		break;
 
 	case BPF_MOD:
 		if (b == 0)
 			bpf_error(cstate, "modulus by zero");
 		a %= b;
 		break;
 
 	case BPF_AND:
 		a &= b;
 		break;
 
 	case BPF_OR:
 		a |= b;
 		break;
 
 	case BPF_XOR:
 		a ^= b;
 		break;
 
 	case BPF_LSH:
 		a <<= b;
 		break;
 
 	case BPF_RSH:
 		a >>= b;
 		break;
 
 	default:
 		abort();
 	}
 	s->k = a;
 	s->code = BPF_LD|BPF_IMM;
 	opt_state->done = 0;
 }
 
 static inline struct slist *
 this_op(struct slist *s)
 {
 	while (s != 0 && s->s.code == NOP)
 		s = s->next;
 	return s;
 }
 
 static void
 opt_not(struct block *b)
 {
 	struct block *tmp = JT(b);
 
 	JT(b) = JF(b);
 	JF(b) = tmp;
 }
 
 static void
 opt_peep(opt_state_t *opt_state, struct block *b)
 {
 	struct slist *s;
 	struct slist *next, *last;
 	int val;
 
 	s = b->stmts;
 	if (s == 0)
 		return;
 
 	last = s;
 	for (/*empty*/; /*empty*/; s = next) {
 		/*
 		 * Skip over nops.
 		 */
 		s = this_op(s);
 		if (s == 0)
 			break;	/* nothing left in the block */
 
 		/*
 		 * Find the next real instruction after that one
 		 * (skipping nops).
 		 */
 		next = this_op(s->next);
 		if (next == 0)
 			break;	/* no next instruction */
 		last = next;
 
 		/*
 		 * st  M[k]	-->	st  M[k]
 		 * ldx M[k]		tax
 		 */
 		if (s->s.code == BPF_ST &&
 		    next->s.code == (BPF_LDX|BPF_MEM) &&
 		    s->s.k == next->s.k) {
 			opt_state->done = 0;
 			next->s.code = BPF_MISC|BPF_TAX;
 		}
 		/*
 		 * ld  #k	-->	ldx  #k
 		 * tax			txa
 		 */
 		if (s->s.code == (BPF_LD|BPF_IMM) &&
 		    next->s.code == (BPF_MISC|BPF_TAX)) {
 			s->s.code = BPF_LDX|BPF_IMM;
 			next->s.code = BPF_MISC|BPF_TXA;
 			opt_state->done = 0;
 		}
 		/*
 		 * This is an ugly special case, but it happens
 		 * when you say tcp[k] or udp[k] where k is a constant.
 		 */
 		if (s->s.code == (BPF_LD|BPF_IMM)) {
 			struct slist *add, *tax, *ild;
 
 			/*
 			 * Check that X isn't used on exit from this
 			 * block (which the optimizer might cause).
 			 * We know the code generator won't generate
 			 * any local dependencies.
 			 */
 			if (ATOMELEM(b->out_use, X_ATOM))
 				continue;
 
 			/*
 			 * Check that the instruction following the ldi
 			 * is an addx, or it's an ldxms with an addx
 			 * following it (with 0 or more nops between the
 			 * ldxms and addx).
 			 */
 			if (next->s.code != (BPF_LDX|BPF_MSH|BPF_B))
 				add = next;
 			else
 				add = this_op(next->next);
 			if (add == 0 || add->s.code != (BPF_ALU|BPF_ADD|BPF_X))
 				continue;
 
 			/*
 			 * Check that a tax follows that (with 0 or more
 			 * nops between them).
 			 */
 			tax = this_op(add->next);
 			if (tax == 0 || tax->s.code != (BPF_MISC|BPF_TAX))
 				continue;
 
 			/*
 			 * Check that an ild follows that (with 0 or more
 			 * nops between them).
 			 */
 			ild = this_op(tax->next);
 			if (ild == 0 || BPF_CLASS(ild->s.code) != BPF_LD ||
 			    BPF_MODE(ild->s.code) != BPF_IND)
 				continue;
 			/*
 			 * We want to turn this sequence:
 			 *
 			 * (004) ldi     #0x2		{s}
 			 * (005) ldxms   [14]		{next}  -- optional
 			 * (006) addx			{add}
 			 * (007) tax			{tax}
 			 * (008) ild     [x+0]		{ild}
 			 *
 			 * into this sequence:
 			 *
 			 * (004) nop
 			 * (005) ldxms   [14]
 			 * (006) nop
 			 * (007) nop
 			 * (008) ild     [x+2]
 			 *
 			 * XXX We need to check that X is not
 			 * subsequently used, because we want to change
 			 * what'll be in it after this sequence.
 			 *
 			 * We know we can eliminate the accumulator
 			 * modifications earlier in the sequence since
 			 * it is defined by the last stmt of this sequence
 			 * (i.e., the last statement of the sequence loads
 			 * a value into the accumulator, so we can eliminate
 			 * earlier operations on the accumulator).
 			 */
 			ild->s.k += s->s.k;
 			s->s.code = NOP;
 			add->s.code = NOP;
 			tax->s.code = NOP;
 			opt_state->done = 0;
 		}
 	}
 	/*
 	 * If the comparison at the end of a block is an equality
 	 * comparison against a constant, and nobody uses the value
 	 * we leave in the A register at the end of a block, and
 	 * the operation preceding the comparison is an arithmetic
 	 * operation, we can sometime optimize it away.
 	 */
 	if (b->s.code == (BPF_JMP|BPF_JEQ|BPF_K) &&
 	    !ATOMELEM(b->out_use, A_ATOM)) {
 	    	/*
 	    	 * We can optimize away certain subtractions of the
 	    	 * X register.
 	    	 */
 		if (last->s.code == (BPF_ALU|BPF_SUB|BPF_X)) {
 			val = b->val[X_ATOM];
 			if (opt_state->vmap[val].is_const) {
 				/*
 				 * If we have a subtract to do a comparison,
 				 * and the X register is a known constant,
 				 * we can merge this value into the
 				 * comparison:
 				 *
 				 * sub x  ->	nop
 				 * jeq #y	jeq #(x+y)
 				 */
 				b->s.k += opt_state->vmap[val].const_val;
 				last->s.code = NOP;
 				opt_state->done = 0;
 			} else if (b->s.k == 0) {
 				/*
 				 * If the X register isn't a constant,
 				 * and the comparison in the test is
 				 * against 0, we can compare with the
 				 * X register, instead:
 				 *
 				 * sub x  ->	nop
 				 * jeq #0	jeq x
 				 */
 				last->s.code = NOP;
 				b->s.code = BPF_JMP|BPF_JEQ|BPF_X;
 				opt_state->done = 0;
 			}
 		}
 		/*
 		 * Likewise, a constant subtract can be simplified:
 		 *
 		 * sub #x ->	nop
 		 * jeq #y ->	jeq #(x+y)
 		 */
 		else if (last->s.code == (BPF_ALU|BPF_SUB|BPF_K)) {
 			last->s.code = NOP;
 			b->s.k += last->s.k;
 			opt_state->done = 0;
 		}
 		/*
 		 * And, similarly, a constant AND can be simplified
 		 * if we're testing against 0, i.e.:
 		 *
 		 * and #k	nop
 		 * jeq #0  ->	jset #k
 		 */
 		else if (last->s.code == (BPF_ALU|BPF_AND|BPF_K) &&
 		    b->s.k == 0) {
 			b->s.k = last->s.k;
 			b->s.code = BPF_JMP|BPF_K|BPF_JSET;
 			last->s.code = NOP;
 			opt_state->done = 0;
 			opt_not(b);
 		}
 	}
 	/*
 	 * jset #0        ->   never
 	 * jset #ffffffff ->   always
 	 */
 	if (b->s.code == (BPF_JMP|BPF_K|BPF_JSET)) {
 		if (b->s.k == 0)
 			JT(b) = JF(b);
 		if ((u_int)b->s.k == 0xffffffffU)
 			JF(b) = JT(b);
 	}
 	/*
 	 * If we're comparing against the index register, and the index
 	 * register is a known constant, we can just compare against that
 	 * constant.
 	 */
 	val = b->val[X_ATOM];
 	if (opt_state->vmap[val].is_const && BPF_SRC(b->s.code) == BPF_X) {
 		bpf_int32 v = opt_state->vmap[val].const_val;
 		b->s.code &= ~BPF_X;
 		b->s.k = v;
 	}
 	/*
 	 * If the accumulator is a known constant, we can compute the
 	 * comparison result.
 	 */
 	val = b->val[A_ATOM];
 	if (opt_state->vmap[val].is_const && BPF_SRC(b->s.code) == BPF_K) {
 		bpf_int32 v = opt_state->vmap[val].const_val;
 		switch (BPF_OP(b->s.code)) {
 
 		case BPF_JEQ:
 			v = v == b->s.k;
 			break;
 
 		case BPF_JGT:
 			v = (unsigned)v > (unsigned)b->s.k;
 			break;
 
 		case BPF_JGE:
 			v = (unsigned)v >= (unsigned)b->s.k;
 			break;
 
 		case BPF_JSET:
 			v &= b->s.k;
 			break;
 
 		default:
 			abort();
 		}
 		if (JF(b) != JT(b))
 			opt_state->done = 0;
 		if (v)
 			JF(b) = JT(b);
 		else
 			JT(b) = JF(b);
 	}
 }
 
 /*
  * Compute the symbolic value of expression of 's', and update
  * anything it defines in the value table 'val'.  If 'alter' is true,
  * do various optimizations.  This code would be cleaner if symbolic
  * evaluation and code transformations weren't folded together.
  */
 static void
-opt_stmt(compiler_state_t *cstate, struct icode *ic, opt_state_t *opt_state,
+opt_stmt(compiler_state_t *cstate, opt_state_t *opt_state,
     struct stmt *s, int val[], int alter)
 {
 	int op;
 	int v;
 
 	switch (s->code) {
 
 	case BPF_LD|BPF_ABS|BPF_W:
 	case BPF_LD|BPF_ABS|BPF_H:
 	case BPF_LD|BPF_ABS|BPF_B:
 		v = F(opt_state, s->code, s->k, 0L);
 		vstore(s, &val[A_ATOM], v, alter);
 		break;
 
 	case BPF_LD|BPF_IND|BPF_W:
 	case BPF_LD|BPF_IND|BPF_H:
 	case BPF_LD|BPF_IND|BPF_B:
 		v = val[X_ATOM];
 		if (alter && opt_state->vmap[v].is_const) {
 			s->code = BPF_LD|BPF_ABS|BPF_SIZE(s->code);
 			s->k += opt_state->vmap[v].const_val;
 			v = F(opt_state, s->code, s->k, 0L);
 			opt_state->done = 0;
 		}
 		else
 			v = F(opt_state, s->code, s->k, v);
 		vstore(s, &val[A_ATOM], v, alter);
 		break;
 
 	case BPF_LD|BPF_LEN:
 		v = F(opt_state, s->code, 0L, 0L);
 		vstore(s, &val[A_ATOM], v, alter);
 		break;
 
 	case BPF_LD|BPF_IMM:
 		v = K(s->k);
 		vstore(s, &val[A_ATOM], v, alter);
 		break;
 
 	case BPF_LDX|BPF_IMM:
 		v = K(s->k);
 		vstore(s, &val[X_ATOM], v, alter);
 		break;
 
 	case BPF_LDX|BPF_MSH|BPF_B:
 		v = F(opt_state, s->code, s->k, 0L);
 		vstore(s, &val[X_ATOM], v, alter);
 		break;
 
 	case BPF_ALU|BPF_NEG:
 		if (alter && opt_state->vmap[val[A_ATOM]].is_const) {
 			s->code = BPF_LD|BPF_IMM;
 			s->k = -opt_state->vmap[val[A_ATOM]].const_val;
 			val[A_ATOM] = K(s->k);
 		}
 		else
 			val[A_ATOM] = F(opt_state, s->code, val[A_ATOM], 0L);
 		break;
 
 	case BPF_ALU|BPF_ADD|BPF_K:
 	case BPF_ALU|BPF_SUB|BPF_K:
 	case BPF_ALU|BPF_MUL|BPF_K:
 	case BPF_ALU|BPF_DIV|BPF_K:
 	case BPF_ALU|BPF_MOD|BPF_K:
 	case BPF_ALU|BPF_AND|BPF_K:
 	case BPF_ALU|BPF_OR|BPF_K:
 	case BPF_ALU|BPF_XOR|BPF_K:
 	case BPF_ALU|BPF_LSH|BPF_K:
 	case BPF_ALU|BPF_RSH|BPF_K:
 		op = BPF_OP(s->code);
 		if (alter) {
 			if (s->k == 0) {
 				/* don't optimize away "sub #0"
 				 * as it may be needed later to
 				 * fixup the generated math code */
 				if (op == BPF_ADD ||
 				    op == BPF_LSH || op == BPF_RSH ||
 				    op == BPF_OR || op == BPF_XOR) {
 					s->code = NOP;
 					break;
 				}
 				if (op == BPF_MUL || op == BPF_AND) {
 					s->code = BPF_LD|BPF_IMM;
 					val[A_ATOM] = K(s->k);
 					break;
 				}
 			}
 			if (opt_state->vmap[val[A_ATOM]].is_const) {
-				fold_op(cstate, ic, opt_state, s, val[A_ATOM], K(s->k));
+				fold_op(cstate, opt_state, s, val[A_ATOM], K(s->k));
 				val[A_ATOM] = K(s->k);
 				break;
 			}
 		}
 		val[A_ATOM] = F(opt_state, s->code, val[A_ATOM], K(s->k));
 		break;
 
 	case BPF_ALU|BPF_ADD|BPF_X:
 	case BPF_ALU|BPF_SUB|BPF_X:
 	case BPF_ALU|BPF_MUL|BPF_X:
 	case BPF_ALU|BPF_DIV|BPF_X:
 	case BPF_ALU|BPF_MOD|BPF_X:
 	case BPF_ALU|BPF_AND|BPF_X:
 	case BPF_ALU|BPF_OR|BPF_X:
 	case BPF_ALU|BPF_XOR|BPF_X:
 	case BPF_ALU|BPF_LSH|BPF_X:
 	case BPF_ALU|BPF_RSH|BPF_X:
 		op = BPF_OP(s->code);
 		if (alter && opt_state->vmap[val[X_ATOM]].is_const) {
 			if (opt_state->vmap[val[A_ATOM]].is_const) {
-				fold_op(cstate, ic, opt_state, s, val[A_ATOM], val[X_ATOM]);
+				fold_op(cstate, opt_state, s, val[A_ATOM], val[X_ATOM]);
 				val[A_ATOM] = K(s->k);
 			}
 			else {
 				s->code = BPF_ALU|BPF_K|op;
 				s->k = opt_state->vmap[val[X_ATOM]].const_val;
 				opt_state->done = 0;
 				val[A_ATOM] =
 					F(opt_state, s->code, val[A_ATOM], K(s->k));
 			}
 			break;
 		}
 		/*
 		 * Check if we're doing something to an accumulator
 		 * that is 0, and simplify.  This may not seem like
 		 * much of a simplification but it could open up further
 		 * optimizations.
 		 * XXX We could also check for mul by 1, etc.
 		 */
 		if (alter && opt_state->vmap[val[A_ATOM]].is_const
 		    && opt_state->vmap[val[A_ATOM]].const_val == 0) {
 			if (op == BPF_ADD || op == BPF_OR || op == BPF_XOR) {
 				s->code = BPF_MISC|BPF_TXA;
 				vstore(s, &val[A_ATOM], val[X_ATOM], alter);
 				break;
 			}
 			else if (op == BPF_MUL || op == BPF_DIV || op == BPF_MOD ||
 				 op == BPF_AND || op == BPF_LSH || op == BPF_RSH) {
 				s->code = BPF_LD|BPF_IMM;
 				s->k = 0;
 				vstore(s, &val[A_ATOM], K(s->k), alter);
 				break;
 			}
 			else if (op == BPF_NEG) {
 				s->code = NOP;
 				break;
 			}
 		}
 		val[A_ATOM] = F(opt_state, s->code, val[A_ATOM], val[X_ATOM]);
 		break;
 
 	case BPF_MISC|BPF_TXA:
 		vstore(s, &val[A_ATOM], val[X_ATOM], alter);
 		break;
 
 	case BPF_LD|BPF_MEM:
 		v = val[s->k];
 		if (alter && opt_state->vmap[v].is_const) {
 			s->code = BPF_LD|BPF_IMM;
 			s->k = opt_state->vmap[v].const_val;
 			opt_state->done = 0;
 		}
 		vstore(s, &val[A_ATOM], v, alter);
 		break;
 
 	case BPF_MISC|BPF_TAX:
 		vstore(s, &val[X_ATOM], val[A_ATOM], alter);
 		break;
 
 	case BPF_LDX|BPF_MEM:
 		v = val[s->k];
 		if (alter && opt_state->vmap[v].is_const) {
 			s->code = BPF_LDX|BPF_IMM;
 			s->k = opt_state->vmap[v].const_val;
 			opt_state->done = 0;
 		}
 		vstore(s, &val[X_ATOM], v, alter);
 		break;
 
 	case BPF_ST:
 		vstore(s, &val[s->k], val[A_ATOM], alter);
 		break;
 
 	case BPF_STX:
 		vstore(s, &val[s->k], val[X_ATOM], alter);
 		break;
 	}
 }
 
 static void
 deadstmt(opt_state_t *opt_state, register struct stmt *s, register struct stmt *last[])
 {
 	register int atom;
 
 	atom = atomuse(s);
 	if (atom >= 0) {
 		if (atom == AX_ATOM) {
 			last[X_ATOM] = 0;
 			last[A_ATOM] = 0;
 		}
 		else
 			last[atom] = 0;
 	}
 	atom = atomdef(s);
 	if (atom >= 0) {
 		if (last[atom]) {
 			opt_state->done = 0;
 			last[atom]->code = NOP;
 		}
 		last[atom] = s;
 	}
 }
 
 static void
 opt_deadstores(opt_state_t *opt_state, register struct block *b)
 {
 	register struct slist *s;
 	register int atom;
 	struct stmt *last[N_ATOMS];
 
 	memset((char *)last, 0, sizeof last);
 
 	for (s = b->stmts; s != 0; s = s->next)
 		deadstmt(opt_state, &s->s, last);
 	deadstmt(opt_state, &b->s, last);
 
 	for (atom = 0; atom < N_ATOMS; ++atom)
 		if (last[atom] && !ATOMELEM(b->out_use, atom)) {
 			last[atom]->code = NOP;
 			opt_state->done = 0;
 		}
 }
 
 static void
-opt_blk(compiler_state_t *cstate, struct icode *ic, opt_state_t *opt_state,
+opt_blk(compiler_state_t *cstate, opt_state_t *opt_state,
     struct block *b, int do_stmts)
 {
 	struct slist *s;
 	struct edge *p;
 	int i;
 	bpf_int32 aval, xval;
 
 #if 0
 	for (s = b->stmts; s && s->next; s = s->next)
 		if (BPF_CLASS(s->s.code) == BPF_JMP) {
 			do_stmts = 0;
 			break;
 		}
 #endif
 
 	/*
 	 * Initialize the atom values.
 	 */
 	p = b->in_edges;
 	if (p == 0) {
 		/*
 		 * We have no predecessors, so everything is undefined
 		 * upon entry to this block.
 		 */
 		memset((char *)b->val, 0, sizeof(b->val));
 	} else {
 		/*
 		 * Inherit values from our predecessors.
 		 *
 		 * First, get the values from the predecessor along the
 		 * first edge leading to this node.
 		 */
 		memcpy((char *)b->val, (char *)p->pred->val, sizeof(b->val));
 		/*
 		 * Now look at all the other nodes leading to this node.
 		 * If, for the predecessor along that edge, a register
 		 * has a different value from the one we have (i.e.,
 		 * control paths are merging, and the merging paths
 		 * assign different values to that register), give the
 		 * register the undefined value of 0.
 		 */
 		while ((p = p->next) != NULL) {
 			for (i = 0; i < N_ATOMS; ++i)
 				if (b->val[i] != p->pred->val[i])
 					b->val[i] = 0;
 		}
 	}
 	aval = b->val[A_ATOM];
 	xval = b->val[X_ATOM];
 	for (s = b->stmts; s; s = s->next)
-		opt_stmt(cstate, ic, opt_state, &s->s, b->val, do_stmts);
+		opt_stmt(cstate, opt_state, &s->s, b->val, do_stmts);
 
 	/*
 	 * This is a special case: if we don't use anything from this
 	 * block, and we load the accumulator or index register with a
 	 * value that is already there, or if this block is a return,
 	 * eliminate all the statements.
 	 *
 	 * XXX - what if it does a store?
 	 *
 	 * XXX - why does it matter whether we use anything from this
 	 * block?  If the accumulator or index register doesn't change
 	 * its value, isn't that OK even if we use that value?
 	 *
 	 * XXX - if we load the accumulator with a different value,
 	 * and the block ends with a conditional branch, we obviously
 	 * can't eliminate it, as the branch depends on that value.
 	 * For the index register, the conditional branch only depends
 	 * on the index register value if the test is against the index
 	 * register value rather than a constant; if nothing uses the
 	 * value we put into the index register, and we're not testing
 	 * against the index register's value, and there aren't any
 	 * other problems that would keep us from eliminating this
 	 * block, can we eliminate it?
 	 */
 	if (do_stmts &&
-	    ((b->out_use == 0 && aval != 0 && b->val[A_ATOM] == aval &&
-	      xval != 0 && b->val[X_ATOM] == xval) ||
+	    ((b->out_use == 0 &&
+	      aval != VAL_UNKNOWN && b->val[A_ATOM] == aval &&
+	      xval != VAL_UNKNOWN && b->val[X_ATOM] == xval) ||
 	     BPF_CLASS(b->s.code) == BPF_RET)) {
 		if (b->stmts != 0) {
 			b->stmts = 0;
 			opt_state->done = 0;
 		}
 	} else {
 		opt_peep(opt_state, b);
 		opt_deadstores(opt_state, b);
 	}
 	/*
 	 * Set up values for branch optimizer.
 	 */
 	if (BPF_SRC(b->s.code) == BPF_K)
 		b->oval = K(b->s.k);
 	else
 		b->oval = b->val[X_ATOM];
 	b->et.code = b->s.code;
 	b->ef.code = -b->s.code;
 }
 
 /*
  * Return true if any register that is used on exit from 'succ', has
  * an exit value that is different from the corresponding exit value
  * from 'b'.
  */
 static int
 use_conflict(struct block *b, struct block *succ)
 {
 	int atom;
 	atomset use = succ->out_use;
 
 	if (use == 0)
 		return 0;
 
 	for (atom = 0; atom < N_ATOMS; ++atom)
 		if (ATOMELEM(use, atom))
 			if (b->val[atom] != succ->val[atom])
 				return 1;
 	return 0;
 }
 
 static struct block *
 fold_edge(struct block *child, struct edge *ep)
 {
 	int sense;
 	int aval0, aval1, oval0, oval1;
 	int code = ep->code;
 
 	if (code < 0) {
 		code = -code;
 		sense = 0;
 	} else
 		sense = 1;
 
 	if (child->s.code != code)
 		return 0;
 
 	aval0 = child->val[A_ATOM];
 	oval0 = child->oval;
 	aval1 = ep->pred->val[A_ATOM];
 	oval1 = ep->pred->oval;
 
 	if (aval0 != aval1)
 		return 0;
 
 	if (oval0 == oval1)
 		/*
 		 * The operands of the branch instructions are
 		 * identical, so the result is true if a true
 		 * branch was taken to get here, otherwise false.
 		 */
 		return sense ? JT(child) : JF(child);
 
 	if (sense && code == (BPF_JMP|BPF_JEQ|BPF_K))
 		/*
 		 * At this point, we only know the comparison if we
 		 * came down the true branch, and it was an equality
 		 * comparison with a constant.
 		 *
 		 * I.e., if we came down the true branch, and the branch
 		 * was an equality comparison with a constant, we know the
 		 * accumulator contains that constant.  If we came down
 		 * the false branch, or the comparison wasn't with a
 		 * constant, we don't know what was in the accumulator.
 		 *
 		 * We rely on the fact that distinct constants have distinct
 		 * value numbers.
 		 */
 		return JF(child);
 
 	return 0;
 }
 
 static void
 opt_j(opt_state_t *opt_state, struct edge *ep)
 {
 	register int i, k;
 	register struct block *target;
 
 	if (JT(ep->succ) == 0)
 		return;
 
 	if (JT(ep->succ) == JF(ep->succ)) {
 		/*
 		 * Common branch targets can be eliminated, provided
 		 * there is no data dependency.
 		 */
 		if (!use_conflict(ep->pred, ep->succ->et.succ)) {
 			opt_state->done = 0;
 			ep->succ = JT(ep->succ);
 		}
 	}
 	/*
 	 * For each edge dominator that matches the successor of this
 	 * edge, promote the edge successor to the its grandchild.
 	 *
 	 * XXX We violate the set abstraction here in favor a reasonably
 	 * efficient loop.
 	 */
  top:
 	for (i = 0; i < opt_state->edgewords; ++i) {
 		register bpf_u_int32 x = ep->edom[i];
 
 		while (x != 0) {
-			k = ffs(x) - 1;
+			k = lowest_set_bit(x);
 			x &=~ (1 << k);
 			k += i * BITS_PER_WORD;
 
 			target = fold_edge(ep->succ, opt_state->edges[k]);
 			/*
 			 * Check that there is no data dependency between
 			 * nodes that will be violated if we move the edge.
 			 */
 			if (target != 0 && !use_conflict(ep->pred, target)) {
 				opt_state->done = 0;
 				ep->succ = target;
 				if (JT(target) != 0)
 					/*
 					 * Start over unless we hit a leaf.
 					 */
 					goto top;
 				return;
 			}
 		}
 	}
 }
 
 
 static void
 or_pullup(opt_state_t *opt_state, struct block *b)
 {
 	int val, at_top;
 	struct block *pull;
 	struct block **diffp, **samep;
 	struct edge *ep;
 
 	ep = b->in_edges;
 	if (ep == 0)
 		return;
 
 	/*
 	 * Make sure each predecessor loads the same value.
 	 * XXX why?
 	 */
 	val = ep->pred->val[A_ATOM];
 	for (ep = ep->next; ep != 0; ep = ep->next)
 		if (val != ep->pred->val[A_ATOM])
 			return;
 
 	if (JT(b->in_edges->pred) == b)
 		diffp = &JT(b->in_edges->pred);
 	else
 		diffp = &JF(b->in_edges->pred);
 
 	at_top = 1;
-	while (1) {
+	for (;;) {
 		if (*diffp == 0)
 			return;
 
 		if (JT(*diffp) != JT(b))
 			return;
 
 		if (!SET_MEMBER((*diffp)->dom, b->id))
 			return;
 
 		if ((*diffp)->val[A_ATOM] != val)
 			break;
 
 		diffp = &JF(*diffp);
 		at_top = 0;
 	}
 	samep = &JF(*diffp);
-	while (1) {
+	for (;;) {
 		if (*samep == 0)
 			return;
 
 		if (JT(*samep) != JT(b))
 			return;
 
 		if (!SET_MEMBER((*samep)->dom, b->id))
 			return;
 
 		if ((*samep)->val[A_ATOM] == val)
 			break;
 
 		/* XXX Need to check that there are no data dependencies
 		   between dp0 and dp1.  Currently, the code generator
 		   will not produce such dependencies. */
 		samep = &JF(*samep);
 	}
 #ifdef notdef
 	/* XXX This doesn't cover everything. */
 	for (i = 0; i < N_ATOMS; ++i)
 		if ((*samep)->val[i] != pred->val[i])
 			return;
 #endif
 	/* Pull up the node. */
 	pull = *samep;
 	*samep = JF(pull);
 	JF(pull) = *diffp;
 
 	/*
 	 * At the top of the chain, each predecessor needs to point at the
 	 * pulled up node.  Inside the chain, there is only one predecessor
 	 * to worry about.
 	 */
 	if (at_top) {
 		for (ep = b->in_edges; ep != 0; ep = ep->next) {
 			if (JT(ep->pred) == b)
 				JT(ep->pred) = pull;
 			else
 				JF(ep->pred) = pull;
 		}
 	}
 	else
 		*diffp = pull;
 
 	opt_state->done = 0;
 }
 
 static void
 and_pullup(opt_state_t *opt_state, struct block *b)
 {
 	int val, at_top;
 	struct block *pull;
 	struct block **diffp, **samep;
 	struct edge *ep;
 
 	ep = b->in_edges;
 	if (ep == 0)
 		return;
 
 	/*
 	 * Make sure each predecessor loads the same value.
 	 */
 	val = ep->pred->val[A_ATOM];
 	for (ep = ep->next; ep != 0; ep = ep->next)
 		if (val != ep->pred->val[A_ATOM])
 			return;
 
 	if (JT(b->in_edges->pred) == b)
 		diffp = &JT(b->in_edges->pred);
 	else
 		diffp = &JF(b->in_edges->pred);
 
 	at_top = 1;
-	while (1) {
+	for (;;) {
 		if (*diffp == 0)
 			return;
 
 		if (JF(*diffp) != JF(b))
 			return;
 
 		if (!SET_MEMBER((*diffp)->dom, b->id))
 			return;
 
 		if ((*diffp)->val[A_ATOM] != val)
 			break;
 
 		diffp = &JT(*diffp);
 		at_top = 0;
 	}
 	samep = &JT(*diffp);
-	while (1) {
+	for (;;) {
 		if (*samep == 0)
 			return;
 
 		if (JF(*samep) != JF(b))
 			return;
 
 		if (!SET_MEMBER((*samep)->dom, b->id))
 			return;
 
 		if ((*samep)->val[A_ATOM] == val)
 			break;
 
 		/* XXX Need to check that there are no data dependencies
 		   between diffp and samep.  Currently, the code generator
 		   will not produce such dependencies. */
 		samep = &JT(*samep);
 	}
 #ifdef notdef
 	/* XXX This doesn't cover everything. */
 	for (i = 0; i < N_ATOMS; ++i)
 		if ((*samep)->val[i] != pred->val[i])
 			return;
 #endif
 	/* Pull up the node. */
 	pull = *samep;
 	*samep = JT(pull);
 	JT(pull) = *diffp;
 
 	/*
 	 * At the top of the chain, each predecessor needs to point at the
 	 * pulled up node.  Inside the chain, there is only one predecessor
 	 * to worry about.
 	 */
 	if (at_top) {
 		for (ep = b->in_edges; ep != 0; ep = ep->next) {
 			if (JT(ep->pred) == b)
 				JT(ep->pred) = pull;
 			else
 				JF(ep->pred) = pull;
 		}
 	}
 	else
 		*diffp = pull;
 
 	opt_state->done = 0;
 }
 
 static void
 opt_blks(compiler_state_t *cstate, opt_state_t *opt_state, struct icode *ic,
     int do_stmts)
 {
 	int i, maxlevel;
 	struct block *p;
 
 	init_val(opt_state);
 	maxlevel = ic->root->level;
 
 	find_inedges(opt_state, ic->root);
 	for (i = maxlevel; i >= 0; --i)
 		for (p = opt_state->levels[i]; p; p = p->link)
-			opt_blk(cstate, ic, opt_state, p, do_stmts);
+			opt_blk(cstate, opt_state, p, do_stmts);
 
 	if (do_stmts)
 		/*
 		 * No point trying to move branches; it can't possibly
 		 * make a difference at this point.
 		 */
 		return;
 
 	for (i = 1; i <= maxlevel; ++i) {
 		for (p = opt_state->levels[i]; p; p = p->link) {
 			opt_j(opt_state, &p->et);
 			opt_j(opt_state, &p->ef);
 		}
 	}
 
 	find_inedges(opt_state, ic->root);
 	for (i = 1; i <= maxlevel; ++i) {
 		for (p = opt_state->levels[i]; p; p = p->link) {
 			or_pullup(opt_state, p);
 			and_pullup(opt_state, p);
 		}
 	}
 }
 
 static inline void
 link_inedge(struct edge *parent, struct block *child)
 {
 	parent->next = child->in_edges;
 	child->in_edges = parent;
 }
 
 static void
 find_inedges(opt_state_t *opt_state, struct block *root)
 {
 	int i;
 	struct block *b;
 
 	for (i = 0; i < opt_state->n_blocks; ++i)
 		opt_state->blocks[i]->in_edges = 0;
 
 	/*
 	 * Traverse the graph, adding each edge to the predecessor
 	 * list of its successors.  Skip the leaves (i.e. level 0).
 	 */
 	for (i = root->level; i > 0; --i) {
 		for (b = opt_state->levels[i]; b != 0; b = b->link) {
 			link_inedge(&b->et, JT(b));
 			link_inedge(&b->ef, JF(b));
 		}
 	}
 }
 
 static void
 opt_root(struct block **b)
 {
 	struct slist *tmp, *s;
 
 	s = (*b)->stmts;
 	(*b)->stmts = 0;
 	while (BPF_CLASS((*b)->s.code) == BPF_JMP && JT(*b) == JF(*b))
 		*b = JT(*b);
 
 	tmp = (*b)->stmts;
 	if (tmp != 0)
 		sappend(s, tmp);
 	(*b)->stmts = s;
 
 	/*
 	 * If the root node is a return, then there is no
 	 * point executing any statements (since the bpf machine
 	 * has no side effects).
 	 */
 	if (BPF_CLASS((*b)->s.code) == BPF_RET)
 		(*b)->stmts = 0;
 }
 
 static void
 opt_loop(compiler_state_t *cstate, opt_state_t *opt_state, struct icode *ic,
     int do_stmts)
 {
 
 #ifdef BDEBUG
-	if (pcap_optimizer_debug > 1) {
+	if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
 		printf("opt_loop(root, %d) begin\n", do_stmts);
 		opt_dump(cstate, ic);
 	}
 #endif
 	do {
 		opt_state->done = 1;
 		find_levels(opt_state, ic);
 		find_dom(opt_state, ic->root);
 		find_closure(opt_state, ic->root);
 		find_ud(opt_state, ic->root);
 		find_edom(opt_state, ic->root);
 		opt_blks(cstate, opt_state, ic, do_stmts);
 #ifdef BDEBUG
-		if (pcap_optimizer_debug > 1) {
+		if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
 			printf("opt_loop(root, %d) bottom, done=%d\n", do_stmts, opt_state->done);
 			opt_dump(cstate, ic);
 		}
 #endif
 	} while (!opt_state->done);
 }
 
 /*
  * Optimize the filter code in its dag representation.
  */
 void
 bpf_optimize(compiler_state_t *cstate, struct icode *ic)
 {
 	opt_state_t opt_state;
 
 	opt_init(cstate, &opt_state, ic);
 	opt_loop(cstate, &opt_state, ic, 0);
 	opt_loop(cstate, &opt_state, ic, 1);
 	intern_blocks(&opt_state, ic);
 #ifdef BDEBUG
-	if (pcap_optimizer_debug > 1) {
+	if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
 		printf("after intern_blocks()\n");
 		opt_dump(cstate, ic);
 	}
 #endif
 	opt_root(&ic->root);
 #ifdef BDEBUG
-	if (pcap_optimizer_debug > 1) {
+	if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
 		printf("after opt_root()\n");
 		opt_dump(cstate, ic);
 	}
 #endif
 	opt_cleanup(&opt_state);
 }
 
 static void
 make_marks(struct icode *ic, struct block *p)
 {
 	if (!isMarked(ic, p)) {
 		Mark(ic, p);
 		if (BPF_CLASS(p->s.code) != BPF_RET) {
 			make_marks(ic, JT(p));
 			make_marks(ic, JF(p));
 		}
 	}
 }
 
 /*
  * Mark code array such that isMarked(ic->cur_mark, i) is true
  * only for nodes that are alive.
  */
 static void
 mark_code(struct icode *ic)
 {
 	ic->cur_mark += 1;
 	make_marks(ic, ic->root);
 }
 
 /*
  * True iff the two stmt lists load the same value from the packet into
  * the accumulator.
  */
 static int
 eq_slist(struct slist *x, struct slist *y)
 {
-	while (1) {
+	for (;;) {
 		while (x && x->s.code == NOP)
 			x = x->next;
 		while (y && y->s.code == NOP)
 			y = y->next;
 		if (x == 0)
 			return y == 0;
 		if (y == 0)
 			return x == 0;
 		if (x->s.code != y->s.code || x->s.k != y->s.k)
 			return 0;
 		x = x->next;
 		y = y->next;
 	}
 }
 
 static inline int
 eq_blk(struct block *b0, struct block *b1)
 {
 	if (b0->s.code == b1->s.code &&
 	    b0->s.k == b1->s.k &&
 	    b0->et.succ == b1->et.succ &&
 	    b0->ef.succ == b1->ef.succ)
 		return eq_slist(b0->stmts, b1->stmts);
 	return 0;
 }
 
 static void
 intern_blocks(opt_state_t *opt_state, struct icode *ic)
 {
 	struct block *p;
 	int i, j;
 	int done1; /* don't shadow global */
  top:
 	done1 = 1;
 	for (i = 0; i < opt_state->n_blocks; ++i)
 		opt_state->blocks[i]->link = 0;
 
 	mark_code(ic);
 
 	for (i = opt_state->n_blocks - 1; --i >= 0; ) {
 		if (!isMarked(ic, opt_state->blocks[i]))
 			continue;
 		for (j = i + 1; j < opt_state->n_blocks; ++j) {
 			if (!isMarked(ic, opt_state->blocks[j]))
 				continue;
 			if (eq_blk(opt_state->blocks[i], opt_state->blocks[j])) {
 				opt_state->blocks[i]->link = opt_state->blocks[j]->link ?
 					opt_state->blocks[j]->link : opt_state->blocks[j];
 				break;
 			}
 		}
 	}
 	for (i = 0; i < opt_state->n_blocks; ++i) {
 		p = opt_state->blocks[i];
 		if (JT(p) == 0)
 			continue;
 		if (JT(p)->link) {
 			done1 = 0;
 			JT(p) = JT(p)->link;
 		}
 		if (JF(p)->link) {
 			done1 = 0;
 			JF(p) = JF(p)->link;
 		}
 	}
 	if (!done1)
 		goto top;
 }
 
 static void
 opt_cleanup(opt_state_t *opt_state)
 {
 	free((void *)opt_state->vnode_base);
 	free((void *)opt_state->vmap);
 	free((void *)opt_state->edges);
 	free((void *)opt_state->space);
 	free((void *)opt_state->levels);
 	free((void *)opt_state->blocks);
 }
 
 /*
  * Return the number of stmts in 's'.
  */
 static u_int
 slength(struct slist *s)
 {
 	u_int n = 0;
 
 	for (; s; s = s->next)
 		if (s->s.code != NOP)
 			++n;
 	return n;
 }
 
 /*
  * Return the number of nodes reachable by 'p'.
  * All nodes should be initially unmarked.
  */
 static int
 count_blocks(struct icode *ic, struct block *p)
 {
 	if (p == 0 || isMarked(ic, p))
 		return 0;
 	Mark(ic, p);
 	return count_blocks(ic, JT(p)) + count_blocks(ic, JF(p)) + 1;
 }
 
 /*
  * Do a depth first search on the flow graph, numbering the
  * the basic blocks, and entering them into the 'blocks' array.`
  */
 static void
 number_blks_r(opt_state_t *opt_state, struct icode *ic, struct block *p)
 {
 	int n;
 
 	if (p == 0 || isMarked(ic, p))
 		return;
 
 	Mark(ic, p);
 	n = opt_state->n_blocks++;
 	p->id = n;
 	opt_state->blocks[n] = p;
 
 	number_blks_r(opt_state, ic, JT(p));
 	number_blks_r(opt_state, ic, JF(p));
 }
 
 /*
  * Return the number of stmts in the flowgraph reachable by 'p'.
  * The nodes should be unmarked before calling.
  *
  * Note that "stmts" means "instructions", and that this includes
  *
  *	side-effect statements in 'p' (slength(p->stmts));
  *
  *	statements in the true branch from 'p' (count_stmts(JT(p)));
  *
  *	statements in the false branch from 'p' (count_stmts(JF(p)));
  *
  *	the conditional jump itself (1);
  *
  *	an extra long jump if the true branch requires it (p->longjt);
  *
  *	an extra long jump if the false branch requires it (p->longjf).
  */
 static u_int
 count_stmts(struct icode *ic, struct block *p)
 {
 	u_int n;
 
 	if (p == 0 || isMarked(ic, p))
 		return 0;
 	Mark(ic, p);
 	n = count_stmts(ic, JT(p)) + count_stmts(ic, JF(p));
 	return slength(p->stmts) + n + 1 + p->longjt + p->longjf;
 }
 
 /*
  * Allocate memory.  All allocation is done before optimization
  * is begun.  A linear bound on the size of all data structures is computed
  * from the total number of blocks and/or statements.
  */
 static void
 opt_init(compiler_state_t *cstate, opt_state_t *opt_state, struct icode *ic)
 {
 	bpf_u_int32 *p;
 	int i, n, max_stmts;
 
 	/*
 	 * First, count the blocks, so we can malloc an array to map
 	 * block number to block.  Then, put the blocks into the array.
 	 */
 	unMarkAll(ic);
 	n = count_blocks(ic, ic->root);
 	opt_state->blocks = (struct block **)calloc(n, sizeof(*opt_state->blocks));
 	if (opt_state->blocks == NULL)
 		bpf_error(cstate, "malloc");
 	unMarkAll(ic);
 	opt_state->n_blocks = 0;
 	number_blks_r(opt_state, ic, ic->root);
 
 	opt_state->n_edges = 2 * opt_state->n_blocks;
 	opt_state->edges = (struct edge **)calloc(opt_state->n_edges, sizeof(*opt_state->edges));
 	if (opt_state->edges == NULL)
 		bpf_error(cstate, "malloc");
 
 	/*
 	 * The number of levels is bounded by the number of nodes.
 	 */
 	opt_state->levels = (struct block **)calloc(opt_state->n_blocks, sizeof(*opt_state->levels));
 	if (opt_state->levels == NULL)
 		bpf_error(cstate, "malloc");
 
 	opt_state->edgewords = opt_state->n_edges / (8 * sizeof(bpf_u_int32)) + 1;
 	opt_state->nodewords = opt_state->n_blocks / (8 * sizeof(bpf_u_int32)) + 1;
 
 	/* XXX */
 	opt_state->space = (bpf_u_int32 *)malloc(2 * opt_state->n_blocks * opt_state->nodewords * sizeof(*opt_state->space)
 				 + opt_state->n_edges * opt_state->edgewords * sizeof(*opt_state->space));
 	if (opt_state->space == NULL)
 		bpf_error(cstate, "malloc");
 	p = opt_state->space;
 	opt_state->all_dom_sets = p;
 	for (i = 0; i < n; ++i) {
 		opt_state->blocks[i]->dom = p;
 		p += opt_state->nodewords;
 	}
 	opt_state->all_closure_sets = p;
 	for (i = 0; i < n; ++i) {
 		opt_state->blocks[i]->closure = p;
 		p += opt_state->nodewords;
 	}
 	opt_state->all_edge_sets = p;
 	for (i = 0; i < n; ++i) {
 		register struct block *b = opt_state->blocks[i];
 
 		b->et.edom = p;
 		p += opt_state->edgewords;
 		b->ef.edom = p;
 		p += opt_state->edgewords;
 		b->et.id = i;
 		opt_state->edges[i] = &b->et;
 		b->ef.id = opt_state->n_blocks + i;
 		opt_state->edges[opt_state->n_blocks + i] = &b->ef;
 		b->et.pred = b;
 		b->ef.pred = b;
 	}
 	max_stmts = 0;
 	for (i = 0; i < n; ++i)
 		max_stmts += slength(opt_state->blocks[i]->stmts) + 1;
 	/*
 	 * We allocate at most 3 value numbers per statement,
 	 * so this is an upper bound on the number of valnodes
 	 * we'll need.
 	 */
 	opt_state->maxval = 3 * max_stmts;
 	opt_state->vmap = (struct vmapinfo *)calloc(opt_state->maxval, sizeof(*opt_state->vmap));
 	opt_state->vnode_base = (struct valnode *)calloc(opt_state->maxval, sizeof(*opt_state->vnode_base));
 	if (opt_state->vmap == NULL || opt_state->vnode_base == NULL)
 		bpf_error(cstate, "malloc");
 }
 
 /*
  * This is only used when supporting optimizer debugging.  It is
  * global state, so do *not* do more than one compile in parallel
  * and expect it to provide meaningful information.
  */
 #ifdef BDEBUG
-int bids[1000];
+int bids[NBIDS];
 #endif
 
 /*
  * Returns true if successful.  Returns false if a branch has
  * an offset that is too large.  If so, we have marked that
  * branch so that on a subsequent iteration, it will be treated
  * properly.
  */
 static int
 convert_code_r(compiler_state_t *cstate, conv_state_t *conv_state,
     struct icode *ic, struct block *p)
 {
 	struct bpf_insn *dst;
 	struct slist *src;
 	u_int slen;
 	u_int off;
-	int extrajmps;		/* number of extra jumps inserted */
+	u_int extrajmps;	/* number of extra jumps inserted */
 	struct slist **offset = NULL;
 
 	if (p == 0 || isMarked(ic, p))
 		return (1);
 	Mark(ic, p);
 
 	if (convert_code_r(cstate, conv_state, ic, JF(p)) == 0)
 		return (0);
 	if (convert_code_r(cstate, conv_state, ic, JT(p)) == 0)
 		return (0);
 
 	slen = slength(p->stmts);
 	dst = conv_state->ftail -= (slen + 1 + p->longjt + p->longjf);
 		/* inflate length by any extra jumps */
 
 	p->offset = (int)(dst - conv_state->fstart);
 
 	/* generate offset[] for convenience  */
 	if (slen) {
 		offset = (struct slist **)calloc(slen, sizeof(struct slist *));
 		if (!offset) {
 			bpf_error(cstate, "not enough core");
 			/*NOTREACHED*/
 		}
 	}
 	src = p->stmts;
 	for (off = 0; off < slen && src; off++) {
 #if 0
 		printf("off=%d src=%x\n", off, src);
 #endif
 		offset[off] = src;
 		src = src->next;
 	}
 
 	off = 0;
 	for (src = p->stmts; src; src = src->next) {
 		if (src->s.code == NOP)
 			continue;
 		dst->code = (u_short)src->s.code;
 		dst->k = src->s.k;
 
 		/* fill block-local relative jump */
 		if (BPF_CLASS(src->s.code) != BPF_JMP || src->s.code == (BPF_JMP|BPF_JA)) {
 #if 0
 			if (src->s.jt || src->s.jf) {
 				bpf_error(cstate, "illegal jmp destination");
 				/*NOTREACHED*/
 			}
 #endif
 			goto filled;
 		}
 		if (off == slen - 2)	/*???*/
 			goto filled;
 
 	    {
 		u_int i;
 		int jt, jf;
-		const char *ljerr = "%s for block-local relative jump: off=%d";
+		const char ljerr[] = "%s for block-local relative jump: off=%d";
 
 #if 0
 		printf("code=%x off=%d %x %x\n", src->s.code,
 			off, src->s.jt, src->s.jf);
 #endif
 
 		if (!src->s.jt || !src->s.jf) {
 			bpf_error(cstate, ljerr, "no jmp destination", off);
 			/*NOTREACHED*/
 		}
 
 		jt = jf = 0;
 		for (i = 0; i < slen; i++) {
 			if (offset[i] == src->s.jt) {
 				if (jt) {
 					bpf_error(cstate, ljerr, "multiple matches", off);
 					/*NOTREACHED*/
 				}
 
-				dst->jt = i - off - 1;
+				if (i - off - 1 >= 256) {
+					bpf_error(cstate, ljerr, "out-of-range jump", off);
+					/*NOTREACHED*/
+				}
+				dst->jt = (u_char)(i - off - 1);
 				jt++;
 			}
 			if (offset[i] == src->s.jf) {
 				if (jf) {
 					bpf_error(cstate, ljerr, "multiple matches", off);
 					/*NOTREACHED*/
 				}
-				dst->jf = i - off - 1;
+				if (i - off - 1 >= 256) {
+					bpf_error(cstate, ljerr, "out-of-range jump", off);
+					/*NOTREACHED*/
+				}
+				dst->jf = (u_char)(i - off - 1);
 				jf++;
 			}
 		}
 		if (!jt || !jf) {
 			bpf_error(cstate, ljerr, "no destination found", off);
 			/*NOTREACHED*/
 		}
 	    }
 filled:
 		++dst;
 		++off;
 	}
 	if (offset)
 		free(offset);
 
 #ifdef BDEBUG
-	bids[dst - conv_state->fstart] = p->id + 1;
+	if (dst - conv_state->fstart < NBIDS)
+		bids[dst - conv_state->fstart] = p->id + 1;
 #endif
 	dst->code = (u_short)p->s.code;
 	dst->k = p->s.k;
 	if (JT(p)) {
 		extrajmps = 0;
 		off = JT(p)->offset - (p->offset + slen) - 1;
 		if (off >= 256) {
 		    /* offset too large for branch, must add a jump */
 		    if (p->longjt == 0) {
 		    	/* mark this instruction and retry */
 			p->longjt++;
 			return(0);
 		    }
 		    /* branch if T to following jump */
-		    dst->jt = extrajmps;
+		    if (extrajmps >= 256) {
+			bpf_error(cstate, "too many extra jumps");
+			/*NOTREACHED*/
+		    }
+		    dst->jt = (u_char)extrajmps;
 		    extrajmps++;
 		    dst[extrajmps].code = BPF_JMP|BPF_JA;
 		    dst[extrajmps].k = off - extrajmps;
 		}
 		else
-		    dst->jt = off;
+		    dst->jt = (u_char)off;
 		off = JF(p)->offset - (p->offset + slen) - 1;
 		if (off >= 256) {
 		    /* offset too large for branch, must add a jump */
 		    if (p->longjf == 0) {
 		    	/* mark this instruction and retry */
 			p->longjf++;
 			return(0);
 		    }
 		    /* branch if F to following jump */
 		    /* if two jumps are inserted, F goes to second one */
-		    dst->jf = extrajmps;
+		    if (extrajmps >= 256) {
+			bpf_error(cstate, "too many extra jumps");
+			/*NOTREACHED*/
+		    }
+		    dst->jf = (u_char)extrajmps;
 		    extrajmps++;
 		    dst[extrajmps].code = BPF_JMP|BPF_JA;
 		    dst[extrajmps].k = off - extrajmps;
 		}
 		else
-		    dst->jf = off;
+		    dst->jf = (u_char)off;
 	}
 	return (1);
 }
 
 
 /*
  * Convert flowgraph intermediate representation to the
  * BPF array representation.  Set *lenp to the number of instructions.
  *
  * This routine does *NOT* leak the memory pointed to by fp.  It *must
  * not* do free(fp) before returning fp; doing so would make no sense,
  * as the BPF array pointed to by the return value of icode_to_fcode()
  * must be valid - it's being returned for use in a bpf_program structure.
  *
  * If it appears that icode_to_fcode() is leaking, the problem is that
  * the program using pcap_compile() is failing to free the memory in
  * the BPF program when it's done - the leak is in the program, not in
  * the routine that happens to be allocating the memory.  (By analogy, if
  * a program calls fopen() without ever calling fclose() on the FILE *,
  * it will leak the FILE structure; the leak is not in fopen(), it's in
  * the program.)  Change the program to use pcap_freecode() when it's
  * done with the filter program.  See the pcap man page.
  */
 struct bpf_insn *
 icode_to_fcode(compiler_state_t *cstate, struct icode *ic,
     struct block *root, u_int *lenp)
 {
 	u_int n;
 	struct bpf_insn *fp;
 	conv_state_t conv_state;
 
 	/*
 	 * Loop doing convert_code_r() until no branches remain
 	 * with too-large offsets.
 	 */
-	while (1) {
+	for (;;) {
 	    unMarkAll(ic);
 	    n = *lenp = count_stmts(ic, root);
 
 	    fp = (struct bpf_insn *)malloc(sizeof(*fp) * n);
 	    if (fp == NULL)
 		    bpf_error(cstate, "malloc");
 	    memset((char *)fp, 0, sizeof(*fp) * n);
 	    conv_state.fstart = fp;
 	    conv_state.ftail = fp + n;
 
 	    unMarkAll(ic);
 	    if (convert_code_r(cstate, &conv_state, ic, root))
 		break;
 	    free(fp);
 	}
 
 	return fp;
 }
 
 /*
  * Make a copy of a BPF program and put it in the "fcode" member of
  * a "pcap_t".
  *
  * If we fail to allocate memory for the copy, fill in the "errbuf"
  * member of the "pcap_t" with an error message, and return -1;
  * otherwise, return 0.
  */
 int
 install_bpf_program(pcap_t *p, struct bpf_program *fp)
 {
 	size_t prog_size;
 
 	/*
 	 * Validate the program.
 	 */
 	if (!bpf_validate(fp->bf_insns, fp->bf_len)) {
 		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 			"BPF program is not valid");
 		return (-1);
 	}
 
 	/*
 	 * Free up any already installed program.
 	 */
 	pcap_freecode(&p->fcode);
 
 	prog_size = sizeof(*fp->bf_insns) * fp->bf_len;
 	p->fcode.bf_len = fp->bf_len;
 	p->fcode.bf_insns = (struct bpf_insn *)malloc(prog_size);
 	if (p->fcode.bf_insns == NULL) {
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			 "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "malloc");
 		return (-1);
 	}
 	memcpy(p->fcode.bf_insns, fp->bf_insns, prog_size);
 	return (0);
 }
 
 #ifdef BDEBUG
 static void
 dot_dump_node(struct icode *ic, struct block *block, struct bpf_program *prog,
     FILE *out)
 {
 	int icount, noffset;
 	int i;
 
 	if (block == NULL || isMarked(ic, block))
 		return;
 	Mark(ic, block);
 
 	icount = slength(block->stmts) + 1 + block->longjt + block->longjf;
 	noffset = min(block->offset + icount, (int)prog->bf_len);
 
 	fprintf(out, "\tblock%d [shape=ellipse, id=\"block-%d\" label=\"BLOCK%d\\n", block->id, block->id, block->id);
 	for (i = block->offset; i < noffset; i++) {
 		fprintf(out, "\\n%s", bpf_image(prog->bf_insns + i, i));
 	}
 	fprintf(out, "\" tooltip=\"");
 	for (i = 0; i < BPF_MEMWORDS; i++)
-		if (block->val[i] != 0)
+		if (block->val[i] != VAL_UNKNOWN)
 			fprintf(out, "val[%d]=%d ", i, block->val[i]);
 	fprintf(out, "val[A]=%d ", block->val[A_ATOM]);
 	fprintf(out, "val[X]=%d", block->val[X_ATOM]);
 	fprintf(out, "\"");
 	if (JT(block) == NULL)
 		fprintf(out, ", peripheries=2");
 	fprintf(out, "];\n");
 
 	dot_dump_node(ic, JT(block), prog, out);
 	dot_dump_node(ic, JF(block), prog, out);
 }
 
 static void
 dot_dump_edge(struct icode *ic, struct block *block, FILE *out)
 {
 	if (block == NULL || isMarked(ic, block))
 		return;
 	Mark(ic, block);
 
 	if (JT(block)) {
 		fprintf(out, "\t\"block%d\":se -> \"block%d\":n [label=\"T\"]; \n",
 				block->id, JT(block)->id);
 		fprintf(out, "\t\"block%d\":sw -> \"block%d\":n [label=\"F\"]; \n",
 			   block->id, JF(block)->id);
 	}
 	dot_dump_edge(ic, JT(block), out);
 	dot_dump_edge(ic, JF(block), out);
 }
 
 /* Output the block CFG using graphviz/DOT language
  * In the CFG, block's code, value index for each registers at EXIT,
  * and the jump relationship is show.
  *
  * example DOT for BPF `ip src host 1.1.1.1' is:
     digraph BPF {
     	block0 [shape=ellipse, id="block-0" label="BLOCK0\n\n(000) ldh      [12]\n(001) jeq      #0x800           jt 2	jf 5" tooltip="val[A]=0 val[X]=0"];
     	block1 [shape=ellipse, id="block-1" label="BLOCK1\n\n(002) ld       [26]\n(003) jeq      #0x1010101       jt 4	jf 5" tooltip="val[A]=0 val[X]=0"];
     	block2 [shape=ellipse, id="block-2" label="BLOCK2\n\n(004) ret      #68" tooltip="val[A]=0 val[X]=0", peripheries=2];
     	block3 [shape=ellipse, id="block-3" label="BLOCK3\n\n(005) ret      #0" tooltip="val[A]=0 val[X]=0", peripheries=2];
     	"block0":se -> "block1":n [label="T"];
     	"block0":sw -> "block3":n [label="F"];
     	"block1":se -> "block2":n [label="T"];
     	"block1":sw -> "block3":n [label="F"];
     }
  *
  *  After install graphviz on http://www.graphviz.org/, save it as bpf.dot
  *  and run `dot -Tpng -O bpf.dot' to draw the graph.
  */
 static void
 dot_dump(compiler_state_t *cstate, struct icode *ic)
 {
 	struct bpf_program f;
 	FILE *out = stdout;
 
 	memset(bids, 0, sizeof bids);
 	f.bf_insns = icode_to_fcode(cstate, ic, ic->root, &f.bf_len);
 
 	fprintf(out, "digraph BPF {\n");
-	ic->cur_mark = 0;
 	unMarkAll(ic);
 	dot_dump_node(ic, ic->root, &f, out);
-	ic->cur_mark = 0;
 	unMarkAll(ic);
 	dot_dump_edge(ic, ic->root, out);
 	fprintf(out, "}\n");
 
 	free((char *)f.bf_insns);
 }
 
 static void
 plain_dump(compiler_state_t *cstate, struct icode *ic)
 {
 	struct bpf_program f;
 
 	memset(bids, 0, sizeof bids);
 	f.bf_insns = icode_to_fcode(cstate, ic, ic->root, &f.bf_len);
 	bpf_dump(&f, 1);
 	putchar('\n');
 	free((char *)f.bf_insns);
 }
 
 static void
 opt_dump(compiler_state_t *cstate, struct icode *ic)
 {
-	/* if optimizer debugging is enabled, output DOT graph
-	 * `pcap_optimizer_debug=4' is equivalent to -dddd to follow -d/-dd/-ddd
-	 * convention in tcpdump command line
+	/*
+	 * If the CFG, in DOT format, is requested, output it rather than
+	 * the code that would be generated from that graph.
 	 */
-	if (pcap_optimizer_debug > 3)
+	if (pcap_print_dot_graph)
 		dot_dump(cstate, ic);
 	else
 		plain_dump(cstate, ic);
 }
 #endif
Index: vendor/libpcap/dist/optimize.h
===================================================================
--- vendor/libpcap/dist/optimize.h	(nonexistent)
+++ vendor/libpcap/dist/optimize.h	(revision 333789)
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may 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.
+ */
+
+/*
+ * Some stuff for use when debugging the optimizer.
+ */
+#ifdef BDEBUG
+#define NBIDS	1000
+extern int bids[NBIDS];
+#endif

Property changes on: vendor/libpcap/dist/optimize.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap/export-defs.h
===================================================================
--- vendor/libpcap/dist/pcap/export-defs.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/export-defs.h	(nonexistent)
@@ -1,108 +0,0 @@
-/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lib_pcap_export_defs_h
-#define lib_pcap_export_defs_h
-
-/*
- * PCAP_API_DEF must be used when defining *data* exported from
- * libpcap.  It can be used when defining *functions* exported
- * from libpcap, but it doesn't have to be used there.  It
- * should not be used in declarations in headers.
- *
- * PCAP_API must be used when *declaring* data or functions
- * exported from libpcap; PCAP_API_DEF won't work on all platforms.
- */
-
-/*
- * Check whether this is GCC major.minor or a later release, or some
- * compiler that claims to be "just like GCC" of that version or a
- * later release.
- */
-#define IS_AT_LEAST_GNUC_VERSION(major, minor) \
-	(defined(__GNUC__) && \
-	    (__GNUC__ > (major) || \
-	     (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
-
-#if defined(_WIN32)
-  #ifdef BUILDING_PCAP
-    /*
-     * We're compiling libpcap, so we should export functions in our
-     * API.
-     */
-    #define PCAP_API_DEF	__declspec(dllexport)
-  #else
-    #define PCAP_API_DEF	__declspec(dllimport)
-  #endif
-#elif defined(MSDOS)
-  /* XXX - does this need special treatment? */
-  #define PCAP_API_DEF
-#else /* UN*X */
-  #ifdef BUILDING_PCAP
-    /*
-     * We're compiling libpcap, so we should export functions in our API.
-     * The compiler might be configured not to export functions from a
-     * shared library by default, so we might have to explicitly mark
-     * functions as exported.
-     */
-    #if IS_AT_LEAST_GNUC_VERSION(3, 4)
-      /*
-       * GCC 3.4 or later, or some compiler asserting compatibility with
-       * GCC 3.4 or later, so we have __attribute__((visibility()).
-       */
-      #define PCAP_API_DEF	__attribute__((visibility("default")))
-    #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-      /*
-       * Sun C 5.5 or later, so we have __global.
-       * (Sun C 5.9 and later also have __attribute__((visibility()),
-       * but there's no reason to prefer it with Sun C.)
-       */
-      #define PCAP_API_DEF	__global
-    #else
-      /*
-       * We don't have anything to say.
-       */
-      #define PCAP_API_DEF
-    #endif
-  #else
-    /*
-     * We're not building libpcap.
-     */
-    #define PCAP_API_DEF
-  #endif
-#endif /* _WIN32/MSDOS/UN*X */
-
-#define PCAP_API	PCAP_API_DEF extern
-
-#endif /* lib_pcap_export_defs_h */

Property changes on: vendor/libpcap/dist/pcap/export-defs.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap/bluetooth.h
===================================================================
--- vendor/libpcap/dist/pcap/bluetooth.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/bluetooth.h	(revision 333789)
@@ -1,55 +1,56 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * bluetooth data struct
  * By Paolo Abeni <paolo.abeni@email.it>
  */
 
 #ifndef lib_pcap_bluetooth_h
 #define lib_pcap_bluetooth_h
 
+#include <pcap/pcap-inttypes.h>
+
 /*
  * Header prepended libpcap to each bluetooth h4 frame,
  * fields are in network byte order
  */
 typedef struct _pcap_bluetooth_h4_header {
-	u_int32_t direction; /* if first bit is set direction is incoming */
+	uint32_t direction; /* if first bit is set direction is incoming */
 } pcap_bluetooth_h4_header;
 
 /*
  * Header prepended libpcap to each bluetooth linux monitor frame,
  * fields are in network byte order
  */
 typedef struct _pcap_bluetooth_linux_monitor_header {
-	u_int16_t adapter_id;
-	u_int16_t opcode;
+	uint16_t adapter_id;
+	uint16_t opcode;
 } pcap_bluetooth_linux_monitor_header;
-
 
 #endif
Index: vendor/libpcap/dist/pcap/bpf.h
===================================================================
--- vendor/libpcap/dist/pcap/bpf.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/bpf.h	(revision 333789)
@@ -1,276 +1,270 @@
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  */
 
 /*
  * This is libpcap's cut-down version of bpf.h; it includes only
  * the stuff needed for the code generator and the userland BPF
  * interpreter, and the libpcap APIs for setting filters, etc..
  *
  * "pcap-bpf.c" will include the native OS version, as it deals with
  * the OS's BPF implementation.
  *
  * At least two programs found by Google Code Search explicitly includes
  * <pcap/bpf.h> (even though <pcap.h>/<pcap/pcap.h> includes it for you),
  * so moving that stuff to <pcap/pcap.h> would break the build for some
  * programs.
  */
 
 /*
  * If we've already included <net/bpf.h>, don't re-define this stuff.
  * We assume BSD-style multiple-include protection in <net/bpf.h>,
  * which is true of all but the oldest versions of FreeBSD and NetBSD,
  * or Tru64 UNIX-style multiple-include protection (or, at least,
  * Tru64 UNIX 5.x-style; I don't have earlier versions available to check),
  * or AIX-style multiple-include protection (or, at least, AIX 5.x-style;
  * I don't have earlier versions available to check), or QNX-style
  * multiple-include protection (as per GitHub pull request #394).
  *
  * We do not check for BPF_MAJOR_VERSION, as that's defined by
  * <linux/filter.h>, which is directly or indirectly included in some
  * programs that also include pcap.h, and <linux/filter.h> doesn't
  * define stuff we need.
  *
  * This also provides our own multiple-include protection.
  */
 #if !defined(_NET_BPF_H_) && !defined(_NET_BPF_H_INCLUDED) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h)
 #define lib_pcap_bpf_h
 
-#include <pcap/export-defs.h>
+#include <pcap/funcattrs.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* BSD style release date */
 #define BPF_RELEASE 199606
 
 #ifdef MSDOS /* must be 32-bit */
 typedef long          bpf_int32;
 typedef unsigned long bpf_u_int32;
 #else
 typedef	int bpf_int32;
 typedef	u_int bpf_u_int32;
 #endif
 
 /*
  * Alignment macros.  BPF_WORDALIGN rounds up to the next
  * even multiple of BPF_ALIGNMENT.
  *
  * Tcpdump's print-pflog.c uses this, so we define it here.
  */
 #ifndef __NetBSD__
 #define BPF_ALIGNMENT sizeof(bpf_int32)
 #else
 #define BPF_ALIGNMENT sizeof(long)
 #endif
 #define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
 
 /*
  * Structure for "pcap_compile()", "pcap_setfilter()", etc..
  */
 struct bpf_program {
 	u_int bf_len;
 	struct bpf_insn *bf_insns;
 };
 
 #include <pcap/dlt.h>
 
 /*
  * The instruction encodings.
  *
  * Please inform tcpdump-workers@lists.tcpdump.org if you use any
  * of the reserved values, so that we can note that they're used
  * (and perhaps implement it in the reference BPF implementation
  * and encourage its implementation elsewhere).
  */
 
 /*
  * The upper 8 bits of the opcode aren't used. BSD/OS used 0x8000.
  */
 
 /* instruction classes */
 #define BPF_CLASS(code) ((code) & 0x07)
 #define		BPF_LD		0x00
 #define		BPF_LDX		0x01
 #define		BPF_ST		0x02
 #define		BPF_STX		0x03
 #define		BPF_ALU		0x04
 #define		BPF_JMP		0x05
 #define		BPF_RET		0x06
 #define		BPF_MISC	0x07
 
 /* ld/ldx fields */
 #define BPF_SIZE(code)	((code) & 0x18)
 #define		BPF_W		0x00
 #define		BPF_H		0x08
 #define		BPF_B		0x10
 /*				0x18	reserved; used by BSD/OS */
 #define BPF_MODE(code)	((code) & 0xe0)
 #define		BPF_IMM 	0x00
 #define		BPF_ABS		0x20
 #define		BPF_IND		0x40
 #define		BPF_MEM		0x60
 #define		BPF_LEN		0x80
 #define		BPF_MSH		0xa0
 /*				0xc0	reserved; used by BSD/OS */
 /*				0xe0	reserved; used by BSD/OS */
 
 /* alu/jmp fields */
 #define BPF_OP(code)	((code) & 0xf0)
 #define		BPF_ADD		0x00
 #define		BPF_SUB		0x10
 #define		BPF_MUL		0x20
 #define		BPF_DIV		0x30
 #define		BPF_OR		0x40
 #define		BPF_AND		0x50
 #define		BPF_LSH		0x60
 #define		BPF_RSH		0x70
 #define		BPF_NEG		0x80
 #define		BPF_MOD		0x90
 #define		BPF_XOR		0xa0
 /*				0xb0	reserved */
 /*				0xc0	reserved */
 /*				0xd0	reserved */
 /*				0xe0	reserved */
 /*				0xf0	reserved */
 
 #define		BPF_JA		0x00
 #define		BPF_JEQ		0x10
 #define		BPF_JGT		0x20
 #define		BPF_JGE		0x30
 #define		BPF_JSET	0x40
 /*				0x50	reserved; used on BSD/OS */
 /*				0x60	reserved */
 /*				0x70	reserved */
 /*				0x80	reserved */
 /*				0x90	reserved */
 /*				0xa0	reserved */
 /*				0xb0	reserved */
 /*				0xc0	reserved */
 /*				0xd0	reserved */
 /*				0xe0	reserved */
 /*				0xf0	reserved */
 #define BPF_SRC(code)	((code) & 0x08)
 #define		BPF_K		0x00
 #define		BPF_X		0x08
 
 /* ret - BPF_K and BPF_X also apply */
 #define BPF_RVAL(code)	((code) & 0x18)
 #define		BPF_A		0x10
 /*				0x18	reserved */
 
 /* misc */
 #define BPF_MISCOP(code) ((code) & 0xf8)
 #define		BPF_TAX		0x00
 /*				0x08	reserved */
 /*				0x10	reserved */
 /*				0x18	reserved */
 /* #define	BPF_COP		0x20	NetBSD "coprocessor" extensions */
 /*				0x28	reserved */
 /*				0x30	reserved */
 /*				0x38	reserved */
 /* #define	BPF_COPX	0x40	NetBSD "coprocessor" extensions */
 /*					also used on BSD/OS */
 /*				0x48	reserved */
 /*				0x50	reserved */
 /*				0x58	reserved */
 /*				0x60	reserved */
 /*				0x68	reserved */
 /*				0x70	reserved */
 /*				0x78	reserved */
 #define		BPF_TXA		0x80
 /*				0x88	reserved */
 /*				0x90	reserved */
 /*				0x98	reserved */
 /*				0xa0	reserved */
 /*				0xa8	reserved */
 /*				0xb0	reserved */
 /*				0xb8	reserved */
 /*				0xc0	reserved; used on BSD/OS */
 /*				0xc8	reserved */
 /*				0xd0	reserved */
 /*				0xd8	reserved */
 /*				0xe0	reserved */
 /*				0xe8	reserved */
 /*				0xf0	reserved */
 /*				0xf8	reserved */
 
 /*
  * The instruction data structure.
  */
 struct bpf_insn {
 	u_short	code;
 	u_char 	jt;
 	u_char 	jf;
 	bpf_u_int32 k;
 };
 
 /*
  * Auxiliary data, for use when interpreting a filter intended for the
  * Linux kernel when the kernel rejects the filter (requiring us to
  * run it in userland).  It contains VLAN tag information.
  */
 struct bpf_aux_data {
 	u_short vlan_tag_present;
 	u_short vlan_tag;
 };
 
 /*
  * Macros for insn array initializers.
  */
 #define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
 #define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
 
-#if __STDC__ || defined(__cplusplus)
 PCAP_API int bpf_validate(const struct bpf_insn *, int);
 PCAP_API u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 extern u_int bpf_filter_with_aux_data(const struct bpf_insn *, const u_char *, u_int, u_int, const struct bpf_aux_data *);
-#else
-PCAP_API int bpf_validate();
-PCAP_API u_int bpf_filter();
-extern u_int bpf_filter_with_aux_data();
-#endif
 
 /*
  * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
  */
 #define BPF_MEMWORDS 16
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* !defined(_NET_BPF_H_) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h) */
Index: vendor/libpcap/dist/pcap/can_socketcan.h
===================================================================
--- vendor/libpcap/dist/pcap/can_socketcan.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/can_socketcan.h	(revision 333789)
@@ -1,54 +1,56 @@
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef lib_pcap_can_socketcan_h
 #define lib_pcap_can_socketcan_h
 
+#include <pcap/pcap-inttypes.h>
+
 /*
  * SocketCAN header, as per Documentation/networking/can.txt in the
  * Linux source.
  */
 typedef struct {
-	u_int32_t can_id;
-	u_int8_t payload_length;
-	u_int8_t pad;
-	u_int8_t reserved1;
-	u_int8_t reserved2;
+	uint32_t can_id;
+	uint8_t payload_length;
+	uint8_t pad;
+	uint8_t reserved1;
+	uint8_t reserved2;
 } pcap_can_socketcan_hdr;
 
 #endif
Index: vendor/libpcap/dist/pcap/compiler-tests.h
===================================================================
--- vendor/libpcap/dist/pcap/compiler-tests.h	(nonexistent)
+++ vendor/libpcap/dist/pcap/compiler-tests.h	(revision 333789)
@@ -0,0 +1,163 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lib_pcap_compiler_tests_h
+#define lib_pcap_compiler_tests_h
+
+/*
+ * This was introduced by Clang:
+ *
+ *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
+ *
+ * in some version (which version?); it has been picked up by GCC 5.0.
+ */
+#ifndef __has_attribute
+  /*
+   * It's a macro, so you can check whether it's defined to check
+   * whether it's supported.
+   *
+   * If it's not, define it to always return 0, so that we move on to
+   * the fallback checks.
+   */
+  #define __has_attribute(x) 0
+#endif
+
+/*
+ * Note that the C90 spec's "6.8.1 Conditional inclusion" and the
+ * C99 spec's and C11 spec's "6.10.1 Conditional inclusion" say:
+ *
+ *    Prior to evaluation, macro invocations in the list of preprocessing
+ *    tokens that will become the controlling constant expression are
+ *    replaced (except for those macro names modified by the defined unary
+ *    operator), just as in normal text.  If the token "defined" is
+ *    generated as a result of this replacement process or use of the
+ *    "defined" unary operator does not match one of the two specified
+ *    forms prior to macro replacement, the behavior is undefined.
+ *
+ * so you shouldn't use defined() in a #define that's used in #if or
+ * #elif.  Some versions of Clang, for example, will warn about this.
+ *
+ * Instead, we check whether the pre-defined macros for particular
+ * compilers are defined and, if not, define the "is this version XXX
+ * or a later version of this compiler" macros as 0.
+ */
+
+/*
+ * Check whether this is GCC major.minor or a later release, or some
+ * compiler that claims to be "just like GCC" of that version or a
+ * later release.
+ */
+
+#if ! defined(__GNUC__)
+#define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) 0
+#else
+#define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) \
+	(__GNUC__ > (major) || \
+	 (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
+#endif
+
+/*
+ * Check whether this is Clang major.minor or a later release.
+ */
+
+#if !defined(__clang__)
+#define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) 0
+#else
+#define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) \
+	(__clang_major__ > (major) || \
+	 (__clang_major__ == (major) && __clang_minor__ >= (minor)))
+#endif
+
+/*
+ * Check whether this is Sun C/SunPro C/Oracle Studio major.minor
+ * or a later release.
+ *
+ * The version number in __SUNPRO_C is encoded in hex BCD, with the
+ * uppermost hex digit being the major version number, the next
+ * one or two hex digits being the minor version number, and
+ * the last digit being the patch version.
+ *
+ * It represents the *compiler* version, not the product version;
+ * see
+ *
+ *    https://sourceforge.net/p/predef/wiki/Compilers/
+ *
+ * for a partial mapping, which we assume continues for later
+ * 12.x product releases.
+ */
+
+#if ! defined(__SUNPRO_C)
+#define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) 0
+#else
+#define PCAP_SUNPRO_VERSION_TO_BCD(major, minor) \
+	(((minor) >= 10) ? \
+	    (((major) << 12) | (((minor)/10) << 8) | (((minor)%10) << 4)) : \
+	    (((major) << 8) | ((minor) << 4)))
+#define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) \
+	(__SUNPRO_C >= PCAP_SUNPRO_VERSION_TO_BCD((major), (minor)))
+#endif
+
+/*
+ * Check whether this is IBM XL C major.minor or a later release.
+ *
+ * The version number in __xlC__ has the major version in the
+ * upper 8 bits and the minor version in the lower 8 bits.
+ */
+
+#if ! defined(__xlC__)
+#define PCAP_IS_AT_LEAST_XL_C_VERSION(major,minor) 0
+#else
+#define PCAP_IS_AT_LEAST_XL_C_VERSION(major, minor) \
+	(__xlC__ >= (((major) << 8) | (minor)))
+#endif
+
+/*
+ * Check whether this is HP aC++/HP C major.minor or a later release.
+ *
+ * The version number in __HP_aCC is encoded in zero-padded decimal BCD,
+ * with the "A." stripped off, the uppermost two decimal digits being
+ * the major version number, the next two decimal digits being the minor
+ * version number, and the last two decimal digits being the patch version.
+ * (Strip off the A., remove the . between the major and minor version
+ * number, and add two digits of patch.)
+ */
+
+#if ! defined(__HP_aCC)
+#define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) 0
+#else
+#define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) \
+	(__HP_aCC >= ((major)*10000 + (minor)*100))
+#endif
+
+#endif /* lib_pcap_funcattrs_h */

Property changes on: vendor/libpcap/dist/pcap/compiler-tests.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap/dlt.h
===================================================================
--- vendor/libpcap/dist/pcap/dlt.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/dlt.h	(revision 333789)
@@ -1,1336 +1,1401 @@
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  */
 
 #ifndef lib_pcap_dlt_h
 #define lib_pcap_dlt_h
 
 /*
  * Link-layer header type codes.
  *
  * Do *NOT* add new values to this list without asking
  * "tcpdump-workers@lists.tcpdump.org" for a value.  Otherwise, you run
  * the risk of using a value that's already being used for some other
  * purpose, and of having tools that read libpcap-format captures not
  * being able to handle captures with your new DLT_ value, with no hope
  * that they will ever be changed to do so (as that would destroy their
  * ability to read captures using that value for that other purpose).
  *
  * See
  *
  *	http://www.tcpdump.org/linktypes.html
  *
  * for detailed descriptions of some of these link-layer header types.
  */
 
 /*
  * These are the types that are the same on all platforms, and that
  * have been defined by <net/bpf.h> for ages.
  */
 #define DLT_NULL	0	/* BSD loopback encapsulation */
 #define DLT_EN10MB	1	/* Ethernet (10Mb) */
 #define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
 #define DLT_AX25	3	/* Amateur Radio AX.25 */
 #define DLT_PRONET	4	/* Proteon ProNET Token Ring */
 #define DLT_CHAOS	5	/* Chaos */
 #define DLT_IEEE802	6	/* 802.5 Token Ring */
 #define DLT_ARCNET	7	/* ARCNET, with BSD-style header */
 #define DLT_SLIP	8	/* Serial Line IP */
 #define DLT_PPP		9	/* Point-to-point Protocol */
 #define DLT_FDDI	10	/* FDDI */
 
 /*
  * These are types that are different on some platforms, and that
  * have been defined by <net/bpf.h> for ages.  We use #ifdefs to
  * detect the BSDs that define them differently from the traditional
  * libpcap <net/bpf.h>
  *
  * XXX - DLT_ATM_RFC1483 is 13 in BSD/OS, and DLT_RAW is 14 in BSD/OS,
  * but I don't know what the right #define is for BSD/OS.
  */
 #define DLT_ATM_RFC1483	11	/* LLC-encapsulated ATM */
 
 #ifdef __OpenBSD__
 #define DLT_RAW		14	/* raw IP */
 #else
 #define DLT_RAW		12	/* raw IP */
 #endif
 
 /*
  * Given that the only OS that currently generates BSD/OS SLIP or PPP
  * is, well, BSD/OS, arguably everybody should have chosen its values
  * for DLT_SLIP_BSDOS and DLT_PPP_BSDOS, which are 15 and 16, but they
  * didn't.  So it goes.
  */
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #ifndef DLT_SLIP_BSDOS
 #define DLT_SLIP_BSDOS	13	/* BSD/OS Serial Line IP */
 #define DLT_PPP_BSDOS	14	/* BSD/OS Point-to-point Protocol */
 #endif
 #else
 #define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
 #define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
 #endif
 
 /*
  * 17 was used for DLT_PFLOG in OpenBSD; it no longer is.
  *
  * It was DLT_LANE8023 in SuSE 6.3, so we defined LINKTYPE_PFLOG
  * as 117 so that pflog captures would use a link-layer header type
  * value that didn't collide with any other values.  On all
  * platforms other than OpenBSD, we defined DLT_PFLOG as 117,
  * and we mapped between LINKTYPE_PFLOG and DLT_PFLOG.
  *
  * OpenBSD eventually switched to using 117 for DLT_PFLOG as well.
  *
  * Don't use 17 for anything else.
  */
 
 /*
  * 18 is used for DLT_PFSYNC in OpenBSD, NetBSD, DragonFly BSD and
- * Mac OS X; don't use it for anything else.  (FreeBSD uses 121,
- * which collides with DLT_HHDLC, even though it doesn't use 18
- * for anything and doesn't appear to have ever used it for anything.)
+ * macOS; don't use it for anything else.  (FreeBSD uses 121, which
+ * collides with DLT_HHDLC, even though it doesn't use 18 for
+ * anything and doesn't appear to have ever used it for anything.)
  *
  * We define it as 18 on those platforms; it is, unfortunately, used
  * for DLT_CIP in Suse 6.3, so we don't define it as DLT_PFSYNC
  * in general.  As the packet format for it, like that for
  * DLT_PFLOG, is not only OS-dependent but OS-version-dependent,
  * we don't support printing it in tcpdump except on OSes that
  * have the relevant header files, so it's not that useful on
  * other platforms.
  */
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
 #define DLT_PFSYNC	18
 #endif
 
 #define DLT_ATM_CLIP	19	/* Linux Classical-IP over ATM */
 
 /*
  * Apparently Redback uses this for its SmartEdge 400/800.  I hope
  * nobody else decided to use it, too.
  */
 #define DLT_REDBACK_SMARTEDGE	32
 
 /*
  * These values are defined by NetBSD; other platforms should refrain from
  * using them for other purposes, so that NetBSD savefiles with link
  * types of 50 or 51 can be read as this type on all platforms.
  */
 #define DLT_PPP_SERIAL	50	/* PPP over serial with HDLC encapsulation */
 #define DLT_PPP_ETHER	51	/* PPP over Ethernet */
 
 /*
  * The Axent Raptor firewall - now the Symantec Enterprise Firewall - uses
  * a link-layer type of 99 for the tcpdump it supplies.  The link-layer
  * header has 6 bytes of unknown data, something that appears to be an
  * Ethernet type, and 36 bytes that appear to be 0 in at least one capture
  * I've seen.
  */
 #define DLT_SYMANTEC_FIREWALL	99
 
 /*
  * Values between 100 and 103 are used in capture file headers as
  * link-layer header type LINKTYPE_ values corresponding to DLT_ types
  * that differ between platforms; don't use those values for new DLT_
  * new types.
  */
 
 /*
  * Values starting with 104 are used for newly-assigned link-layer
  * header type values; for those link-layer header types, the DLT_
  * value returned by pcap_datalink() and passed to pcap_open_dead(),
  * and the LINKTYPE_ value that appears in capture files, are the
  * same.
  *
  * DLT_MATCHING_MIN is the lowest such value; DLT_MATCHING_MAX is
  * the highest such value.
  */
 #define DLT_MATCHING_MIN	104
 
 /*
  * This value was defined by libpcap 0.5; platforms that have defined
  * it with a different value should define it here with that value -
  * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
  * whatever value that happens to be, so programs will correctly
  * handle files with that link type regardless of the value of
  * DLT_C_HDLC.
  *
  * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
  * compatibility with programs written for BSD/OS.
  *
  * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
  * for source compatibility with programs written for libpcap 0.5.
  */
 #define DLT_C_HDLC	104	/* Cisco HDLC */
 #define DLT_CHDLC	DLT_C_HDLC
 
 #define DLT_IEEE802_11	105	/* IEEE 802.11 wireless */
 
 /*
  * 106 is reserved for Linux Classical IP over ATM; it's like DLT_RAW,
  * except when it isn't.  (I.e., sometimes it's just raw IP, and
  * sometimes it isn't.)  We currently handle it as DLT_LINUX_SLL,
  * so that we don't have to worry about the link-layer header.)
  */
 
 /*
  * Frame Relay; BSD/OS has a DLT_FR with a value of 11, but that collides
  * with other values.
  * DLT_FR and DLT_FRELAY packets start with the Q.922 Frame Relay header
  * (DLCI, etc.).
  */
 #define DLT_FRELAY	107
 
 /*
  * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
  * that the AF_ type in the link-layer header is in network byte order.
  *
  * DLT_LOOP is 12 in OpenBSD, but that's DLT_RAW in other OSes, so
  * we don't use 12 for it in OSes other than OpenBSD.
  */
 #ifdef __OpenBSD__
 #define DLT_LOOP	12
 #else
 #define DLT_LOOP	108
 #endif
 
 /*
  * Encapsulated packets for IPsec; DLT_ENC is 13 in OpenBSD, but that's
  * DLT_SLIP_BSDOS in NetBSD, so we don't use 13 for it in OSes other
  * than OpenBSD.
  */
 #ifdef __OpenBSD__
 #define DLT_ENC		13
 #else
 #define DLT_ENC		109
 #endif
 
 /*
  * Values between 110 and 112 are reserved for use in capture file headers
  * as link-layer types corresponding to DLT_ types that might differ
  * between platforms; don't use those values for new DLT_ types
  * other than the corresponding DLT_ types.
  */
 
 /*
  * This is for Linux cooked sockets.
  */
 #define DLT_LINUX_SLL	113
 
 /*
  * Apple LocalTalk hardware.
  */
 #define DLT_LTALK	114
 
 /*
  * Acorn Econet.
  */
 #define DLT_ECONET	115
 
 /*
  * Reserved for use with OpenBSD ipfilter.
  */
 #define DLT_IPFILTER	116
 
 /*
  * OpenBSD DLT_PFLOG.
  */
 #define DLT_PFLOG	117
 
 /*
  * Registered for Cisco-internal use.
  */
 #define DLT_CISCO_IOS	118
 
 /*
  * For 802.11 cards using the Prism II chips, with a link-layer
  * header including Prism monitor mode information plus an 802.11
  * header.
  */
 #define DLT_PRISM_HEADER	119
 
 /*
  * Reserved for Aironet 802.11 cards, with an Aironet link-layer header
  * (see Doug Ambrisko's FreeBSD patches).
  */
 #define DLT_AIRONET_HEADER	120
 
 /*
  * Sigh.
  *
  * 121 was reserved for Siemens HiPath HDLC on 2002-01-25, as
  * requested by Tomas Kukosa.
  *
  * On 2004-02-25, a FreeBSD checkin to sys/net/bpf.h was made that
  * assigned 121 as DLT_PFSYNC.  In current versions, its libpcap
  * does DLT_ <-> LINKTYPE_ mapping, mapping DLT_PFSYNC to a
  * LINKTYPE_PFSYNC value of 246, so it should write out DLT_PFSYNC
  * dump files with 246 as the link-layer header type.  (Earlier
  * versions might not have done mapping, in which case they would
  * have written them out with a link-layer header type of 121.)
  *
  * OpenBSD, from which pf came, however, uses 18 for DLT_PFSYNC;
  * its libpcap does no DLT_ <-> LINKTYPE_ mapping, so it would
  * write out DLT_PFSYNC dump files with use 18 as the link-layer
  * header type.
  *
  * NetBSD, DragonFly BSD, and Darwin also use 18 for DLT_PFSYNC; in
  * current versions, their libpcaps do DLT_ <-> LINKTYPE_ mapping,
  * mapping DLT_PFSYNC to a LINKTYPE_PFSYNC value of 246, so they
  * should write out DLT_PFSYNC dump files with 246 as the link-layer
  * header type.  (Earlier versions might not have done mapping,
  * in which case they'd work the same way OpenBSD does, writing
  * them out with a link-layer header type of 18.)
  *
  * We'll define DLT_PFSYNC as:
  *
  *    18 on NetBSD, OpenBSD, DragonFly BSD, and Darwin;
  *
  *    121 on FreeBSD;
  *
  *    246 everywhere else.
  *
  * We'll define DLT_HHDLC as 121 on everything except for FreeBSD;
  * anybody who wants to compile, on FreeBSD, code that uses DLT_HHDLC
  * is out of luck.
  *
  * We'll define LINKTYPE_PFSYNC as 246 on *all* platforms, so that
  * savefiles written using *this* code won't use 18 or 121 for PFSYNC,
  * they'll all use 246.
  *
  * Code that uses pcap_datalink() to determine the link-layer header
  * type of a savefile won't, when built and run on FreeBSD, be able
  * to distinguish between LINKTYPE_PFSYNC and LINKTYPE_HHDLC capture
  * files, as pcap_datalink() will give 121 for both of them.  Code
  * that doesn't, such as the code in Wireshark, will be able to
  * distinguish between them.
  *
  * FreeBSD's libpcap won't map a link-layer header type of 18 - i.e.,
  * DLT_PFSYNC files from OpenBSD and possibly older versions of NetBSD,
- * DragonFly BSD, and OS X - to DLT_PFSYNC, so code built with FreeBSD's
+ * DragonFly BSD, and macOS - to DLT_PFSYNC, so code built with FreeBSD's
  * libpcap won't treat those files as DLT_PFSYNC files.
  *
  * Other libpcaps won't map a link-layer header type of 121 to DLT_PFSYNC;
  * this means they can read DLT_HHDLC files, if any exist, but won't
  * treat pcap files written by any older versions of FreeBSD libpcap that
  * didn't map to 246 as DLT_PFSYNC files.
  */
 #ifdef __FreeBSD__
 #define DLT_PFSYNC		121
 #else
 #define DLT_HHDLC		121
 #endif
 
 /*
  * This is for RFC 2625 IP-over-Fibre Channel.
  *
  * This is not for use with raw Fibre Channel, where the link-layer
  * header starts with a Fibre Channel frame header; it's for IP-over-FC,
  * where the link-layer header starts with an RFC 2625 Network_Header
  * field.
  */
 #define DLT_IP_OVER_FC		122
 
 /*
  * This is for Full Frontal ATM on Solaris with SunATM, with a
  * pseudo-header followed by an AALn PDU.
  *
  * There may be other forms of Full Frontal ATM on other OSes,
  * with different pseudo-headers.
  *
  * If ATM software returns a pseudo-header with VPI/VCI information
  * (and, ideally, packet type information, e.g. signalling, ILMI,
  * LANE, LLC-multiplexed traffic, etc.), it should not use
  * DLT_ATM_RFC1483, but should get a new DLT_ value, so tcpdump
  * and the like don't have to infer the presence or absence of a
  * pseudo-header and the form of the pseudo-header.
  */
 #define DLT_SUNATM		123	/* Solaris+SunATM */
 
 /*
  * Reserved as per request from Kent Dahlgren <kent@praesum.com>
  * for private use.
  */
 #define DLT_RIO                 124     /* RapidIO */
 #define DLT_PCI_EXP             125     /* PCI Express */
 #define DLT_AURORA              126     /* Xilinx Aurora link layer */
 
 /*
  * Header for 802.11 plus a number of bits of link-layer information
  * including radio information, used by some recent BSD drivers as
  * well as the madwifi Atheros driver for Linux.
  */
 #define DLT_IEEE802_11_RADIO	127	/* 802.11 plus radiotap radio header */
 
 /*
  * Reserved for the TZSP encapsulation, as per request from
  * Chris Waters <chris.waters@networkchemistry.com>
  * TZSP is a generic encapsulation for any other link type,
  * which includes a means to include meta-information
  * with the packet, e.g. signal strength and channel
  * for 802.11 packets.
  */
 #define DLT_TZSP                128     /* Tazmen Sniffer Protocol */
 
 /*
  * BSD's ARCNET headers have the source host, destination host,
  * and type at the beginning of the packet; that's what's handed
  * up to userland via BPF.
  *
  * Linux's ARCNET headers, however, have a 2-byte offset field
  * between the host IDs and the type; that's what's handed up
  * to userland via PF_PACKET sockets.
  *
  * We therefore have to have separate DLT_ values for them.
  */
 #define DLT_ARCNET_LINUX	129	/* ARCNET */
 
 /*
  * Juniper-private data link types, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
  * for passing on chassis-internal metainformation such as
  * QOS profiles, etc..
  */
 #define DLT_JUNIPER_MLPPP       130
 #define DLT_JUNIPER_MLFR        131
 #define DLT_JUNIPER_ES          132
 #define DLT_JUNIPER_GGSN        133
 #define DLT_JUNIPER_MFR         134
 #define DLT_JUNIPER_ATM2        135
 #define DLT_JUNIPER_SERVICES    136
 #define DLT_JUNIPER_ATM1        137
 
 /*
  * Apple IP-over-IEEE 1394, as per a request from Dieter Siegmund
  * <dieter@apple.com>.  The header that's presented is an Ethernet-like
  * header:
  *
  *	#define FIREWIRE_EUI64_LEN	8
  *	struct firewire_header {
  *		u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
  *		u_char  firewire_shost[FIREWIRE_EUI64_LEN];
  *		u_short firewire_type;
  *	};
  *
  * with "firewire_type" being an Ethernet type value, rather than,
  * for example, raw GASP frames being handed up.
  */
 #define DLT_APPLE_IP_OVER_IEEE1394	138
 
 /*
  * Various SS7 encapsulations, as per a request from Jeff Morriss
  * <jeff.morriss[AT]ulticom.com> and subsequent discussions.
  */
 #define DLT_MTP2_WITH_PHDR	139	/* pseudo-header with various info, followed by MTP2 */
 #define DLT_MTP2		140	/* MTP2, without pseudo-header */
 #define DLT_MTP3		141	/* MTP3, without pseudo-header or MTP2 */
 #define DLT_SCCP		142	/* SCCP, without pseudo-header or MTP2 or MTP3 */
 
 /*
  * DOCSIS MAC frames.
  */
 #define DLT_DOCSIS		143
 
 /*
  * Linux-IrDA packets. Protocol defined at http://www.irda.org.
  * Those packets include IrLAP headers and above (IrLMP...), but
  * don't include Phy framing (SOF/EOF/CRC & byte stuffing), because Phy
  * framing can be handled by the hardware and depend on the bitrate.
  * This is exactly the format you would get capturing on a Linux-IrDA
  * interface (irdaX), but not on a raw serial port.
  * Note the capture is done in "Linux-cooked" mode, so each packet include
  * a fake packet header (struct sll_header). This is because IrDA packet
  * decoding is dependant on the direction of the packet (incomming or
  * outgoing).
  * When/if other platform implement IrDA capture, we may revisit the
  * issue and define a real DLT_IRDA...
  * Jean II
  */
 #define DLT_LINUX_IRDA		144
 
 /*
  * Reserved for IBM SP switch and IBM Next Federation switch.
  */
 #define DLT_IBM_SP		145
 #define DLT_IBM_SN		146
 
 /*
  * Reserved for private use.  If you have some link-layer header type
  * that you want to use within your organization, with the capture files
  * using that link-layer header type not ever be sent outside your
  * organization, you can use these values.
  *
  * No libpcap release will use these for any purpose, nor will any
  * tcpdump release use them, either.
  *
  * Do *NOT* use these in capture files that you expect anybody not using
  * your private versions of capture-file-reading tools to read; in
  * particular, do *NOT* use them in products, otherwise you may find that
  * people won't be able to use tcpdump, or snort, or Ethereal, or... to
  * read capture files from your firewall/intrusion detection/traffic
  * monitoring/etc. appliance, or whatever product uses that DLT_ value,
  * and you may also find that the developers of those applications will
  * not accept patches to let them read those files.
  *
  * Also, do not use them if somebody might send you a capture using them
  * for *their* private type and tools using them for *your* private type
  * would have to read them.
  *
  * Instead, ask "tcpdump-workers@lists.tcpdump.org" for a new DLT_ value,
  * as per the comment above, and use the type you're given.
  */
 #define DLT_USER0		147
 #define DLT_USER1		148
 #define DLT_USER2		149
 #define DLT_USER3		150
 #define DLT_USER4		151
 #define DLT_USER5		152
 #define DLT_USER6		153
 #define DLT_USER7		154
 #define DLT_USER8		155
 #define DLT_USER9		156
 #define DLT_USER10		157
 #define DLT_USER11		158
 #define DLT_USER12		159
 #define DLT_USER13		160
 #define DLT_USER14		161
 #define DLT_USER15		162
 
 /*
  * For future use with 802.11 captures - defined by AbsoluteValue
  * Systems to store a number of bits of link-layer information
  * including radio information:
  *
  *	http://www.shaftnet.org/~pizza/software/capturefrm.txt
  *
  * but it might be used by some non-AVS drivers now or in the
  * future.
  */
 #define DLT_IEEE802_11_RADIO_AVS 163	/* 802.11 plus AVS radio header */
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
  * for passing on chassis-internal metainformation such as
  * QOS profiles, etc..
  */
 #define DLT_JUNIPER_MONITOR     164
 
 /*
  * BACnet MS/TP frames.
  */
 #define DLT_BACNET_MS_TP	165
 
 /*
  * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
  *
  * This is used in some OSes to allow a kernel socket filter to distinguish
  * between incoming and outgoing packets, on a socket intended to
  * supply pppd with outgoing packets so it can do dial-on-demand and
  * hangup-on-lack-of-demand; incoming packets are filtered out so they
  * don't cause pppd to hold the connection up (you don't want random
  * input packets such as port scans, packets from old lost connections,
  * etc. to force the connection to stay up).
  *
  * The first byte of the PPP header (0xff03) is modified to accomodate
  * the direction - 0x00 = IN, 0x01 = OUT.
  */
 #define DLT_PPP_PPPD		166
 
 /*
  * Names for backwards compatibility with older versions of some PPP
  * software; new software should use DLT_PPP_PPPD.
  */
 #define DLT_PPP_WITH_DIRECTION	DLT_PPP_PPPD
 #define DLT_LINUX_PPP_WITHDIRECTION	DLT_PPP_PPPD
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
  * for passing on chassis-internal metainformation such as
  * QOS profiles, cookies, etc..
  */
 #define DLT_JUNIPER_PPPOE       167
 #define DLT_JUNIPER_PPPOE_ATM   168
 
 #define DLT_GPRS_LLC		169	/* GPRS LLC */
 #define DLT_GPF_T		170	/* GPF-T (ITU-T G.7041/Y.1303) */
 #define DLT_GPF_F		171	/* GPF-F (ITU-T G.7041/Y.1303) */
 
 /*
  * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
  * monitoring equipment.
  */
 #define DLT_GCOM_T1E1		172
 #define DLT_GCOM_SERIAL		173
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_ is used
  * for internal communication to Physical Interface Cards (PIC)
  */
 #define DLT_JUNIPER_PIC_PEER    174
 
 /*
  * Link types requested by Gregor Maier <gregor@endace.com> of Endace
  * Measurement Systems.  They add an ERF header (see
  * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
  * the link-layer header.
  */
 #define DLT_ERF_ETH		175	/* Ethernet */
 #define DLT_ERF_POS		176	/* Packet-over-SONET */
 
 /*
  * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
  * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
  * includes additional information before the LAPD header, so it's
  * not necessarily a generic LAPD header.
  */
 #define DLT_LINUX_LAPD		177
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ are used for prepending meta-information
  * like interface index, interface name
  * before standard Ethernet, PPP, Frelay & C-HDLC Frames
  */
 #define DLT_JUNIPER_ETHER       178
 #define DLT_JUNIPER_PPP         179
 #define DLT_JUNIPER_FRELAY      180
 #define DLT_JUNIPER_CHDLC       181
 
 /*
  * Multi Link Frame Relay (FRF.16)
  */
 #define DLT_MFR                 182
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for internal communication with a
  * voice Adapter Card (PIC)
  */
 #define DLT_JUNIPER_VP          183
 
 /*
  * Arinc 429 frames.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Every frame contains a 32bit A429 label.
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */
 #define DLT_A429                184
 
 /*
  * Arinc 653 Interpartition Communication messages.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Please refer to the A653-1 standard for more information.
  */
 #define DLT_A653_ICM            185
 
 /*
  * This used to be "USB packets, beginning with a USB setup header;
  * requested by Paolo Abeni <paolo.abeni@email.it>."
  *
  * However, that header didn't work all that well - it left out some
  * useful information - and was abandoned in favor of the DLT_USB_LINUX
  * header.
  *
  * This is now used by FreeBSD for its BPF taps for USB; that has its
  * own headers.  So it is written, so it is done.
  *
  * For source-code compatibility, we also define DLT_USB to have this
  * value.  We do it numerically so that, if code that includes this
  * file (directly or indirectly) also includes an OS header that also
  * defines DLT_USB as 186, we don't get a redefinition warning.
  * (NetBSD 7 does that.)
  */
 #define DLT_USB_FREEBSD		186
 #define DLT_USB			186
 
 /*
  * Bluetooth HCI UART transport layer (part H:4); requested by
  * Paolo Abeni.
  */
 #define DLT_BLUETOOTH_HCI_H4	187
 
 /*
  * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
  * <cruz_petagay@bah.com>.
  */
 #define DLT_IEEE802_16_MAC_CPS	188
 
 /*
  * USB packets, beginning with a Linux USB header; requested by
  * Paolo Abeni <paolo.abeni@email.it>.
  */
 #define DLT_USB_LINUX		189
 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Used to dump CAN packets coming from a CAN Vector board.
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */
 #define DLT_CAN20B              190
 
 /*
  * IEEE 802.15.4, with address fields padded, as is done by Linux
  * drivers; requested by Juergen Schimmer.
  */
 #define DLT_IEEE802_15_4_LINUX	191
 
 /*
  * Per Packet Information encapsulated packets.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  */
 #define DLT_PPI			192
 
 /*
  * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
  * requested by Charles Clancy.
  */
 #define DLT_IEEE802_16_MAC_CPS_RADIO	193
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for internal communication with a
  * integrated service module (ISM).
  */
 #define DLT_JUNIPER_ISM         194
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
  * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
  * For this one, we expect the FCS to be present at the end of the frame;
  * if the frame has no FCS, DLT_IEEE802_15_4_NOFCS should be used.
+ *
+ * We keep the name DLT_IEEE802_15_4 as an alias for backwards
+ * compatibility, but, again, this should *only* be used for 802.15.4
+ * frames that include the FCS.
  */
-#define DLT_IEEE802_15_4	195
+#define DLT_IEEE802_15_4_WITHFCS	195
+#define DLT_IEEE802_15_4		DLT_IEEE802_15_4_WITHFCS
 
 /*
  * Various link-layer types, with a pseudo-header, for SITA
  * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
  */
 #define DLT_SITA		196
 
 /*
  * Various link-layer types, with a pseudo-header, for Endace DAG cards;
  * encapsulates Endace ERF records.  Requested by Stephen Donnelly
  * <stephen@endace.com>.
  */
 #define DLT_ERF			197
 
 /*
  * Special header prepended to Ethernet packets when capturing from a
  * u10 Networks board.  Requested by Phil Mulholland
  * <phil@u10networks.com>.
  */
 #define DLT_RAIF1		198
 
 /*
  * IPMB packet for IPMI, beginning with the I2C slave address, followed
  * by the netFn and LUN, etc..  Requested by Chanthy Toeung
  * <chanthy.toeung@ca.kontron.com>.
  */
 #define DLT_IPMB		199
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for capturing data on a secure tunnel interface.
  */
 #define DLT_JUNIPER_ST          200
 
 /*
  * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
  * that includes direction information; requested by Paolo Abeni.
  */
 #define DLT_BLUETOOTH_HCI_H4_WITH_PHDR	201
 
 /*
  * AX.25 packet with a 1-byte KISS header; see
  *
  *	http://www.ax25.net/kiss.htm
  *
  * as per Richard Stearn <richard@rns-stearn.demon.co.uk>.
  */
 #define DLT_AX25_KISS		202
 
 /*
  * LAPD packets from an ISDN channel, starting with the address field,
  * with no pseudo-header.
  * Requested by Varuna De Silva <varunax@gmail.com>.
  */
 #define DLT_LAPD		203
 
 /*
  * Variants of various link-layer headers, with a one-byte direction
  * pseudo-header prepended - zero means "received by this host",
  * non-zero (any non-zero value) means "sent by this host" - as per
  * Will Barker <w.barker@zen.co.uk>.
  */
 #define DLT_PPP_WITH_DIR	204	/* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
 #define DLT_C_HDLC_WITH_DIR	205	/* Cisco HDLC */
 #define DLT_FRELAY_WITH_DIR	206	/* Frame Relay */
 #define DLT_LAPB_WITH_DIR	207	/* LAPB */
 
 /*
  * 208 is reserved for an as-yet-unspecified proprietary link-layer
  * type, as requested by Will Barker.
  */
 
 /*
  * IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
  * <avn@pigeonpoint.com>.
  */
 #define DLT_IPMB_LINUX		209
 
 /*
  * FlexRay automotive bus - http://www.flexray.com/ - as requested
  * by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define DLT_FLEXRAY		210
 
 /*
  * Media Oriented Systems Transport (MOST) bus for multimedia
  * transport - http://www.mostcooperation.com/ - as requested
  * by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define DLT_MOST		211
 
 /*
  * Local Interconnect Network (LIN) bus for vehicle networks -
  * http://www.lin-subbus.org/ - as requested by Hannes Kaelber
  * <hannes.kaelber@x2e.de>.
  */
 #define DLT_LIN			212
 
 /*
  * X2E-private data link type used for serial line capture,
  * as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define DLT_X2E_SERIAL		213
 
 /*
  * X2E-private data link type used for the Xoraya data logger
  * family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define DLT_X2E_XORAYA		214
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
  * nothing), but with the PHY-level data for non-ASK PHYs (4 octets
  * of 0 as preamble, one octet of SFD, one octet of frame length+
  * reserved bit, and then the MAC-layer data, starting with the
  * frame control field).
  *
  * Requested by Max Filippov <jcmvbkbc@gmail.com>.
  */
 #define DLT_IEEE802_15_4_NONASK_PHY	215
 
 /*
  * David Gibson <david@gibson.dropbear.id.au> requested this for
  * captures from the Linux kernel /dev/input/eventN devices. This
  * is used to communicate keystrokes and mouse movements from the
  * Linux kernel to display systems, such as Xorg.
  */
 #define DLT_LINUX_EVDEV		216
 
 /*
  * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
  *
  * Requested by Harald Welte <laforge@gnumonks.org>.
  */
 #define DLT_GSMTAP_UM		217
 #define DLT_GSMTAP_ABIS		218
 
 /*
  * MPLS, with an MPLS label as the link-layer header.
  * Requested by Michele Marchetto <michele@openbsd.org> on behalf
  * of OpenBSD.
  */
 #define DLT_MPLS		219
 
 /*
  * USB packets, beginning with a Linux USB header, with the USB header
  * padded to 64 bytes; required for memory-mapped access.
  */
 #define DLT_USB_LINUX_MMAPPED	220
 
 /*
  * DECT packets, with a pseudo-header; requested by
  * Matthias Wenzel <tcpdump@mazzoo.de>.
  */
 #define DLT_DECT		221
 
 /*
  * From: "Lidwa, Eric (GSFC-582.0)[SGT INC]" <eric.lidwa-1@nasa.gov>
  * Date: Mon, 11 May 2009 11:18:30 -0500
  *
  * DLT_AOS. We need it for AOS Space Data Link Protocol.
  *   I have already written dissectors for but need an OK from
  *   legal before I can submit a patch.
  *
  */
 #define DLT_AOS                 222
 
 /*
  * Wireless HART (Highway Addressable Remote Transducer)
  * From the HART Communication Foundation
  * IES/PAS 62591
  *
  * Requested by Sam Roberts <vieuxtech@gmail.com>.
  */
 #define DLT_WIHART		223
 
 /*
  * Fibre Channel FC-2 frames, beginning with a Frame_Header.
  * Requested by Kahou Lei <kahou82@gmail.com>.
  */
 #define DLT_FC_2		224
 
 /*
  * Fibre Channel FC-2 frames, beginning with an encoding of the
  * SOF, and ending with an encoding of the EOF.
  *
  * The encodings represent the frame delimiters as 4-byte sequences
  * representing the corresponding ordered sets, with K28.5
  * represented as 0xBC, and the D symbols as the corresponding
  * byte values; for example, SOFi2, which is K28.5 - D21.5 - D1.2 - D21.2,
  * is represented as 0xBC 0xB5 0x55 0x55.
  *
  * Requested by Kahou Lei <kahou82@gmail.com>.
  */
 #define DLT_FC_2_WITH_FRAME_DELIMS	225
 
 /*
  * Solaris ipnet pseudo-header; requested by Darren Reed <Darren.Reed@Sun.COM>.
  *
  * The pseudo-header starts with a one-byte version number; for version 2,
  * the pseudo-header is:
  *
  * struct dl_ipnetinfo {
- *     u_int8_t   dli_version;
- *     u_int8_t   dli_family;
- *     u_int16_t  dli_htype;
- *     u_int32_t  dli_pktlen;
- *     u_int32_t  dli_ifindex;
- *     u_int32_t  dli_grifindex;
- *     u_int32_t  dli_zsrc;
- *     u_int32_t  dli_zdst;
+ *     uint8_t   dli_version;
+ *     uint8_t   dli_family;
+ *     uint16_t  dli_htype;
+ *     uint32_t  dli_pktlen;
+ *     uint32_t  dli_ifindex;
+ *     uint32_t  dli_grifindex;
+ *     uint32_t  dli_zsrc;
+ *     uint32_t  dli_zdst;
  * };
  *
  * dli_version is 2 for the current version of the pseudo-header.
  *
  * dli_family is a Solaris address family value, so it's 2 for IPv4
  * and 26 for IPv6.
  *
  * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
  * packets, and 2 for packets arriving from another zone on the same
  * machine.
  *
  * dli_pktlen is the length of the packet data following the pseudo-header
  * (so the captured length minus dli_pktlen is the length of the
  * pseudo-header, assuming the entire pseudo-header was captured).
  *
  * dli_ifindex is the interface index of the interface on which the
  * packet arrived.
  *
  * dli_grifindex is the group interface index number (for IPMP interfaces).
  *
  * dli_zsrc is the zone identifier for the source of the packet.
  *
  * dli_zdst is the zone identifier for the destination of the packet.
  *
  * A zone number of 0 is the global zone; a zone number of 0xffffffff
  * means that the packet arrived from another host on the network, not
  * from another zone on the same machine.
  *
  * An IPv4 or IPv6 datagram follows the pseudo-header; dli_family indicates
  * which of those it is.
  */
 #define DLT_IPNET		226
 
 /*
  * CAN (Controller Area Network) frames, with a pseudo-header as supplied
  * by Linux SocketCAN, and with multi-byte numerical fields in that header
  * in big-endian byte order.
  *
  * See Documentation/networking/can.txt in the Linux source.
  *
  * Requested by Felix Obenhuber <felix@obenhuber.de>.
  */
 #define DLT_CAN_SOCKETCAN	227
 
 /*
  * Raw IPv4/IPv6; different from DLT_RAW in that the DLT_ value specifies
  * whether it's v4 or v6.  Requested by Darren Reed <Darren.Reed@Sun.COM>.
  */
 #define DLT_IPV4		228
 #define DLT_IPV6		229
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
  * nothing), and with no FCS at the end of the frame; requested by
  * Jon Smirl <jonsmirl@gmail.com>.
  */
 #define DLT_IEEE802_15_4_NOFCS	230
 
 /*
  * Raw D-Bus:
  *
  *	http://www.freedesktop.org/wiki/Software/dbus
  *
  * messages:
  *
  *	http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
  *
  * starting with the endianness flag, followed by the message type, etc.,
  * but without the authentication handshake before the message sequence:
  *
  *	http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
  *
  * Requested by Martin Vidner <martin@vidner.net>.
  */
 #define DLT_DBUS		231
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  */
 #define DLT_JUNIPER_VS			232
 #define DLT_JUNIPER_SRX_E2E		233
 #define DLT_JUNIPER_FIBRECHANNEL	234
 
 /*
  * DVB-CI (DVB Common Interface for communication between a PC Card
  * module and a DVB receiver).  See
  *
  *	http://www.kaiser.cx/pcap-dvbci.html
  *
  * for the specification.
  *
  * Requested by Martin Kaiser <martin@kaiser.cx>.
  */
 #define DLT_DVB_CI		235
 
 /*
  * Variant of 3GPP TS 27.010 multiplexing protocol (similar to, but
  * *not* the same as, 27.010).  Requested by Hans-Christoph Schemmel
  * <hans-christoph.schemmel@cinterion.com>.
  */
 #define DLT_MUX27010		236
 
 /*
  * STANAG 5066 D_PDUs.  Requested by M. Baris Demiray
  * <barisdemiray@gmail.com>.
  */
 #define DLT_STANAG_5066_D_PDU	237
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  */
 #define DLT_JUNIPER_ATM_CEMIC	238
 
 /*
  * NetFilter LOG messages
  * (payload of netlink NFNL_SUBSYS_ULOG/NFULNL_MSG_PACKET packets)
  *
  * Requested by Jakub Zawadzki <darkjames-ws@darkjames.pl>
  */
 #define DLT_NFLOG		239
 
 /*
  * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
  * for Ethernet packets with a 4-byte pseudo-header and always
  * with the payload including the FCS, as supplied by their
  * netANALYZER hardware and software.
  *
  * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
  */
 #define DLT_NETANALYZER		240
 
 /*
  * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
  * for Ethernet packets with a 4-byte pseudo-header and FCS and
  * with the Ethernet header preceded by 7 bytes of preamble and
  * 1 byte of SFD, as supplied by their netANALYZER hardware and
  * software.
  *
  * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
  */
 #define DLT_NETANALYZER_TRANSPARENT	241
 
 /*
  * IP-over-InfiniBand, as specified by RFC 4391.
  *
  * Requested by Petr Sumbera <petr.sumbera@oracle.com>.
  */
 #define DLT_IPOIB		242
 
 /*
  * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0).
  *
  * Requested by Guy Martin <gmsoft@tuxicoman.be>.
  */
 #define DLT_MPEG_2_TS		243
 
 /*
  * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as
  * used by their ng40 protocol tester.
  *
  * Requested by Jens Grimmer <jens.grimmer@ng4t.com>.
  */
 #define DLT_NG40		244
 
 /*
  * Pseudo-header giving adapter number and flags, followed by an NFC
  * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU,
  * as specified by NFC Forum Logical Link Control Protocol Technical
  * Specification LLCP 1.1.
  *
  * Requested by Mike Wakerly <mikey@google.com>.
  */
 #define DLT_NFC_LLCP		245
 
 /*
  * 246 is used as LINKTYPE_PFSYNC; do not use it for any other purpose.
  *
  * DLT_PFSYNC has different values on different platforms, and all of
  * them collide with something used elsewhere.  On platforms that
  * don't already define it, define it as 246.
  */
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
 #define DLT_PFSYNC		246
 #endif
 
 /*
  * Raw InfiniBand packets, starting with the Local Routing Header.
  *
  * Requested by Oren Kladnitsky <orenk@mellanox.com>.
  */
 #define DLT_INFINIBAND		247
 
 /*
  * SCTP, with no lower-level protocols (i.e., no IPv4 or IPv6).
  *
  * Requested by Michael Tuexen <Michael.Tuexen@lurchi.franken.de>.
  */
 #define DLT_SCTP		248
 
 /*
  * USB packets, beginning with a USBPcap header.
  *
  * Requested by Tomasz Mon <desowin@gmail.com>
  */
 #define DLT_USBPCAP		249
 
 /*
  * Schweitzer Engineering Laboratories "RTAC" product serial-line
  * packets.
  *
  * Requested by Chris Bontje <chris_bontje@selinc.com>.
  */
 #define DLT_RTAC_SERIAL		250
 
 /*
  * Bluetooth Low Energy air interface link-layer packets.
  *
  * Requested by Mike Kershaw <dragorn@kismetwireless.net>.
  */
 #define DLT_BLUETOOTH_LE_LL	251
 
 /*
  * DLT type for upper-protocol layer PDU saves from wireshark.
  *
  * the actual contents are determined by two TAGs stored with each
  * packet:
  *   EXP_PDU_TAG_LINKTYPE          the link type (LINKTYPE_ value) of the
  *				   original packet.
  *
  *   EXP_PDU_TAG_PROTO_NAME        the name of the wireshark dissector
  * 				   that can make sense of the data stored.
  */
 #define DLT_WIRESHARK_UPPER_PDU	252
 
 /*
  * DLT type for the netlink protocol (nlmon devices).
  */
 #define DLT_NETLINK		253
 
 /*
  * Bluetooth Linux Monitor headers for the BlueZ stack.
  */
 #define DLT_BLUETOOTH_LINUX_MONITOR	254
 
 /*
  * Bluetooth Basic Rate/Enhanced Data Rate baseband packets, as
  * captured by Ubertooth.
  */
 #define DLT_BLUETOOTH_BREDR_BB	255
 
 /*
  * Bluetooth Low Energy link layer packets, as captured by Ubertooth.
  */
 #define DLT_BLUETOOTH_LE_LL_WITH_PHDR	256
 
 /*
  * PROFIBUS data link layer.
  */
 #define DLT_PROFIBUS_DL		257
 
 /*
  * Apple's DLT_PKTAP headers.
  *
  * Sadly, the folks at Apple either had no clue that the DLT_USERn values
  * are for internal use within an organization and partners only, and
  * didn't know that the right way to get a link-layer header type is to
  * ask tcpdump.org for one, or knew and didn't care, so they just
  * used DLT_USER2, which causes problems for everything except for
  * their version of tcpdump.
  *
  * So I'll just give them one; hopefully this will show up in a
  * libpcap release in time for them to get this into 10.10 Big Sur
  * or whatever Mavericks' successor is called.  LINKTYPE_PKTAP
- * will be 258 *even on OS X*; that is *intentional*, so that
+ * will be 258 *even on macOS*; that is *intentional*, so that
  * PKTAP files look the same on *all* OSes (different OSes can have
  * different numerical values for a given DLT_, but *MUST NOT* have
  * different values for what goes in a file, as files can be moved
  * between OSes!).
  *
  * When capturing, on a system with a Darwin-based OS, on a device
  * that returns 149 (DLT_USER2 and Apple's DLT_PKTAP) with this
  * version of libpcap, the DLT_ value for the pcap_t  will be DLT_PKTAP,
  * and that will continue to be DLT_USER2 on Darwin-based OSes. That way,
  * binary compatibility with Mavericks is preserved for programs using
  * this version of libpcap.  This does mean that if you were using
- * DLT_USER2 for some capture device on OS X, you can't do so with
+ * DLT_USER2 for some capture device on macOS, you can't do so with
  * this version of libpcap, just as you can't with Apple's libpcap -
- * on OS X, they define DLT_PKTAP to be DLT_USER2, so programs won't
+ * on macOS, they define DLT_PKTAP to be DLT_USER2, so programs won't
  * be able to distinguish between PKTAP and whatever you were using
  * DLT_USER2 for.
  *
  * If the program saves the capture to a file using this version of
  * libpcap's pcap_dump code, the LINKTYPE_ value in the file will be
  * LINKTYPE_PKTAP, which will be 258, even on Darwin-based OSes.
  * That way, the file will *not* be a DLT_USER2 file.  That means
  * that the latest version of tcpdump, when built with this version
  * of libpcap, and sufficiently recent versions of Wireshark will
  * be able to read those files and interpret them correctly; however,
  * Apple's version of tcpdump in OS X 10.9 won't be able to handle
  * them.  (Hopefully, Apple will pick up this version of libpcap,
  * and the corresponding version of tcpdump, so that tcpdump will
  * be able to handle the old LINKTYPE_USER2 captures *and* the new
  * LINKTYPE_PKTAP captures.)
  */
 #ifdef __APPLE__
 #define DLT_PKTAP	DLT_USER2
 #else
 #define DLT_PKTAP	258
 #endif
 
 /*
  * Ethernet packets preceded by a header giving the last 6 octets
  * of the preamble specified by 802.3-2012 Clause 65, section
  * 65.1.3.2 "Transmit".
  */
 #define DLT_EPON	259
 
 /*
  * IPMI trace packets, as specified by Table 3-20 "Trace Data Block Format"
  * in the PICMG HPM.2 specification.
  */
 #define DLT_IPMI_HPM_2	260
 
 /*
  * per  Joshua Wright <jwright@hasborg.com>, formats for Zwave captures.
  */
 #define DLT_ZWAVE_R1_R2  261
 #define DLT_ZWAVE_R3     262
 
 /*
  * per Steve Karg <skarg@users.sourceforge.net>, formats for Wattstopper
  * Digital Lighting Management room bus serial protocol captures.
  */
 #define DLT_WATTSTOPPER_DLM     263
 
 /*
  * ISO 14443 contactless smart card messages.
  */
 #define DLT_ISO_14443	264
 
 /*
  * Radio data system (RDS) groups.  IEC 62106.
  * Per Jonathan Brucker <jonathan.brucke@gmail.com>.
  */
 #define DLT_RDS		265
 
 /*
+ * USB packets, beginning with a Darwin (macOS, etc.) header.
+ */
+#define DLT_USB_DARWIN	266
+
+/*
+ * OpenBSD DLT_OPENFLOW.
+ */
+#define DLT_OPENFLOW	267
+
+/*
+ * SDLC frames containing SNA PDUs.
+ */
+#define DLT_SDLC	268
+
+/*
+ * per "Selvig, Bjorn" <b.selvig@ti.com> used for
+ * TI protocol sniffer.
+ */
+#define DLT_TI_LLN_SNIFFER	269
+
+/*
+ * per: Erik de Jong <erikdejong at gmail.com> for
+ *   https://github.com/eriknl/LoRaTap/releases/tag/v0.1
+ */
+#define DLT_LORATAP             270
+
+/*
+ * per: Stefanha at gmail.com for
+ *   http://lists.sandelman.ca/pipermail/tcpdump-workers/2017-May/000772.html
+ * and: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/vsockmon.h
+ * for: http://qemu-project.org/Features/VirtioVsock
+ */
+#define DLT_VSOCK               271
+
+/*
+ * Nordic Semiconductor Bluetooth LE sniffer.
+ */
+#define DLT_NORDIC_BLE		272
+
+/*
+ * Excentis DOCSIS 3.1 RF sniffer (XRA-31)
+ *   per: bruno.verstuyft at excentis.com
+ *        http://www.xra31.com/xra-header
+ */
+#define DLT_DOCSIS31_XRA31	273
+
+/*
+ * mPackets, as specified by IEEE 802.3br Figure 99-4, starting
+ * with the preamble and always ending with a CRC field.
+ */
+#define DLT_ETHERNET_MPACKET	274
+
+/*
+ * DisplayPort AUX channel monitoring data as specified by VESA
+ * DisplayPort(DP) Standard preceeded by a pseudo-header.
+ *    per dirk.eibach at gdsys.cc
+ */
+#define DLT_DISPLAYPORT_AUX	275
+
+/*
  * In case the code that includes this file (directly or indirectly)
  * has also included OS files that happen to define DLT_MATCHING_MAX,
  * with a different value (perhaps because that OS hasn't picked up
  * the latest version of our DLT definitions), we undefine the
  * previous value of DLT_MATCHING_MAX.
  */
 #ifdef DLT_MATCHING_MAX
 #undef DLT_MATCHING_MAX
 #endif
-#define DLT_MATCHING_MAX	265	/* highest value in the "matching" range */
+#define DLT_MATCHING_MAX	275	/* highest value in the "matching" range */
 
 /*
  * DLT and savefile link type values are split into a class and
  * a member of that class.  A class value of 0 indicates a regular
  * DLT_/LINKTYPE_ value.
  */
 #define DLT_CLASS(x)		((x) & 0x03ff0000)
 
 /*
  * NetBSD-specific generic "raw" link type.  The class value indicates
  * that this is the generic raw type, and the lower 16 bits are the
  * address family we're dealing with.  Those values are NetBSD-specific;
  * do not assume that they correspond to AF_ values for your operating
  * system.
  */
 #define	DLT_CLASS_NETBSD_RAWAF	0x02240000
 #define	DLT_NETBSD_RAWAF(af)	(DLT_CLASS_NETBSD_RAWAF | (af))
 #define	DLT_NETBSD_RAWAF_AF(x)	((x) & 0x0000ffff)
 #define	DLT_IS_NETBSD_RAWAF(x)	(DLT_CLASS(x) == DLT_CLASS_NETBSD_RAWAF)
 
 #endif /* !defined(lib_pcap_dlt_h) */
Index: vendor/libpcap/dist/pcap/funcattrs.h
===================================================================
--- vendor/libpcap/dist/pcap/funcattrs.h	(nonexistent)
+++ vendor/libpcap/dist/pcap/funcattrs.h	(revision 333789)
@@ -0,0 +1,261 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lib_pcap_funcattrs_h
+#define lib_pcap_funcattrs_h
+
+#include <pcap/compiler-tests.h>
+
+/*
+ * Attributes to apply to functions and their arguments, using various
+ * compiler-specific extensions.
+ */
+
+/*
+ * PCAP_API_DEF must be used when defining *data* exported from
+ * libpcap.  It can be used when defining *functions* exported
+ * from libpcap, but it doesn't have to be used there.  It
+ * should not be used in declarations in headers.
+ *
+ * PCAP_API must be used when *declaring* data or functions
+ * exported from libpcap; PCAP_API_DEF won't work on all platforms.
+ */
+
+#if defined(_WIN32)
+  /*
+   * For Windows:
+   *
+   *    when building libpcap:
+   *
+   *       if we're building it as a DLL, we have to declare API
+   *       functions with __declspec(dllexport);
+   *
+   *       if we're building it as a static library, we don't want
+   *       to do so.
+   *
+   *    when using libpcap:
+   *
+   *       if we're using the DLL, calls to its functions are a
+   *       little more efficient if they're declared with
+   *       __declspec(dllimport);
+   *
+   *       if we're not using the dll, we don't want to declare
+   *       them that way.
+   *
+   * So:
+   *
+   *    if pcap_EXPORTS is defined, we define PCAP_API_DEF as
+   *     __declspec(dllexport);
+   *
+   *    if PCAP_DLL is defined, we define PCAP_API_DEF as
+   *    __declspec(dllimport);
+   *
+   *    otherwise, we define PCAP_API_DEF as nothing.
+   */
+  #if defined(pcap_EXPORTS)
+    /*
+     * We're compiling libpcap as a DLL, so we should export functions
+     * in our API.
+     */
+    #define PCAP_API_DEF	__declspec(dllexport)
+  #elif defined(PCAP_DLL)
+    /*
+     * We're using libpcap as a DLL, so the calls will be a little more
+     * efficient if we explicitly import the functions.
+     */
+    #define PCAP_API_DEF	__declspec(dllimport)
+  #else
+    /*
+     * Either we're building libpcap as a static library, or we're using
+     * it as a static library, or we don't know for certain that we're
+     * using it as a dynamic library, so neither import nor export the
+     * functions explicitly.
+     */
+    #define PCAP_API_DEF
+  #endif
+#elif defined(MSDOS)
+  /* XXX - does this need special treatment? */
+  #define PCAP_API_DEF
+#else /* UN*X */
+  #ifdef pcap_EXPORTS
+    /*
+     * We're compiling libpcap as a (dynamic) shared library, so we should
+     * export functions in our API.  The compiler might be configured not
+     * to export functions from a shared library by default, so we might
+     * have to explicitly mark functions as exported.
+     */
+    #if PCAP_IS_AT_LEAST_GNUC_VERSION(3,4) \
+        || PCAP_IS_AT_LEAST_XL_C_VERSION(12,0)
+      /*
+       * GCC 3.4 or later, or some compiler asserting compatibility with
+       * GCC 3.4 or later, or XL C 13.0 or later, so we have
+       * __attribute__((visibility()).
+       */
+      #define PCAP_API_DEF	__attribute__((visibility("default")))
+    #elif PCAP_IS_AT_LEAST_SUNC_VERSION(5,5)
+      /*
+       * Sun C 5.5 or later, so we have __global.
+       * (Sun C 5.9 and later also have __attribute__((visibility()),
+       * but there's no reason to prefer it with Sun C.)
+       */
+      #define PCAP_API_DEF	__global
+    #else
+      /*
+       * We don't have anything to say.
+       */
+      #define PCAP_API_DEF
+    #endif
+  #else
+    /*
+     * We're not building libpcap.
+     */
+    #define PCAP_API_DEF
+  #endif
+#endif /* _WIN32/MSDOS/UN*X */
+
+#define PCAP_API	PCAP_API_DEF extern
+
+/*
+ * PCAP_NORETURN, before a function declaration, means "this function
+ * never returns".  (It must go before the function declaration, e.g.
+ * "extern PCAP_NORETURN func(...)" rather than after the function
+ * declaration, as the MSVC version has to go before the declaration.)
+ *
+ * PCAP_NORETURN_DEF, before a function *definition*, means "this
+ * function never returns"; it would be used only for static functions
+ * that are defined before any use, and thus have no declaration.
+ * (MSVC doesn't support that; I guess the "decl" in "__declspec"
+ * means "declaration", and __declspec doesn't work with definitions.)
+ */
+#if __has_attribute(noreturn) \
+    || PCAP_IS_AT_LEAST_GNUC_VERSION(2,5) \
+    || PCAP_IS_AT_LEAST_SUNC_VERSION(5,9) \
+    || PCAP_IS_AT_LEAST_XL_C_VERSION(10,1) \
+    || PCAP_IS_AT_LEAST_HP_C_VERSION(6,10)
+  /*
+   * Compiler with support for __attribute((noreturn)), or GCC 2.5 and
+   * later, or Solaris Studio 12 (Sun C 5.9) and later, or IBM XL C 10.1
+   * and later (do any earlier versions of XL C support this?), or
+   * HP aCC A.06.10 and later.
+   */
+  #define PCAP_NORETURN __attribute((noreturn))
+  #define PCAP_NORETURN_DEF __attribute((noreturn))
+#elif defined(_MSC_VER)
+  /*
+   * MSVC.
+   */
+  #define PCAP_NORETURN __declspec(noreturn)
+  #define PCAP_NORETURN_DEF
+#else
+  #define PCAP_NORETURN
+  #define PCAP_NORETURN_DEF
+#endif
+
+/*
+ * PCAP_PRINTFLIKE(x,y), after a function declaration, means "this function
+ * does printf-style formatting, with the xth argument being the format
+ * string and the yth argument being the first argument for the format
+ * string".
+ */
+#if __has_attribute(__format__) \
+    || PCAP_IS_AT_LEAST_GNUC_VERSION(2,3) \
+    || PCAP_IS_AT_LEAST_XL_C_VERSION(10,1) \
+    || PCAP_IS_AT_LEAST_HP_C_VERSION(6,10)
+  /*
+   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
+   * and later (do any earlier versions of XL C support this?),
+   * or HP aCC A.06.10 and later.
+   */
+  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
+#else
+  #define PCAP_PRINTFLIKE(x,y)
+#endif
+
+/*
+ * PCAP_DEPRECATED(func, msg), after a function declaration, marks the
+ * function as deprecated.
+ *
+ * The first argument is the name of the function; the second argument is
+ * a string giving the warning message to use if the compiler supports that.
+ *
+ * (Thank you, Microsoft, for requiring the function name.)
+ */
+#if __has_attribute(deprecated) \
+    || PCAP_IS_AT_LEAST_GNUC_VERSION(4,5) \
+    || PCAP_IS_AT_LEAST_SUNC_VERSION(5,13)
+  /*
+   * Compiler that supports __has_attribute and __attribute__((deprecated)),
+   * or GCC 4.5 and later, or Sun/Oracle C 12.4 (Sun C 5.13) or later.
+   *
+   * Those support __attribute__((deprecated(msg))) (we assume, perhaps
+   * incorrectly, that anything that supports __has_attribute() is
+   * recent enough to support __attribute__((deprecated(msg)))).
+   */
+  #define PCAP_DEPRECATED(func, msg)	__attribute__((deprecated(msg)))
+#elif PCAP_IS_AT_LEAST_GNUC_VERSION(3,1)
+  /*
+   * GCC 3.1 through 4.4.
+   *
+   * Those support __attribute__((deprecated)) but not
+   * __attribute__((deprecated(msg))).
+   */
+  #define PCAP_DEPRECATED(func, msg)	__attribute__((deprecated))
+#elif (defined(_MSC_VER) && (_MSC_VER >= 1500)) && !defined(BUILDING_PCAP)
+  /*
+   * MSVC from Visual Studio 2008 or later, and we're not building
+   * libpcap itself.
+   *
+   * If we *are* building libpcap, we don't want this, as it'll warn
+   * us even if we *define* the function.
+   */
+  #define PCAP_DEPRECATED(func, msg)	__pragma(deprecated(func))
+#else
+  #define PCAP_DEPRECATED(func, msg)
+#endif
+
+/*
+ * For flagging arguments as format strings in MSVC.
+ */
+#ifdef _MSC_VER
+ #include <sal.h>
+ #if _MSC_VER > 1400
+  #define PCAP_FORMAT_STRING(p) _Printf_format_string_ p
+ #else
+  #define PCAP_FORMAT_STRING(p) __format_string p
+ #endif
+#else
+ #define PCAP_FORMAT_STRING(p) p
+#endif
+
+#endif /* lib_pcap_funcattrs_h */

Property changes on: vendor/libpcap/dist/pcap/funcattrs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap/namedb.h
===================================================================
--- vendor/libpcap/dist/pcap/namedb.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/namedb.h	(revision 333789)
@@ -1,85 +1,83 @@
 /*
  * Copyright (c) 1994, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef lib_pcap_namedb_h
 #define lib_pcap_namedb_h
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * As returned by the pcap_next_etherent()
  * XXX this stuff doesn't belong in this interface, but this
  * library already must do name to address translation, so
  * on systems that don't have support for /etc/ethers, we
  * export these hooks since they're already being used by
  * some applications (such as tcpdump) and already being
  * marked as exported in some OSes offering libpcap (such
  * as Debian).
  */
 struct pcap_etherent {
 	u_char addr[6];
 	char name[122];
 };
 #ifndef PCAP_ETHERS_FILE
 #define PCAP_ETHERS_FILE "/etc/ethers"
 #endif
 PCAP_API struct	pcap_etherent *pcap_next_etherent(FILE *);
 PCAP_API u_char *pcap_ether_hostton(const char*);
 PCAP_API u_char *pcap_ether_aton(const char *);
 
 PCAP_API bpf_u_int32 **pcap_nametoaddr(const char *);
-#ifdef INET6
 PCAP_API struct addrinfo *pcap_nametoaddrinfo(const char *);
-#endif
 PCAP_API bpf_u_int32 pcap_nametonetaddr(const char *);
 
 PCAP_API int	pcap_nametoport(const char *, int *, int *);
 PCAP_API int	pcap_nametoportrange(const char *, int *, int *, int *);
 PCAP_API int	pcap_nametoproto(const char *);
 PCAP_API int	pcap_nametoeproto(const char *);
 PCAP_API int	pcap_nametollc(const char *);
 /*
  * If a protocol is unknown, PROTO_UNDEF is returned.
  * Also, pcap_nametoport() returns the protocol along with the port number.
  * If there are ambiguous entried in /etc/services (i.e. domain
  * can be either tcp or udp) PROTO_UNDEF is returned.
  */
 #define PROTO_UNDEF		-1
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
Index: vendor/libpcap/dist/pcap/nflog.h
===================================================================
--- vendor/libpcap/dist/pcap/nflog.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/nflog.h	(revision 333789)
@@ -1,92 +1,94 @@
 /*
  * Copyright (c) 2013, Petar Alilovic,
  * Faculty of Electrical Engineering and Computing, University of Zagreb
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * * Redistributions of source code must retain the above copyright notice,
  *	 this list of conditions and the following disclaimer.
  * * Redistributions in binary form must reproduce the above copyright
  *	 notice, this list of conditions and the following disclaimer in the
  *	 documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
 
 #ifndef lib_pcap_nflog_h
 #define lib_pcap_nflog_h
 
+#include <pcap/pcap-inttypes.h>
+
 /*
  * Structure of an NFLOG header and TLV parts, as described at
  * http://www.tcpdump.org/linktypes/LINKTYPE_NFLOG.html
  *
  * The NFLOG header is big-endian.
  *
  * The TLV length and type are in host byte order.  The value is either
  * big-endian or is an array of bytes in some externally-specified byte
  * order (text string, link-layer address, link-layer header, packet
  * data, etc.).
  */
 typedef struct nflog_hdr {
-	u_int8_t	nflog_family;		/* address family */
-	u_int8_t	nflog_version;		/* version */
-	u_int16_t	nflog_rid;		/* resource ID */
+	uint8_t	nflog_family;		/* address family */
+	uint8_t	nflog_version;		/* version */
+	uint16_t	nflog_rid;		/* resource ID */
 } nflog_hdr_t;
 
 typedef struct nflog_tlv {
-	u_int16_t	tlv_length;		/* tlv length */
-	u_int16_t	tlv_type;		/* tlv type */
+	uint16_t	tlv_length;		/* tlv length */
+	uint16_t	tlv_type;		/* tlv type */
 	/* value follows this */
 } nflog_tlv_t;
 
 typedef struct nflog_packet_hdr {
-	u_int16_t	hw_protocol;	/* hw protocol */
-	u_int8_t	hook;		/* netfilter hook */
-	u_int8_t	pad;		/* padding to 32 bits */
+	uint16_t	hw_protocol;	/* hw protocol */
+	uint8_t	hook;		/* netfilter hook */
+	uint8_t	pad;		/* padding to 32 bits */
 } nflog_packet_hdr_t;
 
 typedef struct nflog_hwaddr {
-	u_int16_t	hw_addrlen;	/* address length */
-	u_int16_t	pad;		/* padding to 32-bit boundary */
-	u_int8_t	hw_addr[8];	/* address, up to 8 bytes */
+	uint16_t	hw_addrlen;	/* address length */
+	uint16_t	pad;		/* padding to 32-bit boundary */
+	uint8_t	hw_addr[8];	/* address, up to 8 bytes */
 } nflog_hwaddr_t;
 
 typedef struct nflog_timestamp {
-	u_int64_t	sec;
-	u_int64_t	usec;
+	uint64_t	sec;
+	uint64_t	usec;
 } nflog_timestamp_t;
 
 /*
  * TLV types.
  */
 #define NFULA_PACKET_HDR		1	/* nflog_packet_hdr_t */
 #define NFULA_MARK			2	/* packet mark from skbuff */
 #define NFULA_TIMESTAMP			3	/* nflog_timestamp_t for skbuff's time stamp */
 #define NFULA_IFINDEX_INDEV		4	/* ifindex of device on which packet received (possibly bridge group) */
 #define NFULA_IFINDEX_OUTDEV		5	/* ifindex of device on which packet transmitted (possibly bridge group) */
 #define NFULA_IFINDEX_PHYSINDEV		6	/* ifindex of physical device on which packet received (not bridge group) */
 #define NFULA_IFINDEX_PHYSOUTDEV	7	/* ifindex of physical device on which packet transmitted (not bridge group) */
 #define NFULA_HWADDR			8	/* nflog_hwaddr_t for hardware address */
 #define NFULA_PAYLOAD			9	/* packet payload */
 #define NFULA_PREFIX			10	/* text string - null-terminated, count includes NUL */
 #define NFULA_UID			11	/* UID owning socket on which packet was sent/received */
 #define NFULA_SEQ			12	/* sequence number of packets on this NFLOG socket */
 #define NFULA_SEQ_GLOBAL		13	/* sequence number of pakets on all NFLOG sockets */
 #define NFULA_GID			14	/* GID owning socket on which packet was sent/received */
 #define NFULA_HWTYPE			15	/* ARPHRD_ type of skbuff's device */
 #define NFULA_HWHEADER			16	/* skbuff's MAC-layer header */
 #define NFULA_HWLEN			17	/* length of skbuff's MAC-layer header */
 
 #endif
Index: vendor/libpcap/dist/pcap/pcap-inttypes.h
===================================================================
--- vendor/libpcap/dist/pcap/pcap-inttypes.h	(nonexistent)
+++ vendor/libpcap/dist/pcap/pcap-inttypes.h	(revision 333789)
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2009 CACE Technologies, Inc. Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef pcap_pcap_inttypes_h
+#define pcap_pcap_inttypes_h
+
+/*
+ * Get the integer types and PRi[doux]64 values from C99 <inttypes.h>
+ * defined, by hook or by crook.
+ */
+#if defined(_MSC_VER)
+  /*
+   * Compiler is MSVC.
+   */
+  #if _MSC_VER >= 1800
+    /*
+     * VS 2013 or newer; we have <inttypes.h>.
+     */
+    #include <inttypes.h>
+  #else
+    /*
+     * Earlier VS; we have to define this stuff ourselves.
+     */
+    typedef unsigned char uint8_t;
+    typedef signed char int8_t;
+    typedef unsigned short uint16_t;
+    typedef signed short int16_t;
+    typedef unsigned int uint32_t;
+    typedef signed int int32_t;
+    #ifdef _MSC_EXTENSIONS
+      typedef unsigned _int64 uint64_t;
+      typedef _int64 int64_t;
+    #else /* _MSC_EXTENSIONS */
+      typedef unsigned long long uint64_t;
+      typedef long long int64_t;
+    #endif
+  #endif
+
+  /*
+   * These may be defined by <inttypes.h>.
+   *
+   * XXX - for MSVC, we always want the _MSC_EXTENSIONS versions.
+   * What about other compilers?  If, as the MinGW Web site says MinGW
+   * does, the other compilers just use Microsoft's run-time library,
+   * then they should probably use the _MSC_EXTENSIONS even if the
+   * compiler doesn't define _MSC_EXTENSIONS.
+   *
+   * XXX - we currently aren't using any of these, but this allows
+   * their use in the future.
+   */
+  #ifndef PRId64
+    #ifdef _MSC_EXTENSIONS
+      #define PRId64	"I64d"
+    #else
+      #define PRId64	"lld"
+    #endif
+  #endif /* PRId64 */
+
+  #ifndef PRIo64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIo64	"I64o"
+    #else
+      #define PRIo64	"llo"
+    #endif
+  #endif /* PRIo64 */
+
+  #ifndef PRIx64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIx64	"I64x"
+    #else
+      #define PRIx64	"llx"
+    #endif
+  #endif
+
+  #ifndef PRIu64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIu64	"I64u"
+    #else
+      #define PRIu64	"llu"
+    #endif
+  #endif
+#elif defined(__MINGW32__) || !defined(_WIN32)
+  /*
+   * Compiler is MinGW or target is UN*X or MS-DOS.  Just use
+   * <inttypes.h>.
+   */
+  #include <inttypes.h>
+#endif
+
+#endif /* pcap/pcap-inttypes.h */

Property changes on: vendor/libpcap/dist/pcap/pcap-inttypes.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap/pcap.h
===================================================================
--- vendor/libpcap/dist/pcap/pcap.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/pcap.h	(revision 333789)
@@ -1,538 +1,973 @@
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
+/*
+ * Remote packet capture mechanisms and extensions from WinPcap:
+ *
+ * Copyright (c) 2002 - 2003
+ * NetGroup, Politecnico di Torino (Italy)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
 #ifndef lib_pcap_pcap_h
 #define lib_pcap_pcap_h
 
-#include <pcap/export-defs.h>
+#include <pcap/funcattrs.h>
 
+#include <pcap/pcap-inttypes.h>
+
 #if defined(_WIN32)
-  #include <pcap-stdinc.h>
+  #include <winsock2.h>		/* u_int, u_char etc. */
+  #include <io.h>		/* _get_osfhandle() */
 #elif defined(MSDOS)
-  #include <sys/types.h>
-  #include <sys/socket.h>  /* u_int, u_char etc. */
+  #include <sys/types.h>	/* u_int, u_char etc. */
+  #include <sys/socket.h>
 #else /* UN*X */
-  #include <sys/types.h>
+  #include <sys/types.h>	/* u_int, u_char etc. */
   #include <sys/time.h>
 #endif /* _WIN32/MSDOS/UN*X */
 
 #ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
 #include <pcap/bpf.h>
 #endif
 
 #include <stdio.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * Version number of the current version of the pcap file format.
  *
  * NOTE: this is *NOT* the version number of the libpcap library.
  * To fetch the version information for the version of libpcap
  * you're using, use pcap_lib_version().
  */
 #define PCAP_VERSION_MAJOR 2
 #define PCAP_VERSION_MINOR 4
 
 #define PCAP_ERRBUF_SIZE 256
 
 /*
  * Compatibility for systems that have a bpf.h that
  * predates the bpf typedefs for 64-bit support.
  */
 #if BPF_RELEASE - 0 < 199406
 typedef	int bpf_int32;
 typedef	u_int bpf_u_int32;
 #endif
 
 typedef struct pcap pcap_t;
 typedef struct pcap_dumper pcap_dumper_t;
 typedef struct pcap_if pcap_if_t;
 typedef struct pcap_addr pcap_addr_t;
 
 /*
  * The first record in the file contains saved values for some
  * of the flags used in the printout phases of tcpdump.
  * Many fields here are 32 bit ints so compilers won't insert unwanted
  * padding; these files need to be interchangeable across architectures.
  *
  * Do not change the layout of this structure, in any way (this includes
  * changes that only affect the length of fields in this structure).
  *
  * Also, do not change the interpretation of any of the members of this
  * structure, in any way (this includes using values other than
  * LINKTYPE_ values, as defined in "savefile.c", in the "linktype"
  * field).
  *
  * Instead:
  *
  *	introduce a new structure for the new format, if the layout
  *	of the structure changed;
  *
  *	send mail to "tcpdump-workers@lists.tcpdump.org", requesting
  *	a new magic number for your new capture file format, and, when
  *	you get the new magic number, put it in "savefile.c";
  *
  *	use that magic number for save files with the changed file
  *	header;
  *
  *	make the code in "savefile.c" capable of reading files with
  *	the old file header as well as files with the new file header
  *	(using the magic number to determine the header format).
  *
  * Then supply the changes by forking the branch at
  *
  *	https://github.com/the-tcpdump-group/libpcap/issues
  *
  * and issuing a pull request, so that future versions of libpcap and
  * programs that use it (such as tcpdump) will be able to read your new
  * capture file format.
  */
 struct pcap_file_header {
 	bpf_u_int32 magic;
 	u_short version_major;
 	u_short version_minor;
 	bpf_int32 thiszone;	/* gmt to local correction */
 	bpf_u_int32 sigfigs;	/* accuracy of timestamps */
 	bpf_u_int32 snaplen;	/* max length saved portion of each pkt */
 	bpf_u_int32 linktype;	/* data link type (LINKTYPE_*) */
 };
 
 /*
  * Macros for the value returned by pcap_datalink_ext().
  *
  * If LT_FCS_LENGTH_PRESENT(x) is true, the LT_FCS_LENGTH(x) macro
  * gives the FCS length of packets in the capture.
  */
 #define LT_FCS_LENGTH_PRESENT(x)	((x) & 0x04000000)
 #define LT_FCS_LENGTH(x)		(((x) & 0xF0000000) >> 28)
 #define LT_FCS_DATALINK_EXT(x)		((((x) & 0xF) << 28) | 0x04000000)
 
 typedef enum {
        PCAP_D_INOUT = 0,
        PCAP_D_IN,
        PCAP_D_OUT
 } pcap_direction_t;
 
 /*
  * Generic per-packet information, as supplied by libpcap.
  *
  * The time stamp can and should be a "struct timeval", regardless of
  * whether your system supports 32-bit tv_sec in "struct timeval",
  * 64-bit tv_sec in "struct timeval", or both if it supports both 32-bit
  * and 64-bit applications.  The on-disk format of savefiles uses 32-bit
  * tv_sec (and tv_usec); this structure is irrelevant to that.  32-bit
  * and 64-bit versions of libpcap, even if they're on the same platform,
  * should supply the appropriate version of "struct timeval", even if
  * that's not what the underlying packet capture mechanism supplies.
  */
 struct pcap_pkthdr {
 	struct timeval ts;	/* time stamp */
 	bpf_u_int32 caplen;	/* length of portion present */
 	bpf_u_int32 len;	/* length this packet (off wire) */
 };
 
 /*
  * As returned by the pcap_stats()
  */
 struct pcap_stat {
 	u_int ps_recv;		/* number of packets received */
 	u_int ps_drop;		/* number of packets dropped */
 	u_int ps_ifdrop;	/* drops by interface -- only supported on some platforms */
-#if defined(_WIN32) && defined(HAVE_REMOTE)
+#ifdef _WIN32
 	u_int ps_capt;		/* number of packets that reach the application */
 	u_int ps_sent;		/* number of packets sent by the server on the network */
 	u_int ps_netdrop;	/* number of packets lost on the network */
-#endif /* _WIN32 && HAVE_REMOTE */
+#endif /* _WIN32 */
 };
 
 #ifdef MSDOS
 /*
  * As returned by the pcap_stats_ex()
  */
 struct pcap_stat_ex {
        u_long  rx_packets;        /* total packets received       */
        u_long  tx_packets;        /* total packets transmitted    */
        u_long  rx_bytes;          /* total bytes received         */
        u_long  tx_bytes;          /* total bytes transmitted      */
        u_long  rx_errors;         /* bad packets received         */
        u_long  tx_errors;         /* packet transmit problems     */
        u_long  rx_dropped;        /* no space in Rx buffers       */
        u_long  tx_dropped;        /* no space available for Tx    */
        u_long  multicast;         /* multicast packets received   */
        u_long  collisions;
 
        /* detailed rx_errors: */
        u_long  rx_length_errors;
        u_long  rx_over_errors;    /* receiver ring buff overflow  */
        u_long  rx_crc_errors;     /* recv'd pkt with crc error    */
        u_long  rx_frame_errors;   /* recv'd frame alignment error */
        u_long  rx_fifo_errors;    /* recv'r fifo overrun          */
        u_long  rx_missed_errors;  /* recv'r missed packet         */
 
        /* detailed tx_errors */
        u_long  tx_aborted_errors;
        u_long  tx_carrier_errors;
        u_long  tx_fifo_errors;
        u_long  tx_heartbeat_errors;
        u_long  tx_window_errors;
      };
 #endif
 
 /*
  * Item in a list of interfaces.
  */
 struct pcap_if {
 	struct pcap_if *next;
 	char *name;		/* name to hand to "pcap_open_live()" */
 	char *description;	/* textual description of interface, or NULL */
 	struct pcap_addr *addresses;
 	bpf_u_int32 flags;	/* PCAP_IF_ interface flags */
 };
 
-#define PCAP_IF_LOOPBACK	0x00000001	/* interface is loopback */
-#define PCAP_IF_UP		0x00000002	/* interface is up */
-#define PCAP_IF_RUNNING		0x00000004	/* interface is running */
+#define PCAP_IF_LOOPBACK				0x00000001	/* interface is loopback */
+#define PCAP_IF_UP					0x00000002	/* interface is up */
+#define PCAP_IF_RUNNING					0x00000004	/* interface is running */
+#define PCAP_IF_WIRELESS				0x00000008	/* interface is wireless (*NOT* necessarily Wi-Fi!) */
+#define PCAP_IF_CONNECTION_STATUS			0x00000030	/* connection status: */
+#define PCAP_IF_CONNECTION_STATUS_UNKNOWN		0x00000000	/* unknown */
+#define PCAP_IF_CONNECTION_STATUS_CONNECTED		0x00000010	/* connected */
+#define PCAP_IF_CONNECTION_STATUS_DISCONNECTED		0x00000020	/* disconnected */
+#define PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE	0x00000030	/* not applicable */
 
 /*
  * Representation of an interface address.
  */
 struct pcap_addr {
 	struct pcap_addr *next;
 	struct sockaddr *addr;		/* address */
 	struct sockaddr *netmask;	/* netmask for that address */
 	struct sockaddr *broadaddr;	/* broadcast address for that address */
 	struct sockaddr *dstaddr;	/* P2P destination address for that address */
 };
 
 typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *,
 			     const u_char *);
 
 /*
  * Error codes for the pcap API.
  * These will all be negative, so you can check for the success or
  * failure of a call that returns these codes by checking for a
  * negative value.
  */
 #define PCAP_ERROR			-1	/* generic error code */
 #define PCAP_ERROR_BREAK		-2	/* loop terminated by pcap_breakloop */
 #define PCAP_ERROR_NOT_ACTIVATED	-3	/* the capture needs to be activated */
 #define PCAP_ERROR_ACTIVATED		-4	/* the operation can't be performed on already activated captures */
 #define PCAP_ERROR_NO_SUCH_DEVICE	-5	/* no such device exists */
 #define PCAP_ERROR_RFMON_NOTSUP		-6	/* this device doesn't support rfmon (monitor) mode */
 #define PCAP_ERROR_NOT_RFMON		-7	/* operation supported only in monitor mode */
 #define PCAP_ERROR_PERM_DENIED		-8	/* no permission to open the device */
 #define PCAP_ERROR_IFACE_NOT_UP		-9	/* interface isn't up */
 #define PCAP_ERROR_CANTSET_TSTAMP_TYPE	-10	/* this device doesn't support setting the time stamp type */
 #define PCAP_ERROR_PROMISC_PERM_DENIED	-11	/* you don't have permission to capture in promiscuous mode */
 #define PCAP_ERROR_TSTAMP_PRECISION_NOTSUP -12  /* the requested time stamp precision is not supported */
 
 /*
  * Warning codes for the pcap API.
  * These will all be positive and non-zero, so they won't look like
  * errors.
  */
 #define PCAP_WARNING			1	/* generic warning code */
 #define PCAP_WARNING_PROMISC_NOTSUP	2	/* this device doesn't support promiscuous mode */
 #define PCAP_WARNING_TSTAMP_TYPE_NOTSUP	3	/* the requested time stamp type is not supported */
 
 /*
  * Value to pass to pcap_compile() as the netmask if you don't know what
  * the netmask is.
  */
 #define PCAP_NETMASK_UNKNOWN	0xffffffff
 
-PCAP_API char	*pcap_lookupdev(char *);
+/*
+ * We're deprecating pcap_lookupdev() for various reasons (not
+ * thread-safe, can behave weirdly with WinPcap).  Callers
+ * should use pcap_findalldevs() and use the first device.
+ */
+PCAP_API char	*pcap_lookupdev(char *)
+PCAP_DEPRECATED(pcap_lookupdev, "use 'pcap_findalldevs' and use the first device");
+
 PCAP_API int	pcap_lookupnet(const char *, bpf_u_int32 *, bpf_u_int32 *, char *);
 
 PCAP_API pcap_t	*pcap_create(const char *, char *);
 PCAP_API int	pcap_set_snaplen(pcap_t *, int);
 PCAP_API int	pcap_set_promisc(pcap_t *, int);
 PCAP_API int	pcap_can_set_rfmon(pcap_t *);
 PCAP_API int	pcap_set_rfmon(pcap_t *, int);
 PCAP_API int	pcap_set_timeout(pcap_t *, int);
 PCAP_API int	pcap_set_tstamp_type(pcap_t *, int);
 PCAP_API int	pcap_set_immediate_mode(pcap_t *, int);
 PCAP_API int	pcap_set_buffer_size(pcap_t *, int);
 PCAP_API int	pcap_set_tstamp_precision(pcap_t *, int);
 PCAP_API int	pcap_get_tstamp_precision(pcap_t *);
 PCAP_API int	pcap_activate(pcap_t *);
 
 PCAP_API int	pcap_list_tstamp_types(pcap_t *, int **);
 PCAP_API void	pcap_free_tstamp_types(int *);
 PCAP_API int	pcap_tstamp_type_name_to_val(const char *);
 PCAP_API const char *pcap_tstamp_type_val_to_name(int);
 PCAP_API const char *pcap_tstamp_type_val_to_description(int);
 
+#ifdef __linux__
+PCAP_API int	pcap_set_protocol(pcap_t *, int);
+#endif
+
 /*
  * Time stamp types.
  * Not all systems and interfaces will necessarily support all of these.
  *
  * A system that supports PCAP_TSTAMP_HOST is offering time stamps
  * provided by the host machine, rather than by the capture device,
  * but not committing to any characteristics of the time stamp;
  * it will not offer any of the PCAP_TSTAMP_HOST_ subtypes.
  *
  * PCAP_TSTAMP_HOST_LOWPREC is a time stamp, provided by the host machine,
  * that's low-precision but relatively cheap to fetch; it's normally done
  * using the system clock, so it's normally synchronized with times you'd
  * fetch from system calls.
  *
  * PCAP_TSTAMP_HOST_HIPREC is a time stamp, provided by the host machine,
  * that's high-precision; it might be more expensive to fetch.  It might
  * or might not be synchronized with the system clock, and might have
  * problems with time stamps for packets received on different CPUs,
  * depending on the platform.
  *
  * PCAP_TSTAMP_ADAPTER is a high-precision time stamp supplied by the
  * capture device; it's synchronized with the system clock.
  *
  * PCAP_TSTAMP_ADAPTER_UNSYNCED is a high-precision time stamp supplied by
  * the capture device; it's not synchronized with the system clock.
  *
  * Note that time stamps synchronized with the system clock can go
  * backwards, as the system clock can go backwards.  If a clock is
  * not in sync with the system clock, that could be because the
  * system clock isn't keeping accurate time, because the other
  * clock isn't keeping accurate time, or both.
  *
  * Note that host-provided time stamps generally correspond to the
  * time when the time-stamping code sees the packet; this could
  * be some unknown amount of time after the first or last bit of
  * the packet is received by the network adapter, due to batching
  * of interrupts for packet arrival, queueing delays, etc..
  */
 #define PCAP_TSTAMP_HOST		0	/* host-provided, unknown characteristics */
 #define PCAP_TSTAMP_HOST_LOWPREC	1	/* host-provided, low precision */
 #define PCAP_TSTAMP_HOST_HIPREC		2	/* host-provided, high precision */
 #define PCAP_TSTAMP_ADAPTER		3	/* device-provided, synced with the system clock */
 #define PCAP_TSTAMP_ADAPTER_UNSYNCED	4	/* device-provided, not synced with the system clock */
 
 /*
  * Time stamp resolution types.
  * Not all systems and interfaces will necessarily support all of these
  * resolutions when doing live captures; all of them can be requested
  * when reading a savefile.
  */
 #define PCAP_TSTAMP_PRECISION_MICRO	0	/* use timestamps with microsecond precision, default */
 #define PCAP_TSTAMP_PRECISION_NANO	1	/* use timestamps with nanosecond precision */
 
 PCAP_API pcap_t	*pcap_open_live(const char *, int, int, int, char *);
 PCAP_API pcap_t	*pcap_open_dead(int, int);
 PCAP_API pcap_t	*pcap_open_dead_with_tstamp_precision(int, int, u_int);
 PCAP_API pcap_t	*pcap_open_offline_with_tstamp_precision(const char *, u_int, char *);
 PCAP_API pcap_t	*pcap_open_offline(const char *, char *);
 #ifdef _WIN32
   PCAP_API pcap_t  *pcap_hopen_offline_with_tstamp_precision(intptr_t, u_int, char *);
   PCAP_API pcap_t  *pcap_hopen_offline(intptr_t, char *);
   /*
    * If we're building libpcap, these are internal routines in savefile.c,
-   * so we mustn't define them as macros.
+   * so we must not define them as macros.
+   *
+   * If we're not building libpcap, given that the version of the C runtime
+   * with which libpcap was built might be different from the version
+   * of the C runtime with which an application using libpcap was built,
+   * and that a FILE structure may differ between the two versions of the
+   * C runtime, calls to _fileno() must use the version of _fileno() in
+   * the C runtime used to open the FILE *, not the version in the C
+   * runtime with which libpcap was built.  (Maybe once the Universal CRT
+   * rules the world, this will cease to be a problem.)
    */
   #ifndef BUILDING_PCAP
     #define pcap_fopen_offline_with_tstamp_precision(f,p,b) \
 	pcap_hopen_offline_with_tstamp_precision(_get_osfhandle(_fileno(f)), p, b)
     #define pcap_fopen_offline(f,b) \
 	pcap_hopen_offline(_get_osfhandle(_fileno(f)), b)
   #endif
 #else /*_WIN32*/
   PCAP_API pcap_t	*pcap_fopen_offline_with_tstamp_precision(FILE *, u_int, char *);
   PCAP_API pcap_t	*pcap_fopen_offline(FILE *, char *);
 #endif /*_WIN32*/
 
 PCAP_API void	pcap_close(pcap_t *);
 PCAP_API int	pcap_loop(pcap_t *, int, pcap_handler, u_char *);
 PCAP_API int	pcap_dispatch(pcap_t *, int, pcap_handler, u_char *);
 PCAP_API const u_char *pcap_next(pcap_t *, struct pcap_pkthdr *);
 PCAP_API int 	pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **);
 PCAP_API void	pcap_breakloop(pcap_t *);
 PCAP_API int	pcap_stats(pcap_t *, struct pcap_stat *);
 PCAP_API int	pcap_setfilter(pcap_t *, struct bpf_program *);
 PCAP_API int 	pcap_setdirection(pcap_t *, pcap_direction_t);
 PCAP_API int	pcap_getnonblock(pcap_t *, char *);
 PCAP_API int	pcap_setnonblock(pcap_t *, int, char *);
 PCAP_API int	pcap_inject(pcap_t *, const void *, size_t);
 PCAP_API int	pcap_sendpacket(pcap_t *, const u_char *, int);
 PCAP_API const char *pcap_statustostr(int);
 PCAP_API const char *pcap_strerror(int);
 PCAP_API char	*pcap_geterr(pcap_t *);
 PCAP_API void	pcap_perror(pcap_t *, const char *);
 PCAP_API int	pcap_compile(pcap_t *, struct bpf_program *, const char *, int,
 	    bpf_u_int32);
 PCAP_API int	pcap_compile_nopcap(int, int, struct bpf_program *,
 	    const char *, int, bpf_u_int32);
 PCAP_API void	pcap_freecode(struct bpf_program *);
 PCAP_API int	pcap_offline_filter(const struct bpf_program *,
 	    const struct pcap_pkthdr *, const u_char *);
 PCAP_API int	pcap_datalink(pcap_t *);
 PCAP_API int	pcap_datalink_ext(pcap_t *);
 PCAP_API int	pcap_list_datalinks(pcap_t *, int **);
 PCAP_API int	pcap_set_datalink(pcap_t *, int);
 PCAP_API void	pcap_free_datalinks(int *);
 PCAP_API int	pcap_datalink_name_to_val(const char *);
 PCAP_API const char *pcap_datalink_val_to_name(int);
 PCAP_API const char *pcap_datalink_val_to_description(int);
 PCAP_API int	pcap_snapshot(pcap_t *);
 PCAP_API int	pcap_is_swapped(pcap_t *);
 PCAP_API int	pcap_major_version(pcap_t *);
 PCAP_API int	pcap_minor_version(pcap_t *);
+PCAP_API int	pcap_bufsize(pcap_t *);
 
 /* XXX */
 PCAP_API FILE	*pcap_file(pcap_t *);
 PCAP_API int	pcap_fileno(pcap_t *);
 
 #ifdef _WIN32
   PCAP_API int	pcap_wsockinit(void);
 #endif
 
 PCAP_API pcap_dumper_t *pcap_dump_open(pcap_t *, const char *);
 PCAP_API pcap_dumper_t *pcap_dump_fopen(pcap_t *, FILE *fp);
 PCAP_API pcap_dumper_t *pcap_dump_open_append(pcap_t *, const char *);
 PCAP_API FILE	*pcap_dump_file(pcap_dumper_t *);
 PCAP_API long	pcap_dump_ftell(pcap_dumper_t *);
+PCAP_API int64_t	pcap_dump_ftell64(pcap_dumper_t *);
 PCAP_API int	pcap_dump_flush(pcap_dumper_t *);
 PCAP_API void	pcap_dump_close(pcap_dumper_t *);
 PCAP_API void	pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
 
 PCAP_API int	pcap_findalldevs(pcap_if_t **, char *);
 PCAP_API void	pcap_freealldevs(pcap_if_t *);
 
+/*
+ * We return a pointer to the version string, rather than exporting the
+ * version string directly.
+ *
+ * On at least some UNIXes, if you import data from a shared library into
+ * an program, the data is bound into the program binary, so if the string
+ * in the version of the library with which the program was linked isn't
+ * the same as the string in the version of the library with which the
+ * program is being run, various undesirable things may happen (warnings,
+ * the string being the one from the version of the library with which the
+ * program was linked, or even weirder things, such as the string being the
+ * one from the library but being truncated).
+ *
+ * On Windows, the string is constructed at run time.
+ */
 PCAP_API const char *pcap_lib_version(void);
 
 /*
  * On at least some versions of NetBSD and QNX, we don't want to declare
  * bpf_filter() here, as it's also be declared in <net/bpf.h>, with a
  * different signature, but, on other BSD-flavored UN*Xes, it's not
  * declared in <net/bpf.h>, so we *do* want to declare it here, so it's
  * declared when we build pcap-bpf.c.
  */
 #if !defined(__NetBSD__) && !defined(__QNX__)
   PCAP_API u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 #endif
 PCAP_API int	bpf_validate(const struct bpf_insn *f, int len);
 PCAP_API char	*bpf_image(const struct bpf_insn *, int);
 PCAP_API void	bpf_dump(const struct bpf_program *, int);
 
 #if defined(_WIN32)
 
   /*
    * Win32 definitions
    */
 
   /*!
     \brief A queue of raw packets that will be sent to the network with pcap_sendqueue_transmit().
   */
   struct pcap_send_queue
   {
-	u_int maxlen;	/* Maximum size of the the queue, in bytes. This
+	u_int maxlen;	/* Maximum size of the queue, in bytes. This
 			   variable contains the size of the buffer field. */
 	u_int len;	/* Current size of the queue, in bytes. */
 	char *buffer;	/* Buffer containing the packets to be sent. */
   };
 
   typedef struct pcap_send_queue pcap_send_queue;
 
   /*!
     \brief This typedef is a support for the pcap_get_airpcap_handle() function
   */
   #if !defined(AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_)
     #define AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_
     typedef struct _AirpcapHandle *PAirpcapHandle;
   #endif
 
   PCAP_API int pcap_setbuff(pcap_t *p, int dim);
   PCAP_API int pcap_setmode(pcap_t *p, int mode);
   PCAP_API int pcap_setmintocopy(pcap_t *p, int size);
 
   PCAP_API HANDLE pcap_getevent(pcap_t *p);
 
   PCAP_API int pcap_oid_get_request(pcap_t *, bpf_u_int32, void *, size_t *);
   PCAP_API int pcap_oid_set_request(pcap_t *, bpf_u_int32, const void *, size_t *);
 
   PCAP_API pcap_send_queue* pcap_sendqueue_alloc(u_int memsize);
 
   PCAP_API void pcap_sendqueue_destroy(pcap_send_queue* queue);
 
   PCAP_API int pcap_sendqueue_queue(pcap_send_queue* queue, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data);
 
   PCAP_API u_int pcap_sendqueue_transmit(pcap_t *p, pcap_send_queue* queue, int sync);
 
   PCAP_API struct pcap_stat *pcap_stats_ex(pcap_t *p, int *pcap_stat_size);
 
   PCAP_API int pcap_setuserbuffer(pcap_t *p, int size);
 
   PCAP_API int pcap_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks);
 
   PCAP_API int pcap_live_dump_ended(pcap_t *p, int sync);
 
   PCAP_API int pcap_start_oem(char* err_str, int flags);
 
   PCAP_API PAirpcapHandle pcap_get_airpcap_handle(pcap_t *p);
 
   #define MODE_CAPT 0
   #define MODE_STAT 1
   #define MODE_MON 2
 
 #elif defined(MSDOS)
 
   /*
    * MS-DOS definitions
    */
 
   PCAP_API int  pcap_stats_ex (pcap_t *, struct pcap_stat_ex *);
   PCAP_API void pcap_set_wait (pcap_t *p, void (*yield)(void), int wait);
   PCAP_API u_long pcap_mac_packets (void);
 
 #else /* UN*X */
 
   /*
    * UN*X definitions
    */
 
   PCAP_API int	pcap_get_selectable_fd(pcap_t *);
+  PCAP_API struct timeval *pcap_get_required_select_timeout(pcap_t *);
 
 #endif /* _WIN32/MSDOS/UN*X */
 
-#ifdef HAVE_REMOTE
-  /* Includes most of the public stuff that is needed for the remote capture */
-  #include <remote-ext.h>
-#endif	 /* HAVE_REMOTE */
+/*
+ * Remote capture definitions.
+ *
+ * These routines are only present if libpcap has been configured to
+ * include remote capture support.
+ */
+
+/*
+ * The maximum buffer size in which address, port, interface names are kept.
+ *
+ * In case the adapter name or such is larger than this value, it is truncated.
+ * This is not used by the user; however it must be aware that an hostname / interface
+ * name longer than this value will be truncated.
+ */
+#define PCAP_BUF_SIZE 1024
+
+/*
+ * The type of input source, passed to pcap_open().
+ */
+#define PCAP_SRC_FILE		2	/* local savefile */
+#define PCAP_SRC_IFLOCAL	3	/* local network interface */
+#define PCAP_SRC_IFREMOTE	4	/* interface on a remote host, using RPCAP */
+
+/*
+ * The formats allowed by pcap_open() are the following:
+ * - file://path_and_filename [opens a local file]
+ * - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
+ * - rpcap://host/devicename [opens the selected device available on a remote host]
+ * - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
+ * - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
+ * - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
+ *
+ * The formats allowed by the pcap_findalldevs_ex() are the following:
+ * - file://folder/ [lists all the files in the given folder]
+ * - rpcap:// [lists all local adapters]
+ * - rpcap://host:port/ [lists the devices available on a remote host]
+ *
+ * Referring to the 'host' and 'port' parameters, they can be either numeric or literal. Since
+ * IPv6 is fully supported, these are the allowed formats:
+ *
+ * - host (literal): e.g. host.foo.bar
+ * - host (numeric IPv4): e.g. 10.11.12.13
+ * - host (numeric IPv4, IPv6 style): e.g. [10.11.12.13]
+ * - host (numeric IPv6): e.g. [1:2:3::4]
+ * - port: can be either numeric (e.g. '80') or literal (e.g. 'http')
+ *
+ * Here you find some allowed examples:
+ * - rpcap://host.foo.bar/devicename [everything literal, no port number]
+ * - rpcap://host.foo.bar:1234/devicename [everything literal, with port number]
+ * - rpcap://10.11.12.13/devicename [IPv4 numeric, no port number]
+ * - rpcap://10.11.12.13:1234/devicename [IPv4 numeric, with port number]
+ * - rpcap://[10.11.12.13]:1234/devicename [IPv4 numeric with IPv6 format, with port number]
+ * - rpcap://[1:2:3::4]/devicename [IPv6 numeric, no port number]
+ * - rpcap://[1:2:3::4]:1234/devicename [IPv6 numeric, with port number]
+ * - rpcap://[1:2:3::4]:http/devicename [IPv6 numeric, with literal port number]
+ */
+
+/*
+ * URL schemes for capture source.
+ */
+/*
+ * This string indicates that the user wants to open a capture from a
+ * local file.
+ */
+#define PCAP_SRC_FILE_STRING "file://"
+/*
+ * This string indicates that the user wants to open a capture from a
+ * network interface.  This string does not necessarily involve the use
+ * of the RPCAP protocol. If the interface required resides on the local
+ * host, the RPCAP protocol is not involved and the local functions are used.
+ */
+#define PCAP_SRC_IF_STRING "rpcap://"
+
+/*
+ * Flags to pass to pcap_open().
+ */
+
+/*
+ * Specifies whether promiscuous mode is to be used.
+ */
+#define PCAP_OPENFLAG_PROMISCUOUS		0x00000001
+
+/*
+ * Specifies, for an RPCAP capture, whether the data transfer (in
+ * case of a remote capture) has to be done with UDP protocol.
+ *
+ * If it is '1' if you want a UDP data connection, '0' if you want
+ * a TCP data connection; control connection is always TCP-based.
+ * A UDP connection is much lighter, but it does not guarantee that all
+ * the captured packets arrive to the client workstation. Moreover,
+ * it could be harmful in case of network congestion.
+ * This flag is meaningless if the source is not a remote interface.
+ * In that case, it is simply ignored.
+ */
+#define PCAP_OPENFLAG_DATATX_UDP		0x00000002
+
+/*
+ * Specifies wheether the remote probe will capture its own generated
+ * traffic.
+ *
+ * In case the remote probe uses the same interface to capture traffic
+ * and to send data back to the caller, the captured traffic includes
+ * the RPCAP traffic as well.  If this flag is turned on, the RPCAP
+ * traffic is excluded from the capture, so that the trace returned
+ * back to the collector is does not include this traffic.
+ *
+ * Has no effect on local interfaces or savefiles.
+ */
+#define PCAP_OPENFLAG_NOCAPTURE_RPCAP		0x00000004
+
+/*
+ * Specifies whether the local adapter will capture its own generated traffic.
+ *
+ * This flag tells the underlying capture driver to drop the packets
+ * that were sent by itself.  This is useful when building applications
+ * such as bridges that should ignore the traffic they just sent.
+ *
+ * Supported only on Windows.
+ */
+#define PCAP_OPENFLAG_NOCAPTURE_LOCAL		0x00000008
+
+/*
+ * This flag configures the adapter for maximum responsiveness.
+ *
+ * In presence of a large value for nbytes, WinPcap waits for the arrival
+ * of several packets before copying the data to the user. This guarantees
+ * a low number of system calls, i.e. lower processor usage, i.e. better
+ * performance, which is good for applications like sniffers. If the user
+ * sets the PCAP_OPENFLAG_MAX_RESPONSIVENESS flag, the capture driver will
+ * copy the packets as soon as the application is ready to receive them.
+ * This is suggested for real time applications (such as, for example,
+ * a bridge) that need the best responsiveness.
+ *
+ * The equivalent with pcap_create()/pcap_activate() is "immediate mode".
+ */
+#define PCAP_OPENFLAG_MAX_RESPONSIVENESS	0x00000010
+
+/*
+ * Remote authentication methods.
+ * These are used in the 'type' member of the pcap_rmtauth structure.
+ */
+
+/*
+ * NULL authentication.
+ *
+ * The 'NULL' authentication has to be equal to 'zero', so that old
+ * applications can just put every field of struct pcap_rmtauth to zero,
+ * and it does work.
+ */
+#define RPCAP_RMTAUTH_NULL 0
+/*
+ * Username/password authentication.
+ *
+ * With this type of authentication, the RPCAP protocol will use the username/
+ * password provided to authenticate the user on the remote machine. If the
+ * authentication is successful (and the user has the right to open network
+ * devices) the RPCAP connection will continue; otherwise it will be dropped.
+ *
+ * *******NOTE********: the username and password are sent over the network
+ * to the capture server *IN CLEAR TEXT*.  Don't use this on a network
+ * that you don't completely control!  (And be *really* careful in your
+ * definition of "completely"!)
+ */
+#define RPCAP_RMTAUTH_PWD 1
+
+/*
+ * This structure keeps the information needed to autheticate the user
+ * on a remote machine.
+ *
+ * The remote machine can either grant or refuse the access according
+ * to the information provided.
+ * In case the NULL authentication is required, both 'username' and
+ * 'password' can be NULL pointers.
+ *
+ * This structure is meaningless if the source is not a remote interface;
+ * in that case, the functions which requires such a structure can accept
+ * a NULL pointer as well.
+ */
+struct pcap_rmtauth
+{
+	/*
+	 * \brief Type of the authentication required.
+	 *
+	 * In order to provide maximum flexibility, we can support different types
+	 * of authentication based on the value of this 'type' variable. The currently
+	 * supported authentication methods are defined into the
+	 * \link remote_auth_methods Remote Authentication Methods Section\endlink.
+	 */
+	int type;
+	/*
+	 * \brief Zero-terminated string containing the username that has to be
+	 * used on the remote machine for authentication.
+	 *
+	 * This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
+	 * and it can be NULL.
+	 */
+	char *username;
+	/*
+	 * \brief Zero-terminated string containing the password that has to be
+	 * used on the remote machine for authentication.
+	 *
+	 * This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
+	 * and it can be NULL.
+	 */
+	char *password;
+};
+
+/*
+ * This routine can open a savefile, a local device, or a device on
+ * a remote machine running an RPCAP server.
+ *
+ * For opening a savefile, the pcap_open_offline routines can be used,
+ * and will work just as well; code using them will work on more
+ * platforms than code using pcap_open() to open savefiles.
+ *
+ * For opening a local device, pcap_open_live() can be used; it supports
+ * most of the capabilities that pcap_open() supports, and code using it
+ * will work on more platforms than code using pcap_open().  pcap_create()
+ * and pcap_activate() can also be used; they support all capabilities
+ * that pcap_open() supports, except for the Windows-only
+ * PCAP_OPENFLAG_NOCAPTURE_LOCAL, and support additional capabilities.
+ *
+ * For opening a remote capture, pcap_open() is currently the only
+ * API available.
+ */
+PCAP_API pcap_t	*pcap_open(const char *source, int snaplen, int flags,
+	    int read_timeout, struct pcap_rmtauth *auth, char *errbuf);
+PCAP_API int	pcap_createsrcstr(char *source, int type, const char *host,
+	    const char *port, const char *name, char *errbuf);
+PCAP_API int	pcap_parsesrcstr(const char *source, int *type, char *host,
+	    char *port, char *name, char *errbuf);
+
+/*
+ * This routine can scan a directory for savefiles, list local capture
+ * devices, or list capture devices on a remote machine running an RPCAP
+ * server.
+ *
+ * For scanning for savefiles, it can be used on both UN*X systems and
+ * Windows systems; for each directory entry it sees, it tries to open
+ * the file as a savefile using pcap_open_offline(), and only includes
+ * it in the list of files if the open succeeds, so it filters out
+ * files for which the user doesn't have read permission, as well as
+ * files that aren't valid savefiles readable by libpcap.
+ *
+ * For listing local capture devices, it's just a wrapper around
+ * pcap_findalldevs(); code using pcap_findalldevs() will work on more
+ * platforms than code using pcap_findalldevs_ex().
+ *
+ * For listing remote capture devices, pcap_findalldevs_ex() is currently
+ * the only API available.
+ */
+PCAP_API int	pcap_findalldevs_ex(char *source, struct pcap_rmtauth *auth,
+	    pcap_if_t **alldevs, char *errbuf);
+
+/*
+ * Sampling methods.
+ *
+ * These allow pcap_loop(), pcap_dispatch(), pcap_next(), and pcap_next_ex()
+ * to see only a sample of packets, rather than all packets.
+ *
+ * Currently, they work only on Windows local captures.
+ */
+
+/*
+ * Specifies that no sampling is to be done on the current capture.
+ *
+ * In this case, no sampling algorithms are applied to the current capture.
+ */
+#define PCAP_SAMP_NOSAMP	0
+
+/*
+ * Specifies that only 1 out of N packets must be returned to the user.
+ *
+ * In this case, the 'value' field of the 'pcap_samp' structure indicates the
+ * number of packets (minus 1) that must be discarded before one packet got
+ * accepted.
+ * In other words, if 'value = 10', the first packet is returned to the
+ * caller, while the following 9 are discarded.
+ */
+#define PCAP_SAMP_1_EVERY_N	1
+
+/*
+ * Specifies that we have to return 1 packet every N milliseconds.
+ *
+ * In this case, the 'value' field of the 'pcap_samp' structure indicates
+ * the 'waiting time' in milliseconds before one packet got accepted.
+ * In other words, if 'value = 10', the first packet is returned to the
+ * caller; the next returned one will be the first packet that arrives
+ * when 10ms have elapsed.
+ */
+#define PCAP_SAMP_FIRST_AFTER_N_MS 2
+
+/*
+ * This structure defines the information related to sampling.
+ *
+ * In case the sampling is requested, the capturing device should read
+ * only a subset of the packets coming from the source. The returned packets
+ * depend on the sampling parameters.
+ *
+ * WARNING: The sampling process is applied *after* the filtering process.
+ * In other words, packets are filtered first, then the sampling process
+ * selects a subset of the 'filtered' packets and it returns them to the
+ * caller.
+ */
+struct pcap_samp
+{
+	/*
+	 * Method used for sampling; see above.
+	 */
+	int method;
+
+	/*
+	 * This value depends on the sampling method defined.
+	 * For its meaning, see above.
+	 */
+	int value;
+};
+
+/*
+ * New functions.
+ */
+PCAP_API struct pcap_samp *pcap_setsampling(pcap_t *p);
+
+/*
+ * RPCAP active mode.
+ */
+
+/* Maximum length of an host name (needed for the RPCAP active mode) */
+#define RPCAP_HOSTLIST_SIZE 1024
+
+/*
+ * Some minor differences between UN*X sockets and and Winsock sockets.
+ */
+#ifndef _WIN32
+  /*!
+   * \brief In Winsock, a socket handle is of type SOCKET; in UN*X, it's
+   * a file descriptor, and therefore a signed integer.
+   * We define SOCKET to be a signed integer on UN*X, so that it can
+   * be used on both platforms.
+   */
+  #define SOCKET int
+
+  /*!
+   * \brief In Winsock, the error return if socket() fails is INVALID_SOCKET;
+   * in UN*X, it's -1.
+   * We define INVALID_SOCKET to be -1 on UN*X, so that it can be used on
+   * both platforms.
+   */
+  #define INVALID_SOCKET -1
+#endif
+
+PCAP_API SOCKET	pcap_remoteact_accept(const char *address, const char *port,
+	    const char *hostlist, char *connectinghost,
+	    struct pcap_rmtauth *auth, char *errbuf);
+PCAP_API int	pcap_remoteact_list(char *hostlist, char sep, int size,
+	    char *errbuf);
+PCAP_API int	pcap_remoteact_close(const char *host, char *errbuf);
+PCAP_API void	pcap_remoteact_cleanup(void);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* lib_pcap_pcap_h */
Index: vendor/libpcap/dist/pcap/sll.h
===================================================================
--- vendor/libpcap/dist/pcap/sll.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/sll.h	(revision 333789)
@@ -1,129 +1,131 @@
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * For captures on Linux cooked sockets, we construct a fake header
  * that includes:
  *
  *	a 2-byte "packet type" which is one of:
  *
  *		LINUX_SLL_HOST		packet was sent to us
  *		LINUX_SLL_BROADCAST	packet was broadcast
  *		LINUX_SLL_MULTICAST	packet was multicast
  *		LINUX_SLL_OTHERHOST	packet was sent to somebody else
  *		LINUX_SLL_OUTGOING	packet was sent *by* us;
  *
  *	a 2-byte Ethernet protocol field;
  *
  *	a 2-byte link-layer type;
  *
  *	a 2-byte link-layer address length;
  *
  *	an 8-byte source link-layer address, whose actual length is
  *	specified by the previous value.
  *
  * All fields except for the link-layer address are in network byte order.
  *
  * DO NOT change the layout of this structure, or change any of the
  * LINUX_SLL_ values below.  If you must change the link-layer header
  * for a "cooked" Linux capture, introduce a new DLT_ type (ask
  * "tcpdump-workers@lists.tcpdump.org" for one, so that you don't give it
  * a value that collides with a value already being used), and use the
  * new header in captures of that type, so that programs that can
  * handle DLT_LINUX_SLL captures will continue to handle them correctly
  * without any change, and so that capture files with different headers
  * can be told apart and programs that read them can dissect the
  * packets in them.
  */
 
 #ifndef lib_pcap_sll_h
 #define lib_pcap_sll_h
 
 /*
  * A DLT_LINUX_SLL fake link-layer header.
  */
 #define SLL_HDR_LEN	16		/* total header length */
 #define SLL_ADDRLEN	8		/* length of address field */
 
+#include <pcap/pcap-inttypes.h>
+
 struct sll_header {
-	u_int16_t sll_pkttype;		/* packet type */
-	u_int16_t sll_hatype;		/* link-layer address type */
-	u_int16_t sll_halen;		/* link-layer address length */
-	u_int8_t sll_addr[SLL_ADDRLEN];	/* link-layer address */
-	u_int16_t sll_protocol;		/* protocol */
+	uint16_t sll_pkttype;		/* packet type */
+	uint16_t sll_hatype;		/* link-layer address type */
+	uint16_t sll_halen;		/* link-layer address length */
+	uint8_t sll_addr[SLL_ADDRLEN];	/* link-layer address */
+	uint16_t sll_protocol;		/* protocol */
 };
 
 /*
  * The LINUX_SLL_ values for "sll_pkttype"; these correspond to the
  * PACKET_ values on Linux, but are defined here so that they're
  * available even on systems other than Linux, and so that they
  * don't change even if the PACKET_ values change.
  */
 #define LINUX_SLL_HOST		0
 #define LINUX_SLL_BROADCAST	1
 #define LINUX_SLL_MULTICAST	2
 #define LINUX_SLL_OTHERHOST	3
 #define LINUX_SLL_OUTGOING	4
 
 /*
  * The LINUX_SLL_ values for "sll_protocol"; these correspond to the
  * ETH_P_ values on Linux, but are defined here so that they're
  * available even on systems other than Linux.  We assume, for now,
  * that the ETH_P_ values won't change in Linux; if they do, then:
  *
  *	if we don't translate them in "pcap-linux.c", capture files
  *	won't necessarily be readable if captured on a system that
  *	defines ETH_P_ values that don't match these values;
  *
  *	if we do translate them in "pcap-linux.c", that makes life
  *	unpleasant for the BPF code generator, as the values you test
  *	for in the kernel aren't the values that you test for when
  *	reading a capture file, so the fixup code run on BPF programs
  *	handed to the kernel ends up having to do more work.
  *
  * Add other values here as necessary, for handling packet types that
  * might show up on non-Ethernet, non-802.x networks.  (Not all the ones
  * in the Linux "if_ether.h" will, I suspect, actually show up in
  * captures.)
  */
 #define LINUX_SLL_P_802_3	0x0001	/* Novell 802.3 frames without 802.2 LLC header */
 #define LINUX_SLL_P_802_2	0x0004	/* 802.2 frames (not D/I/X Ethernet) */
 #define LINUX_SLL_P_CAN		0x000C	/* CAN frames, with SocketCAN pseudo-headers */
 #define LINUX_SLL_P_CANFD	0x000D	/* CAN FD frames, with SocketCAN pseudo-headers */
 
 #endif
Index: vendor/libpcap/dist/pcap/usb.h
===================================================================
--- vendor/libpcap/dist/pcap/usb.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/usb.h	(revision 333789)
@@ -1,141 +1,143 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Basic USB data struct
  * By Paolo Abeni <paolo.abeni@email.it>
  */
 
 #ifndef lib_pcap_usb_h
 #define lib_pcap_usb_h
 
+#include <pcap/pcap-inttypes.h>
+
 /*
  * possible transfer mode
  */
 #define URB_TRANSFER_IN   0x80
 #define URB_ISOCHRONOUS   0x0
 #define URB_INTERRUPT     0x1
 #define URB_CONTROL       0x2
 #define URB_BULK          0x3
 
 /*
  * possible event type
  */
 #define URB_SUBMIT        'S'
 #define URB_COMPLETE      'C'
 #define URB_ERROR         'E'
 
 /*
  * USB setup header as defined in USB specification.
  * Appears at the front of each Control S-type packet in DLT_USB captures.
  */
 typedef struct _usb_setup {
-	u_int8_t bmRequestType;
-	u_int8_t bRequest;
-	u_int16_t wValue;
-	u_int16_t wIndex;
-	u_int16_t wLength;
+	uint8_t bmRequestType;
+	uint8_t bRequest;
+	uint16_t wValue;
+	uint16_t wIndex;
+	uint16_t wLength;
 } pcap_usb_setup;
 
 /*
  * Information from the URB for Isochronous transfers.
  */
 typedef struct _iso_rec {
 	int32_t	error_count;
 	int32_t	numdesc;
 } iso_rec;
 
 /*
  * Header prepended by linux kernel to each event.
  * Appears at the front of each packet in DLT_USB_LINUX captures.
  */
 typedef struct _usb_header {
-	u_int64_t id;
-	u_int8_t event_type;
-	u_int8_t transfer_type;
-	u_int8_t endpoint_number;
-	u_int8_t device_address;
-	u_int16_t bus_id;
+	uint64_t id;
+	uint8_t event_type;
+	uint8_t transfer_type;
+	uint8_t endpoint_number;
+	uint8_t device_address;
+	uint16_t bus_id;
 	char setup_flag;/*if !=0 the urb setup header is not present*/
 	char data_flag; /*if !=0 no urb data is present*/
 	int64_t ts_sec;
 	int32_t ts_usec;
 	int32_t status;
-	u_int32_t urb_len;
-	u_int32_t data_len; /* amount of urb data really present in this event*/
+	uint32_t urb_len;
+	uint32_t data_len; /* amount of urb data really present in this event*/
 	pcap_usb_setup setup;
 } pcap_usb_header;
 
 /*
  * Header prepended by linux kernel to each event for the 2.6.31
  * and later kernels; for the 2.6.21 through 2.6.30 kernels, the
  * "iso_rec" information, and the fields starting with "interval"
  * are zeroed-out padding fields.
  *
  * Appears at the front of each packet in DLT_USB_LINUX_MMAPPED captures.
  */
 typedef struct _usb_header_mmapped {
-	u_int64_t id;
-	u_int8_t event_type;
-	u_int8_t transfer_type;
-	u_int8_t endpoint_number;
-	u_int8_t device_address;
-	u_int16_t bus_id;
+	uint64_t id;
+	uint8_t event_type;
+	uint8_t transfer_type;
+	uint8_t endpoint_number;
+	uint8_t device_address;
+	uint16_t bus_id;
 	char setup_flag;/*if !=0 the urb setup header is not present*/
 	char data_flag; /*if !=0 no urb data is present*/
 	int64_t ts_sec;
 	int32_t ts_usec;
 	int32_t status;
-	u_int32_t urb_len;
-	u_int32_t data_len; /* amount of urb data really present in this event*/
+	uint32_t urb_len;
+	uint32_t data_len; /* amount of urb data really present in this event*/
 	union {
 		pcap_usb_setup setup;
 		iso_rec iso;
 	} s;
 	int32_t	interval;	/* for Interrupt and Isochronous events */
 	int32_t start_frame;	/* for Isochronous events */
-	u_int32_t xfer_flags;	/* copy of URB's transfer flags */
-	u_int32_t ndesc;	/* number of isochronous descriptors */
+	uint32_t xfer_flags;	/* copy of URB's transfer flags */
+	uint32_t ndesc;	/* number of isochronous descriptors */
 } pcap_usb_header_mmapped;
 
 /*
  * Isochronous descriptors; for isochronous transfers there might be
  * one or more of these at the beginning of the packet data.  The
  * number of descriptors is given by the "ndesc" field in the header;
  * as indicated, in older kernels that don't put the descriptors at
  * the beginning of the packet, that field is zeroed out, so that field
  * can be trusted even in captures from older kernels.
  */
 typedef struct _usb_isodesc {
 	int32_t		status;
-	u_int32_t	offset;
-	u_int32_t	len;
-	u_int8_t	pad[4];
+	uint32_t	offset;
+	uint32_t	len;
+	uint8_t	pad[4];
 } usb_isodesc;
 
 #endif
Index: vendor/libpcap/dist/pcap/vlan.h
===================================================================
--- vendor/libpcap/dist/pcap/vlan.h	(revision 333788)
+++ vendor/libpcap/dist/pcap/vlan.h	(revision 333789)
@@ -1,44 +1,46 @@
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef lib_pcap_vlan_h
 #define lib_pcap_vlan_h
 
+#include <pcap/pcap-inttypes.h>
+
 struct vlan_tag {
-	u_int16_t	vlan_tpid;		/* ETH_P_8021Q */
-	u_int16_t	vlan_tci;		/* VLAN TCI */
+	uint16_t	vlan_tpid;		/* ETH_P_8021Q */
+	uint16_t	vlan_tci;		/* VLAN TCI */
 };
 
 #define VLAN_TAG_LEN	4
 
 #endif
Index: vendor/libpcap/dist/pcap-bpf.c
===================================================================
--- vendor/libpcap/dist/pcap-bpf.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-bpf.c	(revision 333789)
@@ -1,3108 +1,3292 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>			/* optionally get BSD define */
-#ifdef HAVE_ZEROCOPY_BPF
-#include <sys/mman.h>
-#endif
 #include <sys/socket.h>
 #include <time.h>
 /*
  * <net/bpf.h> defines ioctls, but doesn't include <sys/ioccom.h>.
  *
  * We include <sys/ioctl.h> as it might be necessary to declare ioctl();
- * at least on *BSD and Mac OS X, it also defines various SIOC ioctls -
+ * at least on *BSD and macOS, it also defines various SIOC ioctls -
  * we could include <sys/sockio.h>, but if we're already including
  * <sys/ioctl.h>, which includes <sys/sockio.h> on those platforms,
  * there's not much point in doing so.
  *
  * If we have <sys/ioccom.h>, we include it as well, to handle systems
  * such as Solaris which don't arrange to include <sys/ioccom.h> if you
  * include <sys/ioctl.h>
  */
 #include <sys/ioctl.h>
 #ifdef HAVE_SYS_IOCCOM_H
 #include <sys/ioccom.h>
 #endif
 #include <sys/utsname.h>
 
 #if defined(__FreeBSD__) && defined(SIOCIFCREATE2)
 /*
  * Add support for capturing on FreeBSD usbusN interfaces.
  */
 static const char usbus_prefix[] = "usbus";
 #define USBUS_PREFIX_LEN	(sizeof(usbus_prefix) - 1)
 #include <dirent.h>
 #endif
 
-#ifdef HAVE_ZEROCOPY_BPF
-#include <machine/atomic.h>
-#endif
-
 #include <net/if.h>
 
 #ifdef _AIX
 
 /*
  * Make "pcap.h" not include "pcap/bpf.h"; we are going to include the
  * native OS version, as we need "struct bpf_config" from it.
  */
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
 
 #include <sys/types.h>
 
 /*
  * Prevent bpf.h from redefining the DLT_ values to their
  * IFT_ values, as we're going to return the standard libpcap
  * values, not IBM's non-standard IFT_ values.
  */
 #undef _AIX
 #include <net/bpf.h>
 #define _AIX
 
+/*
+ * If both BIOCROTZBUF and BPF_BUFMODE_ZBUF are defined, we have
+ * zero-copy BPF.
+ */
+#if defined(BIOCROTZBUF) && defined(BPF_BUFMODE_ZBUF)
+  #define HAVE_ZEROCOPY_BPF
+  #include <sys/mman.h>
+  #include <machine/atomic.h>
+#endif
+
 #include <net/if_types.h>		/* for IFT_ values */
 #include <sys/sysconfig.h>
 #include <sys/device.h>
 #include <sys/cfgodm.h>
 #include <cf.h>
 
 #ifdef __64BIT__
 #define domakedev makedev64
 #define getmajor major64
 #define bpf_hdr bpf_hdr32
 #else /* __64BIT__ */
 #define domakedev makedev
 #define getmajor major
 #endif /* __64BIT__ */
 
 #define BPF_NAME "bpf"
 #define BPF_MINORS 4
 #define DRIVER_PATH "/usr/lib/drivers"
 #define BPF_NODE "/dev/bpf"
 static int bpfloadedflag = 0;
 static int odmlockid = 0;
 
 static int bpf_load(char *errbuf);
 
 #else /* _AIX */
 
 #include <net/bpf.h>
 
 #endif /* _AIX */
 
 #include <ctype.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_NET_IF_MEDIA_H
+#ifdef SIOCGIFMEDIA
 # include <net/if_media.h>
 #endif
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * Later versions of NetBSD stick padding in front of FDDI frames
  * to align the IP header on a 4-byte boundary.
  */
 #if defined(__NetBSD__) && __NetBSD_Version__ > 106000000
 #define       PCAP_FDDIPAD 3
 #endif
 
 /*
  * Private data for capturing on BPF devices.
  */
 struct pcap_bpf {
 #ifdef HAVE_ZEROCOPY_BPF
 	/*
 	 * Zero-copy read buffer -- for zero-copy BPF.  'buffer' above will
 	 * alternative between these two actual mmap'd buffers as required.
 	 * As there is a header on the front size of the mmap'd buffer, only
 	 * some of the buffer is exposed to libpcap as a whole via bufsize;
 	 * zbufsize is the true size.  zbuffer tracks the current zbuf
 	 * assocated with buffer so that it can be used to decide which the
 	 * next buffer to read will be.
 	 */
 	u_char *zbuf1, *zbuf2, *zbuffer;
 	u_int zbufsize;
 	u_int zerocopy;
 	u_int interrupted;
 	struct timespec firstsel;
 	/*
 	 * If there's currently a buffer being actively processed, then it is
 	 * referenced here; 'buffer' is also pointed at it, but offset by the
 	 * size of the header.
 	 */
 	struct bpf_zbuf_header *bzh;
 	int nonblock;		/* true if in nonblocking mode */
 #endif /* HAVE_ZEROCOPY_BPF */
 
 	char *device;		/* device name */
 	int filtering_in_kernel; /* using kernel filter */
 	int must_do_on_close;	/* stuff we must do when we close */
 };
 
 /*
  * Stuff to do when we close.
  */
 #define MUST_CLEAR_RFMON	0x00000001	/* clear rfmon (monitor) mode */
 #define MUST_DESTROY_USBUS	0x00000002	/* destroy usbusN interface */
 
 #ifdef BIOCGDLTLIST
 # if (defined(HAVE_NET_IF_MEDIA_H) && defined(IFM_IEEE80211)) && !defined(__APPLE__)
 #define HAVE_BSD_IEEE80211
 
 /*
  * The ifm_ulist member of a struct ifmediareq is an int * on most systems,
  * but it's a uint64_t on newer versions of OpenBSD.
  *
  * We check this by checking whether IFM_GMASK is defined and > 2^32-1.
  */
 #  if defined(IFM_GMASK) && IFM_GMASK > 0xFFFFFFFF
 #    define IFM_ULIST_TYPE	uint64_t
 #  else
 #    define IFM_ULIST_TYPE	int
 #  endif
 # endif
 
 # if defined(__APPLE__) || defined(HAVE_BSD_IEEE80211)
 static int find_802_11(struct bpf_dltlist *);
 
 #  ifdef HAVE_BSD_IEEE80211
 static int monitor_mode(pcap_t *, int);
 #  endif
 
 #  if defined(__APPLE__)
 static void remove_en(pcap_t *);
 static void remove_802_11(pcap_t *);
 #  endif
 
 # endif /* defined(__APPLE__) || defined(HAVE_BSD_IEEE80211) */
 
 #endif /* BIOCGDLTLIST */
 
 #if defined(sun) && defined(LIFNAMSIZ) && defined(lifr_zoneid)
 #include <zone.h>
 #endif
 
 /*
  * We include the OS's <net/bpf.h>, not our "pcap/bpf.h", so we probably
  * don't get DLT_DOCSIS defined.
  */
 #ifndef DLT_DOCSIS
 #define DLT_DOCSIS	143
 #endif
 
 /*
- * On OS X, we don't even get any of the 802.11-plus-radio-header DLT_'s
- * defined, even though some of them are used by various Airport drivers.
+ * In some versions of macOS, we might not even get any of the
+ * 802.11-plus-radio-header DLT_'s defined, even though some
+ * of them are used by various Airport drivers in those versions.
  */
 #ifndef DLT_PRISM_HEADER
 #define DLT_PRISM_HEADER	119
 #endif
 #ifndef DLT_AIRONET_HEADER
 #define DLT_AIRONET_HEADER	120
 #endif
 #ifndef DLT_IEEE802_11_RADIO
 #define DLT_IEEE802_11_RADIO	127
 #endif
 #ifndef DLT_IEEE802_11_RADIO_AVS
 #define DLT_IEEE802_11_RADIO_AVS 163
 #endif
 
 static int pcap_can_set_rfmon_bpf(pcap_t *p);
 static int pcap_activate_bpf(pcap_t *p);
 static int pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp);
 static int pcap_setdirection_bpf(pcap_t *, pcap_direction_t);
 static int pcap_set_datalink_bpf(pcap_t *p, int dlt);
 
 /*
  * For zerocopy bpf, the setnonblock/getnonblock routines need to modify
  * pb->nonblock so we don't call select(2) if the pcap handle is in non-
  * blocking mode.
  */
 static int
-pcap_getnonblock_bpf(pcap_t *p, char *errbuf)
+pcap_getnonblock_bpf(pcap_t *p)
 {
 #ifdef HAVE_ZEROCOPY_BPF
 	struct pcap_bpf *pb = p->priv;
 
 	if (pb->zerocopy)
 		return (pb->nonblock);
 #endif
-	return (pcap_getnonblock_fd(p, errbuf));
+	return (pcap_getnonblock_fd(p));
 }
 
 static int
-pcap_setnonblock_bpf(pcap_t *p, int nonblock, char *errbuf)
+pcap_setnonblock_bpf(pcap_t *p, int nonblock)
 {
 #ifdef HAVE_ZEROCOPY_BPF
 	struct pcap_bpf *pb = p->priv;
 
 	if (pb->zerocopy) {
 		pb->nonblock = nonblock;
 		return (0);
 	}
 #endif
-	return (pcap_setnonblock_fd(p, nonblock, errbuf));
+	return (pcap_setnonblock_fd(p, nonblock));
 }
 
 #ifdef HAVE_ZEROCOPY_BPF
 /*
  * Zero-copy BPF buffer routines to check for and acknowledge BPF data in
  * shared memory buffers.
  *
  * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer,
  * and set up p->buffer and cc to reflect one if available.  Notice that if
  * there was no prior buffer, we select zbuf1 as this will be the first
  * buffer filled for a fresh BPF session.
  */
 static int
 pcap_next_zbuf_shm(pcap_t *p, int *cc)
 {
 	struct pcap_bpf *pb = p->priv;
 	struct bpf_zbuf_header *bzh;
 
 	if (pb->zbuffer == pb->zbuf2 || pb->zbuffer == NULL) {
 		bzh = (struct bpf_zbuf_header *)pb->zbuf1;
 		if (bzh->bzh_user_gen !=
 		    atomic_load_acq_int(&bzh->bzh_kernel_gen)) {
 			pb->bzh = bzh;
 			pb->zbuffer = (u_char *)pb->zbuf1;
 			p->buffer = pb->zbuffer + sizeof(*bzh);
 			*cc = bzh->bzh_kernel_len;
 			return (1);
 		}
 	} else if (pb->zbuffer == pb->zbuf1) {
 		bzh = (struct bpf_zbuf_header *)pb->zbuf2;
 		if (bzh->bzh_user_gen !=
 		    atomic_load_acq_int(&bzh->bzh_kernel_gen)) {
 			pb->bzh = bzh;
 			pb->zbuffer = (u_char *)pb->zbuf2;
   			p->buffer = pb->zbuffer + sizeof(*bzh);
 			*cc = bzh->bzh_kernel_len;
 			return (1);
 		}
 	}
 	*cc = 0;
 	return (0);
 }
 
 /*
  * pcap_next_zbuf() -- Similar to pcap_next_zbuf_shm(), except wait using
  * select() for data or a timeout, and possibly force rotation of the buffer
  * in the event we time out or are in immediate mode.  Invoke the shared
  * memory check before doing system calls in order to avoid doing avoidable
  * work.
  */
 static int
 pcap_next_zbuf(pcap_t *p, int *cc)
 {
 	struct pcap_bpf *pb = p->priv;
 	struct bpf_zbuf bz;
 	struct timeval tv;
 	struct timespec cur;
 	fd_set r_set;
 	int data, r;
 	int expire, tmout;
 
 #define TSTOMILLI(ts) (((ts)->tv_sec * 1000) + ((ts)->tv_nsec / 1000000))
 	/*
 	 * Start out by seeing whether anything is waiting by checking the
 	 * next shared memory buffer for data.
 	 */
 	data = pcap_next_zbuf_shm(p, cc);
 	if (data)
 		return (data);
 	/*
 	 * If a previous sleep was interrupted due to signal delivery, make
 	 * sure that the timeout gets adjusted accordingly.  This requires
 	 * that we analyze when the timeout should be been expired, and
 	 * subtract the current time from that.  If after this operation,
 	 * our timeout is less then or equal to zero, handle it like a
 	 * regular timeout.
 	 */
 	tmout = p->opt.timeout;
 	if (tmout)
 		(void) clock_gettime(CLOCK_MONOTONIC, &cur);
 	if (pb->interrupted && p->opt.timeout) {
 		expire = TSTOMILLI(&pb->firstsel) + p->opt.timeout;
 		tmout = expire - TSTOMILLI(&cur);
 #undef TSTOMILLI
 		if (tmout <= 0) {
 			pb->interrupted = 0;
 			data = pcap_next_zbuf_shm(p, cc);
 			if (data)
 				return (data);
 			if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) {
-				(void) pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "BIOCROTZBUF: %s", strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "BIOCROTZBUF");
 				return (PCAP_ERROR);
 			}
 			return (pcap_next_zbuf_shm(p, cc));
 		}
 	}
 	/*
 	 * No data in the buffer, so must use select() to wait for data or
 	 * the next timeout.  Note that we only call select if the handle
 	 * is in blocking mode.
 	 */
 	if (!pb->nonblock) {
 		FD_ZERO(&r_set);
 		FD_SET(p->fd, &r_set);
 		if (tmout != 0) {
 			tv.tv_sec = tmout / 1000;
 			tv.tv_usec = (tmout * 1000) % 1000000;
 		}
 		r = select(p->fd + 1, &r_set, NULL, NULL,
 		    p->opt.timeout != 0 ? &tv : NULL);
 		if (r < 0 && errno == EINTR) {
 			if (!pb->interrupted && p->opt.timeout) {
 				pb->interrupted = 1;
 				pb->firstsel = cur;
 			}
 			return (0);
 		} else if (r < 0) {
-			(void) pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "select: %s", strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "select");
 			return (PCAP_ERROR);
 		}
 	}
 	pb->interrupted = 0;
 	/*
 	 * Check again for data, which may exist now that we've either been
 	 * woken up as a result of data or timed out.  Try the "there's data"
 	 * case first since it doesn't require a system call.
 	 */
 	data = pcap_next_zbuf_shm(p, cc);
 	if (data)
 		return (data);
 	/*
 	 * Try forcing a buffer rotation to dislodge timed out or immediate
 	 * data.
 	 */
 	if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) {
-		(void) pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "BIOCROTZBUF: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCROTZBUF");
 		return (PCAP_ERROR);
 	}
 	return (pcap_next_zbuf_shm(p, cc));
 }
 
 /*
  * Notify kernel that we are done with the buffer.  We don't reset zbuffer so
  * that we know which buffer to use next time around.
  */
 static int
 pcap_ack_zbuf(pcap_t *p)
 {
 	struct pcap_bpf *pb = p->priv;
 
 	atomic_store_rel_int(&pb->bzh->bzh_user_gen,
 	    pb->bzh->bzh_kernel_gen);
 	pb->bzh = NULL;
 	p->buffer = NULL;
 	return (0);
 }
 #endif /* HAVE_ZEROCOPY_BPF */
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_bpf));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_bpf;
 	p->can_set_rfmon_op = pcap_can_set_rfmon_bpf;
 #ifdef BIOCSTSTAMP
 	/*
 	 * We claim that we support microsecond and nanosecond time
 	 * stamps.
 	 */
 	p->tstamp_precision_count = 2;
 	p->tstamp_precision_list = malloc(2 * sizeof(u_int));
 	if (p->tstamp_precision_list == NULL) {
-		snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE, errno,
+		    "malloc");
 		free(p);
 		return (NULL);
 	}
 	p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
 	p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
 #endif /* BIOCSTSTAMP */
 	return (p);
 }
 
 /*
  * On success, returns a file descriptor for a BPF device.
  * On failure, returns a PCAP_ERROR_ value, and sets p->errbuf.
  */
 static int
 bpf_open(char *errbuf)
 {
-	int fd;
-#ifdef HAVE_CLONING_BPF
-	static const char device[] = "/dev/bpf";
-#else
+	int fd = -1;
+	static const char cloning_device[] = "/dev/bpf";
 	int n = 0;
 	char device[sizeof "/dev/bpf0000000000"];
-#endif
+	static int no_cloning_bpf = 0;
 
 #ifdef _AIX
 	/*
 	 * Load the bpf driver, if it isn't already loaded,
 	 * and create the BPF device entries, if they don't
 	 * already exist.
 	 */
 	if (bpf_load(errbuf) == PCAP_ERROR)
 		return (PCAP_ERROR);
 #endif
 
-#ifdef HAVE_CLONING_BPF
-	if ((fd = open(device, O_RDWR)) == -1 &&
-	    (errno != EACCES || (fd = open(device, O_RDONLY)) == -1)) {
-		if (errno == EACCES)
-			fd = PCAP_ERROR_PERM_DENIED;
-		else
-			fd = PCAP_ERROR;
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		  "(cannot open device) %s: %s", device, pcap_strerror(errno));
-	}
-#else
 	/*
-	 * Go through all the minors and find one that isn't in use.
+	 * First, unless we've already tried opening /dev/bpf and
+	 * gotten ENOENT, try opening /dev/bpf.
+	 * If it fails with ENOENT, remember that, so we don't try
+	 * again, and try /dev/bpfN.
 	 */
-	do {
-		(void)pcap_snprintf(device, sizeof(device), "/dev/bpf%d", n++);
+	if (!no_cloning_bpf &&
+	    (fd = open(cloning_device, O_RDWR)) == -1 &&
+	    ((errno != EACCES && errno != ENOENT) ||
+	     (fd = open(cloning_device, O_RDONLY)) == -1)) {
+		if (errno != ENOENT) {
+			if (errno == EACCES)
+				fd = PCAP_ERROR_PERM_DENIED;
+			else
+				fd = PCAP_ERROR;
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "(cannot open device) %s", cloning_device);
+			return (fd);
+		}
+		no_cloning_bpf = 1;
+	}
+
+	if (no_cloning_bpf) {
 		/*
-		 * Initially try a read/write open (to allow the inject
-		 * method to work).  If that fails due to permission
-		 * issues, fall back to read-only.  This allows a
-		 * non-root user to be granted specific access to pcap
-		 * capabilities via file permissions.
-		 *
-		 * XXX - we should have an API that has a flag that
-		 * controls whether to open read-only or read-write,
-		 * so that denial of permission to send (or inability
-		 * to send, if sending packets isn't supported on
-		 * the device in question) can be indicated at open
-		 * time.
+		 * We don't have /dev/bpf.
+		 * Go through all the /dev/bpfN minors and find one
+		 * that isn't in use.
 		 */
-		fd = open(device, O_RDWR);
-		if (fd == -1 && errno == EACCES)
-			fd = open(device, O_RDONLY);
-	} while (fd < 0 && errno == EBUSY);
+		do {
+			(void)pcap_snprintf(device, sizeof(device), "/dev/bpf%d", n++);
+			/*
+			 * Initially try a read/write open (to allow the inject
+			 * method to work).  If that fails due to permission
+			 * issues, fall back to read-only.  This allows a
+			 * non-root user to be granted specific access to pcap
+			 * capabilities via file permissions.
+			 *
+			 * XXX - we should have an API that has a flag that
+			 * controls whether to open read-only or read-write,
+			 * so that denial of permission to send (or inability
+			 * to send, if sending packets isn't supported on
+			 * the device in question) can be indicated at open
+			 * time.
+			 */
+			fd = open(device, O_RDWR);
+			if (fd == -1 && errno == EACCES)
+				fd = open(device, O_RDONLY);
+		} while (fd < 0 && errno == EBUSY);
+	}
 
 	/*
 	 * XXX better message for all minors used
 	 */
 	if (fd < 0) {
 		switch (errno) {
 
 		case ENOENT:
 			fd = PCAP_ERROR;
 			if (n == 1) {
 				/*
 				 * /dev/bpf0 doesn't exist, which
 				 * means we probably have no BPF
 				 * devices.
 				 */
 				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 				    "(there are no BPF devices)");
 			} else {
 				/*
 				 * We got EBUSY on at least one
 				 * BPF device, so we have BPF
 				 * devices, but all the ones
 				 * that exist are busy.
 				 */
 				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 				    "(all BPF devices are busy)");
 			}
 			break;
 
 		case EACCES:
 			/*
 			 * Got EACCES on the last device we tried,
 			 * and EBUSY on all devices before that,
 			 * if any.
 			 */
 			fd = PCAP_ERROR_PERM_DENIED;
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "(cannot open BPF device) %s: %s", device,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "(cannot open BPF device) %s", device);
 			break;
 
 		default:
 			/*
 			 * Some other problem.
 			 */
 			fd = PCAP_ERROR;
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "(cannot open BPF device) %s: %s", device,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "(cannot open BPF device) %s", device);
 			break;
 		}
 	}
-#endif
 
 	return (fd);
 }
 
 /*
  * Open and bind to a device; used if we're not actually going to use
  * the device, but are just testing whether it can be opened, or opening
  * it to get information about it.
  *
  * Returns an error code on failure (always negative), and an FD for
  * the now-bound BPF device on success (always non-negative).
  */
 static int
 bpf_open_and_bind(const char *name, char *errbuf)
 {
 	int fd;
 	struct ifreq ifr;
 
 	/*
 	 * First, open a BPF device.
 	 */
 	fd = bpf_open(errbuf);
 	if (fd < 0)
 		return (fd);	/* fd is the appropriate error code */
 
 	/*
 	 * Now bind to the device.
 	 */
 	(void)strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 	if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
 		switch (errno) {
 
 		case ENXIO:
 			/*
 			 * There's no such device.
 			 */
 			close(fd);
 			return (PCAP_ERROR_NO_SUCH_DEVICE);
 
 		case ENETDOWN:
 			/*
 			 * Return a "network down" indication, so that
 			 * the application can report that rather than
 			 * saying we had a mysterious failure and
 			 * suggest that they report a problem to the
 			 * libpcap developers.
 			 */
 			close(fd);
 			return (PCAP_ERROR_IFACE_NOT_UP);
 
 		default:
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "BIOCSETIF: %s: %s", name, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCSETIF: %s", name);
 			close(fd);
 			return (PCAP_ERROR);
 		}
 	}
 
 	/*
 	 * Success.
 	 */
 	return (fd);
 }
 
 #ifdef BIOCGDLTLIST
 static int
 get_dlt_list(int fd, int v, struct bpf_dltlist *bdlp, char *ebuf)
 {
 	memset(bdlp, 0, sizeof(*bdlp));
 	if (ioctl(fd, BIOCGDLTLIST, (caddr_t)bdlp) == 0) {
 		u_int i;
 		int is_ethernet;
 
 		bdlp->bfl_list = (u_int *) malloc(sizeof(u_int) * (bdlp->bfl_len + 1));
 		if (bdlp->bfl_list == NULL) {
-			(void)pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
 			return (PCAP_ERROR);
 		}
 
 		if (ioctl(fd, BIOCGDLTLIST, (caddr_t)bdlp) < 0) {
-			(void)pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			    "BIOCGDLTLIST: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCGDLTLIST");
 			free(bdlp->bfl_list);
 			return (PCAP_ERROR);
 		}
 
 		/*
 		 * OK, for real Ethernet devices, add DLT_DOCSIS to the
 		 * list, so that an application can let you choose it,
 		 * in case you're capturing DOCSIS traffic that a Cisco
 		 * Cable Modem Termination System is putting out onto
 		 * an Ethernet (it doesn't put an Ethernet header onto
 		 * the wire, it puts raw DOCSIS frames out on the wire
 		 * inside the low-level Ethernet framing).
 		 *
 		 * A "real Ethernet device" is defined here as a device
 		 * that has a link-layer type of DLT_EN10MB and that has
 		 * no alternate link-layer types; that's done to exclude
 		 * 802.11 interfaces (which might or might not be the
 		 * right thing to do, but I suspect it is - Ethernet <->
 		 * 802.11 bridges would probably badly mishandle frames
 		 * that don't have Ethernet headers).
 		 *
 		 * On Solaris with BPF, Ethernet devices also offer
 		 * DLT_IPNET, so we, if DLT_IPNET is defined, we don't
 		 * treat it as an indication that the device isn't an
 		 * Ethernet.
 		 */
 		if (v == DLT_EN10MB) {
 			is_ethernet = 1;
 			for (i = 0; i < bdlp->bfl_len; i++) {
 				if (bdlp->bfl_list[i] != DLT_EN10MB
 #ifdef DLT_IPNET
 				    && bdlp->bfl_list[i] != DLT_IPNET
 #endif
 				    ) {
 					is_ethernet = 0;
 					break;
 				}
 			}
 			if (is_ethernet) {
 				/*
 				 * We reserved one more slot at the end of
 				 * the list.
 				 */
 				bdlp->bfl_list[bdlp->bfl_len] = DLT_DOCSIS;
 				bdlp->bfl_len++;
 			}
 		}
 	} else {
 		/*
 		 * EINVAL just means "we don't support this ioctl on
 		 * this device"; don't treat it as an error.
 		 */
 		if (errno != EINVAL) {
-			(void)pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			    "BIOCGDLTLIST: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCGDLTLIST");
 			return (PCAP_ERROR);
 		}
 	}
 	return (0);
 }
 #endif
 
 static int
 pcap_can_set_rfmon_bpf(pcap_t *p)
 {
 #if defined(__APPLE__)
 	struct utsname osinfo;
 	struct ifreq ifr;
 	int fd;
 #ifdef BIOCGDLTLIST
 	struct bpf_dltlist bdl;
 #endif
 
 	/*
-	 * The joys of monitor mode on OS X.
+	 * The joys of monitor mode on Mac OS X/OS X/macOS.
 	 *
 	 * Prior to 10.4, it's not supported at all.
 	 *
 	 * In 10.4, if adapter enN supports monitor mode, there's a
 	 * wltN adapter corresponding to it; you open it, instead of
 	 * enN, to get monitor mode.  You get whatever link-layer
 	 * headers it supplies.
 	 *
 	 * In 10.5, and, we assume, later releases, if adapter enN
 	 * supports monitor mode, it offers, among its selectable
 	 * DLT_ values, values that let you get the 802.11 header;
 	 * selecting one of those values puts the adapter into monitor
 	 * mode (i.e., you can't get 802.11 headers except in monitor
 	 * mode, and you can't get Ethernet headers in monitor mode).
 	 */
 	if (uname(&osinfo) == -1) {
 		/*
 		 * Can't get the OS version; just say "no".
 		 */
 		return (0);
 	}
 	/*
 	 * We assume osinfo.sysname is "Darwin", because
 	 * __APPLE__ is defined.  We just check the version.
 	 */
 	if (osinfo.release[0] < '8' && osinfo.release[1] == '.') {
 		/*
 		 * 10.3 (Darwin 7.x) or earlier.
 		 * Monitor mode not supported.
 		 */
 		return (0);
 	}
 	if (osinfo.release[0] == '8' && osinfo.release[1] == '.') {
 		/*
 		 * 10.4 (Darwin 8.x).  s/en/wlt/, and check
 		 * whether the device exists.
 		 */
 		if (strncmp(p->opt.device, "en", 2) != 0) {
 			/*
 			 * Not an enN device; no monitor mode.
 			 */
 			return (0);
 		}
 		fd = socket(AF_INET, SOCK_DGRAM, 0);
 		if (fd == -1) {
-			(void)pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "socket: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "socket");
 			return (PCAP_ERROR);
 		}
 		strlcpy(ifr.ifr_name, "wlt", sizeof(ifr.ifr_name));
 		strlcat(ifr.ifr_name, p->opt.device + 2, sizeof(ifr.ifr_name));
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) {
 			/*
 			 * No such device?
 			 */
 			close(fd);
 			return (0);
 		}
 		close(fd);
 		return (1);
 	}
 
 #ifdef BIOCGDLTLIST
 	/*
 	 * Everything else is 10.5 or later; for those,
 	 * we just open the enN device, and check whether
 	 * we have any 802.11 devices.
 	 *
 	 * First, open a BPF device.
 	 */
 	fd = bpf_open(p->errbuf);
 	if (fd < 0)
 		return (fd);	/* fd is the appropriate error code */
 
 	/*
 	 * Now bind to the device.
 	 */
 	(void)strncpy(ifr.ifr_name, p->opt.device, sizeof(ifr.ifr_name));
 	if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
 		switch (errno) {
 
 		case ENXIO:
 			/*
 			 * There's no such device.
 			 */
 			close(fd);
 			return (PCAP_ERROR_NO_SUCH_DEVICE);
 
 		case ENETDOWN:
 			/*
 			 * Return a "network down" indication, so that
 			 * the application can report that rather than
 			 * saying we had a mysterious failure and
 			 * suggest that they report a problem to the
 			 * libpcap developers.
 			 */
 			close(fd);
 			return (PCAP_ERROR_IFACE_NOT_UP);
 
 		default:
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "BIOCSETIF: %s: %s",
-			    p->opt.device, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCSETIF: %s", p->opt.device);
 			close(fd);
 			return (PCAP_ERROR);
 		}
 	}
 
 	/*
 	 * We know the default link type -- now determine all the DLTs
 	 * this interface supports.  If this fails with EINVAL, it's
 	 * not fatal; we just don't get to use the feature later.
 	 * (We don't care about DLT_DOCSIS, so we pass DLT_NULL
 	 * as the default DLT for this adapter.)
 	 */
 	if (get_dlt_list(fd, DLT_NULL, &bdl, p->errbuf) == PCAP_ERROR) {
 		close(fd);
 		return (PCAP_ERROR);
 	}
 	if (find_802_11(&bdl) != -1) {
 		/*
 		 * We have an 802.11 DLT, so we can set monitor mode.
 		 */
 		free(bdl.bfl_list);
 		close(fd);
 		return (1);
 	}
 	free(bdl.bfl_list);
 	close(fd);
 #endif /* BIOCGDLTLIST */
 	return (0);
 #elif defined(HAVE_BSD_IEEE80211)
 	int ret;
 
 	ret = monitor_mode(p, 0);
 	if (ret == PCAP_ERROR_RFMON_NOTSUP)
 		return (0);	/* not an error, just a "can't do" */
 	if (ret == 0)
 		return (1);	/* success */
 	return (ret);
 #else
 	return (0);
 #endif
 }
 
 static int
 pcap_stats_bpf(pcap_t *p, struct pcap_stat *ps)
 {
 	struct bpf_stat s;
 
 	/*
 	 * "ps_recv" counts packets handed to the filter, not packets
 	 * that passed the filter.  This includes packets later dropped
 	 * because we ran out of buffer space.
 	 *
 	 * "ps_drop" counts packets dropped inside the BPF device
 	 * because we ran out of buffer space.  It doesn't count
 	 * packets dropped by the interface driver.  It counts
 	 * only packets that passed the filter.
 	 *
 	 * Both statistics include packets not yet read from the kernel
 	 * by libpcap, and thus not yet seen by the application.
 	 */
 	if (ioctl(p->fd, BIOCGSTATS, (caddr_t)&s) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGSTATS: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCGSTATS");
 		return (PCAP_ERROR);
 	}
 
 	ps->ps_recv = s.bs_recv;
 	ps->ps_drop = s.bs_drop;
 	ps->ps_ifdrop = 0;
 	return (0);
 }
 
 static int
 pcap_read_bpf(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_bpf *pb = p->priv;
 	int cc;
 	int n = 0;
 	register u_char *bp, *ep;
 	u_char *datap;
 #ifdef PCAP_FDDIPAD
 	register u_int pad;
 #endif
 #ifdef HAVE_ZEROCOPY_BPF
 	int i;
 #endif
 
  again:
 	/*
 	 * Has "pcap_breakloop()" been called?
 	 */
 	if (p->break_loop) {
 		/*
 		 * Yes - clear the flag that indicates that it
 		 * has, and return PCAP_ERROR_BREAK to indicate
 		 * that we were told to break out of the loop.
 		 */
 		p->break_loop = 0;
 		return (PCAP_ERROR_BREAK);
 	}
 	cc = p->cc;
 	if (p->cc == 0) {
 		/*
 		 * When reading without zero-copy from a file descriptor, we
 		 * use a single buffer and return a length of data in the
 		 * buffer.  With zero-copy, we update the p->buffer pointer
 		 * to point at whatever underlying buffer contains the next
 		 * data and update cc to reflect the data found in the
 		 * buffer.
 		 */
 #ifdef HAVE_ZEROCOPY_BPF
 		if (pb->zerocopy) {
 			if (p->buffer != NULL)
 				pcap_ack_zbuf(p);
 			i = pcap_next_zbuf(p, &cc);
 			if (i == 0)
 				goto again;
 			if (i < 0)
 				return (PCAP_ERROR);
 		} else
 #endif
 		{
 			cc = read(p->fd, p->buffer, p->bufsize);
 		}
 		if (cc < 0) {
 			/* Don't choke when we get ptraced */
 			switch (errno) {
 
 			case EINTR:
 				goto again;
 
 #ifdef _AIX
 			case EFAULT:
 				/*
 				 * Sigh.  More AIX wonderfulness.
 				 *
 				 * For some unknown reason the uiomove()
 				 * operation in the bpf kernel extension
 				 * used to copy the buffer into user
 				 * space sometimes returns EFAULT. I have
 				 * no idea why this is the case given that
 				 * a kernel debugger shows the user buffer
 				 * is correct. This problem appears to
 				 * be mostly mitigated by the memset of
 				 * the buffer before it is first used.
 				 * Very strange.... Shaun Clowes
 				 *
 				 * In any case this means that we shouldn't
 				 * treat EFAULT as a fatal error; as we
 				 * don't have an API for returning
 				 * a "some packets were dropped since
 				 * the last packet you saw" indication,
 				 * we just ignore EFAULT and keep reading.
 				 */
 				goto again;
 #endif
 
 			case EWOULDBLOCK:
 				return (0);
 
 			case ENXIO:
 				/*
 				 * The device on which we're capturing
 				 * went away.
 				 *
 				 * XXX - we should really return
 				 * PCAP_ERROR_IFACE_NOT_UP, but
 				 * pcap_dispatch() etc. aren't
 				 * defined to retur that.
 				 */
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "The interface went down");
 				return (PCAP_ERROR);
 
 #if defined(sun) && !defined(BSD) && !defined(__svr4__) && !defined(__SVR4)
 			/*
 			 * Due to a SunOS bug, after 2^31 bytes, the kernel
 			 * file offset overflows and read fails with EINVAL.
 			 * The lseek() to 0 will fix things.
 			 */
 			case EINVAL:
 				if (lseek(p->fd, 0L, SEEK_CUR) +
 				    p->bufsize < 0) {
 					(void)lseek(p->fd, 0L, SEEK_SET);
 					goto again;
 				}
 				/* fall through */
 #endif
 			}
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "read");
 			return (PCAP_ERROR);
 		}
 		bp = (u_char *)p->buffer;
 	} else
 		bp = p->bp;
 
 	/*
 	 * Loop through each packet.
 	 */
 #ifdef BIOCSTSTAMP
 #define bhp ((struct bpf_xhdr *)bp)
 #else
 #define bhp ((struct bpf_hdr *)bp)
 #endif
 	ep = bp + cc;
 #ifdef PCAP_FDDIPAD
 	pad = p->fddipad;
 #endif
 	while (bp < ep) {
 		register u_int caplen, hdrlen;
 
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return PCAP_ERROR_BREAK
 		 * to indicate that we were told to break out of the loop,
 		 * otherwise leave the flag set, so that the *next* call
 		 * will break out of the loop without having read any
 		 * packets, and return the number of packets we've
 		 * processed so far.
 		 */
 		if (p->break_loop) {
 			p->bp = bp;
 			p->cc = ep - bp;
 			/*
 			 * ep is set based on the return value of read(),
 			 * but read() from a BPF device doesn't necessarily
 			 * return a value that's a multiple of the alignment
 			 * value for BPF_WORDALIGN().  However, whenever we
 			 * increment bp, we round up the increment value by
 			 * a value rounded up by BPF_WORDALIGN(), so we
 			 * could increment bp past ep after processing the
 			 * last packet in the buffer.
 			 *
 			 * We treat ep < bp as an indication that this
 			 * happened, and just set p->cc to 0.
 			 */
 			if (p->cc < 0)
 				p->cc = 0;
 			if (n == 0) {
 				p->break_loop = 0;
 				return (PCAP_ERROR_BREAK);
 			} else
 				return (n);
 		}
 
 		caplen = bhp->bh_caplen;
 		hdrlen = bhp->bh_hdrlen;
 		datap = bp + hdrlen;
 		/*
 		 * Short-circuit evaluation: if using BPF filter
 		 * in kernel, no need to do it now - we already know
 		 * the packet passed the filter.
 		 *
 #ifdef PCAP_FDDIPAD
 		 * Note: the filter code was generated assuming
 		 * that p->fddipad was the amount of padding
 		 * before the header, as that's what's required
 		 * in the kernel, so we run the filter before
 		 * skipping that padding.
 #endif
 		 */
 		if (pb->filtering_in_kernel ||
 		    bpf_filter(p->fcode.bf_insns, datap, bhp->bh_datalen, caplen)) {
 			struct pcap_pkthdr pkthdr;
 #ifdef BIOCSTSTAMP
 			struct bintime bt;
 
 			bt.sec = bhp->bh_tstamp.bt_sec;
 			bt.frac = bhp->bh_tstamp.bt_frac;
 			if (p->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO) {
 				struct timespec ts;
 
 				bintime2timespec(&bt, &ts);
 				pkthdr.ts.tv_sec = ts.tv_sec;
 				pkthdr.ts.tv_usec = ts.tv_nsec;
 			} else {
 				struct timeval tv;
 
 				bintime2timeval(&bt, &tv);
 				pkthdr.ts.tv_sec = tv.tv_sec;
 				pkthdr.ts.tv_usec = tv.tv_usec;
 			}
 #else
 			pkthdr.ts.tv_sec = bhp->bh_tstamp.tv_sec;
 #ifdef _AIX
 			/*
 			 * AIX's BPF returns seconds/nanoseconds time
 			 * stamps, not seconds/microseconds time stamps.
 			 */
 			pkthdr.ts.tv_usec = bhp->bh_tstamp.tv_usec/1000;
 #else
 			pkthdr.ts.tv_usec = bhp->bh_tstamp.tv_usec;
 #endif
 #endif /* BIOCSTSTAMP */
 #ifdef PCAP_FDDIPAD
 			if (caplen > pad)
 				pkthdr.caplen = caplen - pad;
 			else
 				pkthdr.caplen = 0;
 			if (bhp->bh_datalen > pad)
 				pkthdr.len = bhp->bh_datalen - pad;
 			else
 				pkthdr.len = 0;
 			datap += pad;
 #else
 			pkthdr.caplen = caplen;
 			pkthdr.len = bhp->bh_datalen;
 #endif
 			(*callback)(user, &pkthdr, datap);
 			bp += BPF_WORDALIGN(caplen + hdrlen);
 			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
 				p->bp = bp;
 				p->cc = ep - bp;
 				/*
 				 * See comment above about p->cc < 0.
 				 */
 				if (p->cc < 0)
 					p->cc = 0;
 				return (n);
 			}
 		} else {
 			/*
 			 * Skip this packet.
 			 */
 			bp += BPF_WORDALIGN(caplen + hdrlen);
 		}
 	}
 #undef bhp
 	p->cc = 0;
 	return (n);
 }
 
 static int
 pcap_inject_bpf(pcap_t *p, const void *buf, size_t size)
 {
 	int ret;
 
 	ret = write(p->fd, buf, size);
 #ifdef __APPLE__
 	if (ret == -1 && errno == EAFNOSUPPORT) {
 		/*
-		 * In Mac OS X, there's a bug wherein setting the
-		 * BIOCSHDRCMPLT flag causes writes to fail; see,
-		 * for example:
+		 * In some versions of macOS, there's a bug wherein setting
+		 * the BIOCSHDRCMPLT flag causes writes to fail; see, for
+		 * example:
 		 *
 		 *	http://cerberus.sourcefire.com/~jeff/archives/patches/macosx/BIOCSHDRCMPLT-10.3.3.patch
 		 *
-		 * So, if, on OS X, we get EAFNOSUPPORT from the write, we
+		 * So, if, on macOS, we get EAFNOSUPPORT from the write, we
 		 * assume it's due to that bug, and turn off that flag
 		 * and try again.  If we succeed, it either means that
 		 * somebody applied the fix from that URL, or other patches
 		 * for that bug from
 		 *
 		 *	http://cerberus.sourcefire.com/~jeff/archives/patches/macosx/
 		 *
 		 * and are running a Darwin kernel with those fixes, or
-		 * that Apple fixed the problem in some OS X release.
+		 * that Apple fixed the problem in some macOS release.
 		 */
 		u_int spoof_eth_src = 0;
 
 		if (ioctl(p->fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1) {
-			(void)pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "send: can't turn off BIOCSHDRCMPLT: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "send: can't turn off BIOCSHDRCMPLT");
 			return (PCAP_ERROR);
 		}
 
 		/*
 		 * Now try the write again.
 		 */
 		ret = write(p->fd, buf, size);
 	}
 #endif /* __APPLE__ */
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (PCAP_ERROR);
 	}
 	return (ret);
 }
 
 #ifdef _AIX
 static int
 bpf_odminit(char *errbuf)
 {
 	char *errstr;
 
 	if (odm_initialize() == -1) {
 		if (odm_err_msg(odmerrno, &errstr) == -1)
 			errstr = "Unknown error";
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "bpf_load: odm_initialize failed: %s",
 		    errstr);
 		return (PCAP_ERROR);
 	}
 
 	if ((odmlockid = odm_lock("/etc/objrepos/config_lock", ODM_WAIT)) == -1) {
 		if (odm_err_msg(odmerrno, &errstr) == -1)
 			errstr = "Unknown error";
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "bpf_load: odm_lock of /etc/objrepos/config_lock failed: %s",
 		    errstr);
 		(void)odm_terminate();
 		return (PCAP_ERROR);
 	}
 
 	return (0);
 }
 
 static int
 bpf_odmcleanup(char *errbuf)
 {
 	char *errstr;
 
 	if (odm_unlock(odmlockid) == -1) {
 		if (errbuf != NULL) {
 			if (odm_err_msg(odmerrno, &errstr) == -1)
 				errstr = "Unknown error";
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			    "bpf_load: odm_unlock failed: %s",
 			    errstr);
 		}
 		return (PCAP_ERROR);
 	}
 
 	if (odm_terminate() == -1) {
 		if (errbuf != NULL) {
 			if (odm_err_msg(odmerrno, &errstr) == -1)
 				errstr = "Unknown error";
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			    "bpf_load: odm_terminate failed: %s",
 			    errstr);
 		}
 		return (PCAP_ERROR);
 	}
 
 	return (0);
 }
 
 static int
 bpf_load(char *errbuf)
 {
 	long major;
 	int *minors;
 	int numminors, i, rc;
 	char buf[1024];
 	struct stat sbuf;
 	struct bpf_config cfg_bpf;
 	struct cfg_load cfg_ld;
 	struct cfg_kmod cfg_km;
 
 	/*
 	 * This is very very close to what happens in the real implementation
 	 * but I've fixed some (unlikely) bug situations.
 	 */
 	if (bpfloadedflag)
 		return (0);
 
 	if (bpf_odminit(errbuf) == PCAP_ERROR)
 		return (PCAP_ERROR);
 
 	major = genmajor(BPF_NAME);
 	if (major == -1) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "bpf_load: genmajor failed: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "bpf_load: genmajor failed");
 		(void)bpf_odmcleanup(NULL);
 		return (PCAP_ERROR);
 	}
 
 	minors = getminor(major, &numminors, BPF_NAME);
 	if (!minors) {
 		minors = genminor("bpf", major, 0, BPF_MINORS, 1, 1);
 		if (!minors) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "bpf_load: genminor failed: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "bpf_load: genminor failed");
 			(void)bpf_odmcleanup(NULL);
 			return (PCAP_ERROR);
 		}
 	}
 
 	if (bpf_odmcleanup(errbuf) == PCAP_ERROR)
 		return (PCAP_ERROR);
 
 	rc = stat(BPF_NODE "0", &sbuf);
 	if (rc == -1 && errno != ENOENT) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "bpf_load: can't stat %s: %s",
-		    BPF_NODE "0", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "bpf_load: can't stat %s", BPF_NODE "0");
 		return (PCAP_ERROR);
 	}
 
 	if (rc == -1 || getmajor(sbuf.st_rdev) != major) {
 		for (i = 0; i < BPF_MINORS; i++) {
-			sprintf(buf, "%s%d", BPF_NODE, i);
+			pcap_snprintf(buf, sizeof(buf), "%s%d", BPF_NODE, i);
 			unlink(buf);
 			if (mknod(buf, S_IRUSR | S_IFCHR, domakedev(major, i)) == -1) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "bpf_load: can't mknod %s: %s",
-				    buf, pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "bpf_load: can't mknod %s", buf);
 				return (PCAP_ERROR);
 			}
 		}
 	}
 
 	/* Check if the driver is loaded */
 	memset(&cfg_ld, 0x0, sizeof(cfg_ld));
 	cfg_ld.path = buf;
-	sprintf(cfg_ld.path, "%s/%s", DRIVER_PATH, BPF_NAME);
+	pcap_snprintf(cfg_ld.path, sizeof(cfg_ld.path), "%s/%s", DRIVER_PATH, BPF_NAME);
 	if ((sysconfig(SYS_QUERYLOAD, (void *)&cfg_ld, sizeof(cfg_ld)) == -1) ||
 	    (cfg_ld.kmid == 0)) {
 		/* Driver isn't loaded, load it now */
 		if (sysconfig(SYS_SINGLELOAD, (void *)&cfg_ld, sizeof(cfg_ld)) == -1) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "bpf_load: could not load driver: %s",
-			    strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "bpf_load: could not load driver");
 			return (PCAP_ERROR);
 		}
 	}
 
 	/* Configure the driver */
 	cfg_km.cmd = CFG_INIT;
 	cfg_km.kmid = cfg_ld.kmid;
 	cfg_km.mdilen = sizeof(cfg_bpf);
 	cfg_km.mdiptr = (void *)&cfg_bpf;
 	for (i = 0; i < BPF_MINORS; i++) {
 		cfg_bpf.devno = domakedev(major, i);
 		if (sysconfig(SYS_CFGKMOD, (void *)&cfg_km, sizeof(cfg_km)) == -1) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "bpf_load: could not configure driver: %s",
-			    strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "bpf_load: could not configure driver");
 			return (PCAP_ERROR);
 		}
 	}
 
 	bpfloadedflag = 1;
 
 	return (0);
 }
 #endif
 
 /*
  * Undo any operations done when opening the device when necessary.
  */
 static void
 pcap_cleanup_bpf(pcap_t *p)
 {
 	struct pcap_bpf *pb = p->priv;
 #ifdef HAVE_BSD_IEEE80211
 	int sock;
 	struct ifmediareq req;
 	struct ifreq ifr;
 #endif
 
 	if (pb->must_do_on_close != 0) {
 		/*
 		 * There's something we have to do when closing this
 		 * pcap_t.
 		 */
 #ifdef HAVE_BSD_IEEE80211
 		if (pb->must_do_on_close & MUST_CLEAR_RFMON) {
 			/*
 			 * We put the interface into rfmon mode;
 			 * take it out of rfmon mode.
 			 *
 			 * XXX - if somebody else wants it in rfmon
 			 * mode, this code cannot know that, so it'll take
 			 * it out of rfmon mode.
 			 */
 			sock = socket(AF_INET, SOCK_DGRAM, 0);
 			if (sock == -1) {
 				fprintf(stderr,
 				    "Can't restore interface flags (socket() failed: %s).\n"
 				    "Please adjust manually.\n",
 				    strerror(errno));
 			} else {
 				memset(&req, 0, sizeof(req));
 				strncpy(req.ifm_name, pb->device,
 				    sizeof(req.ifm_name));
 				if (ioctl(sock, SIOCGIFMEDIA, &req) < 0) {
 					fprintf(stderr,
 					    "Can't restore interface flags (SIOCGIFMEDIA failed: %s).\n"
 					    "Please adjust manually.\n",
 					    strerror(errno));
 				} else {
 					if (req.ifm_current & IFM_IEEE80211_MONITOR) {
 						/*
 						 * Rfmon mode is currently on;
 						 * turn it off.
 						 */
 						memset(&ifr, 0, sizeof(ifr));
 						(void)strncpy(ifr.ifr_name,
 						    pb->device,
 						    sizeof(ifr.ifr_name));
 						ifr.ifr_media =
 						    req.ifm_current & ~IFM_IEEE80211_MONITOR;
 						if (ioctl(sock, SIOCSIFMEDIA,
 						    &ifr) == -1) {
 							fprintf(stderr,
 							    "Can't restore interface flags (SIOCSIFMEDIA failed: %s).\n"
 							    "Please adjust manually.\n",
 							    strerror(errno));
 						}
 					}
 				}
 				close(sock);
 			}
 		}
 #endif /* HAVE_BSD_IEEE80211 */
 
 #if defined(__FreeBSD__) && defined(SIOCIFCREATE2)
 		/*
 		 * Attempt to destroy the usbusN interface that we created.
 		 */
 		if (pb->must_do_on_close & MUST_DESTROY_USBUS) {
 			if (if_nametoindex(pb->device) > 0) {
 				int s;
 
 				s = socket(AF_LOCAL, SOCK_DGRAM, 0);
 				if (s >= 0) {
 					strlcpy(ifr.ifr_name, pb->device,
 					    sizeof(ifr.ifr_name));
 					ioctl(s, SIOCIFDESTROY, &ifr);
 					close(s);
 				}
 			}
 		}
 #endif /* defined(__FreeBSD__) && defined(SIOCIFCREATE2) */
 		/*
 		 * Take this pcap out of the list of pcaps for which we
 		 * have to take the interface out of some mode.
 		 */
 		pcap_remove_from_pcaps_to_close(p);
 		pb->must_do_on_close = 0;
 	}
 
 #ifdef HAVE_ZEROCOPY_BPF
 	if (pb->zerocopy) {
 		/*
 		 * Delete the mappings.  Note that p->buffer gets
 		 * initialized to one of the mmapped regions in
 		 * this case, so do not try and free it directly;
 		 * null it out so that pcap_cleanup_live_common()
 		 * doesn't try to free it.
 		 */
 		if (pb->zbuf1 != MAP_FAILED && pb->zbuf1 != NULL)
 			(void) munmap(pb->zbuf1, pb->zbufsize);
 		if (pb->zbuf2 != MAP_FAILED && pb->zbuf2 != NULL)
 			(void) munmap(pb->zbuf2, pb->zbufsize);
 		p->buffer = NULL;
 	}
 #endif
 	if (pb->device != NULL) {
 		free(pb->device);
 		pb->device = NULL;
 	}
 	pcap_cleanup_live_common(p);
 }
 
 static int
 check_setif_failure(pcap_t *p, int error)
 {
 #ifdef __APPLE__
 	int fd;
 	struct ifreq ifr;
 	int err;
 #endif
 
 	if (error == ENXIO) {
 		/*
 		 * No such device exists.
 		 */
 #ifdef __APPLE__
 		if (p->opt.rfmon && strncmp(p->opt.device, "wlt", 3) == 0) {
 			/*
 			 * Monitor mode was requested, and we're trying
 			 * to open a "wltN" device.  Assume that this
 			 * is 10.4 and that we were asked to open an
 			 * "enN" device; if that device exists, return
 			 * "monitor mode not supported on the device".
 			 */
 			fd = socket(AF_INET, SOCK_DGRAM, 0);
 			if (fd != -1) {
 				strlcpy(ifr.ifr_name, "en",
 				    sizeof(ifr.ifr_name));
 				strlcat(ifr.ifr_name, p->opt.device + 3,
 				    sizeof(ifr.ifr_name));
 				if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) {
 					/*
 					 * We assume this failed because
 					 * the underlying device doesn't
 					 * exist.
 					 */
 					err = PCAP_ERROR_NO_SUCH_DEVICE;
-					pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-					    "SIOCGIFFLAGS on %s failed: %s",
-					    ifr.ifr_name, pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(p->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "SIOCGIFFLAGS on %s failed",
+					    ifr.ifr_name);
 				} else {
 					/*
 					 * The underlying "enN" device
 					 * exists, but there's no
 					 * corresponding "wltN" device;
 					 * that means that the "enN"
 					 * device doesn't support
 					 * monitor mode, probably because
 					 * it's an Ethernet device rather
 					 * than a wireless device.
 					 */
 					err = PCAP_ERROR_RFMON_NOTSUP;
 				}
 				close(fd);
 			} else {
 				/*
 				 * We can't find out whether there's
 				 * an underlying "enN" device, so
 				 * just report "no such device".
 				 */
 				err = PCAP_ERROR_NO_SUCH_DEVICE;
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "socket() failed: %s",
-				    pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    errno, PCAP_ERRBUF_SIZE,
+				    "socket() failed");
 			}
 			return (err);
 		}
 #endif
 		/*
 		 * No such device.
 		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETIF failed: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSETIF failed");
 		return (PCAP_ERROR_NO_SUCH_DEVICE);
 	} else if (errno == ENETDOWN) {
 		/*
 		 * Return a "network down" indication, so that
 		 * the application can report that rather than
 		 * saying we had a mysterious failure and
 		 * suggest that they report a problem to the
 		 * libpcap developers.
 		 */
 		return (PCAP_ERROR_IFACE_NOT_UP);
 	} else {
 		/*
 		 * Some other error; fill in the error string, and
 		 * return PCAP_ERROR.
 		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETIF: %s: %s",
-		    p->opt.device, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSETIF: %s", p->opt.device);
 		return (PCAP_ERROR);
 	}
 }
 
 /*
  * Default capture buffer size.
  * 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.
  *
  * However, on AIX 3.5, the larger buffer sized caused unrecoverable
  * read failures under stress, so we leave it as 32K; yet another
  * place where AIX's BPF is broken.
  */
 #ifdef _AIX
 #define DEFAULT_BUFSIZE	32768
 #else
 #define DEFAULT_BUFSIZE	524288
 #endif
 
 static int
 pcap_activate_bpf(pcap_t *p)
 {
 	struct pcap_bpf *pb = p->priv;
 	int status = 0;
 #ifdef HAVE_BSD_IEEE80211
 	int retv;
 #endif
 	int fd;
 #ifdef LIFNAMSIZ
 	char *zonesep;
 	struct lifreq ifr;
 	char *ifrname = ifr.lifr_name;
 	const size_t ifnamsiz = sizeof(ifr.lifr_name);
 #else
 	struct ifreq ifr;
 	char *ifrname = ifr.ifr_name;
 	const size_t ifnamsiz = sizeof(ifr.ifr_name);
 #endif
 	struct bpf_version bv;
 #ifdef __APPLE__
 	int sockfd;
 	char *wltdev = NULL;
 #endif
 #ifdef BIOCGDLTLIST
 	struct bpf_dltlist bdl;
 #if defined(__APPLE__) || defined(HAVE_BSD_IEEE80211)
 	int new_dlt;
 #endif
 #endif /* BIOCGDLTLIST */
 #if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT)
 	u_int spoof_eth_src = 1;
 #endif
 	u_int v;
 	struct bpf_insn total_insn;
 	struct bpf_program total_prog;
 	struct utsname osinfo;
 	int have_osinfo = 0;
 #ifdef HAVE_ZEROCOPY_BPF
 	struct bpf_zbuf bz;
 	u_int bufmode, zbufmax;
 #endif
 
 	fd = bpf_open(p->errbuf);
 	if (fd < 0) {
 		status = fd;
 		goto bad;
 	}
 
 	p->fd = fd;
 
 	if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCVERSION: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCVERSION");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	if (bv.bv_major != BPF_MAJOR_VERSION ||
 	    bv.bv_minor < BPF_MINOR_VERSION) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "kernel bpf filter out of date");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 #if defined(LIFNAMSIZ) && defined(ZONENAME_MAX) && defined(lifr_zoneid)
 	/*
 	 * Retrieve the zoneid of the zone we are currently executing in.
 	 */
 	if ((ifr.lifr_zoneid = getzoneid()) == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "getzoneid(): %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "getzoneid()");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	/*
 	 * Check if the given source datalink name has a '/' separated
 	 * zonename prefix string.  The zonename prefixed source datalink can
 	 * be used by pcap consumers in the Solaris global zone to capture
 	 * traffic on datalinks in non-global zones.  Non-global zones
 	 * do not have access to datalinks outside of their own namespace.
 	 */
 	if ((zonesep = strchr(p->opt.device, '/')) != NULL) {
 		char path_zname[ZONENAME_MAX];
 		int  znamelen;
 		char *lnamep;
 
 		if (ifr.lifr_zoneid != GLOBAL_ZONEID) {
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "zonename/linkname only valid in global zone.");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		znamelen = zonesep - p->opt.device;
 		(void) strlcpy(path_zname, p->opt.device, znamelen + 1);
 		ifr.lifr_zoneid = getzoneidbyname(path_zname);
 		if (ifr.lifr_zoneid == -1) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "getzoneidbyname(%s): %s", path_zname,
-			pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "getzoneidbyname(%s)", path_zname);
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		lnamep = strdup(zonesep + 1);
 		if (lnamep == NULL) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "strdup");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		free(p->opt.device);
 		p->opt.device = lnamep;
 	}
 #endif
 
 	pb->device = strdup(p->opt.device);
 	if (pb->device == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
-		     pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "strdup");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * Attempt to find out the version of the OS on which we're running.
 	 */
 	if (uname(&osinfo) == 0)
 		have_osinfo = 1;
 
 #ifdef __APPLE__
 	/*
 	 * See comment in pcap_can_set_rfmon_bpf() for an explanation
 	 * of why we check the version number.
 	 */
 	if (p->opt.rfmon) {
 		if (have_osinfo) {
 			/*
 			 * We assume osinfo.sysname is "Darwin", because
 			 * __APPLE__ is defined.  We just check the version.
 			 */
 			if (osinfo.release[0] < '8' &&
 			    osinfo.release[1] == '.') {
 				/*
 				 * 10.3 (Darwin 7.x) or earlier.
 				 */
 				status = PCAP_ERROR_RFMON_NOTSUP;
 				goto bad;
 			}
 			if (osinfo.release[0] == '8' &&
 			    osinfo.release[1] == '.') {
 				/*
 				 * 10.4 (Darwin 8.x).  s/en/wlt/
 				 */
 				if (strncmp(p->opt.device, "en", 2) != 0) {
 					/*
 					 * Not an enN device; check
 					 * whether the device even exists.
 					 */
 					sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 					if (sockfd != -1) {
 						strlcpy(ifrname,
 						    p->opt.device, ifnamsiz);
 						if (ioctl(sockfd, SIOCGIFFLAGS,
 						    (char *)&ifr) < 0) {
 							/*
 							 * We assume this
 							 * failed because
 							 * the underlying
 							 * device doesn't
 							 * exist.
 							 */
 							status = PCAP_ERROR_NO_SUCH_DEVICE;
-							pcap_snprintf(p->errbuf,
+							pcap_fmt_errmsg_for_errno(p->errbuf,
 							    PCAP_ERRBUF_SIZE,
-							    "SIOCGIFFLAGS failed: %s",
-							    pcap_strerror(errno));
+							    errno,
+							    "SIOCGIFFLAGS failed");
 						} else
 							status = PCAP_ERROR_RFMON_NOTSUP;
 						close(sockfd);
 					} else {
 						/*
 						 * We can't find out whether
 						 * the device exists, so just
 						 * report "no such device".
 						 */
 						status = PCAP_ERROR_NO_SUCH_DEVICE;
-						pcap_snprintf(p->errbuf,
-						    PCAP_ERRBUF_SIZE,
-						    "socket() failed: %s",
-						    pcap_strerror(errno));
+						pcap_fmt_errmsg_for_errno(p->errbuf,
+						    PCAP_ERRBUF_SIZE, errno,
+						    "socket() failed");
 					}
 					goto bad;
 				}
 				wltdev = malloc(strlen(p->opt.device) + 2);
 				if (wltdev == NULL) {
-					(void)pcap_snprintf(p->errbuf,
-					    PCAP_ERRBUF_SIZE, "malloc: %s",
-					    pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(p->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "malloc");
 					status = PCAP_ERROR;
 					goto bad;
 				}
 				strcpy(wltdev, "wlt");
 				strcat(wltdev, p->opt.device + 2);
 				free(p->opt.device);
 				p->opt.device = wltdev;
 			}
 			/*
 			 * Everything else is 10.5 or later; for those,
 			 * we just open the enN device, and set the DLT.
 			 */
 		}
 	}
 #endif /* __APPLE__ */
 
 	/*
 	 * If this is FreeBSD, and the device name begins with "usbus",
 	 * try to create the interface if it's not available.
 	 */
 #if defined(__FreeBSD__) && defined(SIOCIFCREATE2)
 	if (strncmp(p->opt.device, usbus_prefix, USBUS_PREFIX_LEN) == 0) {
 		/*
 		 * Do we already have an interface with that name?
 		 */
 		if (if_nametoindex(p->opt.device) == 0) {
 			/*
 			 * No.  We need to create it, and, if we
 			 * succeed, remember that we should destroy
 			 * it when the pcap_t is closed.
 			 */
 			int s;
 
 			/*
 			 * Open a socket to use for ioctls to
 			 * create the interface.
 			 */
 			s = socket(AF_LOCAL, SOCK_DGRAM, 0);
 			if (s < 0) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "Can't open socket: %s",
-				    pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "Can't open socket");
 				status = PCAP_ERROR;
 				goto bad;
 			}
 
 			/*
 			 * If we haven't already done so, arrange to have
 			 * "pcap_close_all()" called when we exit.
 			 */
 			if (!pcap_do_addexit(p)) {
 				/*
 				 * "atexit()" failed; don't create the
 				 * interface, just give up.
 				 */
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				     "atexit failed");
 				close(s);
 				status = PCAP_ERROR;
 				goto bad;
 			}
 
 			/*
 			 * Create the interface.
 			 */
 			strlcpy(ifr.ifr_name, p->opt.device, sizeof(ifr.ifr_name));
 			if (ioctl(s, SIOCIFCREATE2, &ifr) < 0) {
 				if (errno == EINVAL) {
 					pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 					    "Invalid USB bus interface %s",
 					    p->opt.device);
 				} else {
-					pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-					    "Can't create interface for %s: %s",
-					    p->opt.device, pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(p->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "Can't create interface for %s",
+					    p->opt.device);
 				}
 				close(s);
 				status = PCAP_ERROR;
 				goto bad;
 			}
 
 			/*
 			 * Make sure we clean this up when we close.
 			 */
 			pb->must_do_on_close |= MUST_DESTROY_USBUS;
 
 			/*
 			 * Add this to the list of pcaps to close when we exit.
 			 */
 			pcap_add_to_pcaps_to_close(p);
 		}
 	}
 #endif /* defined(__FreeBSD__) && defined(SIOCIFCREATE2) */
 
 #ifdef HAVE_ZEROCOPY_BPF
 	/*
 	 * If the BPF extension to set buffer mode is present, try setting
 	 * the mode to zero-copy.  If that fails, use regular buffering.  If
 	 * it succeeds but other setup fails, return an error to the user.
 	 */
 	bufmode = BPF_BUFMODE_ZBUF;
 	if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) {
 		/*
 		 * We have zerocopy BPF; use it.
 		 */
 		pb->zerocopy = 1;
 
 		/*
 		 * How to pick a buffer size: first, query the maximum buffer
 		 * size supported by zero-copy.  This also lets us quickly
 		 * determine whether the kernel generally supports zero-copy.
 		 * Then, if a buffer size was specified, use that, otherwise
 		 * query the default buffer size, which reflects kernel
 		 * policy for a desired default.  Round to the nearest page
 		 * size.
 		 */
 		if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCGETZMAX");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 
 		if (p->opt.buffer_size != 0) {
 			/*
 			 * A buffer size was explicitly specified; use it.
 			 */
 			v = p->opt.buffer_size;
 		} else {
 			if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) ||
 			    v < DEFAULT_BUFSIZE)
 				v = DEFAULT_BUFSIZE;
 		}
 #ifndef roundup
 #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))  /* to any y */
 #endif
 		pb->zbufsize = roundup(v, getpagesize());
 		if (pb->zbufsize > zbufmax)
 			pb->zbufsize = zbufmax;
 		pb->zbuf1 = mmap(NULL, pb->zbufsize, PROT_READ | PROT_WRITE,
 		    MAP_ANON, -1, 0);
 		pb->zbuf2 = mmap(NULL, pb->zbufsize, PROT_READ | PROT_WRITE,
 		    MAP_ANON, -1, 0);
 		if (pb->zbuf1 == MAP_FAILED || pb->zbuf2 == MAP_FAILED) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "mmap: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "mmap");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		memset(&bz, 0, sizeof(bz)); /* bzero() deprecated, replaced with memset() */
 		bz.bz_bufa = pb->zbuf1;
 		bz.bz_bufb = pb->zbuf2;
 		bz.bz_buflen = pb->zbufsize;
 		if (ioctl(fd, BIOCSETZBUF, (caddr_t)&bz) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETZBUF: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCSETZBUF");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		(void)strncpy(ifrname, p->opt.device, ifnamsiz);
 		if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETIF: %s: %s",
-			    p->opt.device, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCSETIF: %s", p->opt.device);
 			status = PCAP_ERROR;
 			goto bad;
 		}
 		v = pb->zbufsize - sizeof(struct bpf_zbuf_header);
 	} else
 #endif
 	{
 		/*
 		 * We don't have zerocopy BPF.
 		 * Set the buffer size.
 		 */
 		if (p->opt.buffer_size != 0) {
 			/*
 			 * A buffer size was explicitly specified; use it.
 			 */
 			if (ioctl(fd, BIOCSBLEN,
 			    (caddr_t)&p->opt.buffer_size) < 0) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "BIOCSBLEN: %s: %s", p->opt.device,
-				    pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "BIOCSBLEN: %s", p->opt.device);
 				status = PCAP_ERROR;
 				goto bad;
 			}
 
 			/*
 			 * Now bind to the device.
 			 */
 			(void)strncpy(ifrname, p->opt.device, ifnamsiz);
 #ifdef BIOCSETLIF
 			if (ioctl(fd, BIOCSETLIF, (caddr_t)&ifr) < 0)
 #else
 			if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0)
 #endif
 			{
 				status = check_setif_failure(p, errno);
 				goto bad;
 			}
 		} else {
 			/*
 			 * No buffer size was explicitly specified.
 			 *
 			 * Try finding a good size for the buffer;
 			 * DEFAULT_BUFSIZE may be too big, so keep
 			 * cutting it in half until we find a size
 			 * that works, or run out of sizes to try.
 			 * If the default is larger, don't make it smaller.
 			 */
 			if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) ||
 			    v < DEFAULT_BUFSIZE)
 				v = DEFAULT_BUFSIZE;
 			for ( ; v != 0; v >>= 1) {
 				/*
 				 * Ignore the return value - this is because the
 				 * call fails on BPF systems that don't have
 				 * kernel malloc.  And if the call fails, it's
 				 * no big deal, we just continue to use the
 				 * standard buffer size.
 				 */
 				(void) ioctl(fd, BIOCSBLEN, (caddr_t)&v);
 
 				(void)strncpy(ifrname, p->opt.device, ifnamsiz);
 #ifdef BIOCSETLIF
 				if (ioctl(fd, BIOCSETLIF, (caddr_t)&ifr) >= 0)
 #else
 				if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) >= 0)
 #endif
 					break;	/* that size worked; we're done */
 
 				if (errno != ENOBUFS) {
 					status = check_setif_failure(p, errno);
 					goto bad;
 				}
 			}
 
 			if (v == 0) {
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "BIOCSBLEN: %s: No buffer size worked",
 				    p->opt.device);
 				status = PCAP_ERROR;
 				goto bad;
 			}
 		}
 	}
 
 	/* Get the data link layer type. */
 	if (ioctl(fd, BIOCGDLT, (caddr_t)&v) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGDLT: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCGDLT");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 #ifdef _AIX
 	/*
 	 * AIX's BPF returns IFF_ types, not DLT_ types, in BIOCGDLT.
 	 */
 	switch (v) {
 
 	case IFT_ETHER:
 	case IFT_ISO88023:
 		v = DLT_EN10MB;
 		break;
 
 	case IFT_FDDI:
 		v = DLT_FDDI;
 		break;
 
 	case IFT_ISO88025:
 		v = DLT_IEEE802;
 		break;
 
 	case IFT_LOOP:
 		v = DLT_NULL;
 		break;
 
 	default:
 		/*
 		 * We don't know what to map this to yet.
 		 */
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "unknown interface type %u",
 		    v);
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #endif
 #if _BSDI_VERSION - 0 >= 199510
 	/* The SLIP and PPP link layer header changed in BSD/OS 2.1 */
 	switch (v) {
 
 	case DLT_SLIP:
 		v = DLT_SLIP_BSDOS;
 		break;
 
 	case DLT_PPP:
 		v = DLT_PPP_BSDOS;
 		break;
 
 	case 11:	/*DLT_FR*/
 		v = DLT_FRELAY;
 		break;
 
 	case 12:	/*DLT_C_HDLC*/
 		v = DLT_CHDLC;
 		break;
 	}
 #endif
 
 #ifdef BIOCGDLTLIST
 	/*
 	 * We know the default link type -- now determine all the DLTs
 	 * this interface supports.  If this fails with EINVAL, it's
 	 * not fatal; we just don't get to use the feature later.
 	 */
 	if (get_dlt_list(fd, v, &bdl, p->errbuf) == -1) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	p->dlt_count = bdl.bfl_len;
 	p->dlt_list = bdl.bfl_list;
 
 #ifdef __APPLE__
 	/*
 	 * Monitor mode fun, continued.
 	 *
 	 * For 10.5 and, we're assuming, later releases, as noted above,
 	 * 802.1 adapters that support monitor mode offer both DLT_EN10MB,
 	 * DLT_IEEE802_11, and possibly some 802.11-plus-radio-information
 	 * DLT_ value.  Choosing one of the 802.11 DLT_ values will turn
 	 * monitor mode on.
 	 *
 	 * Therefore, if the user asked for monitor mode, we filter out
 	 * the DLT_EN10MB value, as you can't get that in monitor mode,
 	 * and, if the user didn't ask for monitor mode, we filter out
 	 * the 802.11 DLT_ values, because selecting those will turn
 	 * monitor mode on.  Then, for monitor mode, if an 802.11-plus-
 	 * radio DLT_ value is offered, we try to select that, otherwise
 	 * we try to select DLT_IEEE802_11.
 	 */
 	if (have_osinfo) {
 		if (isdigit((unsigned)osinfo.release[0]) &&
 		     (osinfo.release[0] == '9' ||
 		     isdigit((unsigned)osinfo.release[1]))) {
 			/*
 			 * 10.5 (Darwin 9.x), or later.
 			 */
 			new_dlt = find_802_11(&bdl);
 			if (new_dlt != -1) {
 				/*
 				 * We have at least one 802.11 DLT_ value,
 				 * so this is an 802.11 interface.
 				 * new_dlt is the best of the 802.11
 				 * DLT_ values in the list.
 				 */
 				if (p->opt.rfmon) {
 					/*
 					 * Our caller wants monitor mode.
 					 * Purge DLT_EN10MB from the list
 					 * of link-layer types, as selecting
 					 * it will keep monitor mode off.
 					 */
 					remove_en(p);
 
 					/*
 					 * If the new mode we want isn't
 					 * the default mode, attempt to
 					 * select the new mode.
 					 */
 					if ((u_int)new_dlt != v) {
 						if (ioctl(p->fd, BIOCSDLT,
 						    &new_dlt) != -1) {
 							/*
 							 * We succeeded;
 							 * make this the
 							 * new DLT_ value.
 							 */
 							v = new_dlt;
 						}
 					}
 				} else {
 					/*
 					 * Our caller doesn't want
 					 * monitor mode.  Unless this
 					 * is being done by pcap_open_live(),
 					 * purge the 802.11 link-layer types
 					 * from the list, as selecting
 					 * one of them will turn monitor
 					 * mode on.
 					 */
 					if (!p->oldstyle)
 						remove_802_11(p);
 				}
 			} else {
 				if (p->opt.rfmon) {
 					/*
 					 * The caller requested monitor
 					 * mode, but we have no 802.11
 					 * link-layer types, so they
 					 * can't have it.
 					 */
 					status = PCAP_ERROR_RFMON_NOTSUP;
 					goto bad;
 				}
 			}
 		}
 	}
 #elif defined(HAVE_BSD_IEEE80211)
 	/*
 	 * *BSD with the new 802.11 ioctls.
 	 * Do we want monitor mode?
 	 */
 	if (p->opt.rfmon) {
 		/*
 		 * Try to put the interface into monitor mode.
 		 */
 		retv = monitor_mode(p, 1);
 		if (retv != 0) {
 			/*
 			 * We failed.
 			 */
 			status = retv;
 			goto bad;
 		}
 
 		/*
 		 * We're in monitor mode.
 		 * Try to find the best 802.11 DLT_ value and, if we
 		 * succeed, try to switch to that mode if we're not
 		 * already in that mode.
 		 */
 		new_dlt = find_802_11(&bdl);
 		if (new_dlt != -1) {
 			/*
 			 * We have at least one 802.11 DLT_ value.
 			 * new_dlt is the best of the 802.11
 			 * DLT_ values in the list.
 			 *
 			 * If the new mode we want isn't the default mode,
 			 * attempt to select the new mode.
 			 */
 			if ((u_int)new_dlt != v) {
 				if (ioctl(p->fd, BIOCSDLT, &new_dlt) != -1) {
 					/*
 					 * We succeeded; make this the
 					 * new DLT_ value.
 					 */
 					v = new_dlt;
 				}
 			}
 		}
 	}
 #endif /* various platforms */
 #endif /* BIOCGDLTLIST */
 
 	/*
 	 * If this is an Ethernet device, and we don't have a DLT_ list,
 	 * give it a list with DLT_EN10MB and DLT_DOCSIS.  (That'd give
 	 * 802.11 interfaces DLT_DOCSIS, which isn't the right thing to
 	 * do, but there's not much we can do about that without finding
 	 * some other way of determining whether it's an Ethernet or 802.11
 	 * device.)
 	 */
 	if (v == DLT_EN10MB && p->dlt_count == 0) {
 		p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 		/*
 		 * If that fails, just leave the list empty.
 		 */
 		if (p->dlt_list != NULL) {
 			p->dlt_list[0] = DLT_EN10MB;
 			p->dlt_list[1] = DLT_DOCSIS;
 			p->dlt_count = 2;
 		}
 	}
 #ifdef PCAP_FDDIPAD
 	if (v == DLT_FDDI)
 		p->fddipad = PCAP_FDDIPAD;
 	else
 #endif
 		p->fddipad = 0;
 	p->linktype = v;
 
 #if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT)
 	/*
 	 * Do a BIOCSHDRCMPLT, if defined, to turn that flag on, so
 	 * the link-layer source address isn't forcibly overwritten.
 	 * (Should we ignore errors?  Should we do this only if
 	 * we're open for writing?)
 	 *
 	 * XXX - I seem to remember some packet-sending bug in some
 	 * BSDs - check CVS log for "bpf.c"?
 	 */
 	if (ioctl(fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1) {
-		(void)pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "BIOCSHDRCMPLT: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSHDRCMPLT");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #endif
 	/* set timeout */
 #ifdef HAVE_ZEROCOPY_BPF
 	/*
 	 * In zero-copy mode, we just use the timeout in select().
 	 * XXX - what if we're in non-blocking mode and the *application*
 	 * is using select() or poll() or kqueues or....?
 	 */
 	if (p->opt.timeout && !pb->zerocopy) {
 #else
 	if (p->opt.timeout) {
 #endif
 		/*
 		 * XXX - is this seconds/nanoseconds in AIX?
 		 * (Treating it as such doesn't fix the timeout
 		 * problem described below.)
 		 *
 		 * XXX - Mac OS X 10.6 mishandles BIOCSRTIMEOUT in
 		 * 64-bit userland - it takes, as an argument, a
 		 * "struct BPF_TIMEVAL", which has 32-bit tv_sec
 		 * and tv_usec, rather than a "struct timeval".
 		 *
 		 * If this platform defines "struct BPF_TIMEVAL",
 		 * we check whether the structure size in BIOCSRTIMEOUT
 		 * is that of a "struct timeval" and, if not, we use
 		 * a "struct BPF_TIMEVAL" rather than a "struct timeval".
 		 * (That way, if the bug is fixed in a future release,
 		 * we will still do the right thing.)
 		 */
 		struct timeval to;
 #ifdef HAVE_STRUCT_BPF_TIMEVAL
 		struct BPF_TIMEVAL bpf_to;
 
 		if (IOCPARM_LEN(BIOCSRTIMEOUT) != sizeof(struct timeval)) {
 			bpf_to.tv_sec = p->opt.timeout / 1000;
 			bpf_to.tv_usec = (p->opt.timeout * 1000) % 1000000;
 			if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&bpf_to) < 0) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "BIOCSRTIMEOUT: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    errno, PCAP_ERRBUF_SIZE, "BIOCSRTIMEOUT");
 				status = PCAP_ERROR;
 				goto bad;
 			}
 		} else {
 #endif
 			to.tv_sec = p->opt.timeout / 1000;
 			to.tv_usec = (p->opt.timeout * 1000) % 1000000;
 			if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&to) < 0) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "BIOCSRTIMEOUT: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    errno, PCAP_ERRBUF_SIZE, "BIOCSRTIMEOUT");
 				status = PCAP_ERROR;
 				goto bad;
 			}
 #ifdef HAVE_STRUCT_BPF_TIMEVAL
 		}
 #endif
 	}
 
 #ifdef	BIOCIMMEDIATE
 	/*
 	 * Darren Reed notes that
 	 *
 	 *	On AIX (4.2 at least), if BIOCIMMEDIATE is not set, the
 	 *	timeout appears to be ignored and it waits until the buffer
 	 *	is filled before returning.  The result of not having it
 	 *	set is almost worse than useless if your BPF filter
 	 *	is reducing things to only a few packets (i.e. one every
 	 *	second or so).
 	 *
 	 * so we always turn BIOCIMMEDIATE mode on if this is AIX.
 	 *
 	 * For other platforms, we don't turn immediate mode on by default,
 	 * as that would mean we get woken up for every packet, which
 	 * probably isn't what you want for a packet sniffer.
 	 *
 	 * We set immediate mode if the caller requested it by calling
 	 * pcap_set_immediate() before calling pcap_activate().
 	 */
 #ifndef _AIX
 	if (p->opt.immediate) {
 #endif /* _AIX */
 		v = 1;
 		if (ioctl(p->fd, BIOCIMMEDIATE, &v) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "BIOCIMMEDIATE: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCIMMEDIATE");
 			status = PCAP_ERROR;
 			goto bad;
 		}
 #ifndef _AIX
 	}
 #endif /* _AIX */
 #else /* BIOCIMMEDIATE */
 	if (p->opt.immediate) {
 		/*
 		 * We don't support immediate mode.  Fail.
 		 */
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Immediate mode not supported");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #endif /* BIOCIMMEDIATE */
 
 	if (p->opt.promisc) {
 		/* set promiscuous mode, just warn if it fails */
 		if (ioctl(p->fd, BIOCPROMISC, NULL) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCPROMISC: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "BIOCPROMISC");
 			status = PCAP_WARNING_PROMISC_NOTSUP;
 		}
 	}
 
 #ifdef BIOCSTSTAMP
 	v = BPF_T_BINTIME;
 	if (ioctl(p->fd, BIOCSTSTAMP, &v) < 0) {
-		snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSTSTAMP: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSTSTAMP");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #endif /* BIOCSTSTAMP */
 
 	if (ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGBLEN: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCGBLEN");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	p->bufsize = v;
 #ifdef HAVE_ZEROCOPY_BPF
 	if (!pb->zerocopy) {
 #endif
 	p->buffer = malloc(p->bufsize);
 	if (p->buffer == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #ifdef _AIX
 	/* For some strange reason this seems to prevent the EFAULT
 	 * problems we have experienced from AIX BPF. */
 	memset(p->buffer, 0x0, p->bufsize);
 #endif
 #ifdef HAVE_ZEROCOPY_BPF
 	}
 #endif
 
 	/*
 	 * If there's no filter program installed, there's
 	 * no indication to the kernel of what the snapshot
 	 * length should be, so no snapshotting is done.
 	 *
 	 * Therefore, when we open the device, we install
 	 * an "accept everything" filter with the specified
 	 * snapshot length.
 	 */
 	total_insn.code = (u_short)(BPF_RET | BPF_K);
 	total_insn.jt = 0;
 	total_insn.jf = 0;
 	total_insn.k = p->snapshot;
 
 	total_prog.bf_len = 1;
 	total_prog.bf_insns = &total_insn;
 	if (ioctl(p->fd, BIOCSETF, (caddr_t)&total_prog) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETF: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSETF");
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * On most BPF platforms, either you can do a "select()" or
 	 * "poll()" on a BPF file descriptor and it works correctly,
 	 * or you can do it and it will return "readable" if the
 	 * hold buffer is full but not if the timeout expires *and*
 	 * a non-blocking read will, if the hold buffer is empty
 	 * but the store buffer isn't empty, rotate the buffers
 	 * and return what packets are available.
 	 *
 	 * In the latter case, the fact that a non-blocking read
 	 * will give you the available packets means you can work
 	 * around the failure of "select()" and "poll()" to wake up
 	 * and return "readable" when the timeout expires by using
 	 * the timeout as the "select()" or "poll()" timeout, putting
 	 * the BPF descriptor into non-blocking mode, and read from
 	 * it regardless of whether "select()" reports it as readable
 	 * or not.
 	 *
 	 * However, in FreeBSD 4.3 and 4.4, "select()" and "poll()"
 	 * won't wake up and return "readable" if the timer expires
 	 * and non-blocking reads return EWOULDBLOCK if the hold
 	 * buffer is empty, even if the store buffer is non-empty.
 	 *
 	 * This means the workaround in question won't work.
 	 *
 	 * Therefore, on FreeBSD 4.3 and 4.4, we set "p->selectable_fd"
 	 * to -1, which means "sorry, you can't use 'select()' or 'poll()'
 	 * here".  On all other BPF platforms, we set it to the FD for
 	 * the BPF device; in NetBSD, OpenBSD, and Darwin, a non-blocking
 	 * read will, if the hold buffer is empty and the store buffer
 	 * isn't empty, rotate the buffers and return what packets are
 	 * there (and in sufficiently recent versions of OpenBSD
 	 * "select()" and "poll()" should work correctly).
 	 *
 	 * XXX - what about AIX?
 	 */
 	p->selectable_fd = p->fd;	/* assume select() works until we know otherwise */
 	if (have_osinfo) {
 		/*
 		 * We can check what OS this is.
 		 */
 		if (strcmp(osinfo.sysname, "FreeBSD") == 0) {
 			if (strncmp(osinfo.release, "4.3-", 4) == 0 ||
 			     strncmp(osinfo.release, "4.4-", 4) == 0)
 				p->selectable_fd = -1;
 		}
 	}
 
 	p->read_op = pcap_read_bpf;
 	p->inject_op = pcap_inject_bpf;
 	p->setfilter_op = pcap_setfilter_bpf;
 	p->setdirection_op = pcap_setdirection_bpf;
 	p->set_datalink_op = pcap_set_datalink_bpf;
 	p->getnonblock_op = pcap_getnonblock_bpf;
 	p->setnonblock_op = pcap_setnonblock_bpf;
 	p->stats_op = pcap_stats_bpf;
 	p->cleanup_op = pcap_cleanup_bpf;
 
 	return (status);
  bad:
 	pcap_cleanup_bpf(p);
 	return (status);
 }
 
 /*
  * Not all interfaces can be bound to by BPF, so try to bind to
  * the specified interface; return 0 if we fail with
  * PCAP_ERROR_NO_SUCH_DEVICE (which means we got an ENXIO when we tried
  * to bind, which means this interface isn't in the list of interfaces
  * attached to BPF) and 1 otherwise.
  */
 static int
 check_bpf_bindable(const char *name)
 {
 	int fd;
 	char errbuf[PCAP_ERRBUF_SIZE];
 
+	/*
+	 * On macOS, we don't do this check if the device name begins
+	 * with "wlt"; at least some versions of macOS (actually, it
+	 * was called "Mac OS X" then...) offer monitor mode capturing
+	 * by having a separate "monitor mode" device for each wireless
+	 * adapter, rather than by implementing the ioctls that
+	 * {Free,Net,Open,DragonFly}BSD provide. Opening that device
+	 * puts the adapter into monitor mode, which, at least for
+	 * some adapters, causes them to deassociate from the network
+	 * with which they're associated.
+	 *
+	 * Instead, we try to open the corresponding "en" device (so
+	 * that we don't end up with, for users without sufficient
+	 * privilege to open capture devices, a list of adapters that
+	 * only includes the wlt devices).
+	 */
+#ifdef __APPLE__
+	if (strncmp(name, "wlt", 3) == 0) {
+		char *en_name;
+		size_t en_name_len;
+
+		/*
+		 * Try to allocate a buffer for the "en"
+		 * device's name.
+		 */
+		en_name_len = strlen(name) - 1;
+		en_name = malloc(en_name_len + 1);
+		if (en_name == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			return (-1);
+		}
+		strcpy(en_name, "en");
+		strcat(en_name, name + 3);
+		fd = bpf_open_and_bind(en_name, errbuf);
+		free(en_name);
+	} else
+#endif /* __APPLE */
 	fd = bpf_open_and_bind(name, errbuf);
 	if (fd < 0) {
 		/*
 		 * Error - was it PCAP_ERROR_NO_SUCH_DEVICE?
 		 */
 		if (fd == PCAP_ERROR_NO_SUCH_DEVICE) {
 			/*
 			 * Yes, so we can't bind to this because it's
 			 * not something supported by BPF.
 			 */
 			return (0);
 		}
 		/*
 		 * No, so we don't know whether it's supported or not;
 		 * say it is, so that the user can at least try to
 		 * open it and report the error (which is probably
 		 * "you don't have permission to open BPF devices";
 		 * reporting those interfaces means users will ask
 		 * "why am I getting a permissions error when I try
 		 * to capture" rather than "why am I not seeing any
 		 * interfaces", making the underlying problem clearer).
 		 */
 		return (1);
 	}
 
 	/*
 	 * Success.
 	 */
 	close(fd);
 	return (1);
 }
 
 #if defined(__FreeBSD__) && defined(SIOCIFCREATE2)
 static int
-finddevs_usb(pcap_if_t **alldevsp, char *errbuf)
+get_usb_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
 {
+	/*
+	 * XXX - if there's a way to determine whether there's something
+	 * plugged into a given USB bus, use that to determine whether
+	 * this device is "connected" or not.
+	 */
+	return (0);
+}
+
+static int
+finddevs_usb(pcap_if_list_t *devlistp, char *errbuf)
+{
 	DIR *usbdir;
 	struct dirent *usbitem;
 	size_t name_max;
 	char *name;
 
 	/*
 	 * We might have USB sniffing support, so try looking for USB
 	 * interfaces.
 	 *
 	 * We want to report a usbusN device for each USB bus, but
 	 * usbusN interfaces might, or might not, exist for them -
 	 * we create one if there isn't already one.
 	 *
 	 * So, instead, we look in /dev/usb for all buses and create
 	 * a "usbusN" device for each one.
 	 */
 	usbdir = opendir("/dev/usb");
 	if (usbdir == NULL) {
 		/*
 		 * Just punt.
 		 */
 		return (0);
 	}
 
 	/*
 	 * Leave enough room for a 32-bit (10-digit) bus number.
 	 * Yes, that's overkill, but we won't be using
 	 * the buffer very long.
 	 */
 	name_max = USBUS_PREFIX_LEN + 10 + 1;
 	name = malloc(name_max);
 	if (name == NULL) {
 		closedir(usbdir);
 		return (0);
 	}
 	while ((usbitem = readdir(usbdir)) != NULL) {
 		char *p;
 		size_t busnumlen;
-		int err;
 
 		if (strcmp(usbitem->d_name, ".") == 0 ||
 		    strcmp(usbitem->d_name, "..") == 0) {
 			/*
 			 * Ignore these.
 			 */
 			continue;
 		}
 		p = strchr(usbitem->d_name, '.');
 		if (p == NULL)
 			continue;
 		busnumlen = p - usbitem->d_name;
 		memcpy(name, usbus_prefix, USBUS_PREFIX_LEN);
 		memcpy(name + USBUS_PREFIX_LEN, usbitem->d_name, busnumlen);
 		*(name + USBUS_PREFIX_LEN + busnumlen) = '\0';
-		err = pcap_add_if(alldevsp, name, PCAP_IF_UP, NULL, errbuf);
-		if (err != 0) {
+		/*
+		 * There's an entry in this directory for every USB device,
+		 * not for every bus; if there's more than one device on
+		 * the bus, there'll be more than one entry for that bus,
+		 * so we need to avoid adding multiple capture devices
+		 * for each bus.
+		 */
+		if (find_or_add_dev(devlistp, name, PCAP_IF_UP,
+		    get_usb_if_flags, NULL, errbuf) == NULL) {
 			free(name);
 			closedir(usbdir);
-			return (err);
+			return (PCAP_ERROR);
 		}
 	}
 	free(name);
 	closedir(usbdir);
 	return (0);
 }
 #endif
 
+/*
+ * Get additional flags for a device, using SIOCGIFMEDIA.
+ */
+#ifdef SIOCGIFMEDIA
+static int
+get_if_flags(const char *name, bpf_u_int32 *flags, char *errbuf)
+{
+	int sock;
+	struct ifmediareq req;
+
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock == -1) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, errno,
+		    "Can't create socket to get media information for %s",
+		    name);
+		return (-1);
+	}
+	memset(&req, 0, sizeof(req));
+	strncpy(req.ifm_name, name, sizeof(req.ifm_name));
+	if (ioctl(sock, SIOCGIFMEDIA, &req) < 0) {
+		if (errno == EOPNOTSUPP || errno == EINVAL || errno == ENOTTY ||
+		    errno == ENODEV) {
+			/*
+			 * Not supported, so we can't provide any
+			 * additional information.  Assume that
+			 * this means that "connected" vs.
+			 * "disconnected" doesn't apply.
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+			close(sock);
+			return (0);
+		}
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, errno,
+		    "SIOCGIFMEDIA on %s failed", name);
+		close(sock);
+		return (-1);
+	}
+	close(sock);
+
+	/*
+	 * OK, what type of network is this?
+	 */
+	switch (IFM_TYPE(req.ifm_active)) {
+
+	case IFM_IEEE80211:
+		/*
+		 * Wireless.
+		 */
+		*flags |= PCAP_IF_WIRELESS;
+		break;
+	}
+
+	/*
+	 * Do we know whether it's connected?
+	 */
+	if (req.ifm_status & IFM_AVALID) {
+		/*
+		 * Yes.
+		 */
+		if (req.ifm_status & IFM_ACTIVE) {
+			/*
+			 * It's connected.
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_CONNECTED;
+		} else {
+			/*
+			 * It's disconnected.
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_DISCONNECTED;
+		}
+	}
+	return (0);
+}
+#else
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do other than mark loopback devices as "the
+	 * connected/disconnected status doesn't apply".
+	 *
+	 * XXX - on Solaris, can we do what the dladm command does,
+	 * i.e. get a connected/disconnected indication from a kstat?
+	 * (Note that you can also get the link speed, and possibly
+	 * other information, from a kstat as well.)
+	 */
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback devices aren't wireless, and "connected"/
+		 * "disconnected" doesn't apply to them.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return (0);
+	}
+	return (0);
+}
+#endif
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 	/*
 	 * Get the list of regular interfaces first.
 	 */
-	if (pcap_findalldevs_interfaces(alldevsp, errbuf, check_bpf_bindable) == -1)
+	if (pcap_findalldevs_interfaces(devlistp, errbuf, check_bpf_bindable,
+	    get_if_flags) == -1)
 		return (-1);	/* failure */
 
 #if defined(__FreeBSD__) && defined(SIOCIFCREATE2)
-	if (finddevs_usb(alldevsp, errbuf) == -1)
+	if (finddevs_usb(devlistp, errbuf) == -1)
 		return (-1);
 #endif
 
 	return (0);
 }
 
 #ifdef HAVE_BSD_IEEE80211
 static int
 monitor_mode(pcap_t *p, int set)
 {
 	struct pcap_bpf *pb = p->priv;
 	int sock;
 	struct ifmediareq req;
 	IFM_ULIST_TYPE *media_list;
 	int i;
 	int can_do;
 	struct ifreq ifr;
 
 	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "can't open socket: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't open socket");
 		return (PCAP_ERROR);
 	}
 
 	memset(&req, 0, sizeof req);
 	strncpy(req.ifm_name, p->opt.device, sizeof req.ifm_name);
 
 	/*
 	 * Find out how many media types we have.
 	 */
 	if (ioctl(sock, SIOCGIFMEDIA, &req) < 0) {
 		/*
 		 * Can't get the media types.
 		 */
 		switch (errno) {
 
 		case ENXIO:
 			/*
 			 * There's no such device.
 			 */
 			close(sock);
 			return (PCAP_ERROR_NO_SUCH_DEVICE);
 
 		case EINVAL:
 			/*
 			 * Interface doesn't support SIOC{G,S}IFMEDIA.
 			 */
 			close(sock);
 			return (PCAP_ERROR_RFMON_NOTSUP);
 
 		default:
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "SIOCGIFMEDIA 1: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "SIOCGIFMEDIA 1");
 			close(sock);
 			return (PCAP_ERROR);
 		}
 	}
 	if (req.ifm_count == 0) {
 		/*
 		 * No media types.
 		 */
 		close(sock);
 		return (PCAP_ERROR_RFMON_NOTSUP);
 	}
 
 	/*
 	 * Allocate a buffer to hold all the media types, and
 	 * get the media types.
 	 */
 	media_list = malloc(req.ifm_count * sizeof(*media_list));
 	if (media_list == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		close(sock);
 		return (PCAP_ERROR);
 	}
 	req.ifm_ulist = media_list;
 	if (ioctl(sock, SIOCGIFMEDIA, &req) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCGIFMEDIA: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFMEDIA");
 		free(media_list);
 		close(sock);
 		return (PCAP_ERROR);
 	}
 
 	/*
 	 * Look for an 802.11 "automatic" media type.
 	 * We assume that all 802.11 adapters have that media type,
 	 * and that it will carry the monitor mode supported flag.
 	 */
 	can_do = 0;
 	for (i = 0; i < req.ifm_count; i++) {
 		if (IFM_TYPE(media_list[i]) == IFM_IEEE80211
 		    && IFM_SUBTYPE(media_list[i]) == IFM_AUTO) {
 			/* OK, does it do monitor mode? */
 			if (media_list[i] & IFM_IEEE80211_MONITOR) {
 				can_do = 1;
 				break;
 			}
 		}
 	}
 	free(media_list);
 	if (!can_do) {
 		/*
 		 * This adapter doesn't support monitor mode.
 		 */
 		close(sock);
 		return (PCAP_ERROR_RFMON_NOTSUP);
 	}
 
 	if (set) {
 		/*
 		 * Don't just check whether we can enable monitor mode,
 		 * do so, if it's not already enabled.
 		 */
 		if ((req.ifm_current & IFM_IEEE80211_MONITOR) == 0) {
 			/*
 			 * Monitor mode isn't currently on, so turn it on,
 			 * and remember that we should turn it off when the
 			 * pcap_t is closed.
 			 */
 
 			/*
 			 * If we haven't already done so, arrange to have
 			 * "pcap_close_all()" called when we exit.
 			 */
 			if (!pcap_do_addexit(p)) {
 				/*
 				 * "atexit()" failed; don't put the interface
 				 * in monitor mode, just give up.
 				 */
 				close(sock);
 				return (PCAP_ERROR);
 			}
 			memset(&ifr, 0, sizeof(ifr));
 			(void)strncpy(ifr.ifr_name, p->opt.device,
 			    sizeof(ifr.ifr_name));
 			ifr.ifr_media = req.ifm_current | IFM_IEEE80211_MONITOR;
 			if (ioctl(sock, SIOCSIFMEDIA, &ifr) == -1) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				     "SIOCSIFMEDIA: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "SIOCSIFMEDIA");
 				close(sock);
 				return (PCAP_ERROR);
 			}
 
 			pb->must_do_on_close |= MUST_CLEAR_RFMON;
 
 			/*
 			 * Add this to the list of pcaps to close when we exit.
 			 */
 			pcap_add_to_pcaps_to_close(p);
 		}
 	}
 	return (0);
 }
 #endif /* HAVE_BSD_IEEE80211 */
 
 #if defined(BIOCGDLTLIST) && (defined(__APPLE__) || defined(HAVE_BSD_IEEE80211))
 /*
  * Check whether we have any 802.11 link-layer types; return the best
  * of the 802.11 link-layer types if we find one, and return -1
  * otherwise.
  *
  * DLT_IEEE802_11_RADIO, with the radiotap header, is considered the
  * best 802.11 link-layer type; any of the other 802.11-plus-radio
  * headers are second-best; 802.11 with no radio information is
  * the least good.
  */
 static int
 find_802_11(struct bpf_dltlist *bdlp)
 {
 	int new_dlt;
 	u_int i;
 
 	/*
 	 * Scan the list of DLT_ values, looking for 802.11 values,
 	 * and, if we find any, choose the best of them.
 	 */
 	new_dlt = -1;
 	for (i = 0; i < bdlp->bfl_len; i++) {
 		switch (bdlp->bfl_list[i]) {
 
 		case DLT_IEEE802_11:
 			/*
 			 * 802.11, but no radio.
 			 *
 			 * Offer this, and select it as the new mode
 			 * unless we've already found an 802.11
 			 * header with radio information.
 			 */
 			if (new_dlt == -1)
 				new_dlt = bdlp->bfl_list[i];
 			break;
 
 		case DLT_PRISM_HEADER:
 		case DLT_AIRONET_HEADER:
 		case DLT_IEEE802_11_RADIO_AVS:
 			/*
 			 * 802.11 with radio, but not radiotap.
 			 *
 			 * Offer this, and select it as the new mode
 			 * unless we've already found the radiotap DLT_.
 			 */
 			if (new_dlt != DLT_IEEE802_11_RADIO)
 				new_dlt = bdlp->bfl_list[i];
 			break;
 
 		case DLT_IEEE802_11_RADIO:
 			/*
 			 * 802.11 with radiotap.
 			 *
 			 * Offer this, and select it as the new mode.
 			 */
 			new_dlt = bdlp->bfl_list[i];
 			break;
 
 		default:
 			/*
 			 * Not 802.11.
 			 */
 			break;
 		}
 	}
 
 	return (new_dlt);
 }
 #endif /* defined(BIOCGDLTLIST) && (defined(__APPLE__) || defined(HAVE_BSD_IEEE80211)) */
 
 #if defined(__APPLE__) && defined(BIOCGDLTLIST)
 /*
  * Remove DLT_EN10MB from the list of DLT_ values, as we're in monitor mode,
  * and DLT_EN10MB isn't supported in monitor mode.
  */
 static void
 remove_en(pcap_t *p)
 {
 	int i, j;
 
 	/*
 	 * Scan the list of DLT_ values and discard DLT_EN10MB.
 	 */
 	j = 0;
 	for (i = 0; i < p->dlt_count; i++) {
 		switch (p->dlt_list[i]) {
 
 		case DLT_EN10MB:
 			/*
 			 * Don't offer this one.
 			 */
 			continue;
 
 		default:
 			/*
 			 * Just copy this mode over.
 			 */
 			break;
 		}
 
 		/*
 		 * Copy this DLT_ value to its new position.
 		 */
 		p->dlt_list[j] = p->dlt_list[i];
 		j++;
 	}
 
 	/*
 	 * Set the DLT_ count to the number of entries we copied.
 	 */
 	p->dlt_count = j;
 }
 
 /*
  * Remove 802.11 link-layer types from the list of DLT_ values, as
  * we're not in monitor mode, and those DLT_ values will switch us
  * to monitor mode.
  */
 static void
 remove_802_11(pcap_t *p)
 {
 	int i, j;
 
 	/*
 	 * Scan the list of DLT_ values and discard 802.11 values.
 	 */
 	j = 0;
 	for (i = 0; i < p->dlt_count; i++) {
 		switch (p->dlt_list[i]) {
 
 		case DLT_IEEE802_11:
 		case DLT_PRISM_HEADER:
 		case DLT_AIRONET_HEADER:
 		case DLT_IEEE802_11_RADIO:
 		case DLT_IEEE802_11_RADIO_AVS:
 			/*
 			 * 802.11.  Don't offer this one.
 			 */
 			continue;
 
 		default:
 			/*
 			 * Just copy this mode over.
 			 */
 			break;
 		}
 
 		/*
 		 * Copy this DLT_ value to its new position.
 		 */
 		p->dlt_list[j] = p->dlt_list[i];
 		j++;
 	}
 
 	/*
 	 * Set the DLT_ count to the number of entries we copied.
 	 */
 	p->dlt_count = j;
 }
 #endif /* defined(__APPLE__) && defined(BIOCGDLTLIST) */
 
 static int
 pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp)
 {
 	struct pcap_bpf *pb = p->priv;
 
 	/*
 	 * Free any user-mode filter we might happen to have installed.
 	 */
 	pcap_freecode(&p->fcode);
 
 	/*
 	 * Try to install the kernel filter.
 	 */
 	if (ioctl(p->fd, BIOCSETF, (caddr_t)fp) == 0) {
 		/*
 		 * It worked.
 		 */
 		pb->filtering_in_kernel = 1;	/* filtering in the kernel */
 
 		/*
 		 * Discard any previously-received packets, as they might
 		 * have passed whatever filter was formerly in effect, but
 		 * might not pass this filter (BIOCSETF discards packets
 		 * buffered in the kernel, so you can lose packets in any
 		 * case).
 		 */
 		p->cc = 0;
 		return (0);
 	}
 
 	/*
 	 * We failed.
 	 *
 	 * If it failed with EINVAL, that's probably because the program
 	 * is invalid or too big.  Validate it ourselves; if we like it
 	 * (we currently allow backward branches, to support protochain),
 	 * run it in userland.  (There's no notion of "too big" for
 	 * userland.)
 	 *
 	 * Otherwise, just give up.
 	 * XXX - if the copy of the program into the kernel failed,
 	 * we will get EINVAL rather than, say, EFAULT on at least
 	 * some kernels.
 	 */
 	if (errno != EINVAL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETF: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "BIOCSETF");
 		return (-1);
 	}
 
 	/*
 	 * install_bpf_program() validates the program.
 	 *
 	 * XXX - what if we already have a filter in the kernel?
 	 */
 	if (install_bpf_program(p, fp) < 0)
 		return (-1);
 	pb->filtering_in_kernel = 0;	/* filtering in userland */
 	return (0);
 }
 
 /*
  * Set direction flag: Which packets do we accept on a forwarding
  * single device? IN, OUT or both?
  */
 static int
 pcap_setdirection_bpf(pcap_t *p, pcap_direction_t d)
 {
 #if defined(BIOCSDIRECTION)
 	u_int direction;
 
 	direction = (d == PCAP_D_IN) ? BPF_D_IN :
 	    ((d == PCAP_D_OUT) ? BPF_D_OUT : BPF_D_INOUT);
 	if (ioctl(p->fd, BIOCSDIRECTION, &direction) == -1) {
-		(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-		    "Cannot set direction to %s: %s",
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "Cannot set direction to %s",
 		        (d == PCAP_D_IN) ? "PCAP_D_IN" :
-			((d == PCAP_D_OUT) ? "PCAP_D_OUT" : "PCAP_D_INOUT"),
-			strerror(errno));
+			((d == PCAP_D_OUT) ? "PCAP_D_OUT" : "PCAP_D_INOUT"));
 		return (-1);
 	}
 	return (0);
 #elif defined(BIOCSSEESENT)
 	u_int seesent;
 
 	/*
 	 * We don't support PCAP_D_OUT.
 	 */
 	if (d == PCAP_D_OUT) {
 		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 		    "Setting direction to PCAP_D_OUT is not supported on BPF");
 		return -1;
 	}
 
 	seesent = (d == PCAP_D_INOUT);
 	if (ioctl(p->fd, BIOCSSEESENT, &seesent) == -1) {
-		(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-		    "Cannot set direction to %s: %s",
-		        (d == PCAP_D_INOUT) ? "PCAP_D_INOUT" : "PCAP_D_IN",
-			strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "Cannot set direction to %s",
+		    (d == PCAP_D_INOUT) ? "PCAP_D_INOUT" : "PCAP_D_IN");
 		return (-1);
 	}
 	return (0);
 #else
 	(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 	    "This system doesn't support BIOCSSEESENT, so the direction can't be set");
 	return (-1);
 #endif
 }
 
 static int
 pcap_set_datalink_bpf(pcap_t *p, int dlt)
 {
 #ifdef BIOCSDLT
 	if (ioctl(p->fd, BIOCSDLT, &dlt) == -1) {
-		(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-		    "Cannot set DLT %d: %s", dlt, strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "Cannot set DLT %d", dlt);
 		return (-1);
 	}
 #endif
 	return (0);
+}
+
+/*
+ * Platform-specific information.
+ */
+const char *
+pcap_lib_version(void)
+{
+#ifdef HAVE_ZEROCOPY_BPF
+	return (PCAP_VERSION_STRING " (with zerocopy support)");
+#else
+	return (PCAP_VERSION_STRING);
+#endif
 }
Index: vendor/libpcap/dist/pcap-bt-linux.c
===================================================================
--- vendor/libpcap/dist/pcap-bt-linux.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-bt-linux.c	(revision 333789)
@@ -1,411 +1,422 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Bluetooth sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
 #include "pcap-bt-linux.h"
 #include "pcap/bluetooth.h"
 
-#ifdef NEED_STRERROR_H
-#include "strerror.h"
-#endif
-
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
 #define BT_IFACE "bluetooth"
 #define BT_CTRL_SIZE 128
 
 /* forward declaration */
 static int bt_activate(pcap_t *);
 static int bt_read_linux(pcap_t *, int , pcap_handler , u_char *);
 static int bt_inject_linux(pcap_t *, const void *, size_t);
 static int bt_setdirection_linux(pcap_t *, pcap_direction_t);
 static int bt_stats_linux(pcap_t *, struct pcap_stat *);
 
 /*
  * Private data for capturing on Linux Bluetooth devices.
  */
 struct pcap_bt {
 	int dev_id;		/* device ID of device we're bound to */
 };
 
 int
-bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
+bt_findalldevs(pcap_if_list_t *devlistp, char *err_str)
 {
 	struct hci_dev_list_req *dev_list;
 	struct hci_dev_req *dev_req;
 	int i, sock;
 	int ret = 0;
 
 	sock  = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 	if (sock < 0)
 	{
 		/* if bluetooth is not supported this this is not fatal*/
 		if (errno == EAFNOSUPPORT)
 			return 0;
-		pcap_snprintf(err_str, PCAP_ERRBUF_SIZE,
-		    "Can't open raw Bluetooth socket: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(err_str, PCAP_ERRBUF_SIZE,
+		    errno, "Can't open raw Bluetooth socket");
 		return -1;
 	}
 
 	dev_list = malloc(HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));
 	if (!dev_list)
 	{
 		pcap_snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't allocate %zu bytes for Bluetooth device list",
 			HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));
 		ret = -1;
 		goto done;
 	}
 
 	dev_list->dev_num = HCI_MAX_DEV;
 
 	if (ioctl(sock, HCIGETDEVLIST, (void *) dev_list) < 0)
 	{
-		pcap_snprintf(err_str, PCAP_ERRBUF_SIZE,
-		    "Can't get Bluetooth device list via ioctl: %s",
-		    strerror(errno));
+		pcap_fmt_errmsg_for_errno(err_str, PCAP_ERRBUF_SIZE,
+		    errno, "Can't get Bluetooth device list via ioctl");
 		ret = -1;
 		goto free;
 	}
 
 	dev_req = dev_list->dev_req;
 	for (i = 0; i < dev_list->dev_num; i++, dev_req++) {
 		char dev_name[20], dev_descr[30];
 
 		pcap_snprintf(dev_name, 20, BT_IFACE"%d", dev_req->dev_id);
 		pcap_snprintf(dev_descr, 30, "Bluetooth adapter number %d", i);
 
-		if (pcap_add_if(alldevsp, dev_name, 0,
-		       dev_descr, err_str) < 0)
+		/*
+		 * Bluetooth is a wireless technology.
+		 * XXX - if there's the notion of associating with a
+		 * network, and we can determine whether the interface
+		 * is associated with a network, check that and set
+		 * the status to PCAP_IF_CONNECTION_STATUS_CONNECTED
+		 * or PCAP_IF_CONNECTION_STATUS_DISCONNECTED.
+		 */
+		if (add_dev(devlistp, dev_name, PCAP_IF_WIRELESS, dev_descr, err_str)  == NULL)
 		{
 			ret = -1;
 			break;
 		}
-
 	}
 
 free:
 	free(dev_list);
 
 done:
 	close(sock);
 	return ret;
 }
 
 pcap_t *
 bt_create(const char *device, char *ebuf, int *is_ours)
 {
 	const char *cp;
 	char *cpend;
 	long devnum;
 	pcap_t *p;
 
 	/* Does this look like a Bluetooth device? */
 	cp = strrchr(device, '/');
 	if (cp == NULL)
 		cp = device;
 	/* Does it begin with BT_IFACE? */
 	if (strncmp(cp, BT_IFACE, sizeof BT_IFACE - 1) != 0) {
 		/* Nope, doesn't begin with BT_IFACE */
 		*is_ours = 0;
 		return NULL;
 	}
 	/* Yes - is BT_IFACE followed by a number? */
 	cp += sizeof BT_IFACE - 1;
 	devnum = strtol(cp, &cpend, 10);
 	if (cpend == cp || *cpend != '\0') {
 		/* Not followed by a number. */
 		*is_ours = 0;
 		return NULL;
 	}
 	if (devnum < 0) {
 		/* Followed by a non-valid number. */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_bt));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = bt_activate;
 	return (p);
 }
 
 static int
 bt_activate(pcap_t* handle)
 {
 	struct pcap_bt *handlep = handle->priv;
 	struct sockaddr_hci addr;
 	int opt;
 	int		dev_id;
 	struct hci_filter	flt;
 	int err = PCAP_ERROR;
 
 	/* get bt interface id */
 	if (sscanf(handle->opt.device, BT_IFACE"%d", &dev_id) != 1)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			"Can't get Bluetooth device index from %s",
 			 handle->opt.device);
 		return PCAP_ERROR;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+		handle->snapshot = MAXIMUM_SNAPLEN;
+
 	/* Initialize some components of the pcap structure. */
 	handle->bufsize = BT_CTRL_SIZE+sizeof(pcap_bluetooth_h4_header)+handle->snapshot;
 	handle->linktype = DLT_BLUETOOTH_HCI_H4_WITH_PHDR;
 
 	handle->read_op = bt_read_linux;
 	handle->inject_op = bt_inject_linux;
 	handle->setfilter_op = install_bpf_program; /* no kernel filtering */
 	handle->setdirection_op = bt_setdirection_linux;
 	handle->set_datalink_op = NULL;	/* can't change data link type */
 	handle->getnonblock_op = pcap_getnonblock_fd;
 	handle->setnonblock_op = pcap_setnonblock_fd;
 	handle->stats_op = bt_stats_linux;
 	handlep->dev_id = dev_id;
 
 	/* Create HCI socket */
 	handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 	if (handle->fd < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't create raw socket: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't create raw socket");
 		return PCAP_ERROR;
 	}
 
 	handle->buffer = malloc(handle->bufsize);
 	if (!handle->buffer) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate dump buffer: %s",
-			pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't allocate dump buffer");
 		goto close_fail;
 	}
 
 	opt = 1;
 	if (setsockopt(handle->fd, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't enable data direction info: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't enable data direction info");
 		goto close_fail;
 	}
 
 	opt = 1;
 	if (setsockopt(handle->fd, SOL_HCI, HCI_TIME_STAMP, &opt, sizeof(opt)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't enable time stamp: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't enable time stamp");
 		goto close_fail;
 	}
 
 	/* Setup filter, do not call hci function to avoid dependence on
 	 * external libs	*/
 	memset(&flt, 0, sizeof(flt));
 	memset((void *) &flt.type_mask, 0xff, sizeof(flt.type_mask));
 	memset((void *) &flt.event_mask, 0xff, sizeof(flt.event_mask));
 	if (setsockopt(handle->fd, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't set filter: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't set filter");
 		goto close_fail;
 	}
 
 
 	/* Bind socket to the HCI device */
 	addr.hci_family = AF_BLUETOOTH;
 	addr.hci_dev = handlep->dev_id;
-#ifdef SOCKADDR_HCI_HAS_HCI_CHANNEL
+#ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
 	addr.hci_channel = HCI_CHANNEL_RAW;
 #endif
 	if (bind(handle->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't attach to device %d: %s", handlep->dev_id,
-		    strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't attach to device %d", handlep->dev_id);
 		goto close_fail;
 	}
 
 	if (handle->opt.rfmon) {
 		/*
 		 * Monitor mode doesn't apply to Bluetooth devices.
 		 */
 		err = PCAP_ERROR_RFMON_NOTSUP;
 		goto close_fail;
 	}
 
 	if (handle->opt.buffer_size != 0) {
 		/*
 		 * Set the socket buffer size to the specified value.
 		 */
 		if (setsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF,
 		    &handle->opt.buffer_size,
 		    sizeof(handle->opt.buffer_size)) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				 "SO_RCVBUF: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    errno, PCAP_ERRBUF_SIZE, "SO_RCVBUF");
 			goto close_fail;
 		}
 	}
 
 	handle->selectable_fd = handle->fd;
 	return 0;
 
 close_fail:
 	pcap_cleanup_live_common(handle);
 	return err;
 }
 
 static int
-bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+bt_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
 	struct cmsghdr *cmsg;
 	struct msghdr msg;
 	struct iovec  iv;
 	ssize_t ret;
 	struct pcap_pkthdr pkth;
 	pcap_bluetooth_h4_header* bthdr;
 	u_char *pktd;
 	int in = 0;
 
 	pktd = (u_char *)handle->buffer + BT_CTRL_SIZE;
 	bthdr = (pcap_bluetooth_h4_header*)(void *)pktd;
 	iv.iov_base = pktd + sizeof(pcap_bluetooth_h4_header);
 	iv.iov_len  = handle->snapshot;
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_iov = &iv;
 	msg.msg_iovlen = 1;
 	msg.msg_control = handle->buffer;
 	msg.msg_controllen = BT_CTRL_SIZE;
 
 	/* ignore interrupt system call error */
 	do {
 		ret = recvmsg(handle->fd, &msg, 0);
 		if (handle->break_loop)
 		{
 			handle->break_loop = 0;
 			return -2;
 		}
 	} while ((ret == -1) && (errno == EINTR));
 
 	if (ret < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't receive packet: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't receive packet");
 		return -1;
 	}
 
 	pkth.caplen = ret;
 
 	/* get direction and timestamp*/
 	cmsg = CMSG_FIRSTHDR(&msg);
 	while (cmsg) {
 		switch (cmsg->cmsg_type) {
 			case HCI_CMSG_DIR:
 				memcpy(&in, CMSG_DATA(cmsg), sizeof in);
 				break;
                       	case HCI_CMSG_TSTAMP:
                       		memcpy(&pkth.ts, CMSG_DATA(cmsg),
                       		    sizeof pkth.ts);
 				break;
 		}
 		cmsg = CMSG_NXTHDR(&msg, cmsg);
 	}
 	if ((in && (handle->direction == PCAP_D_OUT)) ||
 				((!in) && (handle->direction == PCAP_D_IN)))
 		return 0;
 
 	bthdr->direction = htonl(in != 0);
 	pkth.caplen+=sizeof(pcap_bluetooth_h4_header);
 	pkth.len = pkth.caplen;
 	if (handle->fcode.bf_insns == NULL ||
 	    bpf_filter(handle->fcode.bf_insns, pktd, pkth.len, pkth.caplen)) {
 		callback(user, &pkth, pktd);
 		return 1;
 	}
 	return 0;	/* didn't pass filter */
 }
 
 static int
-bt_inject_linux(pcap_t *handle, const void *buf, size_t size)
+bt_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "
     		"bluetooth devices");
 	return (-1);
 }
 
 
 static int
 bt_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_bt *handlep = handle->priv;
 	int ret;
 	struct hci_dev_info dev_info;
 	struct hci_dev_stats * s = &dev_info.stat;
 	dev_info.dev_id = handlep->dev_id;
 
 	/* ignore eintr */
 	do {
 		ret = ioctl(handle->fd, HCIGETDEVINFO, (void *)&dev_info);
 	} while ((ret == -1) && (errno == EINTR));
 
 	if (ret < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't get stats via ioctl: %s", strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't get stats via ioctl");
 		return (-1);
 
 	}
 
 	/* we receive both rx and tx frames, so comulate all stats */
 	stats->ps_recv = s->evt_rx + s->acl_rx + s->sco_rx + s->cmd_tx +
 		s->acl_tx +s->sco_tx;
 	stats->ps_drop = s->err_rx + s->err_tx;
 	stats->ps_ifdrop = 0;
 	return 0;
 }
 
 static int
 bt_setdirection_linux(pcap_t *p, pcap_direction_t d)
 {
 	p->direction = d;
 	return 0;
 }
Index: vendor/libpcap/dist/pcap-bt-linux.h
===================================================================
--- vendor/libpcap/dist/pcap-bt-linux.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-bt-linux.h	(revision 333789)
@@ -1,38 +1,38 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Bluetooth sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
  */
 
 /*
  * Prototypes for Bluetooth-related functions
  */
-int bt_findalldevs(pcap_if_t **alldevsp, char *err_str);
+int bt_findalldevs(pcap_if_list_t *devlistp, char *err_str);
 pcap_t *bt_create(const char *device, char *ebuf, int *is_ours);
Index: vendor/libpcap/dist/pcap-bt-monitor-linux.c
===================================================================
--- vendor/libpcap/dist/pcap-bt-monitor-linux.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-bt-monitor-linux.c	(revision 333789)
@@ -1,252 +1,272 @@
 /*
  * Copyright (c) 2014 Michal Labedzki for Tieto Corporation
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
 #include "pcap/bluetooth.h"
 #include "pcap-int.h"
 
 #include "pcap-bt-monitor-linux.h"
 
 #define BT_CONTROL_SIZE 32
 #define INTERFACE_NAME "bluetooth-monitor"
 
 /*
  * Fields and alignment must match the declaration in the Linux kernel 3.4+.
  * See struct hci_mon_hdr in include/net/bluetooth/hci_mon.h.
  */
 struct hci_mon_hdr {
     uint16_t opcode;
     uint16_t index;
     uint16_t len;
 } __attribute__((packed));
 
 int
-bt_monitor_findalldevs(pcap_if_t **alldevsp, char *err_str)
+bt_monitor_findalldevs(pcap_if_list_t *devlistp, char *err_str)
 {
     int         ret = 0;
 
-    if (pcap_add_if(alldevsp, INTERFACE_NAME, 0,
-               "Bluetooth Linux Monitor", err_str) < 0)
+    /*
+     * Bluetooth is a wireless technology.
+     *
+     * This is a device to monitor all Bluetooth interfaces, so
+     * there's no notion of "connected" or "disconnected", any
+     * more than there's a notion of "connected" or "disconnected"
+     * for the "any" device.
+     */
+    if (add_dev(devlistp, INTERFACE_NAME,
+                PCAP_IF_WIRELESS|PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
+                "Bluetooth Linux Monitor", err_str) == NULL)
     {
         ret = -1;
     }
 
     return ret;
 }
 
 static int
 bt_monitor_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
     struct cmsghdr *cmsg;
     struct msghdr msg;
     struct iovec  iv[2];
     ssize_t ret;
     struct pcap_pkthdr pkth;
     pcap_bluetooth_linux_monitor_header *bthdr;
     u_char *pktd;
     struct hci_mon_hdr hdr;
 
     pktd = (u_char *)handle->buffer + BT_CONTROL_SIZE;
     bthdr = (pcap_bluetooth_linux_monitor_header*)(void *)pktd;
 
     iv[0].iov_base = &hdr;
     iv[0].iov_len = sizeof(hdr);
     iv[1].iov_base = pktd + sizeof(pcap_bluetooth_linux_monitor_header);
     iv[1].iov_len = handle->snapshot;
 
     memset(&pkth.ts, 0, sizeof(pkth.ts));
     memset(&msg, 0, sizeof(msg));
     msg.msg_iov = iv;
     msg.msg_iovlen = 2;
     msg.msg_control = handle->buffer;
     msg.msg_controllen = BT_CONTROL_SIZE;
 
     do {
         ret = recvmsg(handle->fd, &msg, 0);
         if (handle->break_loop)
         {
             handle->break_loop = 0;
             return -2;
         }
     } while ((ret == -1) && (errno == EINTR));
 
     if (ret < 0) {
-        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-            "Can't receive packet: %s", strerror(errno));
+        pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+            errno, "Can't receive packet");
         return -1;
     }
 
     pkth.caplen = ret - sizeof(hdr) + sizeof(pcap_bluetooth_linux_monitor_header);
     pkth.len = pkth.caplen;
 
     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
         if (cmsg->cmsg_level != SOL_SOCKET) continue;
 
         if (cmsg->cmsg_type == SCM_TIMESTAMP) {
             memcpy(&pkth.ts, CMSG_DATA(cmsg), sizeof(pkth.ts));
         }
     }
 
     bthdr->adapter_id = htons(hdr.index);
     bthdr->opcode = htons(hdr.opcode);
 
     if (handle->fcode.bf_insns == NULL ||
         bpf_filter(handle->fcode.bf_insns, pktd, pkth.len, pkth.caplen)) {
         callback(user, &pkth, pktd);
         return 1;
     }
     return 0;   /* didn't pass filter */
 }
 
 static int
 bt_monitor_inject(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
     pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported yet");
     return -1;
 }
 
 static int
 bt_monitor_setdirection(pcap_t *p, pcap_direction_t d)
 {
     p->direction = d;
     return 0;
 }
 
 static int
 bt_monitor_stats(pcap_t *handle _U_, struct pcap_stat *stats)
 {
     stats->ps_recv = 0;
     stats->ps_drop = 0;
     stats->ps_ifdrop = 0;
 
     return 0;
 }
 
 static int
 bt_monitor_activate(pcap_t* handle)
 {
     struct sockaddr_hci addr;
     int err = PCAP_ERROR;
     int opt;
 
     if (handle->opt.rfmon) {
         /* monitor mode doesn't apply here */
         return PCAP_ERROR_RFMON_NOTSUP;
     }
 
+    /*
+     * Turn a negative snapshot value (invalid), a snapshot value of
+     * 0 (unspecified), or a value bigger than the normal maximum
+     * value, into the maximum allowed value.
+     *
+     * If some application really *needs* a bigger snapshot
+     * length, we should just increase MAXIMUM_SNAPLEN.
+     */
+    if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+        handle->snapshot = MAXIMUM_SNAPLEN;
+
     handle->bufsize = BT_CONTROL_SIZE + sizeof(pcap_bluetooth_linux_monitor_header) + handle->snapshot;
     handle->linktype = DLT_BLUETOOTH_LINUX_MONITOR;
 
     handle->read_op = bt_monitor_read;
     handle->inject_op = bt_monitor_inject;
     handle->setfilter_op = install_bpf_program; /* no kernel filtering */
     handle->setdirection_op = bt_monitor_setdirection;
     handle->set_datalink_op = NULL; /* can't change data link type */
     handle->getnonblock_op = pcap_getnonblock_fd;
     handle->setnonblock_op = pcap_setnonblock_fd;
     handle->stats_op = bt_monitor_stats;
 
     handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
     if (handle->fd < 0) {
-        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-            "Can't create raw socket: %s", strerror(errno));
+        pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+            errno, "Can't create raw socket");
         return PCAP_ERROR;
     }
 
     handle->buffer = malloc(handle->bufsize);
     if (!handle->buffer) {
-        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate dump buffer: %s",
-            pcap_strerror(errno));
+        pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+            errno, "Can't allocate dump buffer");
         goto close_fail;
     }
 
     /* Bind socket to the HCI device */
     addr.hci_family = AF_BLUETOOTH;
     addr.hci_dev = HCI_DEV_NONE;
     addr.hci_channel = HCI_CHANNEL_MONITOR;
 
     if (bind(handle->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-            "Can't attach to interface: %s", strerror(errno));
+        pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+            errno, "Can't attach to interface");
         goto close_fail;
     }
 
     opt = 1;
     if (setsockopt(handle->fd, SOL_SOCKET, SO_TIMESTAMP, &opt, sizeof(opt)) < 0) {
-        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-            "Can't enable time stamp: %s", strerror(errno));
+        pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+            errno, "Can't enable time stamp");
         goto close_fail;
     }
 
     handle->selectable_fd = handle->fd;
 
     return 0;
 
 close_fail:
     pcap_cleanup_live_common(handle);
     return err;
 }
 
 pcap_t *
 bt_monitor_create(const char *device, char *ebuf, int *is_ours)
 {
     pcap_t      *p;
     const char  *cp;
 
     cp = strrchr(device, '/');
     if (cp == NULL)
         cp = device;
 
     if (strcmp(cp, INTERFACE_NAME) != 0) {
         *is_ours = 0;
         return NULL;
     }
 
     *is_ours = 1;
     p = pcap_create_common(ebuf, 0);
     if (p == NULL)
         return NULL;
 
     p->activate_op = bt_monitor_activate;
 
     return p;
 }
Index: vendor/libpcap/dist/pcap-bt-monitor-linux.h
===================================================================
--- vendor/libpcap/dist/pcap-bt-monitor-linux.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-bt-monitor-linux.h	(revision 333789)
@@ -1,32 +1,32 @@
 /*
  * Copyright (c) 2014 Michal Labedzki for Tieto Corporation
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-int bt_monitor_findalldevs(pcap_if_t **alldevsp, char *err_str);
+int bt_monitor_findalldevs(pcap_if_list_t *devlistp, char *err_str);
 pcap_t *bt_monitor_create(const char *device, char *ebuf, int *is_ours);
Index: vendor/libpcap/dist/pcap-common.c
===================================================================
--- vendor/libpcap/dist/pcap-common.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-common.c	(revision 333789)
@@ -1,1461 +1,1529 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
- * pcap-common.c - common code for pcap and pcap-ng files
+ * pcap-common.c - common code for pcap and pcapng files
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
-#endif /* _WIN32 */
+#include <pcap-types.h>
 
 #include "pcap-int.h"
 #include "extract.h"
 #include "pcap/sll.h"
 #include "pcap/usb.h"
 #include "pcap/nflog.h"
 #include "pcap/can_socketcan.h"
 
 #include "pcap-common.h"
 
 /*
  * We don't write DLT_* values to capture files, because they're not the
  * same on all platforms.
  *
  * Unfortunately, the various flavors of BSD have not always used the same
  * numerical values for the same data types, and various patches to
  * libpcap for non-BSD OSes have added their own DLT_* codes for link
  * layer encapsulation types seen on those OSes, and those codes have had,
  * in some cases, values that were also used, on other platforms, for other
  * link layer encapsulation types.
  *
  * This means that capture files of a type whose numerical DLT_* code
  * means different things on different BSDs, or with different versions
  * of libpcap, can't always be read on systems other than those like
  * the one running on the machine on which the capture was made.
  *
  * Instead, we define here a set of LINKTYPE_* codes, and map DLT_* codes
  * to LINKTYPE_* codes when writing a savefile header, and map LINKTYPE_*
  * codes to DLT_* codes when reading a savefile header.
  *
  * For those DLT_* codes that have, as far as we know, the same values on
  * all platforms (DLT_NULL through DLT_FDDI), we define LINKTYPE_xxx as
  * DLT_xxx; that way, captures of those types can still be read by
  * versions of libpcap that map LINKTYPE_* values to DLT_* values, and
  * captures of those types written by versions of libpcap that map DLT_
  * values to LINKTYPE_ values can still be read by older versions
  * of libpcap.
  *
  * The other LINKTYPE_* codes are given values starting at 100, in the
  * hopes that no DLT_* code will be given one of those values.
  *
  * In order to ensure that a given LINKTYPE_* code's value will refer to
  * the same encapsulation type on all platforms, you should not allocate
  * a new LINKTYPE_* value without consulting
  * "tcpdump-workers@lists.tcpdump.org".  The tcpdump developers will
  * allocate a value for you, and will not subsequently allocate it to
  * anybody else; that value will be added to the "pcap.h" in the
  * tcpdump.org Git repository, so that a future libpcap release will
  * include it.
  *
  * You should, if possible, also contribute patches to libpcap and tcpdump
  * to handle the new encapsulation type, so that they can also be checked
  * into the tcpdump.org Git repository and so that they will appear in
  * future libpcap and tcpdump releases.
  *
  * Do *NOT* assume that any values after the largest value in this file
  * are available; you might not have the most up-to-date version of this
  * file, and new values after that one might have been assigned.  Also,
  * do *NOT* use any values below 100 - those might already have been
  * taken by one (or more!) organizations.
  *
  * Any platform that defines additional DLT_* codes should:
  *
  *	request a LINKTYPE_* code and value from tcpdump.org,
  *	as per the above;
  *
  *	add, in their version of libpcap, an entry to map
  *	those DLT_* codes to the corresponding LINKTYPE_*
  *	code;
  *
  *	redefine, in their "net/bpf.h", any DLT_* values
  *	that collide with the values used by their additional
  *	DLT_* codes, to remove those collisions (but without
  *	making them collide with any of the LINKTYPE_*
  *	values equal to 50 or above; they should also avoid
  *	defining DLT_* values that collide with those
  *	LINKTYPE_* values, either).
  */
 #define LINKTYPE_NULL		DLT_NULL
 #define LINKTYPE_ETHERNET	DLT_EN10MB	/* also for 100Mb and up */
 #define LINKTYPE_EXP_ETHERNET	DLT_EN3MB	/* 3Mb experimental Ethernet */
 #define LINKTYPE_AX25		DLT_AX25
 #define LINKTYPE_PRONET		DLT_PRONET
 #define LINKTYPE_CHAOS		DLT_CHAOS
 #define LINKTYPE_IEEE802_5	DLT_IEEE802	/* DLT_IEEE802 is used for 802.5 Token Ring */
 #define LINKTYPE_ARCNET_BSD	DLT_ARCNET	/* BSD-style headers */
 #define LINKTYPE_SLIP		DLT_SLIP
 #define LINKTYPE_PPP		DLT_PPP
 #define LINKTYPE_FDDI		DLT_FDDI
 
 /*
  * LINKTYPE_PPP is for use when there might, or might not, be an RFC 1662
  * PPP in HDLC-like framing header (with 0xff 0x03 before the PPP protocol
  * field) at the beginning of the packet.
  *
  * This is for use when there is always such a header; the address field
  * might be 0xff, for regular PPP, or it might be an address field for Cisco
  * point-to-point with HDLC framing as per section 4.3.1 of RFC 1547 ("Cisco
  * HDLC").  This is, for example, what you get with NetBSD's DLT_PPP_SERIAL.
  *
  * We give it the same value as NetBSD's DLT_PPP_SERIAL, in the hopes that
  * nobody else will choose a DLT_ value of 50, and so that DLT_PPP_SERIAL
  * captures will be written out with a link type that NetBSD's tcpdump
  * can read.
  */
 #define LINKTYPE_PPP_HDLC	50		/* PPP in HDLC-like framing */
 
 #define LINKTYPE_PPP_ETHER	51		/* NetBSD PPP-over-Ethernet */
 
 #define LINKTYPE_SYMANTEC_FIREWALL 99		/* Symantec Enterprise Firewall */
 
 /*
  * These correspond to DLT_s that have different values on different
  * platforms; we map between these values in capture files and
  * the DLT_ values as returned by pcap_datalink() and passed to
  * pcap_open_dead().
  */
 #define LINKTYPE_ATM_RFC1483	100		/* LLC/SNAP-encapsulated ATM */
 #define LINKTYPE_RAW		101		/* raw IP */
 #define LINKTYPE_SLIP_BSDOS	102		/* BSD/OS SLIP BPF header */
 #define LINKTYPE_PPP_BSDOS	103		/* BSD/OS PPP BPF header */
 
 /*
  * Values starting with 104 are used for newly-assigned link-layer
  * header type values; for those link-layer header types, the DLT_
  * value returned by pcap_datalink() and passed to pcap_open_dead(),
  * and the LINKTYPE_ value that appears in capture files, are the
  * same.
  *
  * LINKTYPE_MATCHING_MIN is the lowest such value; LINKTYPE_MATCHING_MAX
  * is the highest such value.
  */
 #define LINKTYPE_MATCHING_MIN	104		/* lowest value in the "matching" range */
 
 #define LINKTYPE_C_HDLC		104		/* Cisco HDLC */
 #define LINKTYPE_IEEE802_11	105		/* IEEE 802.11 (wireless) */
 #define LINKTYPE_ATM_CLIP	106		/* Linux Classical IP over ATM */
 #define LINKTYPE_FRELAY		107		/* Frame Relay */
 #define LINKTYPE_LOOP		108		/* OpenBSD loopback */
 #define LINKTYPE_ENC		109		/* OpenBSD IPSEC enc */
 
 /*
  * These three types are reserved for future use.
  */
 #define LINKTYPE_LANE8023	110		/* ATM LANE + 802.3 */
 #define LINKTYPE_HIPPI		111		/* NetBSD HIPPI */
 #define LINKTYPE_HDLC		112		/* NetBSD HDLC framing */
 
 #define LINKTYPE_LINUX_SLL	113		/* Linux cooked socket capture */
 #define LINKTYPE_LTALK		114		/* Apple LocalTalk hardware */
 #define LINKTYPE_ECONET		115		/* Acorn Econet */
 
 /*
  * Reserved for use with OpenBSD ipfilter.
  */
 #define LINKTYPE_IPFILTER	116
 
 #define LINKTYPE_PFLOG		117		/* OpenBSD DLT_PFLOG */
 #define LINKTYPE_CISCO_IOS	118		/* For Cisco-internal use */
 #define LINKTYPE_IEEE802_11_PRISM 119		/* 802.11 plus Prism II monitor mode radio metadata header */
 #define LINKTYPE_IEEE802_11_AIRONET 120		/* 802.11 plus FreeBSD Aironet driver radio metadata header */
 
 /*
  * Reserved for Siemens HiPath HDLC.
  */
 #define LINKTYPE_HHDLC		121
 
 #define LINKTYPE_IP_OVER_FC	122		/* RFC 2625 IP-over-Fibre Channel */
 #define LINKTYPE_SUNATM		123		/* Solaris+SunATM */
 
 /*
  * Reserved as per request from Kent Dahlgren <kent@praesum.com>
  * for private use.
  */
 #define LINKTYPE_RIO		124		/* RapidIO */
 #define LINKTYPE_PCI_EXP	125		/* PCI Express */
 #define LINKTYPE_AURORA		126		/* Xilinx Aurora link layer */
 
 #define LINKTYPE_IEEE802_11_RADIOTAP 127	/* 802.11 plus radiotap radio metadata header */
 
 /*
  * Reserved for the TZSP encapsulation, as per request from
  * Chris Waters <chris.waters@networkchemistry.com>
  * TZSP is a generic encapsulation for any other link type,
  * which includes a means to include meta-information
  * with the packet, e.g. signal strength and channel
  * for 802.11 packets.
  */
 #define LINKTYPE_TZSP		128		/* Tazmen Sniffer Protocol */
 
 #define LINKTYPE_ARCNET_LINUX	129		/* Linux-style headers */
 
 /*
  * Juniper-private data link types, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The corresponding
  * DLT_s are used for passing on chassis-internal
  * metainformation such as QOS profiles, etc..
  */
 #define LINKTYPE_JUNIPER_MLPPP  130
 #define LINKTYPE_JUNIPER_MLFR   131
 #define LINKTYPE_JUNIPER_ES     132
 #define LINKTYPE_JUNIPER_GGSN   133
 #define LINKTYPE_JUNIPER_MFR    134
 #define LINKTYPE_JUNIPER_ATM2   135
 #define LINKTYPE_JUNIPER_SERVICES 136
 #define LINKTYPE_JUNIPER_ATM1   137
 
 #define LINKTYPE_APPLE_IP_OVER_IEEE1394 138	/* Apple IP-over-IEEE 1394 cooked header */
 
 #define LINKTYPE_MTP2_WITH_PHDR	139
 #define LINKTYPE_MTP2		140
 #define LINKTYPE_MTP3		141
 #define LINKTYPE_SCCP		142
 
 #define LINKTYPE_DOCSIS		143		/* DOCSIS MAC frames */
 
 #define LINKTYPE_LINUX_IRDA	144		/* Linux-IrDA */
 
 /*
  * Reserved for IBM SP switch and IBM Next Federation switch.
  */
 #define LINKTYPE_IBM_SP		145
 #define LINKTYPE_IBM_SN		146
 
 /*
  * Reserved for private use.  If you have some link-layer header type
  * that you want to use within your organization, with the capture files
  * using that link-layer header type not ever be sent outside your
  * organization, you can use these values.
  *
  * No libpcap release will use these for any purpose, nor will any
  * tcpdump release use them, either.
  *
  * Do *NOT* use these in capture files that you expect anybody not using
  * your private versions of capture-file-reading tools to read; in
  * particular, do *NOT* use them in products, otherwise you may find that
  * people won't be able to use tcpdump, or snort, or Ethereal, or... to
  * read capture files from your firewall/intrusion detection/traffic
  * monitoring/etc. appliance, or whatever product uses that LINKTYPE_ value,
  * and you may also find that the developers of those applications will
  * not accept patches to let them read those files.
  *
  * Also, do not use them if somebody might send you a capture using them
  * for *their* private type and tools using them for *your* private type
  * would have to read them.
  *
  * Instead, in those cases, ask "tcpdump-workers@lists.tcpdump.org" for a
  * new DLT_ and LINKTYPE_ value, as per the comment in pcap/bpf.h, and use
  * the type you're given.
  */
 #define LINKTYPE_USER0		147
 #define LINKTYPE_USER1		148
 #define LINKTYPE_USER2		149
 #define LINKTYPE_USER3		150
 #define LINKTYPE_USER4		151
 #define LINKTYPE_USER5		152
 #define LINKTYPE_USER6		153
 #define LINKTYPE_USER7		154
 #define LINKTYPE_USER8		155
 #define LINKTYPE_USER9		156
 #define LINKTYPE_USER10		157
 #define LINKTYPE_USER11		158
 #define LINKTYPE_USER12		159
 #define LINKTYPE_USER13		160
 #define LINKTYPE_USER14		161
 #define LINKTYPE_USER15		162
 
 /*
  * For future use with 802.11 captures - defined by AbsoluteValue
  * Systems to store a number of bits of link-layer information
  * including radio information:
  *
  *	http://www.shaftnet.org/~pizza/software/capturefrm.txt
  */
 #define LINKTYPE_IEEE802_11_AVS	163	/* 802.11 plus AVS radio metadata header */
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The corresponding
  * DLT_s are used for passing on chassis-internal
  * metainformation such as QOS profiles, etc..
  */
 #define LINKTYPE_JUNIPER_MONITOR 164
 
 /*
  * BACnet MS/TP frames.
  */
 #define LINKTYPE_BACNET_MS_TP	165
 
 /*
  * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
  *
  * This is used in some OSes to allow a kernel socket filter to distinguish
  * between incoming and outgoing packets, on a socket intended to
  * supply pppd with outgoing packets so it can do dial-on-demand and
  * hangup-on-lack-of-demand; incoming packets are filtered out so they
  * don't cause pppd to hold the connection up (you don't want random
  * input packets such as port scans, packets from old lost connections,
  * etc. to force the connection to stay up).
  *
  * The first byte of the PPP header (0xff03) is modified to accomodate
  * the direction - 0x00 = IN, 0x01 = OUT.
  */
 #define LINKTYPE_PPP_PPPD	166
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
  * for passing on chassis-internal metainformation such as
  * QOS profiles, cookies, etc..
  */
 #define LINKTYPE_JUNIPER_PPPOE     167
 #define LINKTYPE_JUNIPER_PPPOE_ATM 168
 
 #define LINKTYPE_GPRS_LLC	169		/* GPRS LLC */
 #define LINKTYPE_GPF_T		170		/* GPF-T (ITU-T G.7041/Y.1303) */
 #define LINKTYPE_GPF_F		171		/* GPF-F (ITU-T G.7041/Y.1303) */
 
 /*
  * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
  * monitoring equipment.
  */
 #define LINKTYPE_GCOM_T1E1	172
 #define LINKTYPE_GCOM_SERIAL	173
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.  The DLT_ is used
  * for internal communication to Physical Interface Cards (PIC)
  */
 #define LINKTYPE_JUNIPER_PIC_PEER    174
 
 /*
  * Link types requested by Gregor Maier <gregor@endace.com> of Endace
  * Measurement Systems.  They add an ERF header (see
  * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
  * the link-layer header.
  */
 #define LINKTYPE_ERF_ETH	175	/* Ethernet */
 #define LINKTYPE_ERF_POS	176	/* Packet-over-SONET */
 
 /*
  * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
  * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
  * includes additional information before the LAPD header, so it's
  * not necessarily a generic LAPD header.
  */
 #define LINKTYPE_LINUX_LAPD	177
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The Link Types are used for prepending meta-information
  * like interface index, interface name
  * before standard Ethernet, PPP, Frelay & C-HDLC Frames
  */
 #define LINKTYPE_JUNIPER_ETHER  178
 #define LINKTYPE_JUNIPER_PPP    179
 #define LINKTYPE_JUNIPER_FRELAY 180
 #define LINKTYPE_JUNIPER_CHDLC  181
 
 /*
  * Multi Link Frame Relay (FRF.16)
  */
 #define LINKTYPE_MFR            182
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for internal communication with a
  * voice Adapter Card (PIC)
  */
 #define LINKTYPE_JUNIPER_VP     183
 
 /*
  * Arinc 429 frames.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Every frame contains a 32bit A429 label.
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */
 #define LINKTYPE_A429           184
 
 /*
  * Arinc 653 Interpartition Communication messages.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Please refer to the A653-1 standard for more information.
  */
 #define LINKTYPE_A653_ICM       185
 
 /*
  * This used to be "USB packets, beginning with a USB setup header;
  * requested by Paolo Abeni <paolo.abeni@email.it>."
  *
  * However, that header didn't work all that well - it left out some
  * useful information - and was abandoned in favor of the DLT_USB_LINUX
  * header.
  *
  * This is now used by FreeBSD for its BPF taps for USB; that has its
  * own headers.  So it is written, so it is done.
  */
 #define LINKTYPE_USB_FREEBSD	186
 
 /*
  * Bluetooth HCI UART transport layer (part H:4); requested by
  * Paolo Abeni.
  */
 #define LINKTYPE_BLUETOOTH_HCI_H4	187
 
 /*
  * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
  * <cruz_petagay@bah.com>.
  */
 #define LINKTYPE_IEEE802_16_MAC_CPS	188
 
 /*
  * USB packets, beginning with a Linux USB header; requested by
  * Paolo Abeni <paolo.abeni@email.it>.
  */
 #define LINKTYPE_USB_LINUX		189
 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.
  * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  * Used to dump CAN packets coming from a CAN Vector board.
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */
 #define LINKTYPE_CAN20B         190
 
 /*
  * IEEE 802.15.4, with address fields padded, as is done by Linux
  * drivers; requested by Juergen Schimmer.
  */
 #define LINKTYPE_IEEE802_15_4_LINUX	191
 
 /*
  * Per Packet Information encapsulated packets.
  * LINKTYPE_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
  */
 #define LINKTYPE_PPI			192
 
 /*
  * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
  * requested by Charles Clancy.
  */
 #define LINKTYPE_IEEE802_16_MAC_CPS_RADIO	193
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for internal communication with a
  * integrated service module (ISM).
  */
 #define LINKTYPE_JUNIPER_ISM    194
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
+ * nothing), and with the FCS at the end of the frame; requested by
+ * Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
+ *
+ * This should only be used if the FCS is present at the end of the
+ * frame; if the frame has no FCS, DLT_IEEE802_15_4_NOFCS should be
+ * used.
  */
-#define LINKTYPE_IEEE802_15_4	195
+#define LINKTYPE_IEEE802_15_4_WITHFCS	195
 
 /*
  * Various link-layer types, with a pseudo-header, for SITA
  * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
  */
 #define LINKTYPE_SITA		196
 
 /*
  * Various link-layer types, with a pseudo-header, for Endace DAG cards;
  * encapsulates Endace ERF records.  Requested by Stephen Donnelly
  * <stephen@endace.com>.
  */
 #define LINKTYPE_ERF		197
 
 /*
  * Special header prepended to Ethernet packets when capturing from a
  * u10 Networks board.  Requested by Phil Mulholland
  * <phil@u10networks.com>.
  */
 #define LINKTYPE_RAIF1		198
 
 /*
  * IPMB packet for IPMI, beginning with the I2C slave address, followed
  * by the netFn and LUN, etc..  Requested by Chanthy Toeung
  * <chanthy.toeung@ca.kontron.com>.
  */
 #define LINKTYPE_IPMB		199
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  * The DLT_ is used for capturing data on a secure tunnel interface.
  */
 #define LINKTYPE_JUNIPER_ST     200
 
 /*
  * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
  * that includes direction information; requested by Paolo Abeni.
  */
 #define LINKTYPE_BLUETOOTH_HCI_H4_WITH_PHDR	201
 
 /*
  * AX.25 packet with a 1-byte KISS header; see
  *
  *	http://www.ax25.net/kiss.htm
  *
  * as per Richard Stearn <richard@rns-stearn.demon.co.uk>.
  */
 #define LINKTYPE_AX25_KISS	202
 
 /*
  * LAPD packets from an ISDN channel, starting with the address field,
  * with no pseudo-header.
  * Requested by Varuna De Silva <varunax@gmail.com>.
  */
 #define LINKTYPE_LAPD		203
 
 /*
  * Variants of various link-layer headers, with a one-byte direction
  * pseudo-header prepended - zero means "received by this host",
  * non-zero (any non-zero value) means "sent by this host" - as per
  * Will Barker <w.barker@zen.co.uk>.
  */
 #define LINKTYPE_PPP_WITH_DIR	204	/* PPP */
 #define LINKTYPE_C_HDLC_WITH_DIR 205	/* Cisco HDLC */
 #define LINKTYPE_FRELAY_WITH_DIR 206	/* Frame Relay */
 #define LINKTYPE_LAPB_WITH_DIR	207	/* LAPB */
 
 /*
  * 208 is reserved for an as-yet-unspecified proprietary link-layer
  * type, as requested by Will Barker.
  */
 
 /*
  * IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
  * <avn@pigeonpoint.com>.
  */
 #define LINKTYPE_IPMB_LINUX	209
 
 /*
  * FlexRay automotive bus - http://www.flexray.com/ - as requested
  * by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define LINKTYPE_FLEXRAY	210
 
 /*
  * Media Oriented Systems Transport (MOST) bus for multimedia
  * transport - http://www.mostcooperation.com/ - as requested
  * by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define LINKTYPE_MOST		211
 
 /*
  * Local Interconnect Network (LIN) bus for vehicle networks -
  * http://www.lin-subbus.org/ - as requested by Hannes Kaelber
  * <hannes.kaelber@x2e.de>.
  */
 #define LINKTYPE_LIN		212
 
 /*
  * X2E-private data link type used for serial line capture,
  * as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define LINKTYPE_X2E_SERIAL	213
 
 /*
  * X2E-private data link type used for the Xoraya data logger
  * family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
  */
 #define LINKTYPE_X2E_XORAYA	214
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
  * nothing), but with the PHY-level data for non-ASK PHYs (4 octets
  * of 0 as preamble, one octet of SFD, one octet of frame length+
  * reserved bit, and then the MAC-layer data, starting with the
  * frame control field).
  *
  * Requested by Max Filippov <jcmvbkbc@gmail.com>.
  */
 #define LINKTYPE_IEEE802_15_4_NONASK_PHY	215
 
 /*
  * David Gibson <david@gibson.dropbear.id.au> requested this for
  * captures from the Linux kernel /dev/input/eventN devices. This
  * is used to communicate keystrokes and mouse movements from the
  * Linux kernel to display systems, such as Xorg.
  */
 #define LINKTYPE_LINUX_EVDEV	216
 
 /*
  * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
  *
  * Requested by Harald Welte <laforge@gnumonks.org>.
  */
 #define LINKTYPE_GSMTAP_UM	217
 #define LINKTYPE_GSMTAP_ABIS	218
 
 /*
  * MPLS, with an MPLS label as the link-layer header.
  * Requested by Michele Marchetto <michele@openbsd.org> on behalf
  * of OpenBSD.
  */
 #define LINKTYPE_MPLS		219
 
 /*
  * USB packets, beginning with a Linux USB header, with the USB header
  * padded to 64 bytes; required for memory-mapped access.
  */
 #define LINKTYPE_USB_LINUX_MMAPPED		220
 
 /*
  * DECT packets, with a pseudo-header; requested by
  * Matthias Wenzel <tcpdump@mazzoo.de>.
  */
 #define LINKTYPE_DECT		221
 
 /*
  * From: "Lidwa, Eric (GSFC-582.0)[SGT INC]" <eric.lidwa-1@nasa.gov>
  * Date: Mon, 11 May 2009 11:18:30 -0500
  *
  * DLT_AOS. We need it for AOS Space Data Link Protocol.
  *   I have already written dissectors for but need an OK from
  *   legal before I can submit a patch.
  *
  */
 #define LINKTYPE_AOS		222
 
 /*
  * Wireless HART (Highway Addressable Remote Transducer)
  * From the HART Communication Foundation
  * IES/PAS 62591
  *
  * Requested by Sam Roberts <vieuxtech@gmail.com>.
  */
 #define LINKTYPE_WIHART		223
 
 /*
  * Fibre Channel FC-2 frames, beginning with a Frame_Header.
  * Requested by Kahou Lei <kahou82@gmail.com>.
  */
 #define LINKTYPE_FC_2		224
 
 /*
  * Fibre Channel FC-2 frames, beginning with an encoding of the
  * SOF, and ending with an encoding of the EOF.
  *
  * The encodings represent the frame delimiters as 4-byte sequences
  * representing the corresponding ordered sets, with K28.5
  * represented as 0xBC, and the D symbols as the corresponding
  * byte values; for example, SOFi2, which is K28.5 - D21.5 - D1.2 - D21.2,
  * is represented as 0xBC 0xB5 0x55 0x55.
  *
  * Requested by Kahou Lei <kahou82@gmail.com>.
  */
 #define LINKTYPE_FC_2_WITH_FRAME_DELIMS		225
 
 /*
  * Solaris ipnet pseudo-header; requested by Darren Reed <Darren.Reed@Sun.COM>.
  *
  * The pseudo-header starts with a one-byte version number; for version 2,
  * the pseudo-header is:
  *
  * struct dl_ipnetinfo {
- *     u_int8_t   dli_version;
- *     u_int8_t   dli_family;
- *     u_int16_t  dli_htype;
- *     u_int32_t  dli_pktlen;
- *     u_int32_t  dli_ifindex;
- *     u_int32_t  dli_grifindex;
- *     u_int32_t  dli_zsrc;
- *     u_int32_t  dli_zdst;
+ *     uint8_t   dli_version;
+ *     uint8_t   dli_family;
+ *     uint16_t  dli_htype;
+ *     uint32_t  dli_pktlen;
+ *     uint32_t  dli_ifindex;
+ *     uint32_t  dli_grifindex;
+ *     uint32_t  dli_zsrc;
+ *     uint32_t  dli_zdst;
  * };
  *
  * dli_version is 2 for the current version of the pseudo-header.
  *
  * dli_family is a Solaris address family value, so it's 2 for IPv4
  * and 26 for IPv6.
  *
  * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
  * packets, and 2 for packets arriving from another zone on the same
  * machine.
  *
  * dli_pktlen is the length of the packet data following the pseudo-header
  * (so the captured length minus dli_pktlen is the length of the
  * pseudo-header, assuming the entire pseudo-header was captured).
  *
  * dli_ifindex is the interface index of the interface on which the
  * packet arrived.
  *
  * dli_grifindex is the group interface index number (for IPMP interfaces).
  *
  * dli_zsrc is the zone identifier for the source of the packet.
  *
  * dli_zdst is the zone identifier for the destination of the packet.
  *
  * A zone number of 0 is the global zone; a zone number of 0xffffffff
  * means that the packet arrived from another host on the network, not
  * from another zone on the same machine.
  *
  * An IPv4 or IPv6 datagram follows the pseudo-header; dli_family indicates
  * which of those it is.
  */
 #define LINKTYPE_IPNET		226
 
 /*
  * CAN (Controller Area Network) frames, with a pseudo-header as supplied
  * by Linux SocketCAN, and with multi-byte numerical fields in that header
  * in big-endian byte order.
  *
  * See Documentation/networking/can.txt in the Linux source.
  *
  * Requested by Felix Obenhuber <felix@obenhuber.de>.
  */
 #define LINKTYPE_CAN_SOCKETCAN	227
 
 /*
  * Raw IPv4/IPv6; different from DLT_RAW in that the DLT_ value specifies
  * whether it's v4 or v6.  Requested by Darren Reed <Darren.Reed@Sun.COM>.
  */
 #define LINKTYPE_IPV4		228
 #define LINKTYPE_IPV6		229
 
 /*
  * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
  * nothing), and with no FCS at the end of the frame; requested by
  * Jon Smirl <jonsmirl@gmail.com>.
  */
 #define LINKTYPE_IEEE802_15_4_NOFCS		230
 
 /*
  * Raw D-Bus:
  *
  *	http://www.freedesktop.org/wiki/Software/dbus
  *
  * messages:
  *
  *	http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
  *
  * starting with the endianness flag, followed by the message type, etc.,
  * but without the authentication handshake before the message sequence:
  *
  *	http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
  *
  * Requested by Martin Vidner <martin@vidner.net>.
  */
 #define LINKTYPE_DBUS		231
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  */
 #define LINKTYPE_JUNIPER_VS			232
 #define LINKTYPE_JUNIPER_SRX_E2E		233
 #define LINKTYPE_JUNIPER_FIBRECHANNEL		234
 
 /*
  * DVB-CI (DVB Common Interface for communication between a PC Card
  * module and a DVB receiver).  See
  *
  *	http://www.kaiser.cx/pcap-dvbci.html
  *
  * for the specification.
  *
  * Requested by Martin Kaiser <martin@kaiser.cx>.
  */
 #define LINKTYPE_DVB_CI		235
 
 /*
  * Variant of 3GPP TS 27.010 multiplexing protocol.  Requested
  * by Hans-Christoph Schemmel <hans-christoph.schemmel@cinterion.com>.
  */
 #define LINKTYPE_MUX27010	236
 
 /*
  * STANAG 5066 D_PDUs.  Requested by M. Baris Demiray
  * <barisdemiray@gmail.com>.
  */
 #define LINKTYPE_STANAG_5066_D_PDU		237
 
 /*
  * Juniper-private data link type, as per request from
  * Hannes Gredler <hannes@juniper.net>.
  */
 #define LINKTYPE_JUNIPER_ATM_CEMIC		238
 
 /*
  * NetFilter LOG messages
  * (payload of netlink NFNL_SUBSYS_ULOG/NFULNL_MSG_PACKET packets)
  *
  * Requested by Jakub Zawadzki <darkjames-ws@darkjames.pl>
  */
 #define LINKTYPE_NFLOG		239
 
 /*
  * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
  * for Ethernet packets with a 4-byte pseudo-header and always
  * with the payload including the FCS, as supplied by their
  * netANALYZER hardware and software.
  *
  * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
  */
 #define LINKTYPE_NETANALYZER	240
 
 /*
  * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
  * for Ethernet packets with a 4-byte pseudo-header and FCS and
  * 1 byte of SFD, as supplied by their netANALYZER hardware and
  * software.
  *
  * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
  */
 #define LINKTYPE_NETANALYZER_TRANSPARENT	241
 
 /*
  * IP-over-InfiniBand, as specified by RFC 4391.
  *
  * Requested by Petr Sumbera <petr.sumbera@oracle.com>.
  */
 #define LINKTYPE_IPOIB		242
 
 /*
  * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0).
  *
  * Requested by Guy Martin <gmsoft@tuxicoman.be>.
  */
 #define LINKTYPE_MPEG_2_TS	243
 
 /*
  * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as
  * used by their ng40 protocol tester.
  *
  * Requested by Jens Grimmer <jens.grimmer@ng4t.com>.
  */
 #define LINKTYPE_NG40		244
 
 /*
  * Pseudo-header giving adapter number and flags, followed by an NFC
  * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU,
  * as specified by NFC Forum Logical Link Control Protocol Technical
  * Specification LLCP 1.1.
  *
  * Requested by Mike Wakerly <mikey@google.com>.
  */
 #define LINKTYPE_NFC_LLCP	245
 
 /*
  * pfsync output; DLT_PFSYNC is 18, which collides with DLT_CIP in
- * SuSE 6.3, on OpenBSD, NetBSD, DragonFly BSD, and Mac OS X, and
+ * SuSE 6.3, on OpenBSD, NetBSD, DragonFly BSD, and macOS, and
  * is 121, which collides with DLT_HHDLC, in FreeBSD.  We pick a
  * shiny new link-layer header type value that doesn't collide with
  * anything, in the hopes that future pfsync savefiles, if any,
  * won't require special hacks to distinguish from other savefiles.
  *
  */
 #define LINKTYPE_PFSYNC		246
 
 /*
  * Raw InfiniBand packets, starting with the Local Routing Header.
  *
  * Requested by Oren Kladnitsky <orenk@mellanox.com>.
  */
 #define LINKTYPE_INFINIBAND	247
 
 /*
  * SCTP, with no lower-level protocols (i.e., no IPv4 or IPv6).
  *
  * Requested by Michael Tuexen <Michael.Tuexen@lurchi.franken.de>.
  */
 #define LINKTYPE_SCTP		248
 
 /*
  * USB packets, beginning with a USBPcap header.
  *
  * Requested by Tomasz Mon <desowin@gmail.com>
  */
 #define LINKTYPE_USBPCAP	249
 
 /*
  * Schweitzer Engineering Laboratories "RTAC" product serial-line
  * packets.
  *
  * Requested by Chris Bontje <chris_bontje@selinc.com>.
  */
 #define DLT_RTAC_SERIAL		250
 
 /*
  * Bluetooth Low Energy air interface link-layer packets.
  *
  * Requested by Mike Kershaw <dragorn@kismetwireless.net>.
  */
 #define LINKTYPE_BLUETOOTH_LE_LL	251
 
 /*
  * Link-layer header type for upper-protocol layer PDU saves from wireshark.
  *
  * the actual contents are determined by two TAGs stored with each
  * packet:
  *   EXP_PDU_TAG_LINKTYPE          the link type (LINKTYPE_ value) of the
  *				   original packet.
  *
  *   EXP_PDU_TAG_PROTO_NAME        the name of the wireshark dissector
  * 				   that can make sense of the data stored.
  */
 #define LINKTYPE_WIRESHARK_UPPER_PDU	252
 
 /*
  * Link-layer header type for the netlink protocol (nlmon devices).
  */
 #define LINKTYPE_NETLINK		253
 
 /*
  * Bluetooth Linux Monitor headers for the BlueZ stack.
  */
 #define LINKTYPE_BLUETOOTH_LINUX_MONITOR	254
 
 /*
  * Bluetooth Basic Rate/Enhanced Data Rate baseband packets, as
  * captured by Ubertooth.
  */
 #define LINKTYPE_BLUETOOTH_BREDR_BB	255
 
 /*
  * Bluetooth Low Energy link layer packets, as captured by Ubertooth.
  */
 #define LINKTYPE_BLUETOOTH_LE_LL_WITH_PHDR	256
 
 /*
  * PROFIBUS data link layer.
  */
 #define LINKTYPE_PROFIBUS_DL		257
 
 /*
  * Apple's DLT_PKTAP headers.
  *
  * Sadly, the folks at Apple either had no clue that the DLT_USERn values
  * are for internal use within an organization and partners only, and
  * didn't know that the right way to get a link-layer header type is to
  * ask tcpdump.org for one, or knew and didn't care, so they just
  * used DLT_USER2, which causes problems for everything except for
  * their version of tcpdump.
  *
  * So I'll just give them one; hopefully this will show up in a
  * libpcap release in time for them to get this into 10.10 Big Sur
  * or whatever Mavericks' successor is called.  LINKTYPE_PKTAP
- * will be 258 *even on OS X*; that is *intentional*, so that
+ * will be 258 *even on macOS*; that is *intentional*, so that
  * PKTAP files look the same on *all* OSes (different OSes can have
  * different numerical values for a given DLT_, but *MUST NOT* have
  * different values for what goes in a file, as files can be moved
  * between OSes!).
  */
 #define LINKTYPE_PKTAP		258
 
 /*
  * Ethernet packets preceded by a header giving the last 6 octets
  * of the preamble specified by 802.3-2012 Clause 65, section
  * 65.1.3.2 "Transmit".
  */
 #define LINKTYPE_EPON		259
 
 /*
  * IPMI trace packets, as specified by Table 3-20 "Trace Data Block Format"
  * in the PICMG HPM.2 specification.
  */
 #define LINKTYPE_IPMI_HPM_2	260
 
 /*
  * per  Joshua Wright <jwright@hasborg.com>, formats for Zwave captures.
  */
 #define LINKTYPE_ZWAVE_R1_R2	261
 #define LINKTYPE_ZWAVE_R3	262
 
 /*
  * per Steve Karg <skarg@users.sourceforge.net>, formats for Wattstopper
  * Digital Lighting Management room bus serial protocol captures.
  */
 #define LINKTYPE_WATTSTOPPER_DLM 263
 
 /*
  * ISO 14443 contactless smart card messages.
  */
 #define LINKTYPE_ISO_14443      264
 
 /*
  * Radio data system (RDS) groups.  IEC 62106.
  * Per Jonathan Brucker <jonathan.brucke@gmail.com>.
  */
 #define LINKTYPE_RDS		265
 
-#define LINKTYPE_MATCHING_MAX	265		/* highest value in the "matching" range */
+/*
+ * USB packets, beginning with a Darwin (macOS, etc.) header.
+ */
+#define LINKTYPE_USB_DARWIN	266
 
+/*
+ * OpenBSD DLT_OPENFLOW.
+ */
+#define LINKTYPE_OPENFLOW	267
+
+/*
+ * SDLC frames containing SNA PDUs.
+ */
+#define LINKTYPE_SDLC		268
+
+/*
+ * per "Selvig, Bjorn" <b.selvig@ti.com> used for
+ * TI protocol sniffer.
+ */
+#define LINKTYPE_TI_LLN_SNIFFER	269
+
+/*
+ * per: Erik de Jong <erikdejong at gmail.com> for
+ *   https://github.com/eriknl/LoRaTap/releases/tag/v0.1
+ */
+#define LINKTYPE_LORATAP        270
+
+/*
+ * per: Stefanha at gmail.com for
+ *   http://lists.sandelman.ca/pipermail/tcpdump-workers/2017-May/000772.html
+ * and: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/vsockmon.h
+ * for: http://qemu-project.org/Features/VirtioVsock
+ */
+#define LINKTYPE_VSOCK          271
+
+/*
+ * Nordic Semiconductor Bluetooth LE sniffer.
+ */
+#define LINKTYPE_NORDIC_BLE	272
+
+/*
+ * Excentis DOCSIS 3.1 RF sniffer (XRA-31)
+ *   per: bruno.verstuyft at excentis.com
+ *        http://www.xra31.com/xra-header
+ */
+#define LINKTYPE_DOCSIS31_XRA31	273
+
+/*
+ * mPackets, as specified by IEEE 802.3br Figure 99-4, starting
+ * with the preamble and always ending with a CRC field.
+ */
+#define LINKTYPE_ETHERNET_MPACKET	274
+
+/*
+ * DisplayPort AUX channel monitoring data as specified by VESA
+ * DisplayPort(DP) Standard preceeded by a pseudo-header.
+ *    per dirk.eibach at gdsys.cc
+ */
+#define LINKTYPE_DISPLAYPORT_AUX	275
+
+#define LINKTYPE_MATCHING_MAX	275		/* highest value in the "matching" range */
+
 static struct linktype_map {
 	int	dlt;
 	int	linktype;
 } map[] = {
 	/*
 	 * These DLT_* codes have LINKTYPE_* codes with values identical
 	 * to the values of the corresponding DLT_* code.
 	 */
 	{ DLT_NULL,		LINKTYPE_NULL },
 	{ DLT_EN10MB,		LINKTYPE_ETHERNET },
 	{ DLT_EN3MB,		LINKTYPE_EXP_ETHERNET },
 	{ DLT_AX25,		LINKTYPE_AX25 },
 	{ DLT_PRONET,		LINKTYPE_PRONET },
 	{ DLT_CHAOS,		LINKTYPE_CHAOS },
 	{ DLT_IEEE802,		LINKTYPE_IEEE802_5 },
 	{ DLT_ARCNET,		LINKTYPE_ARCNET_BSD },
 	{ DLT_SLIP,		LINKTYPE_SLIP },
 	{ DLT_PPP,		LINKTYPE_PPP },
 	{ DLT_FDDI,	 	LINKTYPE_FDDI },
 	{ DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL },
 
 	/*
 	 * These DLT_* codes have different values on different
 	 * platforms; we map them to LINKTYPE_* codes that
 	 * have values that should never be equal to any DLT_*
 	 * code.
 	 */
 #ifdef DLT_FR
 	/* BSD/OS Frame Relay */
 	{ DLT_FR,		LINKTYPE_FRELAY },
 #endif
 
 	{ DLT_ATM_RFC1483, 	LINKTYPE_ATM_RFC1483 },
 	{ DLT_RAW,		LINKTYPE_RAW },
 	{ DLT_SLIP_BSDOS,	LINKTYPE_SLIP_BSDOS },
 	{ DLT_PPP_BSDOS,	LINKTYPE_PPP_BSDOS },
 
 	/* BSD/OS Cisco HDLC */
 	{ DLT_C_HDLC,		LINKTYPE_C_HDLC },
 
 	/*
 	 * These DLT_* codes are not on all platforms, but, so far,
 	 * there don't appear to be any platforms that define
 	 * other codes with those values; we map them to
 	 * different LINKTYPE_* values anyway, just in case.
 	 */
 
 	/* Linux ATM Classical IP */
 	{ DLT_ATM_CLIP,		LINKTYPE_ATM_CLIP },
 
 	/* NetBSD sync/async serial PPP (or Cisco HDLC) */
 	{ DLT_PPP_SERIAL,	LINKTYPE_PPP_HDLC },
 
 	/* NetBSD PPP over Ethernet */
 	{ DLT_PPP_ETHER,	LINKTYPE_PPP_ETHER },
 
 	/*
 	 * All LINKTYPE_ values between LINKTYPE_MATCHING_MIN
 	 * and LINKTYPE_MATCHING_MAX are mapped to identical
 	 * DLT_ values.
 	 */
 
 	{ -1,			-1 }
 };
 
 int
 dlt_to_linktype(int dlt)
 {
 	int i;
 
 	/*
 	 * DLTs that, on some platforms, have values in the matching range
 	 * but that *don't* have the same value as the corresponding
 	 * LINKTYPE because, for some reason, not all OSes have the
 	 * same value for that DLT (note that the DLT's value might be
 	 * outside the matching range on some of those OSes).
 	 */
 	if (dlt == DLT_PFSYNC)
 		return (LINKTYPE_PFSYNC);
 	if (dlt == DLT_PKTAP)
 		return (LINKTYPE_PKTAP);
 
 	/*
 	 * For all other values in the matching range, the DLT
 	 * value is the same as the LINKTYPE value.
 	 */
 	if (dlt >= DLT_MATCHING_MIN && dlt <= DLT_MATCHING_MAX)
 		return (dlt);
 
 	/*
 	 * Map the values outside that range.
 	 */
 	for (i = 0; map[i].dlt != -1; i++) {
 		if (map[i].dlt == dlt)
 			return (map[i].linktype);
 	}
 
 	/*
 	 * If we don't have a mapping for this DLT, return an
 	 * error; that means that this is a value with no corresponding
 	 * LINKTYPE, and we need to assign one.
 	 */
 	return (-1);
 }
 
 int
 linktype_to_dlt(int linktype)
 {
 	int i;
 
 	/*
 	 * LINKTYPEs in the matching range that *don't*
 	 * have the same value as the corresponding DLTs
 	 * because, for some reason, not all OSes have the
 	 * same value for that DLT.
 	 */
 	if (linktype == LINKTYPE_PFSYNC)
 		return (DLT_PFSYNC);
 	if (linktype == LINKTYPE_PKTAP)
 		return (DLT_PKTAP);
 
 	/*
 	 * For all other values in the matching range, the LINKTYPE
 	 * value is the same as the DLT value.
 	 */
 	if (linktype >= LINKTYPE_MATCHING_MIN &&
 	    linktype <= LINKTYPE_MATCHING_MAX)
 		return (linktype);
 
 	/*
 	 * Map the values outside that range.
 	 */
 	for (i = 0; map[i].linktype != -1; i++) {
 		if (map[i].linktype == linktype)
 			return (map[i].dlt);
 	}
 
 	/*
 	 * If we don't have an entry for this LINKTYPE, return
 	 * the link type value; it may be a DLT from an older
 	 * version of libpcap.
 	 */
 	return linktype;
 }
 
-#define EXTRACT_
+/*
+ * Return the maximum snapshot length for a given DLT_ value.
+ *
+ * For most link-layer types, we use MAXIMUM_SNAPLEN, but for DLT_DBUS,
+ * the maximum is 134217728, as per
+ *
+ *    https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
+ */
+u_int
+max_snaplen_for_dlt(int dlt)
+{
+	if (dlt == DLT_DBUS)
+		return 134217728;
+	else
+		return MAXIMUM_SNAPLEN;
+}
 
 /*
  * DLT_LINUX_SLL packets with a protocol type of LINUX_SLL_P_CAN or
  * LINUX_SLL_P_CANFD have SocketCAN headers in front of the payload,
  * with the CAN ID being in host byte order.
  *
  * When reading a DLT_LINUX_SLL capture file, we need to check for those
  * packets and convert the CAN ID from the byte order of the host that
  * wrote the file to this host's byte order.
  */
 static void
 swap_linux_sll_header(const struct pcap_pkthdr *hdr, u_char *buf)
 {
 	u_int caplen = hdr->caplen;
 	u_int length = hdr->len;
 	struct sll_header *shdr = (struct sll_header *)buf;
-	u_int16_t protocol;
+	uint16_t protocol;
 	pcap_can_socketcan_hdr *chdr;
 
 	if (caplen < (u_int) sizeof(struct sll_header) ||
 	    length < (u_int) sizeof(struct sll_header)) {
 		/* Not enough data to have the protocol field */
 		return;
 	}
 
 	protocol = EXTRACT_16BITS(&shdr->sll_protocol);
 	if (protocol != LINUX_SLL_P_CAN && protocol != LINUX_SLL_P_CANFD)
 		return;
 
 	/*
 	 * SocketCAN packet; fix up the packet's header.
 	 */
 	chdr = (pcap_can_socketcan_hdr *)(buf + sizeof(struct sll_header));
 	if (caplen < (u_int) sizeof(struct sll_header) + sizeof(chdr->can_id) ||
 	    length < (u_int) sizeof(struct sll_header) + sizeof(chdr->can_id)) {
 		/* Not enough data to have the CAN ID */
 		return;
 	}
 	chdr->can_id = SWAPLONG(chdr->can_id);
 }
 
 /*
  * The DLT_USB_LINUX and DLT_USB_LINUX_MMAPPED headers are in host
  * byte order when capturing (it's supplied directly from a
  * memory-mapped buffer shared by the kernel).
  *
  * When reading a DLT_USB_LINUX or DLT_USB_LINUX_MMAPPED capture file,
  * we need to convert it from the byte order of the host that wrote
  * the file to this host's byte order.
  */
 static void
 swap_linux_usb_header(const struct pcap_pkthdr *hdr, u_char *buf,
     int header_len_64_bytes)
 {
 	pcap_usb_header_mmapped *uhdr = (pcap_usb_header_mmapped *)buf;
 	bpf_u_int32 offset = 0;
 
 	/*
 	 * "offset" is the offset *past* the field we're swapping;
 	 * we skip the field *before* checking to make sure
 	 * the captured data length includes the entire field.
 	 */
 
 	/*
 	 * The URB id is a totally opaque value; do we really need to
 	 * convert it to the reading host's byte order???
 	 */
 	offset += 8;			/* skip past id */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->id = SWAPLL(uhdr->id);
 
 	offset += 4;			/* skip past various 1-byte fields */
 
 	offset += 2;			/* skip past bus_id */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->bus_id = SWAPSHORT(uhdr->bus_id);
 
 	offset += 2;			/* skip past various 1-byte fields */
 
 	offset += 8;			/* skip past ts_sec */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->ts_sec = SWAPLL(uhdr->ts_sec);
 
 	offset += 4;			/* skip past ts_usec */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->ts_usec = SWAPLONG(uhdr->ts_usec);
 
 	offset += 4;			/* skip past status */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->status = SWAPLONG(uhdr->status);
 
 	offset += 4;			/* skip past urb_len */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->urb_len = SWAPLONG(uhdr->urb_len);
 
 	offset += 4;			/* skip past data_len */
 	if (hdr->caplen < offset)
 		return;
 	uhdr->data_len = SWAPLONG(uhdr->data_len);
 
 	if (uhdr->transfer_type == URB_ISOCHRONOUS) {
 		offset += 4;			/* skip past s.iso.error_count */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->s.iso.error_count = SWAPLONG(uhdr->s.iso.error_count);
 
 		offset += 4;			/* skip past s.iso.numdesc */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->s.iso.numdesc = SWAPLONG(uhdr->s.iso.numdesc);
 	} else
 		offset += 8;			/* skip USB setup header */
 
 	/*
 	 * With the old header, there are no isochronous descriptors
 	 * after the header.
 	 *
 	 * With the new header, the actual number of descriptors in
 	 * the header is not s.iso.numdesc, it's ndesc - only the
 	 * first N descriptors, for some value of N, are put into
 	 * the header, and ndesc is set to the actual number copied.
 	 * In addition, if s.iso.numdesc is negative, no descriptors
 	 * are captured, and ndesc is set to 0.
 	 */
 	if (header_len_64_bytes) {
 		/*
 		 * This is either the "version 1" header, with
 		 * 16 bytes of additional fields at the end, or
 		 * a "version 0" header from a memory-mapped
 		 * capture, with 16 bytes of zeroed-out padding
 		 * at the end.  Byte swap them as if this were
 		 * a "version 1" header.
 		 */
 		offset += 4;			/* skip past interval */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->interval = SWAPLONG(uhdr->interval);
 
 		offset += 4;			/* skip past start_frame */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->start_frame = SWAPLONG(uhdr->start_frame);
 
 		offset += 4;			/* skip past xfer_flags */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->xfer_flags = SWAPLONG(uhdr->xfer_flags);
 
 		offset += 4;			/* skip past ndesc */
 		if (hdr->caplen < offset)
 			return;
 		uhdr->ndesc = SWAPLONG(uhdr->ndesc);
 
 		if (uhdr->transfer_type == URB_ISOCHRONOUS) {
 			/* swap the values in struct linux_usb_isodesc */
 			usb_isodesc *pisodesc;
-			u_int32_t i;
+			uint32_t i;
 
 			pisodesc = (usb_isodesc *)(void *)(buf+offset);
 			for (i = 0; i < uhdr->ndesc; i++) {
 				offset += 4;		/* skip past status */
 				if (hdr->caplen < offset)
 					return;
 				pisodesc->status = SWAPLONG(pisodesc->status);
 
 				offset += 4;		/* skip past offset */
 				if (hdr->caplen < offset)
 					return;
 				pisodesc->offset = SWAPLONG(pisodesc->offset);
 
 				offset += 4;		/* skip past len */
 				if (hdr->caplen < offset)
 					return;
 				pisodesc->len = SWAPLONG(pisodesc->len);
 
 				offset += 4;		/* skip past padding */
 
 				pisodesc++;
 			}
 		}
 	}
 }
 
 /*
  * The DLT_NFLOG "packets" have a mixture of big-endian and host-byte-order
  * data.  They begin with a fixed-length header with big-endian fields,
  * followed by a set of TLVs, where the type and length are in host
  * byte order but the values are either big-endian or are a raw byte
  * sequence that's the same regardless of the host's byte order.
  *
  * When reading a DLT_NFLOG capture file, we need to convert the type
  * and length values from the byte order of the host that wrote the
  * file to the byte order of this host.
  */
 static void
 swap_nflog_header(const struct pcap_pkthdr *hdr, u_char *buf)
 {
 	u_char *p = buf;
 	nflog_hdr_t *nfhdr = (nflog_hdr_t *)buf;
 	nflog_tlv_t *tlv;
 	u_int caplen = hdr->caplen;
 	u_int length = hdr->len;
-	u_int16_t size;
+	uint16_t size;
 
 	if (caplen < (u_int) sizeof(nflog_hdr_t) ||
 	    length < (u_int) sizeof(nflog_hdr_t)) {
 		/* Not enough data to have any TLVs. */
 		return;
 	}
 
 	if (nfhdr->nflog_version != 0) {
 		/* Unknown NFLOG version */
 		return;
 	}
 
 	length -= sizeof(nflog_hdr_t);
 	caplen -= sizeof(nflog_hdr_t);
 	p += sizeof(nflog_hdr_t);
 
 	while (caplen >= sizeof(nflog_tlv_t)) {
 		tlv = (nflog_tlv_t *) p;
 
 		/* Swap the type and length. */
 		tlv->tlv_type = SWAPSHORT(tlv->tlv_type);
 		tlv->tlv_length = SWAPSHORT(tlv->tlv_length);
 
 		/* Get the length of the TLV. */
 		size = tlv->tlv_length;
 		if (size % 4 != 0)
 			size += 4 - size % 4;
 
 		/* Is the TLV's length less than the minimum? */
 		if (size < sizeof(nflog_tlv_t)) {
 			/* Yes. Give up now. */
 			return;
 		}
 
 		/* Do we have enough data for the full TLV? */
 		if (caplen < size || length < size) {
 			/* No. */
 			return;
 		}
 
 		/* Skip over the TLV. */
 		length -= size;
 		caplen -= size;
 		p += size;
 	}
 }
 
 void
 swap_pseudo_headers(int linktype, struct pcap_pkthdr *hdr, u_char *data)
 {
 	/*
 	 * Convert pseudo-headers from the byte order of
 	 * the host on which the file was saved to our
 	 * byte order, as necessary.
 	 */
 	switch (linktype) {
 
 	case DLT_LINUX_SLL:
 		swap_linux_sll_header(hdr, data);
 		break;
 
 	case DLT_USB_LINUX:
 		swap_linux_usb_header(hdr, data, 0);
 		break;
 
 	case DLT_USB_LINUX_MMAPPED:
 		swap_linux_usb_header(hdr, data, 1);
 		break;
 
 	case DLT_NFLOG:
 		swap_nflog_header(hdr, data);
 		break;
 	}
 }
Index: vendor/libpcap/dist/pcap-common.h
===================================================================
--- vendor/libpcap/dist/pcap-common.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-common.h	(revision 333789)
@@ -1,25 +1,49 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may 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.
+ *
+ * pcap-common.h - common code for pcap and pcapng files
+ */
 
 /*
  * We use the "receiver-makes-right" approach to byte order,
  * because time is at a premium when we are writing the file.
  * In other words, the pcap_file_header and pcap_pkthdr,
  * records are written in host byte order.
  * Note that the bytes of packet data are written out in the order in
  * which they were received, so multi-byte fields in packets are not
  * written in host byte order, they're written in whatever order the
  * sending machine put them in.
  *
  * ntoh[ls] aren't sufficient because we might need to swap on a big-endian
  * machine (if the file was written in little-end order).
  */
 #define	SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 #define	SWAPSHORT(y) \
 	( (((y)&0xff)<<8) | ((u_short)((y)&0xff00)>>8) )
 
 extern int dlt_to_linktype(int dlt);
 
 extern int linktype_to_dlt(int linktype);
 
 extern void swap_pseudo_headers(int linktype, struct pcap_pkthdr *hdr,
     u_char *data);
+
+extern u_int max_snaplen_for_dlt(int dlt);
Index: vendor/libpcap/dist/pcap-config.in
===================================================================
--- vendor/libpcap/dist/pcap-config.in	(revision 333788)
+++ vendor/libpcap/dist/pcap-config.in	(revision 333789)
@@ -1,89 +1,94 @@
 #! /bin/sh
 
 #
 # Script to give the appropriate compiler flags and linker flags
 # to use when building code that uses libpcap.
 #
+# These variables come from the configure script, so includedir and
+# libdir may be defined in terms of prefix and exec_prefix, so the
+# latter must be defined as well.
+#
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 includedir="@includedir@"
 libdir="@libdir@"
 V_RPATH_OPT="@V_RPATH_OPT@"
 LIBS="@LIBS@"
+PACKAGE_NAME="@PACKAGE_NAME@"
 
 static=0
 show_cflags=0
 show_libs=0
 while [ "$#" != 0 ]
 do
 	case "$1" in
 
 	--static)
 		static=1
 		;;
 
 	--cflags)
 		show_cflags=1
 		;;
 
 	--libs)
 		show_libs=1
 		;;
 
 	--additional-libs)
 		show_additional_libs=1
 		;;
 	esac
 	shift
 done
 if [ "$V_RPATH_OPT" != "" ]
 then
 	#
 	# If libdir isn't /usr/lib, add it to the run-time linker path.
 	#
 	if [ "$libdir" != "/usr/lib" ]
 	then
 		RPATH=$V_RPATH_OPT$libdir
 	fi
 fi
 if [ "$static" = 1 ]
 then
 	#
 	# Include LIBS so that the flags include libraries containing
 	# routines that libpcap uses.
 	#
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
 	then
 		echo "-I$includedir -L$libdir -lpcap $LIBS"
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
 	then
 		echo "-I$includedir -L$libdir $LIBS"
 	elif [ "$show_cflags" = 1 ]
 	then
 		echo "-I$includedir"
 	elif [ "$show_libs" = 1 ]
 	then
 		echo "-L$libdir -lpcap $LIBS"
 	elif [ "$show_additional_libs" = 1 ]
 	then
 		echo "$LIBS"
 	fi
 else
 	#
 	# Omit LIBS - libpcap is assumed to be linked with those
 	# libraries, so there's no need to do so explicitly.
 	#
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
 	then
-		echo "-I$includedir -L$libdir $RPATH -lpcap"
+		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
 	then
 		echo "-I$includedir"
 	elif [ "$show_cflags" = 1 ]
 	then
 		echo "-I$includedir"
 	elif [ "$show_libs" = 1 ]
 	then
-		echo "-L$libdir $RPATH -lpcap"
+		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
 	fi
 fi
Index: vendor/libpcap/dist/pcap-dag.c
===================================================================
--- vendor/libpcap/dist/pcap-dag.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-dag.c	(revision 333789)
@@ -1,1379 +1,1430 @@
 /*
  * pcap-dag.c: Packet capture interface for Emulex EndaceDAG cards.
  *
  * The functionality of this code attempts to mimic that of pcap-linux as much
  * as possible.  This code is compiled in several different ways depending on
  * whether DAG_ONLY and HAVE_DAG_API are defined.  If HAVE_DAG_API is not
  * defined it should not get compiled in, otherwise if DAG_ONLY is defined then
  * the 'dag_' function calls are renamed to 'pcap_' equivalents.  If DAG_ONLY
  * is not defined then nothing is altered - the dag_ functions will be
  * called as required from their pcap-linux/bpf equivalents.
  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
  * Modifications: Jesper Peterson
  *                Koryn Grant
  *                Stephen Donnelly <stephen.donnelly@emulex.com>
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>			/* optionally get BSD define */
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include "pcap-int.h"
 
 #include <ctype.h>
 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 struct mbuf;		/* Squelch compiler warnings on some platforms for */
 struct rtentry;		/* declarations in <net/if.h> */
 #include <net/if.h>
 
 #include "dagnew.h"
 #include "dagapi.h"
 #include "dagpci.h"
+#include "dag_config_api.h"
 
 #include "pcap-dag.h"
 
 /*
  * DAG devices have names beginning with "dag", followed by a number
  * from 0 to DAG_MAX_BOARDS, then optionally a colon and a stream number
  * from 0 to DAG_STREAM_MAX.
  */
 #ifndef DAG_MAX_BOARDS
 #define DAG_MAX_BOARDS 32
 #endif
 
 
-#ifndef TYPE_AAL5
-#define TYPE_AAL5               4
+#ifndef ERF_TYPE_AAL5
+#define ERF_TYPE_AAL5               4
 #endif
 
-#ifndef TYPE_MC_HDLC
-#define TYPE_MC_HDLC            5
+#ifndef ERF_TYPE_MC_HDLC
+#define ERF_TYPE_MC_HDLC            5
 #endif
 
-#ifndef TYPE_MC_RAW
-#define TYPE_MC_RAW             6
+#ifndef ERF_TYPE_MC_RAW
+#define ERF_TYPE_MC_RAW             6
 #endif
 
-#ifndef TYPE_MC_ATM
-#define TYPE_MC_ATM             7
+#ifndef ERF_TYPE_MC_ATM
+#define ERF_TYPE_MC_ATM             7
 #endif
 
-#ifndef TYPE_MC_RAW_CHANNEL
-#define TYPE_MC_RAW_CHANNEL     8
+#ifndef ERF_TYPE_MC_RAW_CHANNEL
+#define ERF_TYPE_MC_RAW_CHANNEL     8
 #endif
 
-#ifndef TYPE_MC_AAL5
-#define TYPE_MC_AAL5            9
+#ifndef ERF_TYPE_MC_AAL5
+#define ERF_TYPE_MC_AAL5            9
 #endif
 
-#ifndef TYPE_COLOR_HDLC_POS
-#define TYPE_COLOR_HDLC_POS     10
+#ifndef ERF_TYPE_COLOR_HDLC_POS
+#define ERF_TYPE_COLOR_HDLC_POS     10
 #endif
 
-#ifndef TYPE_COLOR_ETH
-#define TYPE_COLOR_ETH          11
+#ifndef ERF_TYPE_COLOR_ETH
+#define ERF_TYPE_COLOR_ETH          11
 #endif
 
-#ifndef TYPE_MC_AAL2
-#define TYPE_MC_AAL2            12
+#ifndef ERF_TYPE_MC_AAL2
+#define ERF_TYPE_MC_AAL2            12
 #endif
 
-#ifndef TYPE_IP_COUNTER
-#define TYPE_IP_COUNTER         13
+#ifndef ERF_TYPE_IP_COUNTER
+#define ERF_TYPE_IP_COUNTER         13
 #endif
 
-#ifndef TYPE_TCP_FLOW_COUNTER
-#define TYPE_TCP_FLOW_COUNTER   14
+#ifndef ERF_TYPE_TCP_FLOW_COUNTER
+#define ERF_TYPE_TCP_FLOW_COUNTER   14
 #endif
 
-#ifndef TYPE_DSM_COLOR_HDLC_POS
-#define TYPE_DSM_COLOR_HDLC_POS 15
+#ifndef ERF_TYPE_DSM_COLOR_HDLC_POS
+#define ERF_TYPE_DSM_COLOR_HDLC_POS 15
 #endif
 
-#ifndef TYPE_DSM_COLOR_ETH
-#define TYPE_DSM_COLOR_ETH      16
+#ifndef ERF_TYPE_DSM_COLOR_ETH
+#define ERF_TYPE_DSM_COLOR_ETH      16
 #endif
 
-#ifndef TYPE_COLOR_MC_HDLC_POS
-#define TYPE_COLOR_MC_HDLC_POS  17
+#ifndef ERF_TYPE_COLOR_MC_HDLC_POS
+#define ERF_TYPE_COLOR_MC_HDLC_POS  17
 #endif
 
-#ifndef TYPE_AAL2
-#define TYPE_AAL2               18
+#ifndef ERF_TYPE_AAL2
+#define ERF_TYPE_AAL2               18
 #endif
 
-#ifndef TYPE_COLOR_HASH_POS
-#define TYPE_COLOR_HASH_POS     19
+#ifndef ERF_TYPE_COLOR_HASH_POS
+#define ERF_TYPE_COLOR_HASH_POS     19
 #endif
 
-#ifndef TYPE_COLOR_HASH_ETH
-#define TYPE_COLOR_HASH_ETH     20
+#ifndef ERF_TYPE_COLOR_HASH_ETH
+#define ERF_TYPE_COLOR_HASH_ETH     20
 #endif
 
-#ifndef TYPE_INFINIBAND
-#define TYPE_INFINIBAND         21
+#ifndef ERF_TYPE_INFINIBAND
+#define ERF_TYPE_INFINIBAND         21
 #endif
 
-#ifndef TYPE_IPV4
-#define TYPE_IPV4               22
+#ifndef ERF_TYPE_IPV4
+#define ERF_TYPE_IPV4               22
 #endif
 
-#ifndef TYPE_IPV6
-#define TYPE_IPV6               23
+#ifndef ERF_TYPE_IPV6
+#define ERF_TYPE_IPV6               23
 #endif
 
-#ifndef TYPE_RAW_LINK
-#define TYPE_RAW_LINK           24
+#ifndef ERF_TYPE_RAW_LINK
+#define ERF_TYPE_RAW_LINK           24
 #endif
 
-#ifndef TYPE_INFINIBAND_LINK
-#define TYPE_INFINIBAND_LINK    25
+#ifndef ERF_TYPE_INFINIBAND_LINK
+#define ERF_TYPE_INFINIBAND_LINK    25
 #endif
 
-#ifndef TYPE_PAD
-#define TYPE_PAD                48
+#ifndef ERF_TYPE_META
+#define ERF_TYPE_META               27
 #endif
 
+#ifndef ERF_TYPE_PAD
+#define ERF_TYPE_PAD                48
+#endif
+
 #define ATM_CELL_SIZE		52
 #define ATM_HDR_SIZE		4
 
 /*
  * A header containing additional MTP information.
  */
 #define MTP2_SENT_OFFSET		0	/* 1 byte */
 #define MTP2_ANNEX_A_USED_OFFSET	1	/* 1 byte */
 #define MTP2_LINK_NUMBER_OFFSET		2	/* 2 bytes */
 #define MTP2_HDR_LEN			4	/* length of the header */
 
 #define MTP2_ANNEX_A_NOT_USED      0
 #define MTP2_ANNEX_A_USED          1
 #define MTP2_ANNEX_A_USED_UNKNOWN  2
 
 /* SunATM pseudo header */
 struct sunatm_hdr {
 	unsigned char	flags;		/* destination and traffic type */
 	unsigned char	vpi;		/* VPI */
 	unsigned short	vci;		/* VCI */
 };
 
 /*
  * Private data for capturing on DAG devices.
  */
 struct pcap_dag {
 	struct pcap_stat stat;
-#ifdef HAVE_DAG_STREAMS_API
 	u_char	*dag_mem_bottom;	/* DAG card current memory bottom pointer */
 	u_char	*dag_mem_top;	/* DAG card current memory top pointer */
-#else /* HAVE_DAG_STREAMS_API */
-	void	*dag_mem_base;	/* DAG card memory base address */
-	u_int	dag_mem_bottom;	/* DAG card current memory bottom offset */
-	u_int	dag_mem_top;	/* DAG card current memory top offset */
-#endif /* HAVE_DAG_STREAMS_API */
 	int	dag_fcs_bits;	/* Number of checksum bits from link layer */
-	int	dag_offset_flags; /* Flags to pass to dag_offset(). */
+	int	dag_flags;	/* Flags */
 	int	dag_stream;	/* DAG stream number */
 	int	dag_timeout;	/* timeout specified to pcap_open_live.
 				 * Same as in linux above, introduce
 				 * generally? */
+	dag_card_ref_t dag_ref; /* DAG Configuration/Status API card reference */
+	dag_component_t dag_root;	/* DAG CSAPI Root component */
+	attr_uuid_t drop_attr;  /* DAG Stream Drop Attribute handle, if available */
+	struct timeval required_select_timeout;
+				/* Timeout caller must use in event loops */
 };
 
 typedef struct pcap_dag_node {
 	struct pcap_dag_node *next;
 	pcap_t *p;
 	pid_t pid;
 } pcap_dag_node_t;
 
 static pcap_dag_node_t *pcap_dags = NULL;
 static int atexit_handler_installed = 0;
 static const unsigned short endian_test_word = 0x0100;
 
 #define IS_BIGENDIAN() (*((unsigned char *)&endian_test_word))
 
 #define MAX_DAG_PACKET 65536
 
 static unsigned char TempPkt[MAX_DAG_PACKET];
 
+#ifndef HAVE_DAG_LARGE_STREAMS_API
+#define dag_attach_stream64(a, b, c, d) dag_attach_stream(a, b, c, d)
+#define dag_get_stream_poll64(a, b, c, d, e) dag_get_stream_poll(a, b, c, d, e)
+#define dag_set_stream_poll64(a, b, c, d, e) dag_set_stream_poll(a, b, c, d, e)
+#define dag_size_t uint32_t
+#endif
+
 static int dag_setfilter(pcap_t *p, struct bpf_program *fp);
 static int dag_stats(pcap_t *p, struct pcap_stat *ps);
 static int dag_set_datalink(pcap_t *p, int dlt);
 static int dag_get_datalink(pcap_t *p);
-static int dag_setnonblock(pcap_t *p, int nonblock, char *errbuf);
+static int dag_setnonblock(pcap_t *p, int nonblock);
 
 static void
 delete_pcap_dag(pcap_t *p)
 {
 	pcap_dag_node_t *curr = NULL, *prev = NULL;
 
 	for (prev = NULL, curr = pcap_dags; curr != NULL && curr->p != p; prev = curr, curr = curr->next) {
 		/* empty */
 	}
 
 	if (curr != NULL && curr->p == p) {
 		if (prev != NULL) {
 			prev->next = curr->next;
 		} else {
 			pcap_dags = curr->next;
 		}
 	}
 }
 
 /*
  * Performs a graceful shutdown of the DAG card, frees dynamic memory held
  * in the pcap_t structure, and closes the file descriptor for the DAG card.
  */
 
 static void
 dag_platform_cleanup(pcap_t *p)
 {
-	struct pcap_dag *pd = p->pr;
+	struct pcap_dag *pd = p->priv;
 
-#ifdef HAVE_DAG_STREAMS_API
 	if(dag_stop_stream(p->fd, pd->dag_stream) < 0)
 		fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
 
 	if(dag_detach_stream(p->fd, pd->dag_stream) < 0)
 		fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));
-#else
-	if(dag_stop(p->fd) < 0)
-		fprintf(stderr,"dag_stop: %s\n", strerror(errno));
-#endif /* HAVE_DAG_STREAMS_API */
-	if(p->fd != -1) {
-		if(dag_close(p->fd) < 0)
-			fprintf(stderr,"dag_close: %s\n", strerror(errno));
+
+	if(pd->dag_ref != NULL) {
+		dag_config_dispose(pd->dag_ref);
 		p->fd = -1;
+		pd->dag_ref = NULL;
 	}
 	delete_pcap_dag(p);
 	pcap_cleanup_live_common(p);
-	/* Note: don't need to call close(p->fd) here as dag_close(p->fd) does this. */
+	/* Note: don't need to call close(p->fd) or dag_close(p->fd) as dag_config_dispose(pd->dag_ref) does this. */
 }
 
 static void
 atexit_handler(void)
 {
 	while (pcap_dags != NULL) {
 		if (pcap_dags->pid == getpid()) {
 			if (pcap_dags->p != NULL)
 				dag_platform_cleanup(pcap_dags->p);
 		} else {
 			delete_pcap_dag(pcap_dags->p);
 		}
 	}
 }
 
 static int
 new_pcap_dag(pcap_t *p)
 {
 	pcap_dag_node_t *node = NULL;
 
 	if ((node = malloc(sizeof(pcap_dag_node_t))) == NULL) {
 		return -1;
 	}
 
 	if (!atexit_handler_installed) {
 		atexit(atexit_handler);
 		atexit_handler_installed = 1;
 	}
 
 	node->next = pcap_dags;
 	node->p = p;
 	node->pid = getpid();
 
 	pcap_dags = node;
 
 	return 0;
 }
 
 static unsigned int
 dag_erf_ext_header_count(uint8_t * erf, size_t len)
 {
 	uint32_t hdr_num = 0;
 	uint8_t  hdr_type;
 
 	/* basic sanity checks */
 	if ( erf == NULL )
 		return 0;
 	if ( len < 16 )
 		return 0;
 
 	/* check if we have any extension headers */
 	if ( (erf[8] & 0x80) == 0x00 )
 		return 0;
 
 	/* loop over the extension headers */
 	do {
 
 		/* sanity check we have enough bytes */
 		if ( len < (24 + (hdr_num * 8)) )
 			return hdr_num;
 
 		/* get the header type */
 		hdr_type = erf[(16 + (hdr_num * 8))];
 		hdr_num++;
 
 	} while ( hdr_type & 0x80 );
 
 	return hdr_num;
 }
 
 /*
  *  Read at most max_packets from the capture stream and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an
  *  error occured, or -2 if we were told to break out of the loop.
  */
 static int
 dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_dag *pd = p->priv;
 	unsigned int processed = 0;
-	int flags = pd->dag_offset_flags;
-	unsigned int nonblocking = flags & DAGF_NONBLOCK;
+	unsigned int nonblocking = pd->dag_flags & DAGF_NONBLOCK;
 	unsigned int num_ext_hdr = 0;
 	unsigned int ticks_per_second;
 
 	/* Get the next bufferful of packets (if necessary). */
 	while (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size) {
 
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 */
 		if (p->break_loop) {
 			/*
 			 * Yes - clear the flag that indicates that
 			 * it has, and return -2 to indicate that
 			 * we were told to break out of the loop.
 			 */
 			p->break_loop = 0;
 			return -2;
 		}
 
-#ifdef HAVE_DAG_STREAMS_API
 		/* dag_advance_stream() will block (unless nonblock is called)
 		 * until 64kB of data has accumulated.
 		 * If to_ms is set, it will timeout before 64kB has accumulated.
 		 * We wait for 64kB because processing a few packets at a time
 		 * can cause problems at high packet rates (>200kpps) due
 		 * to inefficiencies.
 		 * This does mean if to_ms is not specified the capture may 'hang'
 		 * for long periods if the data rate is extremely slow (<64kB/sec)
 		 * If non-block is specified it will return immediately. The user
 		 * is then responsible for efficiency.
 		 */
 		if ( NULL == (pd->dag_mem_top = dag_advance_stream(p->fd, pd->dag_stream, &(pd->dag_mem_bottom))) ) {
 		     return -1;
 		}
-#else
-		/* dag_offset does not support timeouts */
-		pd->dag_mem_top = dag_offset(p->fd, &(pd->dag_mem_bottom), flags);
-#endif /* HAVE_DAG_STREAMS_API */
 
 		if (nonblocking && (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))
 		{
 			/* Pcap is configured to process only available packets, and there aren't any, return immediately. */
 			return 0;
 		}
 
 		if(!nonblocking &&
 		   pd->dag_timeout &&
 		   (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))
 		{
 			/* Blocking mode, but timeout set and no data has arrived, return anyway.*/
 			return 0;
 		}
 
 	}
 
 	/* Process the packets. */
 	while (pd->dag_mem_top - pd->dag_mem_bottom >= dag_record_size) {
 
 		unsigned short packet_len = 0;
 		int caplen = 0;
 		struct pcap_pkthdr	pcap_header;
 
-#ifdef HAVE_DAG_STREAMS_API
 		dag_record_t *header = (dag_record_t *)(pd->dag_mem_bottom);
-#else
-		dag_record_t *header = (dag_record_t *)(pd->dag_mem_base + pd->dag_mem_bottom);
-#endif /* HAVE_DAG_STREAMS_API */
 
 		u_char *dp = ((u_char *)header); /* + dag_record_size; */
 		unsigned short rlen;
 
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 */
 		if (p->break_loop) {
 			/*
 			 * Yes - clear the flag that indicates that
 			 * it has, and return -2 to indicate that
 			 * we were told to break out of the loop.
 			 */
 			p->break_loop = 0;
 			return -2;
 		}
 
 		rlen = ntohs(header->rlen);
 		if (rlen < dag_record_size)
 		{
 			strncpy(p->errbuf, "dag_read: record too small", PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 		pd->dag_mem_bottom += rlen;
 
 		/* Count lost packets. */
 		switch((header->type & 0x7f)) {
 			/* in these types the color value overwrites the lctr */
-		case TYPE_COLOR_HDLC_POS:
-		case TYPE_COLOR_ETH:
-		case TYPE_DSM_COLOR_HDLC_POS:
-		case TYPE_DSM_COLOR_ETH:
-		case TYPE_COLOR_MC_HDLC_POS:
-		case TYPE_COLOR_HASH_ETH:
-		case TYPE_COLOR_HASH_POS:
+		case ERF_TYPE_COLOR_HDLC_POS:
+		case ERF_TYPE_COLOR_ETH:
+		case ERF_TYPE_DSM_COLOR_HDLC_POS:
+		case ERF_TYPE_DSM_COLOR_ETH:
+		case ERF_TYPE_COLOR_MC_HDLC_POS:
+		case ERF_TYPE_COLOR_HASH_ETH:
+		case ERF_TYPE_COLOR_HASH_POS:
 			break;
 
 		default:
-			if (header->lctr) {
-				if (pd->stat.ps_drop > (UINT_MAX - ntohs(header->lctr))) {
-					pd->stat.ps_drop = UINT_MAX;
-				} else {
-					pd->stat.ps_drop += ntohs(header->lctr);
-				}
+			if ( (pd->drop_attr == kNullAttributeUuid) && (header->lctr) ) {
+				pd->stat.ps_drop += ntohs(header->lctr);
 			}
 		}
 
-		if ((header->type & 0x7f) == TYPE_PAD) {
+		if ((header->type & 0x7f) == ERF_TYPE_PAD) {
 			continue;
 		}
 
 		num_ext_hdr = dag_erf_ext_header_count(dp, rlen);
 
 		/* ERF encapsulation */
 		/* The Extensible Record Format is not dropped for this kind of encapsulation,
 		 * and will be handled as a pseudo header by the decoding application.
 		 * The information carried in the ERF header and in the optional subheader (if present)
 		 * could be merged with the libpcap information, to offer a better decoding.
 		 * The packet length is
 		 * o the length of the packet on the link (header->wlen),
 		 * o plus the length of the ERF header (dag_record_size), as the length of the
 		 *   pseudo header will be adjusted during the decoding,
 		 * o plus the length of the optional subheader (if present).
 		 *
 		 * The capture length is header.rlen and the byte stuffing for alignment will be dropped
 		 * if the capture length is greater than the packet length.
 		 */
 		if (p->linktype == DLT_ERF) {
 			packet_len = ntohs(header->wlen) + dag_record_size;
 			caplen = rlen;
 			switch ((header->type & 0x7f)) {
-			case TYPE_MC_AAL5:
-			case TYPE_MC_ATM:
-			case TYPE_MC_HDLC:
-			case TYPE_MC_RAW_CHANNEL:
-			case TYPE_MC_RAW:
-			case TYPE_MC_AAL2:
-			case TYPE_COLOR_MC_HDLC_POS:
+			case ERF_TYPE_MC_AAL5:
+			case ERF_TYPE_MC_ATM:
+			case ERF_TYPE_MC_HDLC:
+			case ERF_TYPE_MC_RAW_CHANNEL:
+			case ERF_TYPE_MC_RAW:
+			case ERF_TYPE_MC_AAL2:
+			case ERF_TYPE_COLOR_MC_HDLC_POS:
 				packet_len += 4; /* MC header */
 				break;
 
-			case TYPE_COLOR_HASH_ETH:
-			case TYPE_DSM_COLOR_ETH:
-			case TYPE_COLOR_ETH:
-			case TYPE_ETH:
+			case ERF_TYPE_COLOR_HASH_ETH:
+			case ERF_TYPE_DSM_COLOR_ETH:
+			case ERF_TYPE_COLOR_ETH:
+			case ERF_TYPE_ETH:
 				packet_len += 2; /* ETH header */
 				break;
 			} /* switch type */
 
 			/* Include ERF extension headers */
 			packet_len += (8 * num_ext_hdr);
 
 			if (caplen > packet_len) {
 				caplen = packet_len;
 			}
 		} else {
 			/* Other kind of encapsulation according to the header Type */
 
 			/* Skip over generic ERF header */
 			dp += dag_record_size;
 			/* Skip over extension headers */
 			dp += 8 * num_ext_hdr;
 
 			switch((header->type & 0x7f)) {
-			case TYPE_ATM:
-			case TYPE_AAL5:
-				if (header->type == TYPE_AAL5) {
+			case ERF_TYPE_ATM:
+			case ERF_TYPE_AAL5:
+				if ((header->type & 0x7f) == ERF_TYPE_AAL5) {
 					packet_len = ntohs(header->wlen);
 					caplen = rlen - dag_record_size;
 				}
-			case TYPE_MC_ATM:
-				if (header->type == TYPE_MC_ATM) {
+			case ERF_TYPE_MC_ATM:
+				if ((header->type & 0x7f) == ERF_TYPE_MC_ATM) {
 					caplen = packet_len = ATM_CELL_SIZE;
 					dp+=4;
 				}
-			case TYPE_MC_AAL5:
-				if (header->type == TYPE_MC_AAL5) {
+			case ERF_TYPE_MC_AAL5:
+				if ((header->type & 0x7f) == ERF_TYPE_MC_AAL5) {
 					packet_len = ntohs(header->wlen);
 					caplen = rlen - dag_record_size - 4;
 					dp+=4;
 				}
 				/* Skip over extension headers */
 				caplen -= (8 * num_ext_hdr);
 
-				if (header->type == TYPE_ATM) {
+				if ((header->type & 0x7f) == ERF_TYPE_ATM) {
 					caplen = packet_len = ATM_CELL_SIZE;
 				}
 				if (p->linktype == DLT_SUNATM) {
 					struct sunatm_hdr *sunatm = (struct sunatm_hdr *)dp;
 					unsigned long rawatm;
 
 					rawatm = ntohl(*((unsigned long *)dp));
 					sunatm->vci = htons((rawatm >>  4) & 0xffff);
 					sunatm->vpi = (rawatm >> 20) & 0x00ff;
 					sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) |
 						((sunatm->vpi == 0 && sunatm->vci == htons(5)) ? 6 :
 						 ((sunatm->vpi == 0 && sunatm->vci == htons(16)) ? 5 :
 						  ((dp[ATM_HDR_SIZE] == 0xaa &&
 						    dp[ATM_HDR_SIZE+1] == 0xaa &&
 						    dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
 
-				} else {
+				} else if (p->linktype == DLT_ATM_RFC1483) {
 					packet_len -= ATM_HDR_SIZE;
 					caplen -= ATM_HDR_SIZE;
 					dp += ATM_HDR_SIZE;
-				}
+				} else
+					continue;
 				break;
 
-			case TYPE_COLOR_HASH_ETH:
-			case TYPE_DSM_COLOR_ETH:
-			case TYPE_COLOR_ETH:
-			case TYPE_ETH:
+			case ERF_TYPE_COLOR_HASH_ETH:
+			case ERF_TYPE_DSM_COLOR_ETH:
+			case ERF_TYPE_COLOR_ETH:
+			case ERF_TYPE_ETH:
+				if ((p->linktype != DLT_EN10MB) &&
+				    (p->linktype != DLT_DOCSIS))
+					continue;
 				packet_len = ntohs(header->wlen);
 				packet_len -= (pd->dag_fcs_bits >> 3);
 				caplen = rlen - dag_record_size - 2;
 				/* Skip over extension headers */
 				caplen -= (8 * num_ext_hdr);
 				if (caplen > packet_len) {
 					caplen = packet_len;
 				}
 				dp += 2;
 				break;
 
-			case TYPE_COLOR_HASH_POS:
-			case TYPE_DSM_COLOR_HDLC_POS:
-			case TYPE_COLOR_HDLC_POS:
-			case TYPE_HDLC_POS:
+			case ERF_TYPE_COLOR_HASH_POS:
+			case ERF_TYPE_DSM_COLOR_HDLC_POS:
+			case ERF_TYPE_COLOR_HDLC_POS:
+			case ERF_TYPE_HDLC_POS:
+				if ((p->linktype != DLT_CHDLC) &&
+				    (p->linktype != DLT_PPP_SERIAL) &&
+				    (p->linktype != DLT_FRELAY))
+					continue;
 				packet_len = ntohs(header->wlen);
 				packet_len -= (pd->dag_fcs_bits >> 3);
 				caplen = rlen - dag_record_size;
 				/* Skip over extension headers */
 				caplen -= (8 * num_ext_hdr);
 				if (caplen > packet_len) {
 					caplen = packet_len;
 				}
 				break;
 
-			case TYPE_COLOR_MC_HDLC_POS:
-			case TYPE_MC_HDLC:
+			case ERF_TYPE_COLOR_MC_HDLC_POS:
+			case ERF_TYPE_MC_HDLC:
+				if ((p->linktype != DLT_CHDLC) &&
+				    (p->linktype != DLT_PPP_SERIAL) &&
+				    (p->linktype != DLT_FRELAY) &&
+				    (p->linktype != DLT_MTP2) &&
+				    (p->linktype != DLT_MTP2_WITH_PHDR) &&
+				    (p->linktype != DLT_LAPD))
+					continue;
 				packet_len = ntohs(header->wlen);
 				packet_len -= (pd->dag_fcs_bits >> 3);
 				caplen = rlen - dag_record_size - 4;
 				/* Skip over extension headers */
 				caplen -= (8 * num_ext_hdr);
 				if (caplen > packet_len) {
 					caplen = packet_len;
 				}
 				/* jump the MC_HDLC_HEADER */
 				dp += 4;
 #ifdef DLT_MTP2_WITH_PHDR
 				if (p->linktype == DLT_MTP2_WITH_PHDR) {
 					/* Add the MTP2 Pseudo Header */
 					caplen += MTP2_HDR_LEN;
 					packet_len += MTP2_HDR_LEN;
 
 					TempPkt[MTP2_SENT_OFFSET] = 0;
 					TempPkt[MTP2_ANNEX_A_USED_OFFSET] = MTP2_ANNEX_A_USED_UNKNOWN;
 					*(TempPkt+MTP2_LINK_NUMBER_OFFSET) = ((header->rec.mc_hdlc.mc_header>>16)&0x01);
 					*(TempPkt+MTP2_LINK_NUMBER_OFFSET+1) = ((header->rec.mc_hdlc.mc_header>>24)&0xff);
 					memcpy(TempPkt+MTP2_HDR_LEN, dp, caplen);
 					dp = TempPkt;
 				}
 #endif
 				break;
 
-			case TYPE_IPV4:
-			case TYPE_IPV6:
+			case ERF_TYPE_IPV4:
+				if ((p->linktype != DLT_RAW) &&
+				    (p->linktype != DLT_IPV4))
+					continue;
 				packet_len = ntohs(header->wlen);
 				caplen = rlen - dag_record_size;
 				/* Skip over extension headers */
 				caplen -= (8 * num_ext_hdr);
 				if (caplen > packet_len) {
 					caplen = packet_len;
 				}
 				break;
 
+			case ERF_TYPE_IPV6:
+				if ((p->linktype != DLT_RAW) &&
+				    (p->linktype != DLT_IPV6))
+					continue;
+				packet_len = ntohs(header->wlen);
+				caplen = rlen - dag_record_size;
+				/* Skip over extension headers */
+				caplen -= (8 * num_ext_hdr);
+				if (caplen > packet_len) {
+					caplen = packet_len;
+				}
+				break;
+
 			/* These types have no matching 'native' DLT, but can be used with DLT_ERF above */
-			case TYPE_MC_RAW:
-			case TYPE_MC_RAW_CHANNEL:
-			case TYPE_IP_COUNTER:
-			case TYPE_TCP_FLOW_COUNTER:
-			case TYPE_INFINIBAND:
-			case TYPE_RAW_LINK:
-			case TYPE_INFINIBAND_LINK:
+			case ERF_TYPE_MC_RAW:
+			case ERF_TYPE_MC_RAW_CHANNEL:
+			case ERF_TYPE_IP_COUNTER:
+			case ERF_TYPE_TCP_FLOW_COUNTER:
+			case ERF_TYPE_INFINIBAND:
+			case ERF_TYPE_RAW_LINK:
+			case ERF_TYPE_INFINIBAND_LINK:
 			default:
 				/* Unhandled ERF type.
 				 * Ignore rather than generating error
 				 */
 				continue;
 			} /* switch type */
 
 		} /* ERF encapsulation */
 
 		if (caplen > p->snapshot)
 			caplen = p->snapshot;
 
 		/* Run the packet filter if there is one. */
 		if ((p->fcode.bf_insns == NULL) || bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {
 
 			/* convert between timestamp formats */
 			register unsigned long long ts;
 
 			if (IS_BIGENDIAN()) {
 				ts = SWAPLL(header->ts);
 			} else {
 				ts = header->ts;
 			}
 
 			switch (p->opt.tstamp_precision) {
 			case PCAP_TSTAMP_PRECISION_NANO:
 				ticks_per_second = 1000000000;
 				break;
 			case PCAP_TSTAMP_PRECISION_MICRO:
 			default:
 				ticks_per_second = 1000000;
 				break;
 
 			}
 			pcap_header.ts.tv_sec = ts >> 32;
 			ts = (ts & 0xffffffffULL) * ticks_per_second;
 			ts += 0x80000000; /* rounding */
 			pcap_header.ts.tv_usec = ts >> 32;
 			if (pcap_header.ts.tv_usec >= ticks_per_second) {
 				pcap_header.ts.tv_usec -= ticks_per_second;
 				pcap_header.ts.tv_sec++;
 			}
 
 			/* Fill in our own header data */
 			pcap_header.caplen = caplen;
 			pcap_header.len = packet_len;
 
 			/* Count the packet. */
 			pd->stat.ps_recv++;
 
 			/* Call the user supplied callback function */
 			callback(user, &pcap_header, dp);
 
 			/* Only count packets that pass the filter, for consistency with standard Linux behaviour. */
 			processed++;
 			if (processed == cnt && !PACKET_COUNT_IS_UNLIMITED(cnt))
 			{
 				/* Reached the user-specified limit. */
 				return cnt;
 			}
 		}
 	}
 
 	return processed;
 }
 
 static int
 dag_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
 {
 	strlcpy(p->errbuf, "Sending packets isn't supported on DAG cards",
 	    PCAP_ERRBUF_SIZE);
 	return (-1);
 }
 
 /*
  *  Get a handle for a live capture from the given DAG device.  Passing a NULL
  *  device will result in a failure.  The promisc flag is ignored because DAG
  *  cards are always promiscuous.  The to_ms parameter is used in setting the
  *  API polling parameters.
  *
  *  snaplen is now also ignored, until we get per-stream slen support. Set
  *  slen with approprite DAG tool BEFORE pcap_activate().
  *
  *  See also pcap(3).
  */
-static int dag_activate(pcap_t* handle)
+static int dag_activate(pcap_t* p)
 {
-	struct pcap_dag *handlep = handle->priv;
-#if 0
-	char conf[30]; /* dag configure string */
-#endif
+	struct pcap_dag *pd = p->priv;
 	char *s;
 	int n;
 	daginf_t* daginf;
 	char * newDev = NULL;
-	char * device = handle->opt.device;
-#ifdef HAVE_DAG_STREAMS_API
-	uint32_t mindata;
+	char * device = p->opt.device;
+	dag_size_t mindata;
 	struct timeval maxwait;
 	struct timeval poll;
-#endif
 
 	if (device == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "device is NULL: %s", pcap_strerror(errno));
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "device is NULL");
 		return -1;
 	}
 
 	/* Initialize some components of the pcap structure. */
-
-#ifdef HAVE_DAG_STREAMS_API
 	newDev = (char *)malloc(strlen(device) + 16);
 	if (newDev == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate string for device name: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't allocate string for device name");
 		goto fail;
 	}
 
 	/* Parse input name to get dag device and stream number if provided */
-	if (dag_parse_name(device, newDev, strlen(device) + 16, &handlep->dag_stream) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: %s", pcap_strerror(errno));
+	if (dag_parse_name(device, newDev, strlen(device) + 16, &pd->dag_stream) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_parse_name");
 		goto fail;
 	}
 	device = newDev;
 
-	if (handlep->dag_stream%2) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: tx (even numbered) streams not supported for capture");
+	if (pd->dag_stream%2) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: tx (even numbered) streams not supported for capture");
 		goto fail;
 	}
-#else
-	if (strncmp(device, "/dev/", 5) != 0) {
-		newDev = (char *)malloc(strlen(device) + 5);
-		if (newDev == NULL) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate string for device name: %s", pcap_strerror(errno));
-			goto fail;
-		}
-		strcpy(newDev, "/dev/");
-		strcat(newDev, device);
-		device = newDev;
-	}
-#endif /* HAVE_DAG_STREAMS_API */
 
 	/* setup device parameters */
-	if((handle->fd = dag_open((char *)device)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_open %s: %s", device, pcap_strerror(errno));
+	if((pd->dag_ref = dag_config_init((char *)device)) == NULL) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_config_init %s", device);
 		goto fail;
 	}
 
-#ifdef HAVE_DAG_STREAMS_API
+	if((p->fd = dag_config_get_card_fd(pd->dag_ref)) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_config_get_card_fd %s", device);
+		goto fail;
+	}
+
 	/* Open requested stream. Can fail if already locked or on error */
-	if (dag_attach_stream(handle->fd, handlep->dag_stream, 0, 0) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_attach_stream: %s", pcap_strerror(errno));
+	if (dag_attach_stream64(p->fd, pd->dag_stream, 0, 0) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_attach_stream");
 		goto failclose;
 	}
 
+	/* Try to find Stream Drop attribute */
+	pd->drop_attr = kNullAttributeUuid;
+	pd->dag_root = dag_config_get_root_component(pd->dag_ref);
+	if ( dag_component_get_subcomponent(pd->dag_root, kComponentStreamFeatures, 0) )
+	{
+		pd->drop_attr = dag_config_get_indexed_attribute_uuid(pd->dag_ref, kUint32AttributeStreamDropCount, pd->dag_stream/2);
+	}
+
 	/* Set up default poll parameters for stream
 	 * Can be overridden by pcap_set_nonblock()
 	 */
-	if (dag_get_stream_poll(handle->fd, handlep->dag_stream,
+	if (dag_get_stream_poll64(p->fd, pd->dag_stream,
 				&mindata, &maxwait, &poll) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_get_stream_poll");
 		goto faildetach;
 	}
 
-	if (handle->opt.immediate) {
+	/* Use the poll time as the required select timeout for callers
+	 * who are using select()/etc. in an event loop waiting for
+	 * packets to arrive.
+	 */
+	pd->required_select_timeout = poll;
+	p->required_select_timeout = &pd->required_select_timeout;
+
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
+	if (p->opt.immediate) {
 		/* Call callback immediately.
-		 * XXX - is this the right way to handle this?
+		 * XXX - is this the right way to p this?
 		 */
 		mindata = 0;
 	} else {
 		/* Amount of data to collect in Bytes before calling callbacks.
 		 * Important for efficiency, but can introduce latency
 		 * at low packet rates if to_ms not set!
 		 */
 		mindata = 65536;
 	}
 
 	/* Obey opt.timeout (was to_ms) if supplied. This is a good idea!
 	 * Recommend 10-100ms. Calls will time out even if no data arrived.
 	 */
-	maxwait.tv_sec = handle->opt.timeout/1000;
-	maxwait.tv_usec = (handle->opt.timeout%1000) * 1000;
+	maxwait.tv_sec = p->opt.timeout/1000;
+	maxwait.tv_usec = (p->opt.timeout%1000) * 1000;
 
-	if (dag_set_stream_poll(handle->fd, handlep->dag_stream,
+	if (dag_set_stream_poll64(p->fd, pd->dag_stream,
 				mindata, &maxwait, &poll) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_set_stream_poll");
 		goto faildetach;
 	}
 
-#else
-	if((handlep->dag_mem_base = dag_mmap(handle->fd)) == MAP_FAILED) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,"dag_mmap %s: %s", device, pcap_strerror(errno));
-		goto failclose;
-	}
-
-#endif /* HAVE_DAG_STREAMS_API */
-
         /* XXX Not calling dag_configure() to set slen; this is unsafe in
 	 * multi-stream environments as the gpp config is global.
          * Once the firmware provides 'per-stream slen' this can be supported
 	 * again via the Config API without side-effects */
 #if 0
 	/* set the card snap length to the specified snaplen parameter */
 	/* This is a really bad idea, as different cards have different
 	 * valid slen ranges. Should fix in Config API. */
-	if (handle->snapshot == 0 || handle->snapshot > MAX_DAG_SNAPLEN) {
-		handle->snapshot = MAX_DAG_SNAPLEN;
+	if (p->snapshot == 0 || p->snapshot > MAX_DAG_SNAPLEN) {
+		p->snapshot = MAX_DAG_SNAPLEN;
 	} else if (snaplen < MIN_DAG_SNAPLEN) {
-		handle->snapshot = MIN_DAG_SNAPLEN;
+		p->snapshot = MIN_DAG_SNAPLEN;
 	}
 	/* snap len has to be a multiple of 4 */
-	pcap_snprintf(conf, 30, "varlen slen=%d", (snaplen + 3) & ~3);
-
-	if(dag_configure(handle->fd, conf) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,"dag_configure %s: %s", device, pcap_strerror(errno));
-		goto faildetach;
-	}
 #endif
 
-#ifdef HAVE_DAG_STREAMS_API
-	if(dag_start_stream(handle->fd, handlep->dag_stream) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_start_stream %s: %s", device, pcap_strerror(errno));
+	if(dag_start_stream(p->fd, pd->dag_stream) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_start_stream %s", device);
 		goto faildetach;
 	}
-#else
-	if(dag_start(handle->fd) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_start %s: %s", device, pcap_strerror(errno));
-		goto failclose;
-	}
-#endif /* HAVE_DAG_STREAMS_API */
 
 	/*
 	 * Important! You have to ensure bottom is properly
 	 * initialized to zero on startup, it won't give you
 	 * a compiler warning if you make this mistake!
 	 */
-	handlep->dag_mem_bottom = 0;
-	handlep->dag_mem_top = 0;
+	pd->dag_mem_bottom = 0;
+	pd->dag_mem_top = 0;
 
 	/*
 	 * Find out how many FCS bits we should strip.
 	 * First, query the card to see if it strips the FCS.
 	 */
-	daginf = dag_info(handle->fd);
+	daginf = dag_info(p->fd);
 	if ((0x4200 == daginf->device_code) || (0x4230 == daginf->device_code))	{
 		/* DAG 4.2S and 4.23S already strip the FCS.  Stripping the final word again truncates the packet. */
-		handlep->dag_fcs_bits = 0;
+		pd->dag_fcs_bits = 0;
 
 		/* Note that no FCS will be supplied. */
-		handle->linktype_ext = LT_FCS_DATALINK_EXT(0);
+		p->linktype_ext = LT_FCS_DATALINK_EXT(0);
 	} else {
 		/*
 		 * Start out assuming it's 32 bits.
 		 */
-		handlep->dag_fcs_bits = 32;
+		pd->dag_fcs_bits = 32;
 
 		/* Allow an environment variable to override. */
 		if ((s = getenv("ERF_FCS_BITS")) != NULL) {
 			if ((n = atoi(s)) == 0 || n == 16 || n == 32) {
-				handlep->dag_fcs_bits = n;
+				pd->dag_fcs_bits = n;
 			} else {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 					"pcap_activate %s: bad ERF_FCS_BITS value (%d) in environment", device, n);
 				goto failstop;
 			}
 		}
 
 		/*
 		 * Did the user request that they not be stripped?
 		 */
 		if ((s = getenv("ERF_DONT_STRIP_FCS")) != NULL) {
 			/* Yes.  Note the number of bytes that will be
 			   supplied. */
-			handle->linktype_ext = LT_FCS_DATALINK_EXT(handlep->dag_fcs_bits/16);
+			p->linktype_ext = LT_FCS_DATALINK_EXT(pd->dag_fcs_bits/16);
 
 			/* And don't strip them. */
-			handlep->dag_fcs_bits = 0;
+			pd->dag_fcs_bits = 0;
 		}
 	}
 
-	handlep->dag_timeout	= handle->opt.timeout;
+	pd->dag_timeout	= p->opt.timeout;
 
-	handle->linktype = -1;
-	if (dag_get_datalink(handle) < 0)
+	p->linktype = -1;
+	if (dag_get_datalink(p) < 0)
 		goto failstop;
 
-	handle->bufsize = 0;
+	p->bufsize = 0;
 
-	if (new_pcap_dag(handle) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "new_pcap_dag %s: %s", device, pcap_strerror(errno));
+	if (new_pcap_dag(p) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "new_pcap_dag %s", device);
 		goto failstop;
 	}
 
 	/*
 	 * "select()" and "poll()" don't work on DAG device descriptors.
 	 */
-	handle->selectable_fd = -1;
+	p->selectable_fd = -1;
 
 	if (newDev != NULL) {
 		free((char *)newDev);
 	}
 
-	handle->read_op = dag_read;
-	handle->inject_op = dag_inject;
-	handle->setfilter_op = dag_setfilter;
-	handle->setdirection_op = NULL; /* Not implemented.*/
-	handle->set_datalink_op = dag_set_datalink;
-	handle->getnonblock_op = pcap_getnonblock_fd;
-	handle->setnonblock_op = dag_setnonblock;
-	handle->stats_op = dag_stats;
-	handle->cleanup_op = dag_platform_cleanup;
-	handlep->stat.ps_drop = 0;
-	handlep->stat.ps_recv = 0;
-	handlep->stat.ps_ifdrop = 0;
+	p->read_op = dag_read;
+	p->inject_op = dag_inject;
+	p->setfilter_op = dag_setfilter;
+	p->setdirection_op = NULL; /* Not implemented.*/
+	p->set_datalink_op = dag_set_datalink;
+	p->getnonblock_op = pcap_getnonblock_fd;
+	p->setnonblock_op = dag_setnonblock;
+	p->stats_op = dag_stats;
+	p->cleanup_op = dag_platform_cleanup;
+	pd->stat.ps_drop = 0;
+	pd->stat.ps_recv = 0;
+	pd->stat.ps_ifdrop = 0;
 	return 0;
 
-#ifdef HAVE_DAG_STREAMS_API
 failstop:
-	if (dag_stop_stream(handle->fd, handlep->dag_stream) < 0) {
+	if (dag_stop_stream(p->fd, pd->dag_stream) < 0) {
 		fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
 	}
 
 faildetach:
-	if (dag_detach_stream(handle->fd, handlep->dag_stream) < 0)
+	if (dag_detach_stream(p->fd, pd->dag_stream) < 0)
 		fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));
-#else
-failstop:
-	if (dag_stop(handle->fd) < 0)
-		fprintf(stderr,"dag_stop: %s\n", strerror(errno));
-#endif /* HAVE_DAG_STREAMS_API */
 
 failclose:
-	if (dag_close(handle->fd) < 0)
-		fprintf(stderr,"dag_close: %s\n", strerror(errno));
-	delete_pcap_dag(handle);
+	dag_config_dispose(pd->dag_ref);
+	delete_pcap_dag(p);
 
 fail:
-	pcap_cleanup_live_common(handle);
+	pcap_cleanup_live_common(p);
 	if (newDev != NULL) {
 		free((char *)newDev);
 	}
 
 	return PCAP_ERROR;
 }
 
 pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
 {
 	const char *cp;
 	char *cpend;
 	long devnum;
 	pcap_t *p;
-#ifdef HAVE_DAG_STREAMS_API
 	long stream = 0;
-#endif
 
 	/* Does this look like a DAG device? */
 	cp = strrchr(device, '/');
 	if (cp == NULL)
 		cp = device;
 	/* Does it begin with "dag"? */
 	if (strncmp(cp, "dag", 3) != 0) {
 		/* Nope, doesn't begin with "dag" */
 		*is_ours = 0;
 		return NULL;
 	}
 	/* Yes - is "dag" followed by a number from 0 to DAG_MAX_BOARDS-1 */
 	cp += 3;
 	devnum = strtol(cp, &cpend, 10);
-#ifdef HAVE_DAG_STREAMS_API
 	if (*cpend == ':') {
 		/* Followed by a stream number. */
 		stream = strtol(++cpend, &cpend, 10);
 	}
-#endif
+
 	if (cpend == cp || *cpend != '\0') {
 		/* Not followed by a number. */
 		*is_ours = 0;
 		return NULL;
 	}
+
 	if (devnum < 0 || devnum >= DAG_MAX_BOARDS) {
 		/* Followed by a non-valid number. */
 		*is_ours = 0;
 		return NULL;
 	}
-#ifdef HAVE_DAG_STREAMS_API
+
 	if (stream <0 || stream >= DAG_STREAM_MAX) {
 		/* Followed by a non-valid stream number. */
 		*is_ours = 0;
 		return NULL;
 	}
-#endif
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_dag));
 	if (p == NULL)
 		return NULL;
 
 	p->activate_op = dag_activate;
 
 	/*
 	 * We claim that we support microsecond and nanosecond time
 	 * stamps.
 	 *
 	 * XXX Our native precision is 2^-32s, but libpcap doesn't support
 	 * power of two precisions yet. We can convert to either MICRO or NANO.
 	 */
 	p->tstamp_precision_count = 2;
 	p->tstamp_precision_list = malloc(2 * sizeof(u_int));
 	if (p->tstamp_precision_list == NULL) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		pcap_close(p);
 		return NULL;
 	}
 	p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
 	p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
 	return p;
 }
 
 static int
 dag_stats(pcap_t *p, struct pcap_stat *ps) {
 	struct pcap_dag *pd = p->priv;
+	uint32_t stream_drop;
+	dag_err_t dag_error;
 
-	/* This needs to be filled out correctly.  Hopefully a dagapi call will
-		 provide all necessary information.
-	*/
-	/*pd->stat.ps_recv = 0;*/
-	/*pd->stat.ps_drop = 0;*/
+	/*
+	 * Packet records received (ps_recv) are counted in dag_read().
+	 * Packet records dropped (ps_drop) are read from Stream Drop attribute if present,
+	 * otherwise integrate the ERF Header lctr counts (if available) in dag_read().
+	 * We are reporting that no records are dropped by the card/driver (ps_ifdrop).
+	 */
 
+	if(pd->drop_attr != kNullAttributeUuid) {
+		/* Note this counter is cleared at start of capture and will wrap at UINT_MAX.
+		 * The application is responsible for polling ps_drop frequently enough
+		 * to detect each wrap and integrate total drop with a wider counter */
+		if ((dag_error = dag_config_get_uint32_attribute_ex(pd->dag_ref, pd->drop_attr, &stream_drop) == kDagErrNone)) {
+			pd->stat.ps_drop = stream_drop;
+		} else {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "reading stream drop attribute: %s",
+				 dag_config_strerror(dag_error));
+			return -1;
+		}
+	}
+
 	*ps = pd->stat;
 
 	return 0;
 }
 
 /*
- * Previously we just generated a list of all possible names and let
- * pcap_add_if() attempt to open each one, but with streams this adds up
- * to 81 possibilities which is inefficient.
- *
- * Since we know more about the devices we can prune the tree here.
- * pcap_add_if() will still retest each device but the total number of
- * open attempts will still be much less than the naive approach.
+ * Add all DAG devices.
  */
 int
-dag_findalldevs(pcap_if_t **devlistp, char *errbuf)
+dag_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 	char name[12];	/* XXX - pick a size */
-	int ret = 0;
 	int c;
 	char dagname[DAGNAME_BUFSIZE];
 	int dagstream;
 	int dagfd;
 	dag_card_inf_t *inf;
 	char *description;
+	int stream, rxstreams;
 
 	/* Try all the DAGs 0-DAG_MAX_BOARDS */
 	for (c = 0; c < DAG_MAX_BOARDS; c++) {
 		pcap_snprintf(name, 12, "dag%d", c);
 		if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
 		{
-			return -1;
+			(void) pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "dag: device name %s can't be parsed", name);
+			return (-1);
 		}
-		description = NULL;
 		if ( (dagfd = dag_open(dagname)) >= 0 ) {
+			description = NULL;
 			if ((inf = dag_pciinfo(dagfd)))
 				description = dag_device_name(inf->device_code, 1);
-			if (pcap_add_if(devlistp, name, 0, description, errbuf) == -1) {
+			/*
+			 * XXX - is there a way to determine whether
+			 * the card is plugged into a network or not?
+			 * If so, we should check that and set
+			 * PCAP_IF_CONNECTION_STATUS_CONNECTED or
+			 * PCAP_IF_CONNECTION_STATUS_DISCONNECTED.
+			 *
+			 * Also, are there notions of "up" and "running"?
+			 */
+			if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
 				/*
 				 * Failure.
 				 */
-				ret = -1;
+				return (-1);
 			}
-#ifdef HAVE_DAG_STREAMS_API
-			{
-				int stream, rxstreams;
-				rxstreams = dag_rx_get_stream_count(dagfd);
-				for(stream=0;stream<DAG_STREAM_MAX;stream+=2) {
-					if (0 == dag_attach_stream(dagfd, stream, 0, 0)) {
-						dag_detach_stream(dagfd, stream);
+			rxstreams = dag_rx_get_stream_count(dagfd);
+			for(stream=0;stream<DAG_STREAM_MAX;stream+=2) {
+				if (0 == dag_attach_stream(dagfd, stream, 0, 0)) {
+					dag_detach_stream(dagfd, stream);
 
-						pcap_snprintf(name,  10, "dag%d:%d", c, stream);
-						if (pcap_add_if(devlistp, name, 0, description, errbuf) == -1) {
-							/*
-							 * Failure.
-							 */
-							ret = -1;
-						}
+					pcap_snprintf(name,  10, "dag%d:%d", c, stream);
+					if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
+						/*
+						 * Failure.
+						 */
+						return (-1);
+					}
 
-						rxstreams--;
-						if(rxstreams <= 0) {
-							break;
-						}
+					rxstreams--;
+					if(rxstreams <= 0) {
+						break;
 					}
 				}
 			}
-#endif  /* HAVE_DAG_STREAMS_API */
 			dag_close(dagfd);
 		}
 
 	}
-	return (ret);
+	return (0);
 }
 
 /*
  * Installs the given bpf filter program in the given pcap structure.  There is
  * no attempt to store the filter in kernel memory as that is not supported
  * with DAG cards.
  */
 static int
 dag_setfilter(pcap_t *p, struct bpf_program *fp)
 {
 	if (!p)
 		return -1;
 	if (!fp) {
 		strncpy(p->errbuf, "setfilter: No filter specified",
 			sizeof(p->errbuf));
 		return -1;
 	}
 
 	/* Make our private copy of the filter */
 
 	if (install_bpf_program(p, fp) < 0)
 		return -1;
 
 	return (0);
 }
 
 static int
 dag_set_datalink(pcap_t *p, int dlt)
 {
 	p->linktype = dlt;
 
 	return (0);
 }
 
 static int
-dag_setnonblock(pcap_t *p, int nonblock, char *errbuf)
+dag_setnonblock(pcap_t *p, int nonblock)
 {
 	struct pcap_dag *pd = p->priv;
+	dag_size_t mindata;
+	struct timeval maxwait;
+	struct timeval poll;
 
 	/*
 	 * Set non-blocking mode on the FD.
 	 * XXX - is that necessary?  If not, don't bother calling it,
 	 * and have a "dag_getnonblock()" function that looks at
-	 * "pd->dag_offset_flags".
+	 * "pd->dag_flags".
 	 */
-	if (pcap_setnonblock_fd(p, nonblock, errbuf) < 0)
+	if (pcap_setnonblock_fd(p, nonblock) < 0)
 		return (-1);
-#ifdef HAVE_DAG_STREAMS_API
-	{
-		uint32_t mindata;
-		struct timeval maxwait;
-		struct timeval poll;
 
-		if (dag_get_stream_poll(p->fd, pd->dag_stream,
-					&mindata, &maxwait, &poll) < 0) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s", pcap_strerror(errno));
-			return -1;
-		}
+	if (dag_get_stream_poll64(p->fd, pd->dag_stream,
+				&mindata, &maxwait, &poll) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_get_stream_poll");
+		return -1;
+	}
 
-		/* Amount of data to collect in Bytes before calling callbacks.
-		 * Important for efficiency, but can introduce latency
-		 * at low packet rates if to_ms not set!
-		 */
-		if(nonblock)
-			mindata = 0;
-		else
-			mindata = 65536;
+	/* Amount of data to collect in Bytes before calling callbacks.
+	 * Important for efficiency, but can introduce latency
+	 * at low packet rates if to_ms not set!
+	 */
+	if(nonblock)
+		mindata = 0;
+	else
+		mindata = 65536;
 
-		if (dag_set_stream_poll(p->fd, pd->dag_stream,
-					mindata, &maxwait, &poll) < 0) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s", pcap_strerror(errno));
-			return -1;
-		}
+	if (dag_set_stream_poll64(p->fd, pd->dag_stream,
+				mindata, &maxwait, &poll) < 0) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "dag_set_stream_poll");
+		return -1;
 	}
-#endif /* HAVE_DAG_STREAMS_API */
+
 	if (nonblock) {
-		pd->dag_offset_flags |= DAGF_NONBLOCK;
+		pd->dag_flags |= DAGF_NONBLOCK;
 	} else {
-		pd->dag_offset_flags &= ~DAGF_NONBLOCK;
+		pd->dag_flags &= ~DAGF_NONBLOCK;
 	}
 	return (0);
 }
 
 static int
 dag_get_datalink(pcap_t *p)
 {
 	struct pcap_dag *pd = p->priv;
 	int index=0, dlt_index=0;
 	uint8_t types[255];
 
 	memset(types, 0, 255);
 
 	if (p->dlt_list == NULL && (p->dlt_list = malloc(255*sizeof(*(p->dlt_list)))) == NULL) {
-		(void)pcap_snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "malloc");
 		return (-1);
 	}
 
 	p->linktype = 0;
 
 #ifdef HAVE_DAG_GET_STREAM_ERF_TYPES
 	/* Get list of possible ERF types for this card */
 	if (dag_get_stream_erf_types(p->fd, pd->dag_stream, types, 255) < 0) {
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf), "dag_get_stream_erf_types: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "dag_get_stream_erf_types");
 		return (-1);
 	}
 
 	while (types[index]) {
 
 #elif defined HAVE_DAG_GET_ERF_TYPES
 	/* Get list of possible ERF types for this card */
 	if (dag_get_erf_types(p->fd, types, 255) < 0) {
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf), "dag_get_erf_types: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "dag_get_erf_types");
 		return (-1);
 	}
 
 	while (types[index]) {
 #else
 	/* Check the type through a dagapi call. */
 	types[index] = dag_linktype(p->fd);
 
 	{
 #endif
 		switch((types[index] & 0x7f)) {
 
-		case TYPE_HDLC_POS:
-		case TYPE_COLOR_HDLC_POS:
-		case TYPE_DSM_COLOR_HDLC_POS:
-		case TYPE_COLOR_HASH_POS:
+		case ERF_TYPE_HDLC_POS:
+		case ERF_TYPE_COLOR_HDLC_POS:
+		case ERF_TYPE_DSM_COLOR_HDLC_POS:
+		case ERF_TYPE_COLOR_HASH_POS:
 
 			if (p->dlt_list != NULL) {
 				p->dlt_list[dlt_index++] = DLT_CHDLC;
 				p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;
 				p->dlt_list[dlt_index++] = DLT_FRELAY;
 			}
 			if(!p->linktype)
 				p->linktype = DLT_CHDLC;
 			break;
 
-		case TYPE_ETH:
-		case TYPE_COLOR_ETH:
-		case TYPE_DSM_COLOR_ETH:
-		case TYPE_COLOR_HASH_ETH:
+		case ERF_TYPE_ETH:
+		case ERF_TYPE_COLOR_ETH:
+		case ERF_TYPE_DSM_COLOR_ETH:
+		case ERF_TYPE_COLOR_HASH_ETH:
 			/*
 			 * This is (presumably) a real Ethernet capture; give it a
 			 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 			 * that an application can let you choose it, in case you're
 			 * capturing DOCSIS traffic that a Cisco Cable Modem
 			 * Termination System is putting out onto an Ethernet (it
 			 * doesn't put an Ethernet header onto the wire, it puts raw
 			 * DOCSIS frames out on the wire inside the low-level
 			 * Ethernet framing).
 			 */
 			if (p->dlt_list != NULL) {
 				p->dlt_list[dlt_index++] = DLT_EN10MB;
 				p->dlt_list[dlt_index++] = DLT_DOCSIS;
 			}
 			if(!p->linktype)
 				p->linktype = DLT_EN10MB;
 			break;
 
-		case TYPE_ATM:
-		case TYPE_AAL5:
-		case TYPE_MC_ATM:
-		case TYPE_MC_AAL5:
+		case ERF_TYPE_ATM:
+		case ERF_TYPE_AAL5:
+		case ERF_TYPE_MC_ATM:
+		case ERF_TYPE_MC_AAL5:
 			if (p->dlt_list != NULL) {
 				p->dlt_list[dlt_index++] = DLT_ATM_RFC1483;
 				p->dlt_list[dlt_index++] = DLT_SUNATM;
 			}
 			if(!p->linktype)
 				p->linktype = DLT_ATM_RFC1483;
 			break;
 
-		case TYPE_COLOR_MC_HDLC_POS:
-		case TYPE_MC_HDLC:
+		case ERF_TYPE_COLOR_MC_HDLC_POS:
+		case ERF_TYPE_MC_HDLC:
 			if (p->dlt_list != NULL) {
 				p->dlt_list[dlt_index++] = DLT_CHDLC;
 				p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;
 				p->dlt_list[dlt_index++] = DLT_FRELAY;
 				p->dlt_list[dlt_index++] = DLT_MTP2;
 				p->dlt_list[dlt_index++] = DLT_MTP2_WITH_PHDR;
 				p->dlt_list[dlt_index++] = DLT_LAPD;
 			}
 			if(!p->linktype)
 				p->linktype = DLT_CHDLC;
 			break;
 
-		case TYPE_IPV4:
-		case TYPE_IPV6:
+		case ERF_TYPE_IPV4:
+			if (p->dlt_list != NULL) {
+				p->dlt_list[dlt_index++] = DLT_RAW;
+				p->dlt_list[dlt_index++] = DLT_IPV4;
+			}
 			if(!p->linktype)
 				p->linktype = DLT_RAW;
 			break;
 
-		case TYPE_LEGACY:
-		case TYPE_MC_RAW:
-		case TYPE_MC_RAW_CHANNEL:
-		case TYPE_IP_COUNTER:
-		case TYPE_TCP_FLOW_COUNTER:
-		case TYPE_INFINIBAND:
-		case TYPE_RAW_LINK:
-		case TYPE_INFINIBAND_LINK:
+		case ERF_TYPE_IPV6:
+			if (p->dlt_list != NULL) {
+				p->dlt_list[dlt_index++] = DLT_RAW;
+				p->dlt_list[dlt_index++] = DLT_IPV6;
+			}
+			if(!p->linktype)
+				p->linktype = DLT_RAW;
+			break;
+
+		case ERF_TYPE_LEGACY:
+		case ERF_TYPE_MC_RAW:
+		case ERF_TYPE_MC_RAW_CHANNEL:
+		case ERF_TYPE_IP_COUNTER:
+		case ERF_TYPE_TCP_FLOW_COUNTER:
+		case ERF_TYPE_INFINIBAND:
+		case ERF_TYPE_RAW_LINK:
+		case ERF_TYPE_INFINIBAND_LINK:
+		case ERF_TYPE_META:
 		default:
 			/* Libpcap cannot deal with these types yet */
 			/* Add no 'native' DLTs, but still covered by DLT_ERF */
 			break;
 
 		} /* switch */
 		index++;
 	}
 
 	p->dlt_list[dlt_index++] = DLT_ERF;
 
 	p->dlt_count = dlt_index;
 
 	if(!p->linktype)
 		p->linktype = DLT_ERF;
 
 	return p->linktype;
 }
 
 #ifdef DAG_ONLY
 /*
  * This libpcap build supports only DAG cards, not regular network
  * interfaces.
  */
 
 /*
  * There are no regular interfaces, just DAG interfaces.
  */
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp _U_, char *errbuf)
 {
-	*alldevsp = NULL;
 	return (0);
 }
 
 /*
  * Attempts to open a regular interface fail.
  */
 pcap_t *
 pcap_create_interface(const char *device, char *errbuf)
 {
 	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 	    "This version of libpcap only supports DAG cards");
 	return NULL;
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING " (DAG-only)");
 }
 #endif
Index: vendor/libpcap/dist/pcap-dag.h
===================================================================
--- vendor/libpcap/dist/pcap-dag.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-dag.h	(revision 333789)
@@ -1,12 +1,12 @@
 /*
  * pcap-dag.c: Packet capture interface for Endace DAG card.
  *
  * The functionality of this code attempts to mimic that of pcap-linux as much
  * as possible.  This code is only needed when compiling in the DAG card code
  * at the same time as another type of device.
  *
  * Author: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
  */
 
 pcap_t *dag_create(const char *, char *, int *);
-int dag_findalldevs(pcap_if_t **devlistp, char *errbuf);
+int dag_findalldevs(pcap_if_list_t *devlistp, char *errbuf);
Index: vendor/libpcap/dist/pcap-dbus.c
===================================================================
--- vendor/libpcap/dist/pcap-dbus.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-dbus.c	(revision 333789)
@@ -1,279 +1,351 @@
 /*
  * Copyright (c) 2012 Jakub Zawadzki
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
 
 #include <time.h>
 #include <sys/time.h>
 
 #include <dbus/dbus.h>
 
 #include "pcap-int.h"
 #include "pcap-dbus.h"
 
 /*
  * Private data for capturing on D-Bus.
  */
 struct pcap_dbus {
 	DBusConnection *conn;
 	u_int	packets_read;	/* count of packets read */
 };
 
 static int
-dbus_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+dbus_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
 	struct pcap_dbus *handlep = handle->priv;
 
 	struct pcap_pkthdr pkth;
 	DBusMessage *message;
 
 	char *raw_msg;
 	int raw_msg_len;
 
 	int count = 0;
 
 	message = dbus_connection_pop_message(handlep->conn);
 
 	while (!message) {
 		/* XXX handle->opt.timeout = timeout_ms; */
 		if (!dbus_connection_read_write(handlep->conn, 100)) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Connection closed");
 			return -1;
 		}
 
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return -2;
 		}
 
 		message = dbus_connection_pop_message(handlep->conn);
 	}
 
 	if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Disconnected");
 		return -1;
 	}
 
 	if (dbus_message_marshal(message, &raw_msg, &raw_msg_len)) {
 		pkth.caplen = pkth.len = raw_msg_len;
 		/* pkth.caplen = min (payload_len, handle->snapshot); */
 
 		gettimeofday(&pkth.ts, NULL);
 		if (handle->fcode.bf_insns == NULL ||
 		    bpf_filter(handle->fcode.bf_insns, (u_char *)raw_msg, pkth.len, pkth.caplen)) {
 			handlep->packets_read++;
 			callback(user, &pkth, (u_char *)raw_msg);
 			count++;
 		}
 
 		dbus_free(raw_msg);
 	}
 	return count;
 }
 
 static int
 dbus_write(pcap_t *handle, const void *buf, size_t size)
 {
 	/* XXX, not tested */
 	struct pcap_dbus *handlep = handle->priv;
 
 	DBusError error = DBUS_ERROR_INIT;
 	DBusMessage *msg;
 
 	if (!(msg = dbus_message_demarshal(buf, size, &error))) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dbus_message_demarshal() failed: %s", error.message);
 		dbus_error_free(&error);
 		return -1;
 	}
 
 	dbus_connection_send(handlep->conn, msg, NULL);
 	dbus_connection_flush(handlep->conn);
 
 	dbus_message_unref(msg);
 	return 0;
 }
 
 static int
 dbus_stats(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_dbus *handlep = handle->priv;
 
 	stats->ps_recv = handlep->packets_read;
 	stats->ps_drop = 0;
 	stats->ps_ifdrop = 0;
 	return 0;
 }
 
 static void
 dbus_cleanup(pcap_t *handle)
 {
 	struct pcap_dbus *handlep = handle->priv;
 
 	dbus_connection_unref(handlep->conn);
 
 	pcap_cleanup_live_common(handle);
 }
 
+/*
+ * We don't support non-blocking mode.  I'm not sure what we'd
+ * do to support it and, given that we don't support select()/
+ * poll()/epoll_wait()/kevent() etc., it probably doesn't
+ * matter.
+ */
 static int
+dbus_getnonblock(pcap_t *p)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Non-blocking mode isn't supported for capturing on D-Bus");
+	return (-1);
+}
+
+static int
+dbus_setnonblock(pcap_t *p, int nonblock _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Non-blocking mode isn't supported for capturing on D-Bus");
+	return (-1);
+}
+
+static int
 dbus_activate(pcap_t *handle)
 {
 #define EAVESDROPPING_RULE "eavesdrop=true,"
 
 	static const char *rules[] = {
 		EAVESDROPPING_RULE "type='signal'",
 		EAVESDROPPING_RULE "type='method_call'",
 		EAVESDROPPING_RULE "type='method_return'",
 		EAVESDROPPING_RULE "type='error'",
 	};
 
 	#define N_RULES sizeof(rules)/sizeof(rules[0])
 
 	struct pcap_dbus *handlep = handle->priv;
 	const char *dev = handle->opt.device;
 
 	DBusError error = DBUS_ERROR_INIT;
 	u_int i;
 
 	if (strcmp(dev, "dbus-system") == 0) {
 		if (!(handlep->conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Failed to get system bus: %s", error.message);
 			dbus_error_free(&error);
 			return PCAP_ERROR;
 		}
 
 	} else if (strcmp(dev, "dbus-session") == 0) {
 		if (!(handlep->conn = dbus_bus_get(DBUS_BUS_SESSION, &error))) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Failed to get session bus: %s", error.message);
 			dbus_error_free(&error);
 			return PCAP_ERROR;
 		}
 
 	} else if (strncmp(dev, "dbus://", 7) == 0) {
 		const char *addr = dev + 7;
 
 		if (!(handlep->conn = dbus_connection_open(addr, &error))) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Failed to open connection to: %s: %s", addr, error.message);
 			dbus_error_free(&error);
 			return PCAP_ERROR;
 		}
 
 		if (!dbus_bus_register(handlep->conn, &error)) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Failed to register bus %s: %s\n", addr, error.message);
 			dbus_error_free(&error);
 			return PCAP_ERROR;
 		}
 
 	} else {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't get bus address from %s", handle->opt.device);
 		return PCAP_ERROR;
 	}
 
 	/* Initialize some components of the pcap structure. */
 	handle->bufsize = 0;
 	handle->offset = 0;
 	handle->linktype = DLT_DBUS;
 	handle->read_op = dbus_read;
 	handle->inject_op = dbus_write;
 	handle->setfilter_op = install_bpf_program; /* XXX, later add support for dbus_bus_add_match() */
 	handle->setdirection_op = NULL;
 	handle->set_datalink_op = NULL;      /* can't change data link type */
-	handle->getnonblock_op = pcap_getnonblock_fd;
-	handle->setnonblock_op = pcap_setnonblock_fd;
+	handle->getnonblock_op = dbus_getnonblock;
+	handle->setnonblock_op = dbus_setnonblock;
 	handle->stats_op = dbus_stats;
+	handle->cleanup_op = dbus_cleanup;
 
+#ifndef _WIN32
+	/*
+	 * Unfortunately, trying to do a select()/poll()/epoll_wait()/
+	 * kevent()/etc. on a D-Bus connection isn't a simple
+	 * case of "give me an FD on which to wait".
+	 *
+	 * Apparently, you have to register "add watch", "remove watch",
+	 * and "toggle watch" functions with
+	 * dbus_connection_set_watch_functions(),
+	 * keep a *set* of FDs, add to that set in the "add watch"
+	 * function, subtract from it in the "remove watch" function,
+	 * and either add to or subtract from that set in the "toggle
+	 * watch" function, and do the wait on *all* of the FDs in the
+	 * set.  (Yes, you need the "toggle watch" function, so that
+	 * the main loop doesn't itself need to check for whether
+	 * a given watch is enabled or disabled - most libpcap programs
+	 * know nothing about D-Bus and shouldn't *have* to know anything
+	 * about D-Bus other than how to decode D-Bus messages.)
+	 *
+	 * Implementing that would require considerable changes in
+	 * the way libpcap exports "selectable FDs" to its client.
+	 * Until that's done, we just say "you can't do that".
+	 */
 	handle->selectable_fd = handle->fd = -1;
+#endif
 
 	if (handle->opt.rfmon) {
 		/*
 		 * Monitor mode doesn't apply to dbus connections.
 		 */
 		dbus_cleanup(handle);
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum message length for D-Bus (128MB).
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > 134217728)
+		handle->snapshot = 134217728;
+
 	/* dbus_connection_set_max_message_size(handlep->conn, handle->snapshot); */
 	if (handle->opt.buffer_size != 0)
 		dbus_connection_set_max_received_size(handlep->conn, handle->opt.buffer_size);
 
 	for (i = 0; i < N_RULES; i++) {
 		dbus_bus_add_match(handlep->conn, rules[i], &error);
 		if (dbus_error_is_set(&error)) {
 			dbus_error_free(&error);
 
 			/* try without eavesdrop */
 			dbus_bus_add_match(handlep->conn, rules[i] + strlen(EAVESDROPPING_RULE), &error);
 			if (dbus_error_is_set(&error)) {
 				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Failed to add bus match: %s\n", error.message);
 				dbus_error_free(&error);
 				dbus_cleanup(handle);
 				return PCAP_ERROR;
 			}
 		}
 	}
 
 	return 0;
 }
 
 pcap_t *
 dbus_create(const char *device, char *ebuf, int *is_ours)
 {
 	pcap_t *p;
 
 	if (strcmp(device, "dbus-system") &&
 		strcmp(device, "dbus-session") &&
 		strncmp(device, "dbus://", 7))
 	{
 		*is_ours = 0;
 		return NULL;
 	}
 
 	*is_ours = 1;
 	p = pcap_create_common(ebuf, sizeof (struct pcap_dbus));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = dbus_activate;
+	/*
+	 * Set these up front, so that, even if our client tries
+	 * to set non-blocking mode before we're activated, or
+	 * query the state of non-blocking mode, they get an error,
+	 * rather than having the non-blocking mode option set
+	 * for use later.
+	 */
+	p->getnonblock_op = dbus_getnonblock;
+	p->setnonblock_op = dbus_setnonblock;
 	return (p);
 }
 
 int
-dbus_findalldevs(pcap_if_t **alldevsp, char *err_str)
+dbus_findalldevs(pcap_if_list_t *devlistp, char *err_str)
 {
-	if (pcap_add_if(alldevsp, "dbus-system", 0, "D-Bus system bus", err_str) < 0)
+	/*
+	 * The notion of "connected" vs. "disconnected" doesn't apply.
+	 * XXX - what about the notions of "up" and "running"?
+	 */
+	if (add_dev(devlistp, "dbus-system",
+	    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, "D-Bus system bus",
+	    err_str) == NULL)
 		return -1;
-	if (pcap_add_if(alldevsp, "dbus-session", 0, "D-Bus session bus", err_str) < 0)
+	if (add_dev(devlistp, "dbus-session",
+	    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, "D-Bus session bus",
+	    err_str) == NULL)
 		return -1;
 	return 0;
 }
 
Index: vendor/libpcap/dist/pcap-dbus.h
===================================================================
--- vendor/libpcap/dist/pcap-dbus.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-dbus.h	(revision 333789)
@@ -1,2 +1,2 @@
 pcap_t *dbus_create(const char *, char *, int *);
-int dbus_findalldevs(pcap_if_t **devlistp, char *errbuf);
+int dbus_findalldevs(pcap_if_list_t *devlistp, char *errbuf);
Index: vendor/libpcap/dist/pcap-dll.rc
===================================================================
--- vendor/libpcap/dist/pcap-dll.rc	(nonexistent)
+++ vendor/libpcap/dist/pcap-dll.rc	(revision 333789)
@@ -0,0 +1,36 @@
+#include "config.h"
+#include <winver.h>
+
+  VS_VERSION_INFO VERSIONINFO
+    FILEVERSION    PACKAGE_VERSION_DLL
+    PRODUCTVERSION PACKAGE_VERSION_DLL
+    FILEFLAGSMASK  0x3fL
+    FILEOS         VOS__WINDOWS32
+    FILETYPE       VFT_DLL
+#ifdef _DEBUG
+    FILEFLAGS 0x1L
+#else
+    FILEFLAGS 0x0L
+#endif
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904b0"
+      BEGIN
+        VALUE "Comments",         "https://github.com/the-tcpdump-group/libpcap/"
+        VALUE "CompanyName",      "The TCPdump Group"
+        VALUE "FileDescription",  "System-Independent Interface for User-Level Packet Capture"
+        VALUE "FileVersion",      "PACKAGE_VERSION_DLL"
+        VALUE "InternalName",     PACKAGE_NAME
+        VALUE "LegalCopyright",   "Copyright (c) The TCPdump Group"
+        VALUE "LegalTrademarks",  ""
+        VALUE "OriginalFilename", "wpcap.dll"
+        VALUE "ProductName",      PACKAGE_NAME
+        VALUE "ProductVersion",   PACKAGE_VERSION
+      END
+    END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0, 1200
+  END
+  END
Index: vendor/libpcap/dist/pcap-dlpi.c
===================================================================
--- vendor/libpcap/dist/pcap-dlpi.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-dlpi.c	(revision 333789)
@@ -1,1837 +1,1909 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * This code contributed by Atanu Ghosh (atanu@cs.ucl.ac.uk),
  * University College London, and subsequently modified by
  * Guy Harris (guy@alum.mit.edu), Mark Pizzolato
  * <List-tcpdump-workers@subscriptions.pizzolato.net>,
  * Mark C. Brown (mbrown@hp.com), and Sagun Shakya <Sagun.Shakya@Sun.COM>.
  */
 
 /*
  * Packet capture routine for DLPI under SunOS 5, HP-UX 9/10/11, and AIX.
  *
  * Notes:
  *
  *    - The DLIOCRAW ioctl() is specific to SunOS.
  *
  *    - There is a bug in bufmod(7) such that setting the snapshot
  *      length results in data being left of the front of the packet.
  *
  *    - It might be desirable to use pfmod(7) to filter packets in the
  *      kernel when possible.
  *
  *    - An older version of the HP-UX DLPI Programmer's Guide, which
  *      I think was advertised as the 10.20 version, used to be available
  *      at
  *
  *            http://docs.hp.com/hpux/onlinedocs/B2355-90093/B2355-90093.html
  *
  *      but is no longer available; it can still be found at
  *
  *            http://h21007.www2.hp.com/dspp/files/unprotected/Drivers/Docs/Refs/B2355-90093.pdf
  *
  *      in PDF form.
  *
  *    - The HP-UX 10.x, 11.0, and 11i v1.6 version of the HP-UX DLPI
  *      Programmer's Guide, which I think was once advertised as the
  *      11.00 version is available at
  *
  *            http://docs.hp.com/en/B2355-90139/index.html
  *
  *    - The HP-UX 11i v2 version of the HP-UX DLPI Programmer's Guide
  *      is available at
  *
  *            http://docs.hp.com/en/B2355-90871/index.html
  *
  *    - All of the HP documents describe raw-mode services, which are
  *      what we use if DL_HP_RAWDLS is defined.  XXX - we use __hpux
  *      in some places to test for HP-UX, but use DL_HP_RAWDLS in
  *      other places; do we support any versions of HP-UX without
  *      DL_HP_RAWDLS?
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #ifdef HAVE_SYS_BUFMOD_H
 #include <sys/bufmod.h>
 #endif
 #include <sys/dlpi.h>
 #ifdef HAVE_SYS_DLPI_EXT_H
 #include <sys/dlpi_ext.h>
 #endif
 #ifdef HAVE_HPUX9
 #include <sys/socket.h>
 #endif
 #ifdef DL_HP_PPA_REQ
 #include <sys/stat.h>
 #endif
 #include <sys/stream.h>
 #if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
 #include <sys/systeminfo.h>
 #endif
 
 #ifdef HAVE_HPUX9
 #include <net/if.h>
 #endif
 
 #include <ctype.h>
 #ifdef HAVE_HPUX9
 #include <nlist.h>
 #endif
 #include <errno.h>
 #include <fcntl.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stropts.h>
 #include <unistd.h>
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
 #define INT_MAX		2147483647
 #endif
 
 #include "pcap-int.h"
 #include "dlpisubs.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
-#ifndef PCAP_DEV_PREFIX
-#ifdef _AIX
-#define PCAP_DEV_PREFIX "/dev/dlpi"
-#else
-#define PCAP_DEV_PREFIX "/dev"
+#if defined(__hpux)
+  /*
+   * HP-UX has a /dev/dlpi device; you open it and set the PPA of the actual
+   * network device you want.
+   */
+  #define HAVE_DEV_DLPI
+#elif defined(_AIX)
+  /*
+   * AIX has a /dev/dlpi directory, with devices named after the interfaces
+   * underneath it.
+   */
+  #define PCAP_DEV_PREFIX "/dev/dlpi"
+#elif defined(HAVE_SOLARIS)
+  /*
+   * Solaris has devices named after the interfaces underneath /dev.
+   */
+  #define PCAP_DEV_PREFIX "/dev"
 #endif
-#endif
 
 #define	MAXDLBUF	8192
 
 /* Forwards */
-static char *split_dname(char *, int *, char *);
+static char *split_dname(char *, u_int *, char *);
 static int dl_doattach(int, int, char *);
 #ifdef DL_HP_RAWDLS
 static int dl_dohpuxbind(int, char *);
 #endif
 static int dlpromiscon(pcap_t *, bpf_u_int32);
 static int dlbindreq(int, bpf_u_int32, char *);
 static int dlbindack(int, char *, char *, int *);
 static int dlokack(int, const char *, char *, char *);
 static int dlinforeq(int, char *);
 static int dlinfoack(int, char *, char *);
 
-#ifdef HAVE_DLPI_PASSIVE
+#ifdef HAVE_DL_PASSIVE_REQ_T
 static void dlpassive(int, char *);
 #endif
 
 #ifdef DL_HP_RAWDLS
 static int dlrawdatareq(int, const u_char *, int);
 #endif
 static int recv_ack(int, int, const char *, char *, char *, int *);
 static char *dlstrerror(char *, size_t, bpf_u_int32);
 static char *dlprim(char *, size_t, bpf_u_int32);
 #if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
 #define GET_RELEASE_BUFSIZE	32
 static void get_release(char *, size_t, bpf_u_int32 *, bpf_u_int32 *,
     bpf_u_int32 *);
 #endif
 static int send_request(int, char *, int, char *, char *);
 #ifdef HAVE_HPUX9
 static int dlpi_kread(int, off_t, void *, u_int, char *);
 #endif
 #ifdef HAVE_DEV_DLPI
-static int get_dlpi_ppa(int, const char *, int, char *);
+static int get_dlpi_ppa(int, const char *, u_int, u_int *, char *);
 #endif
 
 /*
  * Cast a buffer to "union DL_primitives" without provoking warnings
  * from the compiler.
  */
 #define MAKE_DL_PRIMITIVES(ptr)	((union DL_primitives *)(void *)(ptr))
 
 static int
 pcap_read_dlpi(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	int cc;
 	u_char *bp;
 	int flags;
 	bpf_u_int32 ctlbuf[MAXDLBUF];
 	struct strbuf ctl = {
 		MAXDLBUF,
 		0,
 		(char *)ctlbuf
 	};
 	struct strbuf data;
 
 	flags = 0;
 	cc = p->cc;
 	if (cc == 0) {
 		data.buf = (char *)p->buffer + p->offset;
 		data.maxlen = p->bufsize;
 		data.len = 0;
 		do {
 			/*
 			 * Has "pcap_breakloop()" been called?
 			 */
 			if (p->break_loop) {
 				/*
 				 * Yes - clear the flag that indicates
 				 * that it has, and return -2 to
 				 * indicate that we were told to
 				 * break out of the loop.
 				 */
 				p->break_loop = 0;
 				return (-2);
 			}
 			/*
 			 * XXX - check for the DLPI primitive, which
 			 * would be DL_HP_RAWDATA_IND on HP-UX
 			 * if we're in raw mode?
 			 */
 			ctl.buf = (char *)ctlbuf;
 			ctl.maxlen = MAXDLBUF;
 			ctl.len = 0;
 			if (getmsg(p->fd, &ctl, &data, &flags) < 0) {
 				/* Don't choke when we get ptraced */
 				switch (errno) {
 
 				case EINTR:
 					cc = 0;
 					continue;
 
 				case EAGAIN:
 					return (0);
 				}
-				strlcpy(p->errbuf, pcap_strerror(errno),
-				    sizeof(p->errbuf));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    sizeof(p->errbuf), errno, "getmsg");
 				return (-1);
 			}
 			cc = data.len;
 		} while (cc == 0);
 		bp = (u_char *)p->buffer + p->offset;
 	} else
 		bp = p->bp;
 
 	return (pcap_process_pkts(p, callback, user, cnt, bp, cc));
 }
 
 static int
 pcap_inject_dlpi(pcap_t *p, const void *buf, size_t size)
 {
 #ifdef DL_HP_RAWDLS
 	struct pcap_dlpi *pd = p->priv;
 #endif
 	int ret;
 
 #if defined(DLIOCRAW)
 	ret = write(p->fd, buf, size);
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 #elif defined(DL_HP_RAWDLS)
 	if (pd->send_fd < 0) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "send: Output FD couldn't be opened");
 		return (-1);
 	}
 	ret = dlrawdatareq(pd->send_fd, buf, size);
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	/*
 	 * putmsg() returns either 0 or -1; it doesn't indicate how
 	 * many bytes were written (presumably they were all written
 	 * or none of them were written).  OpenBSD's pcap_inject()
 	 * returns the number of bytes written, so, for API compatibility,
 	 * we return the number of bytes we were told to write.
 	 */
 	ret = size;
 #else /* no raw mode */
 	/*
 	 * XXX - this is a pain, because you might have to extract
 	 * the address from the packet and use it in a DL_UNITDATA_REQ
 	 * request.  That would be dependent on the link-layer type.
 	 *
 	 * I also don't know what SAP you'd have to bind the descriptor
 	 * to, or whether you'd need separate "receive" and "send" FDs,
 	 * nor do I know whether you'd need different bindings for
 	 * D/I/X Ethernet and 802.3, or for {FDDI,Token Ring} plus
 	 * 802.2 and {FDDI,Token Ring} plus 802.2 plus SNAP.
 	 *
 	 * So, for now, we just return a "you can't send" indication,
 	 * and leave it up to somebody with a DLPI-based system lacking
 	 * both DLIOCRAW and DL_HP_RAWDLS to supply code to implement
 	 * packet transmission on that system.  If they do, they should
 	 * send it to us - but should not send us code that assumes
 	 * Ethernet; if the code doesn't work on non-Ethernet interfaces,
 	 * it should check "p->linktype" and reject the send request if
 	 * it's anything other than DLT_EN10MB.
 	 */
 	strlcpy(p->errbuf, "send: Not supported on this version of this OS",
 	    PCAP_ERRBUF_SIZE);
 	ret = -1;
 #endif /* raw mode */
 	return (ret);
 }
 
 #ifndef DL_IPATM
 #define DL_IPATM	0x12	/* ATM Classical IP interface */
 #endif
 
 #ifdef HAVE_SOLARIS
 /*
  * For SunATM.
  */
 #ifndef A_GET_UNITS
 #define A_GET_UNITS	(('A'<<8)|118)
 #endif /* A_GET_UNITS */
 #ifndef A_PROMISCON_REQ
 #define A_PROMISCON_REQ	(('A'<<8)|121)
 #endif /* A_PROMISCON_REQ */
 #endif /* HAVE_SOLARIS */
 
 static void
 pcap_cleanup_dlpi(pcap_t *p)
 {
 #ifdef DL_HP_RAWDLS
 	struct pcap_dlpi *pd = p->priv;
 
 	if (pd->send_fd >= 0) {
 		close(pd->send_fd);
 		pd->send_fd = -1;
 	}
 #endif
 	pcap_cleanup_live_common(p);
 }
 
 static int
-open_dlpi_device(const char *name, int *ppa, char *errbuf)
+open_dlpi_device(const char *name, u_int *ppa, char *errbuf)
 {
 	int status;
 	char dname[100];
 	char *cp;
 	int fd;
-#ifndef HAVE_DEV_DLPI
+#ifdef HAVE_DEV_DLPI
+	u_int unit;
+#else
 	char dname2[100];
 #endif
 
 #ifdef HAVE_DEV_DLPI
 	/*
 	** Remove any "/dev/" on the front of the device.
 	*/
 	cp = strrchr(name, '/');
 	if (cp == NULL)
 		strlcpy(dname, name, sizeof(dname));
 	else
 		strlcpy(dname, cp + 1, sizeof(dname));
 
 	/*
 	 * Split the device name into a device type name and a unit number;
 	 * chop off the unit number, so "dname" is just a device type name.
 	 */
-	cp = split_dname(dname, ppa, errbuf);
+	cp = split_dname(dname, &unit, errbuf);
 	if (cp == NULL)
 		return (PCAP_ERROR_NO_SUCH_DEVICE);
 	*cp = '\0';
 
 	/*
 	 * Use "/dev/dlpi" as the device.
 	 *
 	 * XXX - HP's DLPI Programmer's Guide for HP-UX 11.00 says that
 	 * the "dl_mjr_num" field is for the "major number of interface
 	 * driver"; that's the major of "/dev/dlpi" on the system on
 	 * which I tried this, but there may be DLPI devices that
 	 * use a different driver, in which case we may need to
 	 * search "/dev" for the appropriate device with that major
 	 * device number, rather than hardwiring "/dev/dlpi".
 	 */
 	cp = "/dev/dlpi";
 	if ((fd = open(cp, O_RDWR)) < 0) {
 		if (errno == EPERM || errno == EACCES)
 			status = PCAP_ERROR_PERM_DENIED;
 		else
 			status = PCAP_ERROR;
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: %s", cp, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s", cp);
 		return (status);
 	}
 
 	/*
 	 * Get a table of all PPAs for that device, and search that
 	 * table for the specified device type name and unit number.
 	 */
-	*ppa = get_dlpi_ppa(fd, dname, *ppa, errbuf);
-	if (*ppa < 0) {
+	status = get_dlpi_ppa(fd, dname, unit, ppa, errbuf);
+	if (status < 0) {
 		close(fd);
-		return (*ppa);
+		return (status);
 	}
 #else
 	/*
 	 * If the device name begins with "/", assume it begins with
 	 * the pathname of the directory containing the device to open;
 	 * otherwise, concatenate the device directory name and the
 	 * device name.
 	 */
 	if (*name == '/')
 		strlcpy(dname, name, sizeof(dname));
 	else
 		pcap_snprintf(dname, sizeof(dname), "%s/%s", PCAP_DEV_PREFIX,
 		    name);
 
 	/*
 	 * Get the unit number, and a pointer to the end of the device
 	 * type name.
 	 */
 	cp = split_dname(dname, ppa, errbuf);
 	if (cp == NULL)
 		return (PCAP_ERROR_NO_SUCH_DEVICE);
 
 	/*
 	 * Make a copy of the device pathname, and then remove the unit
 	 * number from the device pathname.
 	 */
 	strlcpy(dname2, dname, sizeof(dname));
 	*cp = '\0';
 
 	/* Try device without unit number */
 	if ((fd = open(dname, O_RDWR)) < 0) {
 		if (errno != ENOENT) {
 			if (errno == EPERM || errno == EACCES)
 				status = PCAP_ERROR_PERM_DENIED;
 			else
 				status = PCAP_ERROR;
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dname,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "%s", dname);
 			return (status);
 		}
 
 		/* Try again with unit number */
 		if ((fd = open(dname2, O_RDWR)) < 0) {
 			if (errno == ENOENT) {
 				status = PCAP_ERROR_NO_SUCH_DEVICE;
 
 				/*
 				 * We provide an error message even
 				 * for this error, for diagnostic
 				 * purposes (so that, for example,
 				 * the app can show the message if the
 				 * user requests it).
 				 *
 				 * In it, we just report "No DLPI device
 				 * found" with the device name, so people
 				 * don't get confused and think, for example,
 				 * that if they can't capture on "lo0"
 				 * on Solaris prior to Solaris 11 the fix
 				 * is to change libpcap (or the application
 				 * that uses it) to look for something other
 				 * than "/dev/lo0", as the fix is to use
 				 * Solaris 11 or some operating system
 				 * other than Solaris - you just *can't*
 				 * capture on a loopback interface
 				 * on Solaris prior to Solaris 11, the lack
 				 * of a DLPI device for the loopback
 				 * interface is just a symptom of that
 				 * inability.
 				 */
 				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 				    "%s: No DLPI device found", name);
 			} else {
 				if (errno == EPERM || errno == EACCES)
 					status = PCAP_ERROR_PERM_DENIED;
 				else
 					status = PCAP_ERROR;
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
-				    dname2, pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "%s", dname2);
 			}
 			return (status);
 		}
 		/* XXX Assume unit zero */
 		*ppa = 0;
 	}
 #endif
 	return (fd);
 }
 
 static int
 pcap_activate_dlpi(pcap_t *p)
 {
 #ifdef DL_HP_RAWDLS
 	struct pcap_dlpi *pd = p->priv;
 #endif
 	int status = 0;
 	int retv;
-	int ppa;
+	u_int ppa;
 #ifdef HAVE_SOLARIS
 	int isatm = 0;
 #endif
 	register dl_info_ack_t *infop;
 #ifdef HAVE_SYS_BUFMOD_H
 	bpf_u_int32 ss;
 #ifdef HAVE_SOLARIS
 	char release[GET_RELEASE_BUFSIZE];
 	bpf_u_int32 osmajor, osminor, osmicro;
 #endif
 #endif
 	bpf_u_int32 buf[MAXDLBUF];
 
 	p->fd = open_dlpi_device(p->opt.device, &ppa, p->errbuf);
 	if (p->fd < 0) {
 		status = p->fd;
 		goto bad;
 	}
 
 #ifdef DL_HP_RAWDLS
 	/*
 	 * XXX - HP-UX 10.20 and 11.xx don't appear to support sending and
 	 * receiving packets on the same descriptor - you need separate
 	 * descriptors for sending and receiving, bound to different SAPs.
 	 *
 	 * If the open fails, we just leave -1 in "pd->send_fd" and reject
 	 * attempts to send packets, just as if, in pcap-bpf.c, we fail
 	 * to open the BPF device for reading and writing, we just try
 	 * to open it for reading only and, if that succeeds, just let
 	 * the send attempts fail.
 	 */
 	pd->send_fd = open("/dev/dlpi", O_RDWR);
 #endif
 
 	/*
 	** Attach if "style 2" provider
 	*/
 	if (dlinforeq(p->fd, p->errbuf) < 0 ||
 	    dlinfoack(p->fd, (char *)buf, p->errbuf) < 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	infop = &(MAKE_DL_PRIMITIVES(buf))->info_ack;
 #ifdef HAVE_SOLARIS
 	if (infop->dl_mac_type == DL_IPATM)
 		isatm = 1;
 #endif
 	if (infop->dl_provider_style == DL_STYLE2) {
 		retv = dl_doattach(p->fd, ppa, p->errbuf);
 		if (retv < 0) {
 			status = retv;
 			goto bad;
 		}
 #ifdef DL_HP_RAWDLS
 		if (pd->send_fd >= 0) {
 			retv = dl_doattach(pd->send_fd, ppa, p->errbuf);
 			if (retv < 0) {
 				status = retv;
 				goto bad;
 			}
 		}
 #endif
 	}
 
 	if (p->opt.rfmon) {
 		/*
 		 * This device exists, but we don't support monitor mode
 		 * any platforms that support DLPI.
 		 */
 		status = PCAP_ERROR_RFMON_NOTSUP;
 		goto bad;
 	}
 
-#ifdef HAVE_DLPI_PASSIVE
+#ifdef HAVE_DL_PASSIVE_REQ_T
 	/*
 	 * Enable Passive mode to be able to capture on aggregated link.
 	 * Not supported in all Solaris versions.
 	 */
 	dlpassive(p->fd, p->errbuf);
 #endif
 	/*
 	** Bind (defer if using HP-UX 9 or HP-UX 10.20 or later, totally
 	** skip if using SINIX)
 	*/
 #if !defined(HAVE_HPUX9) && !defined(HAVE_HPUX10_20_OR_LATER) && !defined(sinix)
 #ifdef _AIX
 	/*
 	** AIX.
 	** According to IBM's AIX Support Line, the dl_sap value
 	** should not be less than 0x600 (1536) for standard Ethernet.
 	** However, we seem to get DL_BADADDR - "DLSAP addr in improper
 	** format or invalid" - errors if we use 1537 on the "tr0"
 	** device, which, given that its name starts with "tr" and that
 	** it's IBM, probably means a Token Ring device.  (Perhaps we
 	** need to use 1537 on "/dev/dlpi/en" because that device is for
 	** D/I/X Ethernet, the "SAP" is actually an Ethernet type, and
 	** it rejects invalid Ethernet types.)
 	**
 	** So if 1537 fails, we try 2, as Hyung Sik Yoon of IBM Korea
 	** says that works on Token Ring (he says that 0 does *not*
 	** work; perhaps that's considered an invalid LLC SAP value - I
 	** assume the SAP value in a DLPI bind is an LLC SAP for network
 	** types that use 802.2 LLC).
 	*/
 	if ((dlbindreq(p->fd, 1537, p->errbuf) < 0 &&
 	     dlbindreq(p->fd, 2, p->errbuf) < 0) ||
 	     dlbindack(p->fd, (char *)buf, p->errbuf, NULL) < 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #elif defined(DL_HP_RAWDLS)
 	/*
 	** HP-UX 10.0x and 10.1x.
 	*/
 	if (dl_dohpuxbind(p->fd, p->errbuf) < 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	if (pd->send_fd >= 0) {
 		/*
 		** XXX - if this fails, just close send_fd and
 		** set it to -1, so that you can't send but can
 		** still receive?
 		*/
 		if (dl_dohpuxbind(pd->send_fd, p->errbuf) < 0) {
 			status = PCAP_ERROR;
 			goto bad;
 		}
 	}
 #else /* neither AIX nor HP-UX */
 	/*
 	** Not Sinix, and neither AIX nor HP-UX - Solaris, and any other
 	** OS using DLPI.
 	**/
 	if (dlbindreq(p->fd, 0, p->errbuf) < 0 ||
 	    dlbindack(p->fd, (char *)buf, p->errbuf, NULL) < 0) {
 	    	status = PCAP_ERROR;
 		goto bad;
 	}
 #endif /* AIX vs. HP-UX vs. other */
 #endif /* !HP-UX 9 and !HP-UX 10.20 or later and !SINIX */
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 #ifdef HAVE_SOLARIS
 	if (isatm) {
 		/*
 		** Have to turn on some special ATM promiscuous mode
 		** for SunATM.
 		** Do *NOT* turn regular promiscuous mode on; it doesn't
 		** help, and may break things.
 		*/
 		if (strioctl(p->fd, A_PROMISCON_REQ, 0, NULL) < 0) {
 			status = PCAP_ERROR;
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "A_PROMISCON_REQ: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "A_PROMISCON_REQ");
 			goto bad;
 		}
 	} else
 #endif
 	if (p->opt.promisc) {
 		/*
 		** Enable promiscuous (not necessary on send FD)
 		*/
 		retv = dlpromiscon(p, DL_PROMISC_PHYS);
 		if (retv < 0) {
 			if (retv == PCAP_ERROR_PERM_DENIED)
 				status = PCAP_ERROR_PROMISC_PERM_DENIED;
 			else
 				status = retv;
 			goto bad;
 		}
 
 		/*
 		** Try to enable multicast (you would have thought
 		** promiscuous would be sufficient). (Skip if using
 		** HP-UX or SINIX) (Not necessary on send FD)
 		*/
 #if !defined(__hpux) && !defined(sinix)
 		retv = dlpromiscon(p, DL_PROMISC_MULTI);
 		if (retv < 0)
 			status = PCAP_WARNING;
 #endif
 	}
 	/*
 	** Try to enable SAP promiscuity (when not in promiscuous mode
 	** when using HP-UX, when not doing SunATM on Solaris, and never
 	** under SINIX) (Not necessary on send FD)
 	*/
 #ifndef sinix
 #if defined(__hpux)
 	/* HP-UX - only do this when not in promiscuous mode */
 	if (!p->opt.promisc) {
 #elif defined(HAVE_SOLARIS)
 	/* Solaris - don't do this on SunATM devices */
 	if (!isatm) {
 #else
 	/* Everything else (except for SINIX) - always do this */
 	{
 #endif
 		retv = dlpromiscon(p, DL_PROMISC_SAP);
 		if (retv < 0) {
 			if (p->opt.promisc) {
 				/*
 				 * Not fatal, since the DL_PROMISC_PHYS mode
 				 * worked.
 				 *
 				 * Report it as a warning, however.
 				 */
 				status = PCAP_WARNING;
 			} else {
 				/*
 				 * Fatal.
 				 */
 				status = retv;
 				goto bad;
 			}
 		}
 	}
 #endif /* sinix */
 
 	/*
 	** HP-UX 9, and HP-UX 10.20 or later, must bind after setting
 	** promiscuous options.
 	*/
 #if defined(HAVE_HPUX9) || defined(HAVE_HPUX10_20_OR_LATER)
 	if (dl_dohpuxbind(p->fd, p->errbuf) < 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 	/*
 	** We don't set promiscuous mode on the send FD, but we'll defer
 	** binding it anyway, just to keep the HP-UX 9/10.20 or later
 	** code together.
 	*/
 	if (pd->send_fd >= 0) {
 		/*
 		** XXX - if this fails, just close send_fd and
 		** set it to -1, so that you can't send but can
 		** still receive?
 		*/
 		if (dl_dohpuxbind(pd->send_fd, p->errbuf) < 0) {
 			status = PCAP_ERROR;
 			goto bad;
 		}
 	}
 #endif
 
 	/*
 	** Determine link type
 	** XXX - get SAP length and address length as well, for use
 	** when sending packets.
 	*/
 	if (dlinforeq(p->fd, p->errbuf) < 0 ||
 	    dlinfoack(p->fd, (char *)buf, p->errbuf) < 0) {
 	    	status = PCAP_ERROR;
 		goto bad;
 	}
 
 	infop = &(MAKE_DL_PRIMITIVES(buf))->info_ack;
 	if (pcap_process_mactype(p, infop->dl_mac_type) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 #ifdef	DLIOCRAW
 	/*
 	** This is a non standard SunOS hack to get the full raw link-layer
 	** header.
 	*/
 	if (strioctl(p->fd, DLIOCRAW, 0, NULL) < 0) {
 		status = PCAP_ERROR;
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "DLIOCRAW: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "DLIOCRAW");
 		goto bad;
 	}
 #endif
 
 #ifdef HAVE_SYS_BUFMOD_H
 	ss = p->snapshot;
 
 	/*
 	** There is a bug in bufmod(7). When dealing with messages of
 	** less than snaplen size it strips data from the beginning not
 	** the end.
 	**
 	** This bug is fixed in 5.3.2. Also, there is a patch available.
 	** Ask for bugid 1149065.
 	*/
 #ifdef HAVE_SOLARIS
 	get_release(release, sizeof (release), &osmajor, &osminor, &osmicro);
 	if (osmajor == 5 && (osminor <= 2 || (osminor == 3 && osmicro < 2)) &&
 	    getenv("BUFMOD_FIXED") == NULL) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		"WARNING: bufmod is broken in SunOS %s; ignoring snaplen.",
 		    release);
 		ss = 0;
 		status = PCAP_WARNING;
 	}
 #endif
 
 	/* Push and configure bufmod. */
 	if (pcap_conf_bufmod(p, ss) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 #endif
 
 	/*
 	** As the last operation flush the read side.
 	*/
 	if (ioctl(p->fd, I_FLUSH, FLUSHR) != 0) {
 		status = PCAP_ERROR;
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "FLUSHR: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "FLUSHR");
 		goto bad;
 	}
 
 	/* Allocate data buffer. */
 	if (pcap_alloc_databuf(p) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * Success.
 	 *
 	 * "p->fd" is an FD for a STREAMS device, so "select()" and
 	 * "poll()" should work on it.
 	 */
 	p->selectable_fd = p->fd;
 
 	p->read_op = pcap_read_dlpi;
 	p->inject_op = pcap_inject_dlpi;
 	p->setfilter_op = install_bpf_program;	/* no kernel filtering */
 	p->setdirection_op = NULL;	/* Not implemented.*/
 	p->set_datalink_op = NULL;	/* can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_dlpi;
 	p->cleanup_op = pcap_cleanup_dlpi;
 
 	return (status);
 bad:
 	pcap_cleanup_dlpi(p);
 	return (status);
 }
 
 /*
  * Split a device name into a device type name and a unit number;
  * return the a pointer to the beginning of the unit number, which
  * is the end of the device type name, and set "*unitp" to the unit
  * number.
  *
  * Returns NULL on error, and fills "ebuf" with an error message.
  */
 static char *
-split_dname(char *device, int *unitp, char *ebuf)
+split_dname(char *device, u_int *unitp, char *ebuf)
 {
 	char *cp;
 	char *eos;
 	long unit;
 
 	/*
 	 * Look for a number at the end of the device name string.
 	 */
 	cp = device + strlen(device) - 1;
 	if (*cp < '0' || *cp > '9') {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s missing unit number",
 		    device);
 		return (NULL);
 	}
 
 	/* Digits at end of string are unit number */
 	while (cp-1 >= device && *(cp-1) >= '0' && *(cp-1) <= '9')
 		cp--;
 
 	errno = 0;
 	unit = strtol(cp, &eos, 10);
 	if (*eos != '\0') {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s bad unit number", device);
 		return (NULL);
 	}
 	if (errno == ERANGE || unit > INT_MAX) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s unit number too large",
 		    device);
 		return (NULL);
 	}
 	if (unit < 0) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s unit number is negative",
 		    device);
 		return (NULL);
 	}
-	*unitp = (int)unit;
+	*unitp = (u_int)unit;
 	return (cp);
 }
 
 static int
 dl_doattach(int fd, int ppa, char *ebuf)
 {
 	dl_attach_req_t	req;
 	bpf_u_int32 buf[MAXDLBUF];
 	int err;
 
 	req.dl_primitive = DL_ATTACH_REQ;
 	req.dl_ppa = ppa;
 	if (send_request(fd, (char *)&req, sizeof(req), "attach", ebuf) < 0)
 		return (PCAP_ERROR);
 
 	err = dlokack(fd, "attach", (char *)buf, ebuf);
 	if (err < 0)
 		return (err);
 	return (0);
 }
 
 #ifdef DL_HP_RAWDLS
 static int
 dl_dohpuxbind(int fd, char *ebuf)
 {
 	int hpsap;
 	int uerror;
 	bpf_u_int32 buf[MAXDLBUF];
 
 	/*
 	 * XXX - we start at 22 because we used to use only 22, but
 	 * that was just because that was the value used in some
 	 * sample code from HP.  With what value *should* we start?
 	 * Does it matter, given that we're enabling SAP promiscuity
 	 * on the input FD?
 	 */
 	hpsap = 22;
 	for (;;) {
 		if (dlbindreq(fd, hpsap, ebuf) < 0)
 			return (-1);
 		if (dlbindack(fd, (char *)buf, ebuf, &uerror) >= 0)
 			break;
 		/*
 		 * For any error other than a UNIX EBUSY, give up.
 		 */
 		if (uerror != EBUSY) {
 			/*
 			 * dlbindack() has already filled in ebuf for
 			 * this error.
 			 */
 			return (-1);
 		}
 
 		/*
 		 * For EBUSY, try the next SAP value; that means that
 		 * somebody else is using that SAP.  Clear ebuf so
 		 * that application doesn't report the "Device busy"
 		 * error as a warning.
 		 */
 		*ebuf = '\0';
 		hpsap++;
 		if (hpsap > 100) {
 			strlcpy(ebuf,
 			    "All SAPs from 22 through 100 are in use",
 			    PCAP_ERRBUF_SIZE);
 			return (-1);
 		}
 	}
 	return (0);
 }
 #endif
 
 #define STRINGIFY(n)	#n
 
 static int
 dlpromiscon(pcap_t *p, bpf_u_int32 level)
 {
 	dl_promiscon_req_t req;
 	bpf_u_int32 buf[MAXDLBUF];
 	int err;
 
 	req.dl_primitive = DL_PROMISCON_REQ;
 	req.dl_level = level;
 	if (send_request(p->fd, (char *)&req, sizeof(req), "promiscon",
 	    p->errbuf) < 0)
 		return (PCAP_ERROR);
 	err = dlokack(p->fd, "promiscon" STRINGIFY(level), (char *)buf,
 	    p->errbuf);
 	if (err < 0)
 		return (err);
 	return (0);
 }
 
 /*
  * Not all interfaces are DLPI interfaces, and thus not all interfaces
  * can be opened with DLPI (for example, the loopback interface is not
  * a DLPI interface on Solaris prior to Solaris 11), so try to open
  * the specified interface; return 0 if we fail with PCAP_ERROR_NO_SUCH_DEVICE
  * and 1 otherwise.
  */
 static int
 is_dlpi_interface(const char *name)
 {
 	int fd;
-	int ppa;
+	u_int ppa;
 	char errbuf[PCAP_ERRBUF_SIZE];
 
 	fd = open_dlpi_device(name, &ppa, errbuf);
 	if (fd < 0) {
 		/*
 		 * Error - was it PCAP_ERROR_NO_SUCH_DEVICE?
 		 */
 		if (fd == PCAP_ERROR_NO_SUCH_DEVICE) {
 			/*
 			 * Yes, so we can't open this because it's
 			 * not a DLPI interface.
 			 */
 			return (0);
 		}
 		/*
 		 * No, so, in the case where there's a single DLPI
 		 * device for all interfaces of this type ("style
 		 * 2" providers?), we don't know whether it's a DLPI
 		 * interface or not, as we didn't try an attach.
 		 * Say it is a DLPI device, so that the user can at
 		 * least try to open it and report the error (which
 		 * is probably "you don't have permission to open that
 		 * DLPI device"; reporting those interfaces means
 		 * users will ask "why am I getting a permissions error
 		 * when I try to capture" rather than "why am I not
 		 * seeing any interfaces", making the underlying problem
 		 * clearer).
 		 */
 		return (1);
 	}
 
 	/*
 	 * Success.
 	 */
 	close(fd);
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do other than mark loopback devices as "the
+	 * connected/disconnected status doesn't apply".
+	 *
+	 * XXX - on Solaris, can we do what the dladm command does,
+	 * i.e. get a connected/disconnected indication from a kstat?
+	 * (Note that you can also get the link speed, and possibly
+	 * other information, from a kstat as well.)
+	 */
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback devices aren't wireless, and "connected"/
+		 * "disconnected" doesn't apply to them.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return (0);
+	}
+	return (0);
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 #ifdef HAVE_SOLARIS
 	int fd;
 	union {
 		u_int nunits;
 		char pad[516];	/* XXX - must be at least 513; is 516
 				   in "atmgetunits" */
 	} buf;
 	char baname[2+1+1];
 	u_int i;
 #endif
 
 	/*
 	 * Get the list of regular interfaces first.
 	 */
-	if (pcap_findalldevs_interfaces(alldevsp, errbuf, is_dlpi_interface) == -1)
+	if (pcap_findalldevs_interfaces(devlistp, errbuf, is_dlpi_interface,
+	    get_if_flags) == -1)
 		return (-1);	/* failure */
 
 #ifdef HAVE_SOLARIS
 	/*
 	 * We may have to do special magic to get ATM devices.
 	 */
 	if ((fd = open("/dev/ba", O_RDWR)) < 0) {
 		/*
 		 * We couldn't open the "ba" device.
 		 * For now, just give up; perhaps we should
 		 * return an error if the problem is neither
 		 * a "that device doesn't exist" error (ENOENT,
 		 * ENXIO, etc.) or a "you're not allowed to do
 		 * that" error (EPERM, EACCES).
 		 */
 		return (0);
 	}
 
 	if (strioctl(fd, A_GET_UNITS, sizeof(buf), (char *)&buf) < 0) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "A_GET_UNITS: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "A_GET_UNITS");
 		return (-1);
 	}
 	for (i = 0; i < buf.nunits; i++) {
 		pcap_snprintf(baname, sizeof baname, "ba%u", i);
-		if (pcap_add_if(alldevsp, baname, 0, NULL, errbuf) < 0)
+		/*
+		 * XXX - is there a notion of "up" and "running"?
+		 * And is there a way to determine whether the
+		 * interface is plugged into a network?
+		 */
+		if (add_dev(devlistp, baname, 0, NULL, errbuf) == NULL)
 			return (-1);
 	}
 #endif
 
 	return (0);
 }
 
 static int
 send_request(int fd, char *ptr, int len, char *what, char *ebuf)
 {
 	struct	strbuf	ctl;
 	int	flags;
 
 	ctl.maxlen = 0;
 	ctl.len = len;
 	ctl.buf = ptr;
 
 	flags = 0;
 	if (putmsg(fd, &ctl, (struct strbuf *) NULL, flags) < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "send_request: putmsg \"%s\": %s",
-		    what, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "send_request: putmsg \"%s\"", what);
 		return (-1);
 	}
 	return (0);
 }
 
 static int
 recv_ack(int fd, int size, const char *what, char *bufp, char *ebuf, int *uerror)
 {
 	union	DL_primitives	*dlp;
 	struct	strbuf	ctl;
 	int	flags;
 	char	errmsgbuf[PCAP_ERRBUF_SIZE];
 	char	dlprimbuf[64];
 
 	/*
 	 * Clear out "*uerror", so it's only set for DL_ERROR_ACK/DL_SYSERR,
 	 * making that the only place where EBUSY is treated specially.
 	 */
 	if (uerror != NULL)
 		*uerror = 0;
 
 	ctl.maxlen = MAXDLBUF;
 	ctl.len = 0;
 	ctl.buf = bufp;
 
 	flags = 0;
 	if (getmsg(fd, &ctl, (struct strbuf*)NULL, &flags) < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "recv_ack: %s getmsg: %s",
-		    what, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "recv_ack: %s getmsg", what);
 		return (PCAP_ERROR);
 	}
 
 	dlp = MAKE_DL_PRIMITIVES(ctl.buf);
 	switch (dlp->dl_primitive) {
 
 	case DL_INFO_ACK:
 	case DL_BIND_ACK:
 	case DL_OK_ACK:
 #ifdef DL_HP_PPA_ACK
 	case DL_HP_PPA_ACK:
 #endif
 		/* These are OK */
 		break;
 
 	case DL_ERROR_ACK:
 		switch (dlp->error_ack.dl_errno) {
 
 		case DL_SYSERR:
 			if (uerror != NULL)
 				*uerror = dlp->error_ack.dl_unix_errno;
-			pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			    "recv_ack: %s: UNIX error - %s",
-			    what, pcap_strerror(dlp->error_ack.dl_unix_errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    dlp->error_ack.dl_unix_errno,
+			    "recv_ack: %s: UNIX error", what);
 			if (dlp->error_ack.dl_unix_errno == EPERM ||
 			    dlp->error_ack.dl_unix_errno == EACCES)
 				return (PCAP_ERROR_PERM_DENIED);
 			break;
 
 		default:
 			pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 			    "recv_ack: %s: %s", what,
 			    dlstrerror(errmsgbuf, sizeof (errmsgbuf), dlp->error_ack.dl_errno));
 			if (dlp->error_ack.dl_errno == DL_BADPPA)
 				return (PCAP_ERROR_NO_SUCH_DEVICE);
 			else if (dlp->error_ack.dl_errno == DL_ACCESS)
 				return (PCAP_ERROR_PERM_DENIED);
 			break;
 		}
 		return (PCAP_ERROR);
 
 	default:
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "recv_ack: %s: Unexpected primitive ack %s",
 		    what, dlprim(dlprimbuf, sizeof (dlprimbuf), dlp->dl_primitive));
 		return (PCAP_ERROR);
 	}
 
 	if (ctl.len < size) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "recv_ack: %s: Ack too small (%d < %d)",
 		    what, ctl.len, size);
 		return (PCAP_ERROR);
 	}
 	return (ctl.len);
 }
 
 static char *
 dlstrerror(char *errbuf, size_t errbufsize, bpf_u_int32 dl_errno)
 {
 	switch (dl_errno) {
 
 	case DL_ACCESS:
 		return ("Improper permissions for request");
 
 	case DL_BADADDR:
 		return ("DLSAP addr in improper format or invalid");
 
 	case DL_BADCORR:
 		return ("Seq number not from outstand DL_CONN_IND");
 
 	case DL_BADDATA:
 		return ("User data exceeded provider limit");
 
 	case DL_BADPPA:
 #ifdef HAVE_DEV_DLPI
 		/*
 		 * With a single "/dev/dlpi" device used for all
 		 * DLPI providers, PPAs have nothing to do with
 		 * unit numbers.
 		 */
 		return ("Specified PPA was invalid");
 #else
 		/*
 		 * We have separate devices for separate devices;
 		 * the PPA is just the unit number.
 		 */
 		return ("Specified PPA (device unit) was invalid");
 #endif
 
 	case DL_BADPRIM:
 		return ("Primitive received not known by provider");
 
 	case DL_BADQOSPARAM:
 		return ("QOS parameters contained invalid values");
 
 	case DL_BADQOSTYPE:
 		return ("QOS structure type is unknown/unsupported");
 
 	case DL_BADSAP:
 		return ("Bad LSAP selector");
 
 	case DL_BADTOKEN:
 		return ("Token used not an active stream");
 
 	case DL_BOUND:
 		return ("Attempted second bind with dl_max_conind");
 
 	case DL_INITFAILED:
 		return ("Physical link initialization failed");
 
 	case DL_NOADDR:
 		return ("Provider couldn't allocate alternate address");
 
 	case DL_NOTINIT:
 		return ("Physical link not initialized");
 
 	case DL_OUTSTATE:
 		return ("Primitive issued in improper state");
 
 	case DL_SYSERR:
 		return ("UNIX system error occurred");
 
 	case DL_UNSUPPORTED:
 		return ("Requested service not supplied by provider");
 
 	case DL_UNDELIVERABLE:
 		return ("Previous data unit could not be delivered");
 
 	case DL_NOTSUPPORTED:
 		return ("Primitive is known but not supported");
 
 	case DL_TOOMANY:
 		return ("Limit exceeded");
 
 	case DL_NOTENAB:
 		return ("Promiscuous mode not enabled");
 
 	case DL_BUSY:
 		return ("Other streams for PPA in post-attached");
 
 	case DL_NOAUTO:
 		return ("Automatic handling XID&TEST not supported");
 
 	case DL_NOXIDAUTO:
 		return ("Automatic handling of XID not supported");
 
 	case DL_NOTESTAUTO:
 		return ("Automatic handling of TEST not supported");
 
 	case DL_XIDAUTO:
 		return ("Automatic handling of XID response");
 
 	case DL_TESTAUTO:
 		return ("Automatic handling of TEST response");
 
 	case DL_PENDING:
 		return ("Pending outstanding connect indications");
 
 	default:
 		pcap_snprintf(errbuf, errbufsize, "Error %02x", dl_errno);
 		return (errbuf);
 	}
 }
 
 static char *
 dlprim(char *primbuf, size_t primbufsize, bpf_u_int32 prim)
 {
 	switch (prim) {
 
 	case DL_INFO_REQ:
 		return ("DL_INFO_REQ");
 
 	case DL_INFO_ACK:
 		return ("DL_INFO_ACK");
 
 	case DL_ATTACH_REQ:
 		return ("DL_ATTACH_REQ");
 
 	case DL_DETACH_REQ:
 		return ("DL_DETACH_REQ");
 
 	case DL_BIND_REQ:
 		return ("DL_BIND_REQ");
 
 	case DL_BIND_ACK:
 		return ("DL_BIND_ACK");
 
 	case DL_UNBIND_REQ:
 		return ("DL_UNBIND_REQ");
 
 	case DL_OK_ACK:
 		return ("DL_OK_ACK");
 
 	case DL_ERROR_ACK:
 		return ("DL_ERROR_ACK");
 
 	case DL_SUBS_BIND_REQ:
 		return ("DL_SUBS_BIND_REQ");
 
 	case DL_SUBS_BIND_ACK:
 		return ("DL_SUBS_BIND_ACK");
 
 	case DL_UNITDATA_REQ:
 		return ("DL_UNITDATA_REQ");
 
 	case DL_UNITDATA_IND:
 		return ("DL_UNITDATA_IND");
 
 	case DL_UDERROR_IND:
 		return ("DL_UDERROR_IND");
 
 	case DL_UDQOS_REQ:
 		return ("DL_UDQOS_REQ");
 
 	case DL_CONNECT_REQ:
 		return ("DL_CONNECT_REQ");
 
 	case DL_CONNECT_IND:
 		return ("DL_CONNECT_IND");
 
 	case DL_CONNECT_RES:
 		return ("DL_CONNECT_RES");
 
 	case DL_CONNECT_CON:
 		return ("DL_CONNECT_CON");
 
 	case DL_TOKEN_REQ:
 		return ("DL_TOKEN_REQ");
 
 	case DL_TOKEN_ACK:
 		return ("DL_TOKEN_ACK");
 
 	case DL_DISCONNECT_REQ:
 		return ("DL_DISCONNECT_REQ");
 
 	case DL_DISCONNECT_IND:
 		return ("DL_DISCONNECT_IND");
 
 	case DL_RESET_REQ:
 		return ("DL_RESET_REQ");
 
 	case DL_RESET_IND:
 		return ("DL_RESET_IND");
 
 	case DL_RESET_RES:
 		return ("DL_RESET_RES");
 
 	case DL_RESET_CON:
 		return ("DL_RESET_CON");
 
 	default:
 		pcap_snprintf(primbuf, primbufsize, "unknown primitive 0x%x",
 		    prim);
 		return (primbuf);
 	}
 }
 
 static int
 dlbindreq(int fd, bpf_u_int32 sap, char *ebuf)
 {
 
 	dl_bind_req_t	req;
 
 	memset((char *)&req, 0, sizeof(req));
 	req.dl_primitive = DL_BIND_REQ;
 	/* XXX - what if neither of these are defined? */
 #if defined(DL_HP_RAWDLS)
 	req.dl_max_conind = 1;			/* XXX magic number */
 	req.dl_service_mode = DL_HP_RAWDLS;
 #elif defined(DL_CLDLS)
 	req.dl_service_mode = DL_CLDLS;
 #endif
 	req.dl_sap = sap;
 
 	return (send_request(fd, (char *)&req, sizeof(req), "bind", ebuf));
 }
 
 static int
 dlbindack(int fd, char *bufp, char *ebuf, int *uerror)
 {
 
 	return (recv_ack(fd, DL_BIND_ACK_SIZE, "bind", bufp, ebuf, uerror));
 }
 
 static int
 dlokack(int fd, const char *what, char *bufp, char *ebuf)
 {
 
 	return (recv_ack(fd, DL_OK_ACK_SIZE, what, bufp, ebuf, NULL));
 }
 
 
 static int
 dlinforeq(int fd, char *ebuf)
 {
 	dl_info_req_t req;
 
 	req.dl_primitive = DL_INFO_REQ;
 
 	return (send_request(fd, (char *)&req, sizeof(req), "info", ebuf));
 }
 
 static int
 dlinfoack(int fd, char *bufp, char *ebuf)
 {
 
 	return (recv_ack(fd, DL_INFO_ACK_SIZE, "info", bufp, ebuf, NULL));
 }
 
-#ifdef HAVE_DLPI_PASSIVE
+#ifdef HAVE_DL_PASSIVE_REQ_T
 /*
  * Enable DLPI passive mode. We do not care if this request fails, as this
  * indicates the underlying DLPI device does not support link aggregation.
  */
 static void
 dlpassive(int fd, char *ebuf)
 {
 	dl_passive_req_t req;
 	bpf_u_int32 buf[MAXDLBUF];
 
 	req.dl_primitive = DL_PASSIVE_REQ;
 
 	if (send_request(fd, (char *)&req, sizeof(req), "dlpassive", ebuf) == 0)
 	    (void) dlokack(fd, "dlpassive", (char *)buf, ebuf);
 }
 #endif
 
 #ifdef DL_HP_RAWDLS
 /*
  * There's an ack *if* there's an error.
  */
 static int
 dlrawdatareq(int fd, const u_char *datap, int datalen)
 {
 	struct strbuf ctl, data;
 	long buf[MAXDLBUF];	/* XXX - char? */
 	union DL_primitives *dlp;
 	int dlen;
 
 	dlp = MAKE_DL_PRIMITIVES(buf);
 
 	dlp->dl_primitive = DL_HP_RAWDATA_REQ;
 	dlen = DL_HP_RAWDATA_REQ_SIZE;
 
 	/*
 	 * HP's documentation doesn't appear to show us supplying any
 	 * address pointed to by the control part of the message.
 	 * I think that's what raw mode means - you just send the raw
 	 * packet, you don't specify where to send it to, as that's
 	 * implied by the destination address.
 	 */
 	ctl.maxlen = 0;
 	ctl.len = dlen;
 	ctl.buf = (void *)buf;
 
 	data.maxlen = 0;
 	data.len = datalen;
 	data.buf = (void *)datap;
 
 	return (putmsg(fd, &ctl, &data, 0));
 }
 #endif /* DL_HP_RAWDLS */
 
 #if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
 static void
 get_release(char *buf, size_t bufsize, bpf_u_int32 *majorp,
     bpf_u_int32 *minorp, bpf_u_int32 *microp)
 {
 	char *cp;
 
 	*majorp = 0;
 	*minorp = 0;
 	*microp = 0;
 	if (sysinfo(SI_RELEASE, buf, bufsize) < 0) {
 		strlcpy(buf, "?", bufsize);
 		return;
 	}
 	cp = buf;
 	if (!isdigit((unsigned char)*cp))
 		return;
 	*majorp = strtol(cp, &cp, 10);
 	if (*cp++ != '.')
 		return;
 	*minorp =  strtol(cp, &cp, 10);
 	if (*cp++ != '.')
 		return;
 	*microp =  strtol(cp, &cp, 10);
 }
 #endif
 
 #ifdef DL_HP_PPA_REQ
 /*
  * Under HP-UX 10 and HP-UX 11, we can ask for the ppa
  */
 
 
 /*
  * Determine ppa number that specifies ifname.
  *
  * If the "dl_hp_ppa_info_t" doesn't have a "dl_module_id_1" member,
  * the code that's used here is the old code for HP-UX 10.x.
  *
  * However, HP-UX 10.20, at least, appears to have such a member
  * in its "dl_hp_ppa_info_t" structure, so the new code is used.
  * The new code didn't work on an old 10.20 system on which Rick
  * Jones of HP tried it, but with later patches installed, it
  * worked - it appears that the older system had those members but
  * didn't put anything in them, so, if the search by name fails, we
  * do the old search.
  *
  * Rick suggests that making sure your system is "up on the latest
  * lancommon/DLPI/driver patches" is probably a good idea; it'd fix
  * that problem, as well as allowing libpcap to see packets sent
  * from the system on which the libpcap application is being run.
  * (On 10.20, in addition to getting the latest patches, you need
  * to turn the kernel "lanc_outbound_promisc_flag" flag on with ADB;
  * a posting to "comp.sys.hp.hpux" at
  *
  *	http://www.deja.com/[ST_rn=ps]/getdoc.xp?AN=558092266
  *
  * says that, to see the machine's outgoing traffic, you'd need to
  * apply the right patches to your system, and also set that variable
  * with:
 
 echo 'lanc_outbound_promisc_flag/W1' | /usr/bin/adb -w /stand/vmunix /dev/kmem
 
  * which could be put in, for example, "/sbin/init.d/lan".
  *
  * Setting the variable is not necessary on HP-UX 11.x.
  */
 static int
-get_dlpi_ppa(register int fd, register const char *device, register int unit,
-    register char *ebuf)
+get_dlpi_ppa(register int fd, register const char *device, register u_int unit,
+    u_int *ppa, register char *ebuf)
 {
 	register dl_hp_ppa_ack_t *ap;
 	register dl_hp_ppa_info_t *ipstart, *ip;
-	register int i;
+	register u_int i;
 	char dname[100];
 	register u_long majdev;
 	struct stat statbuf;
 	dl_hp_ppa_req_t	req;
 	char buf[MAXDLBUF];
 	char *ppa_data_buf;
 	dl_hp_ppa_ack_t	*dlp;
 	struct strbuf ctl;
 	int flags;
-	int ppa;
 
 	memset((char *)&req, 0, sizeof(req));
 	req.dl_primitive = DL_HP_PPA_REQ;
 
 	memset((char *)buf, 0, sizeof(buf));
 	if (send_request(fd, (char *)&req, sizeof(req), "hpppa", ebuf) < 0)
 		return (PCAP_ERROR);
 
 	ctl.maxlen = DL_HP_PPA_ACK_SIZE;
 	ctl.len = 0;
 	ctl.buf = (char *)buf;
 
 	flags = 0;
 	/*
 	 * DLPI may return a big chunk of data for a DL_HP_PPA_REQ. The normal
 	 * recv_ack will fail because it set the maxlen to MAXDLBUF (8192)
 	 * which is NOT big enough for a DL_HP_PPA_REQ.
 	 *
 	 * This causes libpcap applications to fail on a system with HP-APA
 	 * installed.
 	 *
 	 * To figure out how big the returned data is, we first call getmsg
 	 * to get the small head and peek at the head to get the actual data
 	 * length, and  then issue another getmsg to get the actual PPA data.
 	 */
 	/* get the head first */
 	if (getmsg(fd, &ctl, (struct strbuf *)NULL, &flags) < 0) {
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "get_dlpi_ppa: hpppa getmsg");
+		return (PCAP_ERROR);
+	}
+	if (ctl.len == -1) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "get_dlpi_ppa: hpppa getmsg: %s", pcap_strerror(errno));
+		    "get_dlpi_ppa: hpppa getmsg: control buffer has no data");
 		return (PCAP_ERROR);
 	}
 
 	dlp = (dl_hp_ppa_ack_t *)ctl.buf;
 	if (dlp->dl_primitive != DL_HP_PPA_ACK) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "get_dlpi_ppa: hpppa unexpected primitive ack 0x%x",
 		    (bpf_u_int32)dlp->dl_primitive);
 		return (PCAP_ERROR);
 	}
 
-	if (ctl.len < DL_HP_PPA_ACK_SIZE) {
+	if ((size_t)ctl.len < DL_HP_PPA_ACK_SIZE) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "get_dlpi_ppa: hpppa ack too small (%d < %lu)",
 		     ctl.len, (unsigned long)DL_HP_PPA_ACK_SIZE);
 		return (PCAP_ERROR);
 	}
 
 	/* allocate buffer */
 	if ((ppa_data_buf = (char *)malloc(dlp->dl_length)) == NULL) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "get_dlpi_ppa: hpppa malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "get_dlpi_ppa: hpppa malloc");
 		return (PCAP_ERROR);
 	}
 	ctl.maxlen = dlp->dl_length;
 	ctl.len = 0;
 	ctl.buf = (char *)ppa_data_buf;
 	/* get the data */
 	if (getmsg(fd, &ctl, (struct strbuf *)NULL, &flags) < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "get_dlpi_ppa: hpppa getmsg: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "get_dlpi_ppa: hpppa getmsg");
 		free(ppa_data_buf);
 		return (PCAP_ERROR);
 	}
-	if (ctl.len < dlp->dl_length) {
+	if (ctl.len == -1) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
+		    "get_dlpi_ppa: hpppa getmsg: control buffer has no data");
+		return (PCAP_ERROR);
+	}
+	if ((u_int)ctl.len < dlp->dl_length) {
+		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "get_dlpi_ppa: hpppa ack too small (%d < %lu)",
 		    ctl.len, (unsigned long)dlp->dl_length);
 		free(ppa_data_buf);
 		return (PCAP_ERROR);
 	}
 
 	ap = (dl_hp_ppa_ack_t *)buf;
 	ipstart = (dl_hp_ppa_info_t *)ppa_data_buf;
 	ip = ipstart;
 
-#ifdef HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1
+#ifdef HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1
 	/*
 	 * The "dl_hp_ppa_info_t" structure has a "dl_module_id_1"
 	 * member that should, in theory, contain the part of the
 	 * name for the device that comes before the unit number,
 	 * and should also have a "dl_module_id_2" member that may
 	 * contain an alternate name (e.g., I think Ethernet devices
 	 * have both "lan", for "lanN", and "snap", for "snapN", with
 	 * the former being for Ethernet packets and the latter being
 	 * for 802.3/802.2 packets).
 	 *
 	 * Search for the device that has the specified name and
 	 * instance number.
 	 */
 	for (i = 0; i < ap->dl_count; i++) {
 		if ((strcmp((const char *)ip->dl_module_id_1, device) == 0 ||
 		     strcmp((const char *)ip->dl_module_id_2, device) == 0) &&
 		    ip->dl_instance_num == unit)
 			break;
 
 		ip = (dl_hp_ppa_info_t *)((u_char *)ipstart + ip->dl_next_offset);
 	}
 #else
 	/*
 	 * We don't have that member, so the search is impossible; make it
 	 * look as if the search failed.
 	 */
 	i = ap->dl_count;
 #endif
 
 	if (i == ap->dl_count) {
 		/*
 		 * Well, we didn't, or can't, find the device by name.
 		 *
 		 * HP-UX 10.20, whilst it has "dl_module_id_1" and
 		 * "dl_module_id_2" fields in the "dl_hp_ppa_info_t",
 		 * doesn't seem to fill them in unless the system is
 		 * at a reasonably up-to-date patch level.
 		 *
 		 * Older HP-UX 10.x systems might not have those fields
 		 * at all.
 		 *
 		 * Therefore, we'll search for the entry with the major
 		 * device number of a device with the name "/dev/<dev><unit>",
 		 * if such a device exists, as the old code did.
 		 */
-		pcap_snprintf(dname, sizeof(dname), "/dev/%s%d", device, unit);
+		pcap_snprintf(dname, sizeof(dname), "/dev/%s%u", device, unit);
 		if (stat(dname, &statbuf) < 0) {
-			pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "stat: %s: %s",
-			    dname, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "stat: %s", dname);
 			return (PCAP_ERROR);
 		}
 		majdev = major(statbuf.st_rdev);
 
 		ip = ipstart;
 
 		for (i = 0; i < ap->dl_count; i++) {
 			if (ip->dl_mjr_num == majdev &&
 			    ip->dl_instance_num == unit)
 				break;
 
 			ip = (dl_hp_ppa_info_t *)((u_char *)ipstart + ip->dl_next_offset);
 		}
 	}
 	if (i == ap->dl_count) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "can't find /dev/dlpi PPA for %s%d", device, unit);
+		    "can't find /dev/dlpi PPA for %s%u", device, unit);
 		return (PCAP_ERROR_NO_SUCH_DEVICE);
 	}
 	if (ip->dl_hdw_state == HDW_DEAD) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "%s%d: hardware state: DOWN\n", device, unit);
 		free(ppa_data_buf);
 		return (PCAP_ERROR);
 	}
-	ppa = ip->dl_ppa;
+	*ppa = ip->dl_ppa;
 	free(ppa_data_buf);
-	return (ppa);
+	return (0);
 }
 #endif
 
 #ifdef HAVE_HPUX9
 /*
  * Under HP-UX 9, there is no good way to determine the ppa.
  * So punt and read it from /dev/kmem.
  */
 static struct nlist nl[] = {
 #define NL_IFNET 0
 	{ "ifnet" },
 	{ "" }
 };
 
 static char path_vmunix[] = "/hp-ux";
 
 /* Determine ppa number that specifies ifname */
 static int
-get_dlpi_ppa(register int fd, register const char *ifname, register int unit,
-    register char *ebuf)
+get_dlpi_ppa(register int fd, register const char *ifname, register u_int unit,
+    u_int *ppa, register char *ebuf)
 {
 	register const char *cp;
 	register int kd;
 	void *addr;
 	struct ifnet ifnet;
 	char if_name[sizeof(ifnet.if_name) + 1];
 
 	cp = strrchr(ifname, '/');
 	if (cp != NULL)
 		ifname = cp + 1;
 	if (nlist(path_vmunix, &nl) < 0) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "nlist %s failed",
 		    path_vmunix);
-		return (-1);
+		return (PCAP_ERROR);
 	}
 	if (nl[NL_IFNET].n_value == 0) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
 		    "could't find %s kernel symbol",
 		    nl[NL_IFNET].n_name);
-		return (-1);
+		return (PCAP_ERROR);
 	}
 	kd = open("/dev/kmem", O_RDONLY);
 	if (kd < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "kmem open: %s",
-		    pcap_strerror(errno));
-		return (-1);
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "kmem open");
+		return (PCAP_ERROR);
 	}
 	if (dlpi_kread(kd, nl[NL_IFNET].n_value,
 	    &addr, sizeof(addr), ebuf) < 0) {
 		close(kd);
-		return (-1);
+		return (PCAP_ERROR);
 	}
 	for (; addr != NULL; addr = ifnet.if_next) {
 		if (dlpi_kread(kd, (off_t)addr,
 		    &ifnet, sizeof(ifnet), ebuf) < 0 ||
 		    dlpi_kread(kd, (off_t)ifnet.if_name,
 		    if_name, sizeof(ifnet.if_name), ebuf) < 0) {
 			(void)close(kd);
-			return (-1);
+			return (PCAP_ERROR);
 		}
 		if_name[sizeof(ifnet.if_name)] = '\0';
-		if (strcmp(if_name, ifname) == 0 && ifnet.if_unit == unit)
-			return (ifnet.if_index);
+		if (strcmp(if_name, ifname) == 0 && ifnet.if_unit == unit) {
+			*ppa = ifnet.if_index;
+			return (0);
+		}
 	}
 
 	pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "Can't find %s", ifname);
-	return (-1);
+	return (PCAP_ERROR_NO_SUCH_DEVICE);
 }
 
 static int
 dlpi_kread(register int fd, register off_t addr,
     register void *buf, register u_int len, register char *ebuf)
 {
 	register int cc;
 
 	if (lseek(fd, addr, SEEK_SET) < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "lseek: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "lseek");
 		return (-1);
 	}
 	cc = read(fd, buf, len);
 	if (cc < 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "read: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "read");
 		return (-1);
 	} else if (cc != len) {
 		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "short read (%d != %d)", cc,
 		    len);
 		return (-1);
 	}
 	return (cc);
 }
 #endif
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 #ifdef DL_HP_RAWDLS
 	struct pcap_dlpi *pd;
 #endif
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_dlpi));
 	if (p == NULL)
 		return (NULL);
 
 #ifdef DL_HP_RAWDLS
 	pd = p->priv;
 	pd->send_fd = -1;	/* it hasn't been opened yet */
 #endif
 
 	p->activate_op = pcap_activate_dlpi;
 	return (p);
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-dos.c
===================================================================
--- vendor/libpcap/dist/pcap-dos.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-dos.c	(revision 333789)
@@ -1,1512 +1,1536 @@
 /*
  *  This file is part of DOS-libpcap
  *  Ported to DOS/DOSX by G. Vanem <gvanem@yahoo.no>
  *
  *  pcap-dos.c: Interface to PKTDRVR, NDIS2 and 32-bit pmode
  *              network drivers.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <float.h>
 #include <fcntl.h>
 #include <io.h>
 
 #if defined(USE_32BIT_DRIVERS)
   #include "msdos/pm_drvr/pmdrvr.h"
   #include "msdos/pm_drvr/pci.h"
   #include "msdos/pm_drvr/bios32.h"
   #include "msdos/pm_drvr/module.h"
   #include "msdos/pm_drvr/3c501.h"
   #include "msdos/pm_drvr/3c503.h"
   #include "msdos/pm_drvr/3c509.h"
   #include "msdos/pm_drvr/3c59x.h"
   #include "msdos/pm_drvr/3c515.h"
   #include "msdos/pm_drvr/3c90x.h"
   #include "msdos/pm_drvr/3c575_cb.h"
   #include "msdos/pm_drvr/ne.h"
   #include "msdos/pm_drvr/wd.h"
   #include "msdos/pm_drvr/accton.h"
   #include "msdos/pm_drvr/cs89x0.h"
   #include "msdos/pm_drvr/rtl8139.h"
   #include "msdos/pm_drvr/ne2k-pci.h"
 #endif
 
 #include "pcap.h"
 #include "pcap-dos.h"
 #include "pcap-int.h"
 #include "msdos/pktdrvr.h"
 
 #ifdef USE_NDIS2
 #include "msdos/ndis2.h"
 #endif
 
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_ether.h>
 #include <net/if_packe.h>
 #include <tcp.h>
 
 #if defined(USE_32BIT_DRIVERS)
   #define FLUSHK()       do { _printk_safe = 1; _printk_flush(); } while (0)
   #define NDIS_NEXT_DEV  &rtl8139_dev
 
   static char *rx_pool = NULL;
   static void init_32bit (void);
 
   static int  pktq_init     (struct rx_ringbuf *q, int size, int num, char *pool);
   static int  pktq_check    (struct rx_ringbuf *q);
   static int  pktq_inc_out  (struct rx_ringbuf *q);
   static int  pktq_in_index (struct rx_ringbuf *q) LOCKED_FUNC;
   static void pktq_clear    (struct rx_ringbuf *q) LOCKED_FUNC;
 
   static struct rx_elem *pktq_in_elem  (struct rx_ringbuf *q) LOCKED_FUNC;
   static struct rx_elem *pktq_out_elem (struct rx_ringbuf *q);
 
 #else
   #define FLUSHK()      ((void)0)
   #define NDIS_NEXT_DEV  NULL
 #endif
 
 /*
  * Internal variables/functions in Watt-32
  */
 extern WORD  _pktdevclass;
 extern BOOL  _eth_is_init;
 extern int   _w32_dynamic_host;
 extern int   _watt_do_exit;
 extern int   _watt_is_init;
 extern int   _w32__bootp_on, _w32__dhcp_on, _w32__rarp_on, _w32__do_mask_req;
 extern void (*_w32_usr_post_init) (void);
 extern void (*_w32_print_hook)();
 
 extern void dbug_write (const char *);  /* Watt-32 lib, pcdbug.c */
 extern int  pkt_get_mtu (void);
 
 static int ref_count = 0;
 
 static u_long mac_count    = 0;
 static u_long filter_count = 0;
 
 static volatile BOOL exc_occured = 0;
 
 static struct device *handle_to_device [20];
 
 static int  pcap_activate_dos (pcap_t *p);
 static int  pcap_read_dos (pcap_t *p, int cnt, pcap_handler callback,
                            u_char *data);
 static void pcap_cleanup_dos (pcap_t *p);
 static int  pcap_stats_dos (pcap_t *p, struct pcap_stat *ps);
 static int  pcap_sendpacket_dos (pcap_t *p, const void *buf, size_t len);
 static int  pcap_setfilter_dos (pcap_t *p, struct bpf_program *fp);
 
 static int  ndis_probe (struct device *dev);
 static int  pkt_probe  (struct device *dev);
 
 static void close_driver (void);
 static int  init_watt32 (struct pcap *pcap, const char *dev_name, char *err_buf);
 static int  first_init (const char *name, char *ebuf, int promisc);
 
 static void watt32_recv_hook (u_char *dummy, const struct pcap_pkthdr *pcap,
                               const u_char *buf);
 
 /*
  * These are the device we always support
  */
 static struct device ndis_dev = {
               "ndis",
               "NDIS2 LanManager",
               0,
               0,0,0,0,0,0,
               NDIS_NEXT_DEV,  /* NULL or a 32-bit device */
               ndis_probe
             };
 
 static struct device pkt_dev = {
               "pkt",
               "Packet-Driver",
               0,
               0,0,0,0,0,0,
               &ndis_dev,
               pkt_probe
             };
 
 static struct device *get_device (int fd)
 {
   if (fd <= 0 || fd >= sizeof(handle_to_device)/sizeof(handle_to_device[0]))
      return (NULL);
   return handle_to_device [fd-1];
 }
 
 /*
  * Private data for capturing on MS-DOS.
  */
 struct pcap_dos {
 	void (*wait_proc)(void); /* call proc while waiting */
 	struct pcap_stat stat;
 };
 
 pcap_t *pcap_create_interface (const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_dos));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_dos;
 	return (p);
 }
 
 /*
  * Open MAC-driver with name 'device_name' for live capture of
  * network packets.
  */
 static int pcap_activate_dos (pcap_t *pcap)
 {
   if (pcap->opt.rfmon) {
     /*
      * No monitor mode on DOS.
      */
     return (PCAP_ERROR_RFMON_NOTSUP);
   }
 
+  /*
+   * Turn a negative snapshot value (invalid), a snapshot value of
+   * 0 (unspecified), or a value bigger than the normal maximum
+   * value, into the maximum allowed value.
+   *
+   * If some application really *needs* a bigger snapshot
+   * length, we should just increase MAXIMUM_SNAPLEN.
+   */
+  if (pcap->snapshot <= 0 || pcap->snapshot > MAXIMUM_SNAPLEN)
+    pcap->snapshot = MAXIMUM_SNAPLEN;
+
   if (pcap->snapshot < ETH_MIN+8)
       pcap->snapshot = ETH_MIN+8;
 
   if (pcap->snapshot > ETH_MAX)   /* silently accept and truncate large MTUs */
       pcap->snapshot = ETH_MAX;
 
   pcap->linktype          = DLT_EN10MB;  /* !! */
   pcap->cleanup_op        = pcap_cleanup_dos;
   pcap->read_op           = pcap_read_dos;
   pcap->stats_op          = pcap_stats_dos;
   pcap->inject_op         = pcap_sendpacket_dos;
   pcap->setfilter_op      = pcap_setfilter_dos;
   pcap->setdirection_op   = NULL;  /* Not implemented.*/
   pcap->fd                = ++ref_count;
 
   pcap->bufsize = ETH_MAX+100;     /* add some margin */
   pcap->buffer = calloc (pcap->bufsize, 1);
 
   if (pcap->fd == 1)  /* first time we're called */
   {
     if (!init_watt32(pcap, pcap->opt.device, pcap->errbuf) ||
         !first_init(pcap->opt.device, pcap->errbuf, pcap->opt.promisc))
     {
+      /* XXX - free pcap->buffer? */
       return (PCAP_ERROR);
     }
     atexit (close_driver);
   }
   else if (stricmp(active_dev->name,pcap->opt.device))
   {
     pcap_snprintf (pcap->errbuf, PCAP_ERRBUF_SIZE,
                    "Cannot use different devices simultaneously "
                    "(`%s' vs. `%s')", active_dev->name, pcap->opt.device);
+    /* XXX - free pcap->buffer? */
     return (PCAP_ERROR);
   }
   handle_to_device [pcap->fd-1] = active_dev;
   return (0);
 }
 
 /*
  * Poll the receiver queue and call the pcap callback-handler
  * with the packet.
  */
 static int
 pcap_read_one (pcap_t *p, pcap_handler callback, u_char *data)
 {
   struct pcap_dos *pd = p->priv;
   struct pcap_pkthdr pcap;
   struct timeval     now, expiry = { 0,0 };
   int    rx_len = 0;
 
   if (p->opt.timeout > 0)
   {
     gettimeofday2 (&now, NULL);
     expiry.tv_usec = now.tv_usec + 1000UL * p->opt.timeout;
     expiry.tv_sec  = now.tv_sec;
     while (expiry.tv_usec >= 1000000L)
     {
       expiry.tv_usec -= 1000000L;
       expiry.tv_sec++;
     }
   }
 
   while (!exc_occured)
   {
     volatile struct device *dev; /* might be reset by sig_handler */
 
     dev = get_device (p->fd);
     if (!dev)
        break;
 
     PCAP_ASSERT (dev->copy_rx_buf || dev->peek_rx_buf);
     FLUSHK();
 
     /* If driver has a zero-copy receive facility, peek at the queue,
      * filter it, do the callback and release the buffer.
      */
     if (dev->peek_rx_buf)
     {
       PCAP_ASSERT (dev->release_rx_buf);
       rx_len = (*dev->peek_rx_buf) (&p->buffer);
     }
     else
     {
       rx_len = (*dev->copy_rx_buf) (p->buffer, p->snapshot);
     }
 
     if (rx_len > 0)  /* got a packet */
     {
       mac_count++;
 
       FLUSHK();
 
       pcap.caplen = min (rx_len, p->snapshot);
       pcap.len    = rx_len;
 
       if (callback &&
           (!p->fcode.bf_insns || bpf_filter(p->fcode.bf_insns, p->buffer, pcap.len, pcap.caplen)))
       {
         filter_count++;
 
         /* Fix-me!! Should be time of arrival. Not time of
          * capture.
          */
         gettimeofday2 (&pcap.ts, NULL);
         (*callback) (data, &pcap, p->buffer);
       }
 
       if (dev->release_rx_buf)
         (*dev->release_rx_buf) (p->buffer);
 
       if (pcap_pkt_debug > 0)
       {
         if (callback == watt32_recv_hook)
              dbug_write ("pcap_recv_hook\n");
         else dbug_write ("pcap_read_op\n");
       }
       FLUSHK();
       return (1);
     }
 
     /* Has "pcap_breakloop()" been called?
      */
     if (p->break_loop) {
       /*
        * Yes - clear the flag that indicates that it
        * has, and return -2 to indicate that we were
        * told to break out of the loop.
        */
       p->break_loop = 0;
       return (-2);
     }
 
     /* If not to wait for a packet or pcap_cleanup_dos() called from
      * e.g. SIGINT handler, exit loop now.
      */
     if (p->opt.timeout <= 0 || (volatile int)p->fd <= 0)
        break;
 
     gettimeofday2 (&now, NULL);
 
     if (timercmp(&now, &expiry, >))
        break;
 
 #ifndef DJGPP
     kbhit();    /* a real CPU hog */
 #endif
 
     if (pd->wait_proc)
       (*pd->wait_proc)();     /* call yield func */
   }
 
   if (rx_len < 0)            /* receive error */
   {
     pd->stat.ps_drop++;
 #ifdef USE_32BIT_DRIVERS
     if (pcap_pkt_debug > 1)
        printk ("pkt-err %s\n", pktInfo.error);
 #endif
     return (-1);
   }
   return (0);
 }
 
 static int
 pcap_read_dos (pcap_t *p, int cnt, pcap_handler callback, u_char *data)
 {
   int rc, num = 0;
 
   while (num <= cnt || PACKET_COUNT_IS_UNLIMITED(cnt))
   {
     if (p->fd <= 0)
        return (-1);
     rc = pcap_read_one (p, callback, data);
     if (rc > 0)
        num++;
     if (rc < 0)
        break;
     _w32_os_yield();  /* allow SIGINT generation, yield to Win95/NT */
   }
   return (num);
 }
 
 /*
  * Return network statistics
  */
 static int pcap_stats_dos (pcap_t *p, struct pcap_stat *ps)
 {
   struct net_device_stats *stats;
   struct pcap_dos         *pd;
   struct device           *dev = p ? get_device(p->fd) : NULL;
 
   if (!dev)
   {
     strcpy (p->errbuf, "illegal pcap handle");
     return (-1);
   }
 
   if (!dev->get_stats || (stats = (*dev->get_stats)(dev)) == NULL)
   {
     strcpy (p->errbuf, "device statistics not available");
     return (-1);
   }
 
   FLUSHK();
 
   pd = p->priv;
   pd->stat.ps_recv   = stats->rx_packets;
   pd->stat.ps_drop  += stats->rx_missed_errors;
   pd->stat.ps_ifdrop = stats->rx_dropped +  /* queue full */
                          stats->rx_errors;    /* HW errors */
   if (ps)
      *ps = pd->stat;
 
   return (0);
 }
 
 /*
  * Return detailed network/device statistics.
  * May be called after 'dev->close' is called.
  */
 int pcap_stats_ex (pcap_t *p, struct pcap_stat_ex *se)
 {
   struct device *dev = p ? get_device (p->fd) : NULL;
 
   if (!dev || !dev->get_stats)
   {
     strlcpy (p->errbuf, "detailed device statistics not available",
              PCAP_ERRBUF_SIZE);
     return (-1);
   }
 
   if (!strnicmp(dev->name,"pkt",3))
   {
     strlcpy (p->errbuf, "pktdrvr doesn't have detailed statistics",
              PCAP_ERRBUF_SIZE);
     return (-1);
   }
   memcpy (se, (*dev->get_stats)(dev), sizeof(*se));
   return (0);
 }
 
 /*
  * Simply store the filter-code for the pcap_read_dos() callback
  * Some day the filter-code could be handed down to the active
  * device (pkt_rx1.s or 32-bit device interrupt handler).
  */
 static int pcap_setfilter_dos (pcap_t *p, struct bpf_program *fp)
 {
   if (!p)
      return (-1);
   p->fcode = *fp;
   return (0);
 }
 
 /*
  * Return # of packets received in pcap_read_dos()
  */
 u_long pcap_mac_packets (void)
 {
   return (mac_count);
 }
 
 /*
  * Return # of packets passed through filter in pcap_read_dos()
  */
 u_long pcap_filter_packets (void)
 {
   return (filter_count);
 }
 
 /*
  * Close pcap device. Not called for offline captures.
  */
 static void pcap_cleanup_dos (pcap_t *p)
 {
   struct pcap_dos *pd;
 
   if (!exc_occured)
   {
     pd = p->priv;
     if (pcap_stats(p,NULL) < 0)
        pd->stat.ps_drop = 0;
     if (!get_device(p->fd))
        return;
 
     handle_to_device [p->fd-1] = NULL;
     p->fd = 0;
     if (ref_count > 0)
         ref_count--;
     if (ref_count > 0)
        return;
   }
   close_driver();
+  /* XXX - call pcap_cleanup_live_common? */
 }
 
 /*
  * Return the name of the 1st network interface,
  * or NULL if none can be found.
  */
 char *pcap_lookupdev (char *ebuf)
 {
   struct device *dev;
 
 #ifdef USE_32BIT_DRIVERS
   init_32bit();
 #endif
 
   for (dev = (struct device*)dev_base; dev; dev = dev->next)
   {
     PCAP_ASSERT (dev->probe);
 
     if ((*dev->probe)(dev))
     {
       FLUSHK();
       probed_dev = (struct device*) dev; /* remember last probed device */
       return (char*) dev->name;
     }
   }
 
   if (ebuf)
      strcpy (ebuf, "No driver found");
   return (NULL);
 }
 
 /*
  * Gets localnet & netmask from Watt-32.
  */
 int pcap_lookupnet (const char *device, bpf_u_int32 *localnet,
                     bpf_u_int32 *netmask, char *errbuf)
 {
   DWORD mask, net;
 
   if (!_watt_is_init)
   {
     strcpy (errbuf, "pcap_open_offline() or pcap_activate() must be "
                     "called first");
     return (-1);
   }
 
   mask  = _w32_sin_mask;
   net = my_ip_addr & mask;
   if (net == 0)
   {
     if (IN_CLASSA(*netmask))
        net = IN_CLASSA_NET;
     else if (IN_CLASSB(*netmask))
        net = IN_CLASSB_NET;
     else if (IN_CLASSC(*netmask))
        net = IN_CLASSC_NET;
     else
     {
       pcap_snprintf (errbuf, PCAP_ERRBUF_SIZE, "inet class for 0x%lx unknown", mask);
       return (-1);
     }
   }
   *localnet = htonl (net);
   *netmask = htonl (mask);
 
   ARGSUSED (device);
   return (0);
 }
 
 /*
  * Get a list of all interfaces that are present and that we probe okay.
  * Returns -1 on error, 0 otherwise.
- * The list, as returned through "alldevsp", may be NULL if no interfaces
- * were up and could be opened.
+ * The list may be NULL epty if no interfaces were up and could be opened.
  */
-int pcap_platform_finddevs  (pcap_if_t **alldevsp, char *errbuf)
+int pcap_platform_finddevs  (pcap_if_list_t *devlistp, char *errbuf)
 {
   struct device     *dev;
+  pcap_if_t *curdev;
+#if 0   /* Pkt drivers should have no addresses */
   struct sockaddr_in sa_ll_1, sa_ll_2;
   struct sockaddr   *addr, *netmask, *broadaddr, *dstaddr;
-  pcap_if_t *devlist = NULL;
+#endif
   int       ret = 0;
-  size_t    addr_size = sizeof(*addr);
+  int       found = 0;
 
   for (dev = (struct device*)dev_base; dev; dev = dev->next)
   {
     PCAP_ASSERT (dev->probe);
 
     if (!(*dev->probe)(dev))
        continue;
 
     PCAP_ASSERT (dev->close);  /* set by probe routine */
     FLUSHK();
     (*dev->close) (dev);
 
+    /*
+     * XXX - find out whether it's up or running?  Does that apply here?
+     * Can we find out if anything's plugged into the adapter, if it's
+     * a wired device, and set PCAP_IF_CONNECTION_STATUS_CONNECTED
+     * or PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
+     */
+    if ((curdev = add_dev(devlistp, dev->name, 0,
+                dev->long_name, errbuf)) == NULL)
+    {
+      ret = -1;
+      break;
+    }
+    found = 1;
+#if 0   /* Pkt drivers should have no addresses */
     memset (&sa_ll_1, 0, sizeof(sa_ll_1));
     memset (&sa_ll_2, 0, sizeof(sa_ll_2));
     sa_ll_1.sin_family = AF_INET;
     sa_ll_2.sin_family = AF_INET;
 
     addr      = (struct sockaddr*) &sa_ll_1;
     netmask   = (struct sockaddr*) &sa_ll_1;
     dstaddr   = (struct sockaddr*) &sa_ll_1;
     broadaddr = (struct sockaddr*) &sa_ll_2;
     memset (&sa_ll_2.sin_addr, 0xFF, sizeof(sa_ll_2.sin_addr));
 
-    if (pcap_add_if(&devlist, dev->name, dev->flags,
-                    dev->long_name, errbuf) < 0)
+    if (add_addr_to_dev(curdev, addr, sizeof(*addr),
+                        netmask, sizeof(*netmask),
+                        broadaddr, sizeof(*broadaddr),
+                        dstaddr, sizeof(*dstaddr), errbuf) < 0)
     {
       ret = -1;
       break;
     }
-#if 0   /* Pkt drivers should have no addresses */
-    if (add_addr_to_iflist(&devlist, dev->name, dev->flags, addr, addr_size,
-                           netmask, addr_size, broadaddr, addr_size,
-                           dstaddr, addr_size, errbuf) < 0)
-    {
-      ret = -1;
-      break;
-    }
 #endif
   }
 
-  if (devlist && ret < 0)
-  {
-    pcap_freealldevs (devlist);
-    devlist = NULL;
-  }
-  else
-  if (!devlist)
+  if (ret == 0 && !found)
      strcpy (errbuf, "No drivers found");
 
-  *alldevsp = devlist;
   return (ret);
 }
 
 /*
  * pcap_assert() is mainly used for debugging
  */
 void pcap_assert (const char *what, const char *file, unsigned line)
 {
   FLUSHK();
   fprintf (stderr, "%s (%u): Assertion \"%s\" failed\n",
            file, line, what);
   close_driver();
   _exit (-1);
 }
 
 /*
  * For pcap_offline_read(): wait and yield between printing packets
  * to simulate the pace packets where actually recorded.
  */
 void pcap_set_wait (pcap_t *p, void (*yield)(void), int wait)
 {
   if (p)
   {
     struct pcap_dos *pd = p->priv;
 
     pd->wait_proc  = yield;
     p->opt.timeout = wait;
   }
 }
 
 /*
  * Initialise a named network device.
  */
 static struct device *
 open_driver (const char *dev_name, char *ebuf, int promisc)
 {
   struct device *dev;
 
   for (dev = (struct device*)dev_base; dev; dev = dev->next)
   {
     PCAP_ASSERT (dev->name);
 
     if (strcmp (dev_name,dev->name))
        continue;
 
     if (!probed_dev)   /* user didn't call pcap_lookupdev() first */
     {
       PCAP_ASSERT (dev->probe);
 
       if (!(*dev->probe)(dev))    /* call the xx_probe() function */
       {
         pcap_snprintf (ebuf, PCAP_ERRBUF_SIZE, "failed to detect device `%s'", dev_name);
         return (NULL);
       }
       probed_dev = dev;  /* device is probed okay and may be used */
     }
     else if (dev != probed_dev)
     {
       goto not_probed;
     }
 
     FLUSHK();
 
     /* Select what traffic to receive
      */
     if (promisc)
          dev->flags |=  (IFF_ALLMULTI | IFF_PROMISC);
     else dev->flags &= ~(IFF_ALLMULTI | IFF_PROMISC);
 
     PCAP_ASSERT (dev->open);
 
     if (!(*dev->open)(dev))
     {
       pcap_snprintf (ebuf, PCAP_ERRBUF_SIZE, "failed to activate device `%s'", dev_name);
       if (pktInfo.error && !strncmp(dev->name,"pkt",3))
       {
         strcat (ebuf, ": ");
         strcat (ebuf, pktInfo.error);
       }
       return (NULL);
     }
 
     /* Some devices need this to operate in promiscous mode
      */
     if (promisc && dev->set_multicast_list)
        (*dev->set_multicast_list) (dev);
 
     active_dev = dev;   /* remember our active device */
     break;
   }
 
   /* 'dev_name' not matched in 'dev_base' list.
    */
   if (!dev)
   {
     pcap_snprintf (ebuf, PCAP_ERRBUF_SIZE, "device `%s' not supported", dev_name);
     return (NULL);
   }
 
 not_probed:
   if (!probed_dev)
   {
     pcap_snprintf (ebuf, PCAP_ERRBUF_SIZE, "device `%s' not probed", dev_name);
     return (NULL);
   }
   return (dev);
 }
 
 /*
  * Deinitialise MAC driver.
  * Set receive mode back to default mode.
  */
 static void close_driver (void)
 {
   /* !!todo: loop over all 'handle_to_device[]' ? */
   struct device *dev = active_dev;
 
   if (dev && dev->close)
   {
     (*dev->close) (dev);
     FLUSHK();
   }
 
   active_dev = NULL;
 
 #ifdef USE_32BIT_DRIVERS
   if (rx_pool)
   {
     k_free (rx_pool);
     rx_pool = NULL;
   }
   if (dev)
      pcibios_exit();
 #endif
 }
 
 
 #ifdef __DJGPP__
 static void setup_signals (void (*handler)(int))
 {
   signal (SIGSEGV,handler);
   signal (SIGILL, handler);
   signal (SIGFPE, handler);
 }
 
 static void exc_handler (int sig)
 {
 #ifdef USE_32BIT_DRIVERS
   if (active_dev->irq > 0)    /* excludes IRQ 0 */
   {
     disable_irq (active_dev->irq);
     irq_eoi_cmd (active_dev->irq);
     _printk_safe = 1;
   }
 #endif
 
   switch (sig)
   {
     case SIGSEGV:
          fputs ("Catching SIGSEGV.\n", stderr);
          break;
     case SIGILL:
          fputs ("Catching SIGILL.\n", stderr);
          break;
     case SIGFPE:
          _fpreset();
          fputs ("Catching SIGFPE.\n", stderr);
          break;
     default:
          fprintf (stderr, "Catching signal %d.\n", sig);
   }
   exc_occured = 1;
   close_driver();
 }
 #endif  /* __DJGPP__ */
 
 
 /*
  * Open the pcap device for the first client calling pcap_activate()
  */
 static int first_init (const char *name, char *ebuf, int promisc)
 {
   struct device *dev;
 
 #ifdef USE_32BIT_DRIVERS
   rx_pool = k_calloc (RECEIVE_BUF_SIZE, RECEIVE_QUEUE_SIZE);
   if (!rx_pool)
   {
     strcpy (ebuf, "Not enough memory (Rx pool)");
     return (0);
   }
 #endif
 
 #ifdef __DJGPP__
   setup_signals (exc_handler);
 #endif
 
 #ifdef USE_32BIT_DRIVERS
   init_32bit();
 #endif
 
   dev = open_driver (name, ebuf, promisc);
   if (!dev)
   {
 #ifdef USE_32BIT_DRIVERS
     k_free (rx_pool);
     rx_pool = NULL;
 #endif
 
 #ifdef __DJGPP__
     setup_signals (SIG_DFL);
 #endif
     return (0);
   }
 
 #ifdef USE_32BIT_DRIVERS
   /*
    * If driver is NOT a 16-bit "pkt/ndis" driver (having a 'copy_rx_buf'
    * set in it's probe handler), initialise near-memory ring-buffer for
    * the 32-bit device.
    */
   if (dev->copy_rx_buf == NULL)
   {
     dev->get_rx_buf     = get_rxbuf;
     dev->peek_rx_buf    = peek_rxbuf;
     dev->release_rx_buf = release_rxbuf;
     pktq_init (&dev->queue, RECEIVE_BUF_SIZE, RECEIVE_QUEUE_SIZE, rx_pool);
   }
 #endif
   return (1);
 }
 
 #ifdef USE_32BIT_DRIVERS
 static void init_32bit (void)
 {
   static int init_pci = 0;
 
   if (!_printk_file)
      _printk_init (64*1024, NULL); /* calls atexit(printk_exit) */
 
   if (!init_pci)
      (void)pci_init();             /* init BIOS32+PCI interface */
   init_pci = 1;
 }
 #endif
 
 
 /*
  * Hook functions for using Watt-32 together with pcap
  */
 static char rxbuf [ETH_MAX+100]; /* rx-buffer with some margin */
 static WORD etype;
 static pcap_t pcap_save;
 
 static void watt32_recv_hook (u_char *dummy, const struct pcap_pkthdr *pcap,
                               const u_char *buf)
 {
   /* Fix me: assumes Ethernet II only */
   struct ether_header *ep = (struct ether_header*) buf;
 
   memcpy (rxbuf, buf, pcap->caplen);
   etype = ep->ether_type;
   ARGSUSED (dummy);
 }
 
 #if (WATTCP_VER >= 0x0224)
 /*
  * This function is used by Watt-32 to poll for a packet.
  * i.e. it's set to bypass _eth_arrived()
  */
 static void *pcap_recv_hook (WORD *type)
 {
   int len = pcap_read_dos (&pcap_save, 1, watt32_recv_hook, NULL);
 
   if (len < 0)
      return (NULL);
 
   *type = etype;
   return (void*) &rxbuf;
 }
 
 /*
  * This function is called by Watt-32 (via _eth_xmit_hook).
  * If dbug_init() was called, we should trace packets sent.
  */
 static int pcap_xmit_hook (const void *buf, unsigned len)
 {
   int rc = 0;
 
   if (pcap_pkt_debug > 0)
      dbug_write ("pcap_xmit_hook: ");
 
   if (active_dev && active_dev->xmit)
      if ((*active_dev->xmit) (active_dev, buf, len) > 0)
         rc = len;
 
   if (pcap_pkt_debug > 0)
      dbug_write (rc ? "ok\n" : "fail\n");
   return (rc);
 }
 #endif
 
 static int pcap_sendpacket_dos (pcap_t *p, const void *buf, size_t len)
 {
   struct device *dev = p ? get_device(p->fd) : NULL;
 
   if (!dev || !dev->xmit)
      return (-1);
   return (*dev->xmit) (dev, buf, len);
 }
 
 /*
  * This function is called by Watt-32 in tcp_post_init().
  * We should prevent Watt-32 from using BOOTP/DHCP/RARP etc.
  */
 static void (*prev_post_hook) (void);
 
 static void pcap_init_hook (void)
 {
   _w32__bootp_on = _w32__dhcp_on = _w32__rarp_on = 0;
   _w32__do_mask_req = 0;
   _w32_dynamic_host = 0;
   if (prev_post_hook)
     (*prev_post_hook)();
 }
 
 /*
  * Supress PRINT message from Watt-32's sock_init()
  */
 static void null_print (void) {}
 
 /*
  * To use features of Watt-32 (netdb functions and socket etc.)
  * we must call sock_init(). But we set various hooks to prevent
  * using normal PKTDRVR functions in pcpkt.c. This should hopefully
  * make Watt-32 and pcap co-operate.
  */
 static int init_watt32 (struct pcap *pcap, const char *dev_name, char *err_buf)
 {
   char *env;
   int   rc, MTU, has_ip_addr;
   int   using_pktdrv = 1;
 
   /* If user called sock_init() first, we need to reinit in
    * order to open debug/trace-file properly
    */
   if (_watt_is_init)
      sock_exit();
 
   env = getenv ("PCAP_TRACE");
   if (env && atoi(env) > 0 &&
       pcap_pkt_debug < 0)   /* if not already set */
   {
     dbug_init();
     pcap_pkt_debug = atoi (env);
   }
 
   _watt_do_exit      = 0;    /* prevent sock_init() calling exit() */
   prev_post_hook     = _w32_usr_post_init;
   _w32_usr_post_init = pcap_init_hook;
   _w32_print_hook    = null_print;
 
   if (dev_name && strncmp(dev_name,"pkt",3))
      using_pktdrv = FALSE;
 
   rc = sock_init();
   has_ip_addr = (rc != 8);  /* IP-address assignment failed */
 
   /* if pcap is using a 32-bit driver w/o a pktdrvr loaded, we
    * just pretend Watt-32 is initialised okay.
    *
    * !! fix-me: The Watt-32 config isn't done if no pktdrvr
    *            was found. In that case my_ip_addr + sin_mask
    *            have default values. Should be taken from another
    *            ini-file/environment in any case (ref. tcpdump.ini)
    */
   _watt_is_init = 1;
 
   if (!using_pktdrv || !has_ip_addr)  /* for now .... */
   {
     static const char myip[] = "192.168.0.1";
     static const char mask[] = "255.255.255.0";
 
     printf ("Just guessing, using IP %s and netmask %s\n", myip, mask);
     my_ip_addr    = aton (myip);
     _w32_sin_mask = aton (mask);
   }
   else if (rc && using_pktdrv)
   {
     pcap_snprintf (err_buf, PCAP_ERRBUF_SIZE, "sock_init() failed, code %d", rc);
     return (0);
   }
 
   /* Set recv-hook for peeking in _eth_arrived().
    */
 #if (WATTCP_VER >= 0x0224)
   _eth_recv_hook = pcap_recv_hook;
   _eth_xmit_hook = pcap_xmit_hook;
 #endif
 
   /* Free the pkt-drvr handle allocated in pkt_init().
    * The above hooks should thus use the handle reopened in open_driver()
    */
   if (using_pktdrv)
   {
     _eth_release();
 /*  _eth_is_init = 1; */  /* hack to get Rx/Tx-hooks in Watt-32 working */
   }
 
   memcpy (&pcap_save, pcap, sizeof(pcap_save));
   MTU = pkt_get_mtu();
   pcap_save.fcode.bf_insns = NULL;
   pcap_save.linktype       = _eth_get_hwtype (NULL, NULL);
   pcap_save.snapshot       = MTU > 0 ? MTU : ETH_MAX; /* assume 1514 */
 
 #if 1
   /* prevent use of resolve() and resolve_ip()
    */
   last_nameserver = 0;
 #endif
   return (1);
 }
 
 int EISA_bus = 0;  /* Where is natural place for this? */
 
 /*
  * Application config hooks to set various driver parameters.
  */
 
 static const struct config_table debug_tab[] = {
             { "PKT.DEBUG",       ARG_ATOI,   &pcap_pkt_debug    },
             { "PKT.VECTOR",      ARG_ATOX_W, NULL               },
             { "NDIS.DEBUG",      ARG_ATOI,   NULL               },
 #ifdef USE_32BIT_DRIVERS
             { "3C503.DEBUG",     ARG_ATOI,   &ei_debug          },
             { "3C503.IO_BASE",   ARG_ATOX_W, &el2_dev.base_addr },
             { "3C503.MEMORY",    ARG_ATOX_W, &el2_dev.mem_start },
             { "3C503.IRQ",       ARG_ATOI,   &el2_dev.irq       },
             { "3C505.DEBUG",     ARG_ATOI,   NULL               },
             { "3C505.BASE",      ARG_ATOX_W, NULL               },
             { "3C507.DEBUG",     ARG_ATOI,   NULL               },
             { "3C509.DEBUG",     ARG_ATOI,   &el3_debug         },
             { "3C509.ILOOP",     ARG_ATOI,   &el3_max_loop      },
             { "3C529.DEBUG",     ARG_ATOI,   NULL               },
             { "3C575.DEBUG",     ARG_ATOI,   &debug_3c575       },
             { "3C59X.DEBUG",     ARG_ATOI,   &vortex_debug      },
             { "3C59X.IFACE0",    ARG_ATOI,   &vortex_options[0] },
             { "3C59X.IFACE1",    ARG_ATOI,   &vortex_options[1] },
             { "3C59X.IFACE2",    ARG_ATOI,   &vortex_options[2] },
             { "3C59X.IFACE3",    ARG_ATOI,   &vortex_options[3] },
             { "3C90X.DEBUG",     ARG_ATOX_W, &tc90xbc_debug     },
             { "ACCT.DEBUG",      ARG_ATOI,   &ethpk_debug       },
             { "CS89.DEBUG",      ARG_ATOI,   &cs89_debug        },
             { "RTL8139.DEBUG",   ARG_ATOI,   &rtl8139_debug     },
         /*  { "RTL8139.FDUPLEX", ARG_ATOI,   &rtl8139_options   }, */
             { "SMC.DEBUG",       ARG_ATOI,   &ei_debug          },
         /*  { "E100.DEBUG",      ARG_ATOI,   &e100_debug        }, */
             { "PCI.DEBUG",       ARG_ATOI,   &pci_debug         },
             { "BIOS32.DEBUG",    ARG_ATOI,   &bios32_debug      },
             { "IRQ.DEBUG",       ARG_ATOI,   &irq_debug         },
             { "TIMER.IRQ",       ARG_ATOI,   &timer_irq         },
 #endif
             { NULL }
           };
 
 /*
  * pcap_config_hook() is an extension to application's config
  * handling. Uses Watt-32's config-table function.
  */
 int pcap_config_hook (const char *keyword, const char *value)
 {
   return parse_config_table (debug_tab, NULL, keyword, value);
 }
 
 /*
  * Linked list of supported devices
  */
 struct device       *active_dev = NULL;      /* the device we have opened */
 struct device       *probed_dev = NULL;      /* the device we have probed */
 const struct device *dev_base   = &pkt_dev;  /* list of network devices */
 
 /*
  * PKTDRVR device functions
  */
 int pcap_pkt_debug = -1;
 
 static void pkt_close (struct device *dev)
 {
   BOOL okay = PktExitDriver();
 
   if (pcap_pkt_debug > 1)
      fprintf (stderr, "pkt_close(): %d\n", okay);
 
   if (dev->priv)
      free (dev->priv);
   dev->priv = NULL;
 }
 
 static int pkt_open (struct device *dev)
 {
   PKT_RX_MODE mode;
 
   if (dev->flags & IFF_PROMISC)
        mode = PDRX_ALL_PACKETS;
   else mode = PDRX_BROADCAST;
 
   if (!PktInitDriver(mode))
      return (0);
 
   PktResetStatistics (pktInfo.handle);
   PktQueueBusy (FALSE);
   return (1);
 }
 
 static int pkt_xmit (struct device *dev, const void *buf, int len)
 {
   struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
 
   if (pcap_pkt_debug > 0)
      dbug_write ("pcap_xmit\n");
 
   if (!PktTransmit(buf,len))
   {
     stats->tx_errors++;
     return (0);
   }
   return (len);
 }
 
 static void *pkt_stats (struct device *dev)
 {
   struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
 
   if (!stats || !PktSessStatistics(pktInfo.handle))
      return (NULL);
 
   stats->rx_packets       = pktStat.inPackets;
   stats->rx_errors        = pktStat.lost;
   stats->rx_missed_errors = PktRxDropped();
   return (stats);
 }
 
 static int pkt_probe (struct device *dev)
 {
   if (!PktSearchDriver())
      return (0);
 
   dev->open           = pkt_open;
   dev->xmit           = pkt_xmit;
   dev->close          = pkt_close;
   dev->get_stats      = pkt_stats;
   dev->copy_rx_buf    = PktReceive;  /* farmem peek and copy routine */
   dev->get_rx_buf     = NULL;
   dev->peek_rx_buf    = NULL;
   dev->release_rx_buf = NULL;
   dev->priv           = calloc (sizeof(struct net_device_stats), 1);
   if (!dev->priv)
      return (0);
   return (1);
 }
 
 /*
  * NDIS device functions
  */
 static void ndis_close (struct device *dev)
 {
 #ifdef USE_NDIS2
   NdisShutdown();
 #endif
   ARGSUSED (dev);
 }
 
 static int ndis_open (struct device *dev)
 {
   int promis = (dev->flags & IFF_PROMISC);
 
 #ifdef USE_NDIS2
   if (!NdisInit(promis))
      return (0);
   return (1);
 #else
   ARGSUSED (promis);
   return (0);
 #endif
 }
 
 static void *ndis_stats (struct device *dev)
 {
   static struct net_device_stats stats;
 
   /* to-do */
   ARGSUSED (dev);
   return (&stats);
 }
 
 static int ndis_probe (struct device *dev)
 {
 #ifdef USE_NDIS2
   if (!NdisOpen())
      return (0);
 #endif
 
   dev->open           = ndis_open;
   dev->xmit           = NULL;
   dev->close          = ndis_close;
   dev->get_stats      = ndis_stats;
   dev->copy_rx_buf    = NULL;       /* to-do */
   dev->get_rx_buf     = NULL;       /* upcall is from rmode driver */
   dev->peek_rx_buf    = NULL;
   dev->release_rx_buf = NULL;
   return (0);
 }
 
 /*
  * Search & probe for supported 32-bit (pmode) pcap devices
  */
 #if defined(USE_32BIT_DRIVERS)
 
 struct device el2_dev LOCKED_VAR = {
               "3c503",
               "EtherLink II",
               0,
               0,0,0,0,0,0,
               NULL,
               el2_probe
             };
 
 struct device el3_dev LOCKED_VAR = {
               "3c509",
               "EtherLink III",
               0,
               0,0,0,0,0,0,
               &el2_dev,
               el3_probe
             };
 
 struct device tc515_dev LOCKED_VAR = {
               "3c515",
               "EtherLink PCI",
               0,
               0,0,0,0,0,0,
               &el3_dev,
               tc515_probe
             };
 
 struct device tc59_dev LOCKED_VAR = {
               "3c59x",
               "EtherLink PCI",
               0,
               0,0,0,0,0,0,
               &tc515_dev,
               tc59x_probe
             };
 
 struct device tc90xbc_dev LOCKED_VAR = {
               "3c90x",
               "EtherLink 90X",
               0,
               0,0,0,0,0,0,
               &tc59_dev,
               tc90xbc_probe
             };
 
 struct device wd_dev LOCKED_VAR = {
               "wd",
               "Westen Digital",
               0,
               0,0,0,0,0,0,
               &tc90xbc_dev,
               wd_probe
             };
 
 struct device ne_dev LOCKED_VAR = {
               "ne",
               "NEx000",
               0,
               0,0,0,0,0,0,
               &wd_dev,
               ne_probe
             };
 
 struct device acct_dev LOCKED_VAR = {
               "acct",
               "Accton EtherPocket",
               0,
               0,0,0,0,0,0,
               &ne_dev,
               ethpk_probe
             };
 
 struct device cs89_dev LOCKED_VAR = {
               "cs89",
               "Crystal Semiconductor",
               0,
               0,0,0,0,0,0,
               &acct_dev,
               cs89x0_probe
             };
 
 struct device rtl8139_dev LOCKED_VAR = {
               "rtl8139",
               "RealTek PCI",
               0,
               0,0,0,0,0,0,
               &cs89_dev,
               rtl8139_probe     /* dev->probe routine */
             };
 
 /*
  * Dequeue routine is called by polling.
  * NOTE: the queue-element is not copied, only a pointer is
  * returned at '*buf'
  */
 int peek_rxbuf (BYTE **buf)
 {
   struct rx_elem *tail, *head;
 
   PCAP_ASSERT (pktq_check (&active_dev->queue));
 
   DISABLE();
   tail = pktq_out_elem (&active_dev->queue);
   head = pktq_in_elem (&active_dev->queue);
   ENABLE();
 
   if (head != tail)
   {
     PCAP_ASSERT (tail->size < active_dev->queue.elem_size-4-2);
 
     *buf = &tail->data[0];
     return (tail->size);
   }
   *buf = NULL;
   return (0);
 }
 
 /*
  * Release buffer we peeked at above.
  */
 int release_rxbuf (BYTE *buf)
 {
 #ifndef NDEBUG
   struct rx_elem *tail = pktq_out_elem (&active_dev->queue);
 
   PCAP_ASSERT (&tail->data[0] == buf);
 #else
   ARGSUSED (buf);
 #endif
   pktq_inc_out (&active_dev->queue);
   return (1);
 }
 
 /*
  * get_rxbuf() routine (in locked code) is called from IRQ handler
  * to request a buffer. Interrupts are disabled and we have a 32kB stack.
  */
 BYTE *get_rxbuf (int len)
 {
   int idx;
 
   if (len < ETH_MIN || len > ETH_MAX)
      return (NULL);
 
   idx = pktq_in_index (&active_dev->queue);
 
 #ifdef DEBUG
   {
     static int fan_idx LOCKED_VAR = 0;
     writew ("-\\|/"[fan_idx++] | (15 << 8),      /* white on black colour */
             0xB8000 + 2*79);  /* upper-right corner, 80-col colour screen */
     fan_idx &= 3;
   }
 /* writew (idx + '0' + 0x0F00, 0xB8000 + 2*78); */
 #endif
 
   if (idx != active_dev->queue.out_index)
   {
     struct rx_elem *head = pktq_in_elem (&active_dev->queue);
 
     head->size = len;
     active_dev->queue.in_index = idx;
     return (&head->data[0]);
   }
 
   /* !!to-do: drop 25% of the oldest element
    */
   pktq_clear (&active_dev->queue);
   return (NULL);
 }
 
 /*
  *  Simple ring-buffer queue handler for reception of packets
  *  from network driver.
  */
 #define PKTQ_MARKER  0xDEADBEEF
 
 static int pktq_check (struct rx_ringbuf *q)
 {
 #ifndef NDEBUG
   int   i;
   char *buf;
 #endif
 
   if (!q || !q->num_elem || !q->buf_start)
      return (0);
 
 #ifndef NDEBUG
   buf = q->buf_start;
 
   for (i = 0; i < q->num_elem; i++)
   {
     buf += q->elem_size;
     if (*(DWORD*)(buf - sizeof(DWORD)) != PKTQ_MARKER)
        return (0);
   }
 #endif
   return (1);
 }
 
 static int pktq_init (struct rx_ringbuf *q, int size, int num, char *pool)
 {
   int i;
 
   q->elem_size = size;
   q->num_elem  = num;
   q->buf_start = pool;
   q->in_index  = 0;
   q->out_index = 0;
 
   PCAP_ASSERT (size >= sizeof(struct rx_elem) + sizeof(DWORD));
   PCAP_ASSERT (num);
   PCAP_ASSERT (pool);
 
   for (i = 0; i < num; i++)
   {
 #if 0
     struct rx_elem *elem = (struct rx_elem*) pool;
 
     /* assert dword aligned elements
      */
     PCAP_ASSERT (((unsigned)(&elem->data[0]) & 3) == 0);
 #endif
     pool += size;
     *(DWORD*) (pool - sizeof(DWORD)) = PKTQ_MARKER;
   }
   return (1);
 }
 
 /*
  * Increment the queue 'out_index' (tail).
  * Check for wraps.
  */
 static int pktq_inc_out (struct rx_ringbuf *q)
 {
   q->out_index++;
   if (q->out_index >= q->num_elem)
       q->out_index = 0;
   return (q->out_index);
 }
 
 /*
  * Return the queue's next 'in_index' (head).
  * Check for wraps.
  */
 static int pktq_in_index (struct rx_ringbuf *q)
 {
   volatile int index = q->in_index + 1;
 
   if (index >= q->num_elem)
       index = 0;
   return (index);
 }
 
 /*
  * Return the queue's head-buffer.
  */
 static struct rx_elem *pktq_in_elem (struct rx_ringbuf *q)
 {
   return (struct rx_elem*) (q->buf_start + (q->elem_size * q->in_index));
 }
 
 /*
  * Return the queue's tail-buffer.
  */
 static struct rx_elem *pktq_out_elem (struct rx_ringbuf *q)
 {
   return (struct rx_elem*) (q->buf_start + (q->elem_size * q->out_index));
 }
 
 /*
  * Clear the queue ring-buffer by setting head=tail.
  */
 static void pktq_clear (struct rx_ringbuf *q)
 {
   q->in_index = q->out_index;
 }
 
 /*
  * Symbols that must be linkable for "gcc -O0"
  */
 #undef __IOPORT_H
 #undef __DMA_H
 
 #define extern
 #define __inline__
 
 #include "msdos/pm_drvr/ioport.h"
 #include "msdos/pm_drvr/dma.h"
 
 #endif /* USE_32BIT_DRIVERS */
 
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+  return ("DOS-" PCAP_VERSION_STRING);
+}
Index: vendor/libpcap/dist/pcap-enet.c
===================================================================
--- vendor/libpcap/dist/pcap-enet.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-enet.c	(revision 333789)
@@ -1,231 +1,231 @@
 /*
  * Stanford Enetfilter subroutines for tcpdump
  *
  * Based on the MERIT NNstat etherifrt.c and the Ultrix pcap-pf.c
  * subroutines.
  *
  * Rayan Zachariassen, CA*Net
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <pcap/bpf.h>
 #include <net/enet.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <stdio.h>
 #include <errno.h>
 
 #include "interface.h"
 
 struct packet_header {
 #ifdef	IBMRTPC
 	struct LengthWords	length;
 	struct tap_header	tap;
 #endif	/* IBMRTPC */
 	u_char			packet[8]
 };
 
 extern int errno;
 
 #define BUFSPACE (4*1024)
 
 /* Forwards */
 static void efReadError(int, char *);
 
 void
 readloop(int cnt, int if_fd, struct bpf_program *fp, printfunc printit)
 {
 #ifdef	IBMRTPC
 	register struct packet_header *ph;
 	register u_char *bp;
 	register int inc;
 #else	/* !IBMRTPC */
 	static struct timeval tv = { 0 };
 #endif	/* IBMRTPC */
 	register int cc, caplen;
 	register struct bpf_insn *fcode = fp->bf_insns;
 	union {
 		struct packet_header hdr;
 		u_char	p[BUFSPACE];
 		u_short	s;
 	} buf;
 
 	while (1) {
 		if ((cc = read(if_fd, (char *)buf.p, sizeof(buf))) < 0)
 			efReadError(if_fd, "reader");
 
 #ifdef	IBMRTPC
 		/*
 		 * Loop through each packet.
 		 */
 		bp = buf.p;
 		while (cc > 0) {
 			ph = (struct packet_header *)bp;
 			caplen = ph->tap.th_wirelen > snaplen ? snaplen : ph->tap
 .th_wirelen ;
 			if (bpf_filter(fcode, (char *)ph->packet,
 						ph->tap.th_wirelen, caplen)) {
 				if (cnt >= 0 && --cnt < 0)
 					goto out;
 				(*printit)((char *)ph->packet,
 					(struct timeval *)ph->tap.th_timestamp,
 					ph->tap.th_wirelen, caplen);
 			}
 			inc = ph->length.PacketOffset;
 			cc -= inc;
 			bp += inc;
 		}
 #else	/* !IBMRTPC */
 		caplen = cc > snaplen ? snaplen : cc ;
 		if (bpf_filter(fcode, buf.hdr.packet, cc, caplen)) {
 			if (cnt >= 0 && --cnt < 0)
 				goto out;
 			(*printit)(buf.hdr.packet, &tv, cc, caplen);
 		}
 #endif	/* IBMRTPC */
 	}
  out:
 	wrapup(if_fd);
 }
 
 /* Call ONLY if read() has returned an error on packet filter */
 static void
 efReadError(int fid, char *msg)
 {
 	if (errno == EINVAL) {	/* read MAXINT bytes already! */
 		if (lseek(fid, 0, 0) < 0) {
 			perror("tcpdump: efReadError/lseek");
 			exit(-1);
 		}
 		else
 			return;
 	}
 	else {
 		(void) fprintf(stderr, "tcpdump: ");
 		perror(msg);
 		exit(-1);
 	}
 }
 
 void
 wrapup(int fd)
 {
 #ifdef	IBMRTPC
 	struct enstats es;
 
 	if (ioctl(fd, EIOSTATS, &es) == -1) {
 		perror("tcpdump: enet ioctl EIOSTATS error");
 		exit(-1);
 	}
 
 	fprintf(stderr, "%d packets queued", es.enStat_Rcnt);
 	if (es.enStat_Rdrops > 0)
 		fprintf(stderr, ", %d dropped", es.enStat_Rdrops);
 	if (es.enStat_Reads > 0)
 		fprintf(stderr, ", %d tcpdump %s", es.enStat_Reads,
 				es.enStat_Reads > 1 ? "reads" : "read");
 	if (es.enStat_MaxRead > 1)
 		fprintf(stderr, ", %d packets in largest read",
 			es.enStat_MaxRead);
 	putc('\n', stderr);
 #endif	/* IBMRTPC */
 	close(fd);
 }
 
 int
 initdevice(char *device, int pflag, int *linktype)
 {
 	struct eniocb ctl;
 	struct enfilter filter;
 	u_int maxwaiting;
 	int if_fd;
 
 #ifdef	IBMRTPC
 	GETENETDEVICE(0, O_RDONLY, &if_fd);
 #else	/* !IBMRTPC */
 	if_fd = open("/dev/enet", O_RDONLY, 0);
 #endif	/* IBMRTPC */
 
 	if (if_fd == -1) {
 		perror("tcpdump: enet open error");
 		error(
 "your system may not be properly configured; see \"man enet(4)\"");
 		exit(-1);
 	}
 
 	/*  Get operating parameters. */
 
 	if (ioctl(if_fd, EIOCGETP, (char *)&ctl) == -1) {
 		perror("tcpdump: enet ioctl EIOCGETP error");
 		exit(-1);
 	}
 
 	/*  Set operating parameters. */
 
 #ifdef	IBMRTPC
 	ctl.en_rtout = 1 * ctl.en_hz;
 	ctl.en_tr_etherhead = 1;
 	ctl.en_tap_network = 1;
 	ctl.en_multi_packet = 1;
 	ctl.en_maxlen = BUFSPACE;
 #else	/* !IBMRTPC */
 	ctl.en_rtout = 64;	/* randomly picked value for HZ */
 #endif	/* IBMRTPC */
 	if (ioctl(if_fd, EIOCSETP, &ctl) == -1) {
 		perror("tcpdump: enet ioctl EIOCSETP error");
 		exit(-1);
 	}
 
 	/*  Flush the receive queue, since we've changed
 	    the operating parameters and we otherwise might
 	    receive data without headers. */
 
 	if (ioctl(if_fd, EIOCFLUSH) == -1) {
 		perror("tcpdump: enet ioctl EIOCFLUSH error");
 		exit(-1);
 	}
 
 	/*  Set the receive queue depth to its maximum. */
 
 	maxwaiting = ctl.en_maxwaiting;
 	if (ioctl(if_fd, EIOCSETW, &maxwaiting) == -1) {
 		perror("tcpdump: enet ioctl EIOCSETW error");
 		exit(-1);
 	}
 
 #ifdef	IBMRTPC
 	/*  Clear statistics. */
 
 	if (ioctl(if_fd, EIOCLRSTAT, 0) == -1) {
 		perror("tcpdump: enet ioctl EIOCLRSTAT error");
 		exit(-1);
 	}
 #endif	/* IBMRTPC */
 
 	/*  Set the filter (accept all packets). */
 
 	filter.enf_Priority = 3;
 	filter.enf_FilterLen = 0;
 	if (ioctl(if_fd, EIOCSETF, &filter) == -1) {
 		perror("tcpdump: enet ioctl EIOCSETF error");
 		exit(-1);
 	}
 	/*
 	 * "enetfilter" supports only ethernets.
 	 */
 	*linktype = DLT_EN10MB;
 
 	return(if_fd);
 }
Index: vendor/libpcap/dist/pcap-filter.manmisc.in
===================================================================
--- vendor/libpcap/dist/pcap-filter.manmisc.in	(revision 333788)
+++ vendor/libpcap/dist/pcap-filter.manmisc.in	(revision 333789)
@@ -1,1032 +1,1050 @@
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP-FILTER @MAN_MISC_INFO@ "3 August 2015"
 .SH NAME
 pcap-filter \- packet filter syntax
 .br
 .ad
 .SH DESCRIPTION
 .LP
 .B pcap_compile()
 is used to compile a string into a filter program.
 The resulting filter program can then be applied to
 some stream of packets to determine which packets will be supplied to
 .BR pcap_loop() ,
 .BR pcap_dispatch() ,
 .BR pcap_next() ,
 or
 .BR pcap_next_ex() .
 .LP
 The \fIfilter expression\fP consists of one or more
 .IR primitives .
 Primitives usually consist of an
 .I id
 (name or number) preceded by one or more qualifiers.
 There are three
 different kinds of qualifier:
 .IP \fItype\fP
 .I type
 qualifiers say what kind of thing the id name or number refers to.
 Possible types are
 .BR host ,
 .B net ,
 .B port
 and
 .BR portrange .
 E.g., `host foo', `net 128.3', `port 20', `portrange 6000-6008'.
 If there is no type
 qualifier,
 .B host
 is assumed.
 .IP \fIdir\fP
 .I dir
 qualifiers specify a particular transfer direction to and/or from
 .IR id .
 Possible directions are
 .BR src ,
 .BR dst ,
 .BR "src or dst" ,
 .BR "src and dst" ,
 .BR ra ,
 .BR ta ,
 .BR addr1 ,
 .BR addr2 ,
 .BR addr3 ,
 and
 .BR addr4 .
 E.g., `src foo', `dst net 128.3', `src or dst port ftp-data'.
 If
 there is no dir qualifier,
 .B "src or dst"
 is assumed.
 The
 .BR ra ,
 .BR ta ,
 .BR addr1 ,
 .BR addr2 ,
 .BR addr3 ,
 and
 .B addr4
 qualifiers are only valid for IEEE 802.11 Wireless LAN link layers.
 For some link layers, such as SLIP and the ``cooked'' Linux capture mode
 used for the ``any'' device and for some other device types, the
 .B inbound
 and
 .B outbound
 qualifiers can be used to specify a desired direction.
 .IP \fIproto\fP
 .I proto
 qualifiers restrict the match to a particular protocol.
 Possible
 protos are:
 .BR ether ,
 .BR fddi ,
 .BR tr ,
 .BR wlan ,
 .BR ip ,
 .BR ip6 ,
 .BR arp ,
 .BR rarp ,
 .BR decnet ,
 .B tcp
 and
 .BR udp .
 E.g., `ether src foo', `arp net 128.3', `tcp port 21', `udp portrange
 7000-7009', `wlan addr2 0:2:3:4:5:6'.
 If there is
 no proto qualifier, all protocols consistent with the type are
 assumed.
 E.g., `src foo' means `(ip or arp or rarp) src foo'
 (except the latter is not legal syntax), `net bar' means `(ip or
 arp or rarp) net bar' and `port 53' means `(tcp or udp) port 53'.
 .LP
 [`fddi' is actually an alias for `ether'; the parser treats them
 identically as meaning ``the data link level used on the specified
 network interface.''  FDDI headers contain Ethernet-like source
 and destination addresses, and often contain Ethernet-like packet
 types, so you can filter on these FDDI fields just as with the
 analogous Ethernet fields.
 FDDI headers also contain other fields,
 but you cannot name them explicitly in a filter expression.
 .LP
 Similarly, `tr' and `wlan' are aliases for `ether'; the previous
 paragraph's statements about FDDI headers also apply to Token Ring
 and 802.11 wireless LAN headers.  For 802.11 headers, the destination
 address is the DA field and the source address is the SA field; the
 BSSID, RA, and TA fields aren't tested.]
 .LP
 In addition to the above, there are some special `primitive' keywords
 that don't follow the pattern:
 .BR gateway ,
 .BR broadcast ,
 .BR less ,
 .B greater
 and arithmetic expressions.
 All of these are described below.
 .LP
 More complex filter expressions are built up by using the words
 .BR and ,
 .B or
 and
 .B not
 to combine primitives.
 E.g., `host foo and not port ftp and not port ftp-data'.
 To save typing, identical qualifier lists can be omitted.
 E.g.,
 `tcp dst port ftp or ftp-data or domain' is exactly the same as
 `tcp dst port ftp or tcp dst port ftp-data or tcp dst port domain'.
 .LP
 Allowable primitives are:
 .IP "\fBdst host \fIhost\fR"
 True if the IPv4/v6 destination field of the packet is \fIhost\fP,
 which may be either an address or a name.
 .IP "\fBsrc host \fIhost\fR"
 True if the IPv4/v6 source field of the packet is \fIhost\fP.
 .IP "\fBhost \fIhost\fP"
 True if either the IPv4/v6 source or destination of the packet is \fIhost\fP.
 .IP
 Any of the above host expressions can be prepended with the keywords,
 \fBip\fP, \fBarp\fP, \fBrarp\fP, or \fBip6\fP as in:
 .in +.5i
 .nf
 \fBip host \fIhost\fR
 .fi
 .in -.5i
 which is equivalent to:
 .in +.5i
 .nf
 \fBether proto \fI\\ip\fB and host \fIhost\fR
 .fi
 .in -.5i
 If \fIhost\fR is a name with multiple IP addresses, each address will
 be checked for a match.
 .IP "\fBether dst \fIehost\fP"
 True if the Ethernet destination address is \fIehost\fP.
 \fIEhost\fP
-may be either a name from /etc/ethers or a number (see
-.IR ethers (3N)
-for numeric format).
+may be either a name from /etc/ethers or a numerical MAC address of the
+form "xx:xx:xx:xx:xx:xx", "xx.xx.xx.xx.xx.xx", "xx-xx-xx-xx-xx-xx",
+"xxxx.xxxx.xxxx", "xxxxxxxxxxxx", or various mixes of ':', '.', and '-',
+where each "x" is a hex digit (0-9, a-f, or A-F).
 .IP "\fBether src \fIehost\fP"
 True if the Ethernet source address is \fIehost\fP.
 .IP "\fBether host \fIehost\fP"
 True if either the Ethernet source or destination address is \fIehost\fP.
 .IP "\fBgateway\fP \fIhost\fP"
 True if the packet used \fIhost\fP as a gateway.
 I.e., the Ethernet
 source or destination address was \fIhost\fP but neither the IP source
 nor the IP destination was \fIhost\fP.
 \fIHost\fP must be a name and
 must be found both by the machine's host-name-to-IP-address resolution
 mechanisms (host name file, DNS, NIS, etc.) and by the machine's
 host-name-to-Ethernet-address resolution mechanism (/etc/ethers, etc.).
 (An equivalent expression is
 .in +.5i
 .nf
 \fBether host \fIehost \fBand not host \fIhost\fR
 .fi
 .in -.5i
 which can be used with either names or numbers for \fIhost / ehost\fP.)
 This syntax does not work in IPv6-enabled configuration at this moment.
 .IP "\fBdst net \fInet\fR"
 True if the IPv4/v6 destination address of the packet has a network
 number of \fInet\fP.
 \fINet\fP may be either a name from the networks database
 (/etc/networks, etc.) or a network number.
 An IPv4 network number can be written as a dotted quad (e.g., 192.168.1.0),
 dotted triple (e.g., 192.168.1), dotted pair (e.g, 172.16), or single
 number (e.g., 10); the netmask is 255.255.255.255 for a dotted quad
 (which means that it's really a host match), 255.255.255.0 for a dotted
 triple, 255.255.0.0 for a dotted pair, or 255.0.0.0 for a single number.
 An IPv6 network number must be written out fully; the netmask is
 ff:ff:ff:ff:ff:ff:ff:ff, so IPv6 "network" matches are really always
 host matches, and a network match requires a netmask length.
 .IP "\fBsrc net \fInet\fR"
 True if the IPv4/v6 source address of the packet has a network
 number of \fInet\fP.
 .IP "\fBnet \fInet\fR"
 True if either the IPv4/v6 source or destination address of the packet has a network
 number of \fInet\fP.
 .IP "\fBnet \fInet\fR \fBmask \fInetmask\fR"
 True if the IPv4 address matches \fInet\fR with the specific \fInetmask\fR.
 May be qualified with \fBsrc\fR or \fBdst\fR.
 Note that this syntax is not valid for IPv6 \fInet\fR.
 .IP "\fBnet \fInet\fR/\fIlen\fR"
 True if the IPv4/v6 address matches \fInet\fR with a netmask \fIlen\fR
 bits wide.
 May be qualified with \fBsrc\fR or \fBdst\fR.
 .IP "\fBdst port \fIport\fR"
 True if the packet is ip/tcp, ip/udp, ip6/tcp or ip6/udp and has a
 destination port value of \fIport\fP.
 The \fIport\fP can be a number or a name used in /etc/services (see
 .IR tcp (4P)
 and
 .IR udp (4P)).
 If a name is used, both the port
 number and protocol are checked.
 If a number or ambiguous name is used,
 only the port number is checked (e.g., \fBdst port 513\fR will print both
 tcp/login traffic and udp/who traffic, and \fBport domain\fR will print
 both tcp/domain and udp/domain traffic).
 .IP "\fBsrc port \fIport\fR"
 True if the packet has a source port value of \fIport\fP.
 .IP "\fBport \fIport\fR"
 True if either the source or destination port of the packet is \fIport\fP.
 .IP "\fBdst portrange \fIport1\fB-\fIport2\fR"
 True if the packet is ip/tcp, ip/udp, ip6/tcp or ip6/udp and has a
 destination port value between \fIport1\fP and \fIport2\fP.
 .I port1
 and
 .I port2
 are interpreted in the same fashion as the
 .I port
 parameter for
 .BR port .
 .IP "\fBsrc portrange \fIport1\fB-\fIport2\fR"
 True if the packet has a source port value between \fIport1\fP and
 \fIport2\fP.
 .IP "\fBportrange \fIport1\fB-\fIport2\fR"
 True if either the source or destination port of the packet is between
 \fIport1\fP and \fIport2\fP.
 .IP
 Any of the above port or port range expressions can be prepended with
 the keywords, \fBtcp\fP or \fBudp\fP, as in:
 .in +.5i
 .nf
 \fBtcp src port \fIport\fR
 .fi
 .in -.5i
 which matches only tcp packets whose source port is \fIport\fP.
 .IP "\fBless \fIlength\fR"
 True if the packet has a length less than or equal to \fIlength\fP.
 This is equivalent to:
 .in +.5i
 .nf
 \fBlen <= \fIlength\fP.
 .fi
 .in -.5i
 .IP "\fBgreater \fIlength\fR"
 True if the packet has a length greater than or equal to \fIlength\fP.
 This is equivalent to:
 .in +.5i
 .nf
 \fBlen >= \fIlength\fP.
 .fi
 .in -.5i
 .IP "\fBip proto \fIprotocol\fR"
 True if the packet is an IPv4 packet (see
 .IR ip (4P))
 of protocol type \fIprotocol\fP.
 \fIProtocol\fP can be a number or one of the names
 \fBicmp\fP, \fBicmp6\fP, \fBigmp\fP, \fBigrp\fP, \fBpim\fP, \fBah\fP,
 \fBesp\fP, \fBvrrp\fP, \fBudp\fP, or \fBtcp\fP.
 Note that the identifiers \fBtcp\fP, \fBudp\fP, and \fBicmp\fP are also
 keywords and must be escaped via backslash (\\).
 Note that this primitive does not chase the protocol header chain.
 .IP "\fBip6 proto \fIprotocol\fR"
 True if the packet is an IPv6 packet of protocol type \fIprotocol\fP.
 Note that this primitive does not chase the protocol header chain.
 .IP "\fBproto \fIprotocol\fR"
 True if the packet is an IPv4 or IPv6 packet of protocol type
 \fIprotocol\fP.  Note that this primitive does not chase the protocol
 header chain.
 .IP  "\fBtcp\fR, \fBudp\fR, \fBicmp\fR"
 Abbreviations for:
 .in +.5i
 .nf
 \fBproto \fIp\fR\fB
 .fi
 .in -.5i
 where \fIp\fR is one of the above protocols.
 .IP "\fBip6 protochain \fIprotocol\fR"
 True if the packet is IPv6 packet,
 and contains protocol header with type \fIprotocol\fR
 in its protocol header chain.
 For example,
 .in +.5i
 .nf
 \fBip6 protochain 6\fR
 .fi
 .in -.5i
 matches any IPv6 packet with TCP protocol header in the protocol header chain.
 The packet may contain, for example,
 authentication header, routing header, or hop-by-hop option header,
 between IPv6 header and TCP header.
 The BPF code emitted by this primitive is complex and
 cannot be optimized by the BPF optimizer code, and is not supported by
 filter engines in the kernel, so this can be somewhat slow, and may
 cause more packets to be dropped.
 .IP "\fBip protochain \fIprotocol\fR"
 Equivalent to \fBip6 protochain \fIprotocol\fR, but this is for IPv4.
 .IP "\fBprotochain \fIprotocol\fR"
 True if the packet is an IPv4 or IPv6 packet of protocol type
 \fIprotocol\fP.  Note that this primitive chases the protocol
 header chain.
 .IP "\fBether broadcast\fR"
 True if the packet is an Ethernet broadcast packet.
 The \fIether\fP
 keyword is optional.
 .IP "\fBip broadcast\fR"
 True if the packet is an IPv4 broadcast packet.
 It checks for both the all-zeroes and all-ones broadcast conventions,
 and looks up the subnet mask on the interface on which the capture is
 being done.
 .IP
 If the subnet mask of the interface on which the capture is being done
 is not available, either because the interface on which capture is being
 done has no netmask or because the capture is being done on the Linux
 "any" interface, which can capture on more than one interface, this
 check will not work correctly.
 .IP "\fBether multicast\fR"
 True if the packet is an Ethernet multicast packet.
 The \fBether\fP
 keyword is optional.
 This is shorthand for `\fBether[0] & 1 != 0\fP'.
 .IP "\fBip multicast\fR"
 True if the packet is an IPv4 multicast packet.
 .IP "\fBip6 multicast\fR"
 True if the packet is an IPv6 multicast packet.
 .IP  "\fBether proto \fIprotocol\fR"
 True if the packet is of ether type \fIprotocol\fR.
 \fIProtocol\fP can be a number or one of the names
 \fBip\fP, \fBip6\fP, \fBarp\fP, \fBrarp\fP, \fBatalk\fP, \fBaarp\fP,
 \fBdecnet\fP, \fBsca\fP, \fBlat\fP, \fBmopdl\fP, \fBmoprc\fP,
 \fBiso\fP, \fBstp\fP, \fBipx\fP, or \fBnetbeui\fP.
 Note these identifiers are also keywords
 and must be escaped via backslash (\\).
 .IP
 [In the case of FDDI (e.g., `\fBfddi proto arp\fR'), Token Ring
 (e.g., `\fBtr proto arp\fR'), and IEEE 802.11 wireless LANS (e.g.,
 `\fBwlan proto arp\fR'), for most of those protocols, the
 protocol identification comes from the 802.2 Logical Link Control (LLC)
 header, which is usually layered on top of the FDDI, Token Ring, or
 802.11 header.
 .IP
 When filtering for most protocol identifiers on FDDI, Token Ring, or
 802.11, the filter checks only the protocol ID field of an LLC header
 in so-called SNAP format with an Organizational Unit Identifier (OUI) of
 0x000000, for encapsulated Ethernet; it doesn't check whether the packet
 is in SNAP format with an OUI of 0x000000.
 The exceptions are:
 .RS
 .TP
 \fBiso\fP
 the filter checks the DSAP (Destination Service Access Point) and
 SSAP (Source Service Access Point) fields of the LLC header;
 .TP
 \fBstp\fP and \fBnetbeui\fP
 the filter checks the DSAP of the LLC header;
 .TP
 \fBatalk\fP
 the filter checks for a SNAP-format packet with an OUI of 0x080007
 and the AppleTalk etype.
 .RE
 .IP
 In the case of Ethernet, the filter checks the Ethernet type field
 for most of those protocols.  The exceptions are:
 .RS
 .TP
 \fBiso\fP, \fBstp\fP, and \fBnetbeui\fP
 the filter checks for an 802.3 frame and then checks the LLC header as
 it does for FDDI, Token Ring, and 802.11;
 .TP
 \fBatalk\fP
 the filter checks both for the AppleTalk etype in an Ethernet frame and
 for a SNAP-format packet as it does for FDDI, Token Ring, and 802.11;
 .TP
 \fBaarp\fP
 the filter checks for the AppleTalk ARP etype in either an Ethernet
 frame or an 802.2 SNAP frame with an OUI of 0x000000;
 .TP
 \fBipx\fP
 the filter checks for the IPX etype in an Ethernet frame, the IPX
 DSAP in the LLC header, the 802.3-with-no-LLC-header encapsulation of
 IPX, and the IPX etype in a SNAP frame.
 .RE
 .IP "\fBip\fR, \fBip6\fR, \fBarp\fR, \fBrarp\fR, \fBatalk\fR, \fBaarp\fR, \fBdecnet\fR, \fBiso\fR, \fBstp\fR, \fBipx\fR, \fBnetbeui\fP"
 Abbreviations for:
 .in +.5i
 .nf
 \fBether proto \fIp\fR
 .fi
 .in -.5i
 where \fIp\fR is one of the above protocols.
 .IP "\fBlat\fR, \fBmoprc\fR, \fBmopdl\fR"
 Abbreviations for:
 .in +.5i
 .nf
 \fBether proto \fIp\fR
 .fi
 .in -.5i
 where \fIp\fR is one of the above protocols.
 Note that not all applications using
 .BR pcap (3PCAP)
 currently know how to parse these protocols.
 .IP "\fBdecnet src \fIhost\fR"
 True if the DECNET source address is
 .IR host ,
 which may be an address of the form ``10.123'', or a DECNET host
 name.
 [DECNET host name support is only available on ULTRIX systems
 that are configured to run DECNET.]
 .IP "\fBdecnet dst \fIhost\fR"
 True if the DECNET destination address is
 .IR host .
 .IP "\fBdecnet host \fIhost\fR"
 True if either the DECNET source or destination address is
 .IR host .
 .IP \fBllc\fP
 True if the packet has an 802.2 LLC header.  This includes:
 .IP
 Ethernet packets with a length field rather than a type field that
 aren't raw NetWare-over-802.3 packets;
 .IP
 IEEE 802.11 data packets;
 .IP
 Token Ring packets (no check is done for LLC frames);
 .IP
 FDDI packets (no check is done for LLC frames);
 .IP
 LLC-encapsulated ATM packets, for SunATM on Solaris.
 .IP
 
 .IP "\fBllc\fP \Fitype\fR"
 True if the packet has an 802.2 LLC header and has the specified
 .IR type .
 .I type
 can be one of:
 .RS
 .TP
 \fBi\fR
 Information (I) PDUs
 .TP
 \fBs\fR
 Supervisory (S) PDUs
 .TP
 \fBu\fR
 Unnumbered (U) PDUs
 .TP
 \fBrr\fR
 Receiver Ready (RR) S PDUs
 .TP
 \fBrnr\fR
 Receiver Not Ready (RNR) S PDUs
 .TP
 \fBrej\fR
 Reject (REJ) S PDUs
 .TP
 \fBui\fR
 Unnumbered Information (UI) U PDUs
 .TP
 \fBua\fR
 Unnumbered Acknowledgment (UA) U PDUs
 .TP
 \fBdisc\fR
 Disconnect (DISC) U PDUs
 .TP
 \fBsabme\fR
 Set Asynchronous Balanced Mode Extended (SABME) U PDUs
 .TP
 \fBtest\fR
 Test (TEST) U PDUs
 .TP
 \fBxid\fR
 Exchange Identification (XID) U PDUs
 .TP
 \fBfrmr\fR
 Frame Reject (FRMR) U PDUs
 .RE
 .IP "\fBifname \fIinterface\fR"
 True if the packet was logged as coming from the specified interface (applies
 only to packets logged by OpenBSD's or FreeBSD's
 .BR pf (4)).
 .IP "\fBon \fIinterface\fR"
 Synonymous with the
 .B ifname
 modifier.
 .IP "\fBrnr \fInum\fR"
 True if the packet was logged as matching the specified PF rule number
 (applies only to packets logged by OpenBSD's or FreeBSD's
 .BR pf (4)).
 .IP "\fBrulenum \fInum\fR"
 Synonymous with the
 .B rnr
 modifier.
 .IP "\fBreason \fIcode\fR"
 True if the packet was logged with the specified PF reason code.  The known
 codes are:
 .BR match ,
 .BR bad-offset ,
 .BR fragment ,
 .BR short ,
 .BR normalize ,
 and
 .B memory
 (applies only to packets logged by OpenBSD's or FreeBSD's
 .BR pf (4)).
 .IP "\fBrset \fIname\fR"
 True if the packet was logged as matching the specified PF ruleset
 name of an anchored ruleset (applies only to packets logged by OpenBSD's
 or FreeBSD's
 .BR pf (4)).
 .IP "\fBruleset \fIname\fR"
 Synonymous with the
 .B rset
 modifier.
 .IP "\fBsrnr \fInum\fR"
 True if the packet was logged as matching the specified PF rule number
 of an anchored ruleset (applies only to packets logged by OpenBSD's or
 FreeBSD's
 .BR pf (4)).
 .IP "\fBsubrulenum \fInum\fR"
 Synonymous with the
 .B srnr
 modifier.
 .IP "\fBaction \fIact\fR"
 True if PF took the specified action when the packet was logged.  Known actions
 are:
 .B pass
 and
 .B block
 and, with later versions of
 .BR pf (4)),
 .BR nat ,
 .BR rdr ,
 .B binat
 and
 .B scrub
 (applies only to packets logged by OpenBSD's or FreeBSD's
 .BR pf (4)).
 .IP "\fBwlan ra \fIehost\fR"
 True if the IEEE 802.11 RA is
 .IR ehost .
 The RA field is used in all frames except for management frames.
 .IP "\fBwlan ta \fIehost\fR"
 True if the IEEE 802.11 TA is
 .IR ehost .
 The TA field is used in all frames except for management frames and
 CTS (Clear To Send) and ACK (Acknowledgment) control frames.
 .IP "\fBwlan addr1 \fIehost\fR"
 True if the first IEEE 802.11 address is
 .IR ehost .
 .IP "\fBwlan addr2 \fIehost\fR"
 True if the second IEEE 802.11 address, if present, is
 .IR ehost .
 The second address field is used in all frames except for CTS (Clear To
 Send) and ACK (Acknowledgment) control frames.
 .IP "\fBwlan addr3 \fIehost\fR"
 True if the third IEEE 802.11 address, if present, is
 .IR ehost .
 The third address field is used in management and data frames, but not
 in control frames.
 .IP "\fBwlan addr4 \fIehost\fR"
 True if the fourth IEEE 802.11 address, if present, is
 .IR ehost .
 The fourth address field is only used for
 WDS (Wireless Distribution System) frames.
 .IP "\fBtype \fIwlan_type\fR"
 True if the IEEE 802.11 frame type matches the specified \fIwlan_type\fR.
 Valid \fIwlan_type\fRs are:
 \fBmgt\fP,
 \fBctl\fP
 and \fBdata\fP.
 .IP "\fBtype \fIwlan_type \fBsubtype \fIwlan_subtype\fR"
 True if the IEEE 802.11 frame type matches the specified \fIwlan_type\fR
 and frame subtype matches the specified \fIwlan_subtype\fR.
 .IP
 If the specified \fIwlan_type\fR is \fBmgt\fP,
 then valid \fIwlan_subtype\fRs are:
 \fBassoc-req\fP,
 \fBassoc-resp\fP,
 \fBreassoc-req\fP,
 \fBreassoc-resp\fP,
 \fBprobe-req\fP,
 \fBprobe-resp\fP,
 \fBbeacon\fP,
 \fBatim\fP,
 \fBdisassoc\fP,
 \fBauth\fP and
 \fBdeauth\fP.
 .IP
 If the specified \fIwlan_type\fR is \fBctl\fP,
 then valid \fIwlan_subtype\fRs are:
 \fBps-poll\fP,
 \fBrts\fP,
 \fBcts\fP,
 \fBack\fP,
 \fBcf-end\fP and
 \fBcf-end-ack\fP.
 .IP
 If the specified \fIwlan_type\fR is \fBdata\fP,
 then valid \fIwlan_subtype\fRs are:
 \fBdata\fP,
 \fBdata-cf-ack\fP,
 \fBdata-cf-poll\fP,
 \fBdata-cf-ack-poll\fP,
 \fBnull\fP,
 \fBcf-ack\fP,
 \fBcf-poll\fP,
 \fBcf-ack-poll\fP,
 \fBqos-data\fP,
 \fBqos-data-cf-ack\fP,
 \fBqos-data-cf-poll\fP,
 \fBqos-data-cf-ack-poll\fP,
 \fBqos\fP,
 \fBqos-cf-poll\fP and
 \fBqos-cf-ack-poll\fP.
 .IP "\fBsubtype \fIwlan_subtype\fR"
 True if the IEEE 802.11 frame subtype matches the specified \fIwlan_subtype\fR
 and frame has the type to which the specified \fIwlan_subtype\fR belongs.
 .IP "\fBdir \fIdir\fR"
 True if the IEEE 802.11 frame direction matches the specified
 .IR dir .
 Valid directions are:
 .BR nods ,
 .BR tods ,
 .BR fromds ,
 .BR dstods ,
 or a numeric value.
 .IP "\fBvlan \fI[vlan_id]\fR"
 True if the packet is an IEEE 802.1Q VLAN packet.
 If \fI[vlan_id]\fR is specified, only true if the packet has the specified
 \fIvlan_id\fR.
 Note that the first \fBvlan\fR keyword encountered in \fIexpression\fR
 changes the decoding offsets for the remainder of \fIexpression\fR on
 the assumption that the packet is a VLAN packet.  The \fBvlan
 \fI[vlan_id]\fR expression may be used more than once, to filter on VLAN
 hierarchies.  Each use of that expression increments the filter offsets
 by 4.
 .IP
 For example:
 .in +.5i
 .nf
 \fBvlan 100 && vlan 200\fR
 .fi
 .in -.5i
 filters on VLAN 200 encapsulated within VLAN 100, and
 .in +.5i
 .nf
 \fBvlan && vlan 300 && ip\fR
 .fi
 .in -.5i
 filters IPv4 protocols encapsulated in VLAN 300 encapsulated within any
 higher order VLAN.
 .IP "\fBmpls \fI[label_num]\fR"
 True if the packet is an MPLS packet.
 If \fI[label_num]\fR is specified, only true is the packet has the specified
 \fIlabel_num\fR.
 Note that the first \fBmpls\fR keyword encountered in \fIexpression\fR
 changes the decoding offsets for the remainder of \fIexpression\fR on
 the assumption that the packet is a MPLS-encapsulated IP packet.  The
 \fBmpls \fI[label_num]\fR expression may be used more than once, to
 filter on MPLS hierarchies.  Each use of that expression increments the
 filter offsets by 4.
 .IP
 For example:
 .in +.5i
 .nf
 \fBmpls 100000 && mpls 1024\fR
 .fi
 .in -.5i
 filters packets with an outer label of 100000 and an inner label of
 1024, and
 .in +.5i
 .nf
 \fBmpls && mpls 1024 && host 192.9.200.1\fR
 .fi
 .in -.5i
 filters packets to or from 192.9.200.1 with an inner label of 1024 and
 any outer label.
 .IP \fBpppoed\fP
 True if the packet is a PPP-over-Ethernet Discovery packet (Ethernet
 type 0x8863).
 .IP "\fBpppoes \fI[session_id]\fR"
 True if the packet is a PPP-over-Ethernet Session packet (Ethernet
 type 0x8864).
 If \fI[session_id]\fR is specified, only true if the packet has the specified
 \fIsession_id\fR.
 Note that the first \fBpppoes\fR keyword encountered in \fIexpression\fR
 changes the decoding offsets for the remainder of \fIexpression\fR on
 the assumption that the packet is a PPPoE session packet.
 .IP
 For example:
 .in +.5i
 .nf
 \fBpppoes 0x27 && ip\fR
 .fi
 .in -.5i
 filters IPv4 protocols encapsulated in PPPoE session id 0x27.
 .IP "\fBgeneve \fI[vni]\fR"
 True if the packet is a Geneve packet (UDP port 6081). If \fI[vni]\fR
 is specified, only true if the packet has the specified \fIvni\fR.
 Note that when the \fBgeneve\fR keyword is encountered in
 \fIexpression\fR, it changes the decoding offsets for the remainder of
 \fIexpression\fR on the assumption that the packet is a Geneve packet.
 .IP
 For example:
 .in +.5i
 .nf
 \fBgeneve 0xb && ip\fR
 .fi
 .in -.5i
 filters IPv4 protocols encapsulated in Geneve with VNI 0xb. This will
 match both IP directly encapsulated in Geneve as well as IP contained
 inside an Ethernet frame.
 .IP "\fBiso proto \fIprotocol\fR"
 True if the packet is an OSI packet of protocol type \fIprotocol\fP.
 \fIProtocol\fP can be a number or one of the names
 \fBclnp\fP, \fBesis\fP, or \fBisis\fP.
 .IP "\fBclnp\fR, \fBesis\fR, \fBisis\fR"
 Abbreviations for:
 .in +.5i
 .nf
 \fBiso proto \fIp\fR
 .fi
 .in -.5i
 where \fIp\fR is one of the above protocols.
 .IP "\fBl1\fR, \fBl2\fR, \fBiih\fR, \fBlsp\fR, \fBsnp\fR, \fBcsnp\fR, \fBpsnp\fR"
 Abbreviations for IS-IS PDU types.
 .IP "\fBvpi\fP \fIn\fR"
 True if the packet is an ATM packet, for SunATM on Solaris, with a
 virtual path identifier of
 .IR n .
 .IP "\fBvci\fP \fIn\fR"
 True if the packet is an ATM packet, for SunATM on Solaris, with a
 virtual channel identifier of
 .IR n .
 .IP \fBlane\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 an ATM LANE packet.
 Note that the first \fBlane\fR keyword encountered in \fIexpression\fR
 changes the tests done in the remainder of \fIexpression\fR
 on the assumption that the packet is either a LANE emulated Ethernet
 packet or a LANE LE Control packet.  If \fBlane\fR isn't specified, the
 tests are done under the assumption that the packet is an
 LLC-encapsulated packet.
 .IP \fBoamf4s\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 a segment OAM F4 flow cell (VPI=0 & VCI=3).
 .IP \fBoamf4e\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 an end-to-end OAM F4 flow cell (VPI=0 & VCI=4).
 .IP \fBoamf4\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 a segment or end-to-end OAM F4 flow cell (VPI=0 & (VCI=3 | VCI=4)).
 .IP \fBoam\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 a segment or end-to-end OAM F4 flow cell (VPI=0 & (VCI=3 | VCI=4)).
 .IP \fBmetac\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a meta signaling circuit (VPI=0 & VCI=1).
 .IP \fBbcc\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a broadcast signaling circuit (VPI=0 & VCI=2).
 .IP \fBsc\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a signaling circuit (VPI=0 & VCI=5).
 .IP \fBilmic\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on an ILMI circuit (VPI=0 & VCI=16).
 .IP \fBconnectmsg\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a signaling circuit and is a Q.2931 Setup, Call Proceeding, Connect,
 Connect Ack, Release, or Release Done message.
 .IP \fBmetaconnect\fP
 True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a meta signaling circuit and is a Q.2931 Setup, Call Proceeding, Connect,
 Release, or Release Done message.
 .IP  "\fIexpr relop expr\fR"
 True if the relation holds, where \fIrelop\fR is one of >, <, >=, <=, =,
 !=, and \fIexpr\fR is an arithmetic expression composed of integer
 constants (expressed in standard C syntax), the normal binary operators
 [+, -, *, /, %, &, |, ^, <<, >>], a length operator, and special packet data
 accessors.  Note that all comparisons are unsigned, so that, for example,
 0x80000000 and 0xffffffff are > 0.
 .IP
 The % and ^ operators are currently only supported for filtering in the
 kernel on Linux with 3.7 and later kernels; on all other systems, if
 those operators are used, filtering will be done in user mode, which
 will increase the overhead of capturing packets and may cause more
 packets to be dropped.
 .IP
 To access data inside the packet, use the following syntax:
 .in +.5i
 .nf
 \fIproto\fB [ \fIexpr\fB : \fIsize\fB ]\fR
 .fi
 .in -.5i
 \fIProto\fR is one of \fBether, fddi, tr, wlan, ppp, slip, link,
 ip, arp, rarp, tcp, udp, icmp, ip6\fR or \fBradio\fR, and
 indicates the protocol layer for the index operation.
 (\fBether, fddi, wlan, tr, ppp, slip\fR and \fBlink\fR all refer to the
 link layer. \fBradio\fR refers to the "radio header" added to some
 802.11 captures.)
 Note that \fItcp, udp\fR and other upper-layer protocol types only
 apply to IPv4, not IPv6 (this will be fixed in the future).
 The byte offset, relative to the indicated protocol layer, is
 given by \fIexpr\fR.
 \fISize\fR is optional and indicates the number of bytes in the
 field of interest; it can be either one, two, or four, and defaults to one.
 The length operator, indicated by the keyword \fBlen\fP, gives the
 length of the packet.
 
 For example, `\fBether[0] & 1 != 0\fP' catches all multicast traffic.
 The expression `\fBip[0] & 0xf != 5\fP'
 catches all IPv4 packets with options.
 The expression
 `\fBip[6:2] & 0x1fff = 0\fP'
 catches only unfragmented IPv4 datagrams and frag zero of fragmented
 IPv4 datagrams.
 This check is implicitly applied to the \fBtcp\fP and \fBudp\fP
 index operations.
 For instance, \fBtcp[0]\fP always means the first
 byte of the TCP \fIheader\fP, and never means the first byte of an
 intervening fragment.
 
 Some offsets and field values may be expressed as names rather than
 as numeric values.
 The following protocol header field offsets are
-available: \fBicmptype\fP (ICMP type field), \fBicmpcode\fP (ICMP
-code field), and \fBtcpflags\fP (TCP flags field).
+available: \fBicmptype\fP (ICMP type field), \fBicmp6type (ICMP v6 type field)
+\fBicmpcode\fP (ICMP code field), \fBicmp6code\fP (ICMP v6 code field), and
+\fBtcpflags\fP (TCP flags field).
 
 The following ICMP type field values are available: \fBicmp-echoreply\fP,
 \fBicmp-unreach\fP, \fBicmp-sourcequench\fP, \fBicmp-redirect\fP,
 \fBicmp-echo\fP, \fBicmp-routeradvert\fP, \fBicmp-routersolicit\fP,
 \fBicmp-timxceed\fP, \fBicmp-paramprob\fP, \fBicmp-tstamp\fP,
 \fBicmp-tstampreply\fP, \fBicmp-ireq\fP, \fBicmp-ireqreply\fP,
 \fBicmp-maskreq\fP, \fBicmp-maskreply\fP.
 
+The following ICMPv6 type fields are available: \fBicmp6-echo\fP,
+\fBicmp6-echoreply\fP, \fBicmp6-multicastlistenerquery\fP,
+\fBicmp6-multicastlistenerreportv1\fP, \fBicmp6-multicastlistenerdone\fP,
+\fBicmp6-routersolicit\fP, \fBicmp6-routeradvert\fP,
+\fBicmp6-neighborsolicit\fP, \fBicmp6-neighboradvert\fP, \fBicmp6-redirect\fP,
+\fBicmp6-routerrenum\fP, \fBicmp6-nodeinformationquery\fP,
+\fBicmp6-nodeinformationresponse\fP, \fBicmp6-ineighbordiscoverysolicit\fP,
+\fBicmp6-ineighbordiscoveryadvert\fP, \fBicmp6-multicastlistenerreportv2\fP,
+\fBicmp6-homeagentdiscoveryrequest\fP, \fBicmp6-homeagentdiscoveryreply\fP,
+\fBicmp6-mobileprefixsolicit\fP, \fBicmp6-mobileprefixadvert\fP,
+\fBicmp6-certpathsolicit\fP, \fBicmp6-certpathadvert\fP,
+\fBicmp6-multicastrouteradvert\fP, \fBicmp6-multicastroutersolicit\fP,
+\fBicmp6-multicastrouterterm\fP.
+
 The following TCP flags field values are available: \fBtcp-fin\fP,
 \fBtcp-syn\fP, \fBtcp-rst\fP, \fBtcp-push\fP,
-\fBtcp-ack\fP, \fBtcp-urg\fP.
+\fBtcp-ack\fP, \fBtcp-urg\fP, \fBtcp-ece\fP,
+\fBtcp-cwr\fP.
 .LP
 Primitives may be combined using:
 .IP
 A parenthesized group of primitives and operators.
 .IP
 Negation (`\fB!\fP' or `\fBnot\fP').
 .IP
 Concatenation (`\fB&&\fP' or `\fBand\fP').
 .IP
 Alternation (`\fB||\fP' or `\fBor\fP').
 .LP
 Negation has highest precedence.
 Alternation and concatenation have equal precedence and associate
 left to right.
 Note that explicit \fBand\fR tokens, not juxtaposition,
 are now required for concatenation.
 .LP
 If an identifier is given without a keyword, the most recent keyword
 is assumed.
 For example,
 .in +.5i
 .nf
 \fBnot host vs and ace\fR
 .fi
 .in -.5i
 is short for
 .in +.5i
 .nf
 \fBnot host vs and host ace\fR
 .fi
 .in -.5i
 which should not be confused with
 .in +.5i
 .nf
 \fBnot ( host vs or ace )\fR
 .fi
 .in -.5i
 .SH EXAMPLES
 .LP
 To select all packets arriving at or departing from \fIsundown\fP:
 .RS
 .nf
 \fBhost sundown\fP
 .fi
 .RE
 .LP
 To select traffic between \fIhelios\fR and either \fIhot\fR or \fIace\fR:
 .RS
 .nf
 \fBhost helios and \\( hot or ace \\)\fP
 .fi
 .RE
 .LP
 To select all IP packets between \fIace\fR and any host except \fIhelios\fR:
 .RS
 .nf
 \fBip host ace and not helios\fP
 .fi
 .RE
 .LP
 To select all traffic between local hosts and hosts at Berkeley:
 .RS
 .nf
 .B
 net ucb-ether
 .fi
 .RE
 .LP
 To select all ftp traffic through internet gateway \fIsnup\fP:
 .RS
 .nf
 .B
 gateway snup and (port ftp or ftp-data)
 .fi
 .RE
 .LP
 To select traffic neither sourced from nor destined for local hosts
 (if you gateway to one other net, this stuff should never make it
 onto your local net).
 .RS
 .nf
 .B
 ip and not net \fIlocalnet\fP
 .fi
 .RE
 .LP
 To select the start and end packets (the SYN and FIN packets) of each
 TCP conversation that involves a non-local host.
 .RS
 .nf
 .B
 tcp[tcpflags] & (tcp-syn|tcp-fin) != 0 and not src and dst net \fIlocalnet\fP
 .fi
 .RE
 .LP
 To select all IPv4 HTTP packets to and from port 80, i.e. print only
 packets that contain data, not, for example, SYN and FIN packets and
 ACK-only packets.  (IPv6 is left as an exercise for the reader.)
 .RS
 .nf
 .B
 tcp port 80 and (((ip[2:2] - ((ip[0]&0xf)<<2)) - ((tcp[12]&0xf0)>>2)) != 0)
 .fi
 .RE
 .LP
 To select IP packets longer than 576 bytes sent through gateway \fIsnup\fP:
 .RS
 .nf
 .B
 gateway snup and ip[2:2] > 576
 .fi
 .RE
 .LP
 To select IP broadcast or multicast packets that were
 .I not
 sent via Ethernet broadcast or multicast:
 .RS
 .nf
 .B
 ether[0] & 1 = 0 and ip[16] >= 224
 .fi
 .RE
 .LP
 To select all ICMP packets that are not echo requests/replies (i.e., not
 ping packets):
 .RS
 .nf
 .B
 icmp[icmptype] != icmp-echo and icmp[icmptype] != icmp-echoreply
 .fi
 .RE
 .SH "SEE ALSO"
 pcap(3PCAP)
 .SH BUGS
-Please send problems, bugs, questions, desirable enhancements, etc. to:
+To report a security issue please send an e-mail to security@tcpdump.org.
 .LP
-.RS
-tcpdump-workers@lists.tcpdump.org
-.RE
+To report bugs and other problems, contribute patches, request a
+feature, provide generic feedback etc please see the file
+.I CONTRIBUTING
+in the libpcap source tree root.
 .LP
 Filter expressions on fields other than those in Token Ring headers will
 not correctly handle source-routed Token Ring packets.
 .LP
 Filter expressions on fields other than those in 802.11 headers will not
 correctly handle 802.11 data packets with both To DS and From DS set.
 .LP
 .BR "ip6 proto"
 should chase header chain, but at this moment it does not.
 .BR "ip6 protochain"
 is supplied for this behavior.
 .LP
 Arithmetic expression against transport layer headers, like \fBtcp[0]\fP,
 does not work against IPv6 packets.
 It only looks at IPv4 packets.
Index: vendor/libpcap/dist/pcap-int.h
===================================================================
--- vendor/libpcap/dist/pcap-int.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-int.h	(revision 333789)
@@ -1,469 +1,507 @@
 /*
  * Copyright (c) 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef pcap_int_h
 #define	pcap_int_h
 
+#include <signal.h>
+
 #include <pcap/pcap.h>
 
+#include "varattrs.h"
+#include "fmtutils.h"
+
+/*
+ * Version string.
+ * Uses PACKAGE_VERSION from config.h.
+ */
+#define PCAP_VERSION_STRING "libpcap version " PACKAGE_VERSION
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(_WIN32)
-  /*
-   * Make sure Packet32.h doesn't define BPF structures that we've
-   * probably already defined as a result of including <pcap/pcap.h>.
-   */
-  #define BPF_MAJOR_VERSION
-  #include <Packet32.h>
-#elif defined(MSDOS)
+#ifdef MSDOS
   #include <fcntl.h>
   #include <io.h>
 #endif
 
-#if (defined(_MSC_VER) && (_MSC_VER <= 1200)) /* we are compiling with Visual Studio 6, that doesn't support the LL suffix*/
-
 /*
  * Swap byte ordering of unsigned long long timestamp on a big endian
  * machine.
  */
-#define SWAPLL(ull)  ((ull & 0xff00000000000000) >> 56) | \
-                      ((ull & 0x00ff000000000000) >> 40) | \
-                      ((ull & 0x0000ff0000000000) >> 24) | \
-                      ((ull & 0x000000ff00000000) >> 8)  | \
-                      ((ull & 0x00000000ff000000) << 8)  | \
-                      ((ull & 0x0000000000ff0000) << 24) | \
-                      ((ull & 0x000000000000ff00) << 40) | \
-                      ((ull & 0x00000000000000ff) << 56)
+#define SWAPLL(ull)  ((ull & 0xff00000000000000ULL) >> 56) | \
+                      ((ull & 0x00ff000000000000ULL) >> 40) | \
+                      ((ull & 0x0000ff0000000000ULL) >> 24) | \
+                      ((ull & 0x000000ff00000000ULL) >> 8)  | \
+                      ((ull & 0x00000000ff000000ULL) << 8)  | \
+                      ((ull & 0x0000000000ff0000ULL) << 24) | \
+                      ((ull & 0x000000000000ff00ULL) << 40) | \
+                      ((ull & 0x00000000000000ffULL) << 56)
 
-#else /* A recent Visual studio compiler or not VC */
-
 /*
- * Swap byte ordering of unsigned long long timestamp on a big endian
- * machine.
- */
-#define SWAPLL(ull)  ((ull & 0xff00000000000000LL) >> 56) | \
-                      ((ull & 0x00ff000000000000LL) >> 40) | \
-                      ((ull & 0x0000ff0000000000LL) >> 24) | \
-                      ((ull & 0x000000ff00000000LL) >> 8)  | \
-                      ((ull & 0x00000000ff000000LL) << 8)  | \
-                      ((ull & 0x0000000000ff0000LL) << 24) | \
-                      ((ull & 0x000000000000ff00LL) << 40) | \
-                      ((ull & 0x00000000000000ffLL) << 56)
-
-#endif /* _MSC_VER */
-
-/*
  * Maximum snapshot length.
  *
  * Somewhat arbitrary, but chosen to be:
  *
  *    1) big enough for maximum-size Linux loopback packets (65549)
  *       and some USB packets captured with USBPcap:
  *
  *           http://desowin.org/usbpcap/
  *
  *       (> 131072, < 262144)
  *
  * and
  *
  *    2) small enough not to cause attempts to allocate huge amounts of
  *       memory; some applications might use the snapshot length in a
  *       savefile header to control the size of the buffer they allocate,
  *       so a size of, say, 2^31-1 might not work well.
  *
  * We don't enforce this in pcap_set_snaplen(), but we use it internally.
  */
 #define MAXIMUM_SNAPLEN		262144
 
 struct pcap_opt {
 	char	*device;
 	int	timeout;	/* timeout for buffering */
 	u_int	buffer_size;
 	int	promisc;
 	int	rfmon;		/* monitor mode */
 	int	immediate;	/* immediate mode - deliver packets as soon as they arrive */
+	int	nonblock;	/* non-blocking mode - don't wait for packets to be delivered, return "no packets available" */
 	int	tstamp_type;
 	int	tstamp_precision;
+
+	/*
+	 * Platform-dependent options.
+	 */
+#ifdef __linux__
+	int	protocol;	/* protocol to use when creating PF_PACKET socket */
+#endif
+#ifdef _WIN32
+	int	nocapture_local;/* disable NPF loopback */
+#endif
 };
 
 typedef int	(*activate_op_t)(pcap_t *);
 typedef int	(*can_set_rfmon_op_t)(pcap_t *);
 typedef int	(*read_op_t)(pcap_t *, int cnt, pcap_handler, u_char *);
+typedef int	(*next_packet_op_t)(pcap_t *, struct pcap_pkthdr *, u_char **);
 typedef int	(*inject_op_t)(pcap_t *, const void *, size_t);
+typedef void	(*save_current_filter_op_t)(pcap_t *, const char *);
 typedef int	(*setfilter_op_t)(pcap_t *, struct bpf_program *);
 typedef int	(*setdirection_op_t)(pcap_t *, pcap_direction_t);
 typedef int	(*set_datalink_op_t)(pcap_t *, int);
-typedef int	(*getnonblock_op_t)(pcap_t *, char *);
-typedef int	(*setnonblock_op_t)(pcap_t *, int, char *);
+typedef int	(*getnonblock_op_t)(pcap_t *);
+typedef int	(*setnonblock_op_t)(pcap_t *, int);
 typedef int	(*stats_op_t)(pcap_t *, struct pcap_stat *);
 #ifdef _WIN32
 typedef struct pcap_stat *(*stats_ex_op_t)(pcap_t *, int *);
 typedef int	(*setbuff_op_t)(pcap_t *, int);
 typedef int	(*setmode_op_t)(pcap_t *, int);
 typedef int	(*setmintocopy_op_t)(pcap_t *, int);
 typedef HANDLE	(*getevent_op_t)(pcap_t *);
 typedef int	(*oid_get_request_op_t)(pcap_t *, bpf_u_int32, void *, size_t *);
 typedef int	(*oid_set_request_op_t)(pcap_t *, bpf_u_int32, const void *, size_t *);
 typedef u_int	(*sendqueue_transmit_op_t)(pcap_t *, pcap_send_queue *, int);
 typedef int	(*setuserbuffer_op_t)(pcap_t *, int);
 typedef int	(*live_dump_op_t)(pcap_t *, char *, int, int);
 typedef int	(*live_dump_ended_op_t)(pcap_t *, int);
 typedef PAirpcapHandle	(*get_airpcap_handle_op_t)(pcap_t *);
 #endif
 typedef void	(*cleanup_op_t)(pcap_t *);
 
 /*
  * We put all the stuff used in the read code path at the beginning,
  * to try to keep it together in the same cache line or lines.
  */
 struct pcap {
 	/*
 	 * Method to call to read packets on a live capture.
 	 */
 	read_op_t read_op;
 
 	/*
-	 * Method to call to read packets from a savefile.
+	 * Method to call to read the next packet from a savefile.
 	 */
-	int (*next_packet_op)(pcap_t *, struct pcap_pkthdr *, u_char **);
+	next_packet_op_t next_packet_op;
 
 #ifdef _WIN32
-	ADAPTER *adapter;
+	HANDLE handle;
 #else
 	int fd;
-	int selectable_fd;
 #endif /* _WIN32 */
 
 	/*
 	 * Read buffer.
 	 */
 	u_int bufsize;
 	void *buffer;
 	u_char *bp;
 	int cc;
 
-	int break_loop;		/* flag set to force break from packet-reading loop */
+	sig_atomic_t break_loop; /* flag set to force break from packet-reading loop */
 
 	void *priv;		/* private data for methods */
 
+#ifdef ENABLE_REMOTE
+	struct pcap_samp rmt_samp;	/* parameters related to the sampling process. */
+#endif
+
 	int swapped;
 	FILE *rfile;		/* null if live capture, non-null if savefile */
 	u_int fddipad;
 	struct pcap *next;	/* list of open pcaps that need stuff cleared on close */
 
 	/*
 	 * File version number; meaningful only for a savefile, but we
 	 * keep it here so that apps that (mistakenly) ask for the
 	 * version numbers will get the same zero values that they
 	 * always did.
 	 */
 	int version_major;
 	int version_minor;
 
 	int snapshot;
 	int linktype;		/* Network linktype */
 	int linktype_ext;       /* Extended information stored in the linktype field of a file */
 	int tzoff;		/* timezone offset */
 	int offset;		/* offset for proper alignment */
 	int activated;		/* true if the capture is really started */
 	int oldstyle;		/* if we're opening with pcap_open_live() */
 
 	struct pcap_opt opt;
 
 	/*
 	 * Place holder for pcap_next().
 	 */
 	u_char *pkt;
 
 #ifdef _WIN32
-	struct pcap_stat stat;		/* used for pcap_stats_ex() */
+	struct pcap_stat stat;	/* used for pcap_stats_ex() */
 #endif
 
 	/* We're accepting only packets in this direction/these directions. */
 	pcap_direction_t direction;
 
 	/*
 	 * Flags to affect BPF code generation.
 	 */
 	int bpf_codegen_flags;
 
+#if !defined(_WIN32) && !defined(MSDOS)
+	int selectable_fd;	/* FD on which select()/poll()/epoll_wait()/kevent()/etc. can be done */
+
 	/*
+	 * In case there either is no selectable FD, or there is but
+	 * it doesn't necessarily work (e.g., if it doesn't get notified
+	 * if the packet capture timeout expires before the buffer
+	 * fills up), this points to a timeout that should be used
+	 * in select()/poll()/epoll_wait()/kevent() call.  The pcap_t should
+	 * be put into non-blocking mode, and, if the timeout expires on
+	 * the call, an attempt should be made to read packets from all
+	 * pcap_t's with a required timeout, and the code must be
+	 * prepared not to see any packets from the attempt.
+	 */
+	struct timeval *required_select_timeout;
+#endif
+
+	/*
 	 * Placeholder for filter code if bpf not in kernel.
 	 */
 	struct bpf_program fcode;
 
 	char errbuf[PCAP_ERRBUF_SIZE + 1];
 	int dlt_count;
 	u_int *dlt_list;
 	int tstamp_type_count;
 	u_int *tstamp_type_list;
 	int tstamp_precision_count;
 	u_int *tstamp_precision_list;
 
 	struct pcap_pkthdr pcap_header;	/* This is needed for the pcap_next_ex() to work */
 
 	/*
 	 * More methods.
 	 */
 	activate_op_t activate_op;
 	can_set_rfmon_op_t can_set_rfmon_op;
 	inject_op_t inject_op;
+	save_current_filter_op_t save_current_filter_op;
 	setfilter_op_t setfilter_op;
 	setdirection_op_t setdirection_op;
 	set_datalink_op_t set_datalink_op;
 	getnonblock_op_t getnonblock_op;
 	setnonblock_op_t setnonblock_op;
 	stats_op_t stats_op;
 
 	/*
 	 * Routine to use as callback for pcap_next()/pcap_next_ex().
 	 */
 	pcap_handler oneshot_callback;
 
 #ifdef _WIN32
 	/*
 	 * These are, at least currently, specific to the Win32 NPF
 	 * driver.
 	 */
 	stats_ex_op_t stats_ex_op;
 	setbuff_op_t setbuff_op;
 	setmode_op_t setmode_op;
 	setmintocopy_op_t setmintocopy_op;
 	getevent_op_t getevent_op;
 	oid_get_request_op_t oid_get_request_op;
 	oid_set_request_op_t oid_set_request_op;
 	sendqueue_transmit_op_t sendqueue_transmit_op;
 	setuserbuffer_op_t setuserbuffer_op;
 	live_dump_op_t live_dump_op;
 	live_dump_ended_op_t live_dump_ended_op;
 	get_airpcap_handle_op_t get_airpcap_handle_op;
 #endif
 	cleanup_op_t cleanup_op;
 };
 
 /*
  * BPF code generation flags.
  */
 #define BPF_SPECIAL_VLAN_HANDLING	0x00000001	/* special VLAN handling for Linux */
 
 /*
  * This is a timeval as stored in a savefile.
  * It has to use the same types everywhere, independent of the actual
  * `struct timeval'; `struct timeval' has 32-bit tv_sec values on some
  * platforms and 64-bit tv_sec values on other platforms, and writing
  * out native `struct timeval' values would mean files could only be
  * read on systems with the same tv_sec size as the system on which
  * the file was written.
  */
 
 struct pcap_timeval {
     bpf_int32 tv_sec;		/* seconds */
     bpf_int32 tv_usec;		/* microseconds */
 };
 
 /*
  * This is a `pcap_pkthdr' as actually stored in a savefile.
  *
  * Do not change the format of this structure, in any way (this includes
  * changes that only affect the length of fields in this structure),
  * and do not make the time stamp anything other than seconds and
  * microseconds (e.g., seconds and nanoseconds).  Instead:
  *
  *	introduce a new structure for the new format;
  *
  *	send mail to "tcpdump-workers@lists.tcpdump.org", requesting
  *	a new magic number for your new capture file format, and, when
  *	you get the new magic number, put it in "savefile.c";
  *
  *	use that magic number for save files with the changed record
  *	header;
  *
  *	make the code in "savefile.c" capable of reading files with
  *	the old record header as well as files with the new record header
  *	(using the magic number to determine the header format).
  *
  * Then supply the changes by forking the branch at
  *
  *	https://github.com/the-tcpdump-group/libpcap/issues
  *
  * and issuing a pull request, so that future versions of libpcap and
  * programs that use it (such as tcpdump) will be able to read your new
  * capture file format.
  */
 
 struct pcap_sf_pkthdr {
     struct pcap_timeval ts;	/* time stamp */
     bpf_u_int32 caplen;		/* length of portion present */
     bpf_u_int32 len;		/* length this packet (off wire) */
 };
 
 /*
  * How a `pcap_pkthdr' is actually stored in savefiles written
  * by some patched versions of libpcap (e.g. the ones in Red
  * Hat Linux 6.1 and 6.2).
  *
  * Do not change the format of this structure, in any way (this includes
  * changes that only affect the length of fields in this structure).
  * Instead, introduce a new structure, as per the above.
  */
 
 struct pcap_sf_patched_pkthdr {
     struct pcap_timeval ts;	/* time stamp */
     bpf_u_int32 caplen;		/* length of portion present */
     bpf_u_int32 len;		/* length this packet (off wire) */
     int		index;
     unsigned short protocol;
     unsigned char pkt_type;
 };
 
 /*
  * User data structure for the one-shot callback used for pcap_next()
  * and pcap_next_ex().
  */
 struct oneshot_userdata {
 	struct pcap_pkthdr *hdr;
 	const u_char **pkt;
 	pcap_t *pd;
 };
 
 #ifndef min
 #define min(a, b) ((a) > (b) ? (b) : (a))
 #endif
 
 int	pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
 
 #include <stdarg.h>
 
 #include "portability.h"
 
 /*
  * Does the packet count argument to a module's read routine say
  * "supply packets until you run out of packets"?
  */
 #define PACKET_COUNT_IS_UNLIMITED(count)	((count) <= 0)
 
 /*
  * Routines that most pcap implementations can use for non-blocking mode.
  */
 #if !defined(_WIN32) && !defined(MSDOS)
-int	pcap_getnonblock_fd(pcap_t *, char *);
-int	pcap_setnonblock_fd(pcap_t *p, int, char *);
+int	pcap_getnonblock_fd(pcap_t *);
+int	pcap_setnonblock_fd(pcap_t *p, int);
 #endif
 
 /*
  * Internal interfaces for "pcap_create()".
  *
  * "pcap_create_interface()" is the routine to do a pcap_create on
  * a regular network interface.  There are multiple implementations
  * of this, one for each platform type (Linux, BPF, DLPI, etc.),
  * with the one used chosen by the configure script.
  *
  * "pcap_create_common()" allocates and fills in a pcap_t, for use
  * by pcap_create routines.
  */
 pcap_t	*pcap_create_interface(const char *, char *);
 pcap_t	*pcap_create_common(char *, size_t);
 int	pcap_do_addexit(pcap_t *);
 void	pcap_add_to_pcaps_to_close(pcap_t *);
 void	pcap_remove_from_pcaps_to_close(pcap_t *);
 void	pcap_cleanup_live_common(pcap_t *);
 int	pcap_check_activated(pcap_t *);
 
 /*
  * Internal interfaces for "pcap_findalldevs()".
  *
- * "pcap_platform_finddevs()" is a platform-dependent routine to
+ * A pcap_if_list_t * is a reference to a list of devices.
+ *
+ * A get_if_flags_func is a platform-dependent function called to get
+ * additional interface flags.
+ *
+ * "pcap_platform_finddevs()" is the platform-dependent routine to
  * find local network interfaces.
  *
  * "pcap_findalldevs_interfaces()" is a helper to find those interfaces
  * using the "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.).
  *
- * "pcap_add_if()" adds an interface to the list of interfaces, for
- * use by various "find interfaces" routines.
+ * "add_dev()" adds an entry to a pcap_if_list_t.
+ *
+ * "find_dev()" tries to find a device, by name, in a pcap_if_list_t.
+ *
+ * "find_or_add_dev()" checks whether a device is already in a pcap_if_list_t
+ * and, if not, adds an entry for it.
  */
-int	pcap_platform_finddevs(pcap_if_t **, char *);
+struct pcap_if_list;
+typedef struct pcap_if_list pcap_if_list_t;
+typedef int (*get_if_flags_func)(const char *, bpf_u_int32 *, char *);
+int	pcap_platform_finddevs(pcap_if_list_t *, char *);
 #if !defined(_WIN32) && !defined(MSDOS)
-int	pcap_findalldevs_interfaces(pcap_if_t **, char *,
-	    int (*)(const char *));
+int	pcap_findalldevs_interfaces(pcap_if_list_t *, char *,
+	    int (*)(const char *), get_if_flags_func);
 #endif
-int	add_addr_to_iflist(pcap_if_t **, const char *, bpf_u_int32,
-	    struct sockaddr *, size_t, struct sockaddr *, size_t,
-	    struct sockaddr *, size_t, struct sockaddr *, size_t, char *);
+pcap_if_t *find_or_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
+	    get_if_flags_func, const char *, char *);
+pcap_if_t *find_dev(pcap_if_list_t *, const char *);
+pcap_if_t *add_dev(pcap_if_list_t *, const char *, bpf_u_int32, const char *,
+	    char *);
 int	add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t,
 	    struct sockaddr *, size_t, struct sockaddr *, size_t,
 	    struct sockaddr *dstaddr, size_t, char *errbuf);
-int	pcap_add_if(pcap_if_t **, const char *, bpf_u_int32, const char *,
-	    char *);
-int	add_or_find_if(pcap_if_t **, pcap_if_t **, const char *, bpf_u_int32,
-	    const char *, char *);
 #ifndef _WIN32
-bpf_u_int32 if_flags_to_pcap_flags(const char *, u_int);
+pcap_if_t *find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32,
+	    get_if_flags_func, char *);
+int	add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
+	    get_if_flags_func,
+	    struct sockaddr *, size_t, struct sockaddr *, size_t,
+	    struct sockaddr *, size_t, struct sockaddr *, size_t, char *);
 #endif
 
 /*
  * Internal interfaces for "pcap_open_offline()".
  *
  * "pcap_open_offline_common()" allocates and fills in a pcap_t, for use
  * by pcap_open_offline routines.
  *
  * "sf_cleanup()" closes the file handle associated with a pcap_t, if
  * appropriate, and frees all data common to all modules for handling
  * savefile types.
  */
 pcap_t	*pcap_open_offline_common(char *ebuf, size_t size);
 void	sf_cleanup(pcap_t *p);
 
 /*
  * Internal interfaces for both "pcap_create()" and routines that
  * open savefiles.
  *
  * "pcap_oneshot()" is the standard one-shot callback for "pcap_next()"
  * and "pcap_next_ex()".
  */
 void	pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *);
 
 #ifdef _WIN32
 void	pcap_win32_err_to_str(DWORD, char *);
 #endif
 
 int	install_bpf_program(pcap_t *, struct bpf_program *);
 
 int	pcap_strcasecmp(const char *, const char *);
+
+#ifdef YYDEBUG
+extern int pcap_debug;
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
Index: vendor/libpcap/dist/pcap-libdlpi.c
===================================================================
--- vendor/libpcap/dist/pcap-libdlpi.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-libdlpi.c	(revision 333789)
@@ -1,439 +1,495 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * This code contributed by Sagun Shakya (sagun.shakya@sun.com)
  */
 /*
  * Packet capture routines for DLPI using libdlpi under SunOS 5.11.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/bufmod.h>
 #include <sys/stream.h>
 #include <libdlpi.h>
 #include <errno.h>
 #include <memory.h>
 #include <stropts.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "pcap-int.h"
 #include "dlpisubs.h"
 
 /* Forwards. */
 static int dlpromiscon(pcap_t *, bpf_u_int32);
 static int pcap_read_libdlpi(pcap_t *, int, pcap_handler, u_char *);
 static int pcap_inject_libdlpi(pcap_t *, const void *, size_t);
 static void pcap_libdlpi_err(const char *, const char *, int, char *);
 static void pcap_cleanup_libdlpi(pcap_t *);
 
 /*
  * list_interfaces() will list all the network links that are
  * available on a system.
  */
 static boolean_t list_interfaces(const char *, void *);
 
 typedef struct linknamelist {
 	char	linkname[DLPI_LINKNAME_MAX];
 	struct linknamelist *lnl_next;
 } linknamelist_t;
 
 typedef struct linkwalk {
 	linknamelist_t	*lw_list;
 	int		lw_err;
 } linkwalk_t;
 
 /*
  * The caller of this function should free the memory allocated
  * for each linknamelist_t "entry" allocated.
  */
 static boolean_t
 list_interfaces(const char *linkname, void *arg)
 {
 	linkwalk_t	*lwp = arg;
 	linknamelist_t	*entry;
 
 	if ((entry = calloc(1, sizeof(linknamelist_t))) == NULL) {
 		lwp->lw_err = ENOMEM;
 		return (B_TRUE);
 	}
 	(void) strlcpy(entry->linkname, linkname, DLPI_LINKNAME_MAX);
 
 	if (lwp->lw_list == NULL) {
 		lwp->lw_list = entry;
 	} else {
 		entry->lnl_next = lwp->lw_list;
 		lwp->lw_list = entry;
 	}
 
 	return (B_FALSE);
 }
 
 static int
 pcap_activate_libdlpi(pcap_t *p)
 {
 	struct pcap_dlpi *pd = p->priv;
 	int status = 0;
 	int retv;
 	dlpi_handle_t dh;
 	dlpi_info_t dlinfo;
 
 	/*
 	 * Enable Solaris raw and passive DLPI extensions;
 	 * dlpi_open() will not fail if the underlying link does not support
 	 * passive mode. See dlpi(7P) for details.
 	 */
 	retv = dlpi_open(p->opt.device, &dh, DLPI_RAW|DLPI_PASSIVE);
 	if (retv != DLPI_SUCCESS) {
 		if (retv == DLPI_ELINKNAMEINVAL || retv == DLPI_ENOLINK)
 			status = PCAP_ERROR_NO_SUCH_DEVICE;
 		else if (retv == DL_SYSERR &&
 		    (errno == EPERM || errno == EACCES))
 			status = PCAP_ERROR_PERM_DENIED;
 		else
 			status = PCAP_ERROR;
 		pcap_libdlpi_err(p->opt.device, "dlpi_open", retv,
 		    p->errbuf);
 		return (status);
 	}
 	pd->dlpi_hd = dh;
 
 	if (p->opt.rfmon) {
 		/*
 		 * This device exists, but we don't support monitor mode
 		 * any platforms that support DLPI.
 		 */
 		status = PCAP_ERROR_RFMON_NOTSUP;
 		goto bad;
 	}
 
 	/* Bind with DLPI_ANY_SAP. */
 	if ((retv = dlpi_bind(pd->dlpi_hd, DLPI_ANY_SAP, 0)) != DLPI_SUCCESS) {
 		status = PCAP_ERROR;
 		pcap_libdlpi_err(p->opt.device, "dlpi_bind", retv, p->errbuf);
 		goto bad;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 	/* Enable promiscuous mode. */
 	if (p->opt.promisc) {
 		retv = dlpromiscon(p, DL_PROMISC_PHYS);
 		if (retv < 0) {
 			/*
 			 * "You don't have permission to capture on
 			 * this device" and "you don't have permission
 			 * to capture in promiscuous mode on this
 			 * device" are different; let the user know,
 			 * so if they can't get permission to
 			 * capture in promiscuous mode, they can at
 			 * least try to capture in non-promiscuous
 			 * mode.
 			 *
 			 * XXX - you might have to capture in
 			 * promiscuous mode to see outgoing packets.
 			 */
 			if (retv == PCAP_ERROR_PERM_DENIED)
 				status = PCAP_ERROR_PROMISC_PERM_DENIED;
 			else
 				status = retv;
 			goto bad;
 		}
 	} else {
 		/* Try to enable multicast. */
 		retv = dlpromiscon(p, DL_PROMISC_MULTI);
 		if (retv < 0) {
 			status = retv;
 			goto bad;
 		}
 	}
 
 	/* Try to enable SAP promiscuity. */
 	retv = dlpromiscon(p, DL_PROMISC_SAP);
 	if (retv < 0) {
 		/*
 		 * Not fatal, since the DL_PROMISC_PHYS mode worked.
 		 * Report it as a warning, however.
 		 */
 		if (p->opt.promisc)
 			status = PCAP_WARNING;
 		else {
 			status = retv;
 			goto bad;
 		}
 	}
 
 	/* Determine link type.  */
 	if ((retv = dlpi_info(pd->dlpi_hd, &dlinfo, 0)) != DLPI_SUCCESS) {
 		status = PCAP_ERROR;
 		pcap_libdlpi_err(p->opt.device, "dlpi_info", retv, p->errbuf);
 		goto bad;
 	}
 
 	if (pcap_process_mactype(p, dlinfo.di_mactype) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	p->fd = dlpi_fd(pd->dlpi_hd);
 
 	/* Push and configure bufmod. */
 	if (pcap_conf_bufmod(p, p->snapshot) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * Flush the read side.
 	 */
 	if (ioctl(p->fd, I_FLUSH, FLUSHR) != 0) {
 		status = PCAP_ERROR;
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "FLUSHR: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "FLUSHR");
 		goto bad;
 	}
 
 	/* Allocate data buffer. */
 	if (pcap_alloc_databuf(p) != 0) {
 		status = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * "p->fd" is a FD for a STREAMS device, so "select()" and
 	 * "poll()" should work on it.
 	 */
 	p->selectable_fd = p->fd;
 
 	p->read_op = pcap_read_libdlpi;
 	p->inject_op = pcap_inject_libdlpi;
 	p->setfilter_op = install_bpf_program;	/* No kernel filtering */
 	p->setdirection_op = NULL;	/* Not implemented */
 	p->set_datalink_op = NULL;	/* Can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_dlpi;
 	p->cleanup_op = pcap_cleanup_libdlpi;
 
 	return (status);
 bad:
 	pcap_cleanup_libdlpi(p);
 	return (status);
 }
 
 #define STRINGIFY(n)	#n
 
 static int
 dlpromiscon(pcap_t *p, bpf_u_int32 level)
 {
 	struct pcap_dlpi *pd = p->priv;
 	int retv;
 	int err;
 
 	retv = dlpi_promiscon(pd->dlpi_hd, level);
 	if (retv != DLPI_SUCCESS) {
 		if (retv == DL_SYSERR &&
 		    (errno == EPERM || errno == EACCES))
 			err = PCAP_ERROR_PERM_DENIED;
 		else
 			err = PCAP_ERROR;
 		pcap_libdlpi_err(p->opt.device, "dlpi_promiscon" STRINGIFY(level),
 		    retv, p->errbuf);
 		return (err);
 	}
 	return (0);
 }
 
 /*
  * Presumably everything returned by dlpi_walk() is a DLPI device,
  * so there's no work to be done here to check whether name refers
  * to a DLPI device.
  */
 static int
 is_dlpi_interface(const char *name _U_)
 {
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do other than mark loopback devices as "the
+	 * connected/disconnected status doesn't apply".
+	 *
+	 * XXX - on Solaris, can we do what the dladm command does,
+	 * i.e. get a connected/disconnected indication from a kstat?
+	 * (Note that you can also get the link speed, and possibly
+	 * other information, from a kstat as well.)
+	 */
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback devices aren't wireless, and "connected"/
+		 * "disconnected" doesn't apply to them.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return (0);
+	}
+	return (0);
+}
+
 /*
  * In Solaris, the "standard" mechanism" i.e SIOCGLIFCONF will only find
  * network links that are plumbed and are up. dlpi_walk(3DLPI) will find
  * additional network links present in the system.
  */
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 	int retv = 0;
 
 	linknamelist_t	*entry, *next;
 	linkwalk_t	lw = {NULL, 0};
 	int 		save_errno;
 
 	/*
 	 * Get the list of regular interfaces first.
 	 */
-	if (pcap_findalldevs_interfaces(alldevsp, errbuf, is_dlpi_interface) == -1)
+	if (pcap_findalldevs_interfaces(devlistp, errbuf,
+	    is_dlpi_interface, get_if_flags) == -1)
 		return (-1);	/* failure */
 
 	/* dlpi_walk() for loopback will be added here. */
 
+	/*
+	 * Find all DLPI devices in the current zone.
+	 *
+	 * XXX - will pcap_findalldevs_interfaces() find any devices
+	 * outside the current zone?  If not, the only reason to call
+	 * it would be to get the interface addresses.
+	 */
 	dlpi_walk(list_interfaces, &lw, 0);
 
 	if (lw.lw_err != 0) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "dlpi_walk: %s", pcap_strerror(lw.lw_err));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    lw.lw_err, "dlpi_walk");
 		retv = -1;
 		goto done;
 	}
 
 	/* Add linkname if it does not exist on the list. */
 	for (entry = lw.lw_list; entry != NULL; entry = entry->lnl_next) {
-		if (pcap_add_if(alldevsp, entry->linkname, 0, NULL, errbuf) < 0)
+		/*
+		 * If it isn't already in the list of devices, try to
+		 * add it.
+		 */
+		if (find_or_add_dev(devlistp, entry->linkname, 0, get_if_flags,
+		    NULL, errbuf) == NULL)
 			retv = -1;
 	}
 done:
 	save_errno = errno;
 	for (entry = lw.lw_list; entry != NULL; entry = next) {
 		next = entry->lnl_next;
 		free(entry);
 	}
 	errno = save_errno;
 
 	return (retv);
 }
 
 /*
  * Read data received on DLPI handle. Returns -2 if told to terminate, else
  * returns the number of packets read.
  */
 static int
 pcap_read_libdlpi(pcap_t *p, int count, pcap_handler callback, u_char *user)
 {
 	struct pcap_dlpi *pd = p->priv;
 	int len;
 	u_char *bufp;
 	size_t msglen;
 	int retv;
 
 	len = p->cc;
 	if (len != 0) {
 		bufp = p->bp;
 		goto process_pkts;
 	}
 	do {
 		/* Has "pcap_breakloop()" been called? */
 		if (p->break_loop) {
 			/*
 			 * Yes - clear the flag that indicates that it has,
 			 * and return -2 to indicate that we were told to
 			 * break out of the loop.
 			 */
 			p->break_loop = 0;
 			return (-2);
 		}
 
 		msglen = p->bufsize;
 		bufp = (u_char *)p->buffer + p->offset;
 
 		retv = dlpi_recv(pd->dlpi_hd, NULL, NULL, bufp,
 		    &msglen, -1, NULL);
 		if (retv != DLPI_SUCCESS) {
 			/*
 			 * This is most likely a call to terminate out of the
 			 * loop. So, do not return an error message, instead
 			 * check if "pcap_breakloop()" has been called above.
 			 */
 			if (retv == DL_SYSERR && errno == EINTR) {
 				len = 0;
 				continue;
 			}
 			pcap_libdlpi_err(dlpi_linkname(pd->dlpi_hd),
 			    "dlpi_recv", retv, p->errbuf);
 			return (-1);
 		}
 		len = msglen;
 	} while (len == 0);
 
 process_pkts:
 	return (pcap_process_pkts(p, callback, user, count, bufp, len));
 }
 
 static int
 pcap_inject_libdlpi(pcap_t *p, const void *buf, size_t size)
 {
 	struct pcap_dlpi *pd = p->priv;
 	int retv;
 
 	retv = dlpi_send(pd->dlpi_hd, NULL, 0, buf, size, NULL);
 	if (retv != DLPI_SUCCESS) {
 		pcap_libdlpi_err(dlpi_linkname(pd->dlpi_hd), "dlpi_send", retv,
 		    p->errbuf);
 		return (-1);
 	}
 	/*
 	 * dlpi_send(3DLPI) does not provide a way to return the number of
 	 * bytes sent on the wire. Based on the fact that DLPI_SUCCESS was
 	 * returned we are assuming 'size' bytes were sent.
 	 */
 	return (size);
 }
 
 /*
  * Close dlpi handle.
  */
 static void
 pcap_cleanup_libdlpi(pcap_t *p)
 {
 	struct pcap_dlpi *pd = p->priv;
 
 	if (pd->dlpi_hd != NULL) {
 		dlpi_close(pd->dlpi_hd);
 		pd->dlpi_hd = NULL;
 		p->fd = -1;
 	}
 	pcap_cleanup_live_common(p);
 }
 
 /*
  * Write error message to buffer.
  */
 static void
 pcap_libdlpi_err(const char *linkname, const char *func, int err, char *errbuf)
 {
 	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "libpcap: %s failed on %s: %s",
 	    func, linkname, dlpi_strerror(err));
 }
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_dlpi));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_libdlpi;
 	return (p);
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-linux.c
===================================================================
--- vendor/libpcap/dist/pcap-linux.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-linux.c	(revision 333789)
@@ -1,6879 +1,7187 @@
 /*
  *  pcap-linux.c: Packet capture interface to the Linux kernel
  *
  *  Copyright (c) 2000 Torsten Landschoff <torsten@debian.org>
  *  		       Sebastian Krahmer  <krahmer@cs.uni-potsdam.de>
  *
  *  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
  *     notice, this list of conditions and the following disclaimer in
  *     the documentation and/or other materials provided with the
  *     distribution.
  *  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.
  *
  *  Modifications:     Added PACKET_MMAP support
  *                     Paolo Abeni <paolo.abeni@email.it>
  *                     Added TPACKET_V3 support
  *                     Gabor Tatarka <gabor.tatarka@ericsson.com>
  *
  *                     based on previous works of:
  *                     Simon Patarin <patarin@cs.unibo.it>
  *                     Phil Wood <cpw@lanl.gov>
  *
  * Monitor-mode support for mac80211 includes code taken from the iw
  * command; the copyright notice for that code is
  *
  * Copyright (c) 2007, 2008	Johannes Berg
  * Copyright (c) 2007		Andy Lutomirski
  * Copyright (c) 2007		Mike Kershaw
  * Copyright (c) 2008		Gábor Stefanik
  *
  * All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * Known problems with 2.0[.x] kernels:
  *
  *   - The loopback device gives every packet twice; on 2.2[.x] kernels,
  *     if we use PF_PACKET, we can filter out the transmitted version
  *     of the packet by using data in the "sockaddr_ll" returned by
  *     "recvfrom()", but, on 2.0[.x] kernels, we have to use
  *     PF_INET/SOCK_PACKET, which means "recvfrom()" supplies a
  *     "sockaddr_pkt" which doesn't give us enough information to let
  *     us do that.
  *
  *   - We have to set the interface's IFF_PROMISC flag ourselves, if
  *     we're to run in promiscuous mode, which means we have to turn
  *     it off ourselves when we're done; the kernel doesn't keep track
  *     of how many sockets are listening promiscuously, which means
  *     it won't get turned off automatically when no sockets are
  *     listening promiscuously.  We catch "pcap_close()" and, for
  *     interfaces we put into promiscuous mode, take them out of
  *     promiscuous mode - which isn't necessarily the right thing to
  *     do, if another socket also requested promiscuous mode between
  *     the time when we opened the socket and the time when we close
  *     the socket.
  *
  *   - MSG_TRUNC isn't supported, so you can't specify that "recvfrom()"
  *     return the amount of data that you could have read, rather than
  *     the amount that was returned, so we can't just allocate a buffer
  *     whose size is the snapshot length and pass the snapshot length
  *     as the byte count, and also pass MSG_TRUNC, so that the return
  *     value tells us how long the packet was on the wire.
  *
  *     This means that, if we want to get the actual size of the packet,
  *     so we can return it in the "len" field of the packet header,
  *     we have to read the entire packet, not just the part that fits
  *     within the snapshot length, and thus waste CPU time copying data
  *     from the kernel that our caller won't see.
  *
  *     We have to get the actual size, and supply it in "len", because
  *     otherwise, the IP dissector in tcpdump, for example, will complain
  *     about "truncated-ip", as the packet will appear to have been
  *     shorter, on the wire, than the IP header said it should have been.
  */
 
 
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <sys/mman.h>
 #include <linux/if.h>
 #include <linux/if_packet.h>
 #include <linux/sockios.h>
 #include <netinet/in.h>
 #include <linux/if_ether.h>
 #include <net/if_arp.h>
 #include <poll.h>
 #include <dirent.h>
 
 #include "pcap-int.h"
 #include "pcap/sll.h"
 #include "pcap/vlan.h"
 
 /*
  * If PF_PACKET is defined, we can use {SOCK_RAW,SOCK_DGRAM}/PF_PACKET
  * sockets rather than SOCK_PACKET sockets.
  *
  * To use them, we include <linux/if_packet.h> rather than
  * <netpacket/packet.h>; we do so because
  *
  *	some Linux distributions (e.g., Slackware 4.0) have 2.2 or
  *	later kernels and libc5, and don't provide a <netpacket/packet.h>
  *	file;
  *
  *	not all versions of glibc2 have a <netpacket/packet.h> file
  *	that defines stuff needed for some of the 2.4-or-later-kernel
  *	features, so if the system has a 2.4 or later kernel, we
  *	still can't use those features.
  *
  * We're already including a number of other <linux/XXX.h> headers, and
  * this code is Linux-specific (no other OS has PF_PACKET sockets as
  * a raw packet capture mechanism), so it's not as if you gain any
  * useful portability by using <netpacket/packet.h>
  *
  * XXX - should we just include <linux/if_packet.h> even if PF_PACKET
  * isn't defined?  It only defines one data structure in 2.0.x, so
  * it shouldn't cause any problems.
  */
 #ifdef PF_PACKET
 # include <linux/if_packet.h>
 
  /*
   * On at least some Linux distributions (for example, Red Hat 5.2),
   * there's no <netpacket/packet.h> file, but PF_PACKET is defined if
   * you include <sys/socket.h>, but <linux/if_packet.h> doesn't define
   * any of the PF_PACKET stuff such as "struct sockaddr_ll" or any of
   * the PACKET_xxx stuff.
   *
   * So we check whether PACKET_HOST is defined, and assume that we have
   * PF_PACKET sockets only if it is defined.
   */
 # ifdef PACKET_HOST
 #  define HAVE_PF_PACKET_SOCKETS
 #  ifdef PACKET_AUXDATA
 #   define HAVE_PACKET_AUXDATA
 #  endif /* PACKET_AUXDATA */
 # endif /* PACKET_HOST */
 
 
  /* check for memory mapped access avaibility. We assume every needed
   * struct is defined if the macro TPACKET_HDRLEN is defined, because it
   * uses many ring related structs and macros */
 # ifdef PCAP_SUPPORT_PACKET_RING
 # ifdef TPACKET_HDRLEN
 #  define HAVE_PACKET_RING
 #  ifdef TPACKET3_HDRLEN
 #   define HAVE_TPACKET3
 #  endif /* TPACKET3_HDRLEN */
 #  ifdef TPACKET2_HDRLEN
 #   define HAVE_TPACKET2
 #  else  /* TPACKET2_HDRLEN */
 #   define TPACKET_V1	0    /* Old kernel with only V1, so no TPACKET_Vn defined */
 #  endif /* TPACKET2_HDRLEN */
 # endif /* TPACKET_HDRLEN */
 # endif /* PCAP_SUPPORT_PACKET_RING */
 #endif /* PF_PACKET */
 
 #ifdef SO_ATTACH_FILTER
 #include <linux/types.h>
 #include <linux/filter.h>
 #endif
 
 #ifdef HAVE_LINUX_NET_TSTAMP_H
 #include <linux/net_tstamp.h>
 #endif
 
 #ifdef HAVE_LINUX_SOCKIOS_H
 #include <linux/sockios.h>
 #endif
 
 #ifdef HAVE_LINUX_IF_BONDING_H
 #include <linux/if_bonding.h>
 
 /*
  * The ioctl code to use to check whether a device is a bonding device.
  */
 #if defined(SIOCBONDINFOQUERY)
 	#define BOND_INFO_QUERY_IOCTL SIOCBONDINFOQUERY
 #elif defined(BOND_INFO_QUERY_OLD)
 	#define BOND_INFO_QUERY_IOCTL BOND_INFO_QUERY_OLD
 #endif
 #endif /* HAVE_LINUX_IF_BONDING_H */
 
 /*
  * Got Wireless Extensions?
  */
 #ifdef HAVE_LINUX_WIRELESS_H
 #include <linux/wireless.h>
 #endif /* HAVE_LINUX_WIRELESS_H */
 
 /*
  * Got libnl?
  */
 #ifdef HAVE_LIBNL
 #include <linux/nl80211.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
 #include <netlink/genl/ctrl.h>
 #include <netlink/msg.h>
 #include <netlink/attr.h>
 #endif /* HAVE_LIBNL */
 
 /*
  * Got ethtool support?
  */
 #ifdef HAVE_LINUX_ETHTOOL_H
 #include <linux/ethtool.h>
 #endif
 
 #ifndef HAVE_SOCKLEN_T
 typedef int		socklen_t;
 #endif
 
 #ifndef MSG_TRUNC
 /*
  * This is being compiled on a system that lacks MSG_TRUNC; define it
  * with the value it has in the 2.2 and later kernels, so that, on
  * those kernels, when we pass it in the flags argument to "recvfrom()"
  * we're passing the right value and thus get the MSG_TRUNC behavior
  * we want.  (We don't get that behavior on 2.0[.x] kernels, because
  * they didn't support MSG_TRUNC.)
  */
 #define MSG_TRUNC	0x20
 #endif
 
 #ifndef SOL_PACKET
 /*
  * This is being compiled on a system that lacks SOL_PACKET; define it
  * with the value it has in the 2.2 and later kernels, so that we can
  * set promiscuous mode in the good modern way rather than the old
  * 2.0-kernel crappy way.
  */
 #define SOL_PACKET	263
 #endif
 
 #define MAX_LINKHEADER_SIZE	256
 
 /*
  * When capturing on all interfaces we use this as the buffer size.
  * Should be bigger then all MTUs that occur in real life.
  * 64kB should be enough for now.
  */
 #define BIGGER_THAN_ALL_MTUS	(64*1024)
 
 /*
  * Private data for capturing on Linux SOCK_PACKET or PF_PACKET sockets.
  */
 struct pcap_linux {
 	u_int	packets_read;	/* count of packets read with recvfrom() */
 	long	proc_dropped;	/* packets reported dropped by /proc/net/dev */
 	struct pcap_stat stat;
 
 	char	*device;	/* device name */
 	int	filter_in_userland; /* must filter in userland */
 	int	blocks_to_filter_in_userland;
 	int	must_do_on_close; /* stuff we must do when we close */
 	int	timeout;	/* timeout for buffering */
 	int	sock_packet;	/* using Linux 2.0 compatible interface */
 	int	cooked;		/* using SOCK_DGRAM rather than SOCK_RAW */
 	int	ifindex;	/* interface index of device we're bound to */
 	int	lo_ifindex;	/* interface index of the loopback device */
 	bpf_u_int32 oldmode;	/* mode to restore when turning monitor mode off */
 	char	*mondevice;	/* mac80211 monitor device we created */
 	u_char	*mmapbuf;	/* memory-mapped region pointer */
 	size_t	mmapbuflen;	/* size of region */
 	int	vlan_offset;	/* offset at which to insert vlan tags; if -1, don't insert */
 	u_int	tp_version;	/* version of tpacket_hdr for mmaped ring */
 	u_int	tp_hdrlen;	/* hdrlen of tpacket_hdr for mmaped ring */
 	u_char	*oneshot_buffer; /* buffer for copy of packet */
 	int	poll_timeout;	/* timeout to use in poll() */
 #ifdef HAVE_TPACKET3
 	unsigned char *current_packet; /* Current packet within the TPACKET_V3 block. Move to next block if NULL. */
 	int packets_left; /* Unhandled packets left within the block from previous call to pcap_read_linux_mmap_v3 in case of TPACKET_V3. */
 #endif
 };
 
 /*
  * Stuff to do when we close.
  */
 #define MUST_CLEAR_PROMISC	0x00000001	/* clear promiscuous mode */
 #define MUST_CLEAR_RFMON	0x00000002	/* clear rfmon (monitor) mode */
 #define MUST_DELETE_MONIF	0x00000004	/* delete monitor-mode interface */
 
 /*
  * Prototypes for internal functions and methods.
  */
+static int get_if_flags(const char *, bpf_u_int32 *, char *);
+static int is_wifi(int, const char *);
 static void map_arphrd_to_dlt(pcap_t *, int, int, const char *, int);
 #ifdef HAVE_PF_PACKET_SOCKETS
 static short int map_packet_type_to_sll_type(short int);
 #endif
 static int pcap_activate_linux(pcap_t *);
 static int activate_old(pcap_t *);
 static int activate_new(pcap_t *);
 static int activate_mmap(pcap_t *, int *);
 static int pcap_can_set_rfmon_linux(pcap_t *);
 static int pcap_read_linux(pcap_t *, int, pcap_handler, u_char *);
 static int pcap_read_packet(pcap_t *, pcap_handler, u_char *);
 static int pcap_inject_linux(pcap_t *, const void *, size_t);
 static int pcap_stats_linux(pcap_t *, struct pcap_stat *);
 static int pcap_setfilter_linux(pcap_t *, struct bpf_program *);
 static int pcap_setdirection_linux(pcap_t *, pcap_direction_t);
 static int pcap_set_datalink_linux(pcap_t *, int);
 static void pcap_cleanup_linux(pcap_t *);
 
 /*
  * This is what the header structure looks like in a 64-bit kernel;
  * we use this, rather than struct tpacket_hdr, if we're using
  * TPACKET_V1 in 32-bit code running on a 64-bit kernel.
  */
 struct tpacket_hdr_64 {
 	uint64_t	tp_status;
 	unsigned int	tp_len;
 	unsigned int	tp_snaplen;
 	unsigned short	tp_mac;
 	unsigned short	tp_net;
 	unsigned int	tp_sec;
 	unsigned int	tp_usec;
 };
 
 /*
  * We use this internally as the tpacket version for TPACKET_V1 in
  * 32-bit code on a 64-bit kernel.
  */
 #define TPACKET_V1_64 99
 
 union thdr {
 	struct tpacket_hdr		*h1;
 	struct tpacket_hdr_64		*h1_64;
 #ifdef HAVE_TPACKET2
 	struct tpacket2_hdr		*h2;
 #endif
 #ifdef HAVE_TPACKET3
 	struct tpacket_block_desc	*h3;
 #endif
 	void				*raw;
 };
 
 #ifdef HAVE_PACKET_RING
 #define RING_GET_FRAME_AT(h, offset) (((union thdr **)h->buffer)[(offset)])
 #define RING_GET_CURRENT_FRAME(h) RING_GET_FRAME_AT(h, h->offset)
 
 static void destroy_ring(pcap_t *handle);
 static int create_ring(pcap_t *handle, int *status);
 static int prepare_tpacket_socket(pcap_t *handle);
 static void pcap_cleanup_linux_mmap(pcap_t *);
 static int pcap_read_linux_mmap_v1(pcap_t *, int, pcap_handler , u_char *);
 static int pcap_read_linux_mmap_v1_64(pcap_t *, int, pcap_handler , u_char *);
 #ifdef HAVE_TPACKET2
 static int pcap_read_linux_mmap_v2(pcap_t *, int, pcap_handler , u_char *);
 #endif
 #ifdef HAVE_TPACKET3
 static int pcap_read_linux_mmap_v3(pcap_t *, int, pcap_handler , u_char *);
 #endif
 static int pcap_setfilter_linux_mmap(pcap_t *, struct bpf_program *);
-static int pcap_setnonblock_mmap(pcap_t *p, int nonblock, char *errbuf);
-static int pcap_getnonblock_mmap(pcap_t *p, char *errbuf);
+static int pcap_setnonblock_mmap(pcap_t *p, int nonblock);
+static int pcap_getnonblock_mmap(pcap_t *p);
 static void pcap_oneshot_mmap(u_char *user, const struct pcap_pkthdr *h,
     const u_char *bytes);
 #endif
 
+/*
+ * In pre-3.0 kernels, the tp_vlan_tci field is set to whatever the
+ * vlan_tci field in the skbuff is.  0 can either mean "not on a VLAN"
+ * or "on VLAN 0".  There is no flag set in the tp_status field to
+ * distinguish between them.
+ *
+ * In 3.0 and later kernels, if there's a VLAN tag present, the tp_vlan_tci
+ * field is set to the VLAN tag, and the TP_STATUS_VLAN_VALID flag is set
+ * in the tp_status field, otherwise the tp_vlan_tci field is set to 0 and
+ * the TP_STATUS_VLAN_VALID flag isn't set in the tp_status field.
+ *
+ * With a pre-3.0 kernel, we cannot distinguish between packets with no
+ * VLAN tag and packets on VLAN 0, so we will mishandle some packets, and
+ * there's nothing we can do about that.
+ *
+ * So, on those systems, which never set the TP_STATUS_VLAN_VALID flag, we
+ * continue the behavior of earlier libpcaps, wherein we treated packets
+ * with a VLAN tag of 0 as being packets without a VLAN tag rather than packets
+ * on VLAN 0.  We do this by treating packets with a tp_vlan_tci of 0 and
+ * with the TP_STATUS_VLAN_VALID flag not set in tp_status as not having
+ * VLAN tags.  This does the right thing on 3.0 and later kernels, and
+ * continues the old unfixably-imperfect behavior on pre-3.0 kernels.
+ *
+ * If TP_STATUS_VLAN_VALID isn't defined, we test it as the 0x10 bit; it
+ * has that value in 3.0 and later kernels.
+ */
+#ifdef TP_STATUS_VLAN_VALID
+  #define VLAN_VALID(hdr, hv)	((hv)->tp_vlan_tci != 0 || ((hdr)->tp_status & TP_STATUS_VLAN_VALID))
+#else
+  /*
+   * This is being compiled on a system that lacks TP_STATUS_VLAN_VALID,
+   * so we testwith the value it has in the 3.0 and later kernels, so
+   * we can test it if we're running on a system that has it.  (If we're
+   * running on a system that doesn't have it, it won't be set in the
+   * tp_status field, so the tests of it will always fail; that means
+   * we behave the way we did before we introduced this macro.)
+   */
+  #define VLAN_VALID(hdr, hv)	((hv)->tp_vlan_tci != 0 || ((hdr)->tp_status & 0x10))
+#endif
+
 #ifdef TP_STATUS_VLAN_TPID_VALID
 # define VLAN_TPID(hdr, hv)	(((hv)->tp_vlan_tpid || ((hdr)->tp_status & TP_STATUS_VLAN_TPID_VALID)) ? (hv)->tp_vlan_tpid : ETH_P_8021Q)
 #else
 # define VLAN_TPID(hdr, hv)	ETH_P_8021Q
 #endif
 
 /*
  * Wrap some ioctl calls
  */
 #ifdef HAVE_PF_PACKET_SOCKETS
 static int	iface_get_id(int fd, const char *device, char *ebuf);
 #endif /* HAVE_PF_PACKET_SOCKETS */
 static int	iface_get_mtu(int fd, const char *device, char *ebuf);
 static int 	iface_get_arptype(int fd, const char *device, char *ebuf);
 #ifdef HAVE_PF_PACKET_SOCKETS
-static int 	iface_bind(int fd, int ifindex, char *ebuf);
+static int 	iface_bind(int fd, int ifindex, char *ebuf, int protocol);
 #ifdef IW_MODE_MONITOR
 static int	has_wext(int sock_fd, const char *device, char *ebuf);
 #endif /* IW_MODE_MONITOR */
 static int	enter_rfmon_mode(pcap_t *handle, int sock_fd,
     const char *device);
 #endif /* HAVE_PF_PACKET_SOCKETS */
 #if defined(HAVE_LINUX_NET_TSTAMP_H) && defined(PACKET_TIMESTAMP)
 static int	iface_ethtool_get_ts_info(const char *device, pcap_t *handle,
     char *ebuf);
 #endif
 #ifdef HAVE_PACKET_RING
 static int	iface_get_offload(pcap_t *handle);
 #endif
 static int 	iface_bind_old(int fd, const char *device, char *ebuf);
 
 #ifdef SO_ATTACH_FILTER
 static int	fix_program(pcap_t *handle, struct sock_fprog *fcode,
     int is_mapped);
 static int	fix_offset(struct bpf_insn *p);
 static int	set_kernel_filter(pcap_t *handle, struct sock_fprog *fcode);
 static int	reset_kernel_filter(pcap_t *handle);
 
 static struct sock_filter	total_insn
 	= BPF_STMT(BPF_RET | BPF_K, 0);
 static struct sock_fprog	total_fcode
 	= { 1, &total_insn };
 #endif /* SO_ATTACH_FILTER */
 
 pcap_t *
 pcap_create_interface(const char *device, char *ebuf)
 {
 	pcap_t *handle;
 
 	handle = pcap_create_common(ebuf, sizeof (struct pcap_linux));
 	if (handle == NULL)
 		return NULL;
 
 	handle->activate_op = pcap_activate_linux;
 	handle->can_set_rfmon_op = pcap_can_set_rfmon_linux;
 
 #if defined(HAVE_LINUX_NET_TSTAMP_H) && defined(PACKET_TIMESTAMP)
 	/*
 	 * See what time stamp types we support.
 	 */
 	if (iface_ethtool_get_ts_info(device, handle, ebuf) == -1) {
 		pcap_close(handle);
 		return NULL;
 	}
 #endif
 
 #if defined(SIOCGSTAMPNS) && defined(SO_TIMESTAMPNS)
 	/*
 	 * We claim that we support microsecond and nanosecond time
 	 * stamps.
 	 *
 	 * XXX - with adapter-supplied time stamps, can we choose
 	 * microsecond or nanosecond time stamps on arbitrary
 	 * adapters?
 	 */
 	handle->tstamp_precision_count = 2;
 	handle->tstamp_precision_list = malloc(2 * sizeof(u_int));
 	if (handle->tstamp_precision_list == NULL) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		pcap_close(handle);
 		return NULL;
 	}
 	handle->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
 	handle->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
 #endif /* defined(SIOCGSTAMPNS) && defined(SO_TIMESTAMPNS) */
 
 	return handle;
 }
 
 #ifdef HAVE_LIBNL
 /*
  * If interface {if} is a mac80211 driver, the file
  * /sys/class/net/{if}/phy80211 is a symlink to
  * /sys/class/ieee80211/{phydev}, for some {phydev}.
  *
  * On Fedora 9, with a 2.6.26.3-29 kernel, my Zydas stick, at
  * least, has a "wmaster0" device and a "wlan0" device; the
  * latter is the one with the IP address.  Both show up in
  * "tcpdump -D" output.  Capturing on the wmaster0 device
  * captures with 802.11 headers.
  *
  * airmon-ng searches through /sys/class/net for devices named
  * monN, starting with mon0; as soon as one *doesn't* exist,
  * it chooses that as the monitor device name.  If the "iw"
  * command exists, it does "iw dev {if} interface add {monif}
  * type monitor", where {monif} is the monitor device.  It
  * then (sigh) sleeps .1 second, and then configures the
  * device up.  Otherwise, if /sys/class/ieee80211/{phydev}/add_iface
  * is a file, it writes {mondev}, without a newline, to that file,
  * and again (sigh) sleeps .1 second, and then iwconfig's that
  * device into monitor mode and configures it up.  Otherwise,
  * you can't do monitor mode.
  *
  * All these devices are "glued" together by having the
  * /sys/class/net/{device}/phy80211 links pointing to the same
  * place, so, given a wmaster, wlan, or mon device, you can
  * find the other devices by looking for devices with
  * the same phy80211 link.
  *
  * To turn monitor mode off, delete the monitor interface,
  * either with "iw dev {monif} interface del" or by sending
  * {monif}, with no NL, down /sys/class/ieee80211/{phydev}/remove_iface
  *
  * Note: if you try to create a monitor device named "monN", and
  * there's already a "monN" device, it fails, as least with
  * the netlink interface (which is what iw uses), with a return
  * value of -ENFILE.  (Return values are negative errnos.)  We
  * could probably use that to find an unused device.
  *
  * Yes, you can have multiple monitor devices for a given
  * physical device.
  */
 
 /*
  * Is this a mac80211 device?  If so, fill in the physical device path and
  * return 1; if not, return 0.  On an error, fill in handle->errbuf and
  * return PCAP_ERROR.
  */
 static int
 get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path,
     size_t phydev_max_pathlen)
 {
 	char *pathstr;
 	ssize_t bytes_read;
 
 	/*
 	 * Generate the path string for the symlink to the physical device.
 	 */
 	if (asprintf(&pathstr, "/sys/class/net/%s/phy80211", device) == -1) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: Can't generate path name string for /sys/class/net device",
 		    device);
 		return PCAP_ERROR;
 	}
 	bytes_read = readlink(pathstr, phydev_path, phydev_max_pathlen);
 	if (bytes_read == -1) {
 		if (errno == ENOENT || errno == EINVAL) {
 			/*
 			 * Doesn't exist, or not a symlink; assume that
 			 * means it's not a mac80211 device.
 			 */
 			free(pathstr);
 			return 0;
 		}
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: Can't readlink %s: %s", device, pathstr,
-		    strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s: Can't readlink %s", device, pathstr);
 		free(pathstr);
 		return PCAP_ERROR;
 	}
 	free(pathstr);
 	phydev_path[bytes_read] = '\0';
 	return 1;
 }
 
 #ifdef HAVE_LIBNL_SOCKETS
 #define get_nl_errmsg	nl_geterror
 #else
 /* libnl 2.x compatibility code */
 
 #define nl_sock nl_handle
 
 static inline struct nl_handle *
 nl_socket_alloc(void)
 {
 	return nl_handle_alloc();
 }
 
 static inline void
 nl_socket_free(struct nl_handle *h)
 {
 	nl_handle_destroy(h);
 }
 
 #define get_nl_errmsg	strerror
 
 static inline int
 __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
 {
 	struct nl_cache *tmp = genl_ctrl_alloc_cache(h);
 	if (!tmp)
 		return -ENOMEM;
 	*cache = tmp;
 	return 0;
 }
 #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
 #endif /* !HAVE_LIBNL_SOCKETS */
 
 struct nl80211_state {
 	struct nl_sock *nl_sock;
 	struct nl_cache *nl_cache;
 	struct genl_family *nl80211;
 };
 
 static int
 nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
 {
 	int err;
 
 	state->nl_sock = nl_socket_alloc();
 	if (!state->nl_sock) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: failed to allocate netlink handle", device);
 		return PCAP_ERROR;
 	}
 
 	if (genl_connect(state->nl_sock)) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: failed to connect to generic netlink", device);
 		goto out_handle_destroy;
 	}
 
 	err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache);
 	if (err < 0) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: failed to allocate generic netlink cache: %s",
 		    device, get_nl_errmsg(-err));
 		goto out_handle_destroy;
 	}
 
 	state->nl80211 = genl_ctrl_search_by_name(state->nl_cache, "nl80211");
 	if (!state->nl80211) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: nl80211 not found", device);
 		goto out_cache_free;
 	}
 
 	return 0;
 
 out_cache_free:
 	nl_cache_free(state->nl_cache);
 out_handle_destroy:
 	nl_socket_free(state->nl_sock);
 	return PCAP_ERROR;
 }
 
 static void
 nl80211_cleanup(struct nl80211_state *state)
 {
 	genl_family_put(state->nl80211);
 	nl_cache_free(state->nl_cache);
 	nl_socket_free(state->nl_sock);
 }
 
 static int
 del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
     const char *device, const char *mondevice);
 
 static int
 add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
     const char *device, const char *mondevice)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int ifindex;
 	struct nl_msg *msg;
 	int err;
 
 	ifindex = iface_get_id(sock_fd, device, handle->errbuf);
 	if (ifindex == -1)
 		return PCAP_ERROR;
 
 	msg = nlmsg_alloc();
 	if (!msg) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: failed to allocate netlink msg", device);
 		return PCAP_ERROR;
 	}
 
 	genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0,
 		    0, NL80211_CMD_NEW_INTERFACE, 0);
 	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
 	NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice);
 	NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR);
 
 	err = nl_send_auto_complete(state->nl_sock, msg);
 	if (err < 0) {
 #if defined HAVE_LIBNL_NLE
 		if (err == -NLE_FAILURE) {
 #else
 		if (err == -ENFILE) {
 #endif
 			/*
 			 * Device not available; our caller should just
 			 * keep trying.  (libnl 2.x maps ENFILE to
 			 * NLE_FAILURE; it can also map other errors
 			 * to that, but there's not much we can do
 			 * about that.)
 			 */
 			nlmsg_free(msg);
 			return 0;
 		} else {
 			/*
 			 * Real failure, not just "that device is not
 			 * available.
 			 */
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: nl_send_auto_complete failed adding %s interface: %s",
 			    device, mondevice, get_nl_errmsg(-err));
 			nlmsg_free(msg);
 			return PCAP_ERROR;
 		}
 	}
 	err = nl_wait_for_ack(state->nl_sock);
 	if (err < 0) {
 #if defined HAVE_LIBNL_NLE
 		if (err == -NLE_FAILURE) {
 #else
 		if (err == -ENFILE) {
 #endif
 			/*
 			 * Device not available; our caller should just
 			 * keep trying.  (libnl 2.x maps ENFILE to
 			 * NLE_FAILURE; it can also map other errors
 			 * to that, but there's not much we can do
 			 * about that.)
 			 */
 			nlmsg_free(msg);
 			return 0;
 		} else {
 			/*
 			 * Real failure, not just "that device is not
 			 * available.
 			 */
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: nl_wait_for_ack failed adding %s interface: %s",
 			    device, mondevice, get_nl_errmsg(-err));
 			nlmsg_free(msg);
 			return PCAP_ERROR;
 		}
 	}
 
 	/*
 	 * Success.
 	 */
 	nlmsg_free(msg);
 
 	/*
 	 * Try to remember the monitor device.
 	 */
 	handlep->mondevice = strdup(mondevice);
 	if (handlep->mondevice == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
-			 pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "strdup");
 		/*
 		 * Get rid of the monitor device.
 		 */
 		del_mon_if(handle, sock_fd, state, device, mondevice);
 		return PCAP_ERROR;
 	}
 	return 1;
 
 nla_put_failure:
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 	    "%s: nl_put failed adding %s interface",
 	    device, mondevice);
 	nlmsg_free(msg);
 	return PCAP_ERROR;
 }
 
 static int
 del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
     const char *device, const char *mondevice)
 {
 	int ifindex;
 	struct nl_msg *msg;
 	int err;
 
 	ifindex = iface_get_id(sock_fd, mondevice, handle->errbuf);
 	if (ifindex == -1)
 		return PCAP_ERROR;
 
 	msg = nlmsg_alloc();
 	if (!msg) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: failed to allocate netlink msg", device);
 		return PCAP_ERROR;
 	}
 
 	genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0,
 		    0, NL80211_CMD_DEL_INTERFACE, 0);
 	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
 
 	err = nl_send_auto_complete(state->nl_sock, msg);
 	if (err < 0) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: nl_send_auto_complete failed deleting %s interface: %s",
 		    device, mondevice, get_nl_errmsg(-err));
 		nlmsg_free(msg);
 		return PCAP_ERROR;
 	}
 	err = nl_wait_for_ack(state->nl_sock);
 	if (err < 0) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: nl_wait_for_ack failed adding %s interface: %s",
 		    device, mondevice, get_nl_errmsg(-err));
 		nlmsg_free(msg);
 		return PCAP_ERROR;
 	}
 
 	/*
 	 * Success.
 	 */
 	nlmsg_free(msg);
 	return 1;
 
 nla_put_failure:
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 	    "%s: nl_put failed deleting %s interface",
 	    device, mondevice);
 	nlmsg_free(msg);
 	return PCAP_ERROR;
 }
 
 static int
 enter_rfmon_mode_mac80211(pcap_t *handle, int sock_fd, const char *device)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int ret;
 	char phydev_path[PATH_MAX+1];
 	struct nl80211_state nlstate;
 	struct ifreq ifr;
 	u_int n;
 
 	/*
 	 * Is this a mac80211 device?
 	 */
 	ret = get_mac80211_phydev(handle, device, phydev_path, PATH_MAX);
 	if (ret < 0)
 		return ret;	/* error */
 	if (ret == 0)
 		return 0;	/* no error, but not mac80211 device */
 
 	/*
 	 * XXX - is this already a monN device?
 	 * If so, we're done.
 	 * Is that determined by old Wireless Extensions ioctls?
 	 */
 
 	/*
 	 * OK, it's apparently a mac80211 device.
 	 * Try to find an unused monN device for it.
 	 */
 	ret = nl80211_init(handle, &nlstate, device);
 	if (ret != 0)
 		return ret;
 	for (n = 0; n < UINT_MAX; n++) {
 		/*
 		 * Try mon{n}.
 		 */
 		char mondevice[3+10+1];	/* mon{UINT_MAX}\0 */
 
 		pcap_snprintf(mondevice, sizeof mondevice, "mon%u", n);
 		ret = add_mon_if(handle, sock_fd, &nlstate, device, mondevice);
 		if (ret == 1) {
 			/*
 			 * Success.  We don't clean up the libnl state
 			 * yet, as we'll be using it later.
 			 */
 			goto added;
 		}
 		if (ret < 0) {
 			/*
 			 * Hard failure.  Just return ret; handle->errbuf
 			 * has already been set.
 			 */
 			nl80211_cleanup(&nlstate);
 			return ret;
 		}
 	}
 
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 	    "%s: No free monN interfaces", device);
 	nl80211_cleanup(&nlstate);
 	return PCAP_ERROR;
 
 added:
 
 #if 0
 	/*
 	 * Sleep for .1 seconds.
 	 */
 	delay.tv_sec = 0;
 	delay.tv_nsec = 500000000;
 	nanosleep(&delay, NULL);
 #endif
 
 	/*
 	 * If we haven't already done so, arrange to have
 	 * "pcap_close_all()" called when we exit.
 	 */
 	if (!pcap_do_addexit(handle)) {
 		/*
 		 * "atexit()" failed; don't put the interface
 		 * in rfmon mode, just give up.
 		 */
 		del_mon_if(handle, sock_fd, &nlstate, device,
 		    handlep->mondevice);
 		nl80211_cleanup(&nlstate);
 		return PCAP_ERROR;
 	}
 
 	/*
 	 * Now configure the monitor interface up.
 	 */
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, handlep->mondevice, sizeof(ifr.ifr_name));
 	if (ioctl(sock_fd, SIOCGIFFLAGS, &ifr) == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: Can't get flags for %s: %s", device,
-		    handlep->mondevice, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s: Can't get flags for %s", device,
+		    handlep->mondevice);
 		del_mon_if(handle, sock_fd, &nlstate, device,
 		    handlep->mondevice);
 		nl80211_cleanup(&nlstate);
 		return PCAP_ERROR;
 	}
 	ifr.ifr_flags |= IFF_UP|IFF_RUNNING;
 	if (ioctl(sock_fd, SIOCSIFFLAGS, &ifr) == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: Can't set flags for %s: %s", device,
-		    handlep->mondevice, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s: Can't set flags for %s", device,
+		    handlep->mondevice);
 		del_mon_if(handle, sock_fd, &nlstate, device,
 		    handlep->mondevice);
 		nl80211_cleanup(&nlstate);
 		return PCAP_ERROR;
 	}
 
 	/*
 	 * Success.  Clean up the libnl state.
 	 */
 	nl80211_cleanup(&nlstate);
 
 	/*
 	 * Note that we have to delete the monitor device when we close
 	 * the handle.
 	 */
 	handlep->must_do_on_close |= MUST_DELETE_MONIF;
 
 	/*
 	 * Add this to the list of pcaps to close when we exit.
 	 */
 	pcap_add_to_pcaps_to_close(handle);
 
 	return 1;
 }
 #endif /* HAVE_LIBNL */
 
 #ifdef IW_MODE_MONITOR
 /*
  * Bonding devices mishandle unknown ioctls; they fail with ENODEV
  * rather than ENOTSUP, EOPNOTSUPP, or ENOTTY, so Wireless Extensions
  * will fail with ENODEV if we try to do them on a bonding device,
  * making us return a "no such device" indication rather than just
  * saying "no Wireless Extensions".
  *
  * So we check for bonding devices, if we can, before trying those
  * ioctls, by trying a bonding device information query ioctl to see
  * whether it succeeds.
  */
 static int
 is_bonding_device(int fd, const char *device)
 {
 #ifdef BOND_INFO_QUERY_IOCTL
 	struct ifreq ifr;
 	ifbond ifb;
 
 	memset(&ifr, 0, sizeof ifr);
 	strlcpy(ifr.ifr_name, device, sizeof ifr.ifr_name);
 	memset(&ifb, 0, sizeof ifb);
 	ifr.ifr_data = (caddr_t)&ifb;
 	if (ioctl(fd, BOND_INFO_QUERY_IOCTL, &ifr) == 0)
 		return 1;	/* success, so it's a bonding device */
 #endif /* BOND_INFO_QUERY_IOCTL */
 
 	return 0;	/* no, it's not a bonding device */
 }
 #endif /* IW_MODE_MONITOR */
 
+static int pcap_protocol(pcap_t *handle)
+{
+	int protocol;
+
+	protocol = handle->opt.protocol;
+	if (protocol == 0)
+		protocol = ETH_P_ALL;
+
+	return htons(protocol);
+}
+
 static int
 pcap_can_set_rfmon_linux(pcap_t *handle)
 {
 #ifdef HAVE_LIBNL
 	char phydev_path[PATH_MAX+1];
 	int ret;
 #endif
 #ifdef IW_MODE_MONITOR
 	int sock_fd;
 	struct iwreq ireq;
 #endif
 
 	if (strcmp(handle->opt.device, "any") == 0) {
 		/*
 		 * Monitor mode makes no sense on the "any" device.
 		 */
 		return 0;
 	}
 
 #ifdef HAVE_LIBNL
 	/*
 	 * Bleah.  There doesn't seem to be a way to ask a mac80211
 	 * device, through libnl, whether it supports monitor mode;
 	 * we'll just check whether the device appears to be a
 	 * mac80211 device and, if so, assume the device supports
 	 * monitor mode.
 	 *
 	 * wmaster devices don't appear to support the Wireless
 	 * Extensions, but we can create a mon device for a
 	 * wmaster device, so we don't bother checking whether
 	 * a mac80211 device supports the Wireless Extensions.
 	 */
 	ret = get_mac80211_phydev(handle, handle->opt.device, phydev_path,
 	    PATH_MAX);
 	if (ret < 0)
 		return ret;	/* error */
 	if (ret == 1)
 		return 1;	/* mac80211 device */
 #endif
 
 #ifdef IW_MODE_MONITOR
 	/*
 	 * Bleah.  There doesn't appear to be an ioctl to use to ask
 	 * whether a device supports monitor mode; we'll just do
 	 * SIOCGIWMODE and, if it succeeds, assume the device supports
 	 * monitor mode.
 	 *
 	 * Open a socket on which to attempt to get the mode.
 	 * (We assume that if we have Wireless Extensions support
 	 * we also have PF_PACKET support.)
 	 */
-	sock_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+	sock_fd = socket(PF_PACKET, SOCK_RAW, pcap_protocol(handle));
 	if (sock_fd == -1) {
-		(void)pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		return PCAP_ERROR;
 	}
 
 	if (is_bonding_device(sock_fd, handle->opt.device)) {
 		/* It's a bonding device, so don't even try. */
 		close(sock_fd);
 		return 0;
 	}
 
 	/*
 	 * Attempt to get the current mode.
 	 */
 	strlcpy(ireq.ifr_ifrn.ifrn_name, handle->opt.device,
 	    sizeof ireq.ifr_ifrn.ifrn_name);
 	if (ioctl(sock_fd, SIOCGIWMODE, &ireq) != -1) {
 		/*
 		 * Well, we got the mode; assume we can set it.
 		 */
 		close(sock_fd);
 		return 1;
 	}
 	if (errno == ENODEV) {
 		/* The device doesn't even exist. */
-		(void)pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "SIOCGIWMODE failed: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIWMODE failed");
 		close(sock_fd);
 		return PCAP_ERROR_NO_SUCH_DEVICE;
 	}
 	close(sock_fd);
 #endif
 	return 0;
 }
 
 /*
  * Grabs the number of dropped packets by the interface from /proc/net/dev.
  *
  * XXX - what about /sys/class/net/{interface name}/rx_*?  There are
  * individual devices giving, in ASCII, various rx_ and tx_ statistics.
  *
  * Or can we get them in binary form from netlink?
  */
 static long int
 linux_if_drops(const char * if_name)
 {
 	char buffer[512];
 	char * bufptr;
 	FILE * file;
 	int field_to_convert = 3, if_name_sz = strlen(if_name);
 	long int dropped_pkts = 0;
 
 	file = fopen("/proc/net/dev", "r");
 	if (!file)
 		return 0;
 
 	while (!dropped_pkts && fgets( buffer, sizeof(buffer), file ))
 	{
 		/* 	search for 'bytes' -- if its in there, then
 			that means we need to grab the fourth field. otherwise
 			grab the third field. */
 		if (field_to_convert != 4 && strstr(buffer, "bytes"))
 		{
 			field_to_convert = 4;
 			continue;
 		}
 
 		/* find iface and make sure it actually matches -- space before the name and : after it */
 		if ((bufptr = strstr(buffer, if_name)) &&
 			(bufptr == buffer || *(bufptr-1) == ' ') &&
 			*(bufptr + if_name_sz) == ':')
 		{
 			bufptr = bufptr + if_name_sz + 1;
 
 			/* grab the nth field from it */
 			while( --field_to_convert && *bufptr != '\0')
 			{
 				while (*bufptr != '\0' && *(bufptr++) == ' ');
 				while (*bufptr != '\0' && *(bufptr++) != ' ');
 			}
 
 			/* get rid of any final spaces */
 			while (*bufptr != '\0' && *bufptr == ' ') bufptr++;
 
 			if (*bufptr != '\0')
 				dropped_pkts = strtol(bufptr, NULL, 10);
 
 			break;
 		}
 	}
 
 	fclose(file);
 	return dropped_pkts;
 }
 
 
 /*
  * With older kernels promiscuous mode is kind of interesting because we
  * have to reset the interface before exiting. The problem can't really
  * be solved without some daemon taking care of managing usage counts.
  * If we put the interface into promiscuous mode, we set a flag indicating
  * that we must take it out of that mode when the interface is closed,
  * and, when closing the interface, if that flag is set we take it out
  * of promiscuous mode.
  *
  * Even with newer kernels, we have the same issue with rfmon mode.
  */
 
 static void	pcap_cleanup_linux( pcap_t *handle )
 {
 	struct pcap_linux *handlep = handle->priv;
 	struct ifreq	ifr;
 #ifdef HAVE_LIBNL
 	struct nl80211_state nlstate;
 	int ret;
 #endif /* HAVE_LIBNL */
 #ifdef IW_MODE_MONITOR
 	int oldflags;
 	struct iwreq ireq;
 #endif /* IW_MODE_MONITOR */
 
 	if (handlep->must_do_on_close != 0) {
 		/*
 		 * There's something we have to do when closing this
 		 * pcap_t.
 		 */
 		if (handlep->must_do_on_close & MUST_CLEAR_PROMISC) {
 			/*
 			 * We put the interface into promiscuous mode;
 			 * take it out of promiscuous mode.
 			 *
 			 * XXX - if somebody else wants it in promiscuous
 			 * mode, this code cannot know that, so it'll take
 			 * it out of promiscuous mode.  That's not fixable
 			 * in 2.0[.x] kernels.
 			 */
 			memset(&ifr, 0, sizeof(ifr));
 			strlcpy(ifr.ifr_name, handlep->device,
 			    sizeof(ifr.ifr_name));
 			if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
 				fprintf(stderr,
 				    "Can't restore interface %s flags (SIOCGIFFLAGS failed: %s).\n"
 				    "Please adjust manually.\n"
 				    "Hint: This can't happen with Linux >= 2.2.0.\n",
 				    handlep->device, strerror(errno));
 			} else {
 				if (ifr.ifr_flags & IFF_PROMISC) {
 					/*
 					 * Promiscuous mode is currently on;
 					 * turn it off.
 					 */
 					ifr.ifr_flags &= ~IFF_PROMISC;
 					if (ioctl(handle->fd, SIOCSIFFLAGS,
 					    &ifr) == -1) {
 						fprintf(stderr,
 						    "Can't restore interface %s flags (SIOCSIFFLAGS failed: %s).\n"
 						    "Please adjust manually.\n"
 						    "Hint: This can't happen with Linux >= 2.2.0.\n",
 						    handlep->device,
 						    strerror(errno));
 					}
 				}
 			}
 		}
 
 #ifdef HAVE_LIBNL
 		if (handlep->must_do_on_close & MUST_DELETE_MONIF) {
 			ret = nl80211_init(handle, &nlstate, handlep->device);
 			if (ret >= 0) {
 				ret = del_mon_if(handle, handle->fd, &nlstate,
 				    handlep->device, handlep->mondevice);
 				nl80211_cleanup(&nlstate);
 			}
 			if (ret < 0) {
 				fprintf(stderr,
 				    "Can't delete monitor interface %s (%s).\n"
 				    "Please delete manually.\n",
 				    handlep->mondevice, handle->errbuf);
 			}
 		}
 #endif /* HAVE_LIBNL */
 
 #ifdef IW_MODE_MONITOR
 		if (handlep->must_do_on_close & MUST_CLEAR_RFMON) {
 			/*
 			 * We put the interface into rfmon mode;
 			 * take it out of rfmon mode.
 			 *
 			 * XXX - if somebody else wants it in rfmon
 			 * mode, this code cannot know that, so it'll take
 			 * it out of rfmon mode.
 			 */
 
 			/*
 			 * First, take the interface down if it's up;
 			 * otherwise, we might get EBUSY.
 			 * If we get errors, just drive on and print
 			 * a warning if we can't restore the mode.
 			 */
 			oldflags = 0;
 			memset(&ifr, 0, sizeof(ifr));
 			strlcpy(ifr.ifr_name, handlep->device,
 			    sizeof(ifr.ifr_name));
 			if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) != -1) {
 				if (ifr.ifr_flags & IFF_UP) {
 					oldflags = ifr.ifr_flags;
 					ifr.ifr_flags &= ~IFF_UP;
 					if (ioctl(handle->fd, SIOCSIFFLAGS, &ifr) == -1)
 						oldflags = 0;	/* didn't set, don't restore */
 				}
 			}
 
 			/*
 			 * Now restore the mode.
 			 */
 			strlcpy(ireq.ifr_ifrn.ifrn_name, handlep->device,
 			    sizeof ireq.ifr_ifrn.ifrn_name);
 			ireq.u.mode = handlep->oldmode;
 			if (ioctl(handle->fd, SIOCSIWMODE, &ireq) == -1) {
 				/*
 				 * Scientist, you've failed.
 				 */
 				fprintf(stderr,
 				    "Can't restore interface %s wireless mode (SIOCSIWMODE failed: %s).\n"
 				    "Please adjust manually.\n",
 				    handlep->device, strerror(errno));
 			}
 
 			/*
 			 * Now bring the interface back up if we brought
 			 * it down.
 			 */
 			if (oldflags != 0) {
 				ifr.ifr_flags = oldflags;
 				if (ioctl(handle->fd, SIOCSIFFLAGS, &ifr) == -1) {
 					fprintf(stderr,
 					    "Can't bring interface %s back up (SIOCSIFFLAGS failed: %s).\n"
 					    "Please adjust manually.\n",
 					    handlep->device, strerror(errno));
 				}
 			}
 		}
 #endif /* IW_MODE_MONITOR */
 
 		/*
 		 * Take this pcap out of the list of pcaps for which we
 		 * have to take the interface out of some mode.
 		 */
 		pcap_remove_from_pcaps_to_close(handle);
 	}
 
 	if (handlep->mondevice != NULL) {
 		free(handlep->mondevice);
 		handlep->mondevice = NULL;
 	}
 	if (handlep->device != NULL) {
 		free(handlep->device);
 		handlep->device = NULL;
 	}
 	pcap_cleanup_live_common(handle);
 }
 
 /*
  * Set the timeout to be used in poll() with memory-mapped packet capture.
  */
 static void
 set_poll_timeout(struct pcap_linux *handlep)
 {
 #ifdef HAVE_TPACKET3
 	struct utsname utsname;
 	char *version_component, *endp;
 	int major, minor;
 	int broken_tpacket_v3 = 1;
 
 	/*
 	 * Some versions of TPACKET_V3 have annoying bugs/misfeatures
 	 * around which we have to work.  Determine if we have those
 	 * problems or not.
 	 */
 	if (uname(&utsname) == 0) {
 		/*
 		 * 3.19 is the first release with a fixed version of
 		 * TPACKET_V3.  We treat anything before that as
 		 * not haveing a fixed version; that may really mean
 		 * it has *no* version.
 		 */
 		version_component = utsname.release;
 		major = strtol(version_component, &endp, 10);
 		if (endp != version_component && *endp == '.') {
 			/*
 			 * OK, that was a valid major version.
 			 * Get the minor version.
 			 */
 			version_component = endp + 1;
 			minor = strtol(version_component, &endp, 10);
 			if (endp != version_component &&
 			    (*endp == '.' || *endp == '\0')) {
 				/*
 				 * OK, that was a valid minor version.
 				 * Is this 3.19 or newer?
 				 */
 				if (major >= 4 || (major == 3 && minor >= 19)) {
 					/* Yes. TPACKET_V3 works correctly. */
 					broken_tpacket_v3 = 0;
 				}
 			}
 		}
 	}
 #endif
 	if (handlep->timeout == 0) {
 #ifdef HAVE_TPACKET3
 		/*
 		 * XXX - due to a set of (mis)features in the TPACKET_V3
 		 * kernel code prior to the 3.19 kernel, blocking forever
 		 * with a TPACKET_V3 socket can, if few packets are
 		 * arriving and passing the socket filter, cause most
 		 * packets to be dropped.  See libpcap issue #335 for the
 		 * full painful story.
 		 *
 		 * The workaround is to have poll() time out very quickly,
 		 * so we grab the frames handed to us, and return them to
 		 * the kernel, ASAP.
 		 */
 		if (handlep->tp_version == TPACKET_V3 && broken_tpacket_v3)
 			handlep->poll_timeout = 1;	/* don't block for very long */
 		else
 #endif
 			handlep->poll_timeout = -1;	/* block forever */
 	} else if (handlep->timeout > 0) {
 #ifdef HAVE_TPACKET3
 		/*
 		 * For TPACKET_V3, the timeout is handled by the kernel,
 		 * so block forever; that way, we don't get extra timeouts.
 		 * Don't do that if we have a broken TPACKET_V3, though.
 		 */
 		if (handlep->tp_version == TPACKET_V3 && !broken_tpacket_v3)
 			handlep->poll_timeout = -1;	/* block forever, let TPACKET_V3 wake us up */
 		else
 #endif
 			handlep->poll_timeout = handlep->timeout;	/* block for that amount of time */
 	} else {
 		/*
 		 * Non-blocking mode; we call poll() to pick up error
 		 * indications, but we don't want it to wait for
 		 * anything.
 		 */
 		handlep->poll_timeout = 0;
 	}
 }
 
 /*
  *  Get a handle for a live capture from the given device. You can
  *  pass NULL as device to get all packages (without link level
  *  information of course). If you pass 1 as promisc the interface
  *  will be set to promiscous mode (XXX: I think this usage should
  *  be deprecated and functions be added to select that later allow
  *  modification of that values -- Torsten).
  */
 static int
 pcap_activate_linux(pcap_t *handle)
 {
 	struct pcap_linux *handlep = handle->priv;
 	const char	*device;
 	struct ifreq	ifr;
 	int		status = 0;
 	int		ret;
 
 	device = handle->opt.device;
 
 	/*
 	 * Make sure the name we were handed will fit into the ioctls we
 	 * might perform on the device; if not, return a "No such device"
 	 * indication, as the Linux kernel shouldn't support creating
 	 * a device whose name won't fit into those ioctls.
 	 *
 	 * "Will fit" means "will fit, complete with a null terminator",
 	 * so if the length, which does *not* include the null terminator,
 	 * is greater than *or equal to* the size of the field into which
 	 * we'll be copying it, that won't fit.
 	 */
 	if (strlen(device) >= sizeof(ifr.ifr_name)) {
 		status = PCAP_ERROR_NO_SUCH_DEVICE;
 		goto fail;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+		handle->snapshot = MAXIMUM_SNAPLEN;
+
 	handle->inject_op = pcap_inject_linux;
 	handle->setfilter_op = pcap_setfilter_linux;
 	handle->setdirection_op = pcap_setdirection_linux;
 	handle->set_datalink_op = pcap_set_datalink_linux;
 	handle->getnonblock_op = pcap_getnonblock_fd;
 	handle->setnonblock_op = pcap_setnonblock_fd;
 	handle->cleanup_op = pcap_cleanup_linux;
 	handle->read_op = pcap_read_linux;
 	handle->stats_op = pcap_stats_linux;
 
 	/*
 	 * The "any" device is a special device which causes us not
 	 * to bind to a particular device and thus to look at all
 	 * devices.
 	 */
 	if (strcmp(device, "any") == 0) {
 		if (handle->opt.promisc) {
 			handle->opt.promisc = 0;
 			/* Just a warning. */
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			    "Promiscuous mode not supported on the \"any\" device");
 			status = PCAP_WARNING_PROMISC_NOTSUP;
 		}
 	}
 
 	handlep->device	= strdup(device);
 	if (handlep->device == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
-			 pcap_strerror(errno) );
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "strdup");
 		return PCAP_ERROR;
 	}
 
 	/* copy timeout value */
 	handlep->timeout = handle->opt.timeout;
 
 	/*
 	 * If we're in promiscuous mode, then we probably want
 	 * to see when the interface drops packets too, so get an
 	 * initial count from /proc/net/dev
 	 */
 	if (handle->opt.promisc)
 		handlep->proc_dropped = linux_if_drops(handlep->device);
 
 	/*
 	 * Current Linux kernels use the protocol family PF_PACKET to
 	 * allow direct access to all packets on the network while
 	 * older kernels had a special socket type SOCK_PACKET to
 	 * implement this feature.
 	 * While this old implementation is kind of obsolete we need
 	 * to be compatible with older kernels for a while so we are
 	 * trying both methods with the newer method preferred.
 	 */
 	ret = activate_new(handle);
 	if (ret < 0) {
 		/*
 		 * Fatal error with the new way; just fail.
 		 * ret has the error return; if it's PCAP_ERROR,
 		 * handle->errbuf has been set appropriately.
 		 */
 		status = ret;
 		goto fail;
 	}
 	if (ret == 1) {
 		/*
 		 * Success.
 		 * Try to use memory-mapped access.
 		 */
 		switch (activate_mmap(handle, &status)) {
 
 		case 1:
 			/*
 			 * We succeeded.  status has been
 			 * set to the status to return,
 			 * which might be 0, or might be
 			 * a PCAP_WARNING_ value.
 			 *
 			 * Set the timeout to use in poll() before
 			 * returning.
 			 */
 			set_poll_timeout(handlep);
 			return status;
 
 		case 0:
 			/*
 			 * Kernel doesn't support it - just continue
 			 * with non-memory-mapped access.
 			 */
 			break;
 
 		case -1:
 			/*
 			 * We failed to set up to use it, or the kernel
 			 * supports it, but we failed to enable it.
 			 * ret has been set to the error status to
 			 * return and, if it's PCAP_ERROR, handle->errbuf
 			 * contains the error message.
 			 */
 			status = ret;
 			goto fail;
 		}
 	}
 	else if (ret == 0) {
 		/* Non-fatal error; try old way */
 		if ((ret = activate_old(handle)) != 1) {
 			/*
 			 * Both methods to open the packet socket failed.
 			 * Tidy up and report our failure (handle->errbuf
 			 * is expected to be set by the functions above).
 			 */
 			status = ret;
 			goto fail;
 		}
 	}
 
 	/*
 	 * We set up the socket, but not with memory-mapped access.
 	 */
 	if (handle->opt.buffer_size != 0) {
 		/*
 		 * Set the socket buffer size to the specified value.
 		 */
 		if (setsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF,
 		    &handle->opt.buffer_size,
 		    sizeof(handle->opt.buffer_size)) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				 "SO_RCVBUF: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "SO_RCVBUF");
 			status = PCAP_ERROR;
 			goto fail;
 		}
 	}
 
 	/* Allocate the buffer */
 
 	handle->buffer	 = malloc(handle->bufsize + handle->offset);
 	if (!handle->buffer) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		status = PCAP_ERROR;
 		goto fail;
 	}
 
 	/*
 	 * "handle->fd" is a socket, so "select()" and "poll()"
 	 * should work on it.
 	 */
 	handle->selectable_fd = handle->fd;
 
 	return status;
 
 fail:
 	pcap_cleanup_linux(handle);
 	return status;
 }
 
 /*
  *  Read at most max_packets from the capture stream and call the callback
  *  for each of them. Returns the number of packets handled or -1 if an
  *  error occured.
  */
 static int
-pcap_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+pcap_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
 	/*
 	 * Currently, on Linux only one packet is delivered per read,
 	 * so we don't loop.
 	 */
 	return pcap_read_packet(handle, callback, user);
 }
 
 static int
 pcap_set_datalink_linux(pcap_t *handle, int dlt)
 {
 	handle->linktype = dlt;
 	return 0;
 }
 
 /*
  * linux_check_direction()
  *
  * Do checks based on packet direction.
  */
 static inline int
 linux_check_direction(const pcap_t *handle, const struct sockaddr_ll *sll)
 {
 	struct pcap_linux	*handlep = handle->priv;
 
 	if (sll->sll_pkttype == PACKET_OUTGOING) {
 		/*
 		 * Outgoing packet.
 		 * If this is from the loopback device, reject it;
 		 * we'll see the packet as an incoming packet as well,
 		 * and we don't want to see it twice.
 		 */
 		if (sll->sll_ifindex == handlep->lo_ifindex)
 			return 0;
 
 		/*
 		 * If this is an outgoing CAN or CAN FD frame, and
 		 * the user doesn't only want outgoing packets,
 		 * reject it; CAN devices and drivers, and the CAN
 		 * stack, always arrange to loop back transmitted
 		 * packets, so they also appear as incoming packets.
 		 * We don't want duplicate packets, and we can't
 		 * easily distinguish packets looped back by the CAN
 		 * layer than those received by the CAN layer, so we
 		 * eliminate this packet instead.
 		 */
 		if ((sll->sll_protocol == LINUX_SLL_P_CAN ||
 		     sll->sll_protocol == LINUX_SLL_P_CANFD) &&
 		     handle->direction != PCAP_D_OUT)
 			return 0;
 
 		/*
 		 * If the user only wants incoming packets, reject it.
 		 */
 		if (handle->direction == PCAP_D_IN)
 			return 0;
 	} else {
 		/*
 		 * Incoming packet.
 		 * If the user only wants outgoing packets, reject it.
 		 */
 		if (handle->direction == PCAP_D_OUT)
 			return 0;
 	}
 	return 1;
 }
 
 /*
  *  Read a packet from the socket calling the handler provided by
  *  the user. Returns the number of packets received or -1 if an
  *  error occured.
  */
 static int
 pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata)
 {
 	struct pcap_linux	*handlep = handle->priv;
 	u_char			*bp;
 	int			offset;
 #ifdef HAVE_PF_PACKET_SOCKETS
 	struct sockaddr_ll	from;
 	struct sll_header	*hdrp;
 #else
 	struct sockaddr		from;
 #endif
-#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI)
+#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI)
 	struct iovec		iov;
 	struct msghdr		msg;
 	struct cmsghdr		*cmsg;
 	union {
 		struct cmsghdr	cmsg;
 		char		buf[CMSG_SPACE(sizeof(struct tpacket_auxdata))];
 	} cmsg_buf;
-#else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 	socklen_t		fromlen;
-#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 	int			packet_len, caplen;
 	struct pcap_pkthdr	pcap_header;
 
         struct bpf_aux_data     aux_data;
 #ifdef HAVE_PF_PACKET_SOCKETS
 	/*
 	 * If this is a cooked device, leave extra room for a
 	 * fake packet header.
 	 */
 	if (handlep->cooked)
 		offset = SLL_HDR_LEN;
 	else
 		offset = 0;
 #else
 	/*
 	 * This system doesn't have PF_PACKET sockets, so it doesn't
 	 * support cooked devices.
 	 */
 	offset = 0;
 #endif
 
 	/*
 	 * Receive a single packet from the kernel.
 	 * We ignore EINTR, as that might just be due to a signal
 	 * being delivered - if the signal should interrupt the
 	 * loop, the signal handler should call pcap_breakloop()
 	 * to set handle->break_loop (we ignore it on other
 	 * platforms as well).
 	 * We also ignore ENETDOWN, so that we can continue to
 	 * capture traffic if the interface goes down and comes
 	 * back up again; comments in the kernel indicate that
 	 * we'll just block waiting for packets if we try to
 	 * receive from a socket that delivered ENETDOWN, and,
 	 * if we're using a memory-mapped buffer, we won't even
 	 * get notified of "network down" events.
 	 */
 	bp = (u_char *)handle->buffer + handle->offset;
 
-#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI)
+#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI)
 	msg.msg_name		= &from;
 	msg.msg_namelen		= sizeof(from);
 	msg.msg_iov		= &iov;
 	msg.msg_iovlen		= 1;
 	msg.msg_control		= &cmsg_buf;
 	msg.msg_controllen	= sizeof(cmsg_buf);
 	msg.msg_flags		= 0;
 
 	iov.iov_len		= handle->bufsize - offset;
 	iov.iov_base		= bp + offset;
-#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 
 	do {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 */
 		if (handle->break_loop) {
 			/*
 			 * Yes - clear the flag that indicates that it has,
 			 * and return PCAP_ERROR_BREAK as an indication that
 			 * we were told to break out of the loop.
 			 */
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 
-#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI)
+#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI)
 		packet_len = recvmsg(handle->fd, &msg, MSG_TRUNC);
-#else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 		fromlen = sizeof(from);
 		packet_len = recvfrom(
 			handle->fd, bp + offset,
 			handle->bufsize - offset, MSG_TRUNC,
 			(struct sockaddr *) &from, &fromlen);
-#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 	} while (packet_len == -1 && errno == EINTR);
 
 	/* Check if an error occured */
 
 	if (packet_len == -1) {
 		switch (errno) {
 
 		case EAGAIN:
 			return 0;	/* no packet there */
 
 		case ENETDOWN:
 			/*
 			 * The device on which we're capturing went away.
 			 *
 			 * XXX - we should really return
 			 * PCAP_ERROR_IFACE_NOT_UP, but pcap_dispatch()
 			 * etc. aren't defined to return that.
 			 */
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 				"The interface went down");
 			return PCAP_ERROR;
 
 		default:
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				 "recvfrom: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "recvfrom");
 			return PCAP_ERROR;
 		}
 	}
 
 #ifdef HAVE_PF_PACKET_SOCKETS
 	if (!handlep->sock_packet) {
 		/*
 		 * Unfortunately, there is a window between socket() and
 		 * bind() where the kernel may queue packets from any
 		 * interface.  If we're bound to a particular interface,
 		 * discard packets not from that interface.
 		 *
 		 * (If socket filters are supported, we could do the
 		 * same thing we do when changing the filter; however,
 		 * that won't handle packet sockets without socket
 		 * filter support, and it's a bit more complicated.
 		 * It would save some instructions per packet, however.)
 		 */
 		if (handlep->ifindex != -1 &&
 		    from.sll_ifindex != handlep->ifindex)
 			return 0;
 
 		/*
 		 * Do checks based on packet direction.
 		 * We can only do this if we're using PF_PACKET; the
 		 * address returned for SOCK_PACKET is a "sockaddr_pkt"
 		 * which lacks the relevant packet type information.
 		 */
 		if (!linux_check_direction(handle, &from))
 			return 0;
 	}
 #endif
 
 #ifdef HAVE_PF_PACKET_SOCKETS
 	/*
 	 * If this is a cooked device, fill in the fake packet header.
 	 */
 	if (handlep->cooked) {
 		/*
 		 * Add the length of the fake header to the length
 		 * of packet data we read.
 		 */
 		packet_len += SLL_HDR_LEN;
 
 		hdrp = (struct sll_header *)bp;
 		hdrp->sll_pkttype = map_packet_type_to_sll_type(from.sll_pkttype);
 		hdrp->sll_hatype = htons(from.sll_hatype);
 		hdrp->sll_halen = htons(from.sll_halen);
 		memcpy(hdrp->sll_addr, from.sll_addr,
 		    (from.sll_halen > SLL_ADDRLEN) ?
 		      SLL_ADDRLEN :
 		      from.sll_halen);
 		hdrp->sll_protocol = from.sll_protocol;
 	}
 
-#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI)
+	/*
+	 * Start out with no VLAN information.
+	 */
+	aux_data.vlan_tag_present = 0;
+	aux_data.vlan_tag = 0;
+#if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI)
 	if (handlep->vlan_offset != -1) {
 		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
 			struct tpacket_auxdata *aux;
 			unsigned int len;
 			struct vlan_tag *tag;
 
 			if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct tpacket_auxdata)) ||
 			    cmsg->cmsg_level != SOL_PACKET ||
-			    cmsg->cmsg_type != PACKET_AUXDATA)
+			    cmsg->cmsg_type != PACKET_AUXDATA) {
+				/*
+				 * This isn't a PACKET_AUXDATA auxiliary
+				 * data item.
+				 */
 				continue;
+			}
 
 			aux = (struct tpacket_auxdata *)CMSG_DATA(cmsg);
-#if defined(TP_STATUS_VLAN_VALID)
-			if ((aux->tp_vlan_tci == 0) && !(aux->tp_status & TP_STATUS_VLAN_VALID))
-#else
-			if (aux->tp_vlan_tci == 0) /* this is ambigious but without the
-						TP_STATUS_VLAN_VALID flag, there is
-						nothing that we can do */
-#endif
+			if (!VLAN_VALID(aux, aux)) {
+				/*
+				 * There is no VLAN information in the
+				 * auxiliary data.
+				 */
 				continue;
+			}
 
 			len = (u_int)packet_len > iov.iov_len ? iov.iov_len : (u_int)packet_len;
 			if (len < (u_int)handlep->vlan_offset)
 				break;
 
 			/*
 			 * Move everything in the header, except the
 			 * type field, down VLAN_TAG_LEN bytes, to
 			 * allow us to insert the VLAN tag between
 			 * that stuff and the type field.
 			 */
 			bp -= VLAN_TAG_LEN;
 			memmove(bp, bp + VLAN_TAG_LEN, handlep->vlan_offset);
 
 			/*
 			 * Now insert the tag.
 			 */
 			tag = (struct vlan_tag *)(bp + handlep->vlan_offset);
 			tag->vlan_tpid = htons(VLAN_TPID(aux, aux));
 			tag->vlan_tci = htons(aux->tp_vlan_tci);
 
-                        /* store vlan tci to bpf_aux_data struct for userland bpf filter */
-#if defined(TP_STATUS_VLAN_VALID)
-                        aux_data.vlan_tag = htons(aux->tp_vlan_tci) & 0x0fff;
-                        aux_data.vlan_tag_present = (aux->tp_status & TP_STATUS_VLAN_VALID);
-#endif
+			/*
+			 * Save a flag indicating that we have a VLAN tag,
+			 * and the VLAN TCI, to bpf_aux_data struct for
+			 * use by the BPF filter if we're doing the
+			 * filtering in userland.
+			 */
+			aux_data.vlan_tag_present = 1;
+			aux_data.vlan_tag = htons(aux->tp_vlan_tci) & 0x0fff;
 
 			/*
 			 * Add the tag to the packet lengths.
 			 */
 			packet_len += VLAN_TAG_LEN;
 		}
 	}
-#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
+#endif /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) */
 #endif /* HAVE_PF_PACKET_SOCKETS */
 
 	/*
 	 * XXX: According to the kernel source we should get the real
 	 * packet len if calling recvfrom with MSG_TRUNC set. It does
 	 * not seem to work here :(, but it is supported by this code
 	 * anyway.
 	 * To be honest the code RELIES on that feature so this is really
 	 * broken with 2.2.x kernels.
 	 * I spend a day to figure out what's going on and I found out
 	 * that the following is happening:
 	 *
 	 * The packet comes from a random interface and the packet_rcv
 	 * hook is called with a clone of the packet. That code inserts
 	 * the packet into the receive queue of the packet socket.
 	 * If a filter is attached to that socket that filter is run
 	 * first - and there lies the problem. The default filter always
 	 * cuts the packet at the snaplen:
 	 *
 	 * # tcpdump -d
 	 * (000) ret      #68
 	 *
 	 * So the packet filter cuts down the packet. The recvfrom call
 	 * says "hey, it's only 68 bytes, it fits into the buffer" with
 	 * the result that we don't get the real packet length. This
 	 * is valid at least until kernel 2.2.17pre6.
 	 *
 	 * We currently handle this by making a copy of the filter
 	 * program, fixing all "ret" instructions with non-zero
 	 * operands to have an operand of MAXIMUM_SNAPLEN so that the
 	 * filter doesn't truncate the packet, and supplying that modified
 	 * filter to the kernel.
 	 */
 
 	caplen = packet_len;
 	if (caplen > handle->snapshot)
 		caplen = handle->snapshot;
 
 	/* Run the packet filter if not using kernel filter */
 	if (handlep->filter_in_userland && handle->fcode.bf_insns) {
 		if (bpf_filter_with_aux_data(handle->fcode.bf_insns, bp,
 		    packet_len, caplen, &aux_data) == 0) {
 			/* rejected by filter */
 			return 0;
 		}
 	}
 
 	/* Fill in our own header data */
 
 	/* get timestamp for this packet */
 #if defined(SIOCGSTAMPNS) && defined(SO_TIMESTAMPNS)
 	if (handle->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO) {
 		if (ioctl(handle->fd, SIOCGSTAMPNS, &pcap_header.ts) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					"SIOCGSTAMPNS: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "SIOCGSTAMPNS");
 			return PCAP_ERROR;
 		}
         } else
 #endif
 	{
 		if (ioctl(handle->fd, SIOCGSTAMP, &pcap_header.ts) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					"SIOCGSTAMP: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "SIOCGSTAMP");
 			return PCAP_ERROR;
 		}
         }
 
 	pcap_header.caplen	= caplen;
 	pcap_header.len		= packet_len;
 
 	/*
 	 * Count the packet.
 	 *
 	 * Arguably, we should count them before we check the filter,
 	 * as on many other platforms "ps_recv" counts packets
 	 * handed to the filter rather than packets that passed
 	 * the filter, but if filtering is done in the kernel, we
 	 * can't get a count of packets that passed the filter,
 	 * and that would mean the meaning of "ps_recv" wouldn't
 	 * be the same on all Linux systems.
 	 *
 	 * XXX - it's not the same on all systems in any case;
 	 * ideally, we should have a "get the statistics" call
 	 * that supplies more counts and indicates which of them
 	 * it supplies, so that we supply a count of packets
 	 * handed to the filter only on platforms where that
 	 * information is available.
 	 *
 	 * We count them here even if we can get the packet count
 	 * from the kernel, as we can only determine at run time
 	 * whether we'll be able to get it from the kernel (if
-	 * HAVE_TPACKET_STATS isn't defined, we can't get it from
+	 * HAVE_STRUCT_TPACKET_STATS isn't defined, we can't get it from
 	 * the kernel, but if it is defined, the library might
 	 * have been built with a 2.4 or later kernel, but we
 	 * might be running on a 2.2[.x] kernel without Alexey
 	 * Kuznetzov's turbopacket patches, and thus the kernel
 	 * might not be able to supply those statistics).  We
 	 * could, I guess, try, when opening the socket, to get
 	 * the statistics, and if we can not increment the count
 	 * here, but it's not clear that always incrementing
 	 * the count is more expensive than always testing a flag
 	 * in memory.
 	 *
 	 * We keep the count in "handlep->packets_read", and use that
 	 * for "ps_recv" if we can't get the statistics from the kernel.
 	 * We do that because, if we *can* get the statistics from
 	 * the kernel, we use "handlep->stat.ps_recv" and
 	 * "handlep->stat.ps_drop" as running counts, as reading the
 	 * statistics from the kernel resets the kernel statistics,
 	 * and if we directly increment "handlep->stat.ps_recv" here,
 	 * that means it will count packets *twice* on systems where
 	 * we can get kernel statistics - once here, and once in
 	 * pcap_stats_linux().
 	 */
 	handlep->packets_read++;
 
 	/* Call the user supplied callback function */
 	callback(userdata, &pcap_header, bp);
 
 	return 1;
 }
 
 static int
 pcap_inject_linux(pcap_t *handle, const void *buf, size_t size)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int ret;
 
 #ifdef HAVE_PF_PACKET_SOCKETS
 	if (!handlep->sock_packet) {
 		/* PF_PACKET socket */
 		if (handlep->ifindex == -1) {
 			/*
 			 * We don't support sending on the "any" device.
 			 */
 			strlcpy(handle->errbuf,
 			    "Sending packets isn't supported on the \"any\" device",
 			    PCAP_ERRBUF_SIZE);
 			return (-1);
 		}
 
 		if (handlep->cooked) {
 			/*
 			 * We don't support sending on the "any" device.
 			 *
 			 * XXX - how do you send on a bound cooked-mode
 			 * socket?
 			 * Is a "sendto()" required there?
 			 */
 			strlcpy(handle->errbuf,
 			    "Sending packets isn't supported in cooked mode",
 			    PCAP_ERRBUF_SIZE);
 			return (-1);
 		}
 	}
 #endif
 
 	ret = send(handle->fd, buf, size, 0);
 	if (ret == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	return (ret);
 }
 
 /*
  *  Get the statistics for the given packet capture handle.
  *  Reports the number of dropped packets iff the kernel supports
  *  the PACKET_STATISTICS "getsockopt()" argument (2.4 and later
  *  kernels, and 2.2[.x] kernels with Alexey Kuznetzov's turbopacket
  *  patches); otherwise, that information isn't available, and we lie
  *  and report 0 as the count of dropped packets.
  */
 static int
 pcap_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_linux *handlep = handle->priv;
-#ifdef HAVE_TPACKET_STATS
+#ifdef HAVE_STRUCT_TPACKET_STATS
 #ifdef HAVE_TPACKET3
 	/*
 	 * For sockets using TPACKET_V1 or TPACKET_V2, the extra
 	 * stuff at the end of a struct tpacket_stats_v3 will not
 	 * be filled in, and we don't look at it so this is OK even
 	 * for those sockets.  In addition, the PF_PACKET socket
 	 * code in the kernel only uses the length parameter to
 	 * compute how much data to copy out and to indicate how
 	 * much data was copied out, so it's OK to base it on the
 	 * size of a struct tpacket_stats.
 	 *
 	 * XXX - it's probably OK, in fact, to just use a
 	 * struct tpacket_stats for V3 sockets, as we don't
 	 * care about the tp_freeze_q_cnt stat.
 	 */
 	struct tpacket_stats_v3 kstats;
 #else /* HAVE_TPACKET3 */
 	struct tpacket_stats kstats;
 #endif /* HAVE_TPACKET3 */
 	socklen_t len = sizeof (struct tpacket_stats);
-#endif /* HAVE_TPACKET_STATS */
+#endif /* HAVE_STRUCT_TPACKET_STATS */
 
 	long if_dropped = 0;
 
 	/*
 	 *	To fill in ps_ifdrop, we parse /proc/net/dev for the number
 	 */
 	if (handle->opt.promisc)
 	{
 		if_dropped = handlep->proc_dropped;
 		handlep->proc_dropped = linux_if_drops(handlep->device);
 		handlep->stat.ps_ifdrop += (handlep->proc_dropped - if_dropped);
 	}
 
-#ifdef HAVE_TPACKET_STATS
+#ifdef HAVE_STRUCT_TPACKET_STATS
 	/*
 	 * Try to get the packet counts from the kernel.
 	 */
 	if (getsockopt(handle->fd, SOL_PACKET, PACKET_STATISTICS,
 			&kstats, &len) > -1) {
 		/*
 		 * On systems where the PACKET_STATISTICS "getsockopt()"
 		 * argument is supported on PF_PACKET sockets:
 		 *
 		 *	"ps_recv" counts only packets that *passed* the
 		 *	filter, not packets that didn't pass the filter.
 		 *	This includes packets later dropped because we
 		 *	ran out of buffer space.
 		 *
 		 *	"ps_drop" counts packets dropped because we ran
 		 *	out of buffer space.  It doesn't count packets
 		 *	dropped by the interface driver.  It counts only
 		 *	packets that passed the filter.
 		 *
 		 *	See above for ps_ifdrop.
 		 *
 		 *	Both statistics include packets not yet read from
 		 *	the kernel by libpcap, and thus not yet seen by
 		 *	the application.
 		 *
 		 * In "linux/net/packet/af_packet.c", at least in the
 		 * 2.4.9 kernel, "tp_packets" is incremented for every
 		 * packet that passes the packet filter *and* is
 		 * successfully queued on the socket; "tp_drops" is
 		 * incremented for every packet dropped because there's
 		 * not enough free space in the socket buffer.
 		 *
 		 * When the statistics are returned for a PACKET_STATISTICS
 		 * "getsockopt()" call, "tp_drops" is added to "tp_packets",
 		 * so that "tp_packets" counts all packets handed to
 		 * the PF_PACKET socket, including packets dropped because
 		 * there wasn't room on the socket buffer - but not
 		 * including packets that didn't pass the filter.
 		 *
 		 * In the BSD BPF, the count of received packets is
 		 * incremented for every packet handed to BPF, regardless
 		 * of whether it passed the filter.
 		 *
 		 * We can't make "pcap_stats()" work the same on both
 		 * platforms, but the best approximation is to return
 		 * "tp_packets" as the count of packets and "tp_drops"
 		 * as the count of drops.
 		 *
 		 * Keep a running total because each call to
 		 *    getsockopt(handle->fd, SOL_PACKET, PACKET_STATISTICS, ....
 		 * resets the counters to zero.
 		 */
 		handlep->stat.ps_recv += kstats.tp_packets;
 		handlep->stat.ps_drop += kstats.tp_drops;
 		*stats = handlep->stat;
 		return 0;
 	}
 	else
 	{
 		/*
 		 * If the error was EOPNOTSUPP, fall through, so that
 		 * if you build the library on a system with
 		 * "struct tpacket_stats" and run it on a system
 		 * that doesn't, it works as it does if the library
 		 * is built on a system without "struct tpacket_stats".
 		 */
 		if (errno != EOPNOTSUPP) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "pcap_stats: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "pcap_stats");
 			return -1;
 		}
 	}
 #endif
 	/*
 	 * On systems where the PACKET_STATISTICS "getsockopt()" argument
 	 * is not supported on PF_PACKET sockets:
 	 *
 	 *	"ps_recv" counts only packets that *passed* the filter,
 	 *	not packets that didn't pass the filter.  It does not
 	 *	count packets dropped because we ran out of buffer
 	 *	space.
 	 *
 	 *	"ps_drop" is not supported.
 	 *
 	 *	"ps_ifdrop" is supported. It will return the number
 	 *	of drops the interface reports in /proc/net/dev,
 	 *	if that is available.
 	 *
 	 *	"ps_recv" doesn't include packets not yet read from
 	 *	the kernel by libpcap.
 	 *
 	 * We maintain the count of packets processed by libpcap in
 	 * "handlep->packets_read", for reasons described in the comment
 	 * at the end of pcap_read_packet().  We have no idea how many
 	 * packets were dropped by the kernel buffers -- but we know
 	 * how many the interface dropped, so we can return that.
 	 */
 
 	stats->ps_recv = handlep->packets_read;
 	stats->ps_drop = 0;
 	stats->ps_ifdrop = handlep->stat.ps_ifdrop;
 	return 0;
 }
 
 static int
-add_linux_if(pcap_if_t **devlistp, const char *ifname, int fd, char *errbuf)
+add_linux_if(pcap_if_list_t *devlistp, const char *ifname, int fd, char *errbuf)
 {
 	const char *p;
 	char name[512];	/* XXX - pick a size */
 	char *q, *saveq;
 	struct ifreq ifrflags;
 
 	/*
 	 * Get the interface name.
 	 */
 	p = ifname;
 	q = &name[0];
 	while (*p != '\0' && isascii(*p) && !isspace(*p)) {
 		if (*p == ':') {
 			/*
 			 * This could be the separator between a
 			 * name and an alias number, or it could be
 			 * the separator between a name with no
 			 * alias number and the next field.
 			 *
 			 * If there's a colon after digits, it
 			 * separates the name and the alias number,
 			 * otherwise it separates the name and the
 			 * next field.
 			 */
 			saveq = q;
 			while (isascii(*p) && isdigit(*p))
 				*q++ = *p++;
 			if (*p != ':') {
 				/*
 				 * That was the next field,
 				 * not the alias number.
 				 */
 				q = saveq;
 			}
 			break;
 		} else
 			*q++ = *p++;
 	}
 	*q = '\0';
 
 	/*
 	 * Get the flags for this interface.
 	 */
 	strlcpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name));
 	if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 		if (errno == ENXIO || errno == ENODEV)
 			return (0);	/* device doesn't actually exist - ignore it */
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "SIOCGIFFLAGS: %.*s: %s",
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFFLAGS: %.*s",
 		    (int)sizeof(ifrflags.ifr_name),
-		    ifrflags.ifr_name,
-		    pcap_strerror(errno));
+		    ifrflags.ifr_name);
 		return (-1);
 	}
 
 	/*
-	 * Add an entry for this interface, with no addresses.
+	 * Add an entry for this interface, with no addresses, if it's
+	 * not already in the list.
 	 */
-	if (pcap_add_if(devlistp, name,
-	    if_flags_to_pcap_flags(name, ifrflags.ifr_flags), NULL,
-	    errbuf) == -1) {
+	if (find_or_add_if(devlistp, name, ifrflags.ifr_flags,
+	    get_if_flags, errbuf) == NULL) {
 		/*
 		 * Failure.
 		 */
 		return (-1);
 	}
 
 	return (0);
 }
 
 /*
  * Get from "/sys/class/net" all interfaces listed there; if they're
  * already in the list of interfaces we have, that won't add another
  * instance, but if they're not, that'll add them.
  *
  * We don't bother getting any addresses for them; it appears you can't
  * use SIOCGIFADDR on Linux to get IPv6 addresses for interfaces, and,
  * although some other types of addresses can be fetched with SIOCGIFADDR,
  * we don't bother with them for now.
  *
  * We also don't fail if we couldn't open "/sys/class/net"; we just leave
  * the list of interfaces as is, and return 0, so that we can try
  * scanning /proc/net/dev.
  *
  * Otherwise, we return 1 if we don't get an error and -1 if we do.
  */
 static int
-scan_sys_class_net(pcap_if_t **devlistp, char *errbuf)
+scan_sys_class_net(pcap_if_list_t *devlistp, char *errbuf)
 {
 	DIR *sys_class_net_d;
 	int fd;
 	struct dirent *ent;
 	char subsystem_path[PATH_MAX+1];
 	struct stat statb;
 	int ret = 1;
 
 	sys_class_net_d = opendir("/sys/class/net");
 	if (sys_class_net_d == NULL) {
 		/*
 		 * Don't fail if it doesn't exist at all.
 		 */
 		if (errno == ENOENT)
 			return (0);
 
 		/*
 		 * Fail if we got some other error.
 		 */
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't open /sys/class/net: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't open /sys/class/net");
 		return (-1);
 	}
 
 	/*
 	 * Create a socket from which to fetch interface information.
 	 */
 	fd = socket(PF_UNIX, SOCK_RAW, 0);
 	if (fd < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		(void)closedir(sys_class_net_d);
 		return (-1);
 	}
 
 	for (;;) {
 		errno = 0;
 		ent = readdir(sys_class_net_d);
 		if (ent == NULL) {
 			/*
 			 * Error or EOF; if errno != 0, it's an error.
 			 */
 			break;
 		}
 
 		/*
 		 * Ignore "." and "..".
 		 */
 		if (strcmp(ent->d_name, ".") == 0 ||
 		    strcmp(ent->d_name, "..") == 0)
 			continue;
 
 		/*
 		 * Ignore plain files; they do not have subdirectories
 		 * and thus have no attributes.
 		 */
 		if (ent->d_type == DT_REG)
 			continue;
 
 		/*
 		 * Is there an "ifindex" file under that name?
 		 * (We don't care whether it's a directory or
 		 * a symlink; older kernels have directories
 		 * for devices, newer kernels have symlinks to
 		 * directories.)
 		 */
 		pcap_snprintf(subsystem_path, sizeof subsystem_path,
 		    "/sys/class/net/%s/ifindex", ent->d_name);
 		if (lstat(subsystem_path, &statb) != 0) {
 			/*
 			 * Stat failed.  Either there was an error
 			 * other than ENOENT, and we don't know if
 			 * this is an interface, or it's ENOENT,
 			 * and either some part of "/sys/class/net/{if}"
 			 * disappeared, in which case it probably means
 			 * the interface disappeared, or there's no
 			 * "ifindex" file, which means it's not a
 			 * network interface.
 			 */
 			continue;
 		}
 
 		/*
 		 * Attempt to add the interface.
 		 */
 		if (add_linux_if(devlistp, &ent->d_name[0], fd, errbuf) == -1) {
 			/* Fail. */
 			ret = -1;
 			break;
 		}
 	}
 	if (ret != -1) {
 		/*
 		 * Well, we didn't fail for any other reason; did we
 		 * fail due to an error reading the directory?
 		 */
 		if (errno != 0) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "Error reading /sys/class/net: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "Error reading /sys/class/net");
 			ret = -1;
 		}
 	}
 
 	(void)close(fd);
 	(void)closedir(sys_class_net_d);
 	return (ret);
 }
 
 /*
  * Get from "/proc/net/dev" all interfaces listed there; if they're
  * already in the list of interfaces we have, that won't add another
  * instance, but if they're not, that'll add them.
  *
  * See comments from scan_sys_class_net().
  */
 static int
-scan_proc_net_dev(pcap_if_t **devlistp, char *errbuf)
+scan_proc_net_dev(pcap_if_list_t *devlistp, char *errbuf)
 {
 	FILE *proc_net_f;
 	int fd;
 	char linebuf[512];
 	int linenum;
 	char *p;
 	int ret = 0;
 
 	proc_net_f = fopen("/proc/net/dev", "r");
 	if (proc_net_f == NULL) {
 		/*
 		 * Don't fail if it doesn't exist at all.
 		 */
 		if (errno == ENOENT)
 			return (0);
 
 		/*
 		 * Fail if we got some other error.
 		 */
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't open /proc/net/dev: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't open /proc/net/dev");
 		return (-1);
 	}
 
 	/*
 	 * Create a socket from which to fetch interface information.
 	 */
 	fd = socket(PF_UNIX, SOCK_RAW, 0);
 	if (fd < 0) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		(void)fclose(proc_net_f);
 		return (-1);
 	}
 
 	for (linenum = 1;
 	    fgets(linebuf, sizeof linebuf, proc_net_f) != NULL; linenum++) {
 		/*
 		 * Skip the first two lines - they're headers.
 		 */
 		if (linenum <= 2)
 			continue;
 
 		p = &linebuf[0];
 
 		/*
 		 * Skip leading white space.
 		 */
 		while (*p != '\0' && isascii(*p) && isspace(*p))
 			p++;
 		if (*p == '\0' || *p == '\n')
 			continue;	/* blank line */
 
 		/*
 		 * Attempt to add the interface.
 		 */
 		if (add_linux_if(devlistp, p, fd, errbuf) == -1) {
 			/* Fail. */
 			ret = -1;
 			break;
 		}
 	}
 	if (ret != -1) {
 		/*
 		 * Well, we didn't fail for any other reason; did we
 		 * fail due to an error reading the file?
 		 */
 		if (ferror(proc_net_f)) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "Error reading /proc/net/dev: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "Error reading /proc/net/dev");
 			ret = -1;
 		}
 	}
 
 	(void)close(fd);
 	(void)fclose(proc_net_f);
 	return (ret);
 }
 
 /*
  * Description string for the "any" device.
  */
 static const char any_descr[] = "Pseudo-device that captures on all interfaces";
 
 /*
  * A SOCK_PACKET or PF_PACKET socket can be bound to any network interface.
  */
 static int
 can_be_bound(const char *name _U_)
 {
 	return (1);
 }
 
+/*
+ * Get additional flags for a device, using SIOCGIFMEDIA.
+ */
+static int
+get_if_flags(const char *name, bpf_u_int32 *flags, char *errbuf)
+{
+	int sock;
+	FILE *fh;
+	unsigned int arptype;
+	struct ifreq ifr;
+	struct ethtool_value info;
+
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback devices aren't wireless, and "connected"/
+		 * "disconnected" doesn't apply to them.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return 0;
+	}
+
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock == -1) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, errno,
+		    "Can't create socket to get ethtool information for %s",
+		    name);
+		return -1;
+	}
+
+	/*
+	 * OK, what type of network is this?
+	 * In particular, is it wired or wireless?
+	 */
+	if (is_wifi(sock, name)) {
+		/*
+		 * Wi-Fi, hence wireless.
+		 */
+		*flags |= PCAP_IF_WIRELESS;
+	} else {
+		/*
+		 * OK, what does /sys/class/net/{if}/type contain?
+		 * (We don't use that for Wi-Fi, as it'll report
+		 * "Ethernet", i.e. ARPHRD_ETHER, for non-monitor-
+		 * mode devices.)
+		 */
+		char *pathstr;
+
+		if (asprintf(&pathstr, "/sys/class/net/%s/type", name) == -1) {
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "%s: Can't generate path name string for /sys/class/net device",
+			    name);
+			close(sock);
+			return -1;
+		}
+		fh = fopen(pathstr, "r");
+		if (fh != NULL) {
+			if (fscanf(fh, "%u", &arptype) == 1) {
+				/*
+				 * OK, we got an ARPHRD_ type; what is it?
+				 */
+				switch (arptype) {
+
+#ifdef ARPHRD_LOOPBACK
+				case ARPHRD_LOOPBACK:
+					/*
+					 * These are types to which
+					 * "connected" and "disconnected"
+					 * don't apply, so don't bother
+					 * asking about it.
+					 *
+					 * XXX - add other types?
+					 */
+					close(sock);
+					fclose(fh);
+					free(pathstr);
+					return 0;
+#endif
+
+				case ARPHRD_IRDA:
+				case ARPHRD_IEEE80211:
+				case ARPHRD_IEEE80211_PRISM:
+				case ARPHRD_IEEE80211_RADIOTAP:
+#ifdef ARPHRD_IEEE802154
+				case ARPHRD_IEEE802154:
+#endif
+#ifdef ARPHRD_IEEE802154_MONITOR
+				case ARPHRD_IEEE802154_MONITOR:
+#endif
+#ifdef ARPHRD_6LOWPAN
+				case ARPHRD_6LOWPAN:
+#endif
+					/*
+					 * Various wireless types.
+					 */
+					*flags |= PCAP_IF_WIRELESS;
+					break;
+				}
+			}
+			fclose(fh);
+			free(pathstr);
+		}
+	}
+
+#ifdef ETHTOOL_GLINK
+	memset(&ifr, 0, sizeof(ifr));
+	strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+	info.cmd = ETHTOOL_GLINK;
+	ifr.ifr_data = (caddr_t)&info;
+	if (ioctl(sock, SIOCETHTOOL, &ifr) == -1) {
+		int save_errno = errno;
+
+		switch (save_errno) {
+
+		case EOPNOTSUPP:
+		case EINVAL:
+			/*
+			 * OK, this OS version or driver doesn't support
+			 * asking for this information.
+			 * XXX - distinguish between "this doesn't
+			 * support ethtool at all because it's not
+			 * that type of device" vs. "this doesn't
+			 * support ethtool even though it's that
+			 * type of device", and return "unknown".
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+			close(sock);
+			return 0;
+
+		case ENODEV:
+			/*
+			 * OK, no such device.
+			 * The user will find that out when they try to
+			 * activate the device; just say "OK" and
+			 * don't set anything.
+			 */
+			close(sock);
+			return 0;
+
+		default:
+			/*
+			 * Other error.
+			 */
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    save_errno,
+			    "%s: SIOCETHTOOL(ETHTOOL_GLINK) ioctl failed",
+			    name);
+			close(sock);
+			return -1;
+		}
+	}
+
+	/*
+	 * Is it connected?
+	 */
+	if (info.data) {
+		/*
+		 * It's connected.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_CONNECTED;
+	} else {
+		/*
+		 * It's disconnected.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_DISCONNECTED;
+	}
+#endif
+
+	close(sock);
+	return 0;
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 	int ret;
 
 	/*
 	 * Get the list of regular interfaces first.
 	 */
-	if (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound) == -1)
+	if (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+	    get_if_flags) == -1)
 		return (-1);	/* failure */
 
 	/*
 	 * Read "/sys/class/net", and add to the list of interfaces all
 	 * interfaces listed there that we don't already have, because,
 	 * on Linux, SIOCGIFCONF reports only interfaces with IPv4 addresses,
 	 * and even getifaddrs() won't return information about
 	 * interfaces with no addresses, so you need to read "/sys/class/net"
 	 * to get the names of the rest of the interfaces.
 	 */
-	ret = scan_sys_class_net(alldevsp, errbuf);
+	ret = scan_sys_class_net(devlistp, errbuf);
 	if (ret == -1)
 		return (-1);	/* failed */
 	if (ret == 0) {
 		/*
 		 * No /sys/class/net; try reading /proc/net/dev instead.
 		 */
-		if (scan_proc_net_dev(alldevsp, errbuf) == -1)
+		if (scan_proc_net_dev(devlistp, errbuf) == -1)
 			return (-1);
 	}
 
 	/*
 	 * Add the "any" device.
+	 * As it refers to all network devices, not to any particular
+	 * network device, the notion of "connected" vs. "disconnected"
+	 * doesn't apply.
 	 */
-	if (pcap_add_if(alldevsp, "any", PCAP_IF_UP|PCAP_IF_RUNNING,
-	    any_descr, errbuf) < 0)
+	if (add_dev(devlistp, "any",
+	    PCAP_IF_UP|PCAP_IF_RUNNING|PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
+	    any_descr, errbuf) == NULL)
 		return (-1);
 
 	return (0);
 }
 
 /*
  *  Attach the given BPF code to the packet capture device.
  */
 static int
 pcap_setfilter_linux_common(pcap_t *handle, struct bpf_program *filter,
     int is_mmapped)
 {
 	struct pcap_linux *handlep;
 #ifdef SO_ATTACH_FILTER
 	struct sock_fprog	fcode;
 	int			can_filter_in_kernel;
 	int			err = 0;
 #endif
 
 	if (!handle)
 		return -1;
 	if (!filter) {
 	        strlcpy(handle->errbuf, "setfilter: No filter specified",
 			PCAP_ERRBUF_SIZE);
 		return -1;
 	}
 
 	handlep = handle->priv;
 
 	/* Make our private copy of the filter */
 
 	if (install_bpf_program(handle, filter) < 0)
 		/* install_bpf_program() filled in errbuf */
 		return -1;
 
 	/*
 	 * Run user level packet filter by default. Will be overriden if
 	 * installing a kernel filter succeeds.
 	 */
 	handlep->filter_in_userland = 1;
 
 	/* Install kernel level filter if possible */
 
 #ifdef SO_ATTACH_FILTER
 #ifdef USHRT_MAX
 	if (handle->fcode.bf_len > USHRT_MAX) {
 		/*
 		 * fcode.len is an unsigned short for current kernel.
 		 * I have yet to see BPF-Code with that much
 		 * instructions but still it is possible. So for the
 		 * sake of correctness I added this check.
 		 */
 		fprintf(stderr, "Warning: Filter too complex for kernel\n");
 		fcode.len = 0;
 		fcode.filter = NULL;
 		can_filter_in_kernel = 0;
 	} else
 #endif /* USHRT_MAX */
 	{
 		/*
 		 * Oh joy, the Linux kernel uses struct sock_fprog instead
 		 * of struct bpf_program and of course the length field is
 		 * of different size. Pointed out by Sebastian
 		 *
 		 * Oh, and we also need to fix it up so that all "ret"
 		 * instructions with non-zero operands have MAXIMUM_SNAPLEN
 		 * as the operand if we're not capturing in memory-mapped
 		 * mode, and so that, if we're in cooked mode, all memory-
 		 * reference instructions use special magic offsets in
 		 * references to the link-layer header and assume that the
 		 * link-layer payload begins at 0; "fix_program()" will do
 		 * that.
 		 */
 		switch (fix_program(handle, &fcode, is_mmapped)) {
 
 		case -1:
 		default:
 			/*
 			 * Fatal error; just quit.
 			 * (The "default" case shouldn't happen; we
 			 * return -1 for that reason.)
 			 */
 			return -1;
 
 		case 0:
 			/*
 			 * The program performed checks that we can't make
 			 * work in the kernel.
 			 */
 			can_filter_in_kernel = 0;
 			break;
 
 		case 1:
 			/*
 			 * We have a filter that'll work in the kernel.
 			 */
 			can_filter_in_kernel = 1;
 			break;
 		}
 	}
 
 	/*
 	 * NOTE: at this point, we've set both the "len" and "filter"
 	 * fields of "fcode".  As of the 2.6.32.4 kernel, at least,
 	 * those are the only members of the "sock_fprog" structure,
 	 * so we initialize every member of that structure.
 	 *
 	 * If there is anything in "fcode" that is not initialized,
 	 * it is either a field added in a later kernel, or it's
 	 * padding.
 	 *
 	 * If a new field is added, this code needs to be updated
 	 * to set it correctly.
 	 *
 	 * If there are no other fields, then:
 	 *
 	 *	if the Linux kernel looks at the padding, it's
 	 *	buggy;
 	 *
 	 *	if the Linux kernel doesn't look at the padding,
 	 *	then if some tool complains that we're passing
 	 *	uninitialized data to the kernel, then the tool
 	 *	is buggy and needs to understand that it's just
 	 *	padding.
 	 */
 	if (can_filter_in_kernel) {
 		if ((err = set_kernel_filter(handle, &fcode)) == 0)
 		{
 			/*
 			 * Installation succeded - using kernel filter,
 			 * so userland filtering not needed.
 			 */
 			handlep->filter_in_userland = 0;
 		}
 		else if (err == -1)	/* Non-fatal error */
 		{
 			/*
 			 * Print a warning if we weren't able to install
 			 * the filter for a reason other than "this kernel
 			 * isn't configured to support socket filters.
 			 */
 			if (errno != ENOPROTOOPT && errno != EOPNOTSUPP) {
 				fprintf(stderr,
 				    "Warning: Kernel filter failed: %s\n",
 					pcap_strerror(errno));
 			}
 		}
 	}
 
 	/*
 	 * If we're not using the kernel filter, get rid of any kernel
 	 * filter that might've been there before, e.g. because the
 	 * previous filter could work in the kernel, or because some other
 	 * code attached a filter to the socket by some means other than
 	 * calling "pcap_setfilter()".  Otherwise, the kernel filter may
 	 * filter out packets that would pass the new userland filter.
 	 */
 	if (handlep->filter_in_userland) {
 		if (reset_kernel_filter(handle) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "can't remove kernel filter: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't remove kernel filter");
 			err = -2;	/* fatal error */
 		}
 	}
 
 	/*
 	 * Free up the copy of the filter that was made by "fix_program()".
 	 */
 	if (fcode.filter != NULL)
 		free(fcode.filter);
 
 	if (err == -2)
 		/* Fatal error */
 		return -1;
 #endif /* SO_ATTACH_FILTER */
 
 	return 0;
 }
 
 static int
 pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
 {
 	return pcap_setfilter_linux_common(handle, filter, 0);
 }
 
 
 /*
  * Set direction flag: Which packets do we accept on a forwarding
  * single device? IN, OUT or both?
  */
 static int
 pcap_setdirection_linux(pcap_t *handle, pcap_direction_t d)
 {
 #ifdef HAVE_PF_PACKET_SOCKETS
 	struct pcap_linux *handlep = handle->priv;
 
 	if (!handlep->sock_packet) {
 		handle->direction = d;
 		return 0;
 	}
 #endif
 	/*
 	 * We're not using PF_PACKET sockets, so we can't determine
 	 * the direction of the packet.
 	 */
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 	    "Setting direction is not supported on SOCK_PACKET sockets");
 	return -1;
 }
 
 #ifdef HAVE_PF_PACKET_SOCKETS
 /*
  * Map the PACKET_ value to a LINUX_SLL_ value; we
  * want the same numerical value to be used in
  * the link-layer header even if the numerical values
  * for the PACKET_ #defines change, so that programs
  * that look at the packet type field will always be
  * able to handle DLT_LINUX_SLL captures.
  */
 static short int
 map_packet_type_to_sll_type(short int sll_pkttype)
 {
 	switch (sll_pkttype) {
 
 	case PACKET_HOST:
 		return htons(LINUX_SLL_HOST);
 
 	case PACKET_BROADCAST:
 		return htons(LINUX_SLL_BROADCAST);
 
 	case PACKET_MULTICAST:
 		return  htons(LINUX_SLL_MULTICAST);
 
 	case PACKET_OTHERHOST:
 		return htons(LINUX_SLL_OTHERHOST);
 
 	case PACKET_OUTGOING:
 		return htons(LINUX_SLL_OUTGOING);
 
 	default:
 		return -1;
 	}
 }
 #endif
 
 static int
 is_wifi(int sock_fd
 #ifndef IW_MODE_MONITOR
 _U_
 #endif
 , const char *device)
 {
 	char *pathstr;
 	struct stat statb;
 #ifdef IW_MODE_MONITOR
 	char errbuf[PCAP_ERRBUF_SIZE];
 #endif
 
 	/*
 	 * See if there's a sysfs wireless directory for it.
 	 * If so, it's a wireless interface.
 	 */
 	if (asprintf(&pathstr, "/sys/class/net/%s/wireless", device) == -1) {
 		/*
 		 * Just give up here.
 		 */
 		return 0;
 	}
 	if (stat(pathstr, &statb) == 0) {
 		free(pathstr);
 		return 1;
 	}
 	free(pathstr);
 
 #ifdef IW_MODE_MONITOR
 	/*
 	 * OK, maybe it's not wireless, or maybe this kernel doesn't
 	 * support sysfs.  Try the wireless extensions.
 	 */
 	if (has_wext(sock_fd, device, errbuf) == 1) {
 		/*
 		 * It supports the wireless extensions, so it's a Wi-Fi
 		 * device.
 		 */
 		return 1;
 	}
 #endif
 	return 0;
 }
 
 /*
  *  Linux uses the ARP hardware type to identify the type of an
  *  interface. pcap uses the DLT_xxx constants for this. This
  *  function takes a pointer to a "pcap_t", and an ARPHRD_xxx
  *  constant, as arguments, and sets "handle->linktype" to the
  *  appropriate DLT_XXX constant and sets "handle->offset" to
  *  the appropriate value (to make "handle->offset" plus link-layer
  *  header length be a multiple of 4, so that the link-layer payload
  *  will be aligned on a 4-byte boundary when capturing packets).
  *  (If the offset isn't set here, it'll be 0; add code as appropriate
  *  for cases where it shouldn't be 0.)
  *
  *  If "cooked_ok" is non-zero, we can use DLT_LINUX_SLL and capture
  *  in cooked mode; otherwise, we can't use cooked mode, so we have
  *  to pick some type that works in raw mode, or fail.
  *
  *  Sets the link type to -1 if unable to map the type.
  */
 static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
 			      const char *device, int cooked_ok)
 {
 	static const char cdma_rmnet[] = "cdma_rmnet";
 
 	switch (arptype) {
 
 	case ARPHRD_ETHER:
 		/*
 		 * For various annoying reasons having to do with DHCP
 		 * software, some versions of Android give the mobile-
 		 * phone-network interface an ARPHRD_ value of
 		 * ARPHRD_ETHER, even though the packets supplied by
 		 * that interface have no link-layer header, and begin
 		 * with an IP header, so that the ARPHRD_ value should
 		 * be ARPHRD_NONE.
 		 *
 		 * Detect those devices by checking the device name, and
 		 * use DLT_RAW for them.
 		 */
 		if (strncmp(device, cdma_rmnet, sizeof cdma_rmnet - 1) == 0) {
 			handle->linktype = DLT_RAW;
 			return;
 		}
 
 		/*
 		 * Is this a real Ethernet device?  If so, give it a
 		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 		 * that an application can let you choose it, in case you're
 		 * capturing DOCSIS traffic that a Cisco Cable Modem
 		 * Termination System is putting out onto an Ethernet (it
 		 * doesn't put an Ethernet header onto the wire, it puts raw
 		 * DOCSIS frames out on the wire inside the low-level
 		 * Ethernet framing).
 		 *
 		 * XXX - are there any other sorts of "fake Ethernet" that
 		 * have ARPHRD_ETHER but that shouldn't offer DLT_DOCSIS as
 		 * a Cisco CMTS won't put traffic onto it or get traffic
 		 * bridged onto it?  ISDN is handled in "activate_new()",
 		 * as we fall back on cooked mode there, and we use
 		 * is_wifi() to check for 802.11 devices; are there any
 		 * others?
 		 */
 		if (!is_wifi(sock_fd, device)) {
 			/*
 			 * It's not a Wi-Fi device; offer DOCSIS.
 			 */
 			handle->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 			/*
 			 * If that fails, just leave the list empty.
 			 */
 			if (handle->dlt_list != NULL) {
 				handle->dlt_list[0] = DLT_EN10MB;
 				handle->dlt_list[1] = DLT_DOCSIS;
 				handle->dlt_count = 2;
 			}
 		}
 		/* FALLTHROUGH */
 
 	case ARPHRD_METRICOM:
 	case ARPHRD_LOOPBACK:
 		handle->linktype = DLT_EN10MB;
 		handle->offset = 2;
 		break;
 
 	case ARPHRD_EETHER:
 		handle->linktype = DLT_EN3MB;
 		break;
 
 	case ARPHRD_AX25:
 		handle->linktype = DLT_AX25_KISS;
 		break;
 
 	case ARPHRD_PRONET:
 		handle->linktype = DLT_PRONET;
 		break;
 
 	case ARPHRD_CHAOS:
 		handle->linktype = DLT_CHAOS;
 		break;
 #ifndef ARPHRD_CAN
 #define ARPHRD_CAN 280
 #endif
 	case ARPHRD_CAN:
 		/*
 		 * Map this to DLT_LINUX_SLL; that way, CAN frames will
 		 * have ETH_P_CAN/LINUX_SLL_P_CAN as the protocol and
 		 * CAN FD frames will have ETH_P_CANFD/LINUX_SLL_P_CANFD
 		 * as the protocol, so they can be distinguished by the
 		 * protocol in the SLL header.
 		 */
 		handle->linktype = DLT_LINUX_SLL;
 		break;
 
 #ifndef ARPHRD_IEEE802_TR
 #define ARPHRD_IEEE802_TR 800	/* From Linux 2.4 */
 #endif
 	case ARPHRD_IEEE802_TR:
 	case ARPHRD_IEEE802:
 		handle->linktype = DLT_IEEE802;
 		handle->offset = 2;
 		break;
 
 	case ARPHRD_ARCNET:
 		handle->linktype = DLT_ARCNET_LINUX;
 		break;
 
 #ifndef ARPHRD_FDDI	/* From Linux 2.2.13 */
 #define ARPHRD_FDDI	774
 #endif
 	case ARPHRD_FDDI:
 		handle->linktype = DLT_FDDI;
 		handle->offset = 3;
 		break;
 
 #ifndef ARPHRD_ATM  /* FIXME: How to #include this? */
 #define ARPHRD_ATM 19
 #endif
 	case ARPHRD_ATM:
 		/*
 		 * The Classical IP implementation in ATM for Linux
 		 * supports both what RFC 1483 calls "LLC Encapsulation",
 		 * in which each packet has an LLC header, possibly
 		 * with a SNAP header as well, prepended to it, and
 		 * what RFC 1483 calls "VC Based Multiplexing", in which
 		 * different virtual circuits carry different network
 		 * layer protocols, and no header is prepended to packets.
 		 *
 		 * They both have an ARPHRD_ type of ARPHRD_ATM, so
 		 * you can't use the ARPHRD_ type to find out whether
 		 * captured packets will have an LLC header, and,
 		 * while there's a socket ioctl to *set* the encapsulation
 		 * type, there's no ioctl to *get* the encapsulation type.
 		 *
 		 * This means that
 		 *
 		 *	programs that dissect Linux Classical IP frames
 		 *	would have to check for an LLC header and,
 		 *	depending on whether they see one or not, dissect
 		 *	the frame as LLC-encapsulated or as raw IP (I
 		 *	don't know whether there's any traffic other than
 		 *	IP that would show up on the socket, or whether
 		 *	there's any support for IPv6 in the Linux
 		 *	Classical IP code);
 		 *
 		 *	filter expressions would have to compile into
 		 *	code that checks for an LLC header and does
 		 *	the right thing.
 		 *
 		 * Both of those are a nuisance - and, at least on systems
 		 * that support PF_PACKET sockets, we don't have to put
 		 * up with those nuisances; instead, we can just capture
 		 * in cooked mode.  That's what we'll do, if we can.
 		 * Otherwise, we'll just fail.
 		 */
 		if (cooked_ok)
 			handle->linktype = DLT_LINUX_SLL;
 		else
 			handle->linktype = -1;
 		break;
 
 #ifndef ARPHRD_IEEE80211  /* From Linux 2.4.6 */
 #define ARPHRD_IEEE80211 801
 #endif
 	case ARPHRD_IEEE80211:
 		handle->linktype = DLT_IEEE802_11;
 		break;
 
 #ifndef ARPHRD_IEEE80211_PRISM  /* From Linux 2.4.18 */
 #define ARPHRD_IEEE80211_PRISM 802
 #endif
 	case ARPHRD_IEEE80211_PRISM:
 		handle->linktype = DLT_PRISM_HEADER;
 		break;
 
 #ifndef ARPHRD_IEEE80211_RADIOTAP /* new */
 #define ARPHRD_IEEE80211_RADIOTAP 803
 #endif
 	case ARPHRD_IEEE80211_RADIOTAP:
 		handle->linktype = DLT_IEEE802_11_RADIO;
 		break;
 
 	case ARPHRD_PPP:
 		/*
 		 * Some PPP code in the kernel supplies no link-layer
 		 * header whatsoever to PF_PACKET sockets; other PPP
 		 * code supplies PPP link-layer headers ("syncppp.c");
 		 * some PPP code might supply random link-layer
 		 * headers (PPP over ISDN - there's code in Ethereal,
 		 * for example, to cope with PPP-over-ISDN captures
 		 * with which the Ethereal developers have had to cope,
 		 * heuristically trying to determine which of the
 		 * oddball link-layer headers particular packets have).
 		 *
 		 * As such, we just punt, and run all PPP interfaces
 		 * in cooked mode, if we can; otherwise, we just treat
 		 * it as DLT_RAW, for now - if somebody needs to capture,
 		 * on a 2.0[.x] kernel, on PPP devices that supply a
 		 * link-layer header, they'll have to add code here to
 		 * map to the appropriate DLT_ type (possibly adding a
 		 * new DLT_ type, if necessary).
 		 */
 		if (cooked_ok)
 			handle->linktype = DLT_LINUX_SLL;
 		else {
 			/*
 			 * XXX - handle ISDN types here?  We can't fall
 			 * back on cooked sockets, so we'd have to
 			 * figure out from the device name what type of
 			 * link-layer encapsulation it's using, and map
 			 * that to an appropriate DLT_ value, meaning
 			 * we'd map "isdnN" devices to DLT_RAW (they
 			 * supply raw IP packets with no link-layer
 			 * header) and "isdY" devices to a new DLT_I4L_IP
 			 * type that has only an Ethernet packet type as
 			 * a link-layer header.
 			 *
 			 * But sometimes we seem to get random crap
 			 * in the link-layer header when capturing on
 			 * ISDN devices....
 			 */
 			handle->linktype = DLT_RAW;
 		}
 		break;
 
 #ifndef ARPHRD_CISCO
 #define ARPHRD_CISCO 513 /* previously ARPHRD_HDLC */
 #endif
 	case ARPHRD_CISCO:
 		handle->linktype = DLT_C_HDLC;
 		break;
 
 	/* Not sure if this is correct for all tunnels, but it
 	 * works for CIPE */
 	case ARPHRD_TUNNEL:
 #ifndef ARPHRD_SIT
 #define ARPHRD_SIT 776	/* From Linux 2.2.13 */
 #endif
 	case ARPHRD_SIT:
 	case ARPHRD_CSLIP:
 	case ARPHRD_SLIP6:
 	case ARPHRD_CSLIP6:
 	case ARPHRD_ADAPT:
 	case ARPHRD_SLIP:
 #ifndef ARPHRD_RAWHDLC
 #define ARPHRD_RAWHDLC 518
 #endif
 	case ARPHRD_RAWHDLC:
 #ifndef ARPHRD_DLCI
 #define ARPHRD_DLCI 15
 #endif
 	case ARPHRD_DLCI:
 		/*
 		 * XXX - should some of those be mapped to DLT_LINUX_SLL
 		 * instead?  Should we just map all of them to DLT_LINUX_SLL?
 		 */
 		handle->linktype = DLT_RAW;
 		break;
 
 #ifndef ARPHRD_FRAD
 #define ARPHRD_FRAD 770
 #endif
 	case ARPHRD_FRAD:
 		handle->linktype = DLT_FRELAY;
 		break;
 
 	case ARPHRD_LOCALTLK:
 		handle->linktype = DLT_LTALK;
 		break;
 
 	case 18:
 		/*
 		 * RFC 4338 defines an encapsulation for IP and ARP
 		 * packets that's compatible with the RFC 2625
 		 * encapsulation, but that uses a different ARP
 		 * hardware type and hardware addresses.  That
 		 * ARP hardware type is 18; Linux doesn't define
 		 * any ARPHRD_ value as 18, but if it ever officially
 		 * supports RFC 4338-style IP-over-FC, it should define
 		 * one.
 		 *
 		 * For now, we map it to DLT_IP_OVER_FC, in the hopes
 		 * that this will encourage its use in the future,
 		 * should Linux ever officially support RFC 4338-style
 		 * IP-over-FC.
 		 */
 		handle->linktype = DLT_IP_OVER_FC;
 		break;
 
 #ifndef ARPHRD_FCPP
 #define ARPHRD_FCPP	784
 #endif
 	case ARPHRD_FCPP:
 #ifndef ARPHRD_FCAL
 #define ARPHRD_FCAL	785
 #endif
 	case ARPHRD_FCAL:
 #ifndef ARPHRD_FCPL
 #define ARPHRD_FCPL	786
 #endif
 	case ARPHRD_FCPL:
 #ifndef ARPHRD_FCFABRIC
 #define ARPHRD_FCFABRIC	787
 #endif
 	case ARPHRD_FCFABRIC:
 		/*
 		 * Back in 2002, Donald Lee at Cray wanted a DLT_ for
 		 * IP-over-FC:
 		 *
 		 *	http://www.mail-archive.com/tcpdump-workers@sandelman.ottawa.on.ca/msg01043.html
 		 *
 		 * and one was assigned.
 		 *
 		 * In a later private discussion (spun off from a message
 		 * on the ethereal-users list) on how to get that DLT_
 		 * value in libpcap on Linux, I ended up deciding that
 		 * the best thing to do would be to have him tweak the
 		 * driver to set the ARPHRD_ value to some ARPHRD_FCxx
 		 * type, and map all those types to DLT_IP_OVER_FC:
 		 *
 		 *	I've checked into the libpcap and tcpdump CVS tree
 		 *	support for DLT_IP_OVER_FC.  In order to use that,
 		 *	you'd have to modify your modified driver to return
 		 *	one of the ARPHRD_FCxxx types, in "fcLINUXfcp.c" -
 		 *	change it to set "dev->type" to ARPHRD_FCFABRIC, for
 		 *	example (the exact value doesn't matter, it can be
 		 *	any of ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, or
 		 *	ARPHRD_FCFABRIC).
 		 *
 		 * 11 years later, Christian Svensson wanted to map
 		 * various ARPHRD_ values to DLT_FC_2 and
 		 * DLT_FC_2_WITH_FRAME_DELIMS for raw Fibre Channel
 		 * frames:
 		 *
 		 *	https://github.com/mcr/libpcap/pull/29
 		 *
 		 * There doesn't seem to be any network drivers that uses
 		 * any of the ARPHRD_FC* values for IP-over-FC, and
 		 * it's not exactly clear what the "Dummy types for non
 		 * ARP hardware" are supposed to mean (link-layer
 		 * header type?  Physical network type?), so it's
 		 * not exactly clear why the ARPHRD_FC* types exist
 		 * in the first place.
 		 *
 		 * For now, we map them to DLT_FC_2, and provide an
 		 * option of DLT_FC_2_WITH_FRAME_DELIMS, as well as
 		 * DLT_IP_OVER_FC just in case there's some old
 		 * driver out there that uses one of those types for
 		 * IP-over-FC on which somebody wants to capture
 		 * packets.
 		 */
-		handle->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
+		handle->dlt_list = (u_int *) malloc(sizeof(u_int) * 3);
 		/*
 		 * If that fails, just leave the list empty.
 		 */
 		if (handle->dlt_list != NULL) {
 			handle->dlt_list[0] = DLT_FC_2;
 			handle->dlt_list[1] = DLT_FC_2_WITH_FRAME_DELIMS;
 			handle->dlt_list[2] = DLT_IP_OVER_FC;
 			handle->dlt_count = 3;
 		}
 		handle->linktype = DLT_FC_2;
 		break;
 
 #ifndef ARPHRD_IRDA
 #define ARPHRD_IRDA	783
 #endif
 	case ARPHRD_IRDA:
 		/* Don't expect IP packet out of this interfaces... */
 		handle->linktype = DLT_LINUX_IRDA;
 		/* We need to save packet direction for IrDA decoding,
 		 * so let's use "Linux-cooked" mode. Jean II
 		 *
 		 * XXX - this is handled in activate_new(). */
 		/* handlep->cooked = 1; */
 		break;
 
 	/* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
 	 * is needed, please report it to <daniele@orlandi.com> */
 #ifndef ARPHRD_LAPD
 #define ARPHRD_LAPD	8445
 #endif
 	case ARPHRD_LAPD:
 		/* Don't expect IP packet out of this interfaces... */
 		handle->linktype = DLT_LINUX_LAPD;
 		break;
 
 #ifndef ARPHRD_NONE
 #define ARPHRD_NONE	0xFFFE
 #endif
 	case ARPHRD_NONE:
 		/*
 		 * No link-layer header; packets are just IP
 		 * packets, so use DLT_RAW.
 		 */
 		handle->linktype = DLT_RAW;
 		break;
 
 #ifndef ARPHRD_IEEE802154
 #define ARPHRD_IEEE802154      804
 #endif
        case ARPHRD_IEEE802154:
                handle->linktype =  DLT_IEEE802_15_4_NOFCS;
                break;
 
 #ifndef ARPHRD_NETLINK
 #define ARPHRD_NETLINK	824
 #endif
 	case ARPHRD_NETLINK:
 		handle->linktype = DLT_NETLINK;
 		/*
 		 * We need to use cooked mode, so that in sll_protocol we
 		 * pick up the netlink protocol type such as NETLINK_ROUTE,
 		 * NETLINK_GENERIC, NETLINK_FIB_LOOKUP, etc.
 		 *
 		 * XXX - this is handled in activate_new().
 		 */
 		/* handlep->cooked = 1; */
 		break;
 
+#ifndef ARPHRD_VSOCKMON
+#define ARPHRD_VSOCKMON	826
+#endif
+	case ARPHRD_VSOCKMON:
+		handle->linktype = DLT_VSOCK;
+		break;
+
 	default:
 		handle->linktype = -1;
 		break;
 	}
 }
 
 /* ===== Functions to interface to the newer kernels ================== */
 
 /*
  * Try to open a packet socket using the new kernel PF_PACKET interface.
  * Returns 1 on success, 0 on an error that means the new interface isn't
  * present (so the old SOCK_PACKET interface should be tried), and a
  * PCAP_ERROR_ value on an error that means that the old mechanism won't
  * work either (so it shouldn't be tried).
  */
 static int
 activate_new(pcap_t *handle)
 {
 #ifdef HAVE_PF_PACKET_SOCKETS
 	struct pcap_linux *handlep = handle->priv;
 	const char		*device = handle->opt.device;
 	int			is_any_device = (strcmp(device, "any") == 0);
+	int			protocol = pcap_protocol(handle);
 	int			sock_fd = -1, arptype;
 #ifdef HAVE_PACKET_AUXDATA
 	int			val;
 #endif
 	int			err = 0;
 	struct packet_mreq	mr;
 #if defined(SO_BPF_EXTENSIONS) && defined(SKF_AD_VLAN_TAG_PRESENT)
 	int			bpf_extensions;
 	socklen_t		len = sizeof(bpf_extensions);
 #endif
 
 	/*
 	 * Open a socket with protocol family packet. If the
 	 * "any" device was specified, we open a SOCK_DGRAM
 	 * socket for the cooked interface, otherwise we first
 	 * try a SOCK_RAW socket for the raw interface.
 	 */
 	sock_fd = is_any_device ?
-		socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) :
-		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+		socket(PF_PACKET, SOCK_DGRAM, protocol) :
+		socket(PF_PACKET, SOCK_RAW, protocol);
 
 	if (sock_fd == -1) {
 		if (errno == EINVAL || errno == EAFNOSUPPORT) {
 			/*
 			 * We don't support PF_PACKET/SOCK_whatever
 			 * sockets; try the old mechanism.
 			 */
 			return 0;
 		}
 
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
-			 pcap_strerror(errno) );
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		if (errno == EPERM || errno == EACCES) {
 			/*
 			 * You don't have permission to open the
 			 * socket.
 			 */
 			return PCAP_ERROR_PERM_DENIED;
 		} else {
 			/*
 			 * Other error.
 			 */
 			return PCAP_ERROR;
 		}
 	}
 
 	/* It seems the kernel supports the new interface. */
 	handlep->sock_packet = 0;
 
 	/*
 	 * Get the interface index of the loopback device.
 	 * If the attempt fails, don't fail, just set the
 	 * "handlep->lo_ifindex" to -1.
 	 *
 	 * XXX - can there be more than one device that loops
 	 * packets back, i.e. devices other than "lo"?  If so,
 	 * we'd need to find them all, and have an array of
 	 * indices for them, and check all of them in
 	 * "pcap_read_packet()".
 	 */
 	handlep->lo_ifindex = iface_get_id(sock_fd, "lo", handle->errbuf);
 
 	/*
 	 * Default value for offset to align link-layer payload
 	 * on a 4-byte boundary.
 	 */
 	handle->offset	 = 0;
 
 	/*
 	 * What kind of frames do we have to deal with? Fall back
 	 * to cooked mode if we have an unknown interface type
 	 * or a type we know doesn't work well in raw mode.
 	 */
 	if (!is_any_device) {
 		/* Assume for now we don't need cooked mode. */
 		handlep->cooked = 0;
 
 		if (handle->opt.rfmon) {
 			/*
 			 * We were asked to turn on monitor mode.
 			 * Do so before we get the link-layer type,
 			 * because entering monitor mode could change
 			 * the link-layer type.
 			 */
 			err = enter_rfmon_mode(handle, sock_fd, device);
 			if (err < 0) {
 				/* Hard failure */
 				close(sock_fd);
 				return err;
 			}
 			if (err == 0) {
 				/*
 				 * Nothing worked for turning monitor mode
 				 * on.
 				 */
 				close(sock_fd);
 				return PCAP_ERROR_RFMON_NOTSUP;
 			}
 
 			/*
 			 * Either monitor mode has been turned on for
 			 * the device, or we've been given a different
 			 * device to open for monitor mode.  If we've
 			 * been given a different device, use it.
 			 */
 			if (handlep->mondevice != NULL)
 				device = handlep->mondevice;
 		}
 		arptype	= iface_get_arptype(sock_fd, device, handle->errbuf);
 		if (arptype < 0) {
 			close(sock_fd);
 			return arptype;
 		}
 		map_arphrd_to_dlt(handle, sock_fd, arptype, device, 1);
 		if (handle->linktype == -1 ||
 		    handle->linktype == DLT_LINUX_SLL ||
 		    handle->linktype == DLT_LINUX_IRDA ||
 		    handle->linktype == DLT_LINUX_LAPD ||
 		    handle->linktype == DLT_NETLINK ||
 		    (handle->linktype == DLT_EN10MB &&
 		     (strncmp("isdn", device, 4) == 0 ||
 		      strncmp("isdY", device, 4) == 0))) {
 			/*
 			 * Unknown interface type (-1), or a
 			 * device we explicitly chose to run
 			 * in cooked mode (e.g., PPP devices),
 			 * or an ISDN device (whose link-layer
 			 * type we can only determine by using
 			 * APIs that may be different on different
 			 * kernels) - reopen in cooked mode.
 			 */
 			if (close(sock_fd) == -1) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					 "close: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "close");
 				return PCAP_ERROR;
 			}
-			sock_fd = socket(PF_PACKET, SOCK_DGRAM,
-			    htons(ETH_P_ALL));
+			sock_fd = socket(PF_PACKET, SOCK_DGRAM, protocol);
 			if (sock_fd == -1) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				    "socket: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "socket");
 				if (errno == EPERM || errno == EACCES) {
 					/*
 					 * You don't have permission to
 					 * open the socket.
 					 */
 					return PCAP_ERROR_PERM_DENIED;
 				} else {
 					/*
 					 * Other error.
 					 */
 					return PCAP_ERROR;
 				}
 			}
 			handlep->cooked = 1;
 
 			/*
 			 * Get rid of any link-layer type list
 			 * we allocated - this only supports cooked
 			 * capture.
 			 */
 			if (handle->dlt_list != NULL) {
 				free(handle->dlt_list);
 				handle->dlt_list = NULL;
 				handle->dlt_count = 0;
 			}
 
 			if (handle->linktype == -1) {
 				/*
 				 * Warn that we're falling back on
 				 * cooked mode; we may want to
 				 * update "map_arphrd_to_dlt()"
 				 * to handle the new type.
 				 */
 				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 					"arptype %d not "
 					"supported by libpcap - "
 					"falling back to cooked "
 					"socket",
 					arptype);
 			}
 
 			/*
 			 * IrDA capture is not a real "cooked" capture,
 			 * it's IrLAP frames, not IP packets.  The
 			 * same applies to LAPD capture.
 			 */
 			if (handle->linktype != DLT_LINUX_IRDA &&
 			    handle->linktype != DLT_LINUX_LAPD &&
 			    handle->linktype != DLT_NETLINK)
 				handle->linktype = DLT_LINUX_SLL;
 		}
 
 		handlep->ifindex = iface_get_id(sock_fd, device,
 		    handle->errbuf);
 		if (handlep->ifindex == -1) {
 			close(sock_fd);
 			return PCAP_ERROR;
 		}
 
 		if ((err = iface_bind(sock_fd, handlep->ifindex,
-		    handle->errbuf)) != 1) {
+		    handle->errbuf, protocol)) != 1) {
 		    	close(sock_fd);
 			if (err < 0)
 				return err;
 			else
 				return 0;	/* try old mechanism */
 		}
 	} else {
 		/*
 		 * The "any" device.
 		 */
 		if (handle->opt.rfmon) {
 			/*
 			 * It doesn't support monitor mode.
 			 */
 			close(sock_fd);
 			return PCAP_ERROR_RFMON_NOTSUP;
 		}
 
 		/*
 		 * It uses cooked mode.
 		 */
 		handlep->cooked = 1;
 		handle->linktype = DLT_LINUX_SLL;
 
 		/*
 		 * We're not bound to a device.
 		 * For now, we're using this as an indication
 		 * that we can't transmit; stop doing that only
 		 * if we figure out how to transmit in cooked
 		 * mode.
 		 */
 		handlep->ifindex = -1;
 	}
 
 	/*
 	 * Select promiscuous mode on if "promisc" is set.
 	 *
 	 * Do not turn allmulti mode on if we don't select
 	 * promiscuous mode - on some devices (e.g., Orinoco
 	 * wireless interfaces), allmulti mode isn't supported
 	 * and the driver implements it by turning promiscuous
 	 * mode on, and that screws up the operation of the
 	 * card as a normal networking interface, and on no
 	 * other platform I know of does starting a non-
 	 * promiscuous capture affect which multicast packets
 	 * are received by the interface.
 	 */
 
 	/*
 	 * Hmm, how can we set promiscuous mode on all interfaces?
 	 * I am not sure if that is possible at all.  For now, we
 	 * silently ignore attempts to turn promiscuous mode on
 	 * for the "any" device (so you don't have to explicitly
 	 * disable it in programs such as tcpdump).
 	 */
 
 	if (!is_any_device && handle->opt.promisc) {
 		memset(&mr, 0, sizeof(mr));
 		mr.mr_ifindex = handlep->ifindex;
 		mr.mr_type    = PACKET_MR_PROMISC;
 		if (setsockopt(sock_fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
 		    &mr, sizeof(mr)) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				"setsockopt: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "setsockopt");
 			close(sock_fd);
 			return PCAP_ERROR;
 		}
 	}
 
 	/* Enable auxillary data if supported and reserve room for
 	 * reconstructing VLAN headers. */
 #ifdef HAVE_PACKET_AUXDATA
 	val = 1;
 	if (setsockopt(sock_fd, SOL_PACKET, PACKET_AUXDATA, &val,
 		       sizeof(val)) == -1 && errno != ENOPROTOOPT) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "setsockopt: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "setsockopt");
 		close(sock_fd);
 		return PCAP_ERROR;
 	}
 	handle->offset += VLAN_TAG_LEN;
 #endif /* HAVE_PACKET_AUXDATA */
 
 	/*
 	 * This is a 2.2[.x] or later kernel (we know that
 	 * because we're not using a SOCK_PACKET socket -
 	 * PF_PACKET is supported only in 2.2 and later
 	 * kernels).
 	 *
 	 * We can safely pass "recvfrom()" a byte count
 	 * based on the snapshot length.
 	 *
 	 * If we're in cooked mode, make the snapshot length
 	 * large enough to hold a "cooked mode" header plus
 	 * 1 byte of packet data (so we don't pass a byte
 	 * count of 0 to "recvfrom()").
 	 */
 	if (handlep->cooked) {
 		if (handle->snapshot < SLL_HDR_LEN + 1)
 			handle->snapshot = SLL_HDR_LEN + 1;
 	}
 	handle->bufsize = handle->snapshot;
 
 	/*
 	 * Set the offset at which to insert VLAN tags.
 	 * That should be the offset of the type field.
 	 */
 	switch (handle->linktype) {
 
 	case DLT_EN10MB:
 		/*
 		 * The type field is after the destination and source
 		 * MAC address.
 		 */
 		handlep->vlan_offset = 2 * ETH_ALEN;
 		break;
 
 	case DLT_LINUX_SLL:
 		/*
 		 * The type field is in the last 2 bytes of the
 		 * DLT_LINUX_SLL header.
 		 */
 		handlep->vlan_offset = SLL_HDR_LEN - 2;
 		break;
 
 	default:
 		handlep->vlan_offset = -1; /* unknown */
 		break;
 	}
 
 #if defined(SIOCGSTAMPNS) && defined(SO_TIMESTAMPNS)
 	if (handle->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO) {
 		int nsec_tstamps = 1;
 
 		if (setsockopt(sock_fd, SOL_SOCKET, SO_TIMESTAMPNS, &nsec_tstamps, sizeof(nsec_tstamps)) < 0) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "setsockopt: unable to set SO_TIMESTAMPNS");
 			close(sock_fd);
 			return PCAP_ERROR;
 		}
 	}
 #endif /* defined(SIOCGSTAMPNS) && defined(SO_TIMESTAMPNS) */
 
 	/*
 	 * We've succeeded. Save the socket FD in the pcap structure.
 	 */
 	handle->fd = sock_fd;
 
 #if defined(SO_BPF_EXTENSIONS) && defined(SKF_AD_VLAN_TAG_PRESENT)
 	/*
 	 * Can we generate special code for VLAN checks?
 	 * (XXX - what if we need the special code but it's not supported
 	 * by the OS?  Is that possible?)
 	 */
 	if (getsockopt(sock_fd, SOL_SOCKET, SO_BPF_EXTENSIONS,
 	    &bpf_extensions, &len) == 0) {
 		if (bpf_extensions >= SKF_AD_VLAN_TAG_PRESENT) {
 			/*
 			 * Yes, we can.  Request that we do so.
 			 */
 			handle->bpf_codegen_flags |= BPF_SPECIAL_VLAN_HANDLING;
 		}
 	}
 #endif /* defined(SO_BPF_EXTENSIONS) && defined(SKF_AD_VLAN_TAG_PRESENT) */
 
 	return 1;
 #else /* HAVE_PF_PACKET_SOCKETS */
 	strlcpy(ebuf,
 		"New packet capturing interface not supported by build "
 		"environment", PCAP_ERRBUF_SIZE);
 	return 0;
 #endif /* HAVE_PF_PACKET_SOCKETS */
 }
 
 #ifdef HAVE_PACKET_RING
 /*
  * Attempt to activate with memory-mapped access.
  *
  * On success, returns 1, and sets *status to 0 if there are no warnings
  * or to a PCAP_WARNING_ code if there is a warning.
  *
  * On failure due to lack of support for memory-mapped capture, returns
  * 0.
  *
  * On error, returns -1, and sets *status to the appropriate error code;
  * if that is PCAP_ERROR, sets handle->errbuf to the appropriate message.
  */
 static int
 activate_mmap(pcap_t *handle, int *status)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int ret;
 
 	/*
 	 * Attempt to allocate a buffer to hold the contents of one
 	 * packet, for use by the oneshot callback.
 	 */
 	handlep->oneshot_buffer = malloc(handle->snapshot);
 	if (handlep->oneshot_buffer == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "can't allocate oneshot buffer: %s",
-			 pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't allocate oneshot buffer");
 		*status = PCAP_ERROR;
 		return -1;
 	}
 
 	if (handle->opt.buffer_size == 0) {
 		/* by default request 2M for the ring buffer */
 		handle->opt.buffer_size = 2*1024*1024;
 	}
 	ret = prepare_tpacket_socket(handle);
 	if (ret == -1) {
 		free(handlep->oneshot_buffer);
 		*status = PCAP_ERROR;
 		return ret;
 	}
 	ret = create_ring(handle, status);
 	if (ret == 0) {
 		/*
 		 * We don't support memory-mapped capture; our caller
 		 * will fall back on reading from the socket.
 		 */
 		free(handlep->oneshot_buffer);
 		return 0;
 	}
 	if (ret == -1) {
 		/*
 		 * Error attempting to enable memory-mapped capture;
 		 * fail.  create_ring() has set *status.
 		 */
 		free(handlep->oneshot_buffer);
 		return -1;
 	}
 
 	/*
 	 * Success.  *status has been set either to 0 if there are no
 	 * warnings or to a PCAP_WARNING_ value if there is a warning.
 	 *
 	 * Override some defaults and inherit the other fields from
 	 * activate_new.
 	 * handle->offset is used to get the current position into the rx ring.
 	 * handle->cc is used to store the ring size.
 	 */
 
 	switch (handlep->tp_version) {
 	case TPACKET_V1:
 		handle->read_op = pcap_read_linux_mmap_v1;
 		break;
 	case TPACKET_V1_64:
 		handle->read_op = pcap_read_linux_mmap_v1_64;
 		break;
 #ifdef HAVE_TPACKET2
 	case TPACKET_V2:
 		handle->read_op = pcap_read_linux_mmap_v2;
 		break;
 #endif
 #ifdef HAVE_TPACKET3
 	case TPACKET_V3:
 		handle->read_op = pcap_read_linux_mmap_v3;
 		break;
 #endif
 	}
 	handle->cleanup_op = pcap_cleanup_linux_mmap;
 	handle->setfilter_op = pcap_setfilter_linux_mmap;
 	handle->setnonblock_op = pcap_setnonblock_mmap;
 	handle->getnonblock_op = pcap_getnonblock_mmap;
 	handle->oneshot_callback = pcap_oneshot_mmap;
 	handle->selectable_fd = handle->fd;
 	return 1;
 }
 #else /* HAVE_PACKET_RING */
 static int
 activate_mmap(pcap_t *handle _U_, int *status _U_)
 {
 	return 0;
 }
 #endif /* HAVE_PACKET_RING */
 
 #ifdef HAVE_PACKET_RING
 
 #if defined(HAVE_TPACKET2) || defined(HAVE_TPACKET3)
 /*
  * Attempt to set the socket to the specified version of the memory-mapped
  * header.
  *
  * Return 0 if we succeed; return 1 if we fail because that version isn't
  * supported; return -1 on any other error, and set handle->errbuf.
  */
 static int
 init_tpacket(pcap_t *handle, int version, const char *version_str)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int val = version;
 	socklen_t len = sizeof(val);
 
 	/*
 	 * Probe whether kernel supports the specified TPACKET version;
 	 * this also gets the length of the header for that version.
 	 */
 	if (getsockopt(handle->fd, SOL_PACKET, PACKET_HDRLEN, &val, &len) < 0) {
 		if (errno == ENOPROTOOPT || errno == EINVAL)
 			return 1;	/* no */
 
 		/* Failed to even find out; this is a fatal error. */
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			"can't get %s header len on packet socket: %s",
-			version_str,
-			pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't get %s header len on packet socket",
+		    version_str);
 		return -1;
 	}
 	handlep->tp_hdrlen = val;
 
 	val = version;
 	if (setsockopt(handle->fd, SOL_PACKET, PACKET_VERSION, &val,
 			   sizeof(val)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			"can't activate %s on packet socket: %s",
-			version_str,
-			pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't activate %s on packet socket", version_str);
 		return -1;
 	}
 	handlep->tp_version = version;
 
 	/* Reserve space for VLAN tag reconstruction */
 	val = VLAN_TAG_LEN;
 	if (setsockopt(handle->fd, SOL_PACKET, PACKET_RESERVE, &val,
 			   sizeof(val)) < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			"can't set up reserve on packet socket: %s",
-			pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't set up reserve on packet socket");
 		return -1;
 	}
 
 	return 0;
 }
 #endif /* defined HAVE_TPACKET2 || defined HAVE_TPACKET3 */
 
 /*
  * If the instruction set for which we're compiling has both 32-bit
  * and 64-bit versions, and Linux support for the 64-bit version
  * predates TPACKET_V2, define ISA_64_BIT as the .machine value
  * you get from uname() for the 64-bit version.  Otherwise, leave
  * it undefined.  (This includes ARM, which has a 64-bit version,
  * but Linux support for it appeared well after TPACKET_V2 support
  * did, so there should never be a case where 32-bit ARM code is
  * running o a 64-bit kernel that only supports TPACKET_V1.)
  *
  * If we've omitted your favorite such architecture, please contribute
  * a patch.  (No patch is needed for architectures that are 32-bit-only
  * or for which Linux has no support for 32-bit userland - or for which,
  * as noted, 64-bit support appeared in Linux after TPACKET_V2 support
  * did.)
  */
 #if defined(__i386__)
 #define ISA_64_BIT	"x86_64"
 #elif defined(__ppc__)
 #define ISA_64_BIT	"ppc64"
 #elif defined(__sparc__)
 #define ISA_64_BIT	"sparc64"
 #elif defined(__s390__)
 #define ISA_64_BIT	"s390x"
 #elif defined(__mips__)
 #define ISA_64_BIT	"mips64"
 #elif defined(__hppa__)
 #define ISA_64_BIT	"parisc64"
 #endif
 
 /*
  * Attempt to set the socket to version 3 of the memory-mapped header and,
  * if that fails because version 3 isn't supported, attempt to fall
  * back to version 2.  If version 2 isn't supported, just leave it at
  * version 1.
  *
  * Return 1 if we succeed or if we fail because neither version 2 nor 3 is
  * supported; return -1 on any other error, and set handle->errbuf.
  */
 static int
 prepare_tpacket_socket(pcap_t *handle)
 {
 	struct pcap_linux *handlep = handle->priv;
 #if defined(HAVE_TPACKET2) || defined(HAVE_TPACKET3)
 	int ret;
 #endif
 
 #ifdef HAVE_TPACKET3
 	/*
 	 * Try setting the version to TPACKET_V3.
 	 *
 	 * The only mode in which buffering is done on PF_PACKET
 	 * sockets, so that packets might not be delivered
 	 * immediately, is TPACKET_V3 mode.
 	 *
 	 * The buffering cannot be disabled in that mode, so
 	 * if the user has requested immediate mode, we don't
 	 * use TPACKET_V3.
 	 */
 	if (!handle->opt.immediate) {
 		ret = init_tpacket(handle, TPACKET_V3, "TPACKET_V3");
 		if (ret == 0) {
 			/*
 			 * Success.
 			 */
 			return 1;
 		}
 		if (ret == -1) {
 			/*
 			 * We failed for some reason other than "the
 			 * kernel doesn't support TPACKET_V3".
 			 */
 			return -1;
 		}
 	}
 #endif /* HAVE_TPACKET3 */
 
 #ifdef HAVE_TPACKET2
 	/*
 	 * Try setting the version to TPACKET_V2.
 	 */
 	ret = init_tpacket(handle, TPACKET_V2, "TPACKET_V2");
 	if (ret == 0) {
 		/*
 		 * Success.
 		 */
 		return 1;
 	}
 	if (ret == -1) {
 		/*
 		 * We failed for some reason other than "the
 		 * kernel doesn't support TPACKET_V2".
 		 */
 		return -1;
 	}
 #endif /* HAVE_TPACKET2 */
 
 	/*
 	 * OK, we're using TPACKET_V1, as that's all the kernel supports.
 	 */
 	handlep->tp_version = TPACKET_V1;
 	handlep->tp_hdrlen = sizeof(struct tpacket_hdr);
 
 #ifdef ISA_64_BIT
 	/*
 	 * 32-bit userspace + 64-bit kernel + TPACKET_V1 are not compatible with
 	 * each other due to platform-dependent data type size differences.
 	 *
 	 * If we have a 32-bit userland and a 64-bit kernel, use an
 	 * internally-defined TPACKET_V1_64, with which we use a 64-bit
 	 * version of the data structures.
 	 */
 	if (sizeof(long) == 4) {
 		/*
 		 * This is 32-bit code.
 		 */
 		struct utsname utsname;
 
 		if (uname(&utsname) == -1) {
 			/*
 			 * Failed.
 			 */
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "uname failed: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "uname failed");
 			return -1;
 		}
 		if (strcmp(utsname.machine, ISA_64_BIT) == 0) {
 			/*
 			 * uname() tells us the machine is 64-bit,
 			 * so we presumably have a 64-bit kernel.
 			 *
 			 * XXX - this presumes that uname() won't lie
 			 * in 32-bit code and claim that the machine
 			 * has the 32-bit version of the ISA.
 			 */
 			handlep->tp_version = TPACKET_V1_64;
 			handlep->tp_hdrlen = sizeof(struct tpacket_hdr_64);
 		}
 	}
 #endif
 
 	return 1;
 }
 
+#define MAX(a,b) ((a)>(b)?(a):(b))
+
 /*
  * Attempt to set up memory-mapped access.
  *
  * On success, returns 1, and sets *status to 0 if there are no warnings
  * or to a PCAP_WARNING_ code if there is a warning.
  *
  * On failure due to lack of support for memory-mapped capture, returns
  * 0.
  *
  * On error, returns -1, and sets *status to the appropriate error code;
  * if that is PCAP_ERROR, sets handle->errbuf to the appropriate message.
  */
 static int
 create_ring(pcap_t *handle, int *status)
 {
 	struct pcap_linux *handlep = handle->priv;
 	unsigned i, j, frames_per_block;
 #ifdef HAVE_TPACKET3
 	/*
 	 * For sockets using TPACKET_V1 or TPACKET_V2, the extra
 	 * stuff at the end of a struct tpacket_req3 will be
 	 * ignored, so this is OK even for those sockets.
 	 */
 	struct tpacket_req3 req;
 #else
 	struct tpacket_req req;
 #endif
 	socklen_t len;
 	unsigned int sk_type, tp_reserve, maclen, tp_hdrlen, netoff, macoff;
 	unsigned int frame_size;
 
 	/*
 	 * Start out assuming no warnings or errors.
 	 */
 	*status = 0;
 
 	switch (handlep->tp_version) {
 
 	case TPACKET_V1:
 	case TPACKET_V1_64:
 #ifdef HAVE_TPACKET2
 	case TPACKET_V2:
 #endif
-		/* Note that with large snapshot length (say 64K, which is
-		 * the default for recent versions of tcpdump, the value that
-		 * "-s 0" has given for a long time with tcpdump, and the
-		 * default in Wireshark/TShark/dumpcap), if we use the snapshot
+		/* Note that with large snapshot length (say 256K, which is
+		 * the default for recent versions of tcpdump, Wireshark,
+		 * TShark, dumpcap or 64K, the value that "-s 0" has given for
+		 * a long time with tcpdump), if we use the snapshot
 		 * length to calculate the frame length, only a few frames
 		 * will be available in the ring even with pretty
 		 * large ring size (and a lot of memory will be unused).
 		 *
 		 * Ideally, we should choose a frame length based on the
 		 * minimum of the specified snapshot length and the maximum
 		 * packet size.  That's not as easy as it sounds; consider,
 		 * for example, an 802.11 interface in monitor mode, where
 		 * the frame would include a radiotap header, where the
 		 * maximum radiotap header length is device-dependent.
 		 *
 		 * So, for now, we just do this for Ethernet devices, where
 		 * there's no metadata header, and the link-layer header is
 		 * fixed length.  We can get the maximum packet size by
 		 * adding 18, the Ethernet header length plus the CRC length
 		 * (just in case we happen to get the CRC in the packet), to
 		 * the MTU of the interface; we fetch the MTU in the hopes
 		 * that it reflects support for jumbo frames.  (Even if the
 		 * interface is just being used for passive snooping, the
 		 * driver might set the size of buffers in the receive ring
 		 * based on the MTU, so that the MTU limits the maximum size
 		 * of packets that we can receive.)
 		 *
-		 * We don't do that if segmentation/fragmentation or receive
-		 * offload are enabled, so we don't get rudely surprised by
-		 * "packets" bigger than the MTU. */
+		 * If segmentation/fragmentation or receive offload are
+		 * enabled, we can get reassembled/aggregated packets larger
+		 * than MTU, but bounded to 65535 plus the Ethernet overhead,
+		 * due to kernel and protocol constraints */
 		frame_size = handle->snapshot;
 		if (handle->linktype == DLT_EN10MB) {
+			unsigned int max_frame_len;
 			int mtu;
 			int offload;
 
+			mtu = iface_get_mtu(handle->fd, handle->opt.device,
+			    handle->errbuf);
+			if (mtu == -1) {
+				*status = PCAP_ERROR;
+				return -1;
+			}
 			offload = iface_get_offload(handle);
 			if (offload == -1) {
 				*status = PCAP_ERROR;
 				return -1;
 			}
-			if (!offload) {
-				mtu = iface_get_mtu(handle->fd, handle->opt.device,
-				    handle->errbuf);
-				if (mtu == -1) {
-					*status = PCAP_ERROR;
-					return -1;
-				}
-				if (frame_size > (unsigned int)mtu + 18)
-					frame_size = (unsigned int)mtu + 18;
-			}
+			if (offload)
+				max_frame_len = MAX(mtu, 65535);
+			else
+				max_frame_len = mtu;
+			max_frame_len += 18;
+
+			if (frame_size > max_frame_len)
+				frame_size = max_frame_len;
 		}
 
 		/* NOTE: calculus matching those in tpacket_rcv()
 		 * in linux-2.6/net/packet/af_packet.c
 		 */
 		len = sizeof(sk_type);
 		if (getsockopt(handle->fd, SOL_SOCKET, SO_TYPE, &sk_type,
 		    &len) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "getsockopt: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "getsockopt");
 			*status = PCAP_ERROR;
 			return -1;
 		}
 #ifdef PACKET_RESERVE
 		len = sizeof(tp_reserve);
 		if (getsockopt(handle->fd, SOL_PACKET, PACKET_RESERVE,
 		    &tp_reserve, &len) < 0) {
 			if (errno != ENOPROTOOPT) {
 				/*
 				 * ENOPROTOOPT means "kernel doesn't support
 				 * PACKET_RESERVE", in which case we fall back
 				 * as best we can.
 				 */
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				    "getsockopt: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "getsockopt");
 				*status = PCAP_ERROR;
 				return -1;
 			}
 			tp_reserve = 0;	/* older kernel, reserve not supported */
 		}
 #else
 		tp_reserve = 0;	/* older kernel, reserve not supported */
 #endif
 		maclen = (sk_type == SOCK_DGRAM) ? 0 : MAX_LINKHEADER_SIZE;
 			/* XXX: in the kernel maclen is calculated from
 			 * LL_ALLOCATED_SPACE(dev) and vnet_hdr.hdr_len
 			 * in:  packet_snd()           in linux-2.6/net/packet/af_packet.c
 			 * then packet_alloc_skb()     in linux-2.6/net/packet/af_packet.c
 			 * then sock_alloc_send_pskb() in linux-2.6/net/core/sock.c
 			 * but I see no way to get those sizes in userspace,
 			 * like for instance with an ifreq ioctl();
 			 * the best thing I've found so far is MAX_HEADER in
 			 * the kernel part of linux-2.6/include/linux/netdevice.h
 			 * which goes up to 128+48=176; since pcap-linux.c
 			 * defines a MAX_LINKHEADER_SIZE of 256 which is
 			 * greater than that, let's use it.. maybe is it even
 			 * large enough to directly replace macoff..
 			 */
 		tp_hdrlen = TPACKET_ALIGN(handlep->tp_hdrlen) + sizeof(struct sockaddr_ll) ;
 		netoff = TPACKET_ALIGN(tp_hdrlen + (maclen < 16 ? 16 : maclen)) + tp_reserve;
 			/* NOTE: AFAICS tp_reserve may break the TPACKET_ALIGN
 			 * of netoff, which contradicts
 			 * linux-2.6/Documentation/networking/packet_mmap.txt
 			 * documenting that:
 			 * "- Gap, chosen so that packet data (Start+tp_net)
 			 * aligns to TPACKET_ALIGNMENT=16"
 			 */
 			/* NOTE: in linux-2.6/include/linux/skbuff.h:
 			 * "CPUs often take a performance hit
 			 *  when accessing unaligned memory locations"
 			 */
 		macoff = netoff - maclen;
 		req.tp_frame_size = TPACKET_ALIGN(macoff + frame_size);
-		req.tp_frame_nr = handle->opt.buffer_size/req.tp_frame_size;
+		/*
+		 * Round the buffer size up to a multiple of the
+		 * frame size (rather than rounding down, which
+		 * would give a buffer smaller than our caller asked
+		 * for, and possibly give zero frames if the requested
+		 * buffer size is too small for one frame).
+		 */
+		req.tp_frame_nr = (handle->opt.buffer_size + req.tp_frame_size - 1)/req.tp_frame_size;
 		break;
 
 #ifdef HAVE_TPACKET3
 	case TPACKET_V3:
 		/* The "frames" for this are actually buffers that
 		 * contain multiple variable-sized frames.
 		 *
-		 * We pick a "frame" size of 128K to leave enough
-		 * room for at least one reasonably-sized packet
+		 * We pick a "frame" size of MAXIMUM_SNAPLEN to leave
+		 * enough room for at least one reasonably-sized packet
 		 * in the "frame". */
 		req.tp_frame_size = MAXIMUM_SNAPLEN;
-		req.tp_frame_nr = handle->opt.buffer_size/req.tp_frame_size;
+		/*
+		 * Round the buffer size up to a multiple of the
+		 * "frame" size (rather than rounding down, which
+		 * would give a buffer smaller than our caller asked
+		 * for, and possibly give zero "frames" if the requested
+		 * buffer size is too small for one "frame").
+		 */
+		req.tp_frame_nr = (handle->opt.buffer_size + req.tp_frame_size - 1)/req.tp_frame_size;
 		break;
 #endif
 	default:
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "Internal error: unknown TPACKET_ value %u",
 		    handlep->tp_version);
 		*status = PCAP_ERROR;
 		return -1;
 	}
 
 	/* compute the minumum block size that will handle this frame.
 	 * The block has to be page size aligned.
 	 * The max block size allowed by the kernel is arch-dependent and
 	 * it's not explicitly checked here. */
 	req.tp_block_size = getpagesize();
 	while (req.tp_block_size < req.tp_frame_size)
 		req.tp_block_size <<= 1;
 
 	frames_per_block = req.tp_block_size/req.tp_frame_size;
 
 	/*
 	 * PACKET_TIMESTAMP was added after linux/net_tstamp.h was,
 	 * so we check for PACKET_TIMESTAMP.  We check for
 	 * linux/net_tstamp.h just in case a system somehow has
 	 * PACKET_TIMESTAMP but not linux/net_tstamp.h; that might
 	 * be unnecessary.
 	 *
 	 * SIOCSHWTSTAMP was introduced in the patch that introduced
 	 * linux/net_tstamp.h, so we don't bother checking whether
 	 * SIOCSHWTSTAMP is defined (if your Linux system has
 	 * linux/net_tstamp.h but doesn't define SIOCSHWTSTAMP, your
 	 * Linux system is badly broken).
 	 */
 #if defined(HAVE_LINUX_NET_TSTAMP_H) && defined(PACKET_TIMESTAMP)
 	/*
 	 * If we were told to do so, ask the kernel and the driver
 	 * to use hardware timestamps.
 	 *
 	 * Hardware timestamps are only supported with mmapped
 	 * captures.
 	 */
 	if (handle->opt.tstamp_type == PCAP_TSTAMP_ADAPTER ||
 	    handle->opt.tstamp_type == PCAP_TSTAMP_ADAPTER_UNSYNCED) {
 		struct hwtstamp_config hwconfig;
 		struct ifreq ifr;
 		int timesource;
 
 		/*
 		 * Ask for hardware time stamps on all packets,
 		 * including transmitted packets.
 		 */
 		memset(&hwconfig, 0, sizeof(hwconfig));
 		hwconfig.tx_type = HWTSTAMP_TX_ON;
 		hwconfig.rx_filter = HWTSTAMP_FILTER_ALL;
 
 		memset(&ifr, 0, sizeof(ifr));
 		strlcpy(ifr.ifr_name, handle->opt.device, sizeof(ifr.ifr_name));
 		ifr.ifr_data = (void *)&hwconfig;
 
 		if (ioctl(handle->fd, SIOCSHWTSTAMP, &ifr) < 0) {
 			switch (errno) {
 
 			case EPERM:
 				/*
 				 * Treat this as an error, as the
 				 * user should try to run this
 				 * with the appropriate privileges -
 				 * and, if they can't, shouldn't
 				 * try requesting hardware time stamps.
 				 */
 				*status = PCAP_ERROR_PERM_DENIED;
 				return -1;
 
 			case EOPNOTSUPP:
 			case ERANGE:
 				/*
 				 * Treat this as a warning, as the
 				 * only way to fix the warning is to
 				 * get an adapter that supports hardware
 				 * time stamps for *all* packets.
 				 * (ERANGE means "we support hardware
 				 * time stamps, but for packets matching
 				 * that particular filter", so it means
 				 * "we don't support hardware time stamps
 				 * for all incoming packets" here.)
 				 *
 				 * We'll just fall back on the standard
 				 * host time stamps.
 				 */
 				*status = PCAP_WARNING_TSTAMP_TYPE_NOTSUP;
 				break;
 
 			default:
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					"SIOCSHWTSTAMP failed: %s",
-					pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "SIOCSHWTSTAMP failed");
 				*status = PCAP_ERROR;
 				return -1;
 			}
 		} else {
 			/*
 			 * Well, that worked.  Now specify the type of
 			 * hardware time stamp we want for this
 			 * socket.
 			 */
 			if (handle->opt.tstamp_type == PCAP_TSTAMP_ADAPTER) {
 				/*
 				 * Hardware timestamp, synchronized
 				 * with the system clock.
 				 */
 				timesource = SOF_TIMESTAMPING_SYS_HARDWARE;
 			} else {
 				/*
 				 * PCAP_TSTAMP_ADAPTER_UNSYNCED - hardware
 				 * timestamp, not synchronized with the
 				 * system clock.
 				 */
 				timesource = SOF_TIMESTAMPING_RAW_HARDWARE;
 			}
 			if (setsockopt(handle->fd, SOL_PACKET, PACKET_TIMESTAMP,
 				(void *)&timesource, sizeof(timesource))) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					"can't set PACKET_TIMESTAMP: %s",
-					pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "can't set PACKET_TIMESTAMP");
 				*status = PCAP_ERROR;
 				return -1;
 			}
 		}
 	}
 #endif /* HAVE_LINUX_NET_TSTAMP_H && PACKET_TIMESTAMP */
 
 	/* ask the kernel to create the ring */
 retry:
 	req.tp_block_nr = req.tp_frame_nr / frames_per_block;
 
 	/* req.tp_frame_nr is requested to match frames_per_block*req.tp_block_nr */
 	req.tp_frame_nr = req.tp_block_nr * frames_per_block;
 
 #ifdef HAVE_TPACKET3
 	/* timeout value to retire block - use the configured buffering timeout, or default if <0. */
 	req.tp_retire_blk_tov = (handlep->timeout>=0)?handlep->timeout:0;
 	/* private data not used */
 	req.tp_sizeof_priv = 0;
 	/* Rx ring - feature request bits - none (rxhash will not be filled) */
 	req.tp_feature_req_word = 0;
 #endif
 
 	if (setsockopt(handle->fd, SOL_PACKET, PACKET_RX_RING,
 					(void *) &req, sizeof(req))) {
 		if ((errno == ENOMEM) && (req.tp_block_nr > 1)) {
 			/*
 			 * Memory failure; try to reduce the requested ring
 			 * size.
 			 *
 			 * We used to reduce this by half -- do 5% instead.
 			 * That may result in more iterations and a longer
 			 * startup, but the user will be much happier with
 			 * the resulting buffer size.
 			 */
 			if (req.tp_frame_nr < 20)
 				req.tp_frame_nr -= 1;
 			else
 				req.tp_frame_nr -= req.tp_frame_nr/20;
 			goto retry;
 		}
 		if (errno == ENOPROTOOPT) {
 			/*
 			 * We don't have ring buffer support in this kernel.
 			 */
 			return 0;
 		}
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "can't create rx ring on packet socket: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't create rx ring on packet socket");
 		*status = PCAP_ERROR;
 		return -1;
 	}
 
 	/* memory map the rx ring */
 	handlep->mmapbuflen = req.tp_block_nr * req.tp_block_size;
 	handlep->mmapbuf = mmap(0, handlep->mmapbuflen,
 	    PROT_READ|PROT_WRITE, MAP_SHARED, handle->fd, 0);
 	if (handlep->mmapbuf == MAP_FAILED) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "can't mmap rx ring: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't mmap rx ring");
 
 		/* clear the allocated ring on error*/
 		destroy_ring(handle);
 		*status = PCAP_ERROR;
 		return -1;
 	}
 
 	/* allocate a ring for each frame header pointer*/
 	handle->cc = req.tp_frame_nr;
 	handle->buffer = malloc(handle->cc * sizeof(union thdr *));
 	if (!handle->buffer) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "can't allocate ring of frame headers: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "can't allocate ring of frame headers");
 
 		destroy_ring(handle);
 		*status = PCAP_ERROR;
 		return -1;
 	}
 
 	/* fill the header ring with proper frame ptr*/
 	handle->offset = 0;
 	for (i=0; i<req.tp_block_nr; ++i) {
 		void *base = &handlep->mmapbuf[i*req.tp_block_size];
 		for (j=0; j<frames_per_block; ++j, ++handle->offset) {
 			RING_GET_CURRENT_FRAME(handle) = base;
 			base += req.tp_frame_size;
 		}
 	}
 
 	handle->bufsize = req.tp_frame_size;
 	handle->offset = 0;
 	return 1;
 }
 
 /* free all ring related resources*/
 static void
 destroy_ring(pcap_t *handle)
 {
 	struct pcap_linux *handlep = handle->priv;
 
 	/* tell the kernel to destroy the ring*/
 	struct tpacket_req req;
 	memset(&req, 0, sizeof(req));
 	/* do not test for setsockopt failure, as we can't recover from any error */
 	(void)setsockopt(handle->fd, SOL_PACKET, PACKET_RX_RING,
 				(void *) &req, sizeof(req));
 
 	/* if ring is mapped, unmap it*/
 	if (handlep->mmapbuf) {
 		/* do not test for mmap failure, as we can't recover from any error */
 		(void)munmap(handlep->mmapbuf, handlep->mmapbuflen);
 		handlep->mmapbuf = NULL;
 	}
 }
 
 /*
  * Special one-shot callback, used for pcap_next() and pcap_next_ex(),
  * for Linux mmapped capture.
  *
  * The problem is that pcap_next() and pcap_next_ex() expect the packet
  * data handed to the callback to be valid after the callback returns,
  * but pcap_read_linux_mmap() has to release that packet as soon as
  * the callback returns (otherwise, the kernel thinks there's still
  * at least one unprocessed packet available in the ring, so a select()
  * will immediately return indicating that there's data to process), so,
  * in the callback, we have to make a copy of the packet.
  *
  * Yes, this means that, if the capture is using the ring buffer, using
  * pcap_next() or pcap_next_ex() requires more copies than using
  * pcap_loop() or pcap_dispatch().  If that bothers you, don't use
  * pcap_next() or pcap_next_ex().
  */
 static void
 pcap_oneshot_mmap(u_char *user, const struct pcap_pkthdr *h,
     const u_char *bytes)
 {
 	struct oneshot_userdata *sp = (struct oneshot_userdata *)user;
 	pcap_t *handle = sp->pd;
 	struct pcap_linux *handlep = handle->priv;
 
 	*sp->hdr = *h;
 	memcpy(handlep->oneshot_buffer, bytes, h->caplen);
 	*sp->pkt = handlep->oneshot_buffer;
 }
 
 static void
 pcap_cleanup_linux_mmap( pcap_t *handle )
 {
 	struct pcap_linux *handlep = handle->priv;
 
 	destroy_ring(handle);
 	if (handlep->oneshot_buffer != NULL) {
 		free(handlep->oneshot_buffer);
 		handlep->oneshot_buffer = NULL;
 	}
 	pcap_cleanup_linux(handle);
 }
 
 
 static int
-pcap_getnonblock_mmap(pcap_t *p, char *errbuf)
+pcap_getnonblock_mmap(pcap_t *handle)
 {
-	struct pcap_linux *handlep = p->priv;
+	struct pcap_linux *handlep = handle->priv;
 
 	/* use negative value of timeout to indicate non blocking ops */
 	return (handlep->timeout<0);
 }
 
 static int
-pcap_setnonblock_mmap(pcap_t *p, int nonblock, char *errbuf)
+pcap_setnonblock_mmap(pcap_t *handle, int nonblock)
 {
-	struct pcap_linux *handlep = p->priv;
+	struct pcap_linux *handlep = handle->priv;
 
 	/*
 	 * Set the file descriptor to non-blocking mode, as we use
 	 * it for sending packets.
 	 */
-	if (pcap_setnonblock_fd(p, nonblock, errbuf) == -1)
+	if (pcap_setnonblock_fd(handle, nonblock) == -1)
 		return -1;
 
 	/*
 	 * Map each value to their corresponding negation to
 	 * preserve the timeout value provided with pcap_set_timeout.
 	 */
 	if (nonblock) {
 		if (handlep->timeout >= 0) {
 			/*
 			 * Indicate that we're switching to
 			 * non-blocking mode.
 			 */
 			handlep->timeout = ~handlep->timeout;
 		}
 	} else {
 		if (handlep->timeout < 0) {
 			handlep->timeout = ~handlep->timeout;
 		}
 	}
 	/* Update the timeout to use in poll(). */
 	set_poll_timeout(handlep);
 	return 0;
 }
 
 /*
  * Get the status field of the ring buffer frame at a specified offset.
  */
 static inline int
 pcap_get_ring_frame_status(pcap_t *handle, int offset)
 {
 	struct pcap_linux *handlep = handle->priv;
 	union thdr h;
 
 	h.raw = RING_GET_FRAME_AT(handle, offset);
 	switch (handlep->tp_version) {
 	case TPACKET_V1:
 		return (h.h1->tp_status);
 		break;
 	case TPACKET_V1_64:
 		return (h.h1_64->tp_status);
 		break;
 #ifdef HAVE_TPACKET2
 	case TPACKET_V2:
 		return (h.h2->tp_status);
 		break;
 #endif
 #ifdef HAVE_TPACKET3
 	case TPACKET_V3:
 		return (h.h3->hdr.bh1.block_status);
 		break;
 #endif
 	}
 	/* This should not happen. */
 	return 0;
 }
 
 #ifndef POLLRDHUP
 #define POLLRDHUP 0
 #endif
 
 /*
  * Block waiting for frames to be available.
  */
 static int pcap_wait_for_frames_mmap(pcap_t *handle)
 {
 	struct pcap_linux *handlep = handle->priv;
 	char c;
 	struct pollfd pollinfo;
 	int ret;
 
 	pollinfo.fd = handle->fd;
 	pollinfo.events = POLLIN;
 
 	do {
 		/*
 		 * Yes, we do this even in non-blocking mode, as it's
 		 * the only way to get error indications from a
 		 * tpacket socket.
 		 *
 		 * The timeout is 0 in non-blocking mode, so poll()
 		 * returns immediately.
 		 */
 		ret = poll(&pollinfo, 1, handlep->poll_timeout);
 		if (ret < 0 && errno != EINTR) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				"can't poll on packet socket: %s",
-				pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't poll on packet socket");
 			return PCAP_ERROR;
 		} else if (ret > 0 &&
 			(pollinfo.revents & (POLLHUP|POLLRDHUP|POLLERR|POLLNVAL))) {
 			/*
 			 * There's some indication other than
 			 * "you can read on this descriptor" on
 			 * the descriptor.
 			 */
 			if (pollinfo.revents & (POLLHUP | POLLRDHUP)) {
 				pcap_snprintf(handle->errbuf,
 					PCAP_ERRBUF_SIZE,
 					"Hangup on packet socket");
 				return PCAP_ERROR;
 			}
 			if (pollinfo.revents & POLLERR) {
 				/*
 				 * A recv() will give us the actual error code.
 				 *
 				 * XXX - make the socket non-blocking?
 				 */
 				if (recv(handle->fd, &c, sizeof c,
 					MSG_PEEK) != -1)
 					continue;	/* what, no error? */
 				if (errno == ENETDOWN) {
 					/*
 					 * The device on which we're
 					 * capturing went away.
 					 *
 					 * XXX - we should really return
 					 * PCAP_ERROR_IFACE_NOT_UP, but
 					 * pcap_dispatch() etc. aren't
 					 * defined to return that.
 					 */
 					pcap_snprintf(handle->errbuf,
 						PCAP_ERRBUF_SIZE,
 						"The interface went down");
 				} else {
-					pcap_snprintf(handle->errbuf,
-						PCAP_ERRBUF_SIZE,
-						"Error condition on packet socket: %s",
-						strerror(errno));
+					pcap_fmt_errmsg_for_errno(handle->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "Error condition on packet socket");
 				}
 				return PCAP_ERROR;
 			}
 			if (pollinfo.revents & POLLNVAL) {
 				pcap_snprintf(handle->errbuf,
 					PCAP_ERRBUF_SIZE,
 					"Invalid polling request on packet socket");
 				return PCAP_ERROR;
 			}
 		}
 		/* check for break loop condition on interrupted syscall*/
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 	} while (ret < 0);
 	return 0;
 }
 
 /* handle a single memory mapped packet */
 static int pcap_handle_packet_mmap(
 		pcap_t *handle,
 		pcap_handler callback,
 		u_char *user,
 		unsigned char *frame,
 		unsigned int tp_len,
 		unsigned int tp_mac,
 		unsigned int tp_snaplen,
 		unsigned int tp_sec,
 		unsigned int tp_usec,
 		int tp_vlan_tci_valid,
 		__u16 tp_vlan_tci,
 		__u16 tp_vlan_tpid)
 {
 	struct pcap_linux *handlep = handle->priv;
 	unsigned char *bp;
 	struct sockaddr_ll *sll;
 	struct pcap_pkthdr pcaphdr;
+	unsigned int snaplen = tp_snaplen;
 
 	/* perform sanity check on internal offset. */
 	if (tp_mac + tp_snaplen > handle->bufsize) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			"corrupted frame on kernel ring mac "
 			"offset %u + caplen %u > frame len %d",
 			tp_mac, tp_snaplen, handle->bufsize);
 		return -1;
 	}
 
 	/* run filter on received packet
 	 * If the kernel filtering is enabled we need to run the
 	 * filter until all the frames present into the ring
 	 * at filter creation time are processed.
 	 * In this case, blocks_to_filter_in_userland is used
 	 * as a counter for the packet we need to filter.
 	 * Note: alternatively it could be possible to stop applying
 	 * the filter when the ring became empty, but it can possibly
 	 * happen a lot later... */
 	bp = frame + tp_mac;
 
 	/* if required build in place the sll header*/
 	sll = (void *)frame + TPACKET_ALIGN(handlep->tp_hdrlen);
 	if (handlep->cooked) {
 		struct sll_header *hdrp;
 
 		/*
 		 * The kernel should have left us with enough
 		 * space for an sll header; back up the packet
 		 * data pointer into that space, as that'll be
 		 * the beginning of the packet we pass to the
 		 * callback.
 		 */
 		bp -= SLL_HDR_LEN;
 
 		/*
 		 * Let's make sure that's past the end of
 		 * the tpacket header, i.e. >=
 		 * ((u_char *)thdr + TPACKET_HDRLEN), so we
 		 * don't step on the header when we construct
 		 * the sll header.
 		 */
 		if (bp < (u_char *)frame +
 				   TPACKET_ALIGN(handlep->tp_hdrlen) +
 				   sizeof(struct sockaddr_ll)) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 				"cooked-mode frame doesn't have room for sll header");
 			return -1;
 		}
 
 		/*
 		 * OK, that worked; construct the sll header.
 		 */
 		hdrp = (struct sll_header *)bp;
 		hdrp->sll_pkttype = map_packet_type_to_sll_type(
 						sll->sll_pkttype);
 		hdrp->sll_hatype = htons(sll->sll_hatype);
 		hdrp->sll_halen = htons(sll->sll_halen);
 		memcpy(hdrp->sll_addr, sll->sll_addr, SLL_ADDRLEN);
 		hdrp->sll_protocol = sll->sll_protocol;
+
+		snaplen += sizeof(struct sll_header);
 	}
 
 	if (handlep->filter_in_userland && handle->fcode.bf_insns) {
 		struct bpf_aux_data aux_data;
 
-		aux_data.vlan_tag = tp_vlan_tci & 0x0fff;
 		aux_data.vlan_tag_present = tp_vlan_tci_valid;
+		aux_data.vlan_tag = tp_vlan_tci & 0x0fff;
 
-		if (bpf_filter_with_aux_data(handle->fcode.bf_insns, bp,
-		    tp_len, tp_snaplen, &aux_data) == 0)
+		if (bpf_filter_with_aux_data(handle->fcode.bf_insns,
+					     bp,
+					     tp_len,
+					     snaplen,
+					     &aux_data) == 0)
 			return 0;
 	}
 
 	if (!linux_check_direction(handle, sll))
 		return 0;
 
 	/* get required packet info from ring header */
 	pcaphdr.ts.tv_sec = tp_sec;
 	pcaphdr.ts.tv_usec = tp_usec;
 	pcaphdr.caplen = tp_snaplen;
 	pcaphdr.len = tp_len;
 
 	/* if required build in place the sll header*/
 	if (handlep->cooked) {
 		/* update packet len */
 		pcaphdr.caplen += SLL_HDR_LEN;
 		pcaphdr.len += SLL_HDR_LEN;
 	}
 
 #if defined(HAVE_TPACKET2) || defined(HAVE_TPACKET3)
 	if (tp_vlan_tci_valid &&
 		handlep->vlan_offset != -1 &&
 		tp_snaplen >= (unsigned int) handlep->vlan_offset)
 	{
 		struct vlan_tag *tag;
 
 		/*
 		 * Move everything in the header, except the type field,
 		 * down VLAN_TAG_LEN bytes, to allow us to insert the
 		 * VLAN tag between that stuff and the type field.
 		 */
 		bp -= VLAN_TAG_LEN;
 		memmove(bp, bp + VLAN_TAG_LEN, handlep->vlan_offset);
 
 		/*
 		 * Now insert the tag.
 		 */
 		tag = (struct vlan_tag *)(bp + handlep->vlan_offset);
 		tag->vlan_tpid = htons(tp_vlan_tpid);
 		tag->vlan_tci = htons(tp_vlan_tci);
 
 		/*
 		 * Add the tag to the packet lengths.
 		 */
 		pcaphdr.caplen += VLAN_TAG_LEN;
 		pcaphdr.len += VLAN_TAG_LEN;
 	}
 #endif
 
 	/*
 	 * The only way to tell the kernel to cut off the
 	 * packet at a snapshot length is with a filter program;
 	 * if there's no filter program, the kernel won't cut
 	 * the packet off.
 	 *
 	 * Trim the snapshot length to be no longer than the
 	 * specified snapshot length.
 	 */
 	if (pcaphdr.caplen > (bpf_u_int32)handle->snapshot)
 		pcaphdr.caplen = handle->snapshot;
 
 	/* pass the packet to the user */
 	callback(user, &pcaphdr, bp);
 
 	return 1;
 }
 
 static int
 pcap_read_linux_mmap_v1(pcap_t *handle, int max_packets, pcap_handler callback,
 		u_char *user)
 {
 	struct pcap_linux *handlep = handle->priv;
 	union thdr h;
 	int pkts = 0;
 	int ret;
 
 	/* wait for frames availability.*/
 	h.raw = RING_GET_CURRENT_FRAME(handle);
 	if (h.h1->tp_status == TP_STATUS_KERNEL) {
 		/*
 		 * The current frame is owned by the kernel; wait for
 		 * a frame to be handed to us.
 		 */
 		ret = pcap_wait_for_frames_mmap(handle);
 		if (ret) {
 			return ret;
 		}
 	}
 
 	/* non-positive values of max_packets are used to require all
 	 * packets currently available in the ring */
 	while ((pkts < max_packets) || PACKET_COUNT_IS_UNLIMITED(max_packets)) {
 		/*
 		 * Get the current ring buffer frame, and break if
 		 * it's still owned by the kernel.
 		 */
 		h.raw = RING_GET_CURRENT_FRAME(handle);
 		if (h.h1->tp_status == TP_STATUS_KERNEL)
 			break;
 
 		ret = pcap_handle_packet_mmap(
 				handle,
 				callback,
 				user,
 				h.raw,
 				h.h1->tp_len,
 				h.h1->tp_mac,
 				h.h1->tp_snaplen,
 				h.h1->tp_sec,
 				h.h1->tp_usec,
 				0,
 				0,
 				0);
 		if (ret == 1) {
 			pkts++;
 			handlep->packets_read++;
 		} else if (ret < 0) {
 			return ret;
 		}
 
 		/*
 		 * Hand this block back to the kernel, and, if we're
 		 * counting blocks that need to be filtered in userland
 		 * after having been filtered by the kernel, count
 		 * the one we've just processed.
 		 */
 		h.h1->tp_status = TP_STATUS_KERNEL;
 		if (handlep->blocks_to_filter_in_userland > 0) {
 			handlep->blocks_to_filter_in_userland--;
 			if (handlep->blocks_to_filter_in_userland == 0) {
 				/*
 				 * No more blocks need to be filtered
 				 * in userland.
 				 */
 				handlep->filter_in_userland = 0;
 			}
 		}
 
 		/* next block */
 		if (++handle->offset >= handle->cc)
 			handle->offset = 0;
 
 		/* check for break loop condition*/
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 	}
 	return pkts;
 }
 
 static int
 pcap_read_linux_mmap_v1_64(pcap_t *handle, int max_packets, pcap_handler callback,
 		u_char *user)
 {
 	struct pcap_linux *handlep = handle->priv;
 	union thdr h;
 	int pkts = 0;
 	int ret;
 
 	/* wait for frames availability.*/
 	h.raw = RING_GET_CURRENT_FRAME(handle);
 	if (h.h1_64->tp_status == TP_STATUS_KERNEL) {
 		/*
 		 * The current frame is owned by the kernel; wait for
 		 * a frame to be handed to us.
 		 */
 		ret = pcap_wait_for_frames_mmap(handle);
 		if (ret) {
 			return ret;
 		}
 	}
 
 	/* non-positive values of max_packets are used to require all
 	 * packets currently available in the ring */
 	while ((pkts < max_packets) || PACKET_COUNT_IS_UNLIMITED(max_packets)) {
 		/*
 		 * Get the current ring buffer frame, and break if
 		 * it's still owned by the kernel.
 		 */
 		h.raw = RING_GET_CURRENT_FRAME(handle);
 		if (h.h1_64->tp_status == TP_STATUS_KERNEL)
 			break;
 
 		ret = pcap_handle_packet_mmap(
 				handle,
 				callback,
 				user,
 				h.raw,
 				h.h1_64->tp_len,
 				h.h1_64->tp_mac,
 				h.h1_64->tp_snaplen,
 				h.h1_64->tp_sec,
 				h.h1_64->tp_usec,
 				0,
 				0,
 				0);
 		if (ret == 1) {
 			pkts++;
 			handlep->packets_read++;
 		} else if (ret < 0) {
 			return ret;
 		}
 
 		/*
 		 * Hand this block back to the kernel, and, if we're
 		 * counting blocks that need to be filtered in userland
 		 * after having been filtered by the kernel, count
 		 * the one we've just processed.
 		 */
 		h.h1_64->tp_status = TP_STATUS_KERNEL;
 		if (handlep->blocks_to_filter_in_userland > 0) {
 			handlep->blocks_to_filter_in_userland--;
 			if (handlep->blocks_to_filter_in_userland == 0) {
 				/*
 				 * No more blocks need to be filtered
 				 * in userland.
 				 */
 				handlep->filter_in_userland = 0;
 			}
 		}
 
 		/* next block */
 		if (++handle->offset >= handle->cc)
 			handle->offset = 0;
 
 		/* check for break loop condition*/
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 	}
 	return pkts;
 }
 
 #ifdef HAVE_TPACKET2
 static int
 pcap_read_linux_mmap_v2(pcap_t *handle, int max_packets, pcap_handler callback,
 		u_char *user)
 {
 	struct pcap_linux *handlep = handle->priv;
 	union thdr h;
 	int pkts = 0;
 	int ret;
 
 	/* wait for frames availability.*/
 	h.raw = RING_GET_CURRENT_FRAME(handle);
 	if (h.h2->tp_status == TP_STATUS_KERNEL) {
 		/*
 		 * The current frame is owned by the kernel; wait for
 		 * a frame to be handed to us.
 		 */
 		ret = pcap_wait_for_frames_mmap(handle);
 		if (ret) {
 			return ret;
 		}
 	}
 
 	/* non-positive values of max_packets are used to require all
 	 * packets currently available in the ring */
 	while ((pkts < max_packets) || PACKET_COUNT_IS_UNLIMITED(max_packets)) {
 		/*
 		 * Get the current ring buffer frame, and break if
 		 * it's still owned by the kernel.
 		 */
 		h.raw = RING_GET_CURRENT_FRAME(handle);
 		if (h.h2->tp_status == TP_STATUS_KERNEL)
 			break;
 
 		ret = pcap_handle_packet_mmap(
 				handle,
 				callback,
 				user,
 				h.raw,
 				h.h2->tp_len,
 				h.h2->tp_mac,
 				h.h2->tp_snaplen,
 				h.h2->tp_sec,
 				handle->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO ? h.h2->tp_nsec : h.h2->tp_nsec / 1000,
-#if defined(TP_STATUS_VLAN_VALID)
-				(h.h2->tp_vlan_tci || (h.h2->tp_status & TP_STATUS_VLAN_VALID)),
-#else
-				h.h2->tp_vlan_tci != 0,
-#endif
+				VLAN_VALID(h.h2, h.h2),
 				h.h2->tp_vlan_tci,
 				VLAN_TPID(h.h2, h.h2));
 		if (ret == 1) {
 			pkts++;
 			handlep->packets_read++;
 		} else if (ret < 0) {
 			return ret;
 		}
 
 		/*
 		 * Hand this block back to the kernel, and, if we're
 		 * counting blocks that need to be filtered in userland
 		 * after having been filtered by the kernel, count
 		 * the one we've just processed.
 		 */
 		h.h2->tp_status = TP_STATUS_KERNEL;
 		if (handlep->blocks_to_filter_in_userland > 0) {
 			handlep->blocks_to_filter_in_userland--;
 			if (handlep->blocks_to_filter_in_userland == 0) {
 				/*
 				 * No more blocks need to be filtered
 				 * in userland.
 				 */
 				handlep->filter_in_userland = 0;
 			}
 		}
 
 		/* next block */
 		if (++handle->offset >= handle->cc)
 			handle->offset = 0;
 
 		/* check for break loop condition*/
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 	}
 	return pkts;
 }
 #endif /* HAVE_TPACKET2 */
 
 #ifdef HAVE_TPACKET3
 static int
 pcap_read_linux_mmap_v3(pcap_t *handle, int max_packets, pcap_handler callback,
 		u_char *user)
 {
 	struct pcap_linux *handlep = handle->priv;
 	union thdr h;
 	int pkts = 0;
 	int ret;
 
 again:
 	if (handlep->current_packet == NULL) {
 		/* wait for frames availability.*/
 		h.raw = RING_GET_CURRENT_FRAME(handle);
 		if (h.h3->hdr.bh1.block_status == TP_STATUS_KERNEL) {
 			/*
 			 * The current frame is owned by the kernel; wait
 			 * for a frame to be handed to us.
 			 */
 			ret = pcap_wait_for_frames_mmap(handle);
 			if (ret) {
 				return ret;
 			}
 		}
 	}
 	h.raw = RING_GET_CURRENT_FRAME(handle);
 	if (h.h3->hdr.bh1.block_status == TP_STATUS_KERNEL) {
 		if (pkts == 0 && handlep->timeout == 0) {
 			/* Block until we see a packet. */
 			goto again;
 		}
 		return pkts;
 	}
 
 	/* non-positive values of max_packets are used to require all
 	 * packets currently available in the ring */
 	while ((pkts < max_packets) || PACKET_COUNT_IS_UNLIMITED(max_packets)) {
 		int packets_to_read;
 
 		if (handlep->current_packet == NULL) {
 			h.raw = RING_GET_CURRENT_FRAME(handle);
 			if (h.h3->hdr.bh1.block_status == TP_STATUS_KERNEL)
 				break;
 
 			handlep->current_packet = h.raw + h.h3->hdr.bh1.offset_to_first_pkt;
 			handlep->packets_left = h.h3->hdr.bh1.num_pkts;
 		}
 		packets_to_read = handlep->packets_left;
 
 		if (!PACKET_COUNT_IS_UNLIMITED(max_packets) &&
 		    packets_to_read > (max_packets - pkts)) {
 			/*
 			 * We've been given a maximum number of packets
 			 * to process, and there are more packets in
 			 * this buffer than that.  Only process enough
 			 * of them to get us up to that maximum.
 			 */
 			packets_to_read = max_packets - pkts;
 		}
 
 		while (packets_to_read-- && !handle->break_loop) {
 			struct tpacket3_hdr* tp3_hdr = (struct tpacket3_hdr*) handlep->current_packet;
 			ret = pcap_handle_packet_mmap(
 					handle,
 					callback,
 					user,
 					handlep->current_packet,
 					tp3_hdr->tp_len,
 					tp3_hdr->tp_mac,
 					tp3_hdr->tp_snaplen,
 					tp3_hdr->tp_sec,
 					handle->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO ? tp3_hdr->tp_nsec : tp3_hdr->tp_nsec / 1000,
-#if defined(TP_STATUS_VLAN_VALID)
-					(tp3_hdr->hv1.tp_vlan_tci || (tp3_hdr->tp_status & TP_STATUS_VLAN_VALID)),
-#else
-					tp3_hdr->hv1.tp_vlan_tci != 0,
-#endif
+					VLAN_VALID(tp3_hdr, &tp3_hdr->hv1),
 					tp3_hdr->hv1.tp_vlan_tci,
 					VLAN_TPID(tp3_hdr, &tp3_hdr->hv1));
 			if (ret == 1) {
 				pkts++;
 				handlep->packets_read++;
 			} else if (ret < 0) {
 				handlep->current_packet = NULL;
 				return ret;
 			}
 			handlep->current_packet += tp3_hdr->tp_next_offset;
 			handlep->packets_left--;
 		}
 
 		if (handlep->packets_left <= 0) {
 			/*
 			 * Hand this block back to the kernel, and, if
 			 * we're counting blocks that need to be
 			 * filtered in userland after having been
 			 * filtered by the kernel, count the one we've
 			 * just processed.
 			 */
 			h.h3->hdr.bh1.block_status = TP_STATUS_KERNEL;
 			if (handlep->blocks_to_filter_in_userland > 0) {
 				handlep->blocks_to_filter_in_userland--;
 				if (handlep->blocks_to_filter_in_userland == 0) {
 					/*
 					 * No more blocks need to be filtered
 					 * in userland.
 					 */
 					handlep->filter_in_userland = 0;
 				}
 			}
 
 			/* next block */
 			if (++handle->offset >= handle->cc)
 				handle->offset = 0;
 
 			handlep->current_packet = NULL;
 		}
 
 		/* check for break loop condition*/
 		if (handle->break_loop) {
 			handle->break_loop = 0;
 			return PCAP_ERROR_BREAK;
 		}
 	}
 	if (pkts == 0 && handlep->timeout == 0) {
 		/* Block until we see a packet. */
 		goto again;
 	}
 	return pkts;
 }
 #endif /* HAVE_TPACKET3 */
 
 static int
 pcap_setfilter_linux_mmap(pcap_t *handle, struct bpf_program *filter)
 {
 	struct pcap_linux *handlep = handle->priv;
 	int n, offset;
 	int ret;
 
 	/*
 	 * Don't rewrite "ret" instructions; we don't need to, as
 	 * we're not reading packets with recvmsg(), and we don't
 	 * want to, as, by not rewriting them, the kernel can avoid
 	 * copying extra data.
 	 */
 	ret = pcap_setfilter_linux_common(handle, filter, 1);
 	if (ret < 0)
 		return ret;
 
 	/*
 	 * If we're filtering in userland, there's nothing to do;
 	 * the new filter will be used for the next packet.
 	 */
 	if (handlep->filter_in_userland)
 		return ret;
 
 	/*
 	 * We're filtering in the kernel; the packets present in
 	 * all blocks currently in the ring were already filtered
 	 * by the old filter, and so will need to be filtered in
 	 * userland by the new filter.
 	 *
 	 * Get an upper bound for the number of such blocks; first,
 	 * walk the ring backward and count the free blocks.
 	 */
 	offset = handle->offset;
 	if (--offset < 0)
 		offset = handle->cc - 1;
 	for (n=0; n < handle->cc; ++n) {
 		if (--offset < 0)
 			offset = handle->cc - 1;
 		if (pcap_get_ring_frame_status(handle, offset) != TP_STATUS_KERNEL)
 			break;
 	}
 
 	/*
 	 * If we found free blocks, decrement the count of free
 	 * blocks by 1, just in case we lost a race with another
 	 * thread of control that was adding a packet while
 	 * we were counting and that had run the filter before
 	 * we changed it.
 	 *
 	 * XXX - could there be more than one block added in
 	 * this fashion?
 	 *
 	 * XXX - is there a way to avoid that race, e.g. somehow
 	 * wait for all packets that passed the old filter to
 	 * be added to the ring?
 	 */
 	if (n != 0)
 		n--;
 
 	/*
 	 * Set the count of blocks worth of packets to filter
 	 * in userland to the total number of blocks in the
 	 * ring minus the number of free blocks we found, and
 	 * turn on userland filtering.  (The count of blocks
 	 * worth of packets to filter in userland is guaranteed
 	 * not to be zero - n, above, couldn't be set to a
 	 * value > handle->cc, and if it were equal to
 	 * handle->cc, it wouldn't be zero, and thus would
 	 * be decremented to handle->cc - 1.)
 	 */
 	handlep->blocks_to_filter_in_userland = handle->cc - n;
 	handlep->filter_in_userland = 1;
 	return ret;
 }
 
 #endif /* HAVE_PACKET_RING */
 
 
 #ifdef HAVE_PF_PACKET_SOCKETS
 /*
  *  Return the index of the given device name. Fill ebuf and return
  *  -1 on failure.
  */
 static int
 iface_get_id(int fd, const char *device, char *ebuf)
 {
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 
 	if (ioctl(fd, SIOCGIFINDEX, &ifr) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			 "SIOCGIFINDEX: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFINDEX");
 		return -1;
 	}
 
 	return ifr.ifr_ifindex;
 }
 
 /*
  *  Bind the socket associated with FD to the given device.
  *  Return 1 on success, 0 if we should try a SOCK_PACKET socket,
  *  or a PCAP_ERROR_ value on a hard error.
  */
 static int
-iface_bind(int fd, int ifindex, char *ebuf)
+iface_bind(int fd, int ifindex, char *ebuf, int protocol)
 {
 	struct sockaddr_ll	sll;
 	int			err;
 	socklen_t		errlen = sizeof(err);
 
 	memset(&sll, 0, sizeof(sll));
 	sll.sll_family		= AF_PACKET;
 	sll.sll_ifindex		= ifindex;
-	sll.sll_protocol	= htons(ETH_P_ALL);
+	sll.sll_protocol	= protocol;
 
 	if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) == -1) {
 		if (errno == ENETDOWN) {
 			/*
 			 * Return a "network down" indication, so that
 			 * the application can report that rather than
 			 * saying we had a mysterious failure and
 			 * suggest that they report a problem to the
 			 * libpcap developers.
 			 */
 			return PCAP_ERROR_IFACE_NOT_UP;
 		} else {
-			pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-				 "bind: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "bind");
 			return PCAP_ERROR;
 		}
 	}
 
 	/* Any pending errors, e.g., network is down? */
 
 	if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			"getsockopt: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "getsockopt");
 		return 0;
 	}
 
 	if (err == ENETDOWN) {
 		/*
 		 * Return a "network down" indication, so that
 		 * the application can report that rather than
 		 * saying we had a mysterious failure and
 		 * suggest that they report a problem to the
 		 * libpcap developers.
 		 */
 		return PCAP_ERROR_IFACE_NOT_UP;
 	} else if (err > 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			"bind: %s", pcap_strerror(err));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    err, "bind");
 		return 0;
 	}
 
 	return 1;
 }
 
 #ifdef IW_MODE_MONITOR
 /*
  * Check whether the device supports the Wireless Extensions.
  * Returns 1 if it does, 0 if it doesn't, PCAP_ERROR_NO_SUCH_DEVICE
  * if the device doesn't even exist.
  */
 static int
 has_wext(int sock_fd, const char *device, char *ebuf)
 {
 	struct iwreq ireq;
 
 	if (is_bonding_device(sock_fd, device))
 		return 0;	/* bonding device, so don't even try */
 
 	strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 	    sizeof ireq.ifr_ifrn.ifrn_name);
 	if (ioctl(sock_fd, SIOCGIWNAME, &ireq) >= 0)
 		return 1;	/* yes */
-	pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-	    "%s: SIOCGIWNAME: %s", device, pcap_strerror(errno));
+	pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE, errno,
+	    "%s: SIOCGIWNAME", device);
 	if (errno == ENODEV)
 		return PCAP_ERROR_NO_SUCH_DEVICE;
 	return 0;
 }
 
 /*
  * Per me si va ne la citta dolente,
  * Per me si va ne l'etterno dolore,
  *	...
  * Lasciate ogne speranza, voi ch'intrate.
  *
  * XXX - airmon-ng does special stuff with the Orinoco driver and the
  * wlan-ng driver.
  */
 typedef enum {
 	MONITOR_WEXT,
 	MONITOR_HOSTAP,
 	MONITOR_PRISM,
 	MONITOR_PRISM54,
 	MONITOR_ACX100,
 	MONITOR_RT2500,
 	MONITOR_RT2570,
 	MONITOR_RT73,
 	MONITOR_RTL8XXX
 } monitor_type;
 
 /*
  * Use the Wireless Extensions, if we have them, to try to turn monitor mode
  * on if it's not already on.
  *
  * Returns 1 on success, 0 if we don't support the Wireless Extensions
  * on this device, or a PCAP_ERROR_ value if we do support them but
  * we weren't able to turn monitor mode on.
  */
 static int
 enter_rfmon_mode_wext(pcap_t *handle, int sock_fd, const char *device)
 {
 	/*
 	 * XXX - at least some adapters require non-Wireless Extensions
 	 * mechanisms to turn monitor mode on.
 	 *
 	 * Atheros cards might require that a separate "monitor virtual access
 	 * point" be created, with later versions of the madwifi driver.
 	 * airmon-ng does "wlanconfig ath create wlandev {if} wlanmode
 	 * monitor -bssid", which apparently spits out a line "athN"
 	 * where "athN" is the monitor mode device.  To leave monitor
 	 * mode, it destroys the monitor mode device.
 	 *
 	 * Some Intel Centrino adapters might require private ioctls to get
 	 * radio headers; the ipw2200 and ipw3945 drivers allow you to
 	 * configure a separate "rtapN" interface to capture in monitor
 	 * mode without preventing the adapter from operating normally.
 	 * (airmon-ng doesn't appear to use that, though.)
 	 *
 	 * It would be Truly Wonderful if mac80211 and nl80211 cleaned this
 	 * up, and if all drivers were converted to mac80211 drivers.
 	 *
 	 * If interface {if} is a mac80211 driver, the file
 	 * /sys/class/net/{if}/phy80211 is a symlink to
 	 * /sys/class/ieee80211/{phydev}, for some {phydev}.
 	 *
 	 * On Fedora 9, with a 2.6.26.3-29 kernel, my Zydas stick, at
 	 * least, has a "wmaster0" device and a "wlan0" device; the
 	 * latter is the one with the IP address.  Both show up in
 	 * "tcpdump -D" output.  Capturing on the wmaster0 device
 	 * captures with 802.11 headers.
 	 *
 	 * airmon-ng searches through /sys/class/net for devices named
 	 * monN, starting with mon0; as soon as one *doesn't* exist,
 	 * it chooses that as the monitor device name.  If the "iw"
 	 * command exists, it does "iw dev {if} interface add {monif}
 	 * type monitor", where {monif} is the monitor device.  It
 	 * then (sigh) sleeps .1 second, and then configures the
 	 * device up.  Otherwise, if /sys/class/ieee80211/{phydev}/add_iface
 	 * is a file, it writes {mondev}, without a newline, to that file,
 	 * and again (sigh) sleeps .1 second, and then iwconfig's that
 	 * device into monitor mode and configures it up.  Otherwise,
 	 * you can't do monitor mode.
 	 *
 	 * All these devices are "glued" together by having the
 	 * /sys/class/net/{device}/phy80211 links pointing to the same
 	 * place, so, given a wmaster, wlan, or mon device, you can
 	 * find the other devices by looking for devices with
 	 * the same phy80211 link.
 	 *
 	 * To turn monitor mode off, delete the monitor interface,
 	 * either with "iw dev {monif} interface del" or by sending
 	 * {monif}, with no NL, down /sys/class/ieee80211/{phydev}/remove_iface
 	 *
 	 * Note: if you try to create a monitor device named "monN", and
 	 * there's already a "monN" device, it fails, as least with
 	 * the netlink interface (which is what iw uses), with a return
 	 * value of -ENFILE.  (Return values are negative errnos.)  We
 	 * could probably use that to find an unused device.
 	 */
 	struct pcap_linux *handlep = handle->priv;
 	int err;
 	struct iwreq ireq;
 	struct iw_priv_args *priv;
 	monitor_type montype;
 	int i;
 	__u32 cmd;
 	struct ifreq ifr;
 	int oldflags;
 	int args[2];
 	int channel;
 
 	/*
 	 * Does this device *support* the Wireless Extensions?
 	 */
 	err = has_wext(sock_fd, device, handle->errbuf);
 	if (err <= 0)
 		return err;	/* either it doesn't or the device doesn't even exist */
 	/*
 	 * Start out assuming we have no private extensions to control
 	 * radio metadata.
 	 */
 	montype = MONITOR_WEXT;
 	cmd = 0;
 
 	/*
 	 * Try to get all the Wireless Extensions private ioctls
 	 * supported by this device.
 	 *
 	 * First, get the size of the buffer we need, by supplying no
 	 * buffer and a length of 0.  If the device supports private
 	 * ioctls, it should return E2BIG, with ireq.u.data.length set
 	 * to the length we need.  If it doesn't support them, it should
 	 * return EOPNOTSUPP.
 	 */
 	memset(&ireq, 0, sizeof ireq);
 	strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 	    sizeof ireq.ifr_ifrn.ifrn_name);
 	ireq.u.data.pointer = (void *)args;
 	ireq.u.data.length = 0;
 	ireq.u.data.flags = 0;
 	if (ioctl(sock_fd, SIOCGIWPRIV, &ireq) != -1) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: SIOCGIWPRIV with a zero-length buffer didn't fail!",
 		    device);
 		return PCAP_ERROR;
 	}
 	if (errno != EOPNOTSUPP) {
 		/*
 		 * OK, it's not as if there are no private ioctls.
 		 */
 		if (errno != E2BIG) {
 			/*
 			 * Failed.
 			 */
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: SIOCGIWPRIV: %s", device,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: SIOCGIWPRIV", device);
 			return PCAP_ERROR;
 		}
 
 		/*
 		 * OK, try to get the list of private ioctls.
 		 */
 		priv = malloc(ireq.u.data.length * sizeof (struct iw_priv_args));
 		if (priv == NULL) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "malloc");
 			return PCAP_ERROR;
 		}
 		ireq.u.data.pointer = (void *)priv;
 		if (ioctl(sock_fd, SIOCGIWPRIV, &ireq) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: SIOCGIWPRIV: %s", device,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: SIOCGIWPRIV", device);
 			free(priv);
 			return PCAP_ERROR;
 		}
 
 		/*
 		 * Look for private ioctls to turn monitor mode on or, if
 		 * monitor mode is on, to set the header type.
 		 */
 		for (i = 0; i < ireq.u.data.length; i++) {
 			if (strcmp(priv[i].name, "monitor_type") == 0) {
 				/*
 				 * Hostap driver, use this one.
 				 * Set monitor mode first.
 				 * You can set it to 0 to get DLT_IEEE80211,
 				 * 1 to get DLT_PRISM, 2 to get
 				 * DLT_IEEE80211_RADIO_AVS, and, with more
 				 * recent versions of the driver, 3 to get
 				 * DLT_IEEE80211_RADIO.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if (!(priv[i].set_args & IW_PRIV_SIZE_FIXED))
 					break;
 				if ((priv[i].set_args & IW_PRIV_SIZE_MASK) != 1)
 					break;
 				montype = MONITOR_HOSTAP;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "set_prismhdr") == 0) {
 				/*
 				 * Prism54 driver, use this one.
 				 * Set monitor mode first.
 				 * You can set it to 2 to get DLT_IEEE80211
 				 * or 3 or get DLT_PRISM.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if (!(priv[i].set_args & IW_PRIV_SIZE_FIXED))
 					break;
 				if ((priv[i].set_args & IW_PRIV_SIZE_MASK) != 1)
 					break;
 				montype = MONITOR_PRISM54;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "forceprismheader") == 0) {
 				/*
 				 * RT2570 driver, use this one.
 				 * Do this after turning monitor mode on.
 				 * You can set it to 1 to get DLT_PRISM or 2
 				 * to get DLT_IEEE80211.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if (!(priv[i].set_args & IW_PRIV_SIZE_FIXED))
 					break;
 				if ((priv[i].set_args & IW_PRIV_SIZE_MASK) != 1)
 					break;
 				montype = MONITOR_RT2570;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "forceprism") == 0) {
 				/*
 				 * RT73 driver, use this one.
 				 * Do this after turning monitor mode on.
 				 * Its argument is a *string*; you can
 				 * set it to "1" to get DLT_PRISM or "2"
 				 * to get DLT_IEEE80211.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_CHAR)
 					break;
 				if (priv[i].set_args & IW_PRIV_SIZE_FIXED)
 					break;
 				montype = MONITOR_RT73;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "prismhdr") == 0) {
 				/*
 				 * One of the RTL8xxx drivers, use this one.
 				 * It can only be done after monitor mode
 				 * has been turned on.  You can set it to 1
 				 * to get DLT_PRISM or 0 to get DLT_IEEE80211.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if (!(priv[i].set_args & IW_PRIV_SIZE_FIXED))
 					break;
 				if ((priv[i].set_args & IW_PRIV_SIZE_MASK) != 1)
 					break;
 				montype = MONITOR_RTL8XXX;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "rfmontx") == 0) {
 				/*
 				 * RT2500 or RT61 driver, use this one.
 				 * It has one one-byte parameter; set
 				 * u.data.length to 1 and u.data.pointer to
 				 * point to the parameter.
 				 * It doesn't itself turn monitor mode on.
 				 * You can set it to 1 to allow transmitting
 				 * in monitor mode(?) and get DLT_IEEE80211,
 				 * or set it to 0 to disallow transmitting in
 				 * monitor mode(?) and get DLT_PRISM.
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if ((priv[i].set_args & IW_PRIV_SIZE_MASK) != 2)
 					break;
 				montype = MONITOR_RT2500;
 				cmd = priv[i].cmd;
 				break;
 			}
 			if (strcmp(priv[i].name, "monitor") == 0) {
 				/*
 				 * Either ACX100 or hostap, use this one.
 				 * It turns monitor mode on.
 				 * If it takes two arguments, it's ACX100;
 				 * the first argument is 1 for DLT_PRISM
 				 * or 2 for DLT_IEEE80211, and the second
 				 * argument is the channel on which to
 				 * run.  If it takes one argument, it's
 				 * HostAP, and the argument is 2 for
 				 * DLT_IEEE80211 and 3 for DLT_PRISM.
 				 *
 				 * If we see this, we don't quit, as this
 				 * might be a version of the hostap driver
 				 * that also supports "monitor_type".
 				 */
 				if ((priv[i].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_INT)
 					break;
 				if (!(priv[i].set_args & IW_PRIV_SIZE_FIXED))
 					break;
 				switch (priv[i].set_args & IW_PRIV_SIZE_MASK) {
 
 				case 1:
 					montype = MONITOR_PRISM;
 					cmd = priv[i].cmd;
 					break;
 
 				case 2:
 					montype = MONITOR_ACX100;
 					cmd = priv[i].cmd;
 					break;
 
 				default:
 					break;
 				}
 			}
 		}
 		free(priv);
 	}
 
 	/*
 	 * XXX - ipw3945?  islism?
 	 */
 
 	/*
 	 * Get the old mode.
 	 */
 	strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 	    sizeof ireq.ifr_ifrn.ifrn_name);
 	if (ioctl(sock_fd, SIOCGIWMODE, &ireq) == -1) {
 		/*
 		 * We probably won't be able to set the mode, either.
 		 */
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	/*
 	 * Is it currently in monitor mode?
 	 */
 	if (ireq.u.mode == IW_MODE_MONITOR) {
 		/*
 		 * Yes.  Just leave things as they are.
 		 * We don't offer multiple link-layer types, as
 		 * changing the link-layer type out from under
 		 * somebody else capturing in monitor mode would
 		 * be considered rude.
 		 */
 		return 1;
 	}
 	/*
 	 * No.  We have to put the adapter into rfmon mode.
 	 */
 
 	/*
 	 * If we haven't already done so, arrange to have
 	 * "pcap_close_all()" called when we exit.
 	 */
 	if (!pcap_do_addexit(handle)) {
 		/*
 		 * "atexit()" failed; don't put the interface
 		 * in rfmon mode, just give up.
 		 */
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	/*
 	 * Save the old mode.
 	 */
 	handlep->oldmode = ireq.u.mode;
 
 	/*
 	 * Put the adapter in rfmon mode.  How we do this depends
 	 * on whether we have a special private ioctl or not.
 	 */
 	if (montype == MONITOR_PRISM) {
 		/*
 		 * We have the "monitor" private ioctl, but none of
 		 * the other private ioctls.  Use this, and select
 		 * the Prism header.
 		 *
 		 * If it fails, just fall back on SIOCSIWMODE.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		ireq.u.data.length = 1;	/* 1 argument */
 		args[0] = 3;	/* request Prism header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		if (ioctl(sock_fd, cmd, &ireq) != -1) {
 			/*
 			 * Success.
 			 * Note that we have to put the old mode back
 			 * when we close the device.
 			 */
 			handlep->must_do_on_close |= MUST_CLEAR_RFMON;
 
 			/*
 			 * Add this to the list of pcaps to close
 			 * when we exit.
 			 */
 			pcap_add_to_pcaps_to_close(handle);
 
 			return 1;
 		}
 
 		/*
 		 * Failure.  Fall back on SIOCSIWMODE.
 		 */
 	}
 
 	/*
 	 * First, take the interface down if it's up; otherwise, we
 	 * might get EBUSY.
 	 */
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 	if (ioctl(sock_fd, SIOCGIFFLAGS, &ifr) == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: Can't get flags: %s", device, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s: Can't get flags", device);
 		return PCAP_ERROR;
 	}
 	oldflags = 0;
 	if (ifr.ifr_flags & IFF_UP) {
 		oldflags = ifr.ifr_flags;
 		ifr.ifr_flags &= ~IFF_UP;
 		if (ioctl(sock_fd, SIOCSIFFLAGS, &ifr) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: Can't set flags: %s", device, strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: Can't set flags",
+			    device);
 			return PCAP_ERROR;
 		}
 	}
 
 	/*
 	 * Then turn monitor mode on.
 	 */
 	strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 	    sizeof ireq.ifr_ifrn.ifrn_name);
 	ireq.u.mode = IW_MODE_MONITOR;
 	if (ioctl(sock_fd, SIOCSIWMODE, &ireq) == -1) {
 		/*
 		 * Scientist, you've failed.
 		 * Bring the interface back up if we shut it down.
 		 */
 		ifr.ifr_flags = oldflags;
 		if (ioctl(sock_fd, SIOCSIFFLAGS, &ifr) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: Can't set flags: %s", device, strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: Can't set flags",
+			    device);
 			return PCAP_ERROR;
 		}
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	/*
 	 * XXX - airmon-ng does "iwconfig {if} key off" after setting
 	 * monitor mode and setting the channel, and then does
 	 * "iwconfig up".
 	 */
 
 	/*
 	 * Now select the appropriate radio header.
 	 */
 	switch (montype) {
 
 	case MONITOR_WEXT:
 		/*
 		 * We don't have any private ioctl to set the header.
 		 */
 		break;
 
 	case MONITOR_HOSTAP:
 		/*
 		 * Try to select the radiotap header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 3;	/* request radiotap header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		if (ioctl(sock_fd, cmd, &ireq) != -1)
 			break;	/* success */
 
 		/*
 		 * That failed.  Try to select the AVS header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 2;	/* request AVS header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		if (ioctl(sock_fd, cmd, &ireq) != -1)
 			break;	/* success */
 
 		/*
 		 * That failed.  Try to select the Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 1;	/* request Prism header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_PRISM:
 		/*
 		 * The private ioctl failed.
 		 */
 		break;
 
 	case MONITOR_PRISM54:
 		/*
 		 * Select the Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 3;	/* request Prism header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_ACX100:
 		/*
 		 * Get the current channel.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		if (ioctl(sock_fd, SIOCGIWFREQ, &ireq) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: SIOCGIWFREQ: %s", device,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: SIOCGIWFREQ", device);
 			return PCAP_ERROR;
 		}
 		channel = ireq.u.freq.m;
 
 		/*
 		 * Select the Prism header, and set the channel to the
 		 * current value.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 1;		/* request Prism header */
 		args[1] = channel;	/* set channel */
 		memcpy(ireq.u.name, args, 2*sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_RT2500:
 		/*
 		 * Disallow transmission - that turns on the
 		 * Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 0;	/* disallow transmitting */
 		memcpy(ireq.u.name, args, sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_RT2570:
 		/*
 		 * Force the Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 1;	/* request Prism header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_RT73:
 		/*
 		 * Force the Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		ireq.u.data.length = 1;	/* 1 argument */
 		ireq.u.data.pointer = "1";
 		ireq.u.data.flags = 0;
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 
 	case MONITOR_RTL8XXX:
 		/*
 		 * Force the Prism header.
 		 */
 		memset(&ireq, 0, sizeof ireq);
 		strlcpy(ireq.ifr_ifrn.ifrn_name, device,
 		    sizeof ireq.ifr_ifrn.ifrn_name);
 		args[0] = 1;	/* request Prism header */
 		memcpy(ireq.u.name, args, sizeof (int));
 		ioctl(sock_fd, cmd, &ireq);
 		break;
 	}
 
 	/*
 	 * Now bring the interface back up if we brought it down.
 	 */
 	if (oldflags != 0) {
 		ifr.ifr_flags = oldflags;
 		if (ioctl(sock_fd, SIOCSIFFLAGS, &ifr) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "%s: Can't set flags: %s", device, strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "%s: Can't set flags",
+			    device);
 
 			/*
 			 * At least try to restore the old mode on the
 			 * interface.
 			 */
 			if (ioctl(handle->fd, SIOCSIWMODE, &ireq) == -1) {
 				/*
 				 * Scientist, you've failed.
 				 */
 				fprintf(stderr,
 				    "Can't restore interface wireless mode (SIOCSIWMODE failed: %s).\n"
 				    "Please adjust manually.\n",
 				    strerror(errno));
 			}
 			return PCAP_ERROR;
 		}
 	}
 
 	/*
 	 * Note that we have to put the old mode back when we
 	 * close the device.
 	 */
 	handlep->must_do_on_close |= MUST_CLEAR_RFMON;
 
 	/*
 	 * Add this to the list of pcaps to close when we exit.
 	 */
 	pcap_add_to_pcaps_to_close(handle);
 
 	return 1;
 }
 #endif /* IW_MODE_MONITOR */
 
 /*
  * Try various mechanisms to enter monitor mode.
  */
 static int
 enter_rfmon_mode(pcap_t *handle, int sock_fd, const char *device)
 {
 #if defined(HAVE_LIBNL) || defined(IW_MODE_MONITOR)
 	int ret;
 #endif
 
 #ifdef HAVE_LIBNL
 	ret = enter_rfmon_mode_mac80211(handle, sock_fd, device);
 	if (ret < 0)
 		return ret;	/* error attempting to do so */
 	if (ret == 1)
 		return 1;	/* success */
 #endif /* HAVE_LIBNL */
 
 #ifdef IW_MODE_MONITOR
 	ret = enter_rfmon_mode_wext(handle, sock_fd, device);
 	if (ret < 0)
 		return ret;	/* error attempting to do so */
 	if (ret == 1)
 		return 1;	/* success */
 #endif /* IW_MODE_MONITOR */
 
 	/*
 	 * Either none of the mechanisms we know about work or none
 	 * of those mechanisms are available, so we can't do monitor
 	 * mode.
 	 */
 	return 0;
 }
 
 #if defined(HAVE_LINUX_NET_TSTAMP_H) && defined(PACKET_TIMESTAMP)
 /*
  * Map SOF_TIMESTAMPING_ values to PCAP_TSTAMP_ values.
  */
 static const struct {
 	int soft_timestamping_val;
 	int pcap_tstamp_val;
 } sof_ts_type_map[3] = {
 	{ SOF_TIMESTAMPING_SOFTWARE, PCAP_TSTAMP_HOST },
 	{ SOF_TIMESTAMPING_SYS_HARDWARE, PCAP_TSTAMP_ADAPTER },
 	{ SOF_TIMESTAMPING_RAW_HARDWARE, PCAP_TSTAMP_ADAPTER_UNSYNCED }
 };
 #define NUM_SOF_TIMESTAMPING_TYPES	(sizeof sof_ts_type_map / sizeof sof_ts_type_map[0])
 
 /*
  * Set the list of time stamping types to include all types.
  */
 static void
 iface_set_all_ts_types(pcap_t *handle)
 {
 	u_int i;
 
 	handle->tstamp_type_count = NUM_SOF_TIMESTAMPING_TYPES;
 	handle->tstamp_type_list = malloc(NUM_SOF_TIMESTAMPING_TYPES * sizeof(u_int));
 	for (i = 0; i < NUM_SOF_TIMESTAMPING_TYPES; i++)
 		handle->tstamp_type_list[i] = sof_ts_type_map[i].pcap_tstamp_val;
 }
 
 #ifdef ETHTOOL_GET_TS_INFO
 /*
  * Get a list of time stamping capabilities.
  */
 static int
 iface_ethtool_get_ts_info(const char *device, pcap_t *handle, char *ebuf)
 {
 	int fd;
 	struct ifreq ifr;
 	struct ethtool_ts_info info;
 	int num_ts_types;
 	u_int i, j;
 
 	/*
 	 * This doesn't apply to the "any" device; you can't say "turn on
 	 * hardware time stamping for all devices that exist now and arrange
 	 * that it be turned on for any device that appears in the future",
 	 * and not all devices even necessarily *support* hardware time
 	 * stamping, so don't report any time stamp types.
 	 */
 	if (strcmp(device, "any") == 0) {
 		handle->tstamp_type_list = NULL;
 		return 0;
 	}
 
 	/*
 	 * Create a socket from which to fetch time stamping capabilities.
 	 */
 	fd = socket(PF_UNIX, SOCK_RAW, 0);
 	if (fd < 0) {
-		(void)pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-		    "socket for SIOCETHTOOL(ETHTOOL_GET_TS_INFO): %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket for SIOCETHTOOL(ETHTOOL_GET_TS_INFO)");
 		return -1;
 	}
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 	memset(&info, 0, sizeof(info));
 	info.cmd = ETHTOOL_GET_TS_INFO;
 	ifr.ifr_data = (caddr_t)&info;
 	if (ioctl(fd, SIOCETHTOOL, &ifr) == -1) {
 		int save_errno = errno;
 
 		close(fd);
 		switch (save_errno) {
 
 		case EOPNOTSUPP:
 		case EINVAL:
 			/*
 			 * OK, this OS version or driver doesn't support
 			 * asking for the time stamping types, so let's
 			 * just return all the possible types.
 			 */
 			iface_set_all_ts_types(handle);
 			return 0;
 
 		case ENODEV:
 			/*
 			 * OK, no such device.
 			 * The user will find that out when they try to
 			 * activate the device; just return an empty
 			 * list of time stamp types.
 			 */
 			handle->tstamp_type_list = NULL;
 			return 0;
 
 		default:
 			/*
 			 * Other error.
 			 */
-			pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			    "%s: SIOCETHTOOL(ETHTOOL_GET_TS_INFO) ioctl failed: %s", device,
-			    strerror(save_errno));
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    save_errno,
+			    "%s: SIOCETHTOOL(ETHTOOL_GET_TS_INFO) ioctl failed",
+			    device);
 			return -1;
 		}
 	}
 	close(fd);
 
 	/*
 	 * Do we support hardware time stamping of *all* packets?
 	 */
 	if (!(info.rx_filters & (1 << HWTSTAMP_FILTER_ALL))) {
 		/*
 		 * No, so don't report any time stamp types.
 		 *
 		 * XXX - some devices either don't report
 		 * HWTSTAMP_FILTER_ALL when they do support it, or
 		 * report HWTSTAMP_FILTER_ALL but map it to only
 		 * time stamping a few PTP packets.  See
 		 * http://marc.info/?l=linux-netdev&m=146318183529571&w=2
 		 */
 		handle->tstamp_type_list = NULL;
 		return 0;
 	}
 
 	num_ts_types = 0;
 	for (i = 0; i < NUM_SOF_TIMESTAMPING_TYPES; i++) {
 		if (info.so_timestamping & sof_ts_type_map[i].soft_timestamping_val)
 			num_ts_types++;
 	}
 	handle->tstamp_type_count = num_ts_types;
 	if (num_ts_types != 0) {
 		handle->tstamp_type_list = malloc(num_ts_types * sizeof(u_int));
 		for (i = 0, j = 0; i < NUM_SOF_TIMESTAMPING_TYPES; i++) {
 			if (info.so_timestamping & sof_ts_type_map[i].soft_timestamping_val) {
 				handle->tstamp_type_list[j] = sof_ts_type_map[i].pcap_tstamp_val;
 				j++;
 			}
 		}
 	} else
 		handle->tstamp_type_list = NULL;
 
 	return 0;
 }
 #else /* ETHTOOL_GET_TS_INFO */
 static int
 iface_ethtool_get_ts_info(const char *device, pcap_t *handle, char *ebuf _U_)
 {
 	/*
 	 * This doesn't apply to the "any" device; you can't say "turn on
 	 * hardware time stamping for all devices that exist now and arrange
 	 * that it be turned on for any device that appears in the future",
 	 * and not all devices even necessarily *support* hardware time
 	 * stamping, so don't report any time stamp types.
 	 */
 	if (strcmp(device, "any") == 0) {
 		handle->tstamp_type_list = NULL;
 		return 0;
 	}
 
 	/*
 	 * We don't have an ioctl to use to ask what's supported,
 	 * so say we support everything.
 	 */
 	iface_set_all_ts_types(handle);
 	return 0;
 }
 #endif /* ETHTOOL_GET_TS_INFO */
 
 #endif /* defined(HAVE_LINUX_NET_TSTAMP_H) && defined(PACKET_TIMESTAMP) */
 
 #ifdef HAVE_PACKET_RING
 /*
  * Find out if we have any form of fragmentation/reassembly offloading.
  *
  * We do so using SIOCETHTOOL checking for various types of offloading;
  * if SIOCETHTOOL isn't defined, or we don't have any #defines for any
  * of the types of offloading, there's nothing we can do to check, so
  * we just say "no, we don't".
  */
 #if defined(SIOCETHTOOL) && (defined(ETHTOOL_GTSO) || defined(ETHTOOL_GUFO) || defined(ETHTOOL_GGSO) || defined(ETHTOOL_GFLAGS) || defined(ETHTOOL_GGRO))
 static int
 iface_ethtool_flag_ioctl(pcap_t *handle, int cmd, const char *cmdname)
 {
 	struct ifreq	ifr;
 	struct ethtool_value eval;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, handle->opt.device, sizeof(ifr.ifr_name));
 	eval.cmd = cmd;
 	eval.data = 0;
 	ifr.ifr_data = (caddr_t)&eval;
 	if (ioctl(handle->fd, SIOCETHTOOL, &ifr) == -1) {
 		if (errno == EOPNOTSUPP || errno == EINVAL) {
 			/*
 			 * OK, let's just return 0, which, in our
 			 * case, either means "no, what we're asking
 			 * about is not enabled" or "all the flags
 			 * are clear (i.e., nothing is enabled)".
 			 */
 			return 0;
 		}
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "%s: SIOCETHTOOL(%s) ioctl failed: %s", handle->opt.device,
-		    cmdname, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s: SIOCETHTOOL(%s) ioctl failed",
+		    handle->opt.device, cmdname);
 		return -1;
 	}
 	return eval.data;
 }
 
 static int
 iface_get_offload(pcap_t *handle)
 {
 	int ret;
 
 #ifdef ETHTOOL_GTSO
 	ret = iface_ethtool_flag_ioctl(handle, ETHTOOL_GTSO, "ETHTOOL_GTSO");
 	if (ret == -1)
 		return -1;
 	if (ret)
 		return 1;	/* TCP segmentation offloading on */
 #endif
 
 #ifdef ETHTOOL_GUFO
 	ret = iface_ethtool_flag_ioctl(handle, ETHTOOL_GUFO, "ETHTOOL_GUFO");
 	if (ret == -1)
 		return -1;
 	if (ret)
 		return 1;	/* UDP fragmentation offloading on */
 #endif
 
 #ifdef ETHTOOL_GGSO
 	/*
 	 * XXX - will this cause large unsegmented packets to be
 	 * handed to PF_PACKET sockets on transmission?  If not,
 	 * this need not be checked.
 	 */
 	ret = iface_ethtool_flag_ioctl(handle, ETHTOOL_GGSO, "ETHTOOL_GGSO");
 	if (ret == -1)
 		return -1;
 	if (ret)
 		return 1;	/* generic segmentation offloading on */
 #endif
 
 #ifdef ETHTOOL_GFLAGS
 	ret = iface_ethtool_flag_ioctl(handle, ETHTOOL_GFLAGS, "ETHTOOL_GFLAGS");
 	if (ret == -1)
 		return -1;
 	if (ret & ETH_FLAG_LRO)
 		return 1;	/* large receive offloading on */
 #endif
 
 #ifdef ETHTOOL_GGRO
 	/*
 	 * XXX - will this cause large reassembled packets to be
 	 * handed to PF_PACKET sockets on receipt?  If not,
 	 * this need not be checked.
 	 */
 	ret = iface_ethtool_flag_ioctl(handle, ETHTOOL_GGRO, "ETHTOOL_GGRO");
 	if (ret == -1)
 		return -1;
 	if (ret)
 		return 1;	/* generic (large) receive offloading on */
 #endif
 
 	return 0;
 }
 #else /* SIOCETHTOOL */
 static int
 iface_get_offload(pcap_t *handle _U_)
 {
 	/*
 	 * XXX - do we need to get this information if we don't
 	 * have the ethtool ioctls?  If so, how do we do that?
 	 */
 	return 0;
 }
 #endif /* SIOCETHTOOL */
 
 #endif /* HAVE_PACKET_RING */
 
 #endif /* HAVE_PF_PACKET_SOCKETS */
 
 /* ===== Functions to interface to the older kernels ================== */
 
 /*
  * Try to open a packet socket using the old kernel interface.
  * Returns 1 on success and a PCAP_ERROR_ value on an error.
  */
 static int
 activate_old(pcap_t *handle)
 {
 	struct pcap_linux *handlep = handle->priv;
+	int		err;
 	int		arptype;
 	struct ifreq	ifr;
 	const char	*device = handle->opt.device;
 	struct utsname	utsname;
 	int		mtu;
 
 	/* Open the socket */
 
 	handle->fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_ALL));
 	if (handle->fd == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "socket: %s", pcap_strerror(errno));
-		if (errno == EPERM || errno == EACCES) {
+		err = errno;
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    err, "socket");
+		if (err == EPERM || err == EACCES) {
 			/*
 			 * You don't have permission to open the
 			 * socket.
 			 */
 			return PCAP_ERROR_PERM_DENIED;
 		} else {
 			/*
 			 * Other error.
 			 */
 			return PCAP_ERROR;
 		}
 	}
 
 	/* It worked - we are using the old interface */
 	handlep->sock_packet = 1;
 
 	/* ...which means we get the link-layer header. */
 	handlep->cooked = 0;
 
 	/* Bind to the given device */
 
 	if (strcmp(device, "any") == 0) {
 		strlcpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems",
 			PCAP_ERRBUF_SIZE);
 		return PCAP_ERROR;
 	}
 	if (iface_bind_old(handle->fd, device, handle->errbuf) == -1)
 		return PCAP_ERROR;
 
 	/*
 	 * Try to get the link-layer type.
 	 */
 	arptype = iface_get_arptype(handle->fd, device, handle->errbuf);
 	if (arptype < 0)
 		return PCAP_ERROR;
 
 	/*
 	 * Try to find the DLT_ type corresponding to that
 	 * link-layer type.
 	 */
 	map_arphrd_to_dlt(handle, handle->fd, arptype, device, 0);
 	if (handle->linktype == -1) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			 "unknown arptype %d", arptype);
 		return PCAP_ERROR;
 	}
 
 	/* Go to promisc mode if requested */
 
 	if (handle->opt.promisc) {
 		memset(&ifr, 0, sizeof(ifr));
 		strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 		if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				 "SIOCGIFFLAGS: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "SIOCGIFFLAGS");
 			return PCAP_ERROR;
 		}
 		if ((ifr.ifr_flags & IFF_PROMISC) == 0) {
 			/*
 			 * Promiscuous mode isn't currently on,
 			 * so turn it on, and remember that
 			 * we should turn it off when the
 			 * pcap_t is closed.
 			 */
 
 			/*
 			 * If we haven't already done so, arrange
 			 * to have "pcap_close_all()" called when
 			 * we exit.
 			 */
 			if (!pcap_do_addexit(handle)) {
 				/*
 				 * "atexit()" failed; don't put
 				 * the interface in promiscuous
 				 * mode, just give up.
 				 */
 				return PCAP_ERROR;
 			}
 
 			ifr.ifr_flags |= IFF_PROMISC;
 			if (ioctl(handle->fd, SIOCSIFFLAGS, &ifr) == -1) {
-			        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					 "SIOCSIFFLAGS: %s",
-					 pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "SIOCSIFFLAGS");
 				return PCAP_ERROR;
 			}
 			handlep->must_do_on_close |= MUST_CLEAR_PROMISC;
 
 			/*
 			 * Add this to the list of pcaps
 			 * to close when we exit.
 			 */
 			pcap_add_to_pcaps_to_close(handle);
 		}
 	}
 
 	/*
 	 * Compute the buffer size.
 	 *
 	 * We're using SOCK_PACKET, so this might be a 2.0[.x]
 	 * kernel, and might require special handling - check.
 	 */
 	if (uname(&utsname) < 0 ||
 	    strncmp(utsname.release, "2.0", 3) == 0) {
 		/*
 		 * Either we couldn't find out what kernel release
 		 * this is, or it's a 2.0[.x] kernel.
 		 *
 		 * In the 2.0[.x] kernel, a "recvfrom()" on
 		 * a SOCK_PACKET socket, with MSG_TRUNC set, will
 		 * return the number of bytes read, so if we pass
 		 * a length based on the snapshot length, it'll
 		 * return the number of bytes from the packet
 		 * copied to userland, not the actual length
 		 * of the packet.
 		 *
 		 * This means that, for example, the IP dissector
 		 * in tcpdump will get handed a packet length less
 		 * than the length in the IP header, and will
 		 * complain about "truncated-ip".
 		 *
 		 * So we don't bother trying to copy from the
 		 * kernel only the bytes in which we're interested,
 		 * but instead copy them all, just as the older
 		 * versions of libpcap for Linux did.
 		 *
 		 * The buffer therefore needs to be big enough to
 		 * hold the largest packet we can get from this
 		 * device.  Unfortunately, we can't get the MRU
 		 * of the network; we can only get the MTU.  The
 		 * MTU may be too small, in which case a packet larger
 		 * than the buffer size will be truncated *and* we
 		 * won't get the actual packet size.
 		 *
 		 * However, if the snapshot length is larger than
 		 * the buffer size based on the MTU, we use the
 		 * snapshot length as the buffer size, instead;
 		 * this means that with a sufficiently large snapshot
 		 * length we won't artificially truncate packets
 		 * to the MTU-based size.
 		 *
 		 * This mess just one of many problems with packet
 		 * capture on 2.0[.x] kernels; you really want a
 		 * 2.2[.x] or later kernel if you want packet capture
 		 * to work well.
 		 */
 		mtu = iface_get_mtu(handle->fd, device, handle->errbuf);
 		if (mtu == -1)
 			return PCAP_ERROR;
 		handle->bufsize = MAX_LINKHEADER_SIZE + mtu;
 		if (handle->bufsize < (u_int)handle->snapshot)
 			handle->bufsize = (u_int)handle->snapshot;
 	} else {
 		/*
 		 * This is a 2.2[.x] or later kernel.
 		 *
 		 * We can safely pass "recvfrom()" a byte count
 		 * based on the snapshot length.
 		 */
 		handle->bufsize = (u_int)handle->snapshot;
 	}
 
 	/*
 	 * Default value for offset to align link-layer payload
 	 * on a 4-byte boundary.
 	 */
 	handle->offset	 = 0;
 
 	/*
 	 * SOCK_PACKET sockets don't supply information from
 	 * stripped VLAN tags.
 	 */
 	handlep->vlan_offset = -1; /* unknown */
 
 	return 1;
 }
 
 /*
  *  Bind the socket associated with FD to the given device using the
  *  interface of the old kernels.
  */
 static int
 iface_bind_old(int fd, const char *device, char *ebuf)
 {
 	struct sockaddr	saddr;
 	int		err;
 	socklen_t	errlen = sizeof(err);
 
 	memset(&saddr, 0, sizeof(saddr));
 	strlcpy(saddr.sa_data, device, sizeof(saddr.sa_data));
 	if (bind(fd, &saddr, sizeof(saddr)) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			 "bind: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "bind");
 		return -1;
 	}
 
 	/* Any pending errors, e.g., network is down? */
 
 	if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			"getsockopt: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "getsockopt");
 		return -1;
 	}
 
 	if (err > 0) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			"bind: %s", pcap_strerror(err));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    err, "bind");
 		return -1;
 	}
 
 	return 0;
 }
 
 
 /* ===== System calls available on all supported kernels ============== */
 
 /*
  *  Query the kernel for the MTU of the given interface.
  */
 static int
 iface_get_mtu(int fd, const char *device, char *ebuf)
 {
 	struct ifreq	ifr;
 
 	if (!device)
 		return BIGGER_THAN_ALL_MTUS;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 
 	if (ioctl(fd, SIOCGIFMTU, &ifr) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			 "SIOCGIFMTU: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFMTU");
 		return -1;
 	}
 
 	return ifr.ifr_mtu;
 }
 
 /*
  *  Get the hardware type of the given interface as ARPHRD_xxx constant.
  */
 static int
 iface_get_arptype(int fd, const char *device, char *ebuf)
 {
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 
 	if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
-			 "SIOCGIFHWADDR: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFHWADDR");
 		if (errno == ENODEV) {
 			/*
 			 * No such device.
 			 */
 			return PCAP_ERROR_NO_SUCH_DEVICE;
 		}
 		return PCAP_ERROR;
 	}
 
 	return ifr.ifr_hwaddr.sa_family;
 }
 
 #ifdef SO_ATTACH_FILTER
 static int
 fix_program(pcap_t *handle, struct sock_fprog *fcode, int is_mmapped)
 {
 	struct pcap_linux *handlep = handle->priv;
 	size_t prog_size;
 	register int i;
 	register struct bpf_insn *p;
 	struct bpf_insn *f;
 	int len;
 
 	/*
 	 * Make a copy of the filter, and modify that copy if
 	 * necessary.
 	 */
 	prog_size = sizeof(*handle->fcode.bf_insns) * handle->fcode.bf_len;
 	len = handle->fcode.bf_len;
 	f = (struct bpf_insn *)malloc(prog_size);
 	if (f == NULL) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		return -1;
 	}
 	memcpy(f, handle->fcode.bf_insns, prog_size);
 	fcode->len = len;
 	fcode->filter = (struct sock_filter *) f;
 
 	for (i = 0; i < len; ++i) {
 		p = &f[i];
 		/*
 		 * What type of instruction is this?
 		 */
 		switch (BPF_CLASS(p->code)) {
 
 		case BPF_RET:
 			/*
 			 * It's a return instruction; are we capturing
 			 * in memory-mapped mode?
 			 */
 			if (!is_mmapped) {
 				/*
 				 * No; is the snapshot length a constant,
 				 * rather than the contents of the
 				 * accumulator?
 				 */
 				if (BPF_MODE(p->code) == BPF_K) {
 					/*
 					 * Yes - if the value to be returned,
 					 * i.e. the snapshot length, is
 					 * anything other than 0, make it
 					 * MAXIMUM_SNAPLEN, so that the packet
 					 * is truncated by "recvfrom()",
 					 * not by the filter.
 					 *
 					 * XXX - there's nothing we can
 					 * easily do if it's getting the
 					 * value from the accumulator; we'd
 					 * have to insert code to force
 					 * non-zero values to be
 					 * MAXIMUM_SNAPLEN.
 					 */
 					if (p->k != 0)
 						p->k = MAXIMUM_SNAPLEN;
 				}
 			}
 			break;
 
 		case BPF_LD:
 		case BPF_LDX:
 			/*
 			 * It's a load instruction; is it loading
 			 * from the packet?
 			 */
 			switch (BPF_MODE(p->code)) {
 
 			case BPF_ABS:
 			case BPF_IND:
 			case BPF_MSH:
 				/*
 				 * Yes; are we in cooked mode?
 				 */
 				if (handlep->cooked) {
 					/*
 					 * Yes, so we need to fix this
 					 * instruction.
 					 */
 					if (fix_offset(p) < 0) {
 						/*
 						 * We failed to do so.
 						 * Return 0, so our caller
 						 * knows to punt to userland.
 						 */
 						return 0;
 					}
 				}
 				break;
 			}
 			break;
 		}
 	}
 	return 1;	/* we succeeded */
 }
 
 static int
 fix_offset(struct bpf_insn *p)
 {
 	/*
 	 * What's the offset?
 	 */
 	if (p->k >= SLL_HDR_LEN) {
 		/*
 		 * It's within the link-layer payload; that starts at an
 		 * offset of 0, as far as the kernel packet filter is
 		 * concerned, so subtract the length of the link-layer
 		 * header.
 		 */
 		p->k -= SLL_HDR_LEN;
 	} else if (p->k == 0) {
 		/*
 		 * It's the packet type field; map it to the special magic
 		 * kernel offset for that field.
 		 */
 		p->k = SKF_AD_OFF + SKF_AD_PKTTYPE;
 	} else if (p->k == 14) {
 		/*
 		 * It's the protocol field; map it to the special magic
 		 * kernel offset for that field.
 		 */
 		p->k = SKF_AD_OFF + SKF_AD_PROTOCOL;
 	} else if ((bpf_int32)(p->k) > 0) {
 		/*
 		 * It's within the header, but it's not one of those
 		 * fields; we can't do that in the kernel, so punt
 		 * to userland.
 		 */
 		return -1;
 	}
 	return 0;
 }
 
 static int
 set_kernel_filter(pcap_t *handle, struct sock_fprog *fcode)
 {
 	int total_filter_on = 0;
 	int save_mode;
 	int ret;
 	int save_errno;
 
 	/*
 	 * The socket filter code doesn't discard all packets queued
 	 * up on the socket when the filter is changed; this means
 	 * that packets that don't match the new filter may show up
 	 * after the new filter is put onto the socket, if those
 	 * packets haven't yet been read.
 	 *
 	 * This means, for example, that if you do a tcpdump capture
 	 * with a filter, the first few packets in the capture might
 	 * be packets that wouldn't have passed the filter.
 	 *
 	 * We therefore discard all packets queued up on the socket
 	 * when setting a kernel filter.  (This isn't an issue for
 	 * userland filters, as the userland filtering is done after
 	 * packets are queued up.)
 	 *
 	 * To flush those packets, we put the socket in read-only mode,
 	 * and read packets from the socket until there are no more to
 	 * read.
 	 *
 	 * In order to keep that from being an infinite loop - i.e.,
 	 * to keep more packets from arriving while we're draining
 	 * the queue - we put the "total filter", which is a filter
 	 * that rejects all packets, onto the socket before draining
 	 * the queue.
 	 *
 	 * This code deliberately ignores any errors, so that you may
 	 * get bogus packets if an error occurs, rather than having
 	 * the filtering done in userland even if it could have been
 	 * done in the kernel.
 	 */
 	if (setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER,
 		       &total_fcode, sizeof(total_fcode)) == 0) {
 		char drain[1];
 
 		/*
 		 * Note that we've put the total filter onto the socket.
 		 */
 		total_filter_on = 1;
 
 		/*
 		 * Save the socket's current mode, and put it in
 		 * non-blocking mode; we drain it by reading packets
 		 * until we get an error (which is normally a
 		 * "nothing more to be read" error).
 		 */
 		save_mode = fcntl(handle->fd, F_GETFL, 0);
 		if (save_mode == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "can't get FD flags when changing filter: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't get FD flags when changing filter");
 			return -2;
 		}
 		if (fcntl(handle->fd, F_SETFL, save_mode | O_NONBLOCK) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "can't set nonblocking mode when changing filter: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't set nonblocking mode when changing filter");
 			return -2;
 		}
 		while (recv(handle->fd, &drain, sizeof drain, MSG_TRUNC) >= 0)
 			;
 		save_errno = errno;
 		if (save_errno != EAGAIN) {
 			/*
 			 * Fatal error.
 			 *
 			 * If we can't restore the mode or reset the
 			 * kernel filter, there's nothing we can do.
 			 */
 			(void)fcntl(handle->fd, F_SETFL, save_mode);
 			(void)reset_kernel_filter(handle);
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "recv failed when changing filter: %s",
-			    pcap_strerror(save_errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, save_errno,
+			    "recv failed when changing filter");
 			return -2;
 		}
 		if (fcntl(handle->fd, F_SETFL, save_mode) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "can't restore FD flags when changing filter: %s",
-			    pcap_strerror(save_errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't restore FD flags when changing filter");
 			return -2;
 		}
 	}
 
 	/*
 	 * Now attach the new filter.
 	 */
 	ret = setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER,
 			 fcode, sizeof(*fcode));
 	if (ret == -1 && total_filter_on) {
 		/*
 		 * Well, we couldn't set that filter on the socket,
 		 * but we could set the total filter on the socket.
 		 *
 		 * This could, for example, mean that the filter was
 		 * too big to put into the kernel, so we'll have to
 		 * filter in userland; in any case, we'll be doing
 		 * filtering in userland, so we need to remove the
 		 * total filter so we see packets.
 		 */
 		save_errno = errno;
 
 		/*
 		 * If this fails, we're really screwed; we have the
 		 * total filter on the socket, and it won't come off.
 		 * Report it as a fatal error.
 		 */
 		if (reset_kernel_filter(handle) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "can't remove kernel total filter: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "can't remove kernel total filter");
 			return -2;	/* fatal error */
 		}
 
 		errno = save_errno;
 	}
 	return ret;
 }
 
 static int
 reset_kernel_filter(pcap_t *handle)
 {
+	int ret;
 	/*
 	 * setsockopt() barfs unless it get a dummy parameter.
 	 * valgrind whines unless the value is initialized,
 	 * as it has no idea that setsockopt() ignores its
 	 * parameter.
 	 */
 	int dummy = 0;
 
-	return setsockopt(handle->fd, SOL_SOCKET, SO_DETACH_FILTER,
+	ret = setsockopt(handle->fd, SOL_SOCKET, SO_DETACH_FILTER,
 				   &dummy, sizeof(dummy));
+	/*
+	 * Ignore ENOENT - it means "we don't have a filter", so there
+	 * was no filter to remove, and there's still no filter.
+	 *
+	 * Also ignore ENONET, as a lot of kernel versions had a
+	 * typo where ENONET, rather than ENOENT, was returned.
+	 */
+	if (ret == -1 && errno != ENOENT && errno != ENONET)
+		return -1;
+	return 0;
 }
 #endif
+
+int
+pcap_set_protocol(pcap_t *p, int protocol)
+{
+	if (pcap_check_activated(p))
+		return (PCAP_ERROR_ACTIVATED);
+	p->opt.protocol = protocol;
+	return (0);
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+#ifdef HAVE_PACKET_RING
+ #if defined(HAVE_TPACKET3)
+	return (PCAP_VERSION_STRING " (with TPACKET_V3)");
+ #elif defined(HAVE_TPACKET2)
+	return (PCAP_VERSION_STRING " (with TPACKET_V2)");
+ #else
+	return (PCAP_VERSION_STRING " (with TPACKET_V1)");
+ #endif
+#else
+	return (PCAP_VERSION_STRING " (without TPACKET)");
+#endif
+}
Index: vendor/libpcap/dist/pcap-netfilter-linux.c
===================================================================
--- vendor/libpcap/dist/pcap-netfilter-linux.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-netfilter-linux.c	(revision 333789)
@@ -1,658 +1,759 @@
 /*
  * Copyright (c) 2011 Jakub Zawadzki
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
 
 #ifdef NEED_STRERROR_H
 #include "strerror.h"
 #endif
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
 #include <time.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <linux/types.h>
 
 #include <linux/netlink.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
 #include <linux/netfilter/nfnetlink_queue.h>
 
 /* NOTE: if your program drops privilages after pcap_activate() it WON'T work with nfqueue.
  *       It took me quite some time to debug ;/
  *
  *       Sending any data to nfnetlink socket requires CAP_NET_ADMIN privilages,
  *       and in nfqueue we need to send verdict reply after recving packet.
  *
  *       In tcpdump you can disable dropping privilages with -Z root
  */
 
 #include "pcap-netfilter-linux.h"
 
 #define HDR_LENGTH (NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg))))
 
 #define NFLOG_IFACE "nflog"
 #define NFQUEUE_IFACE "nfqueue"
 
 typedef enum { OTHER = -1, NFLOG, NFQUEUE } nftype_t;
 
 /*
  * Private data for capturing on Linux netfilter sockets.
  */
 struct pcap_netfilter {
 	u_int	packets_read;	/* count of packets read with recvfrom() */
 	u_int   packets_nobufs; /* ENOBUFS counter */
 };
 
-static int nfqueue_send_verdict(const pcap_t *handle, u_int16_t group_id, u_int32_t id, u_int32_t verdict);
+static int nfqueue_send_verdict(const pcap_t *handle, uint16_t group_id, u_int32_t id, u_int32_t verdict);
 
 
 static int
 netfilter_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
 {
 	struct pcap_netfilter *handlep = handle->priv;
-	const unsigned char *buf;
+	register u_char *bp, *ep;
 	int count = 0;
 	int len;
 
-	/* ignore interrupt system call error */
-	do {
-		len = recv(handle->fd, handle->buffer, handle->bufsize, 0);
-		if (handle->break_loop) {
-			handle->break_loop = 0;
-			return -2;
-		}
-		if(errno == ENOBUFS) handlep->packets_nobufs++;
-	} while ((len == -1) && (errno == EINTR || errno == ENOBUFS));
-
-	if (len < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't receive packet %d:%s", errno, pcap_strerror(errno));
-		return -1;
+	/*
+	 * Has "pcap_breakloop()" been called?
+	 */
+	if (handle->break_loop) {
+		/*
+		 * Yes - clear the flag that indicates that it
+		 * has, and return PCAP_ERROR_BREAK to indicate
+		 * that we were told to break out of the loop.
+		 */
+		handle->break_loop = 0;
+		return PCAP_ERROR_BREAK;
 	}
+	len = handle->cc;
+	if (len == 0) {
+		/*
+		 * The buffer is empty; refill it.
+		 *
+		 * We ignore EINTR, as that might just be due to a signal
+		 * being delivered - if the signal should interrupt the
+		 * loop, the signal handler should call pcap_breakloop()
+		 * to set handle->break_loop (we ignore it on other
+		 * platforms as well).
+		 */
+		do {
+			len = recv(handle->fd, handle->buffer, handle->bufsize, 0);
+			if (handle->break_loop) {
+				handle->break_loop = 0;
+				return PCAP_ERROR_BREAK;
+			}
+			if (errno == ENOBUFS)
+				handlep->packets_nobufs++;
+		} while ((len == -1) && (errno == EINTR || errno == ENOBUFS));
 
-	buf = (unsigned char *)handle->buffer;
-	while ((u_int)len >= NLMSG_SPACE(0)) {
-		const struct nlmsghdr *nlh = (const struct nlmsghdr *) buf;
-		u_int32_t msg_len;
+		if (len < 0) {
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "Can't receive packet");
+			return PCAP_ERROR;
+		}
+
+		bp = (unsigned char *)handle->buffer;
+	} else
+		bp = handle->bp;
+	ep = bp + len;
+	while (bp < ep) {
+		const struct nlmsghdr *nlh = (const struct nlmsghdr *) bp;
+		uint32_t msg_len;
 		nftype_t type = OTHER;
+		/*
+		 * Has "pcap_breakloop()" been called?
+		 * If so, return immediately - if we haven't read any
+		 * packets, clear the flag and return PCAP_ERROR_BREAK
+		 * to indicate that we were told to break out of the loop,
+		 * otherwise leave the flag set, so that the *next* call
+		 * will break out of the loop without having read any
+		 * packets, and return the number of packets we've
+		 * processed so far.
+		 */
+		if (handle->break_loop) {
+			handle->bp = bp;
+			handle->cc = ep - bp;
+			if (count == 0) {
+				handle->break_loop = 0;
+				return PCAP_ERROR_BREAK;
+			} else
+				return count;
+		}
+		if (ep - bp < NLMSG_SPACE(0)) {
+			/*
+			 * There's less than one netlink message left
+			 * in the buffer.  Give up.
+			 */
+			break;
+		}
 
 		if (nlh->nlmsg_len < sizeof(struct nlmsghdr) || (u_int)len < nlh->nlmsg_len) {
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Message truncated: (got: %d) (nlmsg_len: %u)", len, nlh->nlmsg_len);
 			return -1;
 		}
 
 		if (NFNL_SUBSYS_ID(nlh->nlmsg_type) == NFNL_SUBSYS_ULOG &&
 		    NFNL_MSG_TYPE(nlh->nlmsg_type) == NFULNL_MSG_PACKET)
 			type = NFLOG;
 		else if (NFNL_SUBSYS_ID(nlh->nlmsg_type) == NFNL_SUBSYS_QUEUE &&
 		         NFNL_MSG_TYPE(nlh->nlmsg_type) == NFQNL_MSG_PACKET)
 			type = NFQUEUE;
 
 		if (type != OTHER) {
 			const unsigned char *payload = NULL;
 			struct pcap_pkthdr pkth;
 
 			const struct nfgenmsg *nfg = NULL;
 			int id = 0;
 
 			if (handle->linktype != DLT_NFLOG) {
 				const struct nfattr *payload_attr = NULL;
 
 				if (nlh->nlmsg_len < HDR_LENGTH) {
 					pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Malformed message: (nlmsg_len: %u)", nlh->nlmsg_len);
 					return -1;
 				}
 
 				nfg = NLMSG_DATA(nlh);
 				if (nlh->nlmsg_len > HDR_LENGTH) {
 					struct nfattr *attr = NFM_NFA(nfg);
 					int attr_len = nlh->nlmsg_len - NLMSG_ALIGN(HDR_LENGTH);
 
 					while (NFA_OK(attr, attr_len)) {
 						if (type == NFQUEUE) {
 							switch (NFA_TYPE(attr)) {
 								case NFQA_PACKET_HDR:
 									{
 										const struct nfqnl_msg_packet_hdr *pkt_hdr = (const struct nfqnl_msg_packet_hdr *) NFA_DATA(attr);
 
 										id = ntohl(pkt_hdr->packet_id);
 										break;
 									}
 								case NFQA_PAYLOAD:
 									payload_attr = attr;
 									break;
 							}
 
 						} else if (type == NFLOG) {
 							switch (NFA_TYPE(attr)) {
 								case NFULA_PAYLOAD:
 									payload_attr = attr;
 									break;
 							}
 						}
 						attr = NFA_NEXT(attr, attr_len);
 					}
 				}
 
 				if (payload_attr) {
 					payload = NFA_DATA(payload_attr);
 					pkth.len = pkth.caplen = NFA_PAYLOAD(payload_attr);
 				}
 
 			} else {
 				payload = NLMSG_DATA(nlh);
 				pkth.caplen = pkth.len = nlh->nlmsg_len-NLMSG_ALIGN(sizeof(struct nlmsghdr));
 			}
 
 			if (payload) {
 				/* pkth.caplen = min (payload_len, handle->snapshot); */
 
 				gettimeofday(&pkth.ts, NULL);
 				if (handle->fcode.bf_insns == NULL ||
 						bpf_filter(handle->fcode.bf_insns, payload, pkth.len, pkth.caplen))
 				{
 					handlep->packets_read++;
 					callback(user, &pkth, payload);
 					count++;
 				}
 			}
 
 			if (type == NFQUEUE) {
 				/* XXX, possible responses: NF_DROP, NF_ACCEPT, NF_STOLEN, NF_QUEUE, NF_REPEAT, NF_STOP */
 				/* if type == NFQUEUE, handle->linktype is always != DLT_NFLOG,
 				   so nfg is always initialized to NLMSG_DATA(nlh). */
 				if (nfg != NULL)
 					nfqueue_send_verdict(handle, ntohs(nfg->res_id), id, NF_ACCEPT);
 			}
 		}
 
 		msg_len = NLMSG_ALIGN(nlh->nlmsg_len);
-		if (msg_len > (u_int)len)
-			msg_len = (u_int)len;
+		/*
+		 * If the message length would run past the end of the
+		 * buffer, truncate it to the remaining space in the
+		 * buffer.
+		 */
+		if (msg_len > ep - bp)
+			msg_len = ep - bp;
 
-		len -= msg_len;
-		buf += msg_len;
+		bp += msg_len;
+		if (count >= max_packets && !PACKET_COUNT_IS_UNLIMITED(max_packets)) {
+			handle->bp = bp;
+			handle->cc = ep - bp;
+			if (handle->cc < 0)
+				handle->cc = 0;
+			return count;
+		}
 	}
+
+	handle->cc = 0;
 	return count;
 }
 
 static int
 netfilter_set_datalink(pcap_t *handle, int dlt)
 {
 	handle->linktype = dlt;
 	return 0;
 }
 
 static int
 netfilter_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_netfilter *handlep = handle->priv;
 
 	stats->ps_recv = handlep->packets_read;
 	stats->ps_drop = handlep->packets_nobufs;
 	stats->ps_ifdrop = 0;
 	return 0;
 }
 
 static int
-netfilter_inject_linux(pcap_t *handle, const void *buf, size_t size)
+netfilter_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on netfilter devices");
 	return (-1);
 }
 
 struct my_nfattr {
-	u_int16_t nfa_len;
-	u_int16_t nfa_type;
+	uint16_t nfa_len;
+	uint16_t nfa_type;
 	void *data;
 };
 
 static int
-netfilter_send_config_msg(const pcap_t *handle, u_int16_t msg_type, int ack, u_int8_t family, u_int16_t res_id, const struct my_nfattr *mynfa)
+netfilter_send_config_msg(const pcap_t *handle, uint16_t msg_type, int ack, u_int8_t family, u_int16_t res_id, const struct my_nfattr *mynfa)
 {
 	char buf[1024] __attribute__ ((aligned));
 
 	struct nlmsghdr *nlh = (struct nlmsghdr *) buf;
 	struct nfgenmsg *nfg = (struct nfgenmsg *) (buf + sizeof(struct nlmsghdr));
 
 	struct sockaddr_nl snl;
 	static unsigned int seq_id;
 
 	if (!seq_id)
 		seq_id = time(NULL);
 	++seq_id;
 
 	nlh->nlmsg_len = NLMSG_LENGTH(sizeof(struct nfgenmsg));
 	nlh->nlmsg_type = msg_type;
 	nlh->nlmsg_flags = NLM_F_REQUEST | (ack ? NLM_F_ACK : 0);
 	nlh->nlmsg_pid = 0;	/* to kernel */
 	nlh->nlmsg_seq = seq_id;
 
 	nfg->nfgen_family = family;
 	nfg->version = NFNETLINK_V0;
 	nfg->res_id = htons(res_id);
 
 	if (mynfa) {
 		struct nfattr *nfa = (struct nfattr *) (buf + NLMSG_ALIGN(nlh->nlmsg_len));
 
 		nfa->nfa_type = mynfa->nfa_type;
 		nfa->nfa_len = NFA_LENGTH(mynfa->nfa_len);
 		memcpy(NFA_DATA(nfa), mynfa->data, mynfa->nfa_len);
 		nlh->nlmsg_len = NLMSG_ALIGN(nlh->nlmsg_len) + NFA_ALIGN(nfa->nfa_len);
 	}
 
 	memset(&snl, 0, sizeof(snl));
 	snl.nl_family = AF_NETLINK;
 
 	if (sendto(handle->fd, nlh, nlh->nlmsg_len, 0, (struct sockaddr *) &snl, sizeof(snl)) == -1)
 		return -1;
 
 	if (!ack)
 		return 0;
 
 	/* waiting for reply loop */
 	do {
 		socklen_t addrlen = sizeof(snl);
 		int len;
 
 		/* ignore interrupt system call error */
 		do {
 			len = recvfrom(handle->fd, buf, sizeof(buf), 0, (struct sockaddr *) &snl, &addrlen);
 		} while ((len == -1) && (errno == EINTR));
 
 		if (len <= 0)
 			return len;
 
 		if (addrlen != sizeof(snl) || snl.nl_family != AF_NETLINK) {
 			errno = EINVAL;
 			return -1;
 		}
 
 		nlh = (struct nlmsghdr *) buf;
 		if (snl.nl_pid != 0 || seq_id != nlh->nlmsg_seq)	/* if not from kernel or wrong sequence skip */
 			continue;
 
-		while ((u_int)len >= NLMSG_SPACE(0) && NLMSG_OK(nlh, len)) {
+		while ((u_int)len >= NLMSG_SPACE(0) && NLMSG_OK(nlh, (u_int)len)) {
 			if (nlh->nlmsg_type == NLMSG_ERROR || (nlh->nlmsg_type == NLMSG_DONE && nlh->nlmsg_flags & NLM_F_MULTI)) {
 				if (nlh->nlmsg_len < NLMSG_ALIGN(sizeof(struct nlmsgerr))) {
 					errno = EBADMSG;
 					return -1;
 				}
 				errno = -(*((int *)NLMSG_DATA(nlh)));
 				return (errno == 0) ? 0 : -1;
 			}
 			nlh = NLMSG_NEXT(nlh, len);
 		}
 	} while (1);
 
 	return -1; /* never here */
 }
 
 static int
-nflog_send_config_msg(const pcap_t *handle, u_int8_t family, u_int16_t group_id, const struct my_nfattr *mynfa)
+nflog_send_config_msg(const pcap_t *handle, uint8_t family, u_int16_t group_id, const struct my_nfattr *mynfa)
 {
 	return netfilter_send_config_msg(handle, (NFNL_SUBSYS_ULOG << 8) | NFULNL_MSG_CONFIG, 1, family, group_id, mynfa);
 }
 
 static int
-nflog_send_config_cmd(const pcap_t *handle, u_int16_t group_id, u_int8_t cmd, u_int8_t family)
+nflog_send_config_cmd(const pcap_t *handle, uint16_t group_id, u_int8_t cmd, u_int8_t family)
 {
 	struct nfulnl_msg_config_cmd msg;
 	struct my_nfattr nfa;
 
 	msg.command = cmd;
 
 	nfa.data = &msg;
 	nfa.nfa_type = NFULA_CFG_CMD;
 	nfa.nfa_len = sizeof(msg);
 
 	return nflog_send_config_msg(handle, family, group_id, &nfa);
 }
 
 static int
-nflog_send_config_mode(const pcap_t *handle, u_int16_t group_id, u_int8_t copy_mode, u_int32_t copy_range)
+nflog_send_config_mode(const pcap_t *handle, uint16_t group_id, u_int8_t copy_mode, u_int32_t copy_range)
 {
 	struct nfulnl_msg_config_mode msg;
 	struct my_nfattr nfa;
 
 	msg.copy_range = htonl(copy_range);
 	msg.copy_mode = copy_mode;
 
 	nfa.data = &msg;
 	nfa.nfa_type = NFULA_CFG_MODE;
 	nfa.nfa_len = sizeof(msg);
 
 	return nflog_send_config_msg(handle, AF_UNSPEC, group_id, &nfa);
 }
 
 static int
-nfqueue_send_verdict(const pcap_t *handle, u_int16_t group_id, u_int32_t id, u_int32_t verdict)
+nfqueue_send_verdict(const pcap_t *handle, uint16_t group_id, u_int32_t id, u_int32_t verdict)
 {
 	struct nfqnl_msg_verdict_hdr msg;
 	struct my_nfattr nfa;
 
 	msg.id = htonl(id);
 	msg.verdict = htonl(verdict);
 
 	nfa.data = &msg;
 	nfa.nfa_type = NFQA_VERDICT_HDR;
 	nfa.nfa_len = sizeof(msg);
 
 	return netfilter_send_config_msg(handle, (NFNL_SUBSYS_QUEUE << 8) | NFQNL_MSG_VERDICT, 0, AF_UNSPEC, group_id, &nfa);
 }
 
 static int
-nfqueue_send_config_msg(const pcap_t *handle, u_int8_t family, u_int16_t group_id, const struct my_nfattr *mynfa)
+nfqueue_send_config_msg(const pcap_t *handle, uint8_t family, u_int16_t group_id, const struct my_nfattr *mynfa)
 {
 	return netfilter_send_config_msg(handle, (NFNL_SUBSYS_QUEUE << 8) | NFQNL_MSG_CONFIG, 1, family, group_id, mynfa);
 }
 
 static int
-nfqueue_send_config_cmd(const pcap_t *handle, u_int16_t group_id, u_int8_t cmd, u_int16_t pf)
+nfqueue_send_config_cmd(const pcap_t *handle, uint16_t group_id, u_int8_t cmd, u_int16_t pf)
 {
 	struct nfqnl_msg_config_cmd msg;
 	struct my_nfattr nfa;
 
 	msg.command = cmd;
 	msg.pf = htons(pf);
 
 	nfa.data = &msg;
 	nfa.nfa_type = NFQA_CFG_CMD;
 	nfa.nfa_len = sizeof(msg);
 
 	return nfqueue_send_config_msg(handle, AF_UNSPEC, group_id, &nfa);
 }
 
 static int
-nfqueue_send_config_mode(const pcap_t *handle, u_int16_t group_id, u_int8_t copy_mode, u_int32_t copy_range)
+nfqueue_send_config_mode(const pcap_t *handle, uint16_t group_id, u_int8_t copy_mode, u_int32_t copy_range)
 {
 	struct nfqnl_msg_config_params msg;
 	struct my_nfattr nfa;
 
 	msg.copy_range = htonl(copy_range);
 	msg.copy_mode = copy_mode;
 
 	nfa.data = &msg;
 	nfa.nfa_type = NFQA_CFG_PARAMS;
 	nfa.nfa_len = sizeof(msg);
 
 	return nfqueue_send_config_msg(handle, AF_UNSPEC, group_id, &nfa);
 }
 
 static int
 netfilter_activate(pcap_t* handle)
 {
 	const char *dev = handle->opt.device;
 	unsigned short groups[32];
 	int group_count = 0;
 	nftype_t type = OTHER;
 	int i;
 
  	if (strncmp(dev, NFLOG_IFACE, strlen(NFLOG_IFACE)) == 0) {
  		dev += strlen(NFLOG_IFACE);
 		type = NFLOG;
 
 	} else if (strncmp(dev, NFQUEUE_IFACE, strlen(NFQUEUE_IFACE)) == 0) {
 		dev += strlen(NFQUEUE_IFACE);
 		type = NFQUEUE;
 	}
 
 	if (type != OTHER && *dev == ':') {
 		dev++;
 		while (*dev) {
 			long int group_id;
 			char *end_dev;
 
 			if (group_count == 32) {
 				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 						"Maximum 32 netfilter groups! dev: %s",
 						handle->opt.device);
 				return PCAP_ERROR;
 			}
 
 			group_id = strtol(dev, &end_dev, 0);
 			if (end_dev != dev) {
 				if (group_id < 0 || group_id > 65535) {
 					pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 							"Netfilter group range from 0 to 65535 (got %ld)",
 							group_id);
 					return PCAP_ERROR;
 				}
 
 				groups[group_count++] = (unsigned short) group_id;
 				dev = end_dev;
 			}
 			if (*dev != ',')
 				break;
 			dev++;
 		}
 	}
 
 	if (type == OTHER || *dev) {
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 				"Can't get netfilter group(s) index from %s",
 				handle->opt.device);
 		return PCAP_ERROR;
 	}
 
 	/* if no groups, add default: 0 */
 	if (!group_count) {
 		groups[0] = 0;
 		group_count = 1;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+		handle->snapshot = MAXIMUM_SNAPLEN;
+
 	/* Initialize some components of the pcap structure. */
 	handle->bufsize = 128 + handle->snapshot;
 	handle->offset = 0;
 	handle->read_op = netfilter_read_linux;
 	handle->inject_op = netfilter_inject_linux;
 	handle->setfilter_op = install_bpf_program; /* no kernel filtering */
 	handle->setdirection_op = NULL;
 	handle->set_datalink_op = netfilter_set_datalink;
 	handle->getnonblock_op = pcap_getnonblock_fd;
 	handle->setnonblock_op = pcap_setnonblock_fd;
 	handle->stats_op = netfilter_stats_linux;
 
 	/* Create netlink socket */
 	handle->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);
 	if (handle->fd < 0) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't create raw socket");
 		return PCAP_ERROR;
 	}
 
 	if (type == NFLOG) {
 		handle->linktype = DLT_NFLOG;
 		handle->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 		if (handle->dlt_list != NULL) {
 			handle->dlt_list[0] = DLT_NFLOG;
 			handle->dlt_list[1] = DLT_IPV4;
 			handle->dlt_count = 2;
 		}
 
 	} else
 		handle->linktype = DLT_IPV4;
 
 	handle->buffer = malloc(handle->bufsize);
 	if (!handle->buffer) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate dump buffer: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't allocate dump buffer");
 		goto close_fail;
 	}
 
 	if (type == NFLOG) {
 		if (nflog_send_config_cmd(handle, 0, NFULNL_CFG_CMD_PF_UNBIND, AF_INET) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFULNL_CFG_CMD_PF_UNBIND: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "NFULNL_CFG_CMD_PF_UNBIND");
 			goto close_fail;
 		}
 
 		if (nflog_send_config_cmd(handle, 0, NFULNL_CFG_CMD_PF_BIND, AF_INET) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFULNL_CFG_CMD_PF_BIND: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "NFULNL_CFG_CMD_PF_BIND");
 			goto close_fail;
 		}
 
 		/* Bind socket to the nflog groups */
 		for (i = 0; i < group_count; i++) {
 			if (nflog_send_config_cmd(handle, groups[i], NFULNL_CFG_CMD_BIND, AF_UNSPEC) < 0) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't listen on group group index: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "Can't listen on group group index");
 				goto close_fail;
 			}
 
 			if (nflog_send_config_mode(handle, groups[i], NFULNL_COPY_PACKET, handle->snapshot) < 0) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFULNL_COPY_PACKET: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "NFULNL_COPY_PACKET");
 				goto close_fail;
 			}
 		}
 
 	} else {
 		if (nfqueue_send_config_cmd(handle, 0, NFQNL_CFG_CMD_PF_UNBIND, AF_INET) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFQNL_CFG_CMD_PF_UNBIND: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "NFQNL_CFG_CMD_PF_UNBIND");
 			goto close_fail;
 		}
 
 		if (nfqueue_send_config_cmd(handle, 0, NFQNL_CFG_CMD_PF_BIND, AF_INET) < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFQNL_CFG_CMD_PF_BIND: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "NFQNL_CFG_CMD_PF_BIND");
 			goto close_fail;
 		}
 
 		/* Bind socket to the nfqueue groups */
 		for (i = 0; i < group_count; i++) {
 			if (nfqueue_send_config_cmd(handle, groups[i], NFQNL_CFG_CMD_BIND, AF_UNSPEC) < 0) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't listen on group group index: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "Can't listen on group group index");
 				goto close_fail;
 			}
 
 			if (nfqueue_send_config_mode(handle, groups[i], NFQNL_COPY_PACKET, handle->snapshot) < 0) {
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "NFQNL_COPY_PACKET: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "NFQNL_COPY_PACKET");
 				goto close_fail;
 			}
 		}
 	}
 
 	if (handle->opt.rfmon) {
 		/*
 		 * Monitor mode doesn't apply to netfilter devices.
 		 */
 		pcap_cleanup_live_common(handle);
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	if (handle->opt.buffer_size != 0) {
 		/*
 		 * Set the socket buffer size to the specified value.
 		 */
 		if (setsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF, &handle->opt.buffer_size, sizeof(handle->opt.buffer_size)) == -1) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "SO_RCVBUF: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "SO_RCVBUF");
 			goto close_fail;
 		}
 	}
 
 	handle->selectable_fd = handle->fd;
 	return 0;
 
 close_fail:
 	pcap_cleanup_live_common(handle);
 	return PCAP_ERROR;
 }
 
 pcap_t *
 netfilter_create(const char *device, char *ebuf, int *is_ours)
 {
 	const char *cp;
 	pcap_t *p;
 
 	/* Does this look like an netfilter device? */
 	cp = strrchr(device, '/');
 	if (cp == NULL)
 		cp = device;
 
 	/* Does it begin with NFLOG_IFACE or NFQUEUE_IFACE? */
 	if (strncmp(cp, NFLOG_IFACE, sizeof NFLOG_IFACE - 1) == 0)
 		cp += sizeof NFLOG_IFACE - 1;
 	else if (strncmp(cp, NFQUEUE_IFACE, sizeof NFQUEUE_IFACE - 1) == 0)
 		cp += sizeof NFQUEUE_IFACE - 1;
 	else {
 		/* Nope, doesn't begin with NFLOG_IFACE nor NFQUEUE_IFACE */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/*
 	 * Yes - is that either the end of the name, or is it followed
 	 * by a colon?
 	 */
 	if (*cp != ':' && *cp != '\0') {
 		/* Nope */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_netfilter));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = netfilter_activate;
 	return (p);
 }
 
 int
-netfilter_findalldevs(pcap_if_t **alldevsp, char *err_str)
+netfilter_findalldevs(pcap_if_list_t *devlistp, char *err_str)
 {
 	int sock;
 
 	sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);
 	if (sock < 0) {
 		/* if netlink is not supported this is not fatal */
 		if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT)
 			return 0;
-		pcap_snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s",
-			errno, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(err_str, PCAP_ERRBUF_SIZE,
+		    errno, "Can't open netlink socket");
 		return -1;
 	}
 	close(sock);
 
-	if (pcap_add_if(alldevsp, NFLOG_IFACE, 0, "Linux netfilter log (NFLOG) interface", err_str) < 0)
+	/*
+	 * The notion of "connected" vs. "disconnected" doesn't apply.
+	 * XXX - what about "up" and "running"?
+	 */
+	if (add_dev(devlistp, NFLOG_IFACE,
+	    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
+	    "Linux netfilter log (NFLOG) interface", err_str) == NULL)
 		return -1;
-	if (pcap_add_if(alldevsp, NFQUEUE_IFACE, 0, "Linux netfilter queue (NFQUEUE) interface", err_str) < 0)
+	if (add_dev(devlistp, NFQUEUE_IFACE,
+	    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
+	    "Linux netfilter queue (NFQUEUE) interface", err_str) == NULL)
 		return -1;
 	return 0;
 }
Index: vendor/libpcap/dist/pcap-netfilter-linux.h
===================================================================
--- vendor/libpcap/dist/pcap-netfilter-linux.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-netfilter-linux.h	(revision 333789)
@@ -1,35 +1,35 @@
 /*
  * Copyright (c) 2011 Jakub Zawadzki
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*
  * Prototypes for netlink-related functions
  */
-int netfilter_findalldevs(pcap_if_t **alldevsp, char *err_str);
+int netfilter_findalldevs(pcap_if_list_t *devlistp, char *err_str);
 pcap_t *netfilter_create(const char *device, char *ebuf, int *is_ours);
Index: vendor/libpcap/dist/pcap-netmap.c
===================================================================
--- vendor/libpcap/dist/pcap-netmap.c	(nonexistent)
+++ vendor/libpcap/dist/pcap-netmap.c	(revision 333789)
@@ -0,0 +1,306 @@
+/*
+ * Copyright (C) 2014 Luigi Rizzo. All rights reserved.
+ *
+ * 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
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <poll.h>
+#include <ctype.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define NETMAP_WITH_LIBS
+#include <net/netmap_user.h>
+
+#include "pcap-int.h"
+#include "pcap-netmap.h"
+
+#ifndef __FreeBSD__
+  /*
+   * On FreeBSD we use IFF_PPROMISC which is in ifr_flagshigh.
+   * Remap to IFF_PROMISC on other platforms.
+   *
+   * XXX - DragonFly BSD?
+   */
+  #define IFF_PPROMISC	IFF_PROMISC
+#endif /* __FreeBSD__ */
+
+struct pcap_netmap {
+	struct nm_desc *d;	/* pointer returned by nm_open() */
+	pcap_handler cb;	/* callback and argument */
+	u_char *cb_arg;
+	int must_clear_promisc;	/* flag */
+	uint64_t rx_pkts;	/* # of pkts received before the filter */
+};
+
+
+static int
+pcap_netmap_stats(pcap_t *p, struct pcap_stat *ps)
+{
+	struct pcap_netmap *pn = p->priv;
+
+	ps->ps_recv = pn->rx_pkts;
+	ps->ps_drop = 0;
+	ps->ps_ifdrop = 0;
+	return 0;
+}
+
+
+static void
+pcap_netmap_filter(u_char *arg, struct pcap_pkthdr *h, const u_char *buf)
+{
+	pcap_t *p = (pcap_t *)arg;
+	struct pcap_netmap *pn = p->priv;
+	const struct bpf_insn *pc = p->fcode.bf_insns;
+
+	++pn->rx_pkts;
+	if (pc == NULL || bpf_filter(pc, buf, h->len, h->caplen))
+		pn->cb(pn->cb_arg, h, buf);
+}
+
+
+static int
+pcap_netmap_dispatch(pcap_t *p, int cnt, pcap_handler cb, u_char *user)
+{
+	int ret;
+	struct pcap_netmap *pn = p->priv;
+	struct nm_desc *d = pn->d;
+	struct pollfd pfd = { .fd = p->fd, .events = POLLIN, .revents = 0 };
+
+	pn->cb = cb;
+	pn->cb_arg = user;
+
+	for (;;) {
+		if (p->break_loop) {
+			p->break_loop = 0;
+			return PCAP_ERROR_BREAK;
+		}
+		/* nm_dispatch won't run forever */
+
+		ret = nm_dispatch((void *)d, cnt, (void *)pcap_netmap_filter, (void *)p);
+		if (ret != 0)
+			break;
+		errno = 0;
+		ret = poll(&pfd, 1, p->opt.timeout);
+	}
+	return ret;
+}
+
+
+/* XXX need to check the NIOCTXSYNC/poll */
+static int
+pcap_netmap_inject(pcap_t *p, const void *buf, size_t size)
+{
+	struct pcap_netmap *pn = p->priv;
+	struct nm_desc *d = pn->d;
+
+	return nm_inject(d, buf, size);
+}
+
+
+static int
+pcap_netmap_ioctl(pcap_t *p, u_long what, uint32_t *if_flags)
+{
+	struct pcap_netmap *pn = p->priv;
+	struct nm_desc *d = pn->d;
+	struct ifreq ifr;
+	int error, fd = d->fd;
+
+#ifdef linux
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
+		fprintf(stderr, "Error: cannot get device control socket.\n");
+		return -1;
+	}
+#endif /* linux */
+	bzero(&ifr, sizeof(ifr));
+	strncpy(ifr.ifr_name, d->req.nr_name, sizeof(ifr.ifr_name));
+	switch (what) {
+	case SIOCSIFFLAGS:
+		/*
+		 * The flags we pass in are 32-bit and unsigned.
+		 *
+		 * On most if not all UN*Xes, ifr_flags is 16-bit and
+		 * signed, and the result of assigning a longer
+		 * unsigned value to a shorter signed value is
+		 * implementation-defined (even if, in practice, it'll
+		 * do what's intended on all platforms we support
+		 * result of assigning a 32-bit unsigned value).
+		 * So we mask out the upper 16 bits.
+		 */
+		ifr.ifr_flags = *if_flags & 0xffff;
+#ifdef __FreeBSD__
+		/*
+		 * In FreeBSD, we need to set the high-order flags,
+		 * as we're using IFF_PPROMISC, which is in those bits.
+		 *
+		 * XXX - DragonFly BSD?
+		 */
+		ifr.ifr_flagshigh = *if_flags >> 16;
+#endif /* __FreeBSD__ */
+		break;
+	}
+	error = ioctl(fd, what, &ifr);
+	if (!error) {
+		switch (what) {
+		case SIOCGIFFLAGS:
+			/*
+			 * The flags we return are 32-bit.
+			 *
+			 * On most if not all UN*Xes, ifr_flags is
+			 * 16-bit and signed, and will get sign-
+			 * extended, so that the upper 16 bits of
+			 * those flags will be forced on.  So we
+			 * mask out the upper 16 bits of the
+			 * sign-extended value.
+			 */
+			*if_flags = ifr.ifr_flags & 0xffff;
+#ifdef __FreeBSD__
+			/*
+			 * In FreeBSD, we need to return the
+			 * high-order flags, as we're using
+			 * IFF_PPROMISC, which is in those bits.
+			 *
+			 * XXX - DragonFly BSD?
+			 */
+			*if_flags |= (ifr.ifr_flagshigh << 16);
+#endif /* __FreeBSD__ */
+		}
+	}
+#ifdef linux
+	close(fd);
+#endif /* linux */
+	return error ? -1 : 0;
+}
+
+
+static void
+pcap_netmap_close(pcap_t *p)
+{
+	struct pcap_netmap *pn = p->priv;
+	struct nm_desc *d = pn->d;
+	uint32_t if_flags = 0;
+
+	if (pn->must_clear_promisc) {
+		pcap_netmap_ioctl(p, SIOCGIFFLAGS, &if_flags); /* fetch flags */
+		if (if_flags & IFF_PPROMISC) {
+			if_flags &= ~IFF_PPROMISC;
+			pcap_netmap_ioctl(p, SIOCSIFFLAGS, &if_flags);
+		}
+	}
+	nm_close(d);
+	pcap_cleanup_live_common(p);
+}
+
+
+static int
+pcap_netmap_activate(pcap_t *p)
+{
+	struct pcap_netmap *pn = p->priv;
+	struct nm_desc *d;
+	uint32_t if_flags = 0;
+
+	d = nm_open(p->opt.device, NULL, 0, NULL);
+	if (d == NULL) {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "netmap open: cannot access %s",
+		    p->opt.device);
+		pcap_cleanup_live_common(p);
+		return (PCAP_ERROR);
+	}
+#if 0
+	fprintf(stderr, "%s device %s priv %p fd %d ports %d..%d\n",
+	    __FUNCTION__, p->opt.device, d, d->fd,
+	    d->first_rx_ring, d->last_rx_ring);
+#endif
+	pn->d = d;
+	p->fd = d->fd;
+
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
+	if (p->opt.promisc && !(d->req.nr_ringid & NETMAP_SW_RING)) {
+		pcap_netmap_ioctl(p, SIOCGIFFLAGS, &if_flags); /* fetch flags */
+		if (!(if_flags & IFF_PPROMISC)) {
+			pn->must_clear_promisc = 1;
+			if_flags |= IFF_PPROMISC;
+			pcap_netmap_ioctl(p, SIOCSIFFLAGS, &if_flags);
+		}
+	}
+	p->linktype = DLT_EN10MB;
+	p->selectable_fd = p->fd;
+	p->read_op = pcap_netmap_dispatch;
+	p->inject_op = pcap_netmap_inject;
+	p->setfilter_op = install_bpf_program;
+	p->setdirection_op = NULL;
+	p->set_datalink_op = NULL;
+	p->getnonblock_op = pcap_getnonblock_fd;
+	p->setnonblock_op = pcap_setnonblock_fd;
+	p->stats_op = pcap_netmap_stats;
+	p->cleanup_op = pcap_netmap_close;
+
+	return (0);
+}
+
+
+pcap_t *
+pcap_netmap_create(const char *device, char *ebuf, int *is_ours)
+{
+	pcap_t *p;
+
+	*is_ours = (!strncmp(device, "netmap:", 7) || !strncmp(device, "vale", 4));
+	if (! *is_ours)
+		return NULL;
+	p = pcap_create_common(ebuf, sizeof (struct pcap_netmap));
+	if (p == NULL)
+		return (NULL);
+	p->activate_op = pcap_netmap_activate;
+	return (p);
+}
+
+/*
+ * The "device name" for netmap devices isn't a name for a device, it's
+ * an expression that indicates how the device should be set up, so
+ * there's no way to enumerate them.
+ */
+int
+pcap_netmap_findalldevs(pcap_if_list_t *devlistp _U_, char *err_str _U_)
+{
+	return 0;
+}

Property changes on: vendor/libpcap/dist/pcap-netmap.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-netmap.h
===================================================================
--- vendor/libpcap/dist/pcap-netmap.h	(nonexistent)
+++ vendor/libpcap/dist/pcap-netmap.h	(revision 333789)
@@ -0,0 +1,2 @@
+pcap_t *pcap_netmap_create(const char *, char *, int *);
+int pcap_netmap_findalldevs(pcap_if_list_t *devlistp, char *errbuf);

Property changes on: vendor/libpcap/dist/pcap-netmap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-new.c
===================================================================
--- vendor/libpcap/dist/pcap-new.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-new.c	(revision 333789)
@@ -1,1265 +1,454 @@
 /*
  * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
  * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the Politecnico di Torino, CACE Technologies
  * nor the names of its contributors may be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+/*
+ * sockutils.h may include <crtdbg.h> on Windows, and pcap-int.h will
+ * include portability.h, and portability.h, on Windows, expects that
+ * <crtdbg.h> has already been included, so include sockutils.h first.
+ */
+#include "sockutils.h"
 #include "pcap-int.h"	// for the details of the pcap_t structure
 #include "pcap-rpcap.h"
-#include "sockutils.h"
+#include "rpcap-protocol.h"
 #include <errno.h>		// for the errno variable
 #include <stdlib.h>		// for malloc(), free(), ...
 #include <string.h>		// for strstr, etc
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dirent.h>		// for readdir
 #endif
 
-/* Keeps a list of all the opened connections in the active mode. */
-extern struct activehosts *activeHosts;
-
-/*
- * \brief Keeps the main socket identifier when we want to accept a new remote connection (active mode only).
- * See the documentation of pcap_remoteact_accept() and pcap_remoteact_cleanup() for more details.
- */
-SOCKET sockmain;
-
 /* String identifier to be used in the pcap_findalldevs_ex() */
 #define PCAP_TEXT_SOURCE_FILE "File"
 /* String identifier to be used in the pcap_findalldevs_ex() */
 #define PCAP_TEXT_SOURCE_ADAPTER "Network adapter"
 
 /* String identifier to be used in the pcap_findalldevs_ex() */
 #define PCAP_TEXT_SOURCE_ON_LOCAL_HOST "on local host"
-/* String identifier to be used in the pcap_findalldevs_ex() */
-#define PCAP_TEXT_SOURCE_ON_REMOTE_HOST "on remote node"
 
-/*
-* Private data for capturing on WinPcap devices.
-*/
-struct pcap_win {
-	int nonblock;
-	int rfmon_selfstart;		/* a flag tells whether the monitor mode is set by itself */
-	int filtering_in_kernel;	/* using kernel filter */
-
-#ifdef HAVE_DAG_API
-	int	dag_fcs_bits;		/* Number of checksum bits from link layer */
-#endif
-};
-
 /****************************************************
  *                                                  *
  * Function bodies                                  *
  *                                                  *
  ****************************************************/
 
 int pcap_findalldevs_ex(char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf)
 {
-	SOCKET sockctrl;		/* socket descriptor of the control connection */
-	uint32 totread = 0;		/* number of bytes of the payload read from the socket */
-	int nread;
-	struct addrinfo hints;		/* temp variable needed to resolve hostnames into to socket representation */
-	struct addrinfo *addrinfo;	/* temp variable needed to resolve hostnames into to socket representation */
-	struct rpcap_header header;	/* structure that keeps the general header of the rpcap protocol */
-	int i, j;		/* temp variables */
-	int naddr;		/* temp var needed to avoid problems with IPv6 addresses */
-	struct pcap_addr *addr;	/* another such temp */
-	int retval;		/* store the return value of the functions */
-	int nif;		/* Number of interfaces listed */
-	int active = 0;	/* 'true' if we the other end-party is in active mode */
-	char host[PCAP_BUF_SIZE], port[PCAP_BUF_SIZE], name[PCAP_BUF_SIZE], path[PCAP_BUF_SIZE], filename[PCAP_BUF_SIZE];
 	int type;
+	char name[PCAP_BUF_SIZE], path[PCAP_BUF_SIZE], filename[PCAP_BUF_SIZE];
 	pcap_t *fp;
 	char tmpstring[PCAP_BUF_SIZE + 1];		/* Needed to convert names and descriptions from 'old' syntax to the 'new' one */
-	pcap_if_t *dev;		/* Previous device into the pcap_if_t chain */
+	pcap_if_t *lastdev;	/* Last device in the pcap_if_t list */
+	pcap_if_t *dev;		/* Device we're adding to the pcap_if_t list */
 
+	/* List starts out empty. */
+	(*alldevs) = NULL;
+	lastdev = NULL;
 
 	if (strlen(source) > PCAP_BUF_SIZE)
 	{
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The source string is too long. Cannot handle it correctly.");
 		return -1;
 	}
 
 	/*
 	 * Determine the type of the source (file, local, remote)
 	 * There are some differences if pcap_findalldevs_ex() is called to list files and remote adapters.
 	 * In the first case, the name of the directory we have to look into must be present (therefore
 	 * the 'name' parameter of the pcap_parsesrcstr() is present).
 	 * In the second case, the name of the adapter is not required (we need just the host). So, we have
 	 * to use a first time this function to get the source type, and a second time to get the appropriate
 	 * info, which depends on the source type.
 	 */
 	if (pcap_parsesrcstr(source, &type, NULL, NULL, NULL, errbuf) == -1)
 		return -1;
 
-	if (type == PCAP_SRC_IFLOCAL)
+	switch (type)
 	{
-		if (pcap_parsesrcstr(source, &type, host, NULL, NULL, errbuf) == -1)
+	case PCAP_SRC_IFLOCAL:
+		if (pcap_parsesrcstr(source, &type, NULL, NULL, NULL, errbuf) == -1)
 			return -1;
 
 		/* Initialize temporary string */
 		tmpstring[PCAP_BUF_SIZE] = 0;
 
 		/* The user wants to retrieve adapters from a local host */
 		if (pcap_findalldevs(alldevs, errbuf) == -1)
 			return -1;
 
-		if ((alldevs == NULL) || (*alldevs == NULL))
+		if (*alldevs == NULL)
 		{
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 				"No interfaces found! Make sure libpcap/WinPcap is properly installed"
 				" on the local machine.");
 			return -1;
 		}
 
 		/* Scan all the interfaces and modify name and description */
 		/* This is a trick in order to avoid the re-implementation of the pcap_findalldevs here */
 		dev = *alldevs;
 		while (dev)
 		{
 			/* Create the new device identifier */
 			if (pcap_createsrcstr(tmpstring, PCAP_SRC_IFLOCAL, NULL, NULL, dev->name, errbuf) == -1)
 				return -1;
 
 			/* Delete the old pointer */
 			free(dev->name);
 
 			/* Make a copy of the new device identifier */
 			dev->name = strdup(tmpstring);
 			if (dev->name == NULL)
 			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "malloc() failed");
+				pcap_freealldevs(*alldevs);
 				return -1;
 			}
 
 			/* Create the new device description */
 			if ((dev->description == NULL) || (dev->description[0] == 0))
 				pcap_snprintf(tmpstring, sizeof(tmpstring) - 1, "%s '%s' %s", PCAP_TEXT_SOURCE_ADAPTER,
 				dev->name, PCAP_TEXT_SOURCE_ON_LOCAL_HOST);
 			else
 				pcap_snprintf(tmpstring, sizeof(tmpstring) - 1, "%s '%s' %s", PCAP_TEXT_SOURCE_ADAPTER,
 				dev->description, PCAP_TEXT_SOURCE_ON_LOCAL_HOST);
 
 			/* Delete the old pointer */
 			free(dev->description);
 
 			/* Make a copy of the description */
 			dev->description = strdup(tmpstring);
 			if (dev->description == NULL)
 			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "malloc() failed");
+				pcap_freealldevs(*alldevs);
 				return -1;
 			}
 
 			dev = dev->next;
 		}
 
 		return 0;
-	}
 
-	(*alldevs) = NULL;
-
-	if (type == PCAP_SRC_FILE)
+	case PCAP_SRC_FILE:
 	{
 		size_t stringlen;
-#ifdef WIN32
+#ifdef _WIN32
 		WIN32_FIND_DATA filedata;
 		HANDLE filehandle;
 #else
 		struct dirent *filedata;
 		DIR *unixdir;
 #endif
 
-		if (pcap_parsesrcstr(source, &type, host, port, name, errbuf) == -1)
+		if (pcap_parsesrcstr(source, &type, NULL, NULL, name, errbuf) == -1)
 			return -1;
 
 		/* Check that the filename is correct */
 		stringlen = strlen(name);
 
 		/* The directory must end with '\' in Win32 and '/' in UNIX */
-#ifdef WIN32
+#ifdef _WIN32
 #define ENDING_CHAR '\\'
 #else
 #define ENDING_CHAR '/'
 #endif
 
 		if (name[stringlen - 1] != ENDING_CHAR)
 		{
 			name[stringlen] = ENDING_CHAR;
 			name[stringlen + 1] = 0;
 
 			stringlen++;
 		}
 
 		/* Save the path for future reference */
 		pcap_snprintf(path, sizeof(path), "%s", name);
 
-#ifdef WIN32
+#ifdef _WIN32
 		/* To perform directory listing, Win32 must have an 'asterisk' as ending char */
 		if (name[stringlen - 1] != '*')
 		{
 			name[stringlen] = '*';
 			name[stringlen + 1] = 0;
 		}
 
 		filehandle = FindFirstFile(name, &filedata);
 
 		if (filehandle == INVALID_HANDLE_VALUE)
 		{
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Error when listing files: does folder '%s' exist?", path);
 			return -1;
 		}
 
 #else
 		/* opening the folder */
 		unixdir= opendir(path);
 
 		/* get the first file into it */
 		filedata= readdir(unixdir);
 
 		if (filedata == NULL)
 		{
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Error when listing files: does folder '%s' exist?", path);
 			return -1;
 		}
 #endif
 
+		/* Add all files we find to the list. */
 		do
 		{
 
-#ifdef WIN32
+#ifdef _WIN32
 			pcap_snprintf(filename, sizeof(filename), "%s%s", path, filedata.cFileName);
 #else
 			pcap_snprintf(filename, sizeof(filename), "%s%s", path, filedata->d_name);
 #endif
 
 			fp = pcap_open_offline(filename, errbuf);
 
 			if (fp)
 			{
 				/* allocate the main structure */
-				if (*alldevs == NULL)	/* This is in case it is the first file */
-				{
-					(*alldevs) = (pcap_if_t *)malloc(sizeof(pcap_if_t));
-					dev = (*alldevs);
-				}
-				else
-				{
-					dev->next = (pcap_if_t *)malloc(sizeof(pcap_if_t));
-					dev = dev->next;
-				}
-
-				/* check that the malloc() didn't fail */
+				dev = (pcap_if_t *)malloc(sizeof(pcap_if_t));
 				if (dev == NULL)
 				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "malloc() failed");
+					pcap_freealldevs(*alldevs);
 					return -1;
 				}
 
 				/* Initialize the structure to 'zero' */
 				memset(dev, 0, sizeof(pcap_if_t));
 
+				/* Append it to the list. */
+				if (lastdev == NULL)
+				{
+					/*
+					 * List is empty, so it's also
+					 * the first device.
+					 */
+					*alldevs = dev;
+				}
+				else
+				{
+					/*
+					 * Append after the last device.
+					 */
+					lastdev->next = dev;
+				}
+				/* It's now the last device. */
+				lastdev = dev;
+
 				/* Create the new source identifier */
 				if (pcap_createsrcstr(tmpstring, PCAP_SRC_FILE, NULL, NULL, filename, errbuf) == -1)
+				{
+					pcap_freealldevs(*alldevs);
 					return -1;
+				}
 
 				stringlen = strlen(tmpstring);
 
 				dev->name = (char *)malloc(stringlen + 1);
 				if (dev->name == NULL)
 				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "malloc() failed");
+					pcap_freealldevs(*alldevs);
 					return -1;
 				}
 
 				strlcpy(dev->name, tmpstring, stringlen);
 
 				dev->name[stringlen] = 0;
 
 				/* Create the description */
 				pcap_snprintf(tmpstring, sizeof(tmpstring) - 1, "%s '%s' %s", PCAP_TEXT_SOURCE_FILE,
 					filename, PCAP_TEXT_SOURCE_ON_LOCAL_HOST);
 
 				stringlen = strlen(tmpstring);
 
 				dev->description = (char *)malloc(stringlen + 1);
 
 				if (dev->description == NULL)
 				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "malloc() failed");
+					pcap_freealldevs(*alldevs);
 					return -1;
 				}
 
 				/* Copy the new device description into the correct memory location */
 				strlcpy(dev->description, tmpstring, stringlen + 1);
 
 				pcap_close(fp);
 			}
 		}
-#ifdef WIN32
+#ifdef _WIN32
 		while (FindNextFile(filehandle, &filedata) != 0);
 #else
 		while ( (filedata= readdir(unixdir)) != NULL);
 #endif
 
 
-#ifdef WIN32
+#ifdef _WIN32
 		/* Close the search handle. */
 		FindClose(filehandle);
 #endif
 
 		return 0;
 	}
 
-	/* If we come here, it is a remote host */
-
-	/* Retrieve the needed data for getting adapter list */
-	if (pcap_parsesrcstr(source, &type, host, port, NULL, errbuf) == -1)
-		return -1;
-
-	/* Warning: this call can be the first one called by the user. */
-	/* For this reason, we have to initialize the WinSock support. */
-	if (sock_init(errbuf, PCAP_ERRBUF_SIZE) == -1)
-		return -1;
-
-	/* Check for active mode */
-	sockctrl = rpcap_remoteact_getsock(host, &active, errbuf);
-	if (sockctrl == INVALID_SOCKET)
-		return -1;
-
-	if (!active) {
-		/*
-		 * We're not in active mode; let's try to open a new
-		 * control connection.
-		 */
-		addrinfo = NULL;
-
-		memset(&hints, 0, sizeof(struct addrinfo));
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-
-		if (port[0] == 0)
-		{
-			/* the user chose not to specify the port */
-			if (sock_initaddress(host, RPCAP_DEFAULT_NETPORT, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-				return -1;
-		}
-		else
-		{
-			if (sock_initaddress(host, port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-				return -1;
-		}
-
-		if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, errbuf, PCAP_ERRBUF_SIZE)) == -1)
-			goto error;
-
-		/* addrinfo is no longer used */
-		freeaddrinfo(addrinfo);
-		addrinfo = NULL;
-
-		if (rpcap_sendauth(sockctrl, auth, errbuf) == -1)
-		{
-			sock_close(sockctrl, NULL, 0);
-			return -1;
-		}
-	}
-
-	/* RPCAP findalldevs command */
-	rpcap_createhdr(&header, RPCAP_MSG_FINDALLIF_REQ, 0, 0);
-
-	if (sock_send(sockctrl, (char *)&header, sizeof(struct rpcap_header), errbuf, PCAP_ERRBUF_SIZE) == -1)
-		goto error;
-
-	if (sock_recv(sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, errbuf, PCAP_ERRBUF_SIZE) == -1)
-		goto error;
-
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(errbuf, sockctrl, &header, RPCAP_MSG_FINDALLIF_REPLY, RPCAP_MSG_ERROR, 0);
-
-	if (retval != RPCAP_MSG_FINDALLIF_REPLY)		/* the message is not the one expected */
-	{
-		switch (retval)
-		{
-		case -3:	/* Unrecoverable network error */
-		case -2:	/* The other endpoint send a message that is not allowed here */
-		case -1:	/* The other endpoint has a version number that is not compatible with our */
-			break;
-
-		case RPCAP_MSG_ERROR:		/* The other endpoint reported an error */
-			break;
-
-		default:
-		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Internal error");
-			break;
-		};
-		}
-
-		if (!active)
-			sock_close(sockctrl, NULL, 0);
-
-		return -1;
-	}
-
-	/* read the number of interfaces */
-	nif = ntohs(header.value);
-
-	/* loop until all interfaces have been received */
-	for (i = 0; i < nif; i++)
-	{
-		struct rpcap_findalldevs_if findalldevs_if;
-		char tmpstring2[PCAP_BUF_SIZE + 1];		/* Needed to convert names and descriptions from 'old' syntax to the 'new' one */
-		size_t stringlen;
-
-		tmpstring2[PCAP_BUF_SIZE] = 0;
-
-		/* receive the findalldevs structure from remote host */
-		nread = sock_recv(sockctrl, (char *)&findalldevs_if,
-		    sizeof(struct rpcap_findalldevs_if), SOCK_RECEIVEALL_YES,
-		    errbuf, PCAP_ERRBUF_SIZE);
-		if (nread == -1)
-			goto error;
-		totread += nread;
-
-		findalldevs_if.namelen = ntohs(findalldevs_if.namelen);
-		findalldevs_if.desclen = ntohs(findalldevs_if.desclen);
-		findalldevs_if.naddr = ntohs(findalldevs_if.naddr);
-
-		/* allocate the main structure */
-		if (i == 0)
-		{
-			(*alldevs) = (pcap_if_t *)malloc(sizeof(pcap_if_t));
-			dev = (*alldevs);
-		}
-		else
-		{
-			dev->next = (pcap_if_t *)malloc(sizeof(pcap_if_t));
-			dev = dev->next;
-		}
-
-		/* check that the malloc() didn't fail */
-		if (dev == NULL)
-		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
-			goto error;
-		}
-
-		/* Initialize the structure to 'zero' */
-		memset(dev, 0, sizeof(pcap_if_t));
-
-		/* allocate mem for name and description */
-		if (findalldevs_if.namelen)
-		{
-
-			if (findalldevs_if.namelen >= sizeof(tmpstring))
-			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Interface name too long");
-				goto error;
-			}
-
-			/* Retrieve adapter name */
-			nread = sock_recv(sockctrl, tmpstring,
-			    findalldevs_if.namelen, SOCK_RECEIVEALL_YES,
-			    errbuf, PCAP_ERRBUF_SIZE);
-			if (nread == -1)
-				goto error;
-			totread += nread;
-
-			tmpstring[findalldevs_if.namelen] = 0;
-
-			/* Create the new device identifier */
-			if (pcap_createsrcstr(tmpstring2, PCAP_SRC_IFREMOTE, host, port, tmpstring, errbuf) == -1)
-				return -1;
-
-			stringlen = strlen(tmpstring2);
-
-			dev->name = (char *)malloc(stringlen + 1);
-			if (dev->name == NULL)
-			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
-				goto error;
-			}
-
-			/* Copy the new device name into the correct memory location */
-			strlcpy(dev->name, tmpstring2, stringlen + 1);
-		}
-
-		if (findalldevs_if.desclen)
-		{
-			if (findalldevs_if.desclen >= sizeof(tmpstring))
-			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Interface description too long");
-				goto error;
-			}
-
-			/* Retrieve adapter description */
-			nread = sock_recv(sockctrl, tmpstring,
-			    findalldevs_if.desclen, SOCK_RECEIVEALL_YES,
-			    errbuf, PCAP_ERRBUF_SIZE);
-			if (nread == -1)
-				goto error;
-			totread += nread;
-
-			tmpstring[findalldevs_if.desclen] = 0;
-
-			pcap_snprintf(tmpstring2, sizeof(tmpstring2) - 1, "%s '%s' %s %s", PCAP_TEXT_SOURCE_ADAPTER,
-				tmpstring, PCAP_TEXT_SOURCE_ON_REMOTE_HOST, host);
-
-			stringlen = strlen(tmpstring2);
-
-			dev->description = (char *)malloc(stringlen + 1);
-
-			if (dev->description == NULL)
-			{
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
-				goto error;
-			}
-
-			/* Copy the new device description into the correct memory location */
-			strlcpy(dev->description, tmpstring2, stringlen + 1);
-		}
-
-		dev->flags = ntohl(findalldevs_if.flags);
-
-		naddr = 0;
-		addr = NULL;
-		/* loop until all addresses have been received */
-		for (j = 0; j < findalldevs_if.naddr; j++)
-		{
-			struct rpcap_findalldevs_ifaddr ifaddr;
-
-			/* Retrieve the interface addresses */
-			nread = sock_recv(sockctrl, (char *)&ifaddr,
-			    sizeof(struct rpcap_findalldevs_ifaddr),
-			    SOCK_RECEIVEALL_YES, errbuf, PCAP_ERRBUF_SIZE);
-			if (nread == -1)
-				goto error;
-			totread += nread;
-
-			/*
-			 * WARNING libpcap bug: the address listing is
-			 * available only for AF_INET.
-			 *
-			 * XXX - IPv6?
-			 */
-			if (ntohs(ifaddr.addr.ss_family) == AF_INET)
-			{
-				if (addr == NULL)
-				{
-					dev->addresses = (struct pcap_addr *) malloc(sizeof(struct pcap_addr));
-					addr = dev->addresses;
-				}
-				else
-				{
-					addr->next = (struct pcap_addr *) malloc(sizeof(struct pcap_addr));
-					addr = addr->next;
-				}
-				naddr++;
-
-				if (addr == NULL)
-				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
-					goto error;
-				}
-				addr->next = NULL;
-
-				if (rpcap_deseraddr((struct sockaddr_storage *) &ifaddr.addr,
-					(struct sockaddr_storage **) &addr->addr, errbuf) == -1)
-					goto error;
-				if (rpcap_deseraddr((struct sockaddr_storage *) &ifaddr.netmask,
-					(struct sockaddr_storage **) &addr->netmask, errbuf) == -1)
-					goto error;
-				if (rpcap_deseraddr((struct sockaddr_storage *) &ifaddr.broadaddr,
-					(struct sockaddr_storage **) &addr->broadaddr, errbuf) == -1)
-					goto error;
-				if (rpcap_deseraddr((struct sockaddr_storage *) &ifaddr.dstaddr,
-					(struct sockaddr_storage **) &addr->dstaddr, errbuf) == -1)
-					goto error;
-
-				if ((addr->addr == NULL) && (addr->netmask == NULL) &&
-					(addr->broadaddr == NULL) && (addr->dstaddr == NULL))
-				{
-					free(addr);
-					addr = NULL;
-					if (naddr == 1)
-						naddr = 0;	/* the first item of the list had NULL addresses */
-				}
-			}
-		}
-	}
-
-	/* Checks if all the data has been read; if not, discard the data in excess */
-	if (totread != ntohl(header.plen))
-	{
-		if (sock_discard(sockctrl, ntohl(header.plen) - totread, errbuf, PCAP_ERRBUF_SIZE) == 1)
-			return -1;
-	}
-
-	/* Control connection has to be closed only in case the remote machine is in passive mode */
-	if (!active)
-	{
-		/* DO not send RPCAP_CLOSE, since we did not open a pcap_t; no need to free resources */
-		if (sock_close(sockctrl, errbuf, PCAP_ERRBUF_SIZE))
-			return -1;
-	}
-
-	/* To avoid inconsistencies in the number of sock_init() */
-	sock_cleanup();
-
-	return 0;
-
-error:
-	/*
-	 * In case there has been an error, I don't want to overwrite it with a new one
-	 * if the following call fails. I want to return always the original error.
-	 *
-	 * Take care: this connection can already be closed when we try to close it.
-	 * This happens because a previous error in the rpcapd, which requested to
-	 * closed the connection. In that case, we already recognized that into the
-	 * rpspck_isheaderok() and we already acknowledged the closing.
-	 * In that sense, this call is useless here (however it is needed in case
-	 * the client generates the error).
-	 *
-	 * Checks if all the data has been read; if not, discard the data in excess
-	 */
-	if (totread != ntohl(header.plen))
-	{
-		if (sock_discard(sockctrl, ntohl(header.plen) - totread, NULL, 0) == 1)
-			return -1;
-	}
-
-	/* Control connection has to be closed only in case the remote machine is in passive mode */
-	if (!active)
-		sock_close(sockctrl, NULL, 0);
-
-	/* To avoid inconsistencies in the number of sock_init() */
-	sock_cleanup();
-
-	return -1;
-}
-
-int pcap_createsrcstr(char *source, int type, const char *host, const char *port, const char *name, char *errbuf)
-{
-	switch (type)
-	{
-	case PCAP_SRC_FILE:
-	{
-		strlcpy(source, PCAP_SRC_FILE_STRING, PCAP_BUF_SIZE);
-		if ((name) && (*name))
-		{
-			strlcat(source, name, PCAP_BUF_SIZE);
-			return 0;
-		}
-		else
-		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The file name cannot be NULL.");
-			return -1;
-		}
-	}
-
 	case PCAP_SRC_IFREMOTE:
-	{
-		strlcpy(source, PCAP_SRC_IF_STRING, PCAP_BUF_SIZE);
-		if ((host) && (*host))
-		{
-			if ((strcspn(host, "aAbBcCdDeEfFgGhHjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ")) == strlen(host))
-			{
-				/* the host name does not contains alphabetic chars. So, it is a numeric address */
-				/* In this case we have to include it between square brackets */
-				strlcat(source, "[", PCAP_BUF_SIZE);
-				strlcat(source, host, PCAP_BUF_SIZE);
-				strlcat(source, "]", PCAP_BUF_SIZE);
-			}
-			else
-				strlcat(source, host, PCAP_BUF_SIZE);
+		return pcap_findalldevs_ex_remote(source, auth, alldevs, errbuf);
 
-			if ((port) && (*port))
-			{
-				strlcat(source, ":", PCAP_BUF_SIZE);
-				strlcat(source, port, PCAP_BUF_SIZE);
-			}
-
-			strlcat(source, "/", PCAP_BUF_SIZE);
-		}
-		else
-		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The host name cannot be NULL.");
-			return -1;
-		}
-
-		if ((name) && (*name))
-			strlcat(source, name, PCAP_BUF_SIZE);
-
-		return 0;
-	}
-
-	case PCAP_SRC_IFLOCAL:
-	{
-		strlcpy(source, PCAP_SRC_IF_STRING, PCAP_BUF_SIZE);
-
-		if ((name) && (*name))
-			strlcat(source, name, PCAP_BUF_SIZE);
-
-		return 0;
-	}
-
 	default:
-	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The interface type is not valid.");
+		strlcpy(errbuf, "Source type not supported", PCAP_ERRBUF_SIZE);
 		return -1;
 	}
-	}
 }
 
-int pcap_parsesrcstr(const char *source, int *type, char *host, char *port, char *name, char *errbuf)
-{
-	char *ptr;
-	int ntoken;
-	char tmpname[PCAP_BUF_SIZE];
-	char tmphost[PCAP_BUF_SIZE];
-	char tmpport[PCAP_BUF_SIZE];
-	int tmptype;
-
-	/* Initialization stuff */
-	tmpname[0] = 0;
-	tmphost[0] = 0;
-	tmpport[0] = 0;
-
-	if (host)
-		*host = 0;
-	if (port)
-		*port = 0;
-	if (name)
-		*name = 0;
-
-	/* Look for a 'rpcap://' identifier */
-	if ((ptr = strstr(source, PCAP_SRC_IF_STRING)) != NULL)
-	{
-		if (strlen(PCAP_SRC_IF_STRING) == strlen(source))
-		{
-			/* The source identifier contains only the 'rpcap://' string. */
-			/* So, this is a local capture. */
-			*type = PCAP_SRC_IFLOCAL;
-			return 0;
-		}
-
-		ptr += strlen(PCAP_SRC_IF_STRING);
-
-		if (strchr(ptr, '[')) /* This is probably a numeric address */
-		{
-			ntoken = sscanf(ptr, "[%[1234567890:.]]:%[^/]/%s", tmphost, tmpport, tmpname);
-
-			if (ntoken == 1)	/* probably the port is missing */
-				ntoken = sscanf(ptr, "[%[1234567890:.]]/%s", tmphost, tmpname);
-
-			tmptype = PCAP_SRC_IFREMOTE;
-		}
-		else
-		{
-			ntoken = sscanf(ptr, "%[^/:]:%[^/]/%s", tmphost, tmpport, tmpname);
-
-			if (ntoken == 1)
-			{
-				/*
-				 * This can be due to two reasons:
-				 * - we want a remote capture, but the network port is missing
-				 * - we want to do a local capture
-				 * To distinguish between the two, we look for the '/' char
-				 */
-				if (strchr(ptr, '/'))
-				{
-					/* We're on a remote capture */
-					sscanf(ptr, "%[^/]/%s", tmphost, tmpname);
-					tmptype = PCAP_SRC_IFREMOTE;
-				}
-				else
-				{
-					/* We're on a local capture */
-					if (*ptr)
-						strlcpy(tmpname, ptr, PCAP_BUF_SIZE);
-
-					/* Clean the host name, since it is a remote capture */
-					/* NOTE: the host name has been assigned in the previous "ntoken= sscanf(...)" line */
-					tmphost[0] = 0;
-
-					tmptype = PCAP_SRC_IFLOCAL;
-				}
-			}
-			else
-				tmptype = PCAP_SRC_IFREMOTE;
-		}
-
-		if (host)
-			strlcpy(host, tmphost, PCAP_BUF_SIZE);
-		if (port)
-			strlcpy(port, tmpport, PCAP_BUF_SIZE);
-		if (type)
-			*type = tmptype;
-
-		if (name)
-		{
-			/*
-			 * If the user wants the host name, but it cannot be located into the source string, return error
-			 * However, if the user is not interested in the interface name (e.g. if we're called by
-			 * pcap_findalldevs_ex(), which does not have interface name, do not return error
-			 */
-			if (tmpname[0])
-			{
-				strlcpy(name, tmpname, PCAP_BUF_SIZE);
-			}
-			else
-			{
-				if (errbuf)
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The interface name has not been specified in the source string.");
-
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-	/* Look for a 'file://' identifier */
-	if ((ptr = strstr(source, PCAP_SRC_FILE_STRING)) != NULL)
-	{
-		ptr += strlen(PCAP_SRC_FILE_STRING);
-		if (*ptr)
-		{
-			if (name)
-				strlcpy(name, ptr, PCAP_BUF_SIZE);
-
-			if (type)
-				*type = PCAP_SRC_FILE;
-
-			return 0;
-		}
-		else
-		{
-			if (errbuf)
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The file name has not been specified in the source string.");
-
-			return -1;
-		}
-
-	}
-
-	/* Backward compatibility; the user didn't use the 'rpcap://, file://'  specifiers */
-	if ((source) && (*source))
-	{
-		if (name)
-			strlcpy(name, source, PCAP_BUF_SIZE);
-
-		if (type)
-			*type = PCAP_SRC_IFLOCAL;
-
-		return 0;
-	}
-	else
-	{
-		if (errbuf)
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The interface name has not been specified in the source string.");
-
-		return -1;
-	}
-};
-
 pcap_t *pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf)
 {
-	char host[PCAP_BUF_SIZE], port[PCAP_BUF_SIZE], name[PCAP_BUF_SIZE];
+	char name[PCAP_BUF_SIZE];
 	int type;
 	pcap_t *fp;
-	int result;
+	int status;
 
 	if (strlen(source) > PCAP_BUF_SIZE)
 	{
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The source string is too long. Cannot handle it correctly.");
 		return NULL;
 	}
 
-	/* determine the type of the source (file, local, remote) */
-	if (pcap_parsesrcstr(source, &type, host, port, name, errbuf) == -1)
+	/*
+	 * Determine the type of the source (file, local, remote) and,
+	 * if it's file or local, the name of the file or capture device.
+	 */
+	if (pcap_parsesrcstr(source, &type, NULL, NULL, name, errbuf) == -1)
 		return NULL;
 
-
 	switch (type)
 	{
 	case PCAP_SRC_FILE:
-		fp = pcap_open_offline(name, errbuf);
+		return pcap_open_offline(name, errbuf);
+
+	case PCAP_SRC_IFLOCAL:
+		fp = pcap_create(name, errbuf);
 		break;
 
 	case PCAP_SRC_IFREMOTE:
-		fp = pcap_create(source, errbuf);
-		if (fp == NULL)
-		{
-			return NULL;
-		}
-
 		/*
-		 * Although we already have host, port and iface, we prefer TO PASS only 'pars' to the
-		 * pcap_open_remote() so that it has to call the pcap_parsesrcstr() again.
+		 * Although we already have host, port and iface, we prefer
+		 * to pass only 'source' to pcap_open_rpcap(), so that it
+		 * has to call pcap_parsesrcstr() again.
 		 * This is less optimized, but much clearer.
 		 */
+		return pcap_open_rpcap(source, snaplen, flags, read_timeout, auth, errbuf);
 
-		result = pcap_opensource_remote(fp, auth);
-
-		if (result != 0)
-		{
-			pcap_close(fp);
-			return NULL;
-		}
-
-		struct pcap_md *md;				/* structure used when doing a remote live capture */
-		md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
-		fp->snapshot = snaplen;
-		fp->opt.timeout = read_timeout;
-		md->rmt_flags = flags;
-		break;
-
-	case PCAP_SRC_IFLOCAL:
-
-		fp = pcap_open_live(name, snaplen, (flags & PCAP_OPENFLAG_PROMISCUOUS), read_timeout, errbuf);
-
-#ifdef WIN32
-		/*
-		 * these flags are supported on Windows only
-		 */
-		if (fp != NULL && fp->adapter != NULL)
-		{
-			/* disable loopback capture if requested */
-			if (flags & PCAP_OPENFLAG_NOCAPTURE_LOCAL)
-			{
-				if (!PacketSetLoopbackBehavior(fp->adapter, NPF_DISABLE_LOOPBACK))
-				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Unable to disable the capture of loopback packets.");
-					pcap_close(fp);
-					return NULL;
-				}
-			}
-
-			/* set mintocopy to zero if requested */
-			if (flags & PCAP_OPENFLAG_MAX_RESPONSIVENESS)
-			{
-				if (!PacketSetMinToCopy(fp->adapter, 0))
-				{
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Unable to set max responsiveness.");
-					pcap_close(fp);
-					return NULL;
-				}
-			}
-		}
-#endif /* WIN32 */
-
-		break;
-
 	default:
 		strlcpy(errbuf, "Source type not supported", PCAP_ERRBUF_SIZE);
 		return NULL;
 	}
-	return fp;
-}
 
-struct pcap_samp *pcap_setsampling(pcap_t *p)
-{
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
-
-	md = (struct pcap_md *) ((u_char*)p->priv + sizeof(struct pcap_win));
-	return &(md->rmt_samp);
-}
-
-SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf)
-{
-	/* socket-related variables */
-	struct addrinfo hints;			/* temporary struct to keep settings needed to open the new socket */
-	struct addrinfo *addrinfo;		/* keeps the addrinfo chain; required to open a new socket */
-	struct sockaddr_storage from;	/* generic sockaddr_storage variable */
-	socklen_t fromlen;				/* keeps the length of the sockaddr_storage variable */
-	SOCKET sockctrl;				/* keeps the main socket identifier */
-	struct activehosts *temp, *prev;	/* temp var needed to scan he host list chain */
-
-	*connectinghost = 0;		/* just in case */
-
-	/* Prepare to open a new server socket */
-	memset(&hints, 0, sizeof(struct addrinfo));
-	/* WARNING Currently it supports only ONE socket family among ipv4 and IPv6  */
-	hints.ai_family = AF_INET;		/* PF_UNSPEC to have both IPv4 and IPv6 server */
-	hints.ai_flags = AI_PASSIVE;	/* Ready to a bind() socket */
-	hints.ai_socktype = SOCK_STREAM;
-
-	/* Warning: this call can be the first one called by the user. */
-	/* For this reason, we have to initialize the WinSock support. */
-	if (sock_init(errbuf, PCAP_ERRBUF_SIZE) == -1)
-		return -1;
-
-	/* Do the work */
-	if ((port == NULL) || (port[0] == 0))
+	if (fp == NULL)
+		return (NULL);
+	status = pcap_set_snaplen(fp, snaplen);
+	if (status < 0)
+		goto fail;
+	if (flags & PCAP_OPENFLAG_PROMISCUOUS)
 	{
-		if (sock_initaddress(address, RPCAP_DEFAULT_NETPORT_ACTIVE, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-		{
-			SOCK_ASSERT(errbuf, 1);
-			return -2;
-		}
+		status = pcap_set_promisc(fp, 1);
+		if (status < 0)
+			goto fail;
 	}
-	else
+	if (flags & PCAP_OPENFLAG_MAX_RESPONSIVENESS)
 	{
-		if (sock_initaddress(address, port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-		{
-			SOCK_ASSERT(errbuf, 1);
-			return -2;
-		}
+		status = pcap_set_immediate_mode(fp, 1);
+		if (status < 0)
+			goto fail;
 	}
+#ifdef _WIN32
+	/*
+	 * This flag is supported on Windows only.
+	 * XXX - is there a way to support it with
+	 * the capture mechanisms on UN*X?  It's not
+	 * exactly a "set direction" operation; I
+	 * think it means "do not capture packets
+	 * injected with pcap_sendpacket() or
+	 * pcap_inject()".
+	 */
+	/* disable loopback capture if requested */
+	if (flags & PCAP_OPENFLAG_NOCAPTURE_LOCAL)
+		fp->opt.nocapture_local = 1;
+#endif /* _WIN32 */
+	status = pcap_set_timeout(fp, read_timeout);
+	if (status < 0)
+		goto fail;
+	status = pcap_activate(fp);
+	if (status < 0)
+		goto fail;
+	return fp;
 
-
-	if ((sockmain = sock_open(addrinfo, SOCKOPEN_SERVER, 1, errbuf, PCAP_ERRBUF_SIZE)) == -1)
-	{
-		SOCK_ASSERT(errbuf, 1);
-		return -2;
-	}
-
-	/* Connection creation */
-	fromlen = sizeof(struct sockaddr_storage);
-
-	sockctrl = accept(sockmain, (struct sockaddr *) &from, &fromlen);
-
-	/* We're not using sock_close, since we do not want to send a shutdown */
-	/* (which is not allowed on a non-connected socket) */
-	closesocket(sockmain);
-	sockmain = 0;
-
-	if (sockctrl == -1)
-	{
-		sock_geterror("accept(): ", errbuf, PCAP_ERRBUF_SIZE);
-		return -2;
-	}
-
-	/* Get the numeric for of the name of the connecting host */
-	if (getnameinfo((struct sockaddr *) &from, fromlen, connectinghost, RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST))
-	{
-		sock_geterror("getnameinfo(): ", errbuf, PCAP_ERRBUF_SIZE);
-		rpcap_senderror(sockctrl, errbuf, PCAP_ERR_REMOTEACCEPT, NULL);
-		sock_close(sockctrl, NULL, 0);
-		return -1;
-	}
-
-	/* checks if the connecting host is among the ones allowed */
-	if (sock_check_hostlist((char *)hostlist, RPCAP_HOSTLIST_SEP, &from, errbuf, PCAP_ERRBUF_SIZE) < 0)
-	{
-		rpcap_senderror(sockctrl, errbuf, PCAP_ERR_REMOTEACCEPT, NULL);
-		sock_close(sockctrl, NULL, 0);
-		return -1;
-	}
-
-	/* Send authentication to the remote machine */
-	if (rpcap_sendauth(sockctrl, auth, errbuf) == -1)
-	{
-		rpcap_senderror(sockctrl, errbuf, PCAP_ERR_REMOTEACCEPT, NULL);
-		sock_close(sockctrl, NULL, 0);
-		return -3;
-	}
-
-	/* Checks that this host does not already have a cntrl connection in place */
-
-	/* Initialize pointers */
-	temp = activeHosts;
-	prev = NULL;
-
-	while (temp)
-	{
-		/* This host already has an active connection in place, so I don't have to update the host list */
-		if (sock_cmpaddr(&temp->host, &from) == 0)
-			return sockctrl;
-
-		prev = temp;
-		temp = temp->next;
-	}
-
-	/* The host does not exist in the list; so I have to update the list */
-	if (prev)
-	{
-		prev->next = (struct activehosts *) malloc(sizeof(struct activehosts));
-		temp = prev->next;
-	}
+fail:
+	if (status == PCAP_ERROR)
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
+		    name, fp->errbuf);
+	else if (status == PCAP_ERROR_NO_SUCH_DEVICE ||
+	    status == PCAP_ERROR_PERM_DENIED ||
+	    status == PCAP_ERROR_PROMISC_PERM_DENIED)
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s (%s)",
+		    name, pcap_statustostr(status), fp->errbuf);
 	else
-	{
-		activeHosts = (struct activehosts *) malloc(sizeof(struct activehosts));
-		temp = activeHosts;
-	}
-
-	if (temp == NULL)
-	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
-		rpcap_senderror(sockctrl, errbuf, PCAP_ERR_REMOTEACCEPT, NULL);
-		sock_close(sockctrl, NULL, 0);
-		return -1;
-	}
-
-	memcpy(&temp->host, &from, fromlen);
-	temp->sockctrl = sockctrl;
-	temp->next = NULL;
-
-	return sockctrl;
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
+		    name, pcap_statustostr(status));
+	pcap_close(fp);
+	return NULL;
 }
 
-int pcap_remoteact_close(const char *host, char *errbuf)
+struct pcap_samp *pcap_setsampling(pcap_t *p)
 {
-	struct activehosts *temp, *prev;	/* temp var needed to scan the host list chain */
-	struct addrinfo hints, *addrinfo, *ai_next;	/* temp var needed to translate between hostname to its address */
-	int retval;
-
-	temp = activeHosts;
-	prev = NULL;
-
-	/* retrieve the network address corresponding to 'host' */
-	addrinfo = NULL;
-	memset(&hints, 0, sizeof(struct addrinfo));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-
-	retval = getaddrinfo(host, "0", &hints, &addrinfo);
-	if (retval != 0)
-	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "getaddrinfo() %s", gai_strerror(retval));
-		return -1;
-	}
-
-	while (temp)
-	{
-		ai_next = addrinfo;
-		while (ai_next)
-		{
-			if (sock_cmpaddr(&temp->host, (struct sockaddr_storage *) ai_next->ai_addr) == 0)
-			{
-				struct rpcap_header header;
-
-				/* Close this connection */
-				rpcap_createhdr(&header, RPCAP_MSG_CLOSE, 0, 0);
-
-				/* I don't check for errors, since I'm going to close everything */
-				sock_send(temp->sockctrl, (char *)&header, sizeof(struct rpcap_header), errbuf, PCAP_ERRBUF_SIZE);
-
-				if (sock_close(temp->sockctrl, errbuf, PCAP_ERRBUF_SIZE))
-				{
-					/* To avoid inconsistencies in the number of sock_init() */
-					sock_cleanup();
-
-					return -1;
-				}
-
-				if (prev)
-					prev->next = temp->next;
-				else
-					activeHosts = temp->next;
-
-				freeaddrinfo(addrinfo);
-
-				free(temp);
-
-				/* To avoid inconsistencies in the number of sock_init() */
-				sock_cleanup();
-
-				return 0;
-			}
-
-			ai_next = ai_next->ai_next;
-		}
-		prev = temp;
-		temp = temp->next;
-	}
-
-	if (addrinfo)
-		freeaddrinfo(addrinfo);
-
-	/* To avoid inconsistencies in the number of sock_init() */
-	sock_cleanup();
-
-	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The host you want to close the active connection is not known");
-	return -1;
-}
-
-void pcap_remoteact_cleanup(void)
-{
-	/* Very dirty, but it works */
-	if (sockmain)
-	{
-		closesocket(sockmain);
-
-		/* To avoid inconsistencies in the number of sock_init() */
-		sock_cleanup();
-	}
-
-}
-
-int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf)
-{
-	struct activehosts *temp;	/* temp var needed to scan the host list chain */
-	size_t len;
-	char hoststr[RPCAP_HOSTLIST_SIZE + 1];
-
-	temp = activeHosts;
-
-	len = 0;
-	*hostlist = 0;
-
-	while (temp)
-	{
-		/*int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen) */
-
-		/* Get the numeric form of the name of the connecting host */
-		if (sock_getascii_addrport((struct sockaddr_storage *) &temp->host, hoststr,
-			RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST, errbuf, PCAP_ERRBUF_SIZE) != -1)
-			/*	if (getnameinfo( (struct sockaddr *) &temp->host, sizeof (struct sockaddr_storage), hoststr, */
-			/*		RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST) ) */
-		{
-			/*	sock_geterror("getnameinfo(): ", errbuf, PCAP_ERRBUF_SIZE); */
-			return -1;
-		}
-
-		len = len + strlen(hoststr) + 1 /* the separator */;
-
-		if ((size < 0) || (len >= (size_t)size))
-		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The string you provided is not able to keep "
-				"the hostnames for all the active connections");
-			return -1;
-		}
-
-		strlcat(hostlist, hoststr, PCAP_ERRBUF_SIZE);
-		hostlist[len - 1] = sep;
-		hostlist[len] = 0;
-
-		temp = temp->next;
-	}
-
-	return 0;
+	return &p->rmt_samp;
 }
Index: vendor/libpcap/dist/pcap-nit.c
===================================================================
--- vendor/libpcap/dist/pcap-nit.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-nit.c	(revision 333789)
@@ -1,384 +1,417 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/nit.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * The chunk size for NIT.  This is the amount of buffering
  * done for read calls.
  */
 #define CHUNKSIZE (2*1024)
 
 /*
  * The total buffer space used by NIT.
  */
 #define BUFSPACE (4*CHUNKSIZE)
 
 /* Forwards */
 static int nit_setflags(int, int, int, char *);
 
 /*
  * Private data for capturing on NIT devices.
  */
 struct pcap_nit {
 	struct pcap_stat stat;
 };
 
 static int
 pcap_stats_nit(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_nit *pn = p->priv;
 
 	/*
 	 * "ps_recv" counts packets handed to the filter, not packets
 	 * that passed the filter.  As filtering is done in userland,
 	 * this does not include packets dropped because we ran out
 	 * of buffer space.
 	 *
 	 * "ps_drop" presumably counts packets dropped by the socket
 	 * because of flow control requirements or resource exhaustion;
 	 * it doesn't count packets dropped by the interface driver.
 	 * As filtering is done in userland, it counts packets regardless
 	 * of whether they would've passed the filter.
 	 *
 	 * These statistics don't include packets not yet read from the
 	 * kernel by libpcap or packets not yet read from libpcap by the
 	 * application.
 	 */
 	*ps = pn->stat;
 	return (0);
 }
 
 static int
 pcap_read_nit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_nit *pn = p->priv;
 	register int cc, n;
 	register u_char *bp, *cp, *ep;
 	register struct nit_hdr *nh;
 	register int caplen;
 
 	cc = p->cc;
 	if (cc == 0) {
 		cc = read(p->fd, (char *)p->buffer, p->bufsize);
 		if (cc < 0) {
 			if (errno == EWOULDBLOCK)
 				return (0);
-			pcap_snprintf(p->errbuf, sizeof(p->errbuf), "pcap_read: %s",
-				pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+			    errno, "pcap_read");
 			return (-1);
 		}
 		bp = (u_char *)p->buffer;
 	} else
 		bp = p->bp;
 
 	/*
 	 * Loop through each packet.  The increment expression
 	 * rounds up to the next int boundary past the end of
 	 * the previous packet.
 	 */
 	n = 0;
 	ep = bp + cc;
 	while (bp < ep) {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (p->break_loop) {
 			if (n == 0) {
 				p->break_loop = 0;
 				return (-2);
 			} else {
 				p->cc = ep - bp;
 				p->bp = bp;
 				return (n);
 			}
 		}
 
 		nh = (struct nit_hdr *)bp;
 		cp = bp + sizeof(*nh);
 
 		switch (nh->nh_state) {
 
 		case NIT_CATCH:
 			break;
 
 		case NIT_NOMBUF:
 		case NIT_NOCLUSTER:
 		case NIT_NOSPACE:
 			pn->stat.ps_drop = nh->nh_dropped;
 			continue;
 
 		case NIT_SEQNO:
 			continue;
 
 		default:
 			pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 			    "bad nit state %d", nh->nh_state);
 			return (-1);
 		}
 		++pn->stat.ps_recv;
 		bp += ((sizeof(struct nit_hdr) + nh->nh_datalen +
 		    sizeof(int) - 1) & ~(sizeof(int) - 1));
 
 		caplen = nh->nh_wirelen;
 		if (caplen > p->snapshot)
 			caplen = p->snapshot;
 		if (bpf_filter(p->fcode.bf_insns, cp, nh->nh_wirelen, caplen)) {
 			struct pcap_pkthdr h;
 			h.ts = nh->nh_timestamp;
 			h.len = nh->nh_wirelen;
 			h.caplen = caplen;
 			(*callback)(user, &h, cp);
 			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
 				p->cc = ep - bp;
 				p->bp = bp;
 				return (n);
 			}
 		}
 	}
 	p->cc = 0;
 	return (n);
 }
 
 static int
 pcap_inject_nit(pcap_t *p, const void *buf, size_t size)
 {
 	struct sockaddr sa;
 	int ret;
 
 	memset(&sa, 0, sizeof(sa));
 	strncpy(sa.sa_data, device, sizeof(sa.sa_data));
 	ret = sendto(p->fd, buf, size, 0, &sa, sizeof(sa));
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	return (ret);
 }
 
 static int
 nit_setflags(pcap_t *p)
 {
 	struct nit_ioc nioc;
 
 	memset(&nioc, 0, sizeof(nioc));
 	nioc.nioc_typetomatch = NT_ALLTYPES;
 	nioc.nioc_snaplen = p->snapshot;
 	nioc.nioc_bufalign = sizeof(int);
 	nioc.nioc_bufoffset = 0;
 
 	if (p->opt.buffer_size != 0)
 		nioc.nioc_bufspace = p->opt.buffer_size;
 	else {
 		/* Default buffer size */
 		nioc.nioc_bufspace = BUFSPACE;
 	}
 
 	if (p->opt.immediate) {
 		/*
 		 * XXX - will this cause packets to be delivered immediately?
 		 * XXX - given that this is for SunOS prior to 4.0, do
 		 * we care?
 		 */
 		nioc.nioc_chunksize = 0;
 	} else
 		nioc.nioc_chunksize = CHUNKSIZE;
 	if (p->opt.timeout != 0) {
 		nioc.nioc_flags |= NF_TIMEOUT;
 		nioc.nioc_timeout.tv_sec = p->opt.timeout / 1000;
 		nioc.nioc_timeout.tv_usec = (p->opt.timeout * 1000) % 1000000;
 	}
 	if (p->opt.promisc)
 		nioc.nioc_flags |= NF_PROMISC;
 
 	if (ioctl(p->fd, SIOCSNIT, &nioc) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCSNIT: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCSNIT");
 		return (-1);
 	}
 	return (0);
 }
 
 static int
 pcap_activate_nit(pcap_t *p)
 {
 	int fd;
 	struct sockaddr_nit snit;
 
 	if (p->opt.rfmon) {
 		/*
 		 * No monitor mode on SunOS 3.x or earlier (no
 		 * Wi-Fi *devices* for the hardware that supported
 		 * them!).
 		 */
 		return (PCAP_ERROR_RFMON_NOTSUP);
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 	if (p->snapshot < 96)
 		/*
 		 * NIT requires a snapshot length of at least 96.
 		 */
 		p->snapshot = 96;
 
 	memset(p, 0, sizeof(*p));
 	p->fd = fd = socket(AF_NIT, SOCK_RAW, NITPROTO_RAW);
 	if (fd < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "socket: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
 		goto bad;
 	}
 	snit.snit_family = AF_NIT;
 	(void)strncpy(snit.snit_ifname, p->opt.device, NITIFSIZ);
 
 	if (bind(fd, (struct sockaddr *)&snit, sizeof(snit))) {
 		/*
 		 * XXX - there's probably a particular bind error that
 		 * means "there's no such device" and a particular bind
 		 * error that means "that device doesn't support NIT";
 		 * they might be the same error, if they both end up
 		 * meaning "NIT doesn't know about that device".
 		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "bind: %s: %s", snit.snit_ifname, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "bind: %s", snit.snit_ifname);
 		goto bad;
 	}
 	if (nit_setflags(p) < 0)
 		goto bad;
 
 	/*
 	 * NIT supports only ethernets.
 	 */
 	p->linktype = DLT_EN10MB;
 
 	p->bufsize = BUFSPACE;
 	p->buffer = malloc(p->bufsize);
 	if (p->buffer == NULL) {
-		strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		goto bad;
 	}
 
 	/*
 	 * "p->fd" is a socket, so "select()" should work on it.
 	 */
 	p->selectable_fd = p->fd;
 
 	/*
 	 * This is (presumably) a real Ethernet capture; give it a
 	 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 	 * that an application can let you choose it, in case you're
 	 * capturing DOCSIS traffic that a Cisco Cable Modem
 	 * Termination System is putting out onto an Ethernet (it
 	 * doesn't put an Ethernet header onto the wire, it puts raw
 	 * DOCSIS frames out on the wire inside the low-level
 	 * Ethernet framing).
 	 */
 	p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 	/*
 	 * If that fails, just leave the list empty.
 	 */
 	if (p->dlt_list != NULL) {
 		p->dlt_list[0] = DLT_EN10MB;
 		p->dlt_list[1] = DLT_DOCSIS;
 		p->dlt_count = 2;
 	}
 
 	p->read_op = pcap_read_nit;
 	p->inject_op = pcap_inject_nit;
 	p->setfilter_op = install_bpf_program;	/* no kernel filtering */
 	p->setdirection_op = NULL;	/* Not implemented. */
 	p->set_datalink_op = NULL;	/* can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_nit;
 
 	return (0);
  bad:
 	pcap_cleanup_live_common(p);
 	return (PCAP_ERROR);
 }
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_nit));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_nit;
 	return (p);
 }
 
 /*
  * XXX - there's probably a particular bind error that means "that device
  * doesn't support NIT"; if so, we should try a bind and use that.
  */
 static int
 can_be_bound(const char *name _U_)
 {
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do.
+	 * XXX - is there a way to find out whether an adapter has
+	 * something plugged into it?
+	 */
+	return (0);
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	return (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound));
+	return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+	    get_if_flags));
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-npf.c
===================================================================
--- vendor/libpcap/dist/pcap-npf.c	(nonexistent)
+++ vendor/libpcap/dist/pcap-npf.c	(revision 333789)
@@ -0,0 +1,2098 @@
+/*
+ * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2010 CACE Technologies, Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
+#include <Packet32.h>
+#include <pcap-int.h>
+#include <pcap/dlt.h>
+
+/* Old-school MinGW have these headers in a different place.
+ */
+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+  #include <ddk/ntddndis.h>
+  #include <ddk/ndis.h>
+#else
+  #include <ntddndis.h>  /* MSVC/TDM-MinGW/MinGW64 */
+#endif
+
+#ifdef HAVE_DAG_API
+  #include <dagnew.h>
+  #include <dagapi.h>
+#endif /* HAVE_DAG_API */
+
+static int pcap_setfilter_npf(pcap_t *, struct bpf_program *);
+static int pcap_setfilter_win32_dag(pcap_t *, struct bpf_program *);
+static int pcap_getnonblock_npf(pcap_t *);
+static int pcap_setnonblock_npf(pcap_t *, int);
+
+/*dimension of the buffer in the pcap_t structure*/
+#define	WIN32_DEFAULT_USER_BUFFER_SIZE 256000
+
+/*dimension of the buffer in the kernel driver NPF */
+#define	WIN32_DEFAULT_KERNEL_BUFFER_SIZE 1000000
+
+/* Equivalent to ntohs(), but a lot faster under Windows */
+#define SWAPS(_X) ((_X & 0xff) << 8) | (_X >> 8)
+
+/*
+ * Private data for capturing on WinPcap devices.
+ */
+struct pcap_win {
+	ADAPTER *adapter;		/* the packet32 ADAPTER for the device */
+	int nonblock;
+	int rfmon_selfstart;		/* a flag tells whether the monitor mode is set by itself */
+	int filtering_in_kernel;	/* using kernel filter */
+
+#ifdef HAVE_DAG_API
+	int	dag_fcs_bits;		/* Number of checksum bits from link layer */
+#endif
+
+#ifdef ENABLE_REMOTE
+	int samp_npkt;			/* parameter needed for sampling, with '1 out of N' method has been requested */
+	struct timeval samp_time;	/* parameter needed for sampling, with '1 every N ms' method has been requested */
+#endif
+};
+
+/*
+ * Define stub versions of the monitor-mode support routines if this
+ * isn't Npcap. HAVE_NPCAP_PACKET_API is defined by Npcap but not
+ * WinPcap.
+ */
+#ifndef HAVE_NPCAP_PACKET_API
+static int
+PacketIsMonitorModeSupported(PCHAR AdapterName _U_)
+{
+	/*
+	 * We don't support monitor mode.
+	 */
+	return (0);
+}
+
+static int
+PacketSetMonitorMode(PCHAR AdapterName _U_, int mode _U_)
+{
+	/*
+	 * This should never be called, as PacketIsMonitorModeSupported()
+	 * will return 0, meaning "we don't support monitor mode, so
+	 * don't try to turn it on or off".
+	 */
+	return (0);
+}
+
+static int
+PacketGetMonitorMode(PCHAR AdapterName _U_)
+{
+	/*
+	 * This should fail, so that pcap_activate_npf() returns
+	 * PCAP_ERROR_RFMON_NOTSUP if our caller requested monitor
+	 * mode.
+	 */
+	return (-1);
+}
+#endif
+
+/*
+ * Sigh.  PacketRequest() will have made a DeviceIoControl()
+ * call to the NPF driver to perform the OID request, with a
+ * BIOCQUERYOID ioctl.  The kernel code should get back one
+ * of NDIS_STATUS_INVALID_OID, NDIS_STATUS_NOT_SUPPORTED,
+ * or NDIS_STATUS_NOT_RECOGNIZED if the OID request isn't
+ * supported by the OS or the driver, but that doesn't seem
+ * to make it to the caller of PacketRequest() in a
+ * reiable fashion.
+ */
+#define NDIS_STATUS_INVALID_OID		0xc0010017
+#define NDIS_STATUS_NOT_SUPPORTED	0xc00000bb	/* STATUS_NOT_SUPPORTED */
+#define NDIS_STATUS_NOT_RECOGNIZED	0x00010001
+
+static int
+oid_get_request(ADAPTER *adapter, bpf_u_int32 oid, void *data, size_t *lenp,
+    char *errbuf)
+{
+	PACKET_OID_DATA *oid_data_arg;
+
+	/*
+	 * Allocate a PACKET_OID_DATA structure to hand to PacketRequest().
+	 * It should be big enough to hold "*lenp" bytes of data; it
+	 * will actually be slightly larger, as PACKET_OID_DATA has a
+	 * 1-byte data array at the end, standing in for the variable-length
+	 * data that's actually there.
+	 */
+	oid_data_arg = malloc(sizeof (PACKET_OID_DATA) + *lenp);
+	if (oid_data_arg == NULL) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "Couldn't allocate argument buffer for PacketRequest");
+		return (PCAP_ERROR);
+	}
+
+	/*
+	 * No need to copy the data - we're doing a fetch.
+	 */
+	oid_data_arg->Oid = oid;
+	oid_data_arg->Length = (ULONG)(*lenp);	/* XXX - check for ridiculously large value? */
+	if (!PacketRequest(adapter, FALSE, oid_data_arg)) {
+		char errmsgbuf[PCAP_ERRBUF_SIZE+1];
+
+		pcap_win32_err_to_str(GetLastError(), errmsgbuf);
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "Error calling PacketRequest: %s", errmsgbuf);
+		free(oid_data_arg);
+		return (-1);
+	}
+
+	/*
+	 * Get the length actually supplied.
+	 */
+	*lenp = oid_data_arg->Length;
+
+	/*
+	 * Copy back the data we fetched.
+	 */
+	memcpy(data, oid_data_arg->Data, *lenp);
+	free(oid_data_arg);
+	return (0);
+}
+
+static int
+pcap_stats_npf(pcap_t *p, struct pcap_stat *ps)
+{
+	struct pcap_win *pw = p->priv;
+	struct bpf_stat bstats;
+	char errbuf[PCAP_ERRBUF_SIZE+1];
+
+	/*
+	 * Try to get statistics.
+	 *
+	 * (Please note - "struct pcap_stat" is *not* the same as
+	 * WinPcap's "struct bpf_stat". It might currently have the
+	 * same layout, but let's not cheat.
+	 *
+	 * Note also that we don't fill in ps_capt, as we might have
+	 * been called by code compiled against an earlier version of
+	 * WinPcap that didn't have ps_capt, in which case filling it
+	 * in would stomp on whatever comes after the structure passed
+	 * to us.
+	 */
+	if (!PacketGetStats(pw->adapter, &bstats)) {
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "PacketGetStats error: %s", errbuf);
+		return (-1);
+	}
+	ps->ps_recv = bstats.bs_recv;
+	ps->ps_drop = bstats.bs_drop;
+
+	/*
+	 * XXX - PacketGetStats() doesn't fill this in, so we just
+	 * return 0.
+	 */
+#if 0
+	ps->ps_ifdrop = bstats.ps_ifdrop;
+#else
+	ps->ps_ifdrop = 0;
+#endif
+
+	return (0);
+}
+
+/*
+ * Win32-only routine for getting statistics.
+ *
+ * This way is definitely safer than passing the pcap_stat * from the userland.
+ * In fact, there could happen than the user allocates a variable which is not
+ * big enough for the new structure, and the library will write in a zone
+ * which is not allocated to this variable.
+ *
+ * In this way, we're pretty sure we are writing on memory allocated to this
+ * variable.
+ *
+ * XXX - but this is the wrong way to handle statistics.  Instead, we should
+ * have an API that returns data in a form like the Options section of a
+ * pcapng Interface Statistics Block:
+ *
+ *    http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=https://raw.githubusercontent.com/pcapng/pcapng/master/draft-tuexen-opsawg-pcapng.xml&modeAsFormat=html/ascii&type=ascii#rfc.section.4.6
+ *
+ * which would let us add new statistics straightforwardly and indicate which
+ * statistics we are and are *not* providing, rather than having to provide
+ * possibly-bogus values for statistics we can't provide.
+ */
+struct pcap_stat *
+pcap_stats_ex_npf(pcap_t *p, int *pcap_stat_size)
+{
+	struct pcap_win *pw = p->priv;
+	struct bpf_stat bstats;
+	char errbuf[PCAP_ERRBUF_SIZE+1];
+
+	*pcap_stat_size = sizeof (p->stat);
+
+	/*
+	 * Try to get statistics.
+	 *
+	 * (Please note - "struct pcap_stat" is *not* the same as
+	 * WinPcap's "struct bpf_stat". It might currently have the
+	 * same layout, but let's not cheat.)
+	 */
+	if (!PacketGetStatsEx(pw->adapter, &bstats)) {
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "PacketGetStatsEx error: %s", errbuf);
+		return (NULL);
+	}
+	p->stat.ps_recv = bstats.bs_recv;
+	p->stat.ps_drop = bstats.bs_drop;
+	p->stat.ps_ifdrop = bstats.ps_ifdrop;
+#ifdef ENABLE_REMOTE
+	p->stat.ps_capt = bstats.bs_capt;
+#endif
+	return (&p->stat);
+}
+
+/* Set the dimension of the kernel-level capture buffer */
+static int
+pcap_setbuff_npf(pcap_t *p, int dim)
+{
+	struct pcap_win *pw = p->priv;
+
+	if(PacketSetBuff(pw->adapter,dim)==FALSE)
+	{
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: not enough memory to allocate the kernel buffer");
+		return (-1);
+	}
+	return (0);
+}
+
+/* Set the driver working mode */
+static int
+pcap_setmode_npf(pcap_t *p, int mode)
+{
+	struct pcap_win *pw = p->priv;
+
+	if(PacketSetMode(pw->adapter,mode)==FALSE)
+	{
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: working mode not recognized");
+		return (-1);
+	}
+
+	return (0);
+}
+
+/*set the minimum amount of data that will release a read call*/
+static int
+pcap_setmintocopy_npf(pcap_t *p, int size)
+{
+	struct pcap_win *pw = p->priv;
+
+	if(PacketSetMinToCopy(pw->adapter, size)==FALSE)
+	{
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: unable to set the requested mintocopy size");
+		return (-1);
+	}
+	return (0);
+}
+
+static HANDLE
+pcap_getevent_npf(pcap_t *p)
+{
+	struct pcap_win *pw = p->priv;
+
+	return (PacketGetReadEvent(pw->adapter));
+}
+
+static int
+pcap_oid_get_request_npf(pcap_t *p, bpf_u_int32 oid, void *data, size_t *lenp)
+{
+	struct pcap_win *pw = p->priv;
+
+	return (oid_get_request(pw->adapter, oid, data, lenp, p->errbuf));
+}
+
+static int
+pcap_oid_set_request_npf(pcap_t *p, bpf_u_int32 oid, const void *data,
+    size_t *lenp)
+{
+	struct pcap_win *pw = p->priv;
+	PACKET_OID_DATA *oid_data_arg;
+	char errbuf[PCAP_ERRBUF_SIZE+1];
+
+	/*
+	 * Allocate a PACKET_OID_DATA structure to hand to PacketRequest().
+	 * It should be big enough to hold "*lenp" bytes of data; it
+	 * will actually be slightly larger, as PACKET_OID_DATA has a
+	 * 1-byte data array at the end, standing in for the variable-length
+	 * data that's actually there.
+	 */
+	oid_data_arg = malloc(sizeof (PACKET_OID_DATA) + *lenp);
+	if (oid_data_arg == NULL) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Couldn't allocate argument buffer for PacketRequest");
+		return (PCAP_ERROR);
+	}
+
+	oid_data_arg->Oid = oid;
+	oid_data_arg->Length = (ULONG)(*lenp);	/* XXX - check for ridiculously large value? */
+	memcpy(oid_data_arg->Data, data, *lenp);
+	if (!PacketRequest(pw->adapter, TRUE, oid_data_arg)) {
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error calling PacketRequest: %s", errbuf);
+		free(oid_data_arg);
+		return (PCAP_ERROR);
+	}
+
+	/*
+	 * Get the length actually copied.
+	 */
+	*lenp = oid_data_arg->Length;
+
+	/*
+	 * No need to copy the data - we're doing a set.
+	 */
+	free(oid_data_arg);
+	return (0);
+}
+
+static u_int
+pcap_sendqueue_transmit_npf(pcap_t *p, pcap_send_queue *queue, int sync)
+{
+	struct pcap_win *pw = p->priv;
+	u_int res;
+	char errbuf[PCAP_ERRBUF_SIZE+1];
+
+	if (pw->adapter==NULL) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Cannot transmit a queue to an offline capture or to a TurboCap port");
+		return (0);
+	}
+
+	res = PacketSendPackets(pw->adapter,
+		queue->buffer,
+		queue->len,
+		(BOOLEAN)sync);
+
+	if(res != queue->len){
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error opening adapter: %s", errbuf);
+	}
+
+	return (res);
+}
+
+static int
+pcap_setuserbuffer_npf(pcap_t *p, int size)
+{
+	unsigned char *new_buff;
+
+	if (size<=0) {
+		/* Bogus parameter */
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error: invalid size %d",size);
+		return (-1);
+	}
+
+	/* Allocate the buffer */
+	new_buff=(unsigned char*)malloc(sizeof(char)*size);
+
+	if (!new_buff) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error: not enough memory");
+		return (-1);
+	}
+
+	free(p->buffer);
+
+	p->buffer=new_buff;
+	p->bufsize=size;
+
+	return (0);
+}
+
+static int
+pcap_live_dump_npf(pcap_t *p, char *filename, int maxsize, int maxpacks)
+{
+	struct pcap_win *pw = p->priv;
+	BOOLEAN res;
+
+	/* Set the packet driver in dump mode */
+	res = PacketSetMode(pw->adapter, PACKET_MODE_DUMP);
+	if(res == FALSE){
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error setting dump mode");
+		return (-1);
+	}
+
+	/* Set the name of the dump file */
+	res = PacketSetDumpName(pw->adapter, filename, (int)strlen(filename));
+	if(res == FALSE){
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error setting kernel dump file name");
+		return (-1);
+	}
+
+	/* Set the limits of the dump file */
+	res = PacketSetDumpLimits(pw->adapter, maxsize, maxpacks);
+	if(res == FALSE) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    		"Error setting dump limit");
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+pcap_live_dump_ended_npf(pcap_t *p, int sync)
+{
+	struct pcap_win *pw = p->priv;
+
+	return (PacketIsDumpEnded(pw->adapter, (BOOLEAN)sync));
+}
+
+static PAirpcapHandle
+pcap_get_airpcap_handle_npf(pcap_t *p)
+{
+#ifdef HAVE_AIRPCAP_API
+	struct pcap_win *pw = p->priv;
+
+	return (PacketGetAirPcapHandle(pw->adapter));
+#else
+	return (NULL);
+#endif /* HAVE_AIRPCAP_API */
+}
+
+static int
+pcap_read_npf(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+{
+	PACKET Packet;
+	int cc;
+	int n = 0;
+	register u_char *bp, *ep;
+	u_char *datap;
+	struct pcap_win *pw = p->priv;
+
+	cc = p->cc;
+	if (p->cc == 0) {
+		/*
+		 * Has "pcap_breakloop()" been called?
+		 */
+		if (p->break_loop) {
+			/*
+			 * Yes - clear the flag that indicates that it
+			 * has, and return PCAP_ERROR_BREAK to indicate
+			 * that we were told to break out of the loop.
+			 */
+			p->break_loop = 0;
+			return (PCAP_ERROR_BREAK);
+		}
+
+		/*
+		 * Capture the packets.
+		 *
+		 * The PACKET structure had a bunch of extra stuff for
+		 * Windows 9x/Me, but the only interesting data in it
+		 * in the versions of Windows that we support is just
+		 * a copy of p->buffer, a copy of p->buflen, and the
+		 * actual number of bytes read returned from
+		 * PacketReceivePacket(), none of which has to be
+		 * retained from call to call, so we just keep one on
+		 * the stack.
+		 */
+		PacketInitPacket(&Packet, (BYTE *)p->buffer, p->bufsize);
+		if (!PacketReceivePacket(pw->adapter, &Packet, TRUE)) {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error: PacketReceivePacket failed");
+			return (PCAP_ERROR);
+		}
+
+		cc = Packet.ulBytesReceived;
+
+		bp = p->buffer;
+	}
+	else
+		bp = p->bp;
+
+	/*
+	 * Loop through each packet.
+	 */
+#define bhp ((struct bpf_hdr *)bp)
+	ep = bp + cc;
+	for (;;) {
+		register int caplen, hdrlen;
+
+		/*
+		 * Has "pcap_breakloop()" been called?
+		 * If so, return immediately - if we haven't read any
+		 * packets, clear the flag and return PCAP_ERROR_BREAK
+		 * to indicate that we were told to break out of the loop,
+		 * otherwise leave the flag set, so that the *next* call
+		 * will break out of the loop without having read any
+		 * packets, and return the number of packets we've
+		 * processed so far.
+		 */
+		if (p->break_loop) {
+			if (n == 0) {
+				p->break_loop = 0;
+				return (PCAP_ERROR_BREAK);
+			} else {
+				p->bp = bp;
+				p->cc = (int) (ep - bp);
+				return (n);
+			}
+		}
+		if (bp >= ep)
+			break;
+
+		caplen = bhp->bh_caplen;
+		hdrlen = bhp->bh_hdrlen;
+		datap = bp + hdrlen;
+
+		/*
+		 * Short-circuit evaluation: if using BPF filter
+		 * in kernel, no need to do it now - we already know
+		 * the packet passed the filter.
+		 *
+		 * XXX - bpf_filter() should always return TRUE if
+		 * handed a null pointer for the program, but it might
+		 * just try to "run" the filter, so we check here.
+		 */
+		if (pw->filtering_in_kernel ||
+		    p->fcode.bf_insns == NULL ||
+		    bpf_filter(p->fcode.bf_insns, datap, bhp->bh_datalen, caplen)) {
+#ifdef ENABLE_REMOTE
+			switch (p->rmt_samp.method) {
+
+			case PCAP_SAMP_1_EVERY_N:
+				pw->samp_npkt = (pw->samp_npkt + 1) % p->rmt_samp.value;
+
+				/* Discard all packets that are not '1 out of N' */
+				if (pw->samp_npkt != 0) {
+					bp += Packet_WORDALIGN(caplen + hdrlen);
+					continue;
+				}
+				break;
+
+			case PCAP_SAMP_FIRST_AFTER_N_MS:
+			    {
+				struct pcap_pkthdr *pkt_header = (struct pcap_pkthdr*) bp;
+
+				/*
+				 * Check if the timestamp of the arrived
+				 * packet is smaller than our target time.
+				 */
+				if (pkt_header->ts.tv_sec < pw->samp_time.tv_sec ||
+				   (pkt_header->ts.tv_sec == pw->samp_time.tv_sec && pkt_header->ts.tv_usec < pw->samp_time.tv_usec)) {
+					bp += Packet_WORDALIGN(caplen + hdrlen);
+					continue;
+				}
+
+				/*
+				 * The arrived packet is suitable for being
+				 * delivered to our caller, so let's update
+				 * the target time.
+				 */
+				pw->samp_time.tv_usec = pkt_header->ts.tv_usec + p->rmt_samp.value * 1000;
+				if (pw->samp_time.tv_usec > 1000000) {
+					pw->samp_time.tv_sec = pkt_header->ts.tv_sec + pw->samp_time.tv_usec / 1000000;
+					pw->samp_time.tv_usec = pw->samp_time.tv_usec % 1000000;
+				}
+			    }
+			}
+#endif	/* ENABLE_REMOTE */
+
+			/*
+			 * XXX A bpf_hdr matches a pcap_pkthdr.
+			 */
+			(*callback)(user, (struct pcap_pkthdr*)bp, datap);
+			bp += Packet_WORDALIGN(caplen + hdrlen);
+			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
+				p->bp = bp;
+				p->cc = (int) (ep - bp);
+				return (n);
+			}
+		} else {
+			/*
+			 * Skip this packet.
+			 */
+			bp += Packet_WORDALIGN(caplen + hdrlen);
+		}
+	}
+#undef bhp
+	p->cc = 0;
+	return (n);
+}
+
+#ifdef HAVE_DAG_API
+static int
+pcap_read_win32_dag(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+{
+	struct pcap_win *pw = p->priv;
+	PACKET Packet;
+	u_char *dp = NULL;
+	int	packet_len = 0, caplen = 0;
+	struct pcap_pkthdr	pcap_header;
+	u_char *endofbuf;
+	int n = 0;
+	dag_record_t *header;
+	unsigned erf_record_len;
+	ULONGLONG ts;
+	int cc;
+	unsigned swt;
+	unsigned dfp = pw->adapter->DagFastProcess;
+
+	cc = p->cc;
+	if (cc == 0) /* Get new packets only if we have processed all the ones of the previous read */
+	{
+		/*
+		 * Get new packets from the network.
+		 *
+		 * The PACKET structure had a bunch of extra stuff for
+		 * Windows 9x/Me, but the only interesting data in it
+		 * in the versions of Windows that we support is just
+		 * a copy of p->buffer, a copy of p->buflen, and the
+		 * actual number of bytes read returned from
+		 * PacketReceivePacket(), none of which has to be
+		 * retained from call to call, so we just keep one on
+		 * the stack.
+		 */
+		PacketInitPacket(&Packet, (BYTE *)p->buffer, p->bufsize);
+		if (!PacketReceivePacket(pw->adapter, &Packet, TRUE)) {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error: PacketReceivePacket failed");
+			return (-1);
+		}
+
+		cc = Packet.ulBytesReceived;
+		if(cc == 0)
+			/* The timeout has expired but we no packets arrived */
+			return (0);
+		header = (dag_record_t*)pw->adapter->DagBuffer;
+	}
+	else
+		header = (dag_record_t*)p->bp;
+
+	endofbuf = (char*)header + cc;
+
+	/*
+	 * Cycle through the packets
+	 */
+	do
+	{
+		erf_record_len = SWAPS(header->rlen);
+		if((char*)header + erf_record_len > endofbuf)
+			break;
+
+		/* Increase the number of captured packets */
+		p->stat.ps_recv++;
+
+		/* Find the beginning of the packet */
+		dp = ((u_char *)header) + dag_record_size;
+
+		/* Determine actual packet len */
+		switch(header->type)
+		{
+		case TYPE_ATM:
+			packet_len = ATM_SNAPLEN;
+			caplen = ATM_SNAPLEN;
+			dp += 4;
+
+			break;
+
+		case TYPE_ETH:
+			swt = SWAPS(header->wlen);
+			packet_len = swt - (pw->dag_fcs_bits);
+			caplen = erf_record_len - dag_record_size - 2;
+			if (caplen > packet_len)
+			{
+				caplen = packet_len;
+			}
+			dp += 2;
+
+			break;
+
+		case TYPE_HDLC_POS:
+			swt = SWAPS(header->wlen);
+			packet_len = swt - (pw->dag_fcs_bits);
+			caplen = erf_record_len - dag_record_size;
+			if (caplen > packet_len)
+			{
+				caplen = packet_len;
+			}
+
+			break;
+		}
+
+		if(caplen > p->snapshot)
+			caplen = p->snapshot;
+
+		/*
+		 * Has "pcap_breakloop()" been called?
+		 * If so, return immediately - if we haven't read any
+		 * packets, clear the flag and return -2 to indicate
+		 * that we were told to break out of the loop, otherwise
+		 * leave the flag set, so that the *next* call will break
+		 * out of the loop without having read any packets, and
+		 * return the number of packets we've processed so far.
+		 */
+		if (p->break_loop)
+		{
+			if (n == 0)
+			{
+				p->break_loop = 0;
+				return (-2);
+			}
+			else
+			{
+				p->bp = (char*)header;
+				p->cc = endofbuf - (char*)header;
+				return (n);
+			}
+		}
+
+		if(!dfp)
+		{
+			/* convert between timestamp formats */
+			ts = header->ts;
+			pcap_header.ts.tv_sec = (int)(ts >> 32);
+			ts = (ts & 0xffffffffi64) * 1000000;
+			ts += 0x80000000; /* rounding */
+			pcap_header.ts.tv_usec = (int)(ts >> 32);
+			if (pcap_header.ts.tv_usec >= 1000000) {
+				pcap_header.ts.tv_usec -= 1000000;
+				pcap_header.ts.tv_sec++;
+			}
+		}
+
+		/* No underlaying filtering system. We need to filter on our own */
+		if (p->fcode.bf_insns)
+		{
+			if (bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen) == 0)
+			{
+				/* Move to next packet */
+				header = (dag_record_t*)((char*)header + erf_record_len);
+				continue;
+			}
+		}
+
+		/* Fill the header for the user suppplied callback function */
+		pcap_header.caplen = caplen;
+		pcap_header.len = packet_len;
+
+		/* Call the callback function */
+		(*callback)(user, &pcap_header, dp);
+
+		/* Move to next packet */
+		header = (dag_record_t*)((char*)header + erf_record_len);
+
+		/* Stop if the number of packets requested by user has been reached*/
+		if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt))
+		{
+			p->bp = (char*)header;
+			p->cc = endofbuf - (char*)header;
+			return (n);
+		}
+	}
+	while((u_char*)header < endofbuf);
+
+	return (1);
+}
+#endif /* HAVE_DAG_API */
+
+/* Send a packet to the network */
+static int
+pcap_inject_npf(pcap_t *p, const void *buf, size_t size)
+{
+	struct pcap_win *pw = p->priv;
+	PACKET pkt;
+
+	PacketInitPacket(&pkt, (PVOID)buf, size);
+	if(PacketSendPacket(pw->adapter,&pkt,TRUE) == FALSE) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: PacketSendPacket failed");
+		return (-1);
+	}
+
+	/*
+	 * We assume it all got sent if "PacketSendPacket()" succeeded.
+	 * "pcap_inject()" is expected to return the number of bytes
+	 * sent.
+	 */
+	return ((int)size);
+}
+
+static void
+pcap_cleanup_npf(pcap_t *p)
+{
+	struct pcap_win *pw = p->priv;
+
+	if (pw->adapter != NULL) {
+		PacketCloseAdapter(pw->adapter);
+		pw->adapter = NULL;
+	}
+	if (pw->rfmon_selfstart)
+	{
+		PacketSetMonitorMode(p->opt.device, 0);
+	}
+	pcap_cleanup_live_common(p);
+}
+
+static int
+pcap_activate_npf(pcap_t *p)
+{
+	struct pcap_win *pw = p->priv;
+	NetType type;
+	int res;
+	char errbuf[PCAP_ERRBUF_SIZE+1];
+
+	if (p->opt.rfmon) {
+		/*
+		 * Monitor mode is supported on Windows Vista and later.
+		 */
+		if (PacketGetMonitorMode(p->opt.device) == 1)
+		{
+			pw->rfmon_selfstart = 0;
+		}
+		else
+		{
+			if ((res = PacketSetMonitorMode(p->opt.device, 1)) != 1)
+			{
+				pw->rfmon_selfstart = 0;
+				// Monitor mode is not supported.
+				if (res == 0)
+				{
+					return PCAP_ERROR_RFMON_NOTSUP;
+				}
+				else
+				{
+					return PCAP_ERROR;
+				}
+			}
+			else
+			{
+				pw->rfmon_selfstart = 1;
+			}
+		}
+	}
+
+	/* Init WinSock */
+	pcap_wsockinit();
+
+	pw->adapter = PacketOpenAdapter(p->opt.device);
+
+	if (pw->adapter == NULL)
+	{
+		/* Adapter detected but we are not able to open it. Return failure. */
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		if (pw->rfmon_selfstart)
+		{
+			PacketSetMonitorMode(p->opt.device, 0);
+		}
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Error opening adapter: %s", errbuf);
+		return (PCAP_ERROR);
+	}
+
+	/*get network type*/
+	if(PacketGetNetType (pw->adapter,&type) == FALSE)
+	{
+		pcap_win32_err_to_str(GetLastError(), errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Cannot determine the network type: %s", errbuf);
+		goto bad;
+	}
+
+	/*Set the linktype*/
+	switch (type.LinkType)
+	{
+	case NdisMediumWan:
+		p->linktype = DLT_EN10MB;
+		break;
+
+	case NdisMedium802_3:
+		p->linktype = DLT_EN10MB;
+		/*
+		 * This is (presumably) a real Ethernet capture; give it a
+		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
+		 * that an application can let you choose it, in case you're
+		 * capturing DOCSIS traffic that a Cisco Cable Modem
+		 * Termination System is putting out onto an Ethernet (it
+		 * doesn't put an Ethernet header onto the wire, it puts raw
+		 * DOCSIS frames out on the wire inside the low-level
+		 * Ethernet framing).
+		 */
+		p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
+		/*
+		 * If that fails, just leave the list empty.
+		 */
+		if (p->dlt_list != NULL) {
+			p->dlt_list[0] = DLT_EN10MB;
+			p->dlt_list[1] = DLT_DOCSIS;
+			p->dlt_count = 2;
+		}
+		break;
+
+	case NdisMediumFddi:
+		p->linktype = DLT_FDDI;
+		break;
+
+	case NdisMedium802_5:
+		p->linktype = DLT_IEEE802;
+		break;
+
+	case NdisMediumArcnetRaw:
+		p->linktype = DLT_ARCNET;
+		break;
+
+	case NdisMediumArcnet878_2:
+		p->linktype = DLT_ARCNET;
+		break;
+
+	case NdisMediumAtm:
+		p->linktype = DLT_ATM_RFC1483;
+		break;
+
+	case NdisMediumCHDLC:
+		p->linktype = DLT_CHDLC;
+		break;
+
+	case NdisMediumPPPSerial:
+		p->linktype = DLT_PPP_SERIAL;
+		break;
+
+	case NdisMediumNull:
+		p->linktype = DLT_NULL;
+		break;
+
+	case NdisMediumBare80211:
+		p->linktype = DLT_IEEE802_11;
+		break;
+
+	case NdisMediumRadio80211:
+		p->linktype = DLT_IEEE802_11_RADIO;
+		break;
+
+	case NdisMediumPpi:
+		p->linktype = DLT_PPI;
+		break;
+
+	default:
+		p->linktype = DLT_EN10MB;			/*an unknown adapter is assumed to be ethernet*/
+		break;
+	}
+
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
+	/* Set promiscuous mode */
+	if (p->opt.promisc)
+	{
+
+		if (PacketSetHwFilter(pw->adapter,NDIS_PACKET_TYPE_PROMISCUOUS) == FALSE)
+		{
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "failed to set hardware filter to promiscuous mode");
+			goto bad;
+		}
+	}
+	else
+	{
+		/* NDIS_PACKET_TYPE_ALL_LOCAL selects "All packets sent by installed
+		 * protocols and all packets indicated by the NIC" but if no protocol
+		 * drivers (like TCP/IP) are installed, NDIS_PACKET_TYPE_DIRECTED,
+		 * NDIS_PACKET_TYPE_BROADCAST, and NDIS_PACKET_TYPE_MULTICAST are needed to
+		 * capture incoming frames.
+		 */
+		if (PacketSetHwFilter(pw->adapter,
+			NDIS_PACKET_TYPE_ALL_LOCAL |
+			NDIS_PACKET_TYPE_DIRECTED |
+			NDIS_PACKET_TYPE_BROADCAST |
+			NDIS_PACKET_TYPE_MULTICAST) == FALSE)
+		{
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "failed to set hardware filter to non-promiscuous mode");
+			goto bad;
+		}
+	}
+
+	/* Set the buffer size */
+	p->bufsize = WIN32_DEFAULT_USER_BUFFER_SIZE;
+
+	if(!(pw->adapter->Flags & INFO_FLAG_DAG_CARD))
+	{
+	/*
+	 * Traditional Adapter
+	 */
+		/*
+		 * If the buffer size wasn't explicitly set, default to
+		 * WIN32_DEFAULT_KERNEL_BUFFER_SIZE.
+		 */
+	 	if (p->opt.buffer_size == 0)
+	 		p->opt.buffer_size = WIN32_DEFAULT_KERNEL_BUFFER_SIZE;
+
+		if(PacketSetBuff(pw->adapter,p->opt.buffer_size)==FALSE)
+		{
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: not enough memory to allocate the kernel buffer");
+			goto bad;
+		}
+
+		p->buffer = malloc(p->bufsize);
+		if (p->buffer == NULL)
+		{
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			goto bad;
+		}
+
+		if (p->opt.immediate)
+		{
+			/* tell the driver to copy the buffer as soon as data arrives */
+			if(PacketSetMinToCopy(pw->adapter,0)==FALSE)
+			{
+				pcap_win32_err_to_str(GetLastError(), errbuf);
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "Error calling PacketSetMinToCopy: %s",
+				    errbuf);
+				goto bad;
+			}
+		}
+		else
+		{
+			/* tell the driver to copy the buffer only if it contains at least 16K */
+			if(PacketSetMinToCopy(pw->adapter,16000)==FALSE)
+			{
+				pcap_win32_err_to_str(GetLastError(), errbuf);
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "Error calling PacketSetMinToCopy: %s",
+				    errbuf);
+				goto bad;
+			}
+		}
+	} else {
+		/*
+		 * Dag Card
+		 */
+#ifdef HAVE_DAG_API
+		/*
+		 * We have DAG support.
+		 */
+		LONG	status;
+		HKEY	dagkey;
+		DWORD	lptype;
+		DWORD	lpcbdata;
+		int		postype = 0;
+		char	keyname[512];
+
+		pcap_snprintf(keyname, sizeof(keyname), "%s\\CardParams\\%s",
+			"SYSTEM\\CurrentControlSet\\Services\\DAG",
+			strstr(_strlwr(p->opt.device), "dag"));
+		do
+		{
+			status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &dagkey);
+			if(status != ERROR_SUCCESS)
+				break;
+
+			status = RegQueryValueEx(dagkey,
+				"PosType",
+				NULL,
+				&lptype,
+				(char*)&postype,
+				&lpcbdata);
+
+			if(status != ERROR_SUCCESS)
+			{
+				postype = 0;
+			}
+
+			RegCloseKey(dagkey);
+		}
+		while(FALSE);
+
+
+		p->snapshot = PacketSetSnapLen(pw->adapter, p->snapshot);
+
+		/* Set the length of the FCS associated to any packet. This value
+		 * will be subtracted to the packet length */
+		pw->dag_fcs_bits = pw->adapter->DagFcsLen;
+#else /* HAVE_DAG_API */
+		/*
+		 * No DAG support.
+		 */
+		goto bad;
+#endif /* HAVE_DAG_API */
+	}
+
+	PacketSetReadTimeout(pw->adapter, p->opt.timeout);
+
+	/* disable loopback capture if requested */
+	if (p->opt.nocapture_local)
+	{
+		if (!PacketSetLoopbackBehavior(pw->adapter, NPF_DISABLE_LOOPBACK))
+		{
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "Unable to disable the capture of loopback packets.");
+			goto bad;
+		}
+	}
+
+#ifdef HAVE_DAG_API
+	if(pw->adapter->Flags & INFO_FLAG_DAG_CARD)
+	{
+		/* install dag specific handlers for read and setfilter */
+		p->read_op = pcap_read_win32_dag;
+		p->setfilter_op = pcap_setfilter_win32_dag;
+	}
+	else
+	{
+#endif /* HAVE_DAG_API */
+		/* install traditional npf handlers for read and setfilter */
+		p->read_op = pcap_read_npf;
+		p->setfilter_op = pcap_setfilter_npf;
+#ifdef HAVE_DAG_API
+	}
+#endif /* HAVE_DAG_API */
+	p->setdirection_op = NULL;	/* Not implemented. */
+	    /* XXX - can this be implemented on some versions of Windows? */
+	p->inject_op = pcap_inject_npf;
+	p->set_datalink_op = NULL;	/* can't change data link type */
+	p->getnonblock_op = pcap_getnonblock_npf;
+	p->setnonblock_op = pcap_setnonblock_npf;
+	p->stats_op = pcap_stats_npf;
+	p->stats_ex_op = pcap_stats_ex_npf;
+	p->setbuff_op = pcap_setbuff_npf;
+	p->setmode_op = pcap_setmode_npf;
+	p->setmintocopy_op = pcap_setmintocopy_npf;
+	p->getevent_op = pcap_getevent_npf;
+	p->oid_get_request_op = pcap_oid_get_request_npf;
+	p->oid_set_request_op = pcap_oid_set_request_npf;
+	p->sendqueue_transmit_op = pcap_sendqueue_transmit_npf;
+	p->setuserbuffer_op = pcap_setuserbuffer_npf;
+	p->live_dump_op = pcap_live_dump_npf;
+	p->live_dump_ended_op = pcap_live_dump_ended_npf;
+	p->get_airpcap_handle_op = pcap_get_airpcap_handle_npf;
+	p->cleanup_op = pcap_cleanup_npf;
+
+	/*
+	 * XXX - this is only done because WinPcap supported
+	 * pcap_fileno() returning the hFile HANDLE from the
+	 * ADAPTER structure.  We make no general guarantees
+	 * that the caller can do anything useful with it.
+	 *
+	 * (Not that we make any general guarantee of that
+	 * sort on UN*X, either, any more, given that not
+	 * all capture devices are regular OS network
+	 * interfaces.)
+	 */
+	p->handle = pw->adapter->hFile;
+
+	return (0);
+bad:
+	pcap_cleanup_npf(p);
+	return (PCAP_ERROR);
+}
+
+/*
+* Check if rfmon mode is supported on the pcap_t for Windows systems.
+*/
+static int
+pcap_can_set_rfmon_npf(pcap_t *p)
+{
+	return (PacketIsMonitorModeSupported(p->opt.device) == 1);
+}
+
+pcap_t *
+pcap_create_interface(const char *device _U_, char *ebuf)
+{
+	pcap_t *p;
+
+	p = pcap_create_common(ebuf, sizeof(struct pcap_win));
+	if (p == NULL)
+		return (NULL);
+
+	p->activate_op = pcap_activate_npf;
+	p->can_set_rfmon_op = pcap_can_set_rfmon_npf;
+	return (p);
+}
+
+static int
+pcap_setfilter_npf(pcap_t *p, struct bpf_program *fp)
+{
+	struct pcap_win *pw = p->priv;
+
+	if(PacketSetBpf(pw->adapter,fp)==FALSE){
+		/*
+		 * Kernel filter not installed.
+		 *
+		 * XXX - we don't know whether this failed because:
+		 *
+		 *  the kernel rejected the filter program as invalid,
+		 *  in which case we should fall back on userland
+		 *  filtering;
+		 *
+		 *  the kernel rejected the filter program as too big,
+		 *  in which case we should again fall back on
+		 *  userland filtering;
+		 *
+		 *  there was some other problem, in which case we
+		 *  should probably report an error.
+		 *
+		 * For NPF devices, the Win32 status will be
+		 * STATUS_INVALID_DEVICE_REQUEST for invalid
+		 * filters, but I don't know what it'd be for
+		 * other problems, and for some other devices
+		 * it might not be set at all.
+		 *
+		 * So we just fall back on userland filtering in
+		 * all cases.
+		 */
+
+		/*
+		 * install_bpf_program() validates the program.
+		 *
+		 * XXX - what if we already have a filter in the kernel?
+		 */
+		if (install_bpf_program(p, fp) < 0)
+			return (-1);
+		pw->filtering_in_kernel = 0;	/* filtering in userland */
+		return (0);
+	}
+
+	/*
+	 * It worked.
+	 */
+	pw->filtering_in_kernel = 1;	/* filtering in the kernel */
+
+	/*
+	 * Discard any previously-received packets, as they might have
+	 * passed whatever filter was formerly in effect, but might
+	 * not pass this filter (BIOCSETF discards packets buffered
+	 * in the kernel, so you can lose packets in any case).
+	 */
+	p->cc = 0;
+	return (0);
+}
+
+/*
+ * We filter at user level, since the kernel driver does't process the packets
+ */
+static int
+pcap_setfilter_win32_dag(pcap_t *p, struct bpf_program *fp) {
+
+	if(!fp)
+	{
+		strlcpy(p->errbuf, "setfilter: No filter specified", sizeof(p->errbuf));
+		return (-1);
+	}
+
+	/* Install a user level filter */
+	if (install_bpf_program(p, fp) < 0)
+		return (-1);
+
+	return (0);
+}
+
+static int
+pcap_getnonblock_npf(pcap_t *p)
+{
+	struct pcap_win *pw = p->priv;
+
+	/*
+	 * XXX - if there were a PacketGetReadTimeout() call, we
+	 * would use it, and return 1 if the timeout is -1
+	 * and 0 otherwise.
+	 */
+	return (pw->nonblock);
+}
+
+static int
+pcap_setnonblock_npf(pcap_t *p, int nonblock)
+{
+	struct pcap_win *pw = p->priv;
+	int newtimeout;
+	char win_errbuf[PCAP_ERRBUF_SIZE+1];
+
+	if (nonblock) {
+		/*
+		 * Set the packet buffer timeout to -1 for non-blocking
+		 * mode.
+		 */
+		newtimeout = -1;
+	} else {
+		/*
+		 * Restore the timeout set when the device was opened.
+		 * (Note that this may be -1, in which case we're not
+		 * really leaving non-blocking mode.  However, although
+		 * the timeout argument to pcap_set_timeout() and
+		 * pcap_open_live() is an int, you're not supposed to
+		 * supply a negative value, so that "shouldn't happen".)
+		 */
+		newtimeout = p->opt.timeout;
+	}
+	if (!PacketSetReadTimeout(pw->adapter, newtimeout)) {
+		pcap_win32_err_to_str(GetLastError(), win_errbuf);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "PacketSetReadTimeout: %s", win_errbuf);
+		return (-1);
+	}
+	pw->nonblock = (newtimeout == -1);
+	return (0);
+}
+
+static int
+pcap_add_if_npf(pcap_if_list_t *devlistp, char *name, bpf_u_int32 flags,
+    const char *description, char *errbuf)
+{
+	pcap_if_t *curdev;
+	npf_if_addr if_addrs[MAX_NETWORK_ADDRESSES];
+	LONG if_addr_size;
+	int res = 0;
+
+	if_addr_size = MAX_NETWORK_ADDRESSES;
+
+	/*
+	 * Add an entry for this interface, with no addresses.
+	 */
+	curdev = add_dev(devlistp, name, flags, description, errbuf);
+	if (curdev == NULL) {
+		/*
+		 * Failure.
+		 */
+		return (-1);
+	}
+
+	/*
+	 * Get the list of addresses for the interface.
+	 */
+	if (!PacketGetNetInfoEx((void *)name, if_addrs, &if_addr_size)) {
+		/*
+		 * Failure.
+		 *
+		 * We don't return an error, because this can happen with
+		 * NdisWan interfaces, and we want to supply them even
+		 * if we can't supply their addresses.
+		 *
+		 * We return an entry with an empty address list.
+		 */
+		return (0);
+	}
+
+	/*
+	 * Now add the addresses.
+	 */
+	while (if_addr_size-- > 0) {
+		/*
+		 * "curdev" is an entry for this interface; add an entry for
+		 * this address to its list of addresses.
+		 */
+		res = add_addr_to_dev(curdev,
+		    (struct sockaddr *)&if_addrs[if_addr_size].IPAddress,
+		    sizeof (struct sockaddr_storage),
+		    (struct sockaddr *)&if_addrs[if_addr_size].SubnetMask,
+		    sizeof (struct sockaddr_storage),
+		    (struct sockaddr *)&if_addrs[if_addr_size].Broadcast,
+		    sizeof (struct sockaddr_storage),
+		    NULL,
+		    0,
+		    errbuf);
+		if (res == -1) {
+			/*
+			 * Failure.
+			 */
+			break;
+		}
+	}
+
+	return (res);
+}
+
+static int
+get_if_flags(const char *name, bpf_u_int32 *flags, char *errbuf)
+{
+	char *name_copy;
+	ADAPTER *adapter;
+	int status;
+	size_t len;
+	NDIS_HARDWARE_STATUS hardware_status;
+#ifdef OID_GEN_PHYSICAL_MEDIUM
+	NDIS_PHYSICAL_MEDIUM phys_medium;
+	bpf_u_int32 gen_physical_medium_oids[] = {
+  #ifdef OID_GEN_PHYSICAL_MEDIUM_EX
+		OID_GEN_PHYSICAL_MEDIUM_EX,
+  #endif
+  		OID_GEN_PHYSICAL_MEDIUM
+  	};
+#define N_GEN_PHYSICAL_MEDIUM_OIDS	(sizeof gen_physical_medium_oids / sizeof gen_physical_medium_oids[0])
+	size_t i;
+#endif /* OID_GEN_PHYSICAL_MEDIUM */
+#ifdef OID_GEN_LINK_STATE
+	NDIS_LINK_STATE link_state;
+#endif
+	int connect_status;
+
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback interface, so the connection status doesn't
+		 * apply. and it's not wireless (or wired, for that
+		 * matter...).  We presume it's up and running.
+		 */
+		*flags |= PCAP_IF_UP | PCAP_IF_RUNNING | PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return (0);
+	}
+
+	/*
+	 * We need to open the adapter to get this information.
+	 *
+	 * XXX - PacketOpenAdapter() takes a non-const pointer
+	 * as an argument, so we make a copy of the argument and
+	 * pass that to it.
+	 */
+	name_copy = strdup(name);
+	adapter = PacketOpenAdapter(name_copy);
+	free(name_copy);
+	if (adapter == NULL) {
+		/*
+		 * Give up; if they try to open this device, it'll fail.
+		 */
+		return (0);
+	}
+
+#ifdef HAVE_AIRPCAP_API
+	/*
+	 * Airpcap.sys do not support the below 'OID_GEN_x' values.
+	 * Just set these flags (and none of the '*flags' entered with).
+	 */
+	if (PacketGetAirPcapHandle(adapter)) {
+		/*
+		 * Must be "up" and "running" if the above if succeeded.
+		 */
+		*flags = PCAP_IF_UP | PCAP_IF_RUNNING;
+
+		/*
+		 * An airpcap device is a wireless device (duh!)
+		 */
+		*flags |= PCAP_IF_WIRELESS;
+
+		/*
+		 * A "network assosiation state" makes no sense for airpcap.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		PacketCloseAdapter(adapter);
+		return (0);
+	}
+#endif
+
+	/*
+	 * Get the hardware status, and derive "up" and "running" from
+	 * that.
+	 */
+	len = sizeof (hardware_status);
+	status = oid_get_request(adapter, OID_GEN_HARDWARE_STATUS,
+	    &hardware_status, &len, errbuf);
+	if (status == 0) {
+		switch (hardware_status) {
+
+		case NdisHardwareStatusReady:
+			/*
+			 * "Available and capable of sending and receiving
+			 * data over the wire", so up and running.
+			 */
+			*flags |= PCAP_IF_UP | PCAP_IF_RUNNING;
+			break;
+
+		case NdisHardwareStatusInitializing:
+		case NdisHardwareStatusReset:
+			/*
+			 * "Initializing" or "Resetting", so up, but
+			 * not running.
+			 */
+			*flags |= PCAP_IF_UP;
+			break;
+
+		case NdisHardwareStatusClosing:
+		case NdisHardwareStatusNotReady:
+			/*
+			 * "Closing" or "Not ready", so neither up nor
+			 * running.
+			 */
+			break;
+		}
+	} else {
+		/*
+		 * Can't get the hardware status, so assume both up and
+		 * running.
+		 */
+		*flags |= PCAP_IF_UP | PCAP_IF_RUNNING;
+	}
+
+	/*
+	 * Get the network type.
+	 */
+#ifdef OID_GEN_PHYSICAL_MEDIUM
+	/*
+	 * Try the OIDs we have for this, in order.
+	 */
+	for (i = 0; i < N_GEN_PHYSICAL_MEDIUM_OIDS; i++) {
+		len = sizeof (phys_medium);
+		status = oid_get_request(adapter, gen_physical_medium_oids[i],
+		    &phys_medium, &len, errbuf);
+		if (status == 0) {
+			/*
+			 * Success.
+			 */
+			break;
+		}
+		/*
+		 * Failed.  We can't determine whether it failed
+		 * because that particular OID isn't supported
+		 * or because some other problem occurred, so we
+		 * just drive on and try the next OID.
+		 */
+	}
+	if (status == 0) {
+		/*
+		 * We got the physical medium.
+		 */
+		switch (phys_medium) {
+
+		case NdisPhysicalMediumWirelessLan:
+		case NdisPhysicalMediumWirelessWan:
+		case NdisPhysicalMediumNative802_11:
+		case NdisPhysicalMediumBluetooth:
+		case NdisPhysicalMediumUWB:
+		case NdisPhysicalMediumIrda:
+			/*
+			 * Wireless.
+			 */
+			*flags |= PCAP_IF_WIRELESS;
+			break;
+
+		default:
+			/*
+			 * Not wireless.
+			 */
+			break;
+		}
+	}
+#endif
+
+	/*
+	 * Get the connection status.
+	 */
+#ifdef OID_GEN_LINK_STATE
+	len = sizeof(link_state);
+	status = oid_get_request(adapter, OID_GEN_LINK_STATE, &link_state,
+	    &len, errbuf);
+	if (status == 0) {
+		/*
+		 * NOTE: this also gives us the receive and transmit
+		 * link state.
+		 */
+		switch (link_state.MediaConnectState) {
+
+		case MediaConnectStateConnected:
+			/*
+			 * It's connected.
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_CONNECTED;
+			break;
+
+		case MediaConnectStateDisconnected:
+			/*
+			 * It's disconnected.
+			 */
+			*flags |= PCAP_IF_CONNECTION_STATUS_DISCONNECTED;
+			break;
+		}
+	}
+#else
+	/*
+	 * OID_GEN_LINK_STATE isn't supported because it's not in our SDK.
+	 */
+	status = -1;
+#endif
+	if (status == -1) {
+		/*
+		 * OK, OID_GEN_LINK_STATE didn't work, try
+		 * OID_GEN_MEDIA_CONNECT_STATUS.
+		 */
+		status = oid_get_request(adapter, OID_GEN_MEDIA_CONNECT_STATUS,
+		    &connect_status, &len, errbuf);
+		if (status == 0) {
+			switch (connect_status) {
+
+			case NdisMediaStateConnected:
+				/*
+				 * It's connected.
+				 */
+				*flags |= PCAP_IF_CONNECTION_STATUS_CONNECTED;
+				break;
+
+			case NdisMediaStateDisconnected:
+				/*
+				 * It's disconnected.
+				 */
+				*flags |= PCAP_IF_CONNECTION_STATUS_DISCONNECTED;
+				break;
+			}
+		}
+	}
+	PacketCloseAdapter(adapter);
+	return (0);
+}
+
+int
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
+{
+	int ret = 0;
+	const char *desc;
+	char *AdaptersName;
+	ULONG NameLength;
+	char *name;
+	char our_errbuf[PCAP_ERRBUF_SIZE+1];
+
+	/*
+	 * Find out how big a buffer we need.
+	 *
+	 * This call should always return FALSE; if the error is
+	 * ERROR_INSUFFICIENT_BUFFER, NameLength will be set to
+	 * the size of the buffer we need, otherwise there's a
+	 * problem, and NameLength should be set to 0.
+	 *
+	 * It shouldn't require NameLength to be set, but,
+	 * at least as of WinPcap 4.1.3, it checks whether
+	 * NameLength is big enough before it checks for a
+	 * NULL buffer argument, so, while it'll still do
+	 * the right thing if NameLength is uninitialized and
+	 * whatever junk happens to be there is big enough
+	 * (because the pointer argument will be null), it's
+	 * still reading an uninitialized variable.
+	 */
+	NameLength = 0;
+	if (!PacketGetAdapterNames(NULL, &NameLength))
+	{
+		DWORD last_error = GetLastError();
+
+		if (last_error != ERROR_INSUFFICIENT_BUFFER)
+		{
+			pcap_win32_err_to_str(last_error, our_errbuf);
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "PacketGetAdapterNames: %s", our_errbuf);
+			return (-1);
+		}
+	}
+
+	if (NameLength <= 0)
+		return 0;
+	AdaptersName = (char*) malloc(NameLength);
+	if (AdaptersName == NULL)
+	{
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Cannot allocate enough memory to list the adapters.");
+		return (-1);
+	}
+
+	if (!PacketGetAdapterNames(AdaptersName, &NameLength)) {
+		pcap_win32_err_to_str(GetLastError(), our_errbuf);
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "PacketGetAdapterNames: %s",
+		    our_errbuf);
+		free(AdaptersName);
+		return (-1);
+	}
+
+	/*
+	 * "PacketGetAdapterNames()" returned a list of
+	 * null-terminated ASCII interface name strings,
+	 * terminated by a null string, followed by a list
+	 * of null-terminated ASCII interface description
+	 * strings, terminated by a null string.
+	 * This means there are two ASCII nulls at the end
+	 * of the first list.
+	 *
+	 * Find the end of the first list; that's the
+	 * beginning of the second list.
+	 */
+	desc = &AdaptersName[0];
+	while (*desc != '\0' || *(desc + 1) != '\0')
+		desc++;
+
+	/*
+ 	 * Found it - "desc" points to the first of the two
+	 * nulls at the end of the list of names, so the
+	 * first byte of the list of descriptions is two bytes
+	 * after it.
+	 */
+	desc += 2;
+
+	/*
+	 * Loop over the elements in the first list.
+	 */
+	name = &AdaptersName[0];
+	while (*name != '\0') {
+		bpf_u_int32 flags = 0;
+#ifdef HAVE_PACKET_IS_LOOPBACK_ADAPTER
+		/*
+		 * Is this a loopback interface?
+		 */
+		if (PacketIsLoopbackAdapter(name)) {
+			/* Yes */
+			flags |= PCAP_IF_LOOPBACK;
+		}
+#endif
+		/*
+		 * Get additional flags.
+		 */
+		if (get_if_flags(name, &flags, errbuf) == -1) {
+			/*
+			 * Failure.
+			 */
+			ret = -1;
+			break;
+		}
+
+		/*
+		 * Add an entry for this interface.
+		 */
+		if (pcap_add_if_npf(devlistp, name, flags, desc,
+		    errbuf) == -1) {
+			/*
+			 * Failure.
+			 */
+			ret = -1;
+			break;
+		}
+		name += strlen(name) + 1;
+		desc += strlen(desc) + 1;
+	}
+
+	free(AdaptersName);
+	return (ret);
+}
+
+/*
+ * Return the name of a network interface attached to the system, or NULL
+ * if none can be found.  The interface must be configured up; the
+ * lowest unit number is preferred; loopback is ignored.
+ *
+ * In the best of all possible worlds, this would be the same as on
+ * UN*X, but there may be software that expects this to return a
+ * full list of devices after the first device.
+ */
+#define ADAPTERSNAME_LEN	8192
+char *
+pcap_lookupdev(char *errbuf)
+{
+	DWORD dwVersion;
+	DWORD dwWindowsMajorVersion;
+	char our_errbuf[PCAP_ERRBUF_SIZE+1];
+
+#pragma warning (push)
+#pragma warning (disable: 4996) /* disable MSVC's GetVersion() deprecated warning here */
+	dwVersion = GetVersion();	/* get the OS version */
+#pragma warning (pop)
+	dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+
+	if (dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4) {
+		/*
+		 * Windows 95, 98, ME.
+		 */
+		ULONG NameLength = ADAPTERSNAME_LEN;
+		static char AdaptersName[ADAPTERSNAME_LEN];
+
+		if (PacketGetAdapterNames(AdaptersName,&NameLength) )
+			return (AdaptersName);
+		else
+			return NULL;
+	} else {
+		/*
+		 * Windows NT (NT 4.0 and later).
+		 * Convert the names to Unicode for backward compatibility.
+		 */
+		ULONG NameLength = ADAPTERSNAME_LEN;
+		static WCHAR AdaptersName[ADAPTERSNAME_LEN];
+		size_t BufferSpaceLeft;
+		char *tAstr;
+		WCHAR *Unameptr;
+		char *Adescptr;
+		size_t namelen, i;
+		WCHAR *TAdaptersName = (WCHAR*)malloc(ADAPTERSNAME_LEN * sizeof(WCHAR));
+		int NAdapts = 0;
+
+		if(TAdaptersName == NULL)
+		{
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "memory allocation failure");
+			return NULL;
+		}
+
+		if ( !PacketGetAdapterNames((PTSTR)TAdaptersName,&NameLength) )
+		{
+			pcap_win32_err_to_str(GetLastError(), our_errbuf);
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				"PacketGetAdapterNames: %s", our_errbuf);
+			free(TAdaptersName);
+			return NULL;
+		}
+
+
+		BufferSpaceLeft = ADAPTERSNAME_LEN * sizeof(WCHAR);
+		tAstr = (char*)TAdaptersName;
+		Unameptr = AdaptersName;
+
+		/*
+		 * Convert the device names to Unicode into AdapterName.
+		 */
+		do {
+			/*
+			 * Length of the name, including the terminating
+			 * NUL.
+			 */
+			namelen = strlen(tAstr) + 1;
+
+			/*
+			 * Do we have room for the name in the Unicode
+			 * buffer?
+			 */
+			if (BufferSpaceLeft < namelen * sizeof(WCHAR)) {
+				/*
+				 * No.
+				 */
+				goto quit;
+			}
+			BufferSpaceLeft -= namelen * sizeof(WCHAR);
+
+			/*
+			 * Copy the name, converting ASCII to Unicode.
+			 * namelen includes the NUL, so we copy it as
+			 * well.
+			 */
+			for (i = 0; i < namelen; i++)
+				*Unameptr++ = *tAstr++;
+
+			/*
+			 * Count this adapter.
+			 */
+			NAdapts++;
+		} while (namelen != 1);
+
+		/*
+		 * Copy the descriptions, but don't convert them from
+		 * ASCII to Unicode.
+		 */
+		Adescptr = (char *)Unameptr;
+		while(NAdapts--)
+		{
+			size_t desclen;
+
+			desclen = strlen(tAstr) + 1;
+
+			/*
+			 * Do we have room for the name in the Unicode
+			 * buffer?
+			 */
+			if (BufferSpaceLeft < desclen) {
+				/*
+				 * No.
+				 */
+				goto quit;
+			}
+
+			/*
+			 * Just copy the ASCII string.
+			 * namelen includes the NUL, so we copy it as
+			 * well.
+			 */
+			memcpy(Adescptr, tAstr, desclen);
+			Adescptr += desclen;
+			tAstr += desclen;
+			BufferSpaceLeft -= desclen;
+		}
+
+	quit:
+		free(TAdaptersName);
+		return (char *)(AdaptersName);
+	}
+}
+
+/*
+ * We can't use the same code that we use on UN*X, as that's doing
+ * UN*X-specific calls.
+ *
+ * We don't just fetch the entire list of devices, search for the
+ * particular device, and use its first IPv4 address, as that's too
+ * much work to get just one device's netmask.
+ */
+int
+pcap_lookupnet(const char *device, bpf_u_int32 *netp, bpf_u_int32 *maskp,
+    char *errbuf)
+{
+	/*
+	 * We need only the first IPv4 address, so we must scan the array returned by PacketGetNetInfo()
+	 * in order to skip non IPv4 (i.e. IPv6 addresses)
+	 */
+	npf_if_addr if_addrs[MAX_NETWORK_ADDRESSES];
+	LONG if_addr_size = MAX_NETWORK_ADDRESSES;
+	struct sockaddr_in *t_addr;
+	LONG i;
+
+	if (!PacketGetNetInfoEx((void *)device, if_addrs, &if_addr_size)) {
+		*netp = *maskp = 0;
+		return (0);
+	}
+
+	for(i = 0; i < if_addr_size; i++)
+	{
+		if(if_addrs[i].IPAddress.ss_family == AF_INET)
+		{
+			t_addr = (struct sockaddr_in *) &(if_addrs[i].IPAddress);
+			*netp = t_addr->sin_addr.S_un.S_addr;
+			t_addr = (struct sockaddr_in *) &(if_addrs[i].SubnetMask);
+			*maskp = t_addr->sin_addr.S_un.S_addr;
+
+			*netp &= *maskp;
+			return (0);
+		}
+
+	}
+
+	*netp = *maskp = 0;
+	return (0);
+}
+
+static const char *pcap_lib_version_string;
+
+#ifdef HAVE_VERSION_H
+/*
+ * libpcap being built for Windows, as part of a WinPcap/Npcap source
+ * tree.  Include version.h from that source tree to get the WinPcap/Npcap
+ * version.
+ *
+ * XXX - it'd be nice if we could somehow generate the WinPcap version number
+ * when building WinPcap.  (It'd be nice to do so for the packet.dll version
+ * number as well.)
+ */
+#include "../../version.h"
+
+static const char pcap_version_string[] =
+	WINPCAP_PRODUCT_NAME " version " WINPCAP_VER_STRING ", based on " PCAP_VERSION_STRING;
+static const char pcap_version_string_packet_dll_fmt[] =
+	WINPCAP_PRODUCT_NAME " version " WINPCAP_VER_STRING " (packet.dll version %s), based on " PCAP_VERSION_STRING;
+
+const char *
+pcap_lib_version(void)
+{
+	char *packet_version_string;
+	size_t full_pcap_version_string_len;
+	char *full_pcap_version_string;
+
+	if (pcap_lib_version_string == NULL) {
+		/*
+		 * Generate the version string.
+		 */
+		packet_version_string = PacketGetVersion();
+		if (strcmp(WINPCAP_VER_STRING, packet_version_string) == 0) {
+			/*
+			 * WinPcap version string and packet.dll version
+			 * string are the same; just report the WinPcap
+			 * version.
+			 */
+			pcap_lib_version_string = pcap_version_string;
+		} else {
+			/*
+			 * WinPcap version string and packet.dll version
+			 * string are different; that shouldn't be the
+			 * case (the two libraries should come from the
+			 * same version of WinPcap), so we report both
+			 * versions.
+			 *
+			 * The -2 is for the %s in the format string,
+			 * which will be replaced by packet_version_string.
+			 */
+			full_pcap_version_string_len =
+			    (sizeof pcap_version_string_packet_dll_fmt - 2) +
+			    strlen(packet_version_string);
+			full_pcap_version_string = malloc(full_pcap_version_string_len);
+			if (full_pcap_version_string == NULL)
+				return (NULL);
+			pcap_snprintf(full_pcap_version_string,
+			    full_pcap_version_string_len,
+			    pcap_version_string_packet_dll_fmt,
+			    packet_version_string);
+		}
+		pcap_lib_version_string = full_pcap_version_string;
+	}
+	return (pcap_lib_version_string);
+}
+
+#else /* HAVE_VERSION_H */
+
+/*
+ * libpcap being built for Windows, not as part of a WinPcap/Npcap source
+ * tree.
+ */
+static const char pcap_version_string_packet_dll_fmt[] =
+	PCAP_VERSION_STRING " (packet.dll version %s)";
+const char *
+pcap_lib_version(void)
+{
+	char *packet_version_string;
+	size_t full_pcap_version_string_len;
+	char *full_pcap_version_string;
+
+	if (pcap_lib_version_string == NULL) {
+		/*
+		 * Generate the version string.  Report the packet.dll
+		 * version.
+		 *
+		 * The -2 is for the %s in the format string, which will
+		 * be replaced by packet_version_string.
+		 */
+		packet_version_string = PacketGetVersion();
+		full_pcap_version_string_len =
+		    (sizeof pcap_version_string_packet_dll_fmt - 2) +
+		    strlen(packet_version_string);
+		full_pcap_version_string = malloc(full_pcap_version_string_len);
+		if (full_pcap_version_string == NULL)
+			return (NULL);
+		pcap_snprintf(full_pcap_version_string,
+		    full_pcap_version_string_len,
+		    pcap_version_string_packet_dll_fmt,
+		    packet_version_string);
+		pcap_lib_version_string = full_pcap_version_string;
+	}
+	return (pcap_lib_version_string);
+}
+#endif /* HAVE_VERSION_H */

Property changes on: vendor/libpcap/dist/pcap-npf.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-null.c
===================================================================
--- vendor/libpcap/dist/pcap-null.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-null.c	(revision 333789)
@@ -1,53 +1,65 @@
 /*
  * Copyright (c) 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <sys/param.h>			/* optionally get BSD define */
-
 #include <string.h>
 
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
 #include "pcap-int.h"
 
 static char nosup[] = "live packet capture not supported on this system";
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	(void)strlcpy(ebuf, nosup, PCAP_ERRBUF_SIZE);
 	return (NULL);
 }
 
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 	/*
 	 * There are no interfaces on which we can capture.
 	 */
-	*alldevsp = NULL;
 	return (0);
+}
+
+#ifdef _WIN32
+int
+pcap_lookupnet(const char *device _U_, bpf_u_int32 *netp _U_,
+    bpf_u_int32 *maskp _U_, char *errbuf)
+{
+	(void)strlcpy(errbuf, nosup, PCAP_ERRBUF_SIZE);
+	return (-1);
+}
+#endif
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-pf.c
===================================================================
--- vendor/libpcap/dist/pcap-pf.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-pf.c	(revision 333789)
@@ -1,622 +1,683 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * packet filter subroutines for tcpdump
  *	Extraction/creation by Jeffrey Mogul, DECWRL
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <net/pfilt.h>
 
 struct mbuf;
 struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 /*
  * Make "pcap.h" not include "pcap/bpf.h"; we are going to include the
  * native OS version, as we need various BPF ioctls from it.
  */
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
 #include <net/bpf.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * FDDI packets are padded to make everything line up on a nice boundary.
  */
 #define       PCAP_FDDIPAD 3
 
 /*
  * Private data for capturing on Ultrix and DEC OSF/1^WDigital UNIX^W^W
  * Tru64 UNIX packetfilter devices.
  */
 struct pcap_pf {
 	int	filtering_in_kernel; /* using kernel filter */
 	u_long	TotPkts;	/* can't oflow for 79 hrs on ether */
 	u_long	TotAccepted;	/* count accepted by filter */
 	u_long	TotDrops;	/* count of dropped packets */
 	long	TotMissed;	/* missed by i/f during this run */
 	long	OrigMissed;	/* missed by i/f before this run */
 };
 
 static int pcap_setfilter_pf(pcap_t *, struct bpf_program *);
 
 /*
  * BUFSPACE is the size in bytes of the packet read buffer.  Most tcpdump
  * applications aren't going to need more than 200 bytes of packet header
  * and the read shouldn't return more packets than packetfilter's internal
  * queue limit (bounded at 256).
  */
 #define BUFSPACE (200 * 256)
 
 static int
 pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_pf *pf = pc->priv;
 	register u_char *p, *bp;
 	register int cc, n, buflen, inc;
 	register struct enstamp *sp;
 #ifdef LBL_ALIGN
 	struct enstamp stamp;
 #endif
 	register u_int pad;
 
  again:
 	cc = pc->cc;
 	if (cc == 0) {
 		cc = read(pc->fd, (char *)pc->buffer + pc->offset, pc->bufsize);
 		if (cc < 0) {
 			if (errno == EWOULDBLOCK)
 				return (0);
 			if (errno == EINVAL &&
 			    lseek(pc->fd, 0L, SEEK_CUR) + pc->bufsize < 0) {
 				/*
 				 * Due to a kernel bug, after 2^31 bytes,
 				 * the kernel file offset overflows and
 				 * read fails with EINVAL. The lseek()
 				 * to 0 will fix things.
 				 */
 				(void)lseek(pc->fd, 0L, SEEK_SET);
 				goto again;
 			}
-			pcap_snprintf(pc->errbuf, sizeof(pc->errbuf), "pf read: %s",
-				pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(pc->errbuf,
+			    sizeof(pc->errbuf), errno, "pf read");
 			return (-1);
 		}
 		bp = (u_char *)pc->buffer + pc->offset;
 	} else
 		bp = pc->bp;
 	/*
 	 * Loop through each packet.
 	 */
 	n = 0;
 	pad = pc->fddipad;
 	while (cc > 0) {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (pc->break_loop) {
 			if (n == 0) {
 				pc->break_loop = 0;
 				return (-2);
 			} else {
 				pc->cc = cc;
 				pc->bp = bp;
 				return (n);
 			}
 		}
 		if (cc < sizeof(*sp)) {
 			pcap_snprintf(pc->errbuf, sizeof(pc->errbuf),
 			    "pf short read (%d)", cc);
 			return (-1);
 		}
 #ifdef LBL_ALIGN
 		if ((long)bp & 3) {
 			sp = &stamp;
 			memcpy((char *)sp, (char *)bp, sizeof(*sp));
 		} else
 #endif
 			sp = (struct enstamp *)bp;
 		if (sp->ens_stamplen != sizeof(*sp)) {
 			pcap_snprintf(pc->errbuf, sizeof(pc->errbuf),
 			    "pf short stamplen (%d)",
 			    sp->ens_stamplen);
 			return (-1);
 		}
 
 		p = bp + sp->ens_stamplen;
 		buflen = sp->ens_count;
 		if (buflen > pc->snapshot)
 			buflen = pc->snapshot;
 
 		/* Calculate inc before possible pad update */
 		inc = ENALIGN(buflen + sp->ens_stamplen);
 		cc -= inc;
 		bp += inc;
 		pf->TotPkts++;
 		pf->TotDrops += sp->ens_dropped;
 		pf->TotMissed = sp->ens_ifoverflows;
 		if (pf->OrigMissed < 0)
 			pf->OrigMissed = pf->TotMissed;
 
 		/*
 		 * Short-circuit evaluation: if using BPF filter
 		 * in kernel, no need to do it now - we already know
 		 * the packet passed the filter.
 		 *
 		 * Note: the filter code was generated assuming
 		 * that pc->fddipad was the amount of padding
 		 * before the header, as that's what's required
 		 * in the kernel, so we run the filter before
 		 * skipping that padding.
 		 */
 		if (pf->filtering_in_kernel ||
 		    bpf_filter(pc->fcode.bf_insns, p, sp->ens_count, buflen)) {
 			struct pcap_pkthdr h;
 			pf->TotAccepted++;
 			h.ts = sp->ens_tstamp;
 			h.len = sp->ens_count - pad;
 			p += pad;
 			buflen -= pad;
 			h.caplen = buflen;
 			(*callback)(user, &h, p);
 			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
 				pc->cc = cc;
 				pc->bp = bp;
 				return (n);
 			}
 		}
 	}
 	pc->cc = 0;
 	return (n);
 }
 
 static int
 pcap_inject_pf(pcap_t *p, const void *buf, size_t size)
 {
 	int ret;
 
 	ret = write(p->fd, buf, size);
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	return (ret);
 }
 
 static int
 pcap_stats_pf(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_pf *pf = p->priv;
 
 	/*
 	 * If packet filtering is being done in the kernel:
 	 *
 	 *	"ps_recv" counts only packets that passed the filter.
 	 *	This does not include packets dropped because we
 	 *	ran out of buffer space.  (XXX - perhaps it should,
 	 *	by adding "ps_drop" to "ps_recv", for compatibility
 	 *	with some other platforms.  On the other hand, on
 	 *	some platforms "ps_recv" counts only packets that
 	 *	passed the filter, and on others it counts packets
 	 *	that didn't pass the filter....)
 	 *
 	 *	"ps_drop" counts packets that passed the kernel filter
 	 *	(if any) but were dropped because the input queue was
 	 *	full.
 	 *
 	 *	"ps_ifdrop" counts packets dropped by the network
 	 *	inteface (regardless of whether they would have passed
 	 *	the input filter, of course).
 	 *
 	 * If packet filtering is not being done in the kernel:
 	 *
 	 *	"ps_recv" counts only packets that passed the filter.
 	 *
 	 *	"ps_drop" counts packets that were dropped because the
 	 *	input queue was full, regardless of whether they passed
 	 *	the userland filter.
 	 *
 	 *	"ps_ifdrop" counts packets dropped by the network
 	 *	inteface (regardless of whether they would have passed
 	 *	the input filter, of course).
 	 *
 	 * These statistics don't include packets not yet read from
 	 * the kernel by libpcap, but they may include packets not
 	 * yet read from libpcap by the application.
 	 */
 	ps->ps_recv = pf->TotAccepted;
 	ps->ps_drop = pf->TotDrops;
 	ps->ps_ifdrop = pf->TotMissed - pf->OrigMissed;
 	return (0);
 }
 
 /*
  * We include the OS's <net/bpf.h>, not our "pcap/bpf.h", so we probably
  * don't get DLT_DOCSIS defined.
  */
 #ifndef DLT_DOCSIS
 #define DLT_DOCSIS	143
 #endif
 
 static int
 pcap_activate_pf(pcap_t *p)
 {
 	struct pcap_pf *pf = p->priv;
 	short enmode;
 	int backlog = -1;	/* request the most */
 	struct enfilter Filter;
 	struct endevp devparams;
+	int err;
 
 	/*
 	 * Initially try a read/write open (to allow the inject
 	 * method to work).  If that fails due to permission
 	 * issues, fall back to read-only.  This allows a
 	 * non-root user to be granted specific access to pcap
 	 * capabilities via file permissions.
 	 *
 	 * XXX - we should have an API that has a flag that
 	 * controls whether to open read-only or read-write,
 	 * so that denial of permission to send (or inability
 	 * to send, if sending packets isn't supported on
 	 * the device in question) can be indicated at open
 	 * time.
 	 *
 	 * XXX - we assume here that "pfopen()" does not, in fact, modify
 	 * its argument, even though it takes a "char *" rather than a
 	 * "const char *" as its first argument.  That appears to be
 	 * the case, at least on Digital UNIX 4.0.
 	 *
 	 * XXX - is there an error that means "no such device"?  Is
 	 * there one that means "that device doesn't support pf"?
 	 */
 	p->fd = pfopen(p->opt.device, O_RDWR);
 	if (p->fd == -1 && errno == EACCES)
 		p->fd = pfopen(p->opt.device, O_RDONLY);
 	if (p->fd < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "pf open: %s: %s\n\
-your system may not be properly configured; see the packetfilter(4) man page\n",
-			p->opt.device, pcap_strerror(errno));
+		if (errno == EACCES) {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "pf open: %s: Permission denied\n"
+"your system may not be properly configured; see the packetfilter(4) man page",
+			    p->opt.device);
+			err = PCAP_ERROR_PERM_DENIED;
+		} else {
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "pf open: %s", p->opt.device);
+			err = PCAP_ERROR;
+		}
 		goto bad;
 	}
+
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 	pf->OrigMissed = -1;
 	enmode = ENTSTAMP|ENNONEXCL;
 	if (!p->opt.immediate)
 		enmode |= ENBATCH;
 	if (p->opt.promisc)
 		enmode |= ENPROMISC;
 	if (ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCMBIS: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "EIOCMBIS");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 #ifdef	ENCOPYALL
 	/* Try to set COPYALL mode so that we see packets to ourself */
 	enmode = ENCOPYALL;
 	(void)ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode);/* OK if this fails */
 #endif
 	/* set the backlog */
 	if (ioctl(p->fd, EIOCSETW, (caddr_t)&backlog) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSETW: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "EIOCSETW");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	/* discover interface type */
 	if (ioctl(p->fd, EIOCDEVP, (caddr_t)&devparams) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCDEVP: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "EIOCDEVP");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	/* HACK: to compile prior to Ultrix 4.2 */
 #ifndef	ENDT_FDDI
 #define	ENDT_FDDI	4
 #endif
 	switch (devparams.end_dev_type) {
 
 	case ENDT_10MB:
 		p->linktype = DLT_EN10MB;
 		p->offset = 2;
 		/*
 		 * This is (presumably) a real Ethernet capture; give it a
 		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 		 * that an application can let you choose it, in case you're
 		 * capturing DOCSIS traffic that a Cisco Cable Modem
 		 * Termination System is putting out onto an Ethernet (it
 		 * doesn't put an Ethernet header onto the wire, it puts raw
 		 * DOCSIS frames out on the wire inside the low-level
 		 * Ethernet framing).
 		 */
 		p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 		/*
 		 * If that fails, just leave the list empty.
 		 */
 		if (p->dlt_list != NULL) {
 			p->dlt_list[0] = DLT_EN10MB;
 			p->dlt_list[1] = DLT_DOCSIS;
 			p->dlt_count = 2;
 		}
 		break;
 
 	case ENDT_FDDI:
 		p->linktype = DLT_FDDI;
 		break;
 
 #ifdef ENDT_SLIP
 	case ENDT_SLIP:
 		p->linktype = DLT_SLIP;
 		break;
 #endif
 
 #ifdef ENDT_PPP
 	case ENDT_PPP:
 		p->linktype = DLT_PPP;
 		break;
 #endif
 
 #ifdef ENDT_LOOPBACK
 	case ENDT_LOOPBACK:
 		/*
 		 * It appears to use Ethernet framing, at least on
 		 * Digital UNIX 4.0.
 		 */
 		p->linktype = DLT_EN10MB;
 		p->offset = 2;
 		break;
 #endif
 
 #ifdef ENDT_TRN
 	case ENDT_TRN:
 		p->linktype = DLT_IEEE802;
 		break;
 #endif
 
 	default:
 		/*
 		 * XXX - what about ENDT_IEEE802?  The pfilt.h header
 		 * file calls this "IEEE 802 networks (non-Ethernet)",
 		 * but that doesn't specify a specific link layer type;
 		 * it could be 802.4, or 802.5 (except that 802.5 is
 		 * ENDT_TRN), or 802.6, or 802.11, or....  That's why
 		 * DLT_IEEE802 was hijacked to mean Token Ring in various
 		 * BSDs, and why we went along with that hijacking.
 		 *
 		 * XXX - what about ENDT_HDLC and ENDT_NULL?
 		 * Presumably, as ENDT_OTHER is just "Miscellaneous
 		 * framing", there's not much we can do, as that
 		 * doesn't specify a particular type of header.
 		 */
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "unknown data-link type %u", devparams.end_dev_type);
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	/* set truncation */
 	if (p->linktype == DLT_FDDI) {
 		p->fddipad = PCAP_FDDIPAD;
 
 		/* packetfilter includes the padding in the snapshot */
 		p->snapshot += PCAP_FDDIPAD;
 	} else
 		p->fddipad = 0;
 	if (ioctl(p->fd, EIOCTRUNCATE, (caddr_t)&p->snapshot) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCTRUNCATE: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "EIOCTRUNCATE");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	/* accept all packets */
 	memset(&Filter, 0, sizeof(Filter));
 	Filter.enf_Priority = 37;	/* anything > 2 */
 	Filter.enf_FilterLen = 0;	/* means "always true" */
 	if (ioctl(p->fd, EIOCSETF, (caddr_t)&Filter) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSETF: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "EIOCSETF");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 
 	if (p->opt.timeout != 0) {
 		struct timeval timeout;
 		timeout.tv_sec = p->opt.timeout / 1000;
 		timeout.tv_usec = (p->opt.timeout * 1000) % 1000000;
 		if (ioctl(p->fd, EIOCSRTIMEOUT, (caddr_t)&timeout) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSRTIMEOUT: %s",
-				pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "EIOCSRTIMEOUT");
+			err = PCAP_ERROR;
 			goto bad;
 		}
 	}
 
 	p->bufsize = BUFSPACE;
 	p->buffer = malloc(p->bufsize + p->offset);
 	if (p->buffer == NULL) {
-		strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * "select()" and "poll()" work on packetfilter devices.
 	 */
 	p->selectable_fd = p->fd;
 
 	p->read_op = pcap_read_pf;
 	p->inject_op = pcap_inject_pf;
 	p->setfilter_op = pcap_setfilter_pf;
 	p->setdirection_op = NULL;	/* Not implemented. */
 	p->set_datalink_op = NULL;	/* can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_pf;
 
 	return (0);
  bad:
 	pcap_cleanup_live_common(p);
-	return (PCAP_ERROR);
+	return (err);
 }
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_pf));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_pf;
 	return (p);
 }
 
 /*
  * XXX - is there an error from pfopen() that means "no such device"?
  * Is there one that means "that device doesn't support pf"?
  */
 static int
 can_be_bound(const char *name _U_)
 {
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do other than mark loopback devices as "the
+	 * connected/disconnected status doesn't apply".
+	 *
+	 * XXX - is there a way to find out whether an adapter has
+	 * something plugged into it?
+	 */
+	if (*flags & PCAP_IF_LOOPBACK) {
+		/*
+		 * Loopback devices aren't wireless, and "connected"/
+		 * "disconnected" doesn't apply to them.
+		 */
+		*flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+		return (0);
+	}
+	return (0);
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	return (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound));
+	return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+	    get_if_flags));
 }
 
 static int
 pcap_setfilter_pf(pcap_t *p, struct bpf_program *fp)
 {
 	struct pcap_pf *pf = p->priv;
 	struct bpf_version bv;
 
 	/*
 	 * See if BIOCVERSION works.  If not, we assume the kernel doesn't
 	 * support BPF-style filters (it's not documented in the bpf(7)
 	 * or packetfiler(7) man pages, but the code used to fail if
 	 * BIOCSETF worked but BIOCVERSION didn't, and I've seen it do
 	 * kernel filtering in DU 4.0, so presumably BIOCVERSION works
 	 * there, at least).
 	 */
 	if (ioctl(p->fd, BIOCVERSION, (caddr_t)&bv) >= 0) {
 		/*
 		 * OK, we have the version of the BPF interpreter;
 		 * is it the same major version as us, and the same
 		 * or better minor version?
 		 */
 		if (bv.bv_major == BPF_MAJOR_VERSION &&
 		    bv.bv_minor >= BPF_MINOR_VERSION) {
 			/*
 			 * Yes.  Try to install the filter.
 			 */
 			if (ioctl(p->fd, BIOCSETF, (caddr_t)fp) < 0) {
-				pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-				    "BIOCSETF: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    sizeof(p->errbuf), errno, "BIOCSETF");
 				return (-1);
 			}
 
 			/*
 			 * OK, that succeeded.  We're doing filtering in
 			 * the kernel.  (We assume we don't have a
 			 * userland filter installed - that'd require
 			 * a previous version check to have failed but
 			 * this one to succeed.)
 			 *
 			 * XXX - this message should be supplied to the
 			 * application as a warning of some sort,
 			 * except that if it's a GUI application, it's
 			 * not clear that it should be displayed in
 			 * a window to annoy the user.
 			 */
 			fprintf(stderr, "tcpdump: Using kernel BPF filter\n");
 			pf->filtering_in_kernel = 1;
 
 			/*
 			 * Discard any previously-received packets,
 			 * as they might have passed whatever filter
 			 * was formerly in effect, but might not pass
 			 * this filter (BIOCSETF discards packets buffered
 			 * in the kernel, so you can lose packets in any
 			 * case).
 			 */
 			p->cc = 0;
 			return (0);
 		}
 
 		/*
 		 * We can't use the kernel's BPF interpreter; don't give
 		 * up, just log a message and be inefficient.
 		 *
 		 * XXX - this should really be supplied to the application
 		 * as a warning of some sort.
 		 */
 		fprintf(stderr,
 	    "tcpdump: Requires BPF language %d.%d or higher; kernel is %d.%d\n",
 		    BPF_MAJOR_VERSION, BPF_MINOR_VERSION,
 		    bv.bv_major, bv.bv_minor);
 	}
 
 	/*
 	 * We couldn't do filtering in the kernel; do it in userland.
 	 */
 	if (install_bpf_program(p, fp) < 0)
 		return (-1);
 
 	/*
 	 * XXX - this message should be supplied by the application as
 	 * a warning of some sort.
 	 */
 	fprintf(stderr, "tcpdump: Filtering in user process\n");
 	pf->filtering_in_kernel = 0;
 	return (0);
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-rdmasniff.c
===================================================================
--- vendor/libpcap/dist/pcap-rdmasniff.c	(nonexistent)
+++ vendor/libpcap/dist/pcap-rdmasniff.c	(revision 333789)
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2017 Pure Storage, Inc.
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcap-int.h"
+#include "pcap-rdmasniff.h"
+
+#include <infiniband/verbs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#if !defined(IBV_FLOW_ATTR_SNIFFER)
+#define IBV_FLOW_ATTR_SNIFFER	3
+#endif
+
+static const int RDMASNIFF_NUM_RECEIVES = 128;
+static const int RDMASNIFF_RECEIVE_SIZE = 10000;
+
+struct pcap_rdmasniff {
+	struct ibv_device *		rdma_device;
+	struct ibv_context *		context;
+	struct ibv_comp_channel *	channel;
+	struct ibv_pd *			pd;
+	struct ibv_cq *			cq;
+	struct ibv_qp *			qp;
+	struct ibv_flow *               flow;
+	struct ibv_mr *			mr;
+	u_char *			oneshot_buffer;
+	unsigned			port_num;
+	int                             cq_event;
+	u_int                           packets_recv;
+};
+
+static int
+rdmasniff_stats(pcap_t *handle, struct pcap_stat *stat)
+{
+	struct pcap_rdmasniff *priv = handle->priv;
+
+	stat->ps_recv = priv->packets_recv;
+	stat->ps_drop = 0;
+	stat->ps_ifdrop = 0;
+
+	return 0;
+}
+
+static void
+rdmasniff_cleanup(pcap_t *handle)
+{
+	struct pcap_rdmasniff *priv = handle->priv;
+
+	ibv_dereg_mr(priv->mr);
+	ibv_destroy_flow(priv->flow);
+	ibv_destroy_qp(priv->qp);
+	ibv_destroy_cq(priv->cq);
+	ibv_dealloc_pd(priv->pd);
+	ibv_destroy_comp_channel(priv->channel);
+	ibv_close_device(priv->context);
+	free(priv->oneshot_buffer);
+
+	pcap_cleanup_live_common(handle);
+}
+
+static void
+rdmasniff_post_recv(pcap_t *handle, uint64_t wr_id)
+{
+	struct pcap_rdmasniff *priv = handle->priv;
+	struct ibv_sge sg_entry;
+	struct ibv_recv_wr wr, *bad_wr;
+
+	sg_entry.length = RDMASNIFF_RECEIVE_SIZE;
+	sg_entry.addr = (uintptr_t) handle->buffer + RDMASNIFF_RECEIVE_SIZE * wr_id;
+	sg_entry.lkey = priv->mr->lkey;
+
+	wr.wr_id = wr_id;
+	wr.num_sge = 1;
+	wr.sg_list = &sg_entry;
+	wr.next = NULL;
+
+	ibv_post_recv(priv->qp, &wr, &bad_wr);
+}
+
+static int
+rdmasniff_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+{
+	struct pcap_rdmasniff *priv = handle->priv;
+	struct ibv_cq *ev_cq;
+	void *ev_ctx;
+	struct ibv_wc wc;
+	struct pcap_pkthdr pkth;
+	u_char *pktd;
+	int count = 0;
+
+	if (!priv->cq_event) {
+		while (ibv_get_cq_event(priv->channel, &ev_cq, &ev_ctx) < 0) {
+			if (errno != EINTR) {
+				return PCAP_ERROR;
+			}
+			if (handle->break_loop) {
+				handle->break_loop = 0;
+				return PCAP_ERROR_BREAK;
+			}
+		}
+		ibv_ack_cq_events(priv->cq, 1);
+		ibv_req_notify_cq(priv->cq, 0);
+		priv->cq_event = 1;
+	}
+
+	while (count < max_packets || PACKET_COUNT_IS_UNLIMITED(max_packets)) {
+		if (ibv_poll_cq(priv->cq, 1, &wc) != 1) {
+			priv->cq_event = 0;
+			break;
+		}
+
+		if (wc.status != IBV_WC_SUCCESS) {
+			fprintf(stderr, "failed WC wr_id %lld status %d/%s\n",
+				(unsigned long long) wc.wr_id,
+				wc.status, ibv_wc_status_str(wc.status));
+			continue;
+		}
+
+		pkth.len = wc.byte_len;
+		pkth.caplen = min(pkth.len, (u_int)handle->snapshot);
+		gettimeofday(&pkth.ts, NULL);
+
+		pktd = (u_char *) handle->buffer + wc.wr_id * RDMASNIFF_RECEIVE_SIZE;
+
+		if (handle->fcode.bf_insns == NULL ||
+		    bpf_filter(handle->fcode.bf_insns, pktd, pkth.len, pkth.caplen)) {
+			callback(user, &pkth, pktd);
+			++priv->packets_recv;
+			++count;
+		}
+
+		rdmasniff_post_recv(handle, wc.wr_id);
+
+		if (handle->break_loop) {
+			handle->break_loop = 0;
+			return PCAP_ERROR_BREAK;
+		}
+	}
+
+	return count;
+}
+
+static void
+rdmasniff_oneshot(u_char *user, const struct pcap_pkthdr *h, const u_char *bytes)
+{
+	struct oneshot_userdata *sp = (struct oneshot_userdata *) user;
+	pcap_t *handle = sp->pd;
+	struct pcap_rdmasniff *priv = handle->priv;
+
+	*sp->hdr = *h;
+	memcpy(priv->oneshot_buffer, bytes, h->caplen);
+	*sp->pkt = priv->oneshot_buffer;
+}
+
+static int
+rdmasniff_activate(pcap_t *handle)
+{
+	struct pcap_rdmasniff *priv = handle->priv;
+	struct ibv_qp_init_attr qp_init_attr;
+	struct ibv_qp_attr qp_attr;
+	struct ibv_flow_attr flow_attr;
+	struct ibv_port_attr port_attr;
+	int i;
+
+	priv->context = ibv_open_device(priv->rdma_device);
+	if (!priv->context) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to open device %s", handle->opt.device);
+		goto error;
+	}
+
+	priv->pd = ibv_alloc_pd(priv->context);
+	if (!priv->pd) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to alloc PD for device %s", handle->opt.device);
+		goto error;
+	}
+
+	priv->channel = ibv_create_comp_channel(priv->context);
+	if (!priv->channel) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to create comp channel for device %s", handle->opt.device);
+		goto error;
+	}
+
+	priv->cq = ibv_create_cq(priv->context, RDMASNIFF_NUM_RECEIVES,
+				 NULL, priv->channel, 0);
+	if (!priv->cq) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to create CQ for device %s", handle->opt.device);
+		goto error;
+	}
+
+	ibv_req_notify_cq(priv->cq, 0);
+
+	memset(&qp_init_attr, 0, sizeof qp_init_attr);
+	qp_init_attr.send_cq = qp_init_attr.recv_cq = priv->cq;
+	qp_init_attr.cap.max_recv_wr = RDMASNIFF_NUM_RECEIVES;
+	qp_init_attr.cap.max_recv_sge = 1;
+	qp_init_attr.qp_type = IBV_QPT_RAW_PACKET;
+	priv->qp = ibv_create_qp(priv->pd, &qp_init_attr);
+	if (!priv->qp) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to create QP for device %s", handle->opt.device);
+		goto error;
+	}
+
+	memset(&qp_attr, 0, sizeof qp_attr);
+	qp_attr.qp_state = IBV_QPS_INIT;
+	qp_attr.port_num = priv->port_num;
+	if (ibv_modify_qp(priv->qp, &qp_attr, IBV_QP_STATE | IBV_QP_PORT)) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to modify QP to INIT for device %s", handle->opt.device);
+		goto error;
+	}
+
+	memset(&qp_attr, 0, sizeof qp_attr);
+	qp_attr.qp_state = IBV_QPS_RTR;
+	if (ibv_modify_qp(priv->qp, &qp_attr, IBV_QP_STATE)) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to modify QP to RTR for device %s", handle->opt.device);
+		goto error;
+	}
+
+	memset(&flow_attr, 0, sizeof flow_attr);
+	flow_attr.type = IBV_FLOW_ATTR_SNIFFER;
+	flow_attr.size = sizeof flow_attr;
+	flow_attr.port = priv->port_num;
+	priv->flow = ibv_create_flow(priv->qp, &flow_attr);
+	if (!priv->flow) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to create flow for device %s", handle->opt.device);
+		goto error;
+	}
+
+	handle->bufsize = RDMASNIFF_NUM_RECEIVES * RDMASNIFF_RECEIVE_SIZE;
+	handle->buffer = malloc(handle->bufsize);
+	if (!handle->buffer) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to allocate receive buffer for device %s", handle->opt.device);
+		goto error;
+	}
+
+	priv->oneshot_buffer = malloc(RDMASNIFF_RECEIVE_SIZE);
+	if (!priv->oneshot_buffer) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to allocate oneshot buffer for device %s", handle->opt.device);
+		goto error;
+	}
+
+	priv->mr = ibv_reg_mr(priv->pd, handle->buffer, handle->bufsize, IBV_ACCESS_LOCAL_WRITE);
+	if (!priv->mr) {
+		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+			      "Failed to register MR for device %s", handle->opt.device);
+		goto error;
+	}
+
+
+	for (i = 0; i < RDMASNIFF_NUM_RECEIVES; ++i) {
+		rdmasniff_post_recv(handle, i);
+	}
+
+	if (!ibv_query_port(priv->context, priv->port_num, &port_attr) &&
+	    port_attr.link_layer == IBV_LINK_LAYER_INFINIBAND) {
+		handle->linktype = DLT_INFINIBAND;
+	} else {
+		handle->linktype = DLT_EN10MB;
+	}
+
+	if (handle->snapshot <= 0 || handle->snapshot > RDMASNIFF_RECEIVE_SIZE)
+		handle->snapshot = RDMASNIFF_RECEIVE_SIZE;
+
+	handle->offset = 0;
+	handle->read_op = rdmasniff_read;
+	handle->stats_op = rdmasniff_stats;
+	handle->cleanup_op = rdmasniff_cleanup;
+	handle->setfilter_op = install_bpf_program;
+	handle->setdirection_op = NULL;
+	handle->set_datalink_op = NULL;
+	handle->getnonblock_op = pcap_getnonblock_fd;
+	handle->setnonblock_op = pcap_setnonblock_fd;
+	handle->oneshot_callback = rdmasniff_oneshot;
+	handle->selectable_fd = priv->channel->fd;
+
+	return 0;
+
+error:
+	if (priv->mr) {
+		ibv_dereg_mr(priv->mr);
+	}
+
+	if (priv->flow) {
+		ibv_destroy_flow(priv->flow);
+	}
+
+	if (priv->qp) {
+		ibv_destroy_qp(priv->qp);
+	}
+
+	if (priv->cq) {
+		ibv_destroy_cq(priv->cq);
+	}
+
+	if (priv->channel) {
+		ibv_destroy_comp_channel(priv->channel);
+	}
+
+	if (priv->pd) {
+		ibv_dealloc_pd(priv->pd);
+	}
+
+	if (priv->context) {
+		ibv_close_device(priv->context);
+	}
+
+	if (priv->oneshot_buffer) {
+		free(priv->oneshot_buffer);
+	}
+
+	return PCAP_ERROR;
+}
+
+pcap_t *
+rdmasniff_create(const char *device, char *ebuf, int *is_ours)
+{
+	struct pcap_rdmasniff *priv;
+	struct ibv_device **dev_list;
+	int numdev;
+	size_t namelen;
+	const char *port;
+	unsigned port_num;
+	int i;
+	pcap_t *p = NULL;
+
+	*is_ours = 0;
+
+	dev_list = ibv_get_device_list(&numdev);
+	if (!dev_list || !numdev) {
+		return NULL;
+	}
+
+	namelen = strlen(device);
+
+	port = strchr(device, ':');
+	if (port) {
+		port_num = strtoul(port + 1, NULL, 10);
+		if (port_num > 0) {
+			namelen = port - device;
+		} else {
+			port_num = 1;
+		}
+	} else {
+		port_num = 1;
+	}
+
+	for (i = 0; i < numdev; ++i) {
+		if (strlen(dev_list[i]->name) == namelen &&
+		    !strncmp(device, dev_list[i]->name, namelen)) {
+			*is_ours = 1;
+
+			p = pcap_create_common(ebuf, sizeof (struct pcap_rdmasniff));
+			if (p) {
+				p->activate_op = rdmasniff_activate;
+				priv = p->priv;
+				priv->rdma_device = dev_list[i];
+				priv->port_num = port_num;
+			}
+			break;
+		}
+	}
+
+	ibv_free_device_list(dev_list);
+	return p;
+}
+
+int
+rdmasniff_findalldevs(pcap_if_list_t *devlistp, char *err_str)
+{
+	struct ibv_device **dev_list;
+	int numdev;
+	int i;
+	int ret = 0;
+
+	dev_list = ibv_get_device_list(&numdev);
+	if (!dev_list || !numdev) {
+		return 0;
+	}
+
+	for (i = 0; i < numdev; ++i) {
+		/*
+		 * XXX - do the notions of "up", "running", or
+		 * "connected" apply here?
+		 */
+		if (!add_dev(devlistp, dev_list[i]->name, 0, "RDMA sniffer", err_str)) {
+			ret = -1;
+			goto out;
+		}
+	}
+
+out:
+	ibv_free_device_list(dev_list);
+	return ret;
+}

Property changes on: vendor/libpcap/dist/pcap-rdmasniff.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-rdmasniff.h
===================================================================
--- vendor/libpcap/dist/pcap-rdmasniff.h	(nonexistent)
+++ vendor/libpcap/dist/pcap-rdmasniff.h	(revision 333789)
@@ -0,0 +1,2 @@
+pcap_t *rdmasniff_create(const char *device, char *ebuf, int *is_ours);
+int rdmasniff_findalldevs(pcap_if_list_t *devlistp, char *err_str);

Property changes on: vendor/libpcap/dist/pcap-rdmasniff.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-rpcap-int.h
===================================================================
--- vendor/libpcap/dist/pcap-rpcap-int.h	(nonexistent)
+++ vendor/libpcap/dist/pcap-rpcap-int.h	(revision 333789)
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef __PCAP_RPCAP_INT_H__
+#define __PCAP_RPCAP_INT_H__
+
+#include "pcap.h"
+#include "sockutils.h"	/* Needed for some structures (like SOCKET, sockaddr_in) which are used here */
+
+/*
+ * \file pcap-rpcap-int.h
+ *
+ * This file keeps all the definitions used by the RPCAP client and server,
+ * other than the protocol definitions.
+ *
+ * \warning All the RPCAP functions that are allowed to return a buffer containing
+ * the error description can return max PCAP_ERRBUF_SIZE characters.
+ * However there is no guarantees that the string will be zero-terminated.
+ * Best practice is to define the errbuf variable as a char of size 'PCAP_ERRBUF_SIZE+1'
+ * and to insert manually the termination char at the end of the buffer. This will
+ * guarantee that no buffer overflows occur even if we use the printf() to show
+ * the error on the screen.
+ */
+
+/*********************************************************
+ *                                                       *
+ * General definitions / typedefs for the RPCAP protocol *
+ *                                                       *
+ *********************************************************/
+
+/*
+ * \brief Buffer used by socket functions to send-receive packets.
+ * In case you plan to have messages larger than this value, you have to increase it.
+ */
+#define RPCAP_NETBUF_SIZE 64000
+
+/*********************************************************
+ *                                                       *
+ * Exported function prototypes                          *
+ *                                                       *
+ *********************************************************/
+void rpcap_createhdr(struct rpcap_header *header, uint8 type, uint16 value, uint32 length);
+int rpcap_senderror(SOCKET sock, char *error, unsigned short errcode, char *errbuf);
+
+#endif

Property changes on: vendor/libpcap/dist/pcap-rpcap-int.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-rpcap.c
===================================================================
--- vendor/libpcap/dist/pcap-rpcap.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-rpcap.c	(revision 333789)
@@ -1,2127 +1,3310 @@
 /*
  * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
  * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the Politecnico di Torino, CACE Technologies
  * nor the names of its contributors may be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#include "ftmacros.h"
+
 #include <string.h>		/* for strlen(), ... */
 #include <stdlib.h>		/* for malloc(), free(), ... */
 #include <stdarg.h>		/* for functions with variable number of arguments */
 #include <errno.h>		/* for the errno variable */
+#include "sockutils.h"
 #include "pcap-int.h"
+#include "rpcap-protocol.h"
 #include "pcap-rpcap.h"
-#include "sockutils.h"
 
 /*
- * \file pcap-rpcap.c
+ * This file contains the pcap module for capturing from a remote machine's
+ * interfaces using the RPCAP protocol.
  *
- * This file keeps all the new funtions that are needed for the RPCAP protocol.
- * Almost all the pcap functions need to be modified in order to become compatible
- * with the RPCAP protocol. However, you can find here only the ones that are completely new.
- *
- * This file keeps also the functions that are 'private', i.e. are needed by the RPCAP
- * protocol but are not exported to the user.
- *
- * \warning All the RPCAP functions that are allowed to return a buffer containing
- * the error description can return max PCAP_ERRBUF_SIZE characters.
+ * WARNING: All the RPCAP functions that are allowed to return a buffer
+ * containing the error description can return max PCAP_ERRBUF_SIZE characters.
  * However there is no guarantees that the string will be zero-terminated.
- * Best practice is to define the errbuf variable as a char of size 'PCAP_ERRBUF_SIZE+1'
- * and to insert manually a NULL character at the end of the buffer. This will
- * guarantee that no buffer overflows occur even if we use the printf() to show
- * the error on the screen.
+ * Best practice is to define the errbuf variable as a char of size
+ * 'PCAP_ERRBUF_SIZE+1' and to insert manually a NULL character at the end
+ * of the buffer. This will guarantee that no buffer overflows occur even
+ * if we use the printf() to show the error on the screen.
+ *
+ * XXX - actually, null-terminating the error string is part of the
+ * contract for the pcap API; if there's any place in the pcap code
+ * that doesn't guarantee null-termination, even at the expense of
+ * cutting the message short, that's a bug and needs to be fixed.
  */
 
-#define PCAP_STATS_STANDARD	0	/* Used by pcap_stats_remote to see if we want standard or extended statistics */
-#define PCAP_STATS_EX		1	/* Used by pcap_stats_remote to see if we want standard or extended statistics */
+#define PCAP_STATS_STANDARD	0	/* Used by pcap_stats_rpcap to see if we want standard or extended statistics */
+#ifdef _WIN32
+#define PCAP_STATS_EX		1	/* Used by pcap_stats_rpcap to see if we want standard or extended statistics */
+#endif
 
+/*
+ * \brief Keeps a list of all the opened connections in the active mode.
+ *
+ * This structure defines a linked list of items that are needed to keep the info required to
+ * manage the active mode.
+ * In other words, when a new connection in active mode starts, this structure is updated so that
+ * it reflects the list of active mode connections currently opened.
+ * This structure is required by findalldevs() and open_remote() to see if they have to open a new
+ * control connection toward the host, or they already have a control connection in place.
+ */
+struct activehosts
+{
+	struct sockaddr_storage host;
+	SOCKET sockctrl;
+	uint8 protocol_version;
+	struct activehosts *next;
+};
+
 /* Keeps a list of all the opened connections in the active mode. */
-struct activehosts *activeHosts;
+static struct activehosts *activeHosts;
 
 /*
- * Private data for capturing on WinPcap devices.
+ * Keeps the main socket identifier when we want to accept a new remote
+ * connection (active mode only).
+ * See the documentation of pcap_remoteact_accept() and
+ * pcap_remoteact_cleanup() for more details.
  */
-struct pcap_win {
-	int nonblock;
-	int rfmon_selfstart;		/* a flag tells whether the monitor mode is set by itself */
-	int filtering_in_kernel;	/* using kernel filter */
+static SOCKET sockmain;
 
-#ifdef HAVE_DAG_API
-	int	dag_fcs_bits;		/* Number of checksum bits from link layer */
-#endif
+/*
+ * Private data for capturing remotely using the rpcap protocol.
+ */
+struct pcap_rpcap {
+	/*
+	 * This is '1' if we're the network client; it is needed by several
+	 * functions (such as pcap_setfilter()) to know whether they have
+	 * to use the socket or have to open the local adapter.
+	 */
+	int rmt_clientside;
+
+	SOCKET rmt_sockctrl;		/* socket ID of the socket used for the control connection */
+	SOCKET rmt_sockdata;		/* socket ID of the socket used for the data connection */
+	int rmt_flags;			/* we have to save flags, since they are passed by the pcap_open_live(), but they are used by the pcap_startcapture() */
+	int rmt_capstarted;		/* 'true' if the capture is already started (needed to knoe if we have to call the pcap_startcapture() */
+	char *currentfilter;		/* Pointer to a buffer (allocated at run-time) that stores the current filter. Needed when flag PCAP_OPENFLAG_NOCAPTURE_RPCAP is turned on. */
+
+	uint8 protocol_version;		/* negotiated protocol version */
+
+	unsigned int TotNetDrops;	/* keeps the number of packets that have been dropped by the network */
+
+	/*
+	 * This keeps the number of packets that have been received by the
+	 * application.
+	 *
+	 * Packets dropped by the kernel buffer are not counted in this
+	 * variable. It is always equal to (TotAccepted - TotDrops),
+	 * except for the case of remote capture, in which we have also
+	 * packets in flight, i.e. that have been transmitted by the remote
+	 * host, but that have not been received (yet) from the client.
+	 * In this case, (TotAccepted - TotDrops - TotNetDrops) gives a
+	 * wrong result, since this number does not corresponds always to
+	 * the number of packet received by the application. For this reason,
+	 * in the remote capture we need another variable that takes into
+	 * account of the number of packets actually received by the
+	 * application.
+	 */
+	unsigned int TotCapt;
+
+	struct pcap_stat stat;
+	/* XXX */
+	struct pcap *next;		/* list of open pcaps that need stuff cleared on close */
 };
 
 /****************************************************
  *                                                  *
  * Locally defined functions                        *
  *                                                  *
  ****************************************************/
-static int rpcap_checkver(SOCKET sock, struct rpcap_header *header, char *errbuf);
-static struct pcap_stat *rpcap_stats_remote(pcap_t *p, struct pcap_stat *ps, int mode);
+static struct pcap_stat *rpcap_stats_rpcap(pcap_t *p, struct pcap_stat *ps, int mode);
 static int pcap_pack_bpffilter(pcap_t *fp, char *sendbuf, int *sendbufidx, struct bpf_program *prog);
 static int pcap_createfilter_norpcappkt(pcap_t *fp, struct bpf_program *prog);
 static int pcap_updatefilter_remote(pcap_t *fp, struct bpf_program *prog);
-static int pcap_setfilter_remote(pcap_t *fp, struct bpf_program *prog);
-static int pcap_setsampling_remote(pcap_t *p);
+static void pcap_save_current_filter_rpcap(pcap_t *fp, const char *filter);
+static int pcap_setfilter_rpcap(pcap_t *fp, struct bpf_program *prog);
+static int pcap_setsampling_remote(pcap_t *fp);
+static int pcap_startcapture_remote(pcap_t *fp);
+static int rpcap_sendauth(SOCKET sock, uint8 *ver, struct pcap_rmtauth *auth, char *errbuf);
+static int rpcap_recv_msg_header(SOCKET sock, struct rpcap_header *header, char *errbuf);
+static int rpcap_check_msg_ver(SOCKET sock, uint8 expected_ver, struct rpcap_header *header, char *errbuf);
+static int rpcap_check_msg_type(SOCKET sock, uint8 request_type, struct rpcap_header *header, uint16 *errcode, char *errbuf);
+static int rpcap_process_msg_header(SOCKET sock, uint8 ver, uint8 request_type, struct rpcap_header *header, char *errbuf);
+static int rpcap_recv(SOCKET sock, void *buffer, size_t toread, uint32 *plen, char *errbuf);
+static void rpcap_msg_err(SOCKET sockctrl, uint32 plen, char *remote_errbuf);
+static int rpcap_discard(SOCKET sock, uint32 len, char *errbuf);
+static int rpcap_read_packet_msg(SOCKET sock, pcap_t *p, size_t size);
 
-
 /****************************************************
  *                                                  *
  * Function bodies                                  *
  *                                                  *
  ****************************************************/
 
 /*
- * \ingroup remote_pri_func
+ * This function translates (i.e. de-serializes) a 'rpcap_sockaddr'
+ * structure from the network byte order to a 'sockaddr_in" or
+ * 'sockaddr_in6' structure in the host byte order.
  *
- * \brief 	It traslates (i.e. de-serializes) a 'sockaddr_storage' structure from
- * the network byte order to the host byte order.
+ * It accepts an 'rpcap_sockaddr' structure as it is received from the
+ * network, and checks the address family field against various values
+ * to see whether it looks like an IPv4 address, an IPv6 address, or
+ * neither of those.  It checks for multiple values in order to try
+ * to handle older rpcap daemons that sent the native OS's 'sockaddr_in'
+ * or 'sockaddr_in6' structures over the wire with some members
+ * byte-swapped, and to handle the fact that AF_INET6 has different
+ * values on different OSes.
  *
- * It accepts a 'sockaddr_storage' structure as it is received from the network and it
- * converts it into the host byte order (by means of a set of ntoh() ).
- * The function will allocate the 'sockaddrout' variable according to the address family
- * in use. In case the address does not belong to the AF_INET nor AF_INET6 families,
- * 'sockaddrout' is not allocated and a NULL pointer is returned.
- * This usually happens because that address does not exist on the other host, so the
- * RPCAP daemon sent a 'sockaddr_storage' structure containing all 'zero' values.
+ * For IPv4 addresses, it converts the address family to host byte
+ * order from network byte order and puts it into the structure,
+ * sets the length if a sockaddr structure has a length, converts the
+ * port number to host byte order from network byte order and puts
+ * it into the structure, copies over the IPv4 address, and zeroes
+ * out the zero padding.
  *
- * \param sockaddrin: a 'sockaddr_storage' pointer to the variable that has to be
- * de-serialized.
+ * For IPv6 addresses, it converts the address family to host byte
+ * order from network byte order and puts it into the structure,
+ * sets the length if a sockaddr structure has a length, converts the
+ * port number and flow information to host byte order from network
+ * byte order and puts them into the structure, copies over the IPv6
+ * address, and converts the scope ID to host byte order from network
+ * byte order and puts it into the structure.
  *
+ * The function will allocate the 'sockaddrout' variable according to the
+ * address family in use. In case the address does not belong to the
+ * AF_INET nor AF_INET6 families, 'sockaddrout' is not allocated and a
+ * NULL pointer is returned.  This usually happens because that address
+ * does not exist on the other host, or is of an address family other
+ * than AF_INET or AF_INET6, so the RPCAP daemon sent a 'sockaddr_storage'
+ * structure containing all 'zero' values.
+ *
+ * Older RPCAPDs sent the addresses over the wire in the OS's native
+ * structure format.  For most OSes, this looks like the over-the-wire
+ * format, but might have a different value for AF_INET6 than the value
+ * on the machine receiving the reply.  For OSes with the newer BSD-style
+ * sockaddr structures, this has, instead of a 2-byte address family,
+ * a 1-byte structure length followed by a 1-byte address family.  The
+ * RPCAPD code would put the address family in network byte order before
+ * sending it; that would set it to 0 on a little-endian machine, as
+ * htons() of any value between 1 and 255 would result in a value > 255,
+ * with its lower 8 bits zero, so putting that back into a 1-byte field
+ * would set it to 0.
+ *
+ * Therefore, for older RPCAPDs running on an OS with newer BSD-style
+ * sockaddr structures, the family field, if treated as a big-endian
+ * (network byte order) 16-bit field, would be:
+ *
+ *	(length << 8) | family if sent by a big-endian machine
+ *	(length << 8) if sent by a little-endian machine
+ *
+ * For current RPCAPDs, and for older RPCAPDs running on an OS with
+ * older BSD-style sockaddr structures, the family field, if treated
+ * as a big-endian 16-bit field, would just contain the family.
+ *
+ * \param sockaddrin: a 'rpcap_sockaddr' pointer to the variable that has
+ * to be de-serialized.
+ *
  * \param sockaddrout: a 'sockaddr_storage' pointer to the variable that will contain
  * the de-serialized data. The structure returned can be either a 'sockaddr_in' or 'sockaddr_in6'.
  * This variable will be allocated automatically inside this function.
  *
  * \param errbuf: a pointer to a user-allocated buffer (of size PCAP_ERRBUF_SIZE)
  * that will contain the error message (in case there is one).
  *
  * \return '0' if everything is fine, '-1' if some errors occurred. Basically, the error
  * can be only the fact that the malloc() failed to allocate memory.
  * The error message is returned in the 'errbuf' variable, while the deserialized address
  * is returned into the 'sockaddrout' variable.
  *
  * \warning This function supports only AF_INET and AF_INET6 address families.
  *
  * \warning The sockaddrout (if not NULL) must be deallocated by the user.
  */
-int rpcap_deseraddr(struct sockaddr_storage *sockaddrin, struct sockaddr_storage **sockaddrout, char *errbuf)
+
+/*
+ * Possible IPv4 family values other than the designated over-the-wire value,
+ * which is 2 (because everybody uses 2 for AF_INET4).
+ */
+#define SOCKADDR_IN_LEN		16	/* length of struct sockaddr_in */
+#define SOCKADDR_IN6_LEN	28	/* length of struct sockaddr_in6 */
+#define NEW_BSD_AF_INET_BE	((SOCKADDR_IN_LEN << 8) | 2)
+#define NEW_BSD_AF_INET_LE	(SOCKADDR_IN_LEN << 8)
+
+/*
+ * Possible IPv6 family values other than the designated over-the-wire value,
+ * which is 23 (because that's what Windows uses, and most RPCAP servers
+ * out there are probably running Windows, as WinPcap includes the server
+ * but few if any UN*Xes build and ship it).
+ *
+ * The new BSD sockaddr structure format was in place before 4.4-Lite, so
+ * all the free-software BSDs use it.
+ */
+#define NEW_BSD_AF_INET6_BSD_BE		((SOCKADDR_IN6_LEN << 8) | 24)	/* NetBSD, OpenBSD, BSD/OS */
+#define NEW_BSD_AF_INET6_FREEBSD_BE	((SOCKADDR_IN6_LEN << 8) | 28)	/* FreeBSD, DragonFly BSD */
+#define NEW_BSD_AF_INET6_DARWIN_BE	((SOCKADDR_IN6_LEN << 8) | 30)	/* macOS, iOS, anything else Darwin-based */
+#define NEW_BSD_AF_INET6_LE		(SOCKADDR_IN6_LEN << 8)
+#define LINUX_AF_INET6			10
+#define HPUX_AF_INET6			22
+#define AIX_AF_INET6			24
+#define SOLARIS_AF_INET6		26
+
+static int
+rpcap_deseraddr(struct rpcap_sockaddr *sockaddrin, struct sockaddr_storage **sockaddrout, char *errbuf)
 {
 	/* Warning: we support only AF_INET and AF_INET6 */
-	if (ntohs(sockaddrin->ss_family) == AF_INET)
+	switch (ntohs(sockaddrin->family))
 	{
-		struct sockaddr_in *sockaddr;
+	case RPCAP_AF_INET:
+	case NEW_BSD_AF_INET_BE:
+	case NEW_BSD_AF_INET_LE:
+		{
+		struct rpcap_sockaddr_in *sockaddrin_ipv4;
+		struct sockaddr_in *sockaddrout_ipv4;
 
-		sockaddr = (struct sockaddr_in *) sockaddrin;
-		sockaddr->sin_family = ntohs(sockaddr->sin_family);
-		sockaddr->sin_port = ntohs(sockaddr->sin_port);
-
 		(*sockaddrout) = (struct sockaddr_storage *) malloc(sizeof(struct sockaddr_in));
 		if ((*sockaddrout) == NULL)
 		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc() failed");
 			return -1;
 		}
-		memcpy(*sockaddrout, sockaddr, sizeof(struct sockaddr_in));
-		return 0;
-	}
-	if (ntohs(sockaddrin->ss_family) == AF_INET6)
-	{
-		struct sockaddr_in6 *sockaddr;
+		sockaddrin_ipv4 = (struct rpcap_sockaddr_in *) sockaddrin;
+		sockaddrout_ipv4 = (struct sockaddr_in *) (*sockaddrout);
+		sockaddrout_ipv4->sin_family = AF_INET;
+		sockaddrout_ipv4->sin_port = ntohs(sockaddrin_ipv4->port);
+		memcpy(&sockaddrout_ipv4->sin_addr, &sockaddrin_ipv4->addr, sizeof(sockaddrout_ipv4->sin_addr));
+		memset(sockaddrout_ipv4->sin_zero, 0, sizeof(sockaddrout_ipv4->sin_zero));
+		break;
+		}
 
-		sockaddr = (struct sockaddr_in6 *) sockaddrin;
-		sockaddr->sin6_family = ntohs(sockaddr->sin6_family);
-		sockaddr->sin6_port = ntohs(sockaddr->sin6_port);
-		sockaddr->sin6_flowinfo = ntohl(sockaddr->sin6_flowinfo);
-		sockaddr->sin6_scope_id = ntohl(sockaddr->sin6_scope_id);
+#ifdef AF_INET6
+	case RPCAP_AF_INET6:
+	case NEW_BSD_AF_INET6_BSD_BE:
+	case NEW_BSD_AF_INET6_FREEBSD_BE:
+	case NEW_BSD_AF_INET6_DARWIN_BE:
+	case NEW_BSD_AF_INET6_LE:
+	case LINUX_AF_INET6:
+	case HPUX_AF_INET6:
+	case AIX_AF_INET6:
+	case SOLARIS_AF_INET6:
+		{
+		struct rpcap_sockaddr_in6 *sockaddrin_ipv6;
+		struct sockaddr_in6 *sockaddrout_ipv6;
 
 		(*sockaddrout) = (struct sockaddr_storage *) malloc(sizeof(struct sockaddr_in6));
 		if ((*sockaddrout) == NULL)
 		{
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc() failed: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc() failed");
 			return -1;
 		}
-		memcpy(*sockaddrout, sockaddr, sizeof(struct sockaddr_in6));
-		return 0;
-	}
+		sockaddrin_ipv6 = (struct rpcap_sockaddr_in6 *) sockaddrin;
+		sockaddrout_ipv6 = (struct sockaddr_in6 *) (*sockaddrout);
+		sockaddrout_ipv6->sin6_family = AF_INET6;
+		sockaddrout_ipv6->sin6_port = ntohs(sockaddrin_ipv6->port);
+		sockaddrout_ipv6->sin6_flowinfo = ntohl(sockaddrin_ipv6->flowinfo);
+		memcpy(&sockaddrout_ipv6->sin6_addr, &sockaddrin_ipv6->addr, sizeof(sockaddrout_ipv6->sin6_addr));
+		sockaddrout_ipv6->sin6_scope_id = ntohl(sockaddrin_ipv6->scope_id);
+		break;
+		}
+#endif
 
-	/* It is neither AF_INET nor AF_INET6 */
-	*sockaddrout = NULL;
+	default:
+		/*
+		 * It is neither AF_INET nor AF_INET6 (or, if the OS doesn't
+		 * support AF_INET6, it's not AF_INET).
+		 */
+		*sockaddrout = NULL;
+		break;
+	}
 	return 0;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function reads a packet from the network socket.  It does not
+ * deliver the packet to a pcap_dispatch()/pcap_loop() callback (hence
+ * the "nocb" string into its name).
  *
- * \brief It reads a packet from the network socket. This does not make use of
- * callback (hence the "nocb" string into its name).
+ * This function is called by pcap_read_rpcap().
  *
- * This function is called by the several pcap_next_ex() when they detect that
- * we have a remote capture and they are the client side. In that case, they need
- * to read packets from the socket.
- *
- * Parameters and return values are exactly the same of the pcap_next_ex().
- *
- * \warning By choice, this function does not make use of semaphores. A smarter
+ * WARNING: By choice, this function does not make use of semaphores. A smarter
  * implementation should put a semaphore into the data thread, and a signal will
  * be raised as soon as there is data into the socket buffer.
  * However this is complicated and it does not bring any advantages when reading
  * from the network, in which network delays can be much more important than
  * these optimizations. Therefore, we chose the following approach:
  * - the 'timeout' chosen by the user is split in two (half on the server side,
  * with the usual meaning, and half on the client side)
  * - this function checks for packets; if there are no packets, it waits for
  * timeout/2 and then it checks again. If packets are still missing, it returns,
  * otherwise it reads packets.
  */
-static int pcap_read_nocb_remote(pcap_t *p, struct pcap_pkthdr **pkt_header, u_char **pkt_data)
+static int pcap_read_nocb_remote(pcap_t *p, struct pcap_pkthdr *pkt_header, u_char **pkt_data)
 {
+	struct pcap_rpcap *pr = p->priv;	/* structure used when doing a remote live capture */
 	struct rpcap_header *header;		/* general header according to the RPCAP format */
-	struct rpcap_pkthdr *net_pkt_header;	/* header of the packet */
-	char netbuf[RPCAP_NETBUF_SIZE];		/* size of the network buffer in which the packet is copied, just for UDP */
-	uint32 totread;				/* number of bytes (of payload) currently read from the network (referred to the current pkt) */
-	int nread;
+	struct rpcap_pkthdr *net_pkt_header;	/* header of the packet, from the message */
+	u_char *net_pkt_data;			/* packet data from the message */
+	uint32 plen;
 	int retval;				/* generic return value */
+	int msglen;
 
 	/* Structures needed for the select() call */
-	fd_set rfds;				/* set of socket descriptors we have to check */
 	struct timeval tv;			/* maximum time the select() can block waiting for data */
-	struct pcap_md *md;			/* structure used when doing a remote live capture */
+	fd_set rfds;				/* set of socket descriptors we have to check */
 
-	md = (struct pcap_md *) ((u_char*)p->priv + sizeof(struct pcap_win));
-
 	/*
-	 * Define the read timeout, to be used in the select()
+	 * Define the packet buffer timeout, to be used in the select()
 	 * 'timeout', in pcap_t, is in milliseconds; we have to convert it into sec and microsec
 	 */
 	tv.tv_sec = p->opt.timeout / 1000;
 	tv.tv_usec = (p->opt.timeout - tv.tv_sec * 1000) * 1000;
 
 	/* Watch out sockdata to see if it has input */
 	FD_ZERO(&rfds);
 
 	/*
 	 * 'fp->rmt_sockdata' has always to be set before calling the select(),
 	 * since it is cleared by the select()
 	 */
-	FD_SET(md->rmt_sockdata, &rfds);
+	FD_SET(pr->rmt_sockdata, &rfds);
 
-	retval = select((int) md->rmt_sockdata + 1, &rfds, NULL, NULL, &tv);
+	retval = select((int) pr->rmt_sockdata + 1, &rfds, NULL, NULL, &tv);
 	if (retval == -1)
 	{
+#ifndef _WIN32
+		if (errno == EINTR)
+		{
+			/* Interrupted. */
+			return 0;
+		}
+#endif
 		sock_geterror("select(): ", p->errbuf, PCAP_ERRBUF_SIZE);
 		return -1;
 	}
 
 	/* There is no data waiting, so return '0' */
 	if (retval == 0)
 		return 0;
 
 	/*
-	 * data is here; so, let's copy it into the user buffer.
-	 * I'm going to read a new packet; so I reset the number of bytes (payload only) read
-	 */
-	totread = 0;
-
-	/*
 	 * We have to define 'header' as a pointer to a larger buffer,
 	 * because in case of UDP we have to read all the message within a single call
 	 */
-	header = (struct rpcap_header *) netbuf;
-	net_pkt_header = (struct rpcap_pkthdr *) (netbuf + sizeof(struct rpcap_header));
+	header = (struct rpcap_header *) p->buffer;
+	net_pkt_header = (struct rpcap_pkthdr *) ((char *)p->buffer + sizeof(struct rpcap_header));
+	net_pkt_data = (u_char *)p->buffer + sizeof(struct rpcap_header) + sizeof(struct rpcap_pkthdr);
 
-	if (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
+	if (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
 	{
 		/* Read the entire message from the network */
-		if (sock_recv(md->rmt_sockdata, netbuf, RPCAP_NETBUF_SIZE, SOCK_RECEIVEALL_NO, p->errbuf, PCAP_ERRBUF_SIZE) == -1)
+		msglen = sock_recv_dgram(pr->rmt_sockdata, p->buffer,
+		    p->bufsize, p->errbuf, PCAP_ERRBUF_SIZE);
+		if (msglen == -1)
+		{
+			/* Network error. */
 			return -1;
+		}
+		if (msglen == -3)
+		{
+			/* Interrupted receive. */
+			return 0;
+		}
+		if ((size_t)msglen < sizeof(struct rpcap_header))
+		{
+			/*
+			 * Message is shorter than an rpcap header.
+			 */
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "UDP packet message is shorter than an rpcap header");
+			return -1;
+		}
+		plen = ntohl(header->plen);
+		if ((size_t)msglen < sizeof(struct rpcap_header) + plen)
+		{
+			/*
+			 * Message is shorter than the header claims it
+			 * is.
+			 */
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "UDP packet message is shorter than its rpcap header claims");
+			return -1;
+		}
 	}
 	else
 	{
-		if (sock_recv(md->rmt_sockdata, netbuf, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, p->errbuf, PCAP_ERRBUF_SIZE) == -1)
-			return -1;
-	}
+		int status;
 
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(p->errbuf, md->rmt_sockdata, header, RPCAP_MSG_PACKET, 0);
+		if ((size_t)p->cc < sizeof(struct rpcap_header))
+		{
+			/*
+			 * We haven't read any of the packet header yet.
+			 * The size we should get is the size of the
+			 * packet header.
+			 */
+			status = rpcap_read_packet_msg(pr->rmt_sockdata, p,
+			    sizeof(struct rpcap_header));
+			if (status == -1)
+			{
+				/* Network error. */
+				return -1;
+			}
+			if (status == -3)
+			{
+				/* Interrupted receive. */
+				return 0;
+			}
+		}
 
-	if (retval != RPCAP_MSG_PACKET)		/* the message is not the one expected */
-	{
-		switch (retval)
+		/*
+		 * We have the header, so we know how long the
+		 * message payload is.  The size we should get
+		 * is the size of the packet header plus the
+		 * size of the payload.
+		 */
+		plen = ntohl(header->plen);
+		if (plen > p->bufsize - sizeof(struct rpcap_header))
 		{
-		case -3:		/* Unrecoverable network error */
-			return -1;	/* Do nothing; just exit from here; the error code is already into the errbuf */
+			/*
+			 * This is bigger than the largest
+			 * record we'd expect.  (We do it by
+			 * subtracting in order to avoid an
+			 * overflow.)
+			 */
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "Server sent us a message larger than the largest expected packet message");
+			return -1;
+		}
+		status = rpcap_read_packet_msg(pr->rmt_sockdata, p,
+		    sizeof(struct rpcap_header) + plen);
+		if (status == -1)
+		{
+			/* Network error. */
+			return -1;
+		}
+		if (status == -3)
+		{
+			/* Interrupted receive. */
+			return 0;
+		}
 
-		case -2:		/* The other endpoint sent a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			return 0;	/* Return 'no packets received' */
+		/*
+		 * We have the entire message; reset the buffer pointer
+		 * and count, as the next read should start a new
+		 * message.
+		 */
+		p->bp = p->buffer;
+		p->cc = 0;
+	}
 
-		default:
-			SOCK_ASSERT("Internal error", 1);
-			return 0;	/* Return 'no packets received' */
-		}
+	/*
+	 * We have the entire message.
+	 */
+	header->plen = plen;
+
+	/*
+	 * Did the server specify the version we negotiated?
+	 */
+	if (rpcap_check_msg_ver(pr->rmt_sockdata, pr->protocol_version,
+	    header, p->errbuf) == -1)
+	{
+		return 0;	/* Return 'no packets received' */
 	}
 
-	/* In case of TCP, read the remaining of the packet from the socket */
-	if (!(md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
+	/*
+	 * Is this a RPCAP_MSG_PACKET message?
+	 */
+	if (header->type != RPCAP_MSG_PACKET)
 	{
-		/* Read the RPCAP packet header from the network */
-		nread = sock_recv(md->rmt_sockdata, (char *)net_pkt_header,
-		    sizeof(struct rpcap_pkthdr), SOCK_RECEIVEALL_YES,
-		    p->errbuf, PCAP_ERRBUF_SIZE);
-		if (nread == -1)
-			return -1;
-		totread += nread;
+		return 0;	/* Return 'no packets received' */
 	}
 
-	if ((ntohl(net_pkt_header->caplen) + sizeof(struct pcap_pkthdr)) <= p->bufsize)
+	if (ntohl(net_pkt_header->caplen) > plen)
 	{
-		/* Initialize returned structures */
-		*pkt_header = (struct pcap_pkthdr *) p->buffer;
-		*pkt_data = (u_char*)p->buffer + sizeof(struct pcap_pkthdr);
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Packet's captured data goes past the end of the received packet message.");
+		return -1;
+	}
 
-		(*pkt_header)->caplen = ntohl(net_pkt_header->caplen);
-		(*pkt_header)->len = ntohl(net_pkt_header->len);
-		(*pkt_header)->ts.tv_sec = ntohl(net_pkt_header->timestamp_sec);
-		(*pkt_header)->ts.tv_usec = ntohl(net_pkt_header->timestamp_usec);
+	/* Fill in packet header */
+	pkt_header->caplen = ntohl(net_pkt_header->caplen);
+	pkt_header->len = ntohl(net_pkt_header->len);
+	pkt_header->ts.tv_sec = ntohl(net_pkt_header->timestamp_sec);
+	pkt_header->ts.tv_usec = ntohl(net_pkt_header->timestamp_usec);
 
-		/*
-		 * I don't update the counter of the packets dropped by the network since we're using TCP,
-		 * therefore no packets are dropped. Just update the number of packets received correctly
-		 */
-		md->TotCapt++;
+	/* Supply a pointer to the beginning of the packet data */
+	*pkt_data = net_pkt_data;
 
-		/* Copies the packet into the data buffer */
-		if (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
-		{
-			unsigned int npkt;
+	/*
+	 * I don't update the counter of the packets dropped by the network since we're using TCP,
+	 * therefore no packets are dropped. Just update the number of packets received correctly
+	 */
+	pr->TotCapt++;
 
-			/*
-			 * In case of UDP the packet has already been read, we have to copy it into 'buffer'.
-			 * Another option should be to declare 'netbuf' as 'static'. However this prevents
-			 * using several pcap instances within the same process (because the static buffer is shared among
-			 * all processes)
-			 */
-			memcpy(*pkt_data, netbuf + sizeof(struct rpcap_header) + sizeof(struct rpcap_pkthdr), (*pkt_header)->caplen);
+	if (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
+	{
+		unsigned int npkt;
 
-			/* We're using UDP, so we need to update the counter of the packets dropped by the network */
-			npkt = ntohl(net_pkt_header->npkt);
+		/* We're using UDP, so we need to update the counter of the packets dropped by the network */
+		npkt = ntohl(net_pkt_header->npkt);
 
-			if (md->TotCapt != npkt)
-			{
-				md->TotNetDrops += (npkt - md->TotCapt);
-				md->TotCapt = npkt;
-			}
-
-		}
-		else
+		if (pr->TotCapt != npkt)
 		{
-			/* In case of TCP, read the remaining of the packet from the socket */
-			nread = sock_recv(md->rmt_sockdata, *pkt_data,
-			    (*pkt_header)->caplen, SOCK_RECEIVEALL_YES,
-			    p->errbuf, PCAP_ERRBUF_SIZE);
-			if (nread == -1)
-				return -1;
-			totread += nread;
-
-			/* Checks if all the data has been read; if not, discard the data in excess */
-			/* This check has to be done only on TCP connections */
-			if (totread != ntohl(header->plen))
-				sock_discard(md->rmt_sockdata, ntohl(header->plen) - totread, NULL, 0);
+			pr->TotNetDrops += (npkt - pr->TotCapt);
+			pr->TotCapt = npkt;
 		}
-
-
-		/* Packet read successfully */
-		return 1;
 	}
-	else
-	{
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Received a packet that is larger than the internal buffer size.");
-		return -1;
-	}
 
+	/* Packet read successfully */
+	return 1;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function reads a packet from the network socket.
  *
- * \brief It reads a packet from the network socket.
- *
- * This function is called by the several pcap_read() when they detect that
- * we have a remote capture and they are the client side. In that case, they need
- * to read packets from the socket.
- *
  * This function relies on the pcap_read_nocb_remote to deliver packets. The
  * difference, here, is that as soon as a packet is read, it is delivered
  * to the application by means of a callback function.
- *
- * Parameters and return values are exactly the same of the pcap_read().
  */
-static int pcap_read_remote(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+static int pcap_read_rpcap(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
-	struct pcap_pkthdr *pkt_header;
+	struct pcap_rpcap *pr = p->priv;	/* structure used when doing a remote live capture */
+	struct pcap_pkthdr pkt_header;
 	u_char *pkt_data;
 	int n = 0;
+	int ret;
 
-	while ((n < cnt) || (cnt < 0))
+	/*
+	 * If this is client-side, and we haven't already started
+	 * the capture, start it now.
+	 */
+	if (pr->rmt_clientside)
 	{
-		if (pcap_read_nocb_remote(p, &pkt_header, &pkt_data) == 1)
+		/* We are on an remote capture */
+		if (!pr->rmt_capstarted)
 		{
-			(*callback)(user, pkt_header, pkt_data);
+			/*
+			 * The capture isn't started yet, so try to
+			 * start it.
+			 */
+			if (pcap_startcapture_remote(p))
+				return -1;
+		}
+	}
+
+	while (n < cnt || PACKET_COUNT_IS_UNLIMITED(cnt))
+	{
+		/*
+		 * Has "pcap_breakloop()" been called?
+		 */
+		if (p->break_loop) {
+			/*
+			 * Yes - clear the flag that indicates that it
+			 * has, and return PCAP_ERROR_BREAK to indicate
+			 * that we were told to break out of the loop.
+			 */
+			p->break_loop = 0;
+			return (PCAP_ERROR_BREAK);
+		}
+
+		/*
+		 * Read some packets.
+		 */
+		ret = pcap_read_nocb_remote(p, &pkt_header, &pkt_data);
+		if (ret == 1)
+		{
+			/*
+			 * We got a packet.  Hand it to the callback
+			 * and count it so we can return the count.
+			 */
+			(*callback)(user, &pkt_header, pkt_data);
 			n++;
 		}
+		else if (ret == -1)
+		{
+			/* Error. */
+			return ret;
+		}
 		else
+		{
+			/*
+			 * No packet; this could mean that we timed
+			 * out, or that we got interrupted, or that
+			 * we got a bad packet.
+			 *
+			 * Were we told to break out of the loop?
+			 */
+			if (p->break_loop) {
+				/*
+				 * Yes.
+				 */
+				p->break_loop = 0;
+				return (PCAP_ERROR_BREAK);
+			}
+			/* No - return the number of packets we've processed. */
 			return n;
+		}
 	}
 	return n;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function sends a CLOSE command to the capture server.
  *
- * \brief It sends a CLOSE command to the capture server.
+ * It is called when the user calls pcap_close().  It sends a command
+ * to our peer that says 'ok, let's stop capturing'.
  *
- * This function is called when the user wants to close a pcap_t adapter.
- * In case we're capturing from the network, it sends a command to the other
- * peer that says 'ok, let's stop capturing'.
- * This function is called automatically when the user calls the pcap_close().
- *
- * Parameters and return values are exactly the same of the pcap_close().
- *
- * \warning Since we're closing the connection, we do not check for errors.
+ * WARNING: Since we're closing the connection, we do not check for errors.
  */
-static void pcap_cleanup_remote(pcap_t *fp)
+static void pcap_cleanup_rpcap(pcap_t *fp)
 {
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 	struct rpcap_header header;		/* header of the RPCAP packet */
 	struct activehosts *temp;		/* temp var needed to scan the host list chain, to detect if we're in active mode */
-	int active = 0;					/* active mode or not? */
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
+	int active = 0;				/* active mode or not? */
 
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
 	/* detect if we're in active mode */
 	temp = activeHosts;
 	while (temp)
 	{
-		if (temp->sockctrl == md->rmt_sockctrl)
+		if (temp->sockctrl == pr->rmt_sockctrl)
 		{
 			active = 1;
 			break;
 		}
 		temp = temp->next;
 	}
 
 	if (!active)
 	{
-		rpcap_createhdr(&header, RPCAP_MSG_CLOSE, 0, 0);
+		rpcap_createhdr(&header, pr->protocol_version,
+		    RPCAP_MSG_CLOSE, 0, 0);
 
-		/* I don't check for errors, since I'm going to close everything */
-		sock_send(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), NULL, 0);
+		/*
+		 * Send the close request; don't report any errors, as
+		 * we're closing this pcap_t, and have no place to report
+		 * the error.  No reply is sent to this message.
+		 */
+		(void)sock_send(pr->rmt_sockctrl, (char *)&header,
+		    sizeof(struct rpcap_header), NULL, 0);
 	}
 	else
 	{
-		rpcap_createhdr(&header, RPCAP_MSG_ENDCAP_REQ, 0, 0);
+		rpcap_createhdr(&header, pr->protocol_version,
+		    RPCAP_MSG_ENDCAP_REQ, 0, 0);
 
-		/* I don't check for errors, since I'm going to close everything */
-		sock_send(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), NULL, 0);
-
-		/* wait for the answer */
-		/* Don't check what we got, since the present libpcap does not uses this pcap_t anymore */
-		sock_recv(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, NULL, 0);
-
-		if (ntohl(header.plen) != 0)
-			sock_discard(md->rmt_sockctrl, ntohl(header.plen), NULL, 0);
+		/*
+		 * Send the end capture request; don't report any errors,
+		 * as we're closing this pcap_t, and have no place to
+		 * report the error.
+		 */
+		if (sock_send(pr->rmt_sockctrl, (char *)&header,
+		    sizeof(struct rpcap_header), NULL, 0) == 0)
+		{
+			/*
+			 * Wait for the answer; don't report any errors,
+			 * as we're closing this pcap_t, and have no
+			 * place to report the error.
+			 */
+			if (rpcap_process_msg_header(pr->rmt_sockctrl,
+			    pr->protocol_version, RPCAP_MSG_ENDCAP_REQ,
+			    &header, NULL) == 0)
+			{
+				(void)rpcap_discard(pr->rmt_sockctrl,
+				    header.plen, NULL);
+			}
+		}
 	}
 
-	if (md->rmt_sockdata)
+	if (pr->rmt_sockdata)
 	{
-		sock_close(md->rmt_sockdata, NULL, 0);
-		md->rmt_sockdata = 0;
+		sock_close(pr->rmt_sockdata, NULL, 0);
+		pr->rmt_sockdata = 0;
 	}
 
-	if ((!active) && (md->rmt_sockctrl))
-		sock_close(md->rmt_sockctrl, NULL, 0);
+	if ((!active) && (pr->rmt_sockctrl))
+		sock_close(pr->rmt_sockctrl, NULL, 0);
 
-	md->rmt_sockctrl = 0;
+	pr->rmt_sockctrl = 0;
 
-	if (md->currentfilter)
+	if (pr->currentfilter)
 	{
-		free(md->currentfilter);
-		md->currentfilter = NULL;
+		free(pr->currentfilter);
+		pr->currentfilter = NULL;
 	}
 
 	/* To avoid inconsistencies in the number of sock_init() */
 	sock_cleanup();
 }
 
-/* \ingroup remote_pri_func
- *
- * \brief It retrieves network statistics from the other peer.
- *
- * This function is just a void cointainer, since the work is done by the rpcap_stats_remote().
- * See that funcion for more details.
- *
- * Parameters and return values are exactly the same of the pcap_stats().
+/*
+ * This function retrieves network statistics from our peer;
+ * it provides only the standard statistics.
  */
-static int pcap_stats_remote(pcap_t *p, struct pcap_stat *ps)
+static int pcap_stats_rpcap(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_stat *retval;
 
-	retval = rpcap_stats_remote(p, ps, PCAP_STATS_STANDARD);
+	retval = rpcap_stats_rpcap(p, ps, PCAP_STATS_STANDARD);
 
 	if (retval)
 		return 0;
 	else
 		return -1;
 }
 
 #ifdef _WIN32
-/* \ingroup remote_pri_func
- *
- * \brief It retrieves network statistics from the other peer.
- *
- * This function is just a void cointainer, since the work is done by the rpcap_stats_remote().
- * See that funcion for more details.
- *
- * Parameters and return values are exactly the same of the pcap_stats_ex().
+/*
+ * This function retrieves network statistics from our peer;
+ * it provides the additional statistics supported by pcap_stats_ex().
  */
-static struct pcap_stat *pcap_stats_ex_remote(pcap_t *p, int *pcap_stat_size)
+static struct pcap_stat *pcap_stats_ex_rpcap(pcap_t *p, int *pcap_stat_size)
 {
 	*pcap_stat_size = sizeof (p->stat);
 
 	/* PCAP_STATS_EX (third param) means 'extended pcap_stats()' */
-	return (rpcap_stats_remote(p, &(p->stat), PCAP_STATS_EX));
+	return (rpcap_stats_rpcap(p, &(p->stat), PCAP_STATS_EX));
 }
 #endif
 
-/* \ingroup remote_pri_func
+/*
+ * This function retrieves network statistics from our peer.  It
+ * is used by the two previous functions.
  *
- * \brief It retrieves network statistics from the other peer.
+ * It can be called in two modes:
+ * - PCAP_STATS_STANDARD: if we want just standard statistics (i.e.,
+ *   for pcap_stats())
+ * - PCAP_STATS_EX: if we want extended statistics (i.e., for
+ *   pcap_stats_ex())
  *
- * This function can be called in two modes:
- * - PCAP_STATS_STANDARD: if we want just standard statistics (i.e. the pcap_stats() )
- * - PCAP_STATS_EX: if we want extended statistics (i.e. the pcap_stats_ex() )
+ * This 'mode' parameter is needed because in pcap_stats() the variable that
+ * keeps the statistics is allocated by the user. On Windows, this structure
+ * has been extended in order to keep new stats. However, if the user has a
+ * smaller structure and it passes it to pcap_stats(), this function will
+ * try to fill in more data than the size of the structure, so that memory
+ * after the structure will be overwritten.
  *
- * This 'mode' parameter is needed because in the standard pcap_stats() the variable that keeps the
- * statistics is allocated by the user. Unfortunately, this structure has been extended in order
- * to keep new stats. However, if the user has a smaller structure and it passes it to the pcap_stats,
- * thid function will try to fill in more data than the size of the structure, so that the application
- * goes in memory overflow.
- * So, we need to know it we have to copy just the standard fields, or the extended fields as well.
+ * So, we need to know it we have to copy just the standard fields, or the
+ * extended fields as well.
  *
- * In case we want to copy the extended fields as well, the problem of memory overflow does no
- * longer exist because the structure pcap_stat is no longer allocated by the program;
- * it is allocated by the library instead.
+ * In case we want to copy the extended fields as well, the problem of
+ * memory overflow no longer exists because the structure that's filled
+ * in is part of the pcap_t, so that it can be guaranteed to be large
+ * enough for the additional statistics.
  *
  * \param p: the pcap_t structure related to the current instance.
  *
- * \param ps: a 'pcap_stat' structure, needed for compatibility with pcap_stat(), in which
- * the structure is allocated by the user. In case of pcap_stats_ex, this structure and the
- * function return value point to the same variable.
+ * \param ps: a pointer to a 'pcap_stat' structure, needed for compatibility
+ * with pcap_stat(), where the structure is allocated by the user. In case
+ * of pcap_stats_ex(), this structure and the function return value point
+ * to the same variable.
  *
  * \param mode: one of PCAP_STATS_STANDARD or PCAP_STATS_EX.
  *
  * \return The structure that keeps the statistics, or NULL in case of error.
  * The error string is placed in the pcap_t structure.
  */
-static struct pcap_stat *rpcap_stats_remote(pcap_t *p, struct pcap_stat *ps, int mode)
+static struct pcap_stat *rpcap_stats_rpcap(pcap_t *p, struct pcap_stat *ps, int mode)
 {
+	struct pcap_rpcap *pr = p->priv;	/* structure used when doing a remote live capture */
 	struct rpcap_header header;		/* header of the RPCAP packet */
 	struct rpcap_stats netstats;		/* statistics sent on the network */
-	uint32 totread = 0;			/* number of bytes of the payload read from the socket */
-	int nread;
-	int retval;				/* temp variable which stores functions return value */
-	struct pcap_md *md;			/* structure used when doing a remote live capture */
+	uint32 plen;				/* data remaining in the message */
 
-	md = (struct pcap_md *) ((u_char*)p->priv + sizeof(struct pcap_win));
+#ifdef _WIN32
+	if (mode != PCAP_STATS_STANDARD && mode != PCAP_STATS_EX)
+#else
+	if (mode != PCAP_STATS_STANDARD)
+#endif
+	{
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "Invalid stats mode %d", mode);
+		return NULL;
+	}
 
 	/*
-	 * If the capture has still to start, we cannot ask statistics to the other peer,
-	 * so we return a fake number
+	 * If the capture has not yet started, we cannot request statistics
+	 * for the capture from our peer, so we return 0 for all statistics,
+	 * as nothing's been seen yet.
 	 */
-	if (!md->rmt_capstarted)
+	if (!pr->rmt_capstarted)
 	{
-		if (mode == PCAP_STATS_STANDARD)
+		ps->ps_drop = 0;
+		ps->ps_ifdrop = 0;
+		ps->ps_recv = 0;
+#ifdef _WIN32
+		if (mode == PCAP_STATS_EX)
 		{
-			ps->ps_drop = 0;
-			ps->ps_ifdrop = 0;
-			ps->ps_recv = 0;
-		}
-		else
-		{
 			ps->ps_capt = 0;
-			ps->ps_drop = 0;
-			ps->ps_ifdrop = 0;
-			ps->ps_netdrop = 0;
-			ps->ps_recv = 0;
 			ps->ps_sent = 0;
+			ps->ps_netdrop = 0;
 		}
+#endif /* _WIN32 */
 
 		return ps;
 	}
 
-	rpcap_createhdr(&header, RPCAP_MSG_STATS_REQ, 0, 0);
+	rpcap_createhdr(&header, pr->protocol_version,
+	    RPCAP_MSG_STATS_REQ, 0, 0);
 
 	/* Send the PCAP_STATS command */
-	if (sock_send(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), p->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
+	if (sock_send(pr->rmt_sockctrl, (char *)&header,
+	    sizeof(struct rpcap_header), p->errbuf, PCAP_ERRBUF_SIZE) < 0)
+		return NULL;		/* Unrecoverable network error */
 
-	/* Receive the RPCAP stats reply message */
-	if (sock_recv(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, p->errbuf, PCAP_ERRBUF_SIZE) == -1)
-		goto error;
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(pr->rmt_sockctrl, pr->protocol_version,
+	    RPCAP_MSG_STATS_REQ, &header, p->errbuf) == -1)
+		return NULL;		/* Error */
 
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(p->errbuf, md->rmt_sockctrl, &header, RPCAP_MSG_STATS_REPLY, RPCAP_MSG_ERROR, 0);
+	plen = header.plen;
 
-	if (retval != RPCAP_MSG_STATS_REPLY)		/* the message is not the one expected */
-	{
-		switch (retval)
-		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint send a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			goto error;
-
-		case RPCAP_MSG_ERROR:		/* The other endpoint reported an error */
-			/* Update totread, since the rpcap_checkmsg() already purged the buffer */
-			totread = ntohl(header.plen);
-
-			/* Do nothing; just exit; the error code is already into the errbuf */
-			goto error;
-
-		default:
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Internal error");
-			goto error;
-		}
-	}
-
-	nread = sock_recv(md->rmt_sockctrl, (char *)&netstats,
-	    sizeof(struct rpcap_stats), SOCK_RECEIVEALL_YES,
-	    p->errbuf, PCAP_ERRBUF_SIZE);
-	if (nread == -1)
+	/* Read the reply body */
+	if (rpcap_recv(pr->rmt_sockctrl, (char *)&netstats,
+	    sizeof(struct rpcap_stats), &plen, p->errbuf) == -1)
 		goto error;
-	totread += nread;
 
-	if (mode == PCAP_STATS_STANDARD)
+	ps->ps_drop = ntohl(netstats.krnldrop);
+	ps->ps_ifdrop = ntohl(netstats.ifdrop);
+	ps->ps_recv = ntohl(netstats.ifrecv);
+#ifdef _WIN32
+	if (mode == PCAP_STATS_EX)
 	{
-		ps->ps_drop = ntohl(netstats.krnldrop);
-		ps->ps_ifdrop = ntohl(netstats.ifdrop);
-		ps->ps_recv = ntohl(netstats.ifrecv);
-	}
-	else
-	{
-		ps->ps_capt = md->TotCapt;
-		ps->ps_drop = ntohl(netstats.krnldrop);
-		ps->ps_ifdrop = ntohl(netstats.ifdrop);
-		ps->ps_netdrop = md->TotNetDrops;
-		ps->ps_recv = ntohl(netstats.ifrecv);
+		ps->ps_capt = pr->TotCapt;
+		ps->ps_netdrop = pr->TotNetDrops;
 		ps->ps_sent = ntohl(netstats.svrcapt);
 	}
+#endif /* _WIN32 */
 
-	/* Checks if all the data has been read; if not, discard the data in excess */
-	if (totread != ntohl(header.plen))
-	{
-		if (sock_discard(md->rmt_sockctrl, ntohl(header.plen) - totread, NULL, 0) == 1)
-			goto error;
-	}
+	/* Discard the rest of the message. */
+	if (rpcap_discard(pr->rmt_sockctrl, plen, p->errbuf) == -1)
+		goto error;
 
 	return ps;
 
 error:
-	if (totread != ntohl(header.plen))
-		sock_discard(md->rmt_sockctrl, ntohl(header.plen) - totread, NULL, 0);
+	/*
+	 * Discard the rest of the message.
+	 * We already reported an error; if this gets an error, just
+	 * drive on.
+	 */
+	(void)rpcap_discard(pr->rmt_sockctrl, plen, NULL);
 
 	return NULL;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function returns the entry in the list of active hosts for this
+ * active connection (active mode only), or NULL if there is no
+ * active connection or an error occurred.  It is just for internal
+ * use.
  *
- * \brief It opens a remote adapter by opening an RPCAP connection and so on.
+ * \param host: a string that keeps the host name of the host for which we
+ * want to get the socket ID for that active connection.
  *
- * This function does basically the job of pcap_open_live() for a remote interface.
- * In other words, we have a pcap_read for win32, which reads packets from NPF,
- * another for LINUX, and so on. Now, we have a pcap_opensource_remote() as well.
- * The difference, here, is the capture thread does not start until the
- * pcap_startcapture_remote() is called.
+ * \param error: a pointer to an int that is set to 1 if an error occurred
+ * and 0 otherwise.
  *
- * This is because, in remote capture, we cannot start capturing data as soon ad the
- * 'open adapter' command is sent. Suppose the remote adapter is already overloaded;
- * if we start a capture (which, by default, has a NULL filter) the new traffic can
- * saturate the network.
+ * \param errbuf: a pointer to a user-allocated buffer (of size
+ * PCAP_ERRBUF_SIZE) that will contain the error message (in case
+ * there is one).
  *
- * Instead, we want to "open" the adapter, then send a "start capture" command only
- * when we're ready to start the capture.
- * This funtion does this job: it sends a "open adapter" command (according to the
- * RPCAP protocol), but it does not start the capture.
- *
- * Since the other libpcap functions do not share this way of life, we have to make
- * some dirty things in order to make everyting working.
- *
- * \param fp: A pointer to a pcap_t structure that has been previously created with
- * \ref pcap_create().
- * \param source: see pcap_open().
- * \param auth: see pcap_open().
- *
- * \return 0 in case of success, -1 otherwise. In case of success, the pcap_t pointer in fp can be
- * used as a parameter to the following calls (pcap_compile() and so on). In case of
- * problems, fp->errbuf contains a text explanation of error.
- *
- * \warning In case we call the pcap_compile() and the capture is not started, the filter
- * will be saved into the pcap_t structure, and it will be sent to the other host later
- * (when the pcap_startcapture_remote() is called).
+ * \return the entry for this host in the list of active connections
+ * if found, NULL if it's not found or there's an error.
  */
-int pcap_opensource_remote(pcap_t *fp, struct pcap_rmtauth *auth)
+static struct activehosts *
+rpcap_remoteact_getsock(const char *host, int *error, char *errbuf)
 {
-	char host[PCAP_BUF_SIZE], ctrlport[PCAP_BUF_SIZE], iface[PCAP_BUF_SIZE];
+	struct activehosts *temp;			/* temp var needed to scan the host list chain */
+	struct addrinfo hints, *addrinfo, *ai_next;	/* temp var needed to translate between hostname to its address */
+	int retval;
 
-	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data to be sent is buffered */
-	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
-	uint32 totread = 0;			/* number of bytes of the payload read from the socket */
-	int nread;
-	int retval;				/* store the return value of the functions */
-	int active = 0;				/* '1' if we're in active mode */
-
-	/* socket-related variables */
-	struct addrinfo hints;			/* temp, needed to open a socket connection */
-	struct addrinfo *addrinfo;		/* temp, needed to open a socket connection */
-	SOCKET sockctrl = 0;			/* socket descriptor of the control connection */
-
-	/* RPCAP-related variables */
-	struct rpcap_header header;		/* header of the RPCAP packet */
-	struct rpcap_openreply openreply;	/* open reply message */
-
-	struct pcap_md *md;			/* structure used when doing a remote live capture */
-
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
-
-	/*
-	 * determine the type of the source (NULL, file, local, remote)
-	 * You must have a valid source string even if we're in active mode, because otherwise
-	 * the call to the following function will fail.
-	 */
-	if (pcap_parsesrcstr(fp->opt.device, &retval, host, ctrlport, iface, fp->errbuf) == -1)
-		return -1;
-
-	if (retval != PCAP_SRC_IFREMOTE)
-	{
-		pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE, "This function is able to open only remote interfaces");
-		return -1;
-	}
-
+	/* retrieve the network address corresponding to 'host' */
 	addrinfo = NULL;
+	memset(&hints, 0, sizeof(struct addrinfo));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
 
-	/*
-	 * Warning: this call can be the first one called by the user.
-	 * For this reason, we have to initialize the WinSock support.
-	 */
-	if (sock_init(fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-		return -1;
-
-	sockctrl = rpcap_remoteact_getsock(host, &active, fp->errbuf);
-	if (sockctrl == INVALID_SOCKET)
-		return -1;
-
-	if (!active)
+	retval = getaddrinfo(host, "0", &hints, &addrinfo);
+	if (retval != 0)
 	{
-		/*
-		 * We're not in active mode; let's try to open a new
-		 * control connection.
-		 */
-		memset(&hints, 0, sizeof(struct addrinfo));
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-
-		if ((ctrlport == NULL) || (ctrlport[0] == 0))
-		{
-			/* the user chose not to specify the port */
-			if (sock_initaddress(host, RPCAP_DEFAULT_NETPORT, &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-				return -1;
-		}
-		else
-		{
-			/* the user chose not to specify the port */
-			if (sock_initaddress(host, ctrlport, &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-				return -1;
-		}
-
-		if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, fp->errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-			goto error;
-
-		freeaddrinfo(addrinfo);
-		addrinfo = NULL;
-
-		if (rpcap_sendauth(sockctrl, auth, fp->errbuf) == -1)
-			goto error;
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "getaddrinfo() %s",
+		    gai_strerror(retval));
+		*error = 1;
+		return NULL;
 	}
 
-	/*
-	 * Now it's time to start playing with the RPCAP protocol
-	 * RPCAP open command: create the request message
-	 */
-	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL,
-		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
+	temp = activeHosts;
 
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_OPEN_REQ, 0, (uint32) strlen(iface));
-
-	if (sock_bufferize(iface, (int) strlen(iface), sendbuf, &sendbufidx,
-		RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
-
-	if (sock_send(sockctrl, sendbuf, sendbufidx, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
-
-	/* Receive the RPCAP open reply message */
-	if (sock_recv(sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-		goto error;
-
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(fp->errbuf, sockctrl, &header, RPCAP_MSG_OPEN_REPLY, RPCAP_MSG_ERROR, 0);
-
-	if (retval != RPCAP_MSG_OPEN_REPLY)		/* the message is not the one expected */
+	while (temp)
 	{
-		switch (retval)
+		ai_next = addrinfo;
+		while (ai_next)
 		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint send a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			goto error;
+			if (sock_cmpaddr(&temp->host, (struct sockaddr_storage *) ai_next->ai_addr) == 0)
+			{
+				*error = 0;
+				freeaddrinfo(addrinfo);
+				return temp;
+			}
 
-		case RPCAP_MSG_ERROR:		/* The other endpoint reported an error */
-			/* Update totread, since the rpcap_checkmsg() already purged the buffer */
-			totread = ntohl(header.plen);
-			/* Do nothing; just exit; the error code is already into the errbuf */
-			goto error;
-
-		default:
-			pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE, "Internal error");
-			goto error;
+			ai_next = ai_next->ai_next;
 		}
+		temp = temp->next;
 	}
 
-	nread = sock_recv(sockctrl, (char *)&openreply,
-	    sizeof(struct rpcap_openreply), SOCK_RECEIVEALL_YES,
-	    fp->errbuf, PCAP_ERRBUF_SIZE);
-	if (nread == -1)
-		goto error;
-	totread += nread;
-
-	/* Set proper fields into the pcap_t struct */
-	fp->linktype = ntohl(openreply.linktype);
-	fp->tzoff = ntohl(openreply.tzoff);
-	md->rmt_sockctrl = sockctrl;
-	md->rmt_clientside = 1;
-
-
-	/* This code is duplicated from the end of this function */
-	fp->read_op = pcap_read_remote;
-	fp->setfilter_op = pcap_setfilter_remote;
-	fp->getnonblock_op = NULL;	/* This is not implemented in remote capture */
-	fp->setnonblock_op = NULL;	/* This is not implemented in remote capture */
-	fp->stats_op = pcap_stats_remote;
-#ifdef _WIN32
-	fp->stats_ex_op = pcap_stats_ex_remote;
-#endif
-	fp->cleanup_op = pcap_cleanup_remote;
-
-	/* Checks if all the data has been read; if not, discard the data in excess */
-	if (totread != ntohl(header.plen))
-	{
-		if (sock_discard(sockctrl, ntohl(header.plen) - totread, NULL, 0) == 1)
-			goto error;
-	}
-	return 0;
-
-error:
-	/*
-	 * When the connection has been established, we have to close it. So, at the
-	 * beginning of this function, if an error occur we return immediately with
-	 * a return NULL; when the connection is established, we have to come here
-	 * ('goto error;') in order to close everything properly.
-	 *
-	 * Checks if all the data has been read; if not, discard the data in excess
-	 */
-	if (totread != ntohl(header.plen))
-		sock_discard(sockctrl, ntohl(header.plen) - totread, NULL, 0);
-
 	if (addrinfo)
 		freeaddrinfo(addrinfo);
 
-	if (!active)
-		sock_close(sockctrl, NULL, 0);
-
-	return -1;
+	/*
+	 * The host for which you want to get the socket ID does not have an
+	 * active connection.
+	 */
+	*error = 0;
+	return NULL;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function starts a remote capture.
  *
- * \brief It starts a remote capture.
+ * This function is required since the RPCAP protocol decouples the 'open'
+ * from the 'start capture' functions.
+ * This function takes all the parameters needed (which have been stored
+ * into the pcap_t structure) and sends them to the server.
  *
- * This function is requires since the RPCAP protocol decouples the 'open' from the
- * 'start capture' functions.
- * This function takes all the parameters needed (which have been stored into the pcap_t structure)
- * and sends them to the server.
- * If everything is fine, it creates a new child thread that reads data from the network
- * and puts data it into the user buffer.
- * The pcap_read() will read data from the user buffer, as usual.
- *
- * The remote capture acts like a new "kernel", which puts packets directly into
- * the buffer pointed by pcap_t.
- * In fact, this function does not rely on a kernel that reads packets and put them
- * into the user buffer; it has to do that on its own.
- *
  * \param fp: the pcap_t descriptor of the device currently open.
  *
- * \return '0' if everything is fine, '-1' otherwise. The error message (if one)
- * is returned into the 'errbuf' field of the pcap_t structure.
+ * \return '0' if everything is fine, '-1' otherwise. The error message
+ * (if one) is returned into the 'errbuf' field of the pcap_t structure.
  */
-int pcap_startcapture_remote(pcap_t *fp)
+static int pcap_startcapture_remote(pcap_t *fp)
 {
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data to be sent is buffered */
 	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
-	char portdata[PCAP_BUF_SIZE];		/* temp variable needed to keep the network port for the the data connection */
-	uint32 totread = 0;			/* number of bytes of the payload read from the socket */
-	int nread;
-	int retval;				/* store the return value of the functions */
+	char portdata[PCAP_BUF_SIZE];		/* temp variable needed to keep the network port for the data connection */
+	uint32 plen;
 	int active = 0;				/* '1' if we're in active mode */
 	struct activehosts *temp;		/* temp var needed to scan the host list chain, to detect if we're in active mode */
 	char host[INET6_ADDRSTRLEN + 1];	/* numeric name of the other host */
 
 	/* socket-related variables*/
 	struct addrinfo hints;			/* temp, needed to open a socket connection */
 	struct addrinfo *addrinfo;		/* temp, needed to open a socket connection */
 	SOCKET sockdata = 0;			/* socket descriptor of the data connection */
 	struct sockaddr_storage saddr;		/* temp, needed to retrieve the network data port chosen on the local machine */
 	socklen_t saddrlen;			/* temp, needed to retrieve the network data port chosen on the local machine */
 	int ai_family;				/* temp, keeps the address family used by the control connection */
 
 	/* RPCAP-related variables*/
 	struct rpcap_header header;			/* header of the RPCAP packet */
 	struct rpcap_startcapreq *startcapreq;		/* start capture request message */
 	struct rpcap_startcapreply startcapreply;	/* start capture reply message */
 
 	/* Variables related to the buffer setting */
-	int res, itemp;
+	int res;
+	socklen_t itemp;
 	int sockbufsize = 0;
+	uint32 server_sockbufsize;
 
-	struct pcap_md *md;			/* structure used when doing a remote live capture */
-
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
 	/*
 	 * Let's check if sampling has been required.
 	 * If so, let's set it first
 	 */
 	if (pcap_setsampling_remote(fp) != 0)
 		return -1;
 
-
 	/* detect if we're in active mode */
 	temp = activeHosts;
 	while (temp)
 	{
-		if (temp->sockctrl == md->rmt_sockctrl)
+		if (temp->sockctrl == pr->rmt_sockctrl)
 		{
 			active = 1;
 			break;
 		}
 		temp = temp->next;
 	}
 
 	addrinfo = NULL;
 
 	/*
 	 * Gets the complete sockaddr structure used in the ctrl connection
 	 * This is needed to get the address family of the control socket
 	 * Tip: I cannot save the ai_family of the ctrl sock in the pcap_t struct,
 	 * since the ctrl socket can already be open in case of active mode;
 	 * so I would have to call getpeername() anyway
 	 */
 	saddrlen = sizeof(struct sockaddr_storage);
-	if (getpeername(md->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
+	if (getpeername(pr->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
 	{
 		sock_geterror("getsockname(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
-		goto error;
+		goto error_nodiscard;
 	}
 	ai_family = ((struct sockaddr_storage *) &saddr)->ss_family;
 
 	/* Get the numeric address of the remote host we are connected to */
 	if (getnameinfo((struct sockaddr *) &saddr, saddrlen, host,
 		sizeof(host), NULL, 0, NI_NUMERICHOST))
 	{
 		sock_geterror("getnameinfo(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
-		goto error;
+		goto error_nodiscard;
 	}
 
 	/*
 	 * Data connection is opened by the server toward the client if:
 	 * - we're using TCP, and the user wants us to be in active mode
 	 * - we're using UDP
 	 */
-	if ((active) || (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
+	if ((active) || (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
 	{
 		/*
 		 * We have to create a new socket to receive packets
 		 * We have to do that immediately, since we have to tell the other
 		 * end which network port we picked up
 		 */
 		memset(&hints, 0, sizeof(struct addrinfo));
 		/* TEMP addrinfo is NULL in case of active */
 		hints.ai_family = ai_family;	/* Use the same address family of the control socket */
-		hints.ai_socktype = (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP) ? SOCK_DGRAM : SOCK_STREAM;
+		hints.ai_socktype = (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 		hints.ai_flags = AI_PASSIVE;	/* Data connection is opened by the server toward the client */
 
 		/* Let's the server pick up a free network port for us */
 		if (sock_initaddress(NULL, "0", &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-			goto error;
+			goto error_nodiscard;
 
 		if ((sockdata = sock_open(addrinfo, SOCKOPEN_SERVER,
 			1 /* max 1 connection in queue */, fp->errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-			goto error;
+			goto error_nodiscard;
 
 		/* addrinfo is no longer used */
 		freeaddrinfo(addrinfo);
 		addrinfo = NULL;
 
 		/* get the complete sockaddr structure used in the data connection */
 		saddrlen = sizeof(struct sockaddr_storage);
 		if (getsockname(sockdata, (struct sockaddr *) &saddr, &saddrlen) == -1)
 		{
 			sock_geterror("getsockname(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
-			goto error;
+			goto error_nodiscard;
 		}
 
 		/* Get the local port the system picked up */
 		if (getnameinfo((struct sockaddr *) &saddr, saddrlen, NULL,
 			0, portdata, sizeof(portdata), NI_NUMERICSERV))
 		{
 			sock_geterror("getnameinfo(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
-			goto error;
+			goto error_nodiscard;
 		}
 	}
 
 	/*
 	 * Now it's time to start playing with the RPCAP protocol
 	 * RPCAP start capture command: create the request message
 	 */
 	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL,
 		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
+		goto error_nodiscard;
 
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_STARTCAP_REQ, 0,
-		sizeof(struct rpcap_startcapreq) + sizeof(struct rpcap_filter) + fp->fcode.bf_len * sizeof(struct rpcap_filterbpf_insn));
+	rpcap_createhdr((struct rpcap_header *) sendbuf,
+	    pr->protocol_version, RPCAP_MSG_STARTCAP_REQ, 0,
+	    sizeof(struct rpcap_startcapreq) + sizeof(struct rpcap_filter) + fp->fcode.bf_len * sizeof(struct rpcap_filterbpf_insn));
 
 	/* Fill the structure needed to open an adapter remotely */
 	startcapreq = (struct rpcap_startcapreq *) &sendbuf[sendbufidx];
 
 	if (sock_bufferize(NULL, sizeof(struct rpcap_startcapreq), NULL,
 		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
+		goto error_nodiscard;
 
 	memset(startcapreq, 0, sizeof(struct rpcap_startcapreq));
 
 	/* By default, apply half the timeout on one side, half of the other */
 	fp->opt.timeout = fp->opt.timeout / 2;
 	startcapreq->read_timeout = htonl(fp->opt.timeout);
 
 	/* portdata on the openreq is meaningful only if we're in active mode */
-	if ((active) || (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
+	if ((active) || (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
 	{
 		sscanf(portdata, "%d", (int *)&(startcapreq->portdata));	/* cast to avoid a compiler warning */
 		startcapreq->portdata = htons(startcapreq->portdata);
 	}
 
 	startcapreq->snaplen = htonl(fp->snapshot);
 	startcapreq->flags = 0;
 
-	if (md->rmt_flags & PCAP_OPENFLAG_PROMISCUOUS)
+	if (pr->rmt_flags & PCAP_OPENFLAG_PROMISCUOUS)
 		startcapreq->flags |= RPCAP_STARTCAPREQ_FLAG_PROMISC;
-	if (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
+	if (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP)
 		startcapreq->flags |= RPCAP_STARTCAPREQ_FLAG_DGRAM;
 	if (active)
 		startcapreq->flags |= RPCAP_STARTCAPREQ_FLAG_SERVEROPEN;
 
 	startcapreq->flags = htons(startcapreq->flags);
 
 	/* Pack the capture filter */
 	if (pcap_pack_bpffilter(fp, &sendbuf[sendbufidx], &sendbufidx, &fp->fcode))
-		goto error;
+		goto error_nodiscard;
 
-	if (sock_send(md->rmt_sockctrl, sendbuf, sendbufidx, fp->errbuf, PCAP_ERRBUF_SIZE))
-		goto error;
+	if (sock_send(pr->rmt_sockctrl, sendbuf, sendbufidx, fp->errbuf,
+	    PCAP_ERRBUF_SIZE) < 0)
+		goto error_nodiscard;
 
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(pr->rmt_sockctrl, pr->protocol_version,
+	    RPCAP_MSG_STARTCAP_REQ, &header, fp->errbuf) == -1)
+		goto error_nodiscard;
 
-	/* Receive the RPCAP start capture reply message */
-	if (sock_recv(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-		goto error;
+	plen = header.plen;
 
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(fp->errbuf, md->rmt_sockctrl, &header, RPCAP_MSG_STARTCAP_REPLY, RPCAP_MSG_ERROR, 0);
-
-	if (retval != RPCAP_MSG_STARTCAP_REPLY)		/* the message is not the one expected */
-	{
-		switch (retval)
-		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint send a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			goto error;
-
-		case RPCAP_MSG_ERROR:		/* The other endpoint reported an error */
-			/* Update totread, since the rpcap_checkmsg() already purged the buffer */
-			totread = ntohl(header.plen);
-			/* Do nothing; just exit; the error code is already into the errbuf */
-			goto error;
-
-		default:
-			pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE, "Internal error");
-			goto error;
-		}
-	}
-
-	nread = sock_recv(md->rmt_sockctrl, (char *)&startcapreply,
-	    sizeof(struct rpcap_startcapreply), SOCK_RECEIVEALL_YES,
-	    fp->errbuf, PCAP_ERRBUF_SIZE);
-	if (nread == -1)
+	if (rpcap_recv(pr->rmt_sockctrl, (char *)&startcapreply,
+	    sizeof(struct rpcap_startcapreply), &plen, fp->errbuf) == -1)
 		goto error;
-	totread += nread;
 
 	/*
 	 * In case of UDP data stream, the connection is always opened by the daemon
 	 * So, this case is already covered by the code above.
 	 * Now, we have still to handle TCP connections, because:
 	 * - if we're in active mode, we have to wait for a remote connection
 	 * - if we're in passive more, we have to start a connection
 	 *
 	 * We have to do he job in two steps because in case we're opening a TCP connection, we have
 	 * to tell the port we're using to the remote side; in case we're accepting a TCP
 	 * connection, we have to wait this info from the remote side.
 	 */
-
-	if (!(md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
+	if (!(pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP))
 	{
 		if (!active)
 		{
 			memset(&hints, 0, sizeof(struct addrinfo));
 			hints.ai_family = ai_family;		/* Use the same address family of the control socket */
-			hints.ai_socktype = (md->rmt_flags & PCAP_OPENFLAG_DATATX_UDP) ? SOCK_DGRAM : SOCK_STREAM;
+			hints.ai_socktype = (pr->rmt_flags & PCAP_OPENFLAG_DATATX_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 			pcap_snprintf(portdata, PCAP_BUF_SIZE, "%d", ntohs(startcapreply.portdata));
 
 			/* Let's the server pick up a free network port for us */
 			if (sock_initaddress(host, portdata, &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
 				goto error;
 
 			if ((sockdata = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, fp->errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
 				goto error;
 
 			/* addrinfo is no longer used */
 			freeaddrinfo(addrinfo);
 			addrinfo = NULL;
 		}
 		else
 		{
 			SOCKET socktemp;	/* We need another socket, since we're going to accept() a connection */
 
 			/* Connection creation */
 			saddrlen = sizeof(struct sockaddr_storage);
 
 			socktemp = accept(sockdata, (struct sockaddr *) &saddr, &saddrlen);
 
-			if (socktemp == -1)
+			if (socktemp == INVALID_SOCKET)
 			{
 				sock_geterror("accept(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 				goto error;
 			}
 
 			/* Now that I accepted the connection, the server socket is no longer needed */
 			sock_close(sockdata, fp->errbuf, PCAP_ERRBUF_SIZE);
 			sockdata = socktemp;
 		}
 	}
 
 	/* Let's save the socket of the data connection */
-	md->rmt_sockdata = sockdata;
+	pr->rmt_sockdata = sockdata;
 
-	/* Allocates WinPcap/libpcap user buffer, which is a socket buffer in case of a remote capture */
-	/* It has the same size of the one used on the other side of the connection */
-	fp->bufsize = ntohl(startcapreply.bufsize);
+	/*
+	 * Set the size of the socket buffer for the data socket.
+	 * It has the same size as the local capture buffer used
+	 * on the other side of the connection.
+	 */
+	server_sockbufsize = ntohl(startcapreply.bufsize);
 
 	/* Let's get the actual size of the socket buffer */
 	itemp = sizeof(sockbufsize);
 
 	res = getsockopt(sockdata, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &itemp);
 	if (res == -1)
 	{
 		sock_geterror("pcap_startcapture_remote()", fp->errbuf, PCAP_ERRBUF_SIZE);
-		SOCK_ASSERT(fp->errbuf, 1);
+		SOCK_DEBUG_MESSAGE(fp->errbuf);
 	}
 
 	/*
-	 * Warning: on some kernels (e.g. Linux), the size of the user buffer does not take
-	 * into account the pcap_header and such, and it is set equal to the snaplen.
-	 * In my view, this is wrong (the meaning of the bufsize became a bit strange).
-	 * So, here bufsize is the whole size of the user buffer.
-	 * In case the bufsize returned is too small, let's adjust it accordingly.
+	 * Warning: on some kernels (e.g. Linux), the size of the user
+	 * buffer does not take into account the pcap_header and such,
+	 * and it is set equal to the snaplen.
+	 *
+	 * In my view, this is wrong (the meaning of the bufsize became
+	 * a bit strange).  So, here bufsize is the whole size of the
+	 * user buffer.  In case the bufsize returned is too small,
+	 * let's adjust it accordingly.
 	 */
-	if (fp->bufsize <= (u_int) fp->snapshot)
-		fp->bufsize += sizeof(struct pcap_pkthdr);
+	if (server_sockbufsize <= (u_int) fp->snapshot)
+		server_sockbufsize += sizeof(struct pcap_pkthdr);
 
 	/* if the current socket buffer is smaller than the desired one */
-	if ((u_int) sockbufsize < fp->bufsize)
+	if ((u_int) sockbufsize < server_sockbufsize)
 	{
-		/* Loop until the buffer size is OK or the original socket buffer size is larger than this one */
-		while (1)
+		/*
+		 * Loop until the buffer size is OK or the original
+		 * socket buffer size is larger than this one.
+		 */
+		for (;;)
 		{
-			res = setsockopt(sockdata, SOL_SOCKET, SO_RCVBUF, (char *)&(fp->bufsize), sizeof(fp->bufsize));
+			res = setsockopt(sockdata, SOL_SOCKET, SO_RCVBUF,
+			    (char *)&(server_sockbufsize),
+			    sizeof(server_sockbufsize));
 
 			if (res == 0)
 				break;
 
 			/*
-			 * If something goes wrong, half the buffer size (checking that it does not become smaller than
-			 * the current one)
+			 * If something goes wrong, halve the buffer size
+			 * (checking that it does not become smaller than
+			 * the current one).
 			 */
-			fp->bufsize /= 2;
+			server_sockbufsize /= 2;
 
-			if ((u_int) sockbufsize >= fp->bufsize)
+			if ((u_int) sockbufsize >= server_sockbufsize)
 			{
-				fp->bufsize = sockbufsize;
+				server_sockbufsize = sockbufsize;
 				break;
 			}
 		}
 	}
 
 	/*
-	 * Let's allocate the packet; this is required in order to put the packet somewhere when
-	 * extracting data from the socket
-	 * Since buffering has already been done in the socket buffer, here we need just a buffer,
-	 * whose size is equal to the pcap header plus the snapshot length
+	 * Let's allocate the packet; this is required in order to put
+	 * the packet somewhere when extracting data from the socket.
+	 * Since buffering has already been done in the socket buffer,
+	 * here we need just a buffer whose size is equal to the
+	 * largest possible packet message for the snapshot size,
+	 * namely the length of the message header plus the length
+	 * of the packet header plus the snapshot length.
 	 */
-	fp->bufsize = fp->snapshot + sizeof(struct pcap_pkthdr);
+	fp->bufsize = sizeof(struct rpcap_header) + sizeof(struct rpcap_pkthdr) + fp->snapshot;
 
 	fp->buffer = (u_char *)malloc(fp->bufsize);
 	if (fp->buffer == NULL)
 	{
-		pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(fp->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		goto error;
 	}
 
+	/*
+	 * The buffer is currently empty.
+	 */
+	fp->bp = fp->buffer;
+	fp->cc = 0;
 
-	/* Checks if all the data has been read; if not, discard the data in excess */
-	if (totread != ntohl(header.plen))
-	{
-		if (sock_discard(md->rmt_sockctrl, ntohl(header.plen) - totread, NULL, 0) == 1)
-			goto error;
-	}
+	/* Discard the rest of the message. */
+	if (rpcap_discard(pr->rmt_sockctrl, plen, fp->errbuf) == -1)
+		goto error;
 
 	/*
 	 * In case the user does not want to capture RPCAP packets, let's update the filter
 	 * We have to update it here (instead of sending it into the 'StartCapture' message
 	 * because when we generate the 'start capture' we do not know (yet) all the ports
 	 * we're currently using.
 	 */
-	if (md->rmt_flags & PCAP_OPENFLAG_NOCAPTURE_RPCAP)
+	if (pr->rmt_flags & PCAP_OPENFLAG_NOCAPTURE_RPCAP)
 	{
 		struct bpf_program fcode;
 
 		if (pcap_createfilter_norpcappkt(fp, &fcode) == -1)
 			goto error;
 
-		/* We cannot use 'pcap_setfilter_remote' because formally the capture has not been started yet */
-		/* (the 'fp->rmt_capstarted' variable will be updated some lines below) */
+		/* We cannot use 'pcap_setfilter_rpcap' because formally the capture has not been started yet */
+		/* (the 'pr->rmt_capstarted' variable will be updated some lines below) */
 		if (pcap_updatefilter_remote(fp, &fcode) == -1)
 			goto error;
 
 		pcap_freecode(&fcode);
 	}
 
-	md->rmt_capstarted = 1;
+	pr->rmt_capstarted = 1;
 	return 0;
 
 error:
 	/*
 	 * When the connection has been established, we have to close it. So, at the
 	 * beginning of this function, if an error occur we return immediately with
 	 * a return NULL; when the connection is established, we have to come here
 	 * ('goto error;') in order to close everything properly.
-	 *
-	 * Checks if all the data has been read; if not, discard the data in excess
 	 */
-	if (totread != ntohl(header.plen))
-		sock_discard(md->rmt_sockctrl, ntohl(header.plen) - totread, NULL, 0);
 
+	/*
+	 * Discard the rest of the message.
+	 * We already reported an error; if this gets an error, just
+	 * drive on.
+	 */
+	(void)rpcap_discard(pr->rmt_sockctrl, plen, NULL);
+
+error_nodiscard:
 	if ((sockdata) && (sockdata != -1))		/* we can be here because sockdata said 'error' */
 		sock_close(sockdata, NULL, 0);
 
 	if (!active)
-		sock_close(md->rmt_sockctrl, NULL, 0);
+		sock_close(pr->rmt_sockctrl, NULL, 0);
 
+	if (addrinfo != NULL)
+		freeaddrinfo(addrinfo);
+
 	/*
 	 * We do not have to call pcap_close() here, because this function is always called
 	 * by the user in case something bad happens
 	 */
-	// 	if (fp)
-	// 	{
-	// 		pcap_close(fp);
-	// 		fp= NULL;
-	// 	}
+#if 0
+	if (fp)
+	{
+		pcap_close(fp);
+		fp= NULL;
+	}
+#endif
 
 	return -1;
 }
 
 /*
- * \brief Takes a bpf program and sends it to the other host.
+ * This function takes a bpf program and sends it to the other host.
  *
  * This function can be called in two cases:
- * - the pcap_startcapture() is called (we have to send the filter along with
- * the 'start capture' command)
- * - we want to udpate the filter during a capture (i.e. the pcap_setfilter()
- * is called when the capture is still on)
+ * - pcap_startcapture_remote() is called (we have to send the filter
+ *   along with the 'start capture' command)
+ * - we want to udpate the filter during a capture (i.e. pcap_setfilter()
+ *   after the capture has been started)
  *
- * This function serializes the filter into the sending buffer ('sendbuf', passed
- * as a parameter) and return back. It does not send anything on the network.
+ * This function serializes the filter into the sending buffer ('sendbuf',
+ * passed as a parameter) and return back. It does not send anything on
+ * the network.
  *
  * \param fp: the pcap_t descriptor of the device currently opened.
  *
  * \param sendbuf: the buffer on which the serialized data has to copied.
  *
  * \param sendbufidx: it is used to return the abounf of bytes copied into the buffer.
  *
  * \param prog: the bpf program we have to copy.
  *
  * \return '0' if everything is fine, '-1' otherwise. The error message (if one)
  * is returned into the 'errbuf' field of the pcap_t structure.
  */
 static int pcap_pack_bpffilter(pcap_t *fp, char *sendbuf, int *sendbufidx, struct bpf_program *prog)
 {
 	struct rpcap_filter *filter;
 	struct rpcap_filterbpf_insn *insn;
 	struct bpf_insn *bf_insn;
 	struct bpf_program fake_prog;		/* To be used just in case the user forgot to set a filter */
 	unsigned int i;
 
-
 	if (prog->bf_len == 0)	/* No filters have been specified; so, let's apply a "fake" filter */
 	{
 		if (pcap_compile(fp, &fake_prog, NULL /* buffer */, 1, 0) == -1)
 			return -1;
 
 		prog = &fake_prog;
 	}
 
 	filter = (struct rpcap_filter *) sendbuf;
 
 	if (sock_bufferize(NULL, sizeof(struct rpcap_filter), NULL, sendbufidx,
 		RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
 	filter->filtertype = htons(RPCAP_UPDATEFILTER_BPF);
 	filter->nitems = htonl((int32)prog->bf_len);
 
 	if (sock_bufferize(NULL, prog->bf_len * sizeof(struct rpcap_filterbpf_insn),
 		NULL, sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
 	insn = (struct rpcap_filterbpf_insn *) (filter + 1);
 	bf_insn = prog->bf_insns;
 
 	for (i = 0; i < prog->bf_len; i++)
 	{
 		insn->code = htons(bf_insn->code);
 		insn->jf = bf_insn->jf;
 		insn->jt = bf_insn->jt;
 		insn->k = htonl(bf_insn->k);
 
 		insn++;
 		bf_insn++;
 	}
 
 	return 0;
 }
 
-/* \ingroup remote_pri_func
+/*
+ * This function updates a filter on a remote host.
  *
- * \brief Update a filter on a remote host.
- *
- * This function is called when the user wants to update a filter.
- * In case we're capturing from the network, it sends the filter to the other peer.
- * This function is *not* called automatically when the user calls the pcap_setfilter().
+ * It is called when the user wants to update a filter.
+ * In case we're capturing from the network, it sends the filter to our
+ * peer.
+ * This function is *not* called automatically when the user calls
+ * pcap_setfilter().
  * There will be two cases:
- * - the capture is already on: in this case, pcap_setfilter() calls pcap_updatefilter_remote()
- * - the capture has not started yet: in this case, pcap_setfilter() stores the filter into
- * the pcap_t structure, and then the filter is sent with the pcap_startcap().
+ * - the capture has been started: in this case, pcap_setfilter_rpcap()
+ *   calls pcap_updatefilter_remote()
+ * - the capture has not started yet: in this case, pcap_setfilter_rpcap()
+ *   stores the filter into the pcap_t structure, and then the filter is
+ *   sent with pcap_startcap().
  *
- * Parameters and return values are exactly the same of the pcap_setfilter().
+ * WARNING This function *does not* clear the packet currently into the
+ * buffers. Therefore, the user has to expect to receive some packets
+ * that are related to the previous filter.  If you want to discard all
+ * the packets before applying a new filter, you have to close the
+ * current capture session and start a new one.
  *
- * \warning This function *does not* clear the packet currently into the buffers. Therefore,
- * the user has to expect to receive some packets that are related to the previous filter.
- * If you want to discard all the packets before applying a new filter, you have to close
- * the current capture session and start a new one.
+ * XXX - we really should have pcap_setfilter() always discard packets
+ * received with the old filter, and have a separate pcap_setfilter_noflush()
+ * function that doesn't discard any packets.
  */
 static int pcap_updatefilter_remote(pcap_t *fp, struct bpf_program *prog)
 {
-	int retval;						/* general variable used to keep the return value of other functions */
-	char sendbuf[RPCAP_NETBUF_SIZE];/* temporary buffer in which data to be sent is buffered */
-	int sendbufidx = 0;				/* index which keeps the number of bytes currently buffered */
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
+	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data to be sent is buffered */
+	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
 	struct rpcap_header header;		/* To keep the reply message */
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
 
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
-
 	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL, &sendbufidx,
 		RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_UPDATEFILTER_REQ, 0,
-		sizeof(struct rpcap_filter) + prog->bf_len * sizeof(struct rpcap_filterbpf_insn));
+	rpcap_createhdr((struct rpcap_header *) sendbuf,
+	    pr->protocol_version, RPCAP_MSG_UPDATEFILTER_REQ, 0,
+	    sizeof(struct rpcap_filter) + prog->bf_len * sizeof(struct rpcap_filterbpf_insn));
 
 	if (pcap_pack_bpffilter(fp, &sendbuf[sendbufidx], &sendbufidx, prog))
 		return -1;
 
-	if (sock_send(md->rmt_sockctrl, sendbuf, sendbufidx, fp->errbuf, PCAP_ERRBUF_SIZE))
+	if (sock_send(pr->rmt_sockctrl, sendbuf, sendbufidx, fp->errbuf,
+	    PCAP_ERRBUF_SIZE) < 0)
 		return -1;
 
-	/* Waits for the answer */
-	if (sock_recv(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(pr->rmt_sockctrl, pr->protocol_version,
+	    RPCAP_MSG_UPDATEFILTER_REQ, &header, fp->errbuf) == -1)
 		return -1;
 
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(fp->errbuf, md->rmt_sockctrl, &header, RPCAP_MSG_UPDATEFILTER_REPLY, 0);
+	/*
+	 * It shouldn't have any contents; discard it if it does.
+	 */
+	if (rpcap_discard(pr->rmt_sockctrl, header.plen, fp->errbuf) == -1)
+		return -1;
 
-	if (retval != RPCAP_MSG_UPDATEFILTER_REPLY)		/* the message is not the one expected */
-	{
-		switch (retval)
-		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint sent a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			/* Do nothing; just exit from here; the error code is already into the errbuf */
-			return -1;
+	return 0;
+}
 
-		default:
-			SOCK_ASSERT("Internal error", 0);
-			return -1;
-		}
-	}
+static void
+pcap_save_current_filter_rpcap(pcap_t *fp, const char *filter)
+{
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 
-	if (ntohl(header.plen) != 0)	/* the message has an unexpected size */
+	/*
+	 * Check if:
+	 *  - We are on an remote capture
+	 *  - we do not want to capture RPCAP traffic
+	 *
+	 * If so, we have to save the current filter, because we have to
+	 * add some piece of stuff later
+	 */
+	if (pr->rmt_clientside &&
+	    (pr->rmt_flags & PCAP_OPENFLAG_NOCAPTURE_RPCAP))
 	{
-		if (sock_discard(md->rmt_sockctrl, ntohl(header.plen), fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-			return -1;
-	}
+		if (pr->currentfilter)
+			free(pr->currentfilter);
 
-	return 0;
+		if (filter == NULL)
+			filter = "";
+
+		pr->currentfilter = strdup(filter);
+	}
 }
 
 /*
- * \ingroup remote_pri_func
+ * This function sends a filter to a remote host.
  *
- * \brief Send a filter to a remote host.
- *
  * This function is called when the user wants to set a filter.
- * In case we're capturing from the network, it sends the filter to the other peer.
- * This function is called automatically when the user calls the pcap_setfilter().
+ * It sends the filter to our peer.
+ * This function is called automatically when the user calls pcap_setfilter().
  *
- * Parameters and return values are exactly the same of the pcap_setfilter().
+ * Parameters and return values are exactly the same of pcap_setfilter().
  */
-static int pcap_setfilter_remote(pcap_t *fp, struct bpf_program *prog)
+static int pcap_setfilter_rpcap(pcap_t *fp, struct bpf_program *prog)
 {
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
-	if (!md->rmt_capstarted)
+	if (!pr->rmt_capstarted)
 	{
 		/* copy filter into the pcap_t structure */
 		if (install_bpf_program(fp, prog) == -1)
 			return -1;
 		return 0;
 	}
 
 	/* we have to update a filter during run-time */
 	if (pcap_updatefilter_remote(fp, prog))
 		return -1;
 
 	return 0;
 }
 
 /*
- * \ingroup remote_pri_func
+ * This function updates the current filter in order not to capture rpcap
+ * packets.
  *
- * \brief Update the current filter in order not to capture rpcap packets.
- *
  * This function is called *only* when the user wants exclude RPCAP packets
  * related to the current session from the captured packets.
  *
  * \return '0' if everything is fine, '-1' otherwise. The error message (if one)
  * is returned into the 'errbuf' field of the pcap_t structure.
  */
 static int pcap_createfilter_norpcappkt(pcap_t *fp, struct bpf_program *prog)
 {
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 	int RetVal = 0;
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
 
-	md = (struct pcap_md *) ((u_char*)fp->priv + sizeof(struct pcap_win));
-
 	/* We do not want to capture our RPCAP traffic. So, let's update the filter */
-	if (md->rmt_flags & PCAP_OPENFLAG_NOCAPTURE_RPCAP)
+	if (pr->rmt_flags & PCAP_OPENFLAG_NOCAPTURE_RPCAP)
 	{
 		struct sockaddr_storage saddr;		/* temp, needed to retrieve the network data port chosen on the local machine */
 		socklen_t saddrlen;					/* temp, needed to retrieve the network data port chosen on the local machine */
 		char myaddress[128];
 		char myctrlport[128];
 		char mydataport[128];
 		char peeraddress[128];
 		char peerctrlport[128];
 		char *newfilter;
 		const int newstringsize = 1024;
 		size_t currentfiltersize;
 
-		/* Get the name/port of the other peer */
+		/* Get the name/port of our peer */
 		saddrlen = sizeof(struct sockaddr_storage);
-		if (getpeername(md->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
+		if (getpeername(pr->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
 		{
 			sock_geterror("getpeername(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
 		if (getnameinfo((struct sockaddr *) &saddr, saddrlen, peeraddress,
 			sizeof(peeraddress), peerctrlport, sizeof(peerctrlport), NI_NUMERICHOST | NI_NUMERICSERV))
 		{
 			sock_geterror("getnameinfo(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
 		/* We cannot check the data port, because this is available only in case of TCP sockets */
 		/* Get the name/port of the current host */
-		if (getsockname(md->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
+		if (getsockname(pr->rmt_sockctrl, (struct sockaddr *) &saddr, &saddrlen) == -1)
 		{
 			sock_geterror("getsockname(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
 		/* Get the local port the system picked up */
 		if (getnameinfo((struct sockaddr *) &saddr, saddrlen, myaddress,
 			sizeof(myaddress), myctrlport, sizeof(myctrlport), NI_NUMERICHOST | NI_NUMERICSERV))
 		{
 			sock_geterror("getnameinfo(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
 		/* Let's now check the data port */
-		if (getsockname(md->rmt_sockdata, (struct sockaddr *) &saddr, &saddrlen) == -1)
+		if (getsockname(pr->rmt_sockdata, (struct sockaddr *) &saddr, &saddrlen) == -1)
 		{
 			sock_geterror("getsockname(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
 		/* Get the local port the system picked up */
 		if (getnameinfo((struct sockaddr *) &saddr, saddrlen, NULL, 0, mydataport, sizeof(mydataport), NI_NUMERICSERV))
 		{
 			sock_geterror("getnameinfo(): ", fp->errbuf, PCAP_ERRBUF_SIZE);
 			return -1;
 		}
 
-		currentfiltersize = strlen(md->currentfilter);
+		currentfiltersize = pr->currentfilter ? strlen(pr->currentfilter) : 0;
 
 		newfilter = (char *)malloc(currentfiltersize + newstringsize + 1);
 
 		if (currentfiltersize)
 		{
 			pcap_snprintf(newfilter, currentfiltersize + newstringsize,
 				"(%s) and not (host %s and host %s and port %s and port %s) and not (host %s and host %s and port %s)",
-				md->currentfilter, myaddress, peeraddress, myctrlport, peerctrlport, myaddress, peeraddress, mydataport);
+				pr->currentfilter, myaddress, peeraddress, myctrlport, peerctrlport, myaddress, peeraddress, mydataport);
 		}
 		else
 		{
 			pcap_snprintf(newfilter, currentfiltersize + newstringsize,
 				"not (host %s and host %s and port %s and port %s) and not (host %s and host %s and port %s)",
 				myaddress, peeraddress, myctrlport, peerctrlport, myaddress, peeraddress, mydataport);
 		}
 
 		newfilter[currentfiltersize + newstringsize] = 0;
 
-		/* This is only an hack to make the pcap_compile() working properly */
-		md->rmt_clientside = 0;
+		/*
+		 * This is only an hack to prevent the save_current_filter
+		 * routine, which will be called when we call pcap_compile(),
+		 * from saving the modified filter.
+		 */
+		pr->rmt_clientside = 0;
 
 		if (pcap_compile(fp, prog, newfilter, 1, 0) == -1)
 			RetVal = -1;
 
-		/* This is only an hack to make the pcap_compile() working properly */
-		md->rmt_clientside = 1;
+		/* Undo the hack. */
+		pr->rmt_clientside = 1;
 
 		free(newfilter);
 	}
 
 	return RetVal;
 }
 
 /*
- * \ingroup remote_pri_func
+ * This function sets sampling parameters in the remote host.
  *
- * \brief Set sampling parameters in the remote host.
+ * It is called when the user wants to set activate sampling on the
+ * remote host.
  *
- * This function is called when the user wants to set activate sampling on the remote host.
- *
  * Sampling parameters are defined into the 'pcap_t' structure.
  *
  * \param p: the pcap_t descriptor of the device currently opened.
  *
- * \return '0' if everything is OK, '-1' is something goes wrong. The error message is returned
- * in the 'errbuf' member of the pcap_t structure.
+ * \return '0' if everything is OK, '-1' is something goes wrong. The
+ * error message is returned in the 'errbuf' member of the pcap_t structure.
  */
-static int pcap_setsampling_remote(pcap_t *p)
+static int pcap_setsampling_remote(pcap_t *fp)
 {
-	int retval;						/* general variable used to keep the return value of other functions */
+	struct pcap_rpcap *pr = fp->priv;	/* structure used when doing a remote live capture */
 	char sendbuf[RPCAP_NETBUF_SIZE];/* temporary buffer in which data to be sent is buffered */
-	int sendbufidx = 0;				/* index which keeps the number of bytes currently buffered */
+	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
 	struct rpcap_header header;		/* To keep the reply message */
 	struct rpcap_sampling *sampling_pars;	/* Structure that is needed to send sampling parameters to the remote host */
-	struct pcap_md *md;				/* structure used when doing a remote live capture */
 
-	md = (struct pcap_md *) ((u_char*)p->priv + sizeof(struct pcap_win));
-
 	/* If no samping is requested, return 'ok' */
-	if (md->rmt_samp.method == PCAP_SAMP_NOSAMP)
+	if (fp->rmt_samp.method == PCAP_SAMP_NOSAMP)
 		return 0;
 
+	/*
+	 * Check for sampling parameters that don't fit in a message.
+	 * We'll let the server complain about invalid parameters
+	 * that do fit into the message.
+	 */
+	if (fp->rmt_samp.method < 0 || fp->rmt_samp.method > 255) {
+		pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE,
+		    "Invalid sampling method %d", fp->rmt_samp.method);
+		return -1;
+	}
+	if (fp->rmt_samp.value < 0 || fp->rmt_samp.value > 65535) {
+		pcap_snprintf(fp->errbuf, PCAP_ERRBUF_SIZE,
+		    "Invalid sampling value %d", fp->rmt_samp.value);
+		return -1;
+	}
+
 	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL,
-		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, p->errbuf, PCAP_ERRBUF_SIZE))
+		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_SETSAMPLING_REQ, 0, sizeof(struct rpcap_sampling));
+	rpcap_createhdr((struct rpcap_header *) sendbuf,
+	    pr->protocol_version, RPCAP_MSG_SETSAMPLING_REQ, 0,
+	    sizeof(struct rpcap_sampling));
 
 	/* Fill the structure needed to open an adapter remotely */
 	sampling_pars = (struct rpcap_sampling *) &sendbuf[sendbufidx];
 
 	if (sock_bufferize(NULL, sizeof(struct rpcap_sampling), NULL,
-		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, p->errbuf, PCAP_ERRBUF_SIZE))
+		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, fp->errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
 	memset(sampling_pars, 0, sizeof(struct rpcap_sampling));
 
-	sampling_pars->method = md->rmt_samp.method;
-	sampling_pars->value = htonl(md->rmt_samp.value);
+	sampling_pars->method = (uint8)fp->rmt_samp.method;
+	sampling_pars->value = (uint16)htonl(fp->rmt_samp.value);
 
-	if (sock_send(md->rmt_sockctrl, sendbuf, sendbufidx, p->errbuf, PCAP_ERRBUF_SIZE))
+	if (sock_send(pr->rmt_sockctrl, sendbuf, sendbufidx, fp->errbuf,
+	    PCAP_ERRBUF_SIZE) < 0)
 		return -1;
 
-	/* Waits for the answer */
-	if (sock_recv(md->rmt_sockctrl, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, p->errbuf, PCAP_ERRBUF_SIZE) == -1)
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(pr->rmt_sockctrl, pr->protocol_version,
+	    RPCAP_MSG_SETSAMPLING_REQ, &header, fp->errbuf) == -1)
 		return -1;
 
-	/* Checks if the message is correct */
-	retval = rpcap_checkmsg(p->errbuf, md->rmt_sockctrl, &header, RPCAP_MSG_SETSAMPLING_REPLY, 0);
+	/*
+	 * It shouldn't have any contents; discard it if it does.
+	 */
+	if (rpcap_discard(pr->rmt_sockctrl, header.plen, fp->errbuf) == -1)
+		return -1;
 
-	if (retval != RPCAP_MSG_SETSAMPLING_REPLY)		/* the message is not the one expected */
-	{
-		switch (retval)
-		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint sent a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-		case RPCAP_MSG_ERROR:
-			/* Do nothing; just exit from here; the error code is already into the errbuf */
-			return -1;
-
-		default:
-			SOCK_ASSERT("Internal error", 0);
-			return -1;
-		}
-	}
-
-	if (ntohl(header.plen) != 0)	/* the message has an unexpected size */
-	{
-		if (sock_discard(md->rmt_sockctrl, ntohl(header.plen), p->errbuf, PCAP_ERRBUF_SIZE) == -1)
-			return -1;
-	}
-
 	return 0;
-
 }
 
 /*********************************************************
  *                                                       *
  * Miscellaneous functions                               *
  *                                                       *
  *********************************************************/
 
-
-/* \ingroup remote_pri_func
- * \brief It sends a RPCAP error to the other peer.
+/*
+ * This function performs authentication and protocol version
+ * negotiation.  It first tries to authenticate with the maximum
+ * version we support and, if that fails with an "I don't support
+ * that version" error from the server, and the version number in
+ * the reply from the server is one we support, tries again with
+ * that version.
  *
- * This function has to be called when the main program detects an error. This function
- * will send on the other peer the 'buffer' specified by the user.
- * This function *does not* request a RPCAP CLOSE connection. A CLOSE command must be sent
- * explicitly by the program, since we do not know it the error can be recovered in some
- * way or it is a non-recoverable one.
- *
  * \param sock: the socket we are currently using.
  *
- * \param error: an user-allocated (and '0' terminated) buffer that contains the error
- * description that has to be transmitted on the other peer. The error message cannot
- * be longer than PCAP_ERRBUF_SIZE.
+ * \param ver: pointer to variable holding protocol version number to send
+ * and to set to the protocol version number in the reply.
  *
- * \param errcode: a integer which tells the other party the type of error we had;
- * currently is is not too much used.
+ * \param auth: authentication parameters that have to be sent.
  *
- * \param errbuf: a pointer to a user-allocated buffer (of size PCAP_ERRBUF_SIZE)
- * that will contain the error message (in case there is one). It could be network problem.
+ * \param errbuf: a pointer to a user-allocated buffer (of size
+ * PCAP_ERRBUF_SIZE) that will contain the error message (in case there
+ * is one). It could be a network problem or the fact that the authorization
+ * failed.
  *
- * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
- * in the 'errbuf' variable.
+ * \return '0' if everything is fine, '-1' for an error.  For errors,
+ * an error message string is returned in the 'errbuf' variable.
  */
-int rpcap_senderror(SOCKET sock, char *error, unsigned short errcode, char *errbuf)
+static int rpcap_doauth(SOCKET sockctrl, uint8 *ver, struct pcap_rmtauth *auth, char *errbuf)
 {
-	char sendbuf[RPCAP_NETBUF_SIZE];			/* temporary buffer in which data to be sent is buffered */
-	int sendbufidx = 0;							/* index which keeps the number of bytes currently buffered */
-	uint16 length;
+	int status;
 
-	length = (uint16)strlen(error);
-
-	if (length > PCAP_ERRBUF_SIZE)
-		length = PCAP_ERRBUF_SIZE;
-
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_ERROR, errcode, length);
-
-	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL, &sendbufidx,
-		RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, errbuf, PCAP_ERRBUF_SIZE))
+	/*
+	 * Send authentication to the remote machine.
+	 *
+	 * First try with the maximum version number we support.
+	 */
+	*ver = RPCAP_MAX_VERSION;
+	status = rpcap_sendauth(sockctrl, ver, auth, errbuf);
+	if (status == 0)
+	{
+		//
+		// Success.
+		//
+		return 0;
+	}
+	if (status == -1)
+	{
+		/* Unrecoverable error. */
 		return -1;
+	}
 
-	if (sock_bufferize(error, length, sendbuf, &sendbufidx,
-		RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, errbuf, PCAP_ERRBUF_SIZE))
+	/*
+	 * The server doesn't support the version we used in the initial
+	 * message, and it sent us back a reply either with the maximum
+	 * version they do support, or with the version we sent, and we
+	 * support that version.  *ver has been set to that version; try
+	 * authenticating again with that version.
+	 */
+	status = rpcap_sendauth(sockctrl, ver, auth, errbuf);
+	if (status == 0)
+	{
+		//
+		// Success.
+		//
+		return 0;
+	}
+	if (status == -1)
+	{
+		/* Unrecoverable error. */
 		return -1;
-
-	if (sock_send(sock, sendbuf, sendbufidx, errbuf, PCAP_ERRBUF_SIZE))
+	}
+	if (status == -2)
+	{
+		/*
+		 * The server doesn't support that version, which
+		 * means there is no version we both support, so
+		 * this is a fatal error.
+		 */
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The server doesn't support any protocol version that we support");
 		return -1;
-
-	return 0;
+	}
+	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "rpcap_sendauth() returned %d", status);
+	return -1;
 }
 
-/* \ingroup remote_pri_func
- * \brief Sends the authentication message.
+/*
+ * This function sends the authentication message.
  *
  * It sends the authentication parameters on the control socket.
- * This function is required in order to open the connection with the other end party.
+ * It is required in order to open the connection with the other end party.
  *
  * \param sock: the socket we are currently using.
  *
+ * \param ver: pointer to variable holding protocol version number to send
+ * and to set to the protocol version number in the reply.
+ *
  * \param auth: authentication parameters that have to be sent.
  *
- * \param errbuf: a pointer to a user-allocated buffer (of size PCAP_ERRBUF_SIZE)
- * that will contain the error message (in case there is one). It could be network problem
- * of the fact that the authorization failed.
+ * \param errbuf: a pointer to a user-allocated buffer (of size
+ * PCAP_ERRBUF_SIZE) that will contain the error message (in case there
+ * is one). It could be a network problem or the fact that the authorization
+ * failed.
  *
- * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
- * in the 'errbuf' variable.
- * The error message could be also 'the authentication failed'.
+ * \return '0' if everything is fine, '-2' if the server didn't reply with
+ * the protocol version we requested but replied with a version we do
+ * support, or '-1' for other errors.  For errors, an error message string
+ * is returned in the 'errbuf' variable.
  */
-int rpcap_sendauth(SOCKET sock, struct pcap_rmtauth *auth, char *errbuf)
+static int rpcap_sendauth(SOCKET sock, uint8 *ver, struct pcap_rmtauth *auth, char *errbuf)
 {
 	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data that has to be sent is buffered */
-	int sendbufidx = 0;					/* index which keeps the number of bytes currently buffered */
-	uint16 length;						/* length of the payload of this message */
+	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
+	uint16 length;				/* length of the payload of this message */
+	uint16 errcode;
 	struct rpcap_auth *rpauth;
 	uint16 auth_type;
 	struct rpcap_header header;
-	int retval;							/* temp variable which stores functions return value */
+	size_t str_length;
 
 	if (auth)
 	{
-		auth_type = auth->type;
-
 		switch (auth->type)
 		{
 		case RPCAP_RMTAUTH_NULL:
 			length = sizeof(struct rpcap_auth);
 			break;
 
 		case RPCAP_RMTAUTH_PWD:
 			length = sizeof(struct rpcap_auth);
-			if (auth->username) length += (uint16) strlen(auth->username);
-			if (auth->password) length += (uint16) strlen(auth->password);
+			if (auth->username)
+			{
+				str_length = strlen(auth->username);
+				if (str_length > 65535)
+				{
+					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "User name is too long (> 65535 bytes)");
+					return -1;
+				}
+				length += (uint16)str_length;
+			}
+			if (auth->password)
+			{
+				str_length = strlen(auth->password);
+				if (str_length > 65535)
+				{
+					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Password is too long (> 65535 bytes)");
+					return -1;
+				}
+				length += (uint16)str_length;
+			}
 			break;
 
 		default:
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Authentication type not recognized.");
 			return -1;
 		}
+
+		auth_type = (uint16)auth->type;
 	}
 	else
 	{
 		auth_type = RPCAP_RMTAUTH_NULL;
 		length = sizeof(struct rpcap_auth);
 	}
 
 
 	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL,
 		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
-	rpcap_createhdr((struct rpcap_header *) sendbuf, RPCAP_MSG_AUTH_REQ, 0, length);
+	rpcap_createhdr((struct rpcap_header *) sendbuf, *ver,
+	    RPCAP_MSG_AUTH_REQ, 0, length);
 
 	rpauth = (struct rpcap_auth *) &sendbuf[sendbufidx];
 
 	if (sock_bufferize(NULL, sizeof(struct rpcap_auth), NULL,
 		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, errbuf, PCAP_ERRBUF_SIZE))
 		return -1;
 
 	memset(rpauth, 0, sizeof(struct rpcap_auth));
 
 	rpauth->type = htons(auth_type);
 
 	if (auth_type == RPCAP_RMTAUTH_PWD)
 	{
-
 		if (auth->username)
-			rpauth->slen1 = (uint16) strlen(auth->username);
+			rpauth->slen1 = (uint16)strlen(auth->username);
 		else
 			rpauth->slen1 = 0;
 
 		if (sock_bufferize(auth->username, rpauth->slen1, sendbuf,
 			&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, errbuf, PCAP_ERRBUF_SIZE))
 			return -1;
 
 		if (auth->password)
-			rpauth->slen2 = (uint16) strlen(auth->password);
+			rpauth->slen2 = (uint16)strlen(auth->password);
 		else
 			rpauth->slen2 = 0;
 
 		if (sock_bufferize(auth->password, rpauth->slen2, sendbuf,
 			&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, errbuf, PCAP_ERRBUF_SIZE))
 			return -1;
 
 		rpauth->slen1 = htons(rpauth->slen1);
 		rpauth->slen2 = htons(rpauth->slen2);
 	}
 
-	if (sock_send(sock, sendbuf, sendbufidx, errbuf, PCAP_ERRBUF_SIZE))
+	if (sock_send(sock, sendbuf, sendbufidx, errbuf, PCAP_ERRBUF_SIZE) < 0)
 		return -1;
 
-	if (sock_recv(sock, (char *)&header, sizeof(struct rpcap_header), SOCK_RECEIVEALL_YES, errbuf, PCAP_ERRBUF_SIZE) == -1)
+	/* Receive the reply */
+	if (rpcap_recv_msg_header(sock, &header, errbuf) == -1)
 		return -1;
 
-	retval = rpcap_checkmsg(errbuf, sock, &header, RPCAP_MSG_AUTH_REPLY, RPCAP_MSG_ERROR, 0);
-
-	if (retval != RPCAP_MSG_AUTH_REPLY)		/* the message is not the one expected */
+	if (rpcap_check_msg_type(sock, RPCAP_MSG_AUTH_REQ, &header,
+	    &errcode, errbuf) == -1)
 	{
-		switch (retval)
+		/* Error message - or something else, which is a protocol error. */
+		if (header.type == RPCAP_MSG_ERROR &&
+		    errcode == PCAP_ERR_WRONGVER)
 		{
-		case -3:		/* Unrecoverable network error */
-		case -2:		/* The other endpoint sent a message that is not allowed here */
-		case -1:		/* The other endpoint has a version number that is not compatible with our */
-			/* Do nothing; just exit from here; the error code is already into the errbuf */
-			return -1;
+			/*
+			 * The server didn't support the version we sent,
+			 * and replied with the maximum version it supports
+			 * if our version was too big or with the version
+			 * we sent if out version was too small.
+			 *
+			 * Do we also support it?
+			 */
+			if (!RPCAP_VERSION_IS_SUPPORTED(header.ver))
+			{
+				/*
+				 * No, so there's no version we both support.
+				 * This is an unrecoverable error.
+				 */
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The server doesn't support any protocol version that we support");
+				return -1;
+			}
 
-		case RPCAP_MSG_ERROR:
-			return -1;
-
-		default:
-			SOCK_ASSERT("Internal error", 0);
-			return -1;
+			/*
+			 * OK, use that version, and tell our caller to
+			 * try again.
+			 */
+			*ver = header.ver;
+			return -2;
 		}
-	}
 
-	if (ntohl(header.plen))
-	{
-		if (sock_discard(sock, ntohl(header.plen), errbuf, PCAP_ERRBUF_SIZE))
-			return -1;
+		/*
+		 * Other error - unrecoverable.
+		 */
+		return -1;
 	}
 
+	/*
+	 * OK, it's an authentication reply, so they're OK with the
+	 * protocol version we sent.
+	 *
+	 * Discard the rest of it.
+	 */
+	if (rpcap_discard(sock, header.plen, errbuf) == -1)
+		return -1;
+
 	return 0;
 }
 
-/* \ingroup remote_pri_func
- * \brief Creates a structure of type rpcap_header.
- *
- * This function is provided just because the creation of an rpcap header is quite a common
- * task. It accepts all the values that appears into an rpcap_header, and it puts them in
- * place using the proper hton() calls.
- *
- * \param header: a pointer to a user-allocated buffer which will contain the serialized
- * header, ready to be sent on the network.
- *
- * \param type: a value (in the host by order) which will be placed into the header.type
- * field and that represents the type of the current message.
- *
- * \param value: a value (in the host by order) which will be placed into the header.value
- * field and that has a message-dependent meaning.
- *
- * \param length: a value (in the host by order) which will be placed into the header.length
- * field and that represents the payload length of the message.
- *
- * \return Nothing. The serialized header is returned into the 'header' variable.
- */
-void rpcap_createhdr(struct rpcap_header *header, uint8 type, uint16 value, uint32 length)
+/* We don't currently support non-blocking mode. */
+static int
+pcap_getnonblock_rpcap(pcap_t *p)
 {
-	memset(header, 0, sizeof(struct rpcap_header));
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Non-blocking mode isn't supported for capturing remotely with rpcap");
+	return (-1);
+}
 
-	header->ver = RPCAP_VERSION;
-	header->type = type;
-	header->value = htons(value);
-	header->plen = htonl(length);
+static int
+pcap_setnonblock_rpcap(pcap_t *p, int nonblock _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Non-blocking mode isn't supported for capturing remotely with rpcap");
+	return (-1);
 }
 
-/* ingroup remote_pri_func
- * \brief Checks if the header of the received message is correct.
+/*
+ * This function opens a remote adapter by opening an RPCAP connection and
+ * so on.
  *
- * This function is a way to easily check if the message received, in a certain
- * state of the RPCAP protocol Finite State Machine, is valid. This function accepts,
- * as a parameter, the list of message types that are allowed in a certain situation,
- * and it returns the one which occurs.
+ * It does the job of pcap_open_live() for a remote interface; it's called
+ * by pcap_open() for remote interfaces.
  *
- * \param errbuf: a pointer to a user-allocated buffer (of size PCAP_ERRBUF_SIZE)
- * that will contain the error message (in case there is one). It could be either problem
- * occurred inside this function (e.g. a network problem in case it tries to send an
- * error on the other peer and the send() call fails), an error message which has been
- * sent to us from the other party, or a version error (the message receive has a version
- * number that is incompatible with our).
+ * We do not start the capture until pcap_startcapture_remote() is called.
  *
- * \param sock: the socket that has to be used to receive data. This function can
- * read data from socket in case the version contained into the message is not compatible
- * with our. In that case, all the message is purged from the socket, so that the following
- * recv() calls will return a new message.
+ * This is because, when doing a remote capture, we cannot start capturing
+ * data as soon as the 'open adapter' command is sent. Suppose the remote
+ * adapter is already overloaded; if we start a capture (which, by default,
+ * has a NULL filter) the new traffic can saturate the network.
  *
- * \param header: a pointer to and 'rpcap_header' structure that keeps the data received from
- * the network (still in network byte order) and that has to be checked.
+ * Instead, we want to "open" the adapter, then send a "start capture"
+ * command only when we're ready to start the capture.
+ * This function does this job: it sends an "open adapter" command
+ * (according to the RPCAP protocol), but it does not start the capture.
  *
- * \param first: this function has a variable number of parameters. From this point on,
- * all the messages that are valid in this context must be passed as parameters.
- * The message type list must be terminated with a '0' value, the null message type,
- * which means 'no more types to check'. The RPCAP protocol does not define anything with
- * message type equal to zero, so there is no ambiguity in using this value as a list terminator.
+ * Since the other libpcap functions do not share this way of life, we
+ * have to do some dirty things in order to make everything work.
  *
- * \return The message type of the message that has been detected. In case of errors (e.g. the
- * header contains a type that is not listed among the allowed types), this function will
- * return the following codes:
- * - (-1) if the version is incompatible.
- * - (-2) if the code is not among the one listed into the parameters list
- * - (-3) if a network error (connection reset, ...)
- * - RPCAP_MSG_ERROR if the message is an error message (it follow that the RPCAP_MSG_ERROR
- * could not be present in the allowed message-types list, because this function checks
- * for errors anyway)
+ * \param source: see pcap_open().
+ * \param snaplen: see pcap_open().
+ * \param flags: see pcap_open().
+ * \param read_timeout: see pcap_open().
+ * \param auth: see pcap_open().
+ * \param errbuf: see pcap_open().
  *
- * In case either the version is incompatible or nothing matches (i.e. it returns '-1' or '-2'),
- * it discards the message body (i.e. it reads the remaining part of the message from the
- * network and it discards it) so that the application is ready to receive a new message.
+ * \return a pcap_t pointer in case of success, NULL otherwise. In case of
+ * success, the pcap_t pointer can be used as a parameter to the following
+ * calls (pcap_compile() and so on). In case of problems, errbuf contains
+ * a text explanation of error.
+ *
+ * WARNING: In case we call pcap_compile() and the capture has not yet
+ * been started, the filter will be saved into the pcap_t structure,
+ * and it will be sent to the other host later (when
+ * pcap_startcapture_remote() is called).
  */
-int rpcap_checkmsg(char *errbuf, SOCKET sock, struct rpcap_header *header, uint8 first, ...)
+pcap_t *pcap_open_rpcap(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf)
 {
-	va_list ap;
-	uint8 type;
-	int32 len;
+	pcap_t *fp;
+	char *source_str;
+	struct pcap_rpcap *pr;		/* structure used when doing a remote live capture */
+	char host[PCAP_BUF_SIZE], ctrlport[PCAP_BUF_SIZE], iface[PCAP_BUF_SIZE];
+	struct activehosts *activeconn;		/* active connection, if there is one */
+	int error;				/* '1' if rpcap_remoteact_getsock returned an error */
+	SOCKET sockctrl;
+	uint8 protocol_version;			/* negotiated protocol version */
+	int active;
+	uint32 plen;
+	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data to be sent is buffered */
+	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
+	int retval;				/* store the return value of the functions */
 
-	va_start(ap, first);
+	/* RPCAP-related variables */
+	struct rpcap_header header;		/* header of the RPCAP packet */
+	struct rpcap_openreply openreply;	/* open reply message */
 
-	/* Check if the present version of the protocol can handle this message */
-	if (rpcap_checkver(sock, header, errbuf))
+	fp = pcap_create_common(errbuf, sizeof (struct pcap_rpcap));
+	if (fp == NULL)
 	{
-		SOCK_ASSERT(errbuf, 1);
+		return NULL;
+	}
+	source_str = strdup(source);
+	if (source_str == NULL) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		return NULL;
+	}
 
-		va_end(ap);
-		return -1;
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 *
+	 * XXX - should we leave this up to the remote server to
+	 * do?
+	 */
+	if (snaplen <= 0 || snaplen > MAXIMUM_SNAPLEN)
+		snaplen = MAXIMUM_SNAPLEN;
+
+	fp->opt.device = source_str;
+	fp->snapshot = snaplen;
+	fp->opt.timeout = read_timeout;
+	pr = fp->priv;
+	pr->rmt_flags = flags;
+
+	/*
+	 * determine the type of the source (NULL, file, local, remote)
+	 * You must have a valid source string even if we're in active mode, because otherwise
+	 * the call to the following function will fail.
+	 */
+	if (pcap_parsesrcstr(fp->opt.device, &retval, host, ctrlport, iface, errbuf) == -1)
+	{
+		pcap_close(fp);
+		return NULL;
 	}
 
-	type = first;
+	if (retval != PCAP_SRC_IFREMOTE)
+	{
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "This function is able to open only remote interfaces");
+		pcap_close(fp);
+		return NULL;
+	}
 
-	while (type != 0)
+	/*
+	 * Warning: this call can be the first one called by the user.
+	 * For this reason, we have to initialize the WinSock support.
+	 */
+	if (sock_init(errbuf, PCAP_ERRBUF_SIZE) == -1)
 	{
+		pcap_close(fp);
+		return NULL;
+	}
+
+	/* Check for active mode */
+	activeconn = rpcap_remoteact_getsock(host, &error, errbuf);
+	if (activeconn != NULL)
+	{
+		sockctrl = activeconn->sockctrl;
+		protocol_version = activeconn->protocol_version;
+		active = 1;
+	}
+	else
+	{
+		struct addrinfo hints;			/* temp, needed to open a socket connection */
+		struct addrinfo *addrinfo;		/* temp, needed to open a socket connection */
+
+		if (error)
+		{
+			/*
+			 * Call failed.
+			 */
+			pcap_close(fp);
+			return NULL;
+		}
+
 		/*
-		 * The message matches with one of the types listed
-		 * There is no need of conversions since both values are uint8
-		 *
-		 * Check if the other side reported an error.
-		 * If yes, it retrieves it and it returns it back to the caller
+		 * We're not in active mode; let's try to open a new
+		 * control connection.
 		 */
-		if (header->type == RPCAP_MSG_ERROR)
-		{
-			len = ntohl(header->plen);
+		memset(&hints, 0, sizeof(struct addrinfo));
+		hints.ai_family = PF_UNSPEC;
+		hints.ai_socktype = SOCK_STREAM;
 
-			if (len >= PCAP_ERRBUF_SIZE)
+		if (ctrlport[0] == 0)
+		{
+			/* the user chose not to specify the port */
+			if (sock_initaddress(host, RPCAP_DEFAULT_NETPORT, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
 			{
-				if (sock_recv(sock, errbuf, PCAP_ERRBUF_SIZE - 1, SOCK_RECEIVEALL_YES, errbuf, PCAP_ERRBUF_SIZE))
-					return -3;
+				pcap_close(fp);
+				return NULL;
+			}
+		}
+		else
+		{
+			if (sock_initaddress(host, ctrlport, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
+			{
+				pcap_close(fp);
+				return NULL;
+			}
+		}
 
-				sock_discard(sock, len - (PCAP_ERRBUF_SIZE - 1), NULL, 0);
+		if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
+		{
+			freeaddrinfo(addrinfo);
+			pcap_close(fp);
+			return NULL;
+		}
 
-				/* Put '\0' at the end of the string */
-				errbuf[PCAP_ERRBUF_SIZE - 1] = 0;
+		/* addrinfo is no longer used */
+		freeaddrinfo(addrinfo);
+
+		if (rpcap_doauth(sockctrl, &protocol_version, auth, errbuf) == -1)
+		{
+			sock_close(sockctrl, NULL, 0);
+			pcap_close(fp);
+			return NULL;
+		}
+		active = 0;
+	}
+
+	/*
+	 * Now it's time to start playing with the RPCAP protocol
+	 * RPCAP open command: create the request message
+	 */
+	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL,
+		&sendbufidx, RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, errbuf, PCAP_ERRBUF_SIZE))
+		goto error_nodiscard;
+
+	rpcap_createhdr((struct rpcap_header *) sendbuf, protocol_version,
+	    RPCAP_MSG_OPEN_REQ, 0, (uint32) strlen(iface));
+
+	if (sock_bufferize(iface, (int) strlen(iface), sendbuf, &sendbufidx,
+		RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, errbuf, PCAP_ERRBUF_SIZE))
+		goto error_nodiscard;
+
+	if (sock_send(sockctrl, sendbuf, sendbufidx, errbuf,
+	    PCAP_ERRBUF_SIZE) < 0)
+		goto error_nodiscard;
+
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(sockctrl, protocol_version,
+	    RPCAP_MSG_OPEN_REQ, &header, errbuf) == -1)
+		goto error_nodiscard;
+	plen = header.plen;
+
+	/* Read the reply body */
+	if (rpcap_recv(sockctrl, (char *)&openreply,
+	    sizeof(struct rpcap_openreply), &plen, errbuf) == -1)
+		goto error;
+
+	/* Discard the rest of the message, if there is any. */
+	if (rpcap_discard(pr->rmt_sockctrl, plen, errbuf) == -1)
+		goto error_nodiscard;
+
+	/* Set proper fields into the pcap_t struct */
+	fp->linktype = ntohl(openreply.linktype);
+	fp->tzoff = ntohl(openreply.tzoff);
+	pr->rmt_sockctrl = sockctrl;
+	pr->protocol_version = protocol_version;
+	pr->rmt_clientside = 1;
+
+	/* This code is duplicated from the end of this function */
+	fp->read_op = pcap_read_rpcap;
+	fp->save_current_filter_op = pcap_save_current_filter_rpcap;
+	fp->setfilter_op = pcap_setfilter_rpcap;
+	fp->getnonblock_op = pcap_getnonblock_rpcap;
+	fp->setnonblock_op = pcap_setnonblock_rpcap;
+	fp->stats_op = pcap_stats_rpcap;
+#ifdef _WIN32
+	fp->stats_ex_op = pcap_stats_ex_rpcap;
+#endif
+	fp->cleanup_op = pcap_cleanup_rpcap;
+
+	fp->activated = 1;
+	return fp;
+
+error:
+	/*
+	 * When the connection has been established, we have to close it. So, at the
+	 * beginning of this function, if an error occur we return immediately with
+	 * a return NULL; when the connection is established, we have to come here
+	 * ('goto error;') in order to close everything properly.
+	 */
+
+	/*
+	 * Discard the rest of the message.
+	 * We already reported an error; if this gets an error, just
+	 * drive on.
+	 */
+	(void)rpcap_discard(pr->rmt_sockctrl, plen, NULL);
+
+error_nodiscard:
+	if (!active)
+		sock_close(sockctrl, NULL, 0);
+
+	pcap_close(fp);
+	return NULL;
+}
+
+/* String identifier to be used in the pcap_findalldevs_ex() */
+#define PCAP_TEXT_SOURCE_ADAPTER "Network adapter"
+/* String identifier to be used in the pcap_findalldevs_ex() */
+#define PCAP_TEXT_SOURCE_ON_REMOTE_HOST "on remote node"
+
+static void
+freeaddr(struct pcap_addr *addr)
+{
+	free(addr->addr);
+	free(addr->netmask);
+	free(addr->broadaddr);
+	free(addr->dstaddr);
+	free(addr);
+}
+
+int
+pcap_findalldevs_ex_remote(char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf)
+{
+	struct activehosts *activeconn;	/* active connection, if there is one */
+	int error;			/* '1' if rpcap_remoteact_getsock returned an error */
+	uint8 protocol_version;		/* protocol version */
+	SOCKET sockctrl;		/* socket descriptor of the control connection */
+	uint32 plen;
+	struct rpcap_header header;	/* structure that keeps the general header of the rpcap protocol */
+	int i, j;		/* temp variables */
+	int nif;		/* Number of interfaces listed */
+	int active;			/* 'true' if we the other end-party is in active mode */
+	int type;
+	char host[PCAP_BUF_SIZE], port[PCAP_BUF_SIZE];
+	char tmpstring[PCAP_BUF_SIZE + 1];		/* Needed to convert names and descriptions from 'old' syntax to the 'new' one */
+	pcap_if_t *lastdev;	/* Last device in the pcap_if_t list */
+	pcap_if_t *dev;		/* Device we're adding to the pcap_if_t list */
+
+	/* List starts out empty. */
+	(*alldevs) = NULL;
+	lastdev = NULL;
+
+	/* Retrieve the needed data for getting adapter list */
+	if (pcap_parsesrcstr(source, &type, host, port, NULL, errbuf) == -1)
+		return -1;
+
+	/* Warning: this call can be the first one called by the user. */
+	/* For this reason, we have to initialize the WinSock support. */
+	if (sock_init(errbuf, PCAP_ERRBUF_SIZE) == -1)
+		return -1;
+
+	/* Check for active mode */
+	activeconn = rpcap_remoteact_getsock(host, &error, errbuf);
+	if (activeconn != NULL)
+	{
+		sockctrl = activeconn->sockctrl;
+		protocol_version = activeconn->protocol_version;
+		active = 1;
+	}
+	else
+	{
+		struct addrinfo hints;		/* temp variable needed to resolve hostnames into to socket representation */
+		struct addrinfo *addrinfo;	/* temp variable needed to resolve hostnames into to socket representation */
+
+		if (error)
+		{
+			/*
+			 * Call failed.
+			 */
+			return -1;
+		}
+
+		/*
+		 * We're not in active mode; let's try to open a new
+		 * control connection.
+		 */
+		memset(&hints, 0, sizeof(struct addrinfo));
+		hints.ai_family = PF_UNSPEC;
+		hints.ai_socktype = SOCK_STREAM;
+
+		if (port[0] == 0)
+		{
+			/* the user chose not to specify the port */
+			if (sock_initaddress(host, RPCAP_DEFAULT_NETPORT, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
+				return -1;
+		}
+		else
+		{
+			if (sock_initaddress(host, port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
+				return -1;
+		}
+
+		if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
+		{
+			freeaddrinfo(addrinfo);
+			return -1;
+		}
+
+		/* addrinfo is no longer used */
+		freeaddrinfo(addrinfo);
+		addrinfo = NULL;
+
+		if (rpcap_doauth(sockctrl, &protocol_version, auth, errbuf) == -1)
+		{
+			sock_close(sockctrl, NULL, 0);
+			return -1;
+		}
+		active = 0;
+	}
+
+	/* RPCAP findalldevs command */
+	rpcap_createhdr(&header, protocol_version, RPCAP_MSG_FINDALLIF_REQ,
+	    0, 0);
+
+	if (sock_send(sockctrl, (char *)&header, sizeof(struct rpcap_header),
+	    errbuf, PCAP_ERRBUF_SIZE) < 0)
+		goto error_nodiscard;
+
+	/* Receive and process the reply message header. */
+	if (rpcap_process_msg_header(sockctrl, protocol_version,
+	    RPCAP_MSG_FINDALLIF_REQ, &header, errbuf) == -1)
+		goto error_nodiscard;
+
+	plen = header.plen;
+
+	/* read the number of interfaces */
+	nif = ntohs(header.value);
+
+	/* loop until all interfaces have been received */
+	for (i = 0; i < nif; i++)
+	{
+		struct rpcap_findalldevs_if findalldevs_if;
+		char tmpstring2[PCAP_BUF_SIZE + 1];		/* Needed to convert names and descriptions from 'old' syntax to the 'new' one */
+		size_t stringlen;
+		struct pcap_addr *addr, *prevaddr;
+
+		tmpstring2[PCAP_BUF_SIZE] = 0;
+
+		/* receive the findalldevs structure from remote host */
+		if (rpcap_recv(sockctrl, (char *)&findalldevs_if,
+		    sizeof(struct rpcap_findalldevs_if), &plen, errbuf) == -1)
+			goto error;
+
+		findalldevs_if.namelen = ntohs(findalldevs_if.namelen);
+		findalldevs_if.desclen = ntohs(findalldevs_if.desclen);
+		findalldevs_if.naddr = ntohs(findalldevs_if.naddr);
+
+		/* allocate the main structure */
+		dev = (pcap_if_t *)malloc(sizeof(pcap_if_t));
+		if (dev == NULL)
+		{
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc() failed");
+			goto error;
+		}
+
+		/* Initialize the structure to 'zero' */
+		memset(dev, 0, sizeof(pcap_if_t));
+
+		/* Append it to the list. */
+		if (lastdev == NULL)
+		{
+			/*
+			 * List is empty, so it's also the first device.
+			 */
+			*alldevs = dev;
+		}
+		else
+		{
+			/*
+			 * Append after the last device.
+			 */
+			lastdev->next = dev;
+		}
+		/* It's now the last device. */
+		lastdev = dev;
+
+		/* allocate mem for name and description */
+		if (findalldevs_if.namelen)
+		{
+
+			if (findalldevs_if.namelen >= sizeof(tmpstring))
+			{
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Interface name too long");
+				goto error;
 			}
-			else
+
+			/* Retrieve adapter name */
+			if (rpcap_recv(sockctrl, tmpstring,
+			    findalldevs_if.namelen, &plen, errbuf) == -1)
+				goto error;
+
+			tmpstring[findalldevs_if.namelen] = 0;
+
+			/* Create the new device identifier */
+			if (pcap_createsrcstr(tmpstring2, PCAP_SRC_IFREMOTE, host, port, tmpstring, errbuf) == -1)
+				return -1;
+
+			stringlen = strlen(tmpstring2);
+
+			dev->name = (char *)malloc(stringlen + 1);
+			if (dev->name == NULL)
 			{
-				if (sock_recv(sock, errbuf, len, SOCK_RECEIVEALL_YES, errbuf, PCAP_ERRBUF_SIZE) == -1)
-					return -3;
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "malloc() failed");
+				goto error;
+			}
 
-				/* Put '\0' at the end of the string */
-				errbuf[len] = 0;
+			/* Copy the new device name into the correct memory location */
+			strlcpy(dev->name, tmpstring2, stringlen + 1);
+		}
+
+		if (findalldevs_if.desclen)
+		{
+			if (findalldevs_if.desclen >= sizeof(tmpstring))
+			{
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Interface description too long");
+				goto error;
 			}
 
+			/* Retrieve adapter description */
+			if (rpcap_recv(sockctrl, tmpstring,
+			    findalldevs_if.desclen, &plen, errbuf) == -1)
+				goto error;
 
-			va_end(ap);
-			return header->type;
+			tmpstring[findalldevs_if.desclen] = 0;
+
+			pcap_snprintf(tmpstring2, sizeof(tmpstring2) - 1, "%s '%s' %s %s", PCAP_TEXT_SOURCE_ADAPTER,
+				tmpstring, PCAP_TEXT_SOURCE_ON_REMOTE_HOST, host);
+
+			stringlen = strlen(tmpstring2);
+
+			dev->description = (char *)malloc(stringlen + 1);
+
+			if (dev->description == NULL)
+			{
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "malloc() failed");
+				goto error;
+			}
+
+			/* Copy the new device description into the correct memory location */
+			strlcpy(dev->description, tmpstring2, stringlen + 1);
 		}
 
-		if (header->type == type)
+		dev->flags = ntohl(findalldevs_if.flags);
+
+		prevaddr = NULL;
+		/* loop until all addresses have been received */
+		for (j = 0; j < findalldevs_if.naddr; j++)
 		{
-			va_end(ap);
-			return header->type;
+			struct rpcap_findalldevs_ifaddr ifaddr;
+
+			/* Retrieve the interface addresses */
+			if (rpcap_recv(sockctrl, (char *)&ifaddr,
+			    sizeof(struct rpcap_findalldevs_ifaddr),
+			    &plen, errbuf) == -1)
+				goto error;
+
+			/*
+			 * Deserialize all the address components.
+			 */
+			addr = (struct pcap_addr *) malloc(sizeof(struct pcap_addr));
+			if (addr == NULL)
+			{
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno, "malloc() failed");
+				goto error;
+			}
+			addr->next = NULL;
+			addr->addr = NULL;
+			addr->netmask = NULL;
+			addr->broadaddr = NULL;
+			addr->dstaddr = NULL;
+
+			if (rpcap_deseraddr(&ifaddr.addr,
+				(struct sockaddr_storage **) &addr->addr, errbuf) == -1)
+			{
+				freeaddr(addr);
+				goto error;
+			}
+			if (rpcap_deseraddr(&ifaddr.netmask,
+				(struct sockaddr_storage **) &addr->netmask, errbuf) == -1)
+			{
+				freeaddr(addr);
+				goto error;
+			}
+			if (rpcap_deseraddr(&ifaddr.broadaddr,
+				(struct sockaddr_storage **) &addr->broadaddr, errbuf) == -1)
+			{
+				freeaddr(addr);
+				goto error;
+			}
+			if (rpcap_deseraddr(&ifaddr.dstaddr,
+				(struct sockaddr_storage **) &addr->dstaddr, errbuf) == -1)
+			{
+				freeaddr(addr);
+				goto error;
+			}
+
+			if ((addr->addr == NULL) && (addr->netmask == NULL) &&
+				(addr->broadaddr == NULL) && (addr->dstaddr == NULL))
+			{
+				/*
+				 * None of the addresses are IPv4 or IPv6
+				 * addresses, so throw this entry away.
+				 */
+				free(addr);
+			}
+			else
+			{
+				/*
+				 * Add this entry to the list.
+				 */
+				if (prevaddr == NULL)
+				{
+					dev->addresses = addr;
+				}
+				else
+				{
+					prevaddr->next = addr;
+				}
+				prevaddr = addr;
+			}
 		}
+	}
 
-		/* get next argument */
-		type = va_arg(ap, int);
+	/* Discard the rest of the message. */
+	if (rpcap_discard(sockctrl, plen, errbuf) == 1)
+		return -1;
+
+	/* Control connection has to be closed only in case the remote machine is in passive mode */
+	if (!active)
+	{
+		/* DO not send RPCAP_CLOSE, since we did not open a pcap_t; no need to free resources */
+		if (sock_close(sockctrl, errbuf, PCAP_ERRBUF_SIZE))
+			return -1;
 	}
 
-	/* we already have an error, so please discard this one */
-	sock_discard(sock, ntohl(header->plen), NULL, 0);
+	/* To avoid inconsistencies in the number of sock_init() */
+	sock_cleanup();
 
-	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The other endpoint sent a message that is not allowed here.");
-	SOCK_ASSERT(errbuf, 1);
+	return 0;
 
-	va_end(ap);
-	return -2;
+error:
+	/*
+	 * In case there has been an error, I don't want to overwrite it with a new one
+	 * if the following call fails. I want to return always the original error.
+	 *
+	 * Take care: this connection can already be closed when we try to close it.
+	 * This happens because a previous error in the rpcapd, which requested to
+	 * closed the connection. In that case, we already recognized that into the
+	 * rpspck_isheaderok() and we already acknowledged the closing.
+	 * In that sense, this call is useless here (however it is needed in case
+	 * the client generates the error).
+	 *
+	 * Checks if all the data has been read; if not, discard the data in excess
+	 */
+	(void) rpcap_discard(sockctrl, plen, NULL);
+
+error_nodiscard:
+	/* Control connection has to be closed only in case the remote machine is in passive mode */
+	if (!active)
+		sock_close(sockctrl, NULL, 0);
+
+	/* To avoid inconsistencies in the number of sock_init() */
+	sock_cleanup();
+
+	/* Free whatever interfaces we've allocated. */
+	pcap_freealldevs(*alldevs);
+
+	return -1;
 }
 
-/* \ingroup remote_pri_func
- * \brief Checks if the version contained into the message is compatible with
- * the one handled by this implementation.
+/*
+ * Active mode routines.
  *
- * Right now, this function does not have any sophisticated task: if the versions
- * are different, it returns -1 and it discards the message.
- * It is expected that in the future this message will become more complex.
- *
- * \param sock: the socket that has to be used to receive data. This function can
- * read data from socket in case the version contained into the message is not compatible
- * with our. In that case, all the message is purged from the socket, so that the following
- * recv() calls will return a new (clean) message.
- *
- * \param header: a pointer to and 'rpcap_header' structure that keeps the data received from
- * the network (still in network byte order) and that has to be checked.
- *
- * \param errbuf: a pointer to a user-allocated buffer (of size PCAP_ERRBUF_SIZE)
- * that will contain the error message (in case there is one). The error message is
- * "incompatible version".
- *
- * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
- * in the 'errbuf' variable.
+ * The old libpcap API is somewhat ugly, and makes active mode difficult
+ * to implement; we provide some APIs for it that work only with rpcap.
  */
-static int rpcap_checkver(SOCKET sock, struct rpcap_header *header, char *errbuf)
+
+SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf)
 {
+	/* socket-related variables */
+	struct addrinfo hints;			/* temporary struct to keep settings needed to open the new socket */
+	struct addrinfo *addrinfo;		/* keeps the addrinfo chain; required to open a new socket */
+	struct sockaddr_storage from;	/* generic sockaddr_storage variable */
+	socklen_t fromlen;				/* keeps the length of the sockaddr_storage variable */
+	SOCKET sockctrl;				/* keeps the main socket identifier */
+	uint8 protocol_version;			/* negotiated protocol version */
+	struct activehosts *temp, *prev;	/* temp var needed to scan he host list chain */
+
+	*connectinghost = 0;		/* just in case */
+
+	/* Prepare to open a new server socket */
+	memset(&hints, 0, sizeof(struct addrinfo));
+	/* WARNING Currently it supports only ONE socket family among ipv4 and IPv6  */
+	hints.ai_family = AF_INET;		/* PF_UNSPEC to have both IPv4 and IPv6 server */
+	hints.ai_flags = AI_PASSIVE;	/* Ready to a bind() socket */
+	hints.ai_socktype = SOCK_STREAM;
+
+	/* Warning: this call can be the first one called by the user. */
+	/* For this reason, we have to initialize the WinSock support. */
+	if (sock_init(errbuf, PCAP_ERRBUF_SIZE) == -1)
+		return (SOCKET)-1;
+
+	/* Do the work */
+	if ((port == NULL) || (port[0] == 0))
+	{
+		if (sock_initaddress(address, RPCAP_DEFAULT_NETPORT_ACTIVE, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
+		{
+			SOCK_DEBUG_MESSAGE(errbuf);
+			return (SOCKET)-2;
+		}
+	}
+	else
+	{
+		if (sock_initaddress(address, port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
+		{
+			SOCK_DEBUG_MESSAGE(errbuf);
+			return (SOCKET)-2;
+		}
+	}
+
+
+	if ((sockmain = sock_open(addrinfo, SOCKOPEN_SERVER, 1, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
+	{
+		SOCK_DEBUG_MESSAGE(errbuf);
+		freeaddrinfo(addrinfo);
+		return (SOCKET)-2;
+	}
+	freeaddrinfo(addrinfo);
+
+	/* Connection creation */
+	fromlen = sizeof(struct sockaddr_storage);
+
+	sockctrl = accept(sockmain, (struct sockaddr *) &from, &fromlen);
+
+	/* We're not using sock_close, since we do not want to send a shutdown */
+	/* (which is not allowed on a non-connected socket) */
+	closesocket(sockmain);
+	sockmain = 0;
+
+	if (sockctrl == INVALID_SOCKET)
+	{
+		sock_geterror("accept(): ", errbuf, PCAP_ERRBUF_SIZE);
+		return (SOCKET)-2;
+	}
+
+	/* Get the numeric for of the name of the connecting host */
+	if (getnameinfo((struct sockaddr *) &from, fromlen, connectinghost, RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST))
+	{
+		sock_geterror("getnameinfo(): ", errbuf, PCAP_ERRBUF_SIZE);
+		rpcap_senderror(sockctrl, 0, PCAP_ERR_REMOTEACCEPT, errbuf, NULL);
+		sock_close(sockctrl, NULL, 0);
+		return (SOCKET)-1;
+	}
+
+	/* checks if the connecting host is among the ones allowed */
+	if (sock_check_hostlist((char *)hostlist, RPCAP_HOSTLIST_SEP, &from, errbuf, PCAP_ERRBUF_SIZE) < 0)
+	{
+		rpcap_senderror(sockctrl, 0, PCAP_ERR_REMOTEACCEPT, errbuf, NULL);
+		sock_close(sockctrl, NULL, 0);
+		return (SOCKET)-1;
+	}
+
 	/*
-	 * This is a sample function.
-	 *
-	 * In the real world, you have to check at the type code,
-	 * and decide accordingly.
+	 * Send authentication to the remote machine.
 	 */
+	if (rpcap_doauth(sockctrl, &protocol_version, auth, errbuf) == -1)
+	{
+		/* Unrecoverable error. */
+		rpcap_senderror(sockctrl, 0, PCAP_ERR_REMOTEACCEPT, errbuf, NULL);
+		sock_close(sockctrl, NULL, 0);
+		return (SOCKET)-3;
+	}
 
-	if (header->ver != RPCAP_VERSION)
+	/* Checks that this host does not already have a cntrl connection in place */
+
+	/* Initialize pointers */
+	temp = activeHosts;
+	prev = NULL;
+
+	while (temp)
 	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Incompatible version number: message discarded.");
+		/* This host already has an active connection in place, so I don't have to update the host list */
+		if (sock_cmpaddr(&temp->host, &from) == 0)
+			return sockctrl;
 
-		/* we already have an error, so please discard this one */
-		sock_discard(sock, ntohl(header->plen), NULL, 0);
-		return -1;
+		prev = temp;
+		temp = temp->next;
 	}
 
-	return 0;
+	/* The host does not exist in the list; so I have to update the list */
+	if (prev)
+	{
+		prev->next = (struct activehosts *) malloc(sizeof(struct activehosts));
+		temp = prev->next;
+	}
+	else
+	{
+		activeHosts = (struct activehosts *) malloc(sizeof(struct activehosts));
+		temp = activeHosts;
+	}
+
+	if (temp == NULL)
+	{
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc() failed");
+		rpcap_senderror(sockctrl, protocol_version, PCAP_ERR_REMOTEACCEPT, errbuf, NULL);
+		sock_close(sockctrl, NULL, 0);
+		return (SOCKET)-1;
+	}
+
+	memcpy(&temp->host, &from, fromlen);
+	temp->sockctrl = sockctrl;
+	temp->protocol_version = protocol_version;
+	temp->next = NULL;
+
+	return sockctrl;
 }
 
-/* \ingroup remote_pri_func
- *
- * \brief It returns the socket currently used for this active connection
- * (active mode only) and provides an indication of whether this connection
- * is in active mode or not.
- *
- * This function is just for internal use; it returns the socket ID of the
- * active connection currently opened.
- *
- * \param host: a string that keeps the host name of the host for which we
- * want to get the socket ID for that active connection.
- *
- * \param isactive: a pointer to an int that is set to 1 if there's an
- * active connection to that host and 0 otherwise.
- *
- * \param errbuf: a pointer to a user-allocated buffer (of size
- * PCAP_ERRBUF_SIZE) that will contain the error message (in case
- * there is one).
- *
- * \return the socket identifier if everything is fine, '0' if this host
- * is not in the active host list. An indication of whether this host
- * is in the active host list is returned into the isactive variable.
- * It returns 'INVALID_SOCKET' in case of error. The error message is
- * returned into the errbuf variable.
- */
-SOCKET rpcap_remoteact_getsock(const char *host, int *isactive, char *errbuf)
+int pcap_remoteact_close(const char *host, char *errbuf)
 {
-	struct activehosts *temp;					/* temp var needed to scan the host list chain */
+	struct activehosts *temp, *prev;	/* temp var needed to scan the host list chain */
 	struct addrinfo hints, *addrinfo, *ai_next;	/* temp var needed to translate between hostname to its address */
 	int retval;
 
+	temp = activeHosts;
+	prev = NULL;
+
 	/* retrieve the network address corresponding to 'host' */
 	addrinfo = NULL;
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_family = PF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 
 	retval = getaddrinfo(host, "0", &hints, &addrinfo);
 	if (retval != 0)
 	{
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "getaddrinfo() %s", gai_strerror(retval));
-		*isactive = 0;
-		return INVALID_SOCKET;
+		return -1;
 	}
 
-	temp = activeHosts;
-
 	while (temp)
 	{
 		ai_next = addrinfo;
 		while (ai_next)
 		{
-			if (sock_cmpaddr(&temp->host, (struct sockaddr_storage *) ai_next->ai_addr) == 0) {
-				*isactive = 1;
-				return (temp->sockctrl);
+			if (sock_cmpaddr(&temp->host, (struct sockaddr_storage *) ai_next->ai_addr) == 0)
+			{
+				struct rpcap_header header;
+				int status = 0;
+
+				/* Close this connection */
+				rpcap_createhdr(&header, temp->protocol_version,
+				    RPCAP_MSG_CLOSE, 0, 0);
+
+				/*
+				 * Don't check for errors, since we're
+				 * just cleaning up.
+				 */
+				if (sock_send(temp->sockctrl,
+				    (char *)&header,
+				    sizeof(struct rpcap_header), errbuf,
+				    PCAP_ERRBUF_SIZE) < 0)
+				{
+					/*
+					 * Let that error be the one we
+					 * report.
+					 */
+					(void)sock_close(temp->sockctrl, NULL,
+					   0);
+					status = -1;
+				}
+				else
+				{
+					if (sock_close(temp->sockctrl, errbuf,
+					   PCAP_ERRBUF_SIZE) == -1)
+						status = -1;
+				}
+
+				/*
+				 * Remove the host from the list of active
+				 * hosts.
+				 */
+				if (prev)
+					prev->next = temp->next;
+				else
+					activeHosts = temp->next;
+
+				freeaddrinfo(addrinfo);
+
+				free(temp);
+
+				/* To avoid inconsistencies in the number of sock_init() */
+				sock_cleanup();
+
+				return status;
 			}
 
 			ai_next = ai_next->ai_next;
 		}
+		prev = temp;
 		temp = temp->next;
 	}
 
 	if (addrinfo)
 		freeaddrinfo(addrinfo);
 
+	/* To avoid inconsistencies in the number of sock_init() */
+	sock_cleanup();
+
+	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The host you want to close the active connection is not known");
+	return -1;
+}
+
+void pcap_remoteact_cleanup(void)
+{
+	/* Very dirty, but it works */
+	if (sockmain)
+	{
+		closesocket(sockmain);
+
+		/* To avoid inconsistencies in the number of sock_init() */
+		sock_cleanup();
+	}
+
+}
+
+int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf)
+{
+	struct activehosts *temp;	/* temp var needed to scan the host list chain */
+	size_t len;
+	char hoststr[RPCAP_HOSTLIST_SIZE + 1];
+
+	temp = activeHosts;
+
+	len = 0;
+	*hostlist = 0;
+
+	while (temp)
+	{
+		/*int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen) */
+
+		/* Get the numeric form of the name of the connecting host */
+		if (sock_getascii_addrport((struct sockaddr_storage *) &temp->host, hoststr,
+			RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST, errbuf, PCAP_ERRBUF_SIZE) != -1)
+			/*	if (getnameinfo( (struct sockaddr *) &temp->host, sizeof (struct sockaddr_storage), hoststr, */
+			/*		RPCAP_HOSTLIST_SIZE, NULL, 0, NI_NUMERICHOST) ) */
+		{
+			/*	sock_geterror("getnameinfo(): ", errbuf, PCAP_ERRBUF_SIZE); */
+			return -1;
+		}
+
+		len = len + strlen(hoststr) + 1 /* the separator */;
+
+		if ((size < 0) || (len >= (size_t)size))
+		{
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "The string you provided is not able to keep "
+				"the hostnames for all the active connections");
+			return -1;
+		}
+
+		strlcat(hostlist, hoststr, PCAP_ERRBUF_SIZE);
+		hostlist[len - 1] = sep;
+		hostlist[len] = 0;
+
+		temp = temp->next;
+	}
+
+	return 0;
+}
+
+/*
+ * Receive the header of a message.
+ */
+static int rpcap_recv_msg_header(SOCKET sock, struct rpcap_header *header, char *errbuf)
+{
+	int nrecv;
+
+	nrecv = sock_recv(sock, (char *) header, sizeof(struct rpcap_header),
+	    SOCK_RECEIVEALL_YES|SOCK_EOF_IS_ERROR, errbuf,
+	    PCAP_ERRBUF_SIZE);
+	if (nrecv == -1)
+	{
+		/* Network error. */
+		return -1;
+	}
+	header->plen = ntohl(header->plen);
+	return 0;
+}
+
+/*
+ * Make sure the protocol version of a received message is what we were
+ * expecting.
+ */
+static int rpcap_check_msg_ver(SOCKET sock, uint8 expected_ver, struct rpcap_header *header, char *errbuf)
+{
 	/*
-	 * The host for which you want to get the socket ID does not have an
-	 * active connection.
+	 * Did the server specify the version we negotiated?
 	 */
-	*isactive = 0;
+	if (header->ver != expected_ver)
+	{
+		/*
+		 * Discard the rest of the message.
+		 */
+		if (rpcap_discard(sock, header->plen, errbuf) == -1)
+			return -1;
+
+		/*
+		 * Tell our caller that it's not the negotiated version.
+		 */
+		if (errbuf != NULL)
+		{
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "Server sent us a message with version %u when we were expecting %u",
+			    header->ver, expected_ver);
+		}
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ * Check the message type of a received message, which should either be
+ * the expected message type or RPCAP_MSG_ERROR.
+ */
+static int rpcap_check_msg_type(SOCKET sock, uint8 request_type, struct rpcap_header *header, uint16 *errcode, char *errbuf)
+{
+	const char *request_type_string;
+	const char *msg_type_string;
+
+	/*
+	 * What type of message is it?
+	 */
+	if (header->type == RPCAP_MSG_ERROR)
+	{
+		/*
+		 * The server reported an error.
+		 * Hand that error back to our caller.
+		 */
+		*errcode = ntohs(header->value);
+		rpcap_msg_err(sock, header->plen, errbuf);
+		return -1;
+	}
+
+	*errcode = 0;
+
+	/*
+	 * For a given request type value, the expected reply type value
+	 * is the request type value with ORed with RPCAP_MSG_IS_REPLY.
+	 */
+	if (header->type != (request_type | RPCAP_MSG_IS_REPLY))
+	{
+		/*
+		 * This isn't a reply to the request we sent.
+		 */
+
+		/*
+		 * Discard the rest of the message.
+		 */
+		if (rpcap_discard(sock, header->plen, errbuf) == -1)
+			return -1;
+
+		/*
+		 * Tell our caller about it.
+		 */
+		request_type_string = rpcap_msg_type_string(request_type);
+		msg_type_string = rpcap_msg_type_string(header->type);
+		if (errbuf != NULL)
+		{
+			if (request_type_string == NULL)
+			{
+				/* This should not happen. */
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "rpcap_check_msg_type called for request message with type %u",
+				    request_type);
+				return -1;
+			}
+			if (msg_type_string != NULL)
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "%s message received in response to a %s message",
+				    msg_type_string, request_type_string);
+			else
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Message of unknown type %u message received in response to a %s request",
+				    header->type, request_type_string);
+		}
+		return -1;
+	}
+	
+	return 0;
+}
+
+/*
+ * Receive and process the header of a message.
+ */
+static int rpcap_process_msg_header(SOCKET sock, uint8 expected_ver, uint8 request_type, struct rpcap_header *header, char *errbuf)
+{
+	uint16 errcode;
+
+	if (rpcap_recv_msg_header(sock, header, errbuf) == -1)
+	{
+		/* Network error. */
+		return -1;
+	}
+
+	/*
+	 * Did the server specify the version we negotiated?
+	 */
+	if (rpcap_check_msg_ver(sock, expected_ver, header, errbuf) == -1)
+		return -1;
+
+	/*
+	 * Check the message type.
+	 */
+	return rpcap_check_msg_type(sock, request_type, header,
+	    &errcode, errbuf);
+}
+
+/*
+ * Read data from a message.
+ * If we're trying to read more data that remains, puts an error
+ * message into errmsgbuf and returns -2.  Otherwise, tries to read
+ * the data and, if that succeeds, subtracts the amount read from
+ * the number of bytes of data that remains.
+ * Returns 0 on success, logs a message and returns -1 on a network
+ * error.
+ */
+static int rpcap_recv(SOCKET sock, void *buffer, size_t toread, uint32 *plen, char *errbuf)
+{
+	int nread;
+
+	if (toread > *plen)
+	{
+		/* The server sent us a bad message */
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Message payload is too short");
+		return -1;
+	}
+	nread = sock_recv(sock, buffer, toread,
+	    SOCK_RECEIVEALL_YES|SOCK_EOF_IS_ERROR, errbuf, PCAP_ERRBUF_SIZE);
+	if (nread == -1)
+	{
+		return -1;
+	}
+	*plen -= nread;
+	return 0;
+}
+
+/*
+ * This handles the RPCAP_MSG_ERROR message.
+ */
+static void rpcap_msg_err(SOCKET sockctrl, uint32 plen, char *remote_errbuf)
+{
+	char errbuf[PCAP_ERRBUF_SIZE];
+
+	if (plen >= PCAP_ERRBUF_SIZE)
+	{
+		/*
+		 * Message is too long; just read as much of it as we
+		 * can into the buffer provided, and discard the rest.
+		 */
+		if (sock_recv(sockctrl, remote_errbuf, PCAP_ERRBUF_SIZE - 1,
+		    SOCK_RECEIVEALL_YES|SOCK_EOF_IS_ERROR, errbuf,
+		    PCAP_ERRBUF_SIZE) == -1)
+		{
+			// Network error.
+			pcap_snprintf(remote_errbuf, PCAP_ERRBUF_SIZE, "Read of error message from client failed: %s", errbuf);
+			return;
+		}
+
+		/*
+		 * Null-terminate it.
+		 */
+		remote_errbuf[PCAP_ERRBUF_SIZE - 1] = '\0';
+
+		/*
+		 * Throw away the rest.
+		 */
+		(void)rpcap_discard(sockctrl, plen - (PCAP_ERRBUF_SIZE - 1), remote_errbuf);
+	}
+	else if (plen == 0)
+	{
+		/* Empty error string. */
+		remote_errbuf[0] = '\0';
+	}
+	else
+	{
+		if (sock_recv(sockctrl, remote_errbuf, plen,
+		    SOCK_RECEIVEALL_YES|SOCK_EOF_IS_ERROR, errbuf,
+		    PCAP_ERRBUF_SIZE) == -1)
+		{
+			// Network error.
+			pcap_snprintf(remote_errbuf, PCAP_ERRBUF_SIZE, "Read of error message from client failed: %s", errbuf);
+			return;
+		}
+
+		/*
+		 * Null-terminate it.
+		 */
+		remote_errbuf[plen] = '\0';
+	}
+}
+
+/*
+ * Discard data from a connection.
+ * Mostly used to discard wrong-sized messages.
+ * Returns 0 on success, logs a message and returns -1 on a network
+ * error.
+ */
+static int rpcap_discard(SOCKET sock, uint32 len, char *errbuf)
+{
+	if (len != 0)
+	{
+		if (sock_discard(sock, len, errbuf, PCAP_ERRBUF_SIZE) == -1)
+		{
+			// Network error.
+			return -1;
+		}
+	}
+	return 0;
+}
+
+/*
+ * Read bytes into the pcap_t's buffer until we have the specified
+ * number of bytes read or we get an error or interrupt indication.
+ */
+static int rpcap_read_packet_msg(SOCKET sock, pcap_t *p, size_t size)
+{
+	u_char *bp;
+	int cc;
+	int bytes_read;
+
+	bp = p->bp;
+	cc = p->cc;
+
+	/*
+	 * Loop until we have the amount of data requested or we get
+	 * an error or interrupt.
+	 */
+	while ((size_t)cc < size)
+	{
+		/*
+		 * We haven't read all of the packet header yet.
+		 * Read what remains, which could be all of it.
+		 */
+		bytes_read = sock_recv(sock, bp, size - cc,
+		    SOCK_RECEIVEALL_NO|SOCK_EOF_IS_ERROR, p->errbuf,
+		    PCAP_ERRBUF_SIZE);
+		if (bytes_read == -1)
+		{
+			/*
+			 * Network error.  Update the read pointer and
+			 * byte count, and return an error indication.
+			 */
+			p->bp = bp;
+			p->cc = cc;
+			return -1;
+		}
+		if (bytes_read == -3)
+		{
+			/*
+			 * Interrupted receive.  Update the read
+			 * pointer and byte count, and return
+			 * an interrupted indication.
+			 */
+			p->bp = bp;
+			p->cc = cc;
+			return -3;
+		}
+		if (bytes_read == 0)
+		{
+			/*
+			 * EOF - server terminated the connection.
+			 * Update the read pointer and byte count, and
+			 * return an error indication.
+			 */
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "The server terminated the connection.");
+			return -1;
+		}
+		bp += bytes_read;
+		cc += bytes_read;
+	}
+	p->bp = bp;
+	p->cc = cc;
 	return 0;
 }
Index: vendor/libpcap/dist/pcap-rpcap.h
===================================================================
--- vendor/libpcap/dist/pcap-rpcap.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-rpcap.h	(revision 333789)
@@ -1,465 +1,49 @@
 /*
- * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
- * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
- * All rights reserved.
+ * Copyright (c) 1994, 1995, 1996
+ *	The Regents of the University of California.  All rights reserved.
  *
  * 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.
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino, CACE Technologies
- * nor the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
-#ifndef __PCAP_RPCAP_H__
-#define __PCAP_RPCAP_H__
+#ifndef pcap_rpcap_h
+#define	pcap_rpcap_h
 
-
-#include "pcap.h"
-#include "sockutils.h"	/* Needed for some structures (like SOCKET, sockaddr_in) which are used here */
-
-
 /*
- * \file pcap-pcap.h
- *
- * This file keeps all the new definitions and typedefs that are exported to the user and
- * that are needed for the RPCAP protocol.
- *
- * \warning All the RPCAP functions that are allowed to return a buffer containing
- * the error description can return max PCAP_ERRBUF_SIZE characters.
- * However there is no guarantees that the string will be zero-terminated.
- * Best practice is to define the errbuf variable as a char of size 'PCAP_ERRBUF_SIZE+1'
- * and to insert manually the termination char at the end of the buffer. This will
- * guarantee that no buffer overflows occur even if we use the printf() to show
- * the error on the screen.
- *
- * \warning This file declares some typedefs that MUST be of a specific size.
- * These definitions (i.e. typedefs) could need to be changed on other platforms than
- * Intel IA32.
- *
- * \warning This file defines some structures that are used to transfer data on the network.
- * Be careful that you compiler MUST not insert padding into these structures
- * for better alignment.
- * These structures have been created in order to be correctly aligned to a 32 bits
- * boundary, but be careful in any case.
+ * Internal interfaces for "pcap_open()".
  */
+pcap_t	*pcap_open_rpcap(const char *source, int snaplen, int flags,
+    int read_timeout, struct pcap_rmtauth *auth, char *errbuf);
 
-
-
-
-
-
-
-
-/*********************************************************
- *                                                       *
- * General definitions / typedefs for the RPCAP protocol *
- *                                                       *
- *********************************************************/
-
-/* All the following structures and typedef belongs to the Private Documentation */
 /*
- * \addtogroup remote_pri_struct
- * \{
+ * Internal interfaces for "pcap_findalldevs_ex()".
  */
+int	pcap_findalldevs_ex_remote(char *source, struct pcap_rmtauth *auth,
+   pcap_if_t **alldevs, char *errbuf);
 
-#define RPCAP_DEFAULT_NETPORT "2002" /* Default port on which the RPCAP daemon is waiting for connections. */
-/* Default port on which the client workstation is waiting for connections in case of active mode. */
-#define RPCAP_DEFAULT_NETPORT_ACTIVE "2003"
-#define RPCAP_DEFAULT_NETADDR ""	/* Default network address on which the RPCAP daemon binds to. */
-#define RPCAP_VERSION 0				/* Present version of the RPCAP protocol (0 = Experimental). */
-#define RPCAP_TIMEOUT_INIT 90		/* Initial timeout for RPCAP connections (default: 90 sec) */
-#define RPCAP_TIMEOUT_RUNTIME 180	/* Run-time timeout for RPCAP connections (default: 3 min) */
-#define RPCAP_ACTIVE_WAIT 30		/* Waiting time between two attempts to open a connection, in active mode (default: 30 sec) */
-#define RPCAP_SUSPEND_WRONGAUTH 1	/* If the authentication is wrong, stops 1 sec before accepting a new auth message */
-
-/*
- * \brief Buffer used by socket functions to send-receive packets.
- * In case you plan to have messages larger than this value, you have to increase it.
- */
-#define RPCAP_NETBUF_SIZE 64000
-
-
-/*
- * \brief Separators used for the host list.
- *
- * It is used:
- * - by the rpcapd daemon, when you types a list of allowed connecting hosts
- * - by the rpcap in active mode, when the client waits for incoming connections from other hosts
- */
-#define RPCAP_HOSTLIST_SEP " ,;\n\r"
-
-
-
-
-/* WARNING: These could need to be changed on other platforms */
-typedef unsigned char uint8;		/* Provides an 8-bits unsigned integer */
-typedef unsigned short uint16;		/* Provides a 16-bits unsigned integer */
-typedef unsigned int uint32;		/* Provides a 32-bits unsigned integer */
-typedef int int32;					/* Provides a 32-bits integer */
-
-
-
-
-/*
- * \brief Keeps a list of all the opened connections in the active mode.
- *
- * This structure defines a linked list of items that are needed to keep the info required to
- * manage the active mode.
- * In other words, when a new connection in active mode starts, this structure is updated so that
- * it reflects the list of active mode connections currently opened.
- * This structure is required by findalldevs() and open_remote() to see if they have to open a new
- * control connection toward the host, or they already have a control connection in place.
- */
-struct activehosts
-{
-	struct sockaddr_storage host;
-	SOCKET sockctrl;
-	struct activehosts *next;
-};
-
-
-/*********************************************************
- *                                                       *
- * Protocol messages formats                             *
- *                                                       *
- *********************************************************/
-/* WARNING Take care you compiler does not insert padding for better alignments into these structs */
-
-
-/* Common header for all the RPCAP messages */
-struct rpcap_header
-{
-	uint8 ver;							/* RPCAP version number */
-	uint8 type;							/* RPCAP message type (error, findalldevs, ...) */
-	uint16 value;						/* Message-dependent value (not always used) */
-	uint32 plen;						/* Length of the payload of this RPCAP message */
-};
-
-
-/* Format of the message for the interface description (findalldevs command) */
-struct rpcap_findalldevs_if
-{
-	uint16 namelen;						/* Length of the interface name */
-	uint16 desclen;						/* Length of the interface description */
-	uint32 flags;						/* Interface flags */
-	uint16 naddr;						/* Number of addresses */
-	uint16 dummy;						/* Must be zero */
-};
-
-
-/* Format of the message for the address listing (findalldevs command) */
-struct rpcap_findalldevs_ifaddr
-{
-	struct sockaddr_storage addr;		/* Network address */
-	struct sockaddr_storage netmask;	/* Netmask for that address */
-	struct sockaddr_storage broadaddr;	/* Broadcast address for that address */
-	struct sockaddr_storage dstaddr;	/* P2P destination address for that address */
-};
-
-
-
-/*
- * \brief Format of the message of the connection opening reply (open command).
- *
- * This structure transfers over the network some of the values useful on the client side.
- */
-struct rpcap_openreply
-{
-	int32 linktype;						/* Link type */
-	int32 tzoff;						/* Timezone offset */
-};
-
-
-
-/* Format of the message that starts a remote capture (startcap command) */
-struct rpcap_startcapreq
-{
-	uint32 snaplen;						/* Length of the snapshot (number of bytes to capture for each packet) */
-	uint32 read_timeout;				/* Read timeout in milliseconds */
-	uint16 flags;						/* Flags (see RPCAP_STARTCAPREQ_FLAG_xxx) */
-	uint16 portdata;					/* Network port on which the client is waiting at (if 'serveropen') */
-};
-
-
-/* Format of the reply message that devoted to start a remote capture (startcap reply command) */
-struct rpcap_startcapreply
-{
-	int32 bufsize;						/* Size of the user buffer allocated by WinPcap; it can be different from the one we chose */
-	uint16 portdata;					/* Network port on which the server is waiting at (passive mode only) */
-	uint16 dummy;						/* Must be zero */
-};
-
-
-/*
- * \brief Format of the header which encapsulates captured packets when transmitted on the network.
- *
- * This message requires the general header as well, since we want to be able to exchange
- * more information across the network in the future (for example statistics, and kind like that).
- */
-struct rpcap_pkthdr
-{
-	uint32 timestamp_sec;	/* 'struct timeval' compatible, it represents the 'tv_sec' field */
-	uint32 timestamp_usec;	/* 'struct timeval' compatible, it represents the 'tv_usec' field */
-	uint32 caplen;			/* Length of portion present in the capture */
-	uint32 len;				/* Real length this packet (off wire) */
-	uint32 npkt;			/* Ordinal number of the packet (i.e. the first one captured has '1', the second one '2', etc) */
-};
-
-
-/* General header used for the pcap_setfilter() command; keeps just the number of BPF instructions */
-struct rpcap_filter
-{
-	uint16 filtertype;		/* type of the filter transferred (BPF instructions, ...) */
-	uint16 dummy;			/* Must be zero */
-	uint32 nitems;			/* Number of items contained into the filter (e.g. BPF instructions for BPF filters) */
-};
-
-
-/* Structure that keeps a single BPF instuction; it is repeated 'ninsn' times according to the 'rpcap_filterbpf' header */
-struct rpcap_filterbpf_insn
-{
-	uint16 code;			/* opcode of the instruction */
-	uint8 jt;				/* relative offset to jump to in case of 'true' */
-	uint8 jf;				/* relative offset to jump to in case of 'false' */
-	int32 k;				/* instruction-dependent value */
-};
-
-
-/* Structure that keeps the data required for the authentication on the remote host */
-struct rpcap_auth
-{
-	uint16 type;			/* Authentication type */
-	uint16 dummy;			/* Must be zero */
-	uint16 slen1;			/* Length of the first authentication item (e.g. username) */
-	uint16 slen2;			/* Length of the second authentication item (e.g. password) */
-};
-
-
-/* Structure that keeps the statistics about the number of packets captured, dropped, etc. */
-struct rpcap_stats
-{
-	uint32 ifrecv;		/* Packets received by the kernel filter (i.e. pcap_stats.ps_recv) */
-	uint32 ifdrop;		/* Packets dropped by the network interface (e.g. not enough buffers) (i.e. pcap_stats.ps_ifdrop) */
-	uint32 krnldrop;	/* Packets dropped by the kernel filter (i.e. pcap_stats.ps_drop) */
-	uint32 svrcapt;		/* Packets captured by the RPCAP daemon and sent on the network */
-};
-
-
-/* Structure that is needed to set sampling parameters */
-struct rpcap_sampling
-{
-	uint8 method;		/* Sampling method */
-	uint8 dummy1;		/* Must be zero */
-	uint16 dummy2;		/* Must be zero */
-	uint32 value;		/* Parameter related to the sampling method */
-};
-
-
-/*
- * Private data for doing a live capture.
- */
-struct pcap_md {
-	struct pcap_stat stat;
-	/* XXX */
-	int		use_bpf;		/* using kernel filter */
-	u_long	TotPkts;		/* can't overflow for 79 hrs on ether */
-	u_long	TotAccepted;	/* count accepted by filter */
-	u_long	TotDrops;		/* count of dropped packets */
-	long	TotMissed;		/* missed by i/f during this run */
-	long	OrigMissed;		/* missed by i/f before this run */
-	char	*device;		/* device name */
-	int		timeout;		/* timeout for buffering */
-	int		must_clear;		/* stuff we must clear when we close */
-	struct pcap *next;		/* list of open pcaps that need stuff cleared on close */
-#ifdef linux
-	int		sock_packet;	/* using Linux 2.0 compatible interface */
-	int		cooked;			/* using SOCK_DGRAM rather than SOCK_RAW */
-	int		ifindex;		/* interface index of device we're bound to */
-	int		lo_ifindex;		/* interface index of the loopback device */
-	u_int	packets_read;	/* count of packets read with recvfrom() */
-	bpf_u_int32 oldmode;	/* mode to restore when turning monitor mode off */
-	u_int	tp_version;		/* version of tpacket_hdr for mmaped ring */
-	u_int	tp_hdrlen;		/* hdrlen of tpacket_hdr for mmaped ring */
-#endif /* linux */
-
-#ifdef HAVE_DAG_API
-#ifdef HAVE_DAG_STREAMS_API
-	u_char	*dag_mem_bottom;/* DAG card current memory bottom pointer */
-	u_char	*dag_mem_top;	/* DAG card current memory top pointer */
-#else /* HAVE_DAG_STREAMS_API */
-	void	*dag_mem_base;	/* DAG card memory base address */
-	u_int	dag_mem_bottom;	/* DAG card current memory bottom offset */
-	u_int	dag_mem_top;	/* DAG card current memory top offset */
-#endif /* HAVE_DAG_STREAMS_API */
-	int	dag_fcs_bits;		/* Number of checksum bits from link layer */
-	int	dag_offset_flags;	/* Flags to pass to dag_offset(). */
-	int	dag_stream;			/* DAG stream number */
-	int	dag_timeout;		/* timeout specified to pcap_open_live.
-							 * Same as in linux above, introduce
-							 * generally?
-							 */
-#endif /* HAVE_DAG_API */
-#ifdef HAVE_ZEROCOPY_BPF
-	/*
-	 * Zero-copy read buffer -- for zero-copy BPF.  'buffer' above will
-	 * alternative between these two actual mmap'd buffers as required.
-	 * As there is a header on the front size of the mmap'd buffer, only
-	 * some of the buffer is exposed to libpcap as a whole via bufsize;
-	 * zbufsize is the true size.  zbuffer tracks the current zbuf
-	 * associated with buffer so that it can be used to decide which the
-	 * next buffer to read will be.
-	 */
-	u_char *zbuf1, *zbuf2, *zbuffer;
-	u_int zbufsize;
-	u_int zerocopy;
-	u_int interrupted;
-	struct timespec firstsel;
-	/*
-	 * If there's currently a buffer being actively processed, then it is
-	 * referenced here; 'buffer' is also pointed at it, but offset by the
-	 * size of the header.
-	 */
-	struct bpf_zbuf_header *bzh;
-#endif /* HAVE_ZEROCOPY_BPF */
-
-
-
-#ifdef HAVE_REMOTE
-	/*
-	 * There is really a mess with previous variables, and it seems to me that they are not used
-	 * (they are used in pcap_pf.c only). I think we have to start using them.
-	 * The meaning is the following:
-	 *
-	 * - TotPkts: the amount of packets received by the bpf filter, *before* applying the filter
-	 * - TotAccepted: the amount of packets that satisfies the filter
-	 * - TotDrops: the amount of packet that were dropped into the kernel buffer because of lack of space
-	 * - TotMissed: the amount of packets that were dropped by the physical interface; it is basically
-	 * the value of the hardware counter into the card. This number is never put to zero, so this number
-	 * takes into account the *total* number of interface drops starting from the interface power-on.
-	 * - OrigMissed: the amount of packets that were dropped by the interface *when the capture begins*.
-	 * This value is used to detect the number of packets dropped by the interface *during the present
-	 * capture*, so that (ps_ifdrops= TotMissed - OrigMissed).
-	 */
-	unsigned int TotNetDrops;		/* keeps the number of packets that have been dropped by the network */
-	/*
-	 * \brief It keeps the number of packets that have been received by the application.
-	 *
-	 * Packets dropped by the kernel buffer are not counted in this variable. The variable is always
-	 * equal to (TotAccepted - TotDrops), except for the case of remote capture, in which we have also
-	 * packets in flight, i.e. that have been transmitted by the remote host, but that have not been
-	 * received (yet) from the client. In this case, (TotAccepted - TotDrops - TotNetDrops) gives a
-	 * wrong result, since this number does not corresponds always to the number of packet received by
-	 * the application. For this reason, in the remote capture we need another variable that takes
-	 * into account of the number of packets actually received by the application.
-	 */
-	unsigned int TotCapt;
-
-	/*! \brief '1' if we're the network client; needed by several functions (like pcap_setfilter() ) to know if
-	they have to use the socket or they have to open the local adapter. */
-	int rmt_clientside;
-
-	SOCKET rmt_sockctrl;		//!< socket ID of the socket used for the control connection
-	SOCKET rmt_sockdata;		//!< socket ID of the socket used for the data connection
-	int rmt_flags;				//!< we have to save flags, since they are passed by the pcap_open_live(), but they are used by the pcap_startcapture()
-	int rmt_capstarted;			//!< 'true' if the capture is already started (needed to knoe if we have to call the pcap_startcapture()
-	struct pcap_samp rmt_samp;	//!< Keeps the parameters related to the sampling process.
-	char *currentfilter;		//!< Pointer to a buffer (allocated at run-time) that stores the current filter. Needed when flag PCAP_OPENFLAG_NOCAPTURE_RPCAP is turned on.
-#endif /* HAVE_REMOTE */
-
-};
-
-
-/* Messages field coding */
-#define RPCAP_MSG_ERROR 1				/* Message that keeps an error notification */
-#define RPCAP_MSG_FINDALLIF_REQ 2		/* Request to list all the remote interfaces */
-#define RPCAP_MSG_OPEN_REQ 3			/* Request to open a remote device */
-#define RPCAP_MSG_STARTCAP_REQ 4		/* Request to start a capture on a remote device */
-#define RPCAP_MSG_UPDATEFILTER_REQ 5	/* Send a compiled filter into the remote device */
-#define RPCAP_MSG_CLOSE 6				/* Close the connection with the remote peer */
-#define RPCAP_MSG_PACKET 7				/* This is a 'data' message, which carries a network packet */
-#define RPCAP_MSG_AUTH_REQ 8			/* Message that keeps the authentication parameters */
-#define RPCAP_MSG_STATS_REQ 9			/* It requires to have network statistics */
-#define RPCAP_MSG_ENDCAP_REQ 10			/* Stops the current capture, keeping the device open */
-#define RPCAP_MSG_SETSAMPLING_REQ 11	/* Set sampling parameters */
-
-#define RPCAP_MSG_FINDALLIF_REPLY	(128+RPCAP_MSG_FINDALLIF_REQ)		/* Keeps the list of all the remote interfaces */
-#define RPCAP_MSG_OPEN_REPLY		(128+RPCAP_MSG_OPEN_REQ)			/* The remote device has been opened correctly */
-#define RPCAP_MSG_STARTCAP_REPLY	(128+RPCAP_MSG_STARTCAP_REQ)		/* The capture is starting correctly */
-#define RPCAP_MSG_UPDATEFILTER_REPLY (128+RPCAP_MSG_UPDATEFILTER_REQ)	/* The filter has been applied correctly on the remote device */
-#define RPCAP_MSG_AUTH_REPLY		(128+RPCAP_MSG_AUTH_REQ)			/* Sends a message that says 'ok, authorization successful' */
-#define RPCAP_MSG_STATS_REPLY		(128+RPCAP_MSG_STATS_REQ)			/* Message that keeps the network statistics */
-#define RPCAP_MSG_ENDCAP_REPLY		(128+RPCAP_MSG_ENDCAP_REQ)			/* Confirms that the capture stopped successfully */
-#define RPCAP_MSG_SETSAMPLING_REPLY	(128+RPCAP_MSG_SETSAMPLING_REQ)		/* Confirms that the capture stopped successfully */
-
-#define RPCAP_STARTCAPREQ_FLAG_PROMISC 1	/* Enables promiscuous mode (default: disabled) */
-#define RPCAP_STARTCAPREQ_FLAG_DGRAM 2		/* Use a datagram (i.e. UDP) connection for the data stream (default: use TCP)*/
-#define RPCAP_STARTCAPREQ_FLAG_SERVEROPEN 4	/* The server has to open the data connection toward the client */
-#define RPCAP_STARTCAPREQ_FLAG_INBOUND 8	/* Capture only inbound packets (take care: the flag has no effects with promiscuous enabled) */
-#define RPCAP_STARTCAPREQ_FLAG_OUTBOUND 16	/* Capture only outbound packets (take care: the flag has no effects with promiscuous enabled) */
-
-#define RPCAP_UPDATEFILTER_BPF 1			/* This code tells us that the filter is encoded with the BPF/NPF syntax */
-
-
-/* Network error codes */
-#define PCAP_ERR_NETW 1					/* Network error */
-#define PCAP_ERR_INITTIMEOUT 2			/* The RPCAP initial timeout has expired */
-#define PCAP_ERR_AUTH 3					/* Generic authentication error */
-#define PCAP_ERR_FINDALLIF 4			/* Generic findalldevs error */
-#define PCAP_ERR_NOREMOTEIF 5			/* The findalldevs was ok, but the remote end had no interfaces to list */
-#define PCAP_ERR_OPEN 6					/* Generic pcap_open error */
-#define PCAP_ERR_UPDATEFILTER 7			/* Generic updatefilter error */
-#define PCAP_ERR_GETSTATS 8				/* Generic pcap_stats error */
-#define PCAP_ERR_READEX 9				/* Generic pcap_next_ex error */
-#define PCAP_ERR_HOSTNOAUTH 10			/* The host is not authorized to connect to this server */
-#define PCAP_ERR_REMOTEACCEPT 11		/* Generic pcap_remoteaccept error */
-#define PCAP_ERR_STARTCAPTURE 12		/* Generic pcap_startcapture error */
-#define PCAP_ERR_ENDCAPTURE 13			/* Generic pcap_endcapture error */
-#define PCAP_ERR_RUNTIMETIMEOUT	14		/* The RPCAP run-time timeout has expired */
-#define PCAP_ERR_SETSAMPLING 15			/* Error during the settings of sampling parameters */
-#define PCAP_ERR_WRONGMSG 16			/* The other end endpoint sent a message which has not been recognized */
-#define PCAP_ERR_WRONGVER 17			/* The other end endpoint has a version number that is not compatible with our */
-/*
- * \}
- * // end of private documentation
- */
-
-
-/*********************************************************
- *                                                       *
- * Exported function prototypes                          *
- *                                                       *
- *********************************************************/
-int pcap_opensource_remote(pcap_t *p, struct pcap_rmtauth *auth);
-int pcap_startcapture_remote(pcap_t *fp);
-
-void rpcap_createhdr(struct rpcap_header *header, uint8 type, uint16 value, uint32 length);
-int rpcap_deseraddr(struct sockaddr_storage *sockaddrin, struct sockaddr_storage **sockaddrout, char *errbuf);
-int rpcap_checkmsg(char *errbuf, SOCKET sock, struct rpcap_header *header, uint8 first, ...);
-int rpcap_senderror(SOCKET sock, char *error, unsigned short errcode, char *errbuf);
-int rpcap_sendauth(SOCKET sock, struct pcap_rmtauth *auth, char *errbuf);
-
-SOCKET rpcap_remoteact_getsock(const char *host, int *isactive, char *errbuf);
-
 #endif
-
Index: vendor/libpcap/dist/pcap-septel.c
===================================================================
--- vendor/libpcap/dist/pcap-septel.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-septel.c	(revision 333789)
@@ -1,321 +1,363 @@
 /*
  * pcap-septel.c: Packet capture interface for Intel/Septel card.
  *
  * The functionality of this code attempts to mimic that of pcap-linux as much
  * as possible.  This code is compiled in several different ways depending on
  * whether SEPTEL_ONLY and HAVE_SEPTEL_API are defined.  If HAVE_SEPTEL_API is
  * not defined it should not get compiled in, otherwise if SEPTEL_ONLY is
  * defined then the 'septel_' function calls are renamed to 'pcap_'
  * equivalents.  If SEPTEL_ONLY is not defined then nothing is altered - the
  * septel_ functions will be called as required from their
  * pcap-linux/equivalents.
  *
  * Authors: Gilbert HOYEK (gil_hoyek@hotmail.com), Elias M. KHOURY
  * (+961 3 485243)
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include "pcap-int.h"
 
 #include <ctype.h>
 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <msg.h>
 #include <ss7_inc.h>
 #include <sysgct.h>
 #include <pack.h>
 #include <system.h>
 
 #include "pcap-septel.h"
 
 static int septel_setfilter(pcap_t *p, struct bpf_program *fp);
 static int septel_stats(pcap_t *p, struct pcap_stat *ps);
-static int septel_setnonblock(pcap_t *p, int nonblock, char *errbuf);
+static int septel_getnonblock(pcap_t *p);
+static int septel_setnonblock(pcap_t *p, int nonblock);
 
 /*
  * Private data for capturing on Septel devices.
  */
 struct pcap_septel {
 	struct pcap_stat stat;
 }
 
 /*
  *  Read at most max_packets from the capture queue and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an
  *  error occured, or -2 if we were told to break out of the loop.
  */
 static int septel_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user) {
 
   struct pcap_septel *ps = p->priv;
   HDR *h;
   MSG *m;
   int processed = 0 ;
   int t = 0 ;
 
   /* identifier for the message queue of the module(upe) from which we are capturing
    * packets.These IDs are defined in system.txt . By default it is set to 0x2d
    * so change it to 0xdd for technical reason and therefore the module id for upe becomes:
    * LOCAL        0xdd           * upe - Example user part task */
   unsigned int id = 0xdd;
 
   /* process the packets */
   do  {
 
     unsigned short packet_len = 0;
     int caplen = 0;
     int counter = 0;
     struct pcap_pkthdr   pcap_header;
     u_char *dp ;
 
     /*
      * Has "pcap_breakloop()" been called?
      */
 loop:
     if (p->break_loop) {
       /*
        * Yes - clear the flag that indicates that
        * it has, and return -2 to indicate that
        * we were told to break out of the loop.
        */
       p->break_loop = 0;
       return -2;
     }
 
     /*repeat until a packet is read
      *a NULL message means :
      * when no packet is in queue or all packets in queue already read */
     do  {
       /* receive packet in non-blocking mode
        * GCT_grab is defined in the septel library software */
       h = GCT_grab(id);
 
       m = (MSG*)h;
       /* a couter is added here to avoid an infinite loop
        * that will cause our capture program GUI to freeze while waiting
        * for a packet*/
       counter++ ;
 
     }
     while  ((m == NULL)&& (counter< 100)) ;
 
     if (m != NULL) {
 
       t = h->type ;
 
       /* catch only messages with type = 0xcf00 or 0x8f01 corrsponding to ss7 messages*/
       /* XXX = why not use API_MSG_TX_REQ for 0xcf00 and API_MSG_RX_IND
        * for 0x8f01? */
       if ((t != 0xcf00) && (t != 0x8f01)) {
         relm(h);
         goto loop ;
       }
 
       /* XXX - is API_MSG_RX_IND for an MTP2 or MTP3 message? */
       dp = get_param(m);/* get pointer to MSG parameter area (m->param) */
       packet_len = m->len;
       caplen =  p->snapshot ;
 
 
       if (caplen > packet_len) {
 
         caplen = packet_len;
       }
       /* Run the packet filter if there is one. */
       if ((p->fcode.bf_insns == NULL) || bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {
 
 
         /*  get a time stamp , consisting of :
          *
          *  pcap_header.ts.tv_sec:
          *  ----------------------
          *   a UNIX format time-in-seconds when he packet was captured,
          *   i.e. the number of seconds since Epoch time (January 1,1970, 00:00:00 GMT)
          *
          *  pcap_header.ts.tv_usec :
          *  ------------------------
          *   the number of microseconds since that second
          *   when the packet was captured
          */
 
         (void)gettimeofday(&pcap_header.ts, NULL);
 
         /* Fill in our own header data */
         pcap_header.caplen = caplen;
         pcap_header.len = packet_len;
 
         /* Count the packet. */
         ps->stat.ps_recv++;
 
         /* Call the user supplied callback function */
         callback(user, &pcap_header, dp);
 
         processed++ ;
 
       }
       /* after being processed the packet must be
        *released in order to receive another one */
       relm(h);
     }else
       processed++;
 
   }
   while (processed < cnt) ;
 
   return processed ;
 }
 
 
 static int
 septel_inject(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
   strlcpy(handle->errbuf, "Sending packets isn't supported on Septel cards",
           PCAP_ERRBUF_SIZE);
   return (-1);
 }
 
 /*
  *  Activate a handle for a live capture from the given Septel device.  Always pass a NULL device
  *  The promisc flag is ignored because Septel cards have built-in tracing.
  *  The timeout is also ignored as it is not supported in hardware.
  *
  *  See also pcap(3).
  */
 static pcap_t *septel_activate(pcap_t* handle) {
   /* Initialize some components of the pcap structure. */
   handle->linktype = DLT_MTP2;
 
+  /*
+   * Turn a negative snapshot value (invalid), a snapshot value of
+   * 0 (unspecified), or a value bigger than the normal maximum
+   * value, into the maximum allowed value.
+   *
+   * If some application really *needs* a bigger snapshot
+   * length, we should just increase MAXIMUM_SNAPLEN.
+   */
+  if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+    handle->snapshot = MAXIMUM_SNAPLEN;
+
   handle->bufsize = 0;
 
   /*
    * "select()" and "poll()" don't work on Septel queues
    */
   handle->selectable_fd = -1;
 
   handle->read_op = septel_read;
   handle->inject_op = septel_inject;
   handle->setfilter_op = septel_setfilter;
   handle->set_datalink_op = NULL; /* can't change data link type */
-  handle->getnonblock_op = pcap_getnonblock_fd;
+  handle->getnonblock_op = septel_getnonblock;
   handle->setnonblock_op = septel_setnonblock;
   handle->stats_op = septel_stats;
 
   return 0;
 }
 
 pcap_t *septel_create(const char *device, char *ebuf, int *is_ours) {
 	const char *cp;
 	pcap_t *p;
 
 	/* Does this look like the Septel device? */
 	cp = strrchr(device, '/');
 	if (cp == NULL)
 		cp = device;
 	if (strcmp(cp, "septel") != 0) {
 		/* Nope, it's not "septel" */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_septel));
 	if (p == NULL)
 		return NULL;
 
 	p->activate_op = septel_activate;
+	/*
+	 * Set these up front, so that, even if our client tries
+	 * to set non-blocking mode before we're activated, or
+	 * query the state of non-blocking mode, they get an error,
+	 * rather than having the non-blocking mode option set
+	 * for use later.
+	 */
+	p->getnonblock_op = septel_getnonblock;
+	p->setnonblock_op = septel_setnonblock;
 	return p;
 }
 
 static int septel_stats(pcap_t *p, struct pcap_stat *ps) {
   struct pcap_septel *handlep = p->priv;
   /*handlep->stat.ps_recv = 0;*/
   /*handlep->stat.ps_drop = 0;*/
 
   *ps = handlep->stat;
 
   return 0;
 }
 
 
 int
-septel_findalldevs(pcap_if_t **devlistp, char *errbuf)
+septel_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-  return (pcap_add_if(devlistp,"septel",0,
-                      "Intel/Septel device",errbuf));
+  /*
+   * XXX - do the notions of "up", "running", or "connected" apply here?
+   */
+  if (add_dev(devlistp,"septel",0,"Intel/Septel device",errbuf) == NULL)
+    return -1;
+  return 0;
 }
 
 
 /*
  * Installs the given bpf filter program in the given pcap structure.  There is
  * no attempt to store the filter in kernel memory as that is not supported
  * with Septel cards.
  */
 static int septel_setfilter(pcap_t *p, struct bpf_program *fp) {
   if (!p)
     return -1;
   if (!fp) {
     strncpy(p->errbuf, "setfilter: No filter specified",
 	    sizeof(p->errbuf));
     return -1;
   }
 
   /* Make our private copy of the filter */
 
-  if (install_bpf_program(p, fp) < 0) {
-    pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-	     "malloc: %s", pcap_strerror(errno));
+  if (install_bpf_program(p, fp) < 0)
     return -1;
-  }
 
   return (0);
 }
 
+/*
+ * We don't support non-blocking mode.  I'm not sure what we'd
+ * do to support it and, given that we don't support select()/
+ * poll()/epoll_wait()/kevent() etc., it probably doesn't
+ * matter.
+ */
+static int
+septel_getnonblock(pcap_t *p)
+{
+  fprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Non-blocking mode not supported on Septel devices");
+  return (-1);
+}
 
 static int
-septel_setnonblock(pcap_t *p, int nonblock, char *errbuf)
+septel_setnonblock(pcap_t *p, int nonblock _U_)
 {
-  fprintf(errbuf, PCAP_ERRBUF_SIZE, "Non-blocking mode not supported on Septel devices");
+  fprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Non-blocking mode not supported on Septel devices");
   return (-1);
 }
 
 #ifdef SEPTEL_ONLY
 /*
  * This libpcap build supports only Septel cards, not regular network
  * interfaces.
  */
 
 /*
  * There are no regular interfaces, just Septel interfaces.
  */
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-  *alldevsp = NULL;
   return (0);
 }
 
 /*
  * Attempts to open a regular interface fail.
  */
 pcap_t *
 pcap_create_interface(const char *device, char *errbuf)
 {
   pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                 "This version of libpcap only supports Septel cards");
   return (NULL);
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+  return (PCAP_VERSION_STRING " (Septel-only)");
 }
 #endif
Index: vendor/libpcap/dist/pcap-septel.h
===================================================================
--- vendor/libpcap/dist/pcap-septel.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-septel.h	(revision 333789)
@@ -1,13 +1,13 @@
 /*
  * pcap-septel.c: Packet capture interface for Intel Septel card
  *
  * The functionality of this code attempts to mimic that of pcap-linux as much
  * as possible.  This code is only needed when compiling in the Intel/Septel
  * card code at the same time as another type of device.
  *
  * Authors: Gilbert HOYEK (gil_hoyek@hotmail.com), Elias M. KHOURY
  * (+961 3 485343);
  */
 
 pcap_t *septel_create(const char *device, char *ebuf, int *is_ours);
-int septel_findalldevs(pcap_if_t **devlistp, char *errbuf);
+int septel_findalldevs(pcap_if_list_t *devlistp, char *errbuf);
Index: vendor/libpcap/dist/pcap-sita.c
===================================================================
--- vendor/libpcap/dist/pcap-sita.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-sita.c	(revision 333789)
@@ -1,1049 +1,1087 @@
 /*
  *  pcap-sita.c: Packet capture interface additions for SITA ACN devices
  *
  *  Copyright (c) 2007 Fulko Hew, SITA INC Canada, Inc <fulko.hew@sita.aero>
  *
  *  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
  *     notice, this list of conditions and the following disclaimer in
  *     the documentation and/or other materials provided with the
  *     distribution.
  *  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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "pcap-int.h"
 
 #include "pcap-sita.h"
 
 	/* non-configureable manifests follow */
 
 #define IOP_SNIFFER_PORT	49152			/* TCP port on the IOP used for 'distributed pcap' usage */
 #define MAX_LINE_SIZE		255				/* max size of a buffer/line in /etc/hosts we allow */
 #define MAX_CHASSIS			8				/* number of chassis in an ACN site */
 #define MAX_GEOSLOT			8				/* max number of access units in an ACN site */
 
 #define FIND			0
 #define LIVE			1
 
 typedef struct iface {
 	struct iface	*next;		/* a pointer to the next interface */
 	char		*name;		/* this interface's name */
 	char		*IOPname;	/* this interface's name on an IOP */
 	uint32_t	iftype;		/* the type of interface (DLT values) */
 } iface_t;
 
 typedef struct unit {
 	char			*ip;		/* this unit's IP address (as extracted from /etc/hosts) */
 	int			fd;		/* the connection to this unit (if it exists) */
 	int			find_fd;	/* a big kludge to avoid my programming limitations since I could have this unit open for findalldevs purposes */
 	int			first_time;	/* 0 = just opened via acn_open_live(),  ie. the first time, NZ = nth time */
 	struct sockaddr_in	*serv_addr;	/* the address control block for comms to this unit */
 	int			chassis;
 	int			geoslot;
 	iface_t			*iface;		/* a pointer to a linked list of interface structures */
 	char			*imsg;		/* a pointer to an inbound message */
 	int			len;		/* the current size of the inbound message */
 } unit_t;
 
 static unit_t		units[MAX_CHASSIS+1][MAX_GEOSLOT+1];	/* we use indexes of 1 through 8, but we reserve/waste index 0 */
 static fd_set		readfds;				/* a place to store the file descriptors for the connections to the IOPs */
 static int		max_fs;
 
 pcap_if_t		*acn_if_list;		/* pcap's list of available interfaces */
 
 static void dump_interface_list(void) {
 	pcap_if_t		*iff;
 	pcap_addr_t		*addr;
 	int			longest_name_len = 0;
 	char			*n, *d, *f;
 	int			if_number = 0;
 
 	iff = acn_if_list;
 	while (iff) {
 		if (iff->name && (strlen(iff->name) > longest_name_len)) longest_name_len = strlen(iff->name);
 		iff = iff->next;
 	}
 	iff = acn_if_list;
 	printf("Interface List:\n");
 	while (iff) {
 		n = (iff->name)							? iff->name			: "";
 		d = (iff->description)					? iff->description	: "";
 		f = (iff->flags == PCAP_IF_LOOPBACK)	? "L"				: "";
 		printf("%3d: %*s %s '%s'\n", if_number++, longest_name_len, n, f, d);
 		addr = iff->addresses;
 		while (addr) {
 			printf("%*s ", (5 + longest_name_len), "");		/* add some indentation */
 			printf("%15s  ", (addr->addr)		? inet_ntoa(((struct sockaddr_in *)addr->addr)->sin_addr)		: "");
 			printf("%15s  ", (addr->netmask)	? inet_ntoa(((struct sockaddr_in *)addr->netmask)->sin_addr)	: "");
 			printf("%15s  ", (addr->broadaddr)	? inet_ntoa(((struct sockaddr_in *)addr->broadaddr)->sin_addr)	: "");
 			printf("%15s  ", (addr->dstaddr)	? inet_ntoa(((struct sockaddr_in *)addr->dstaddr)->sin_addr)	: "");
 			printf("\n");
 			addr = addr->next;
 		}
 		iff = iff->next;
 	}
 }
 
 static void dump(unsigned char *ptr, int i, int indent) {
 	fprintf(stderr, "%*s", indent, " ");
 	for (; i > 0; i--) {
 		fprintf(stderr, "%2.2x ", *ptr++);
 	}
 	fprintf(stderr, "\n");
 }
 
 static void dump_interface_list_p(void) {
 	pcap_if_t		*iff;
 	pcap_addr_t		*addr;
 	int				if_number = 0;
 
 	iff = acn_if_list;
 	printf("Interface Pointer @ %p is %p:\n", &acn_if_list, iff);
 	while (iff) {
 		printf("%3d: %p %p next: %p\n", if_number++, iff->name, iff->description, iff->next);
 		dump((unsigned char *)iff, sizeof(pcap_if_t), 5);
 		addr = iff->addresses;
 		while (addr) {
 			printf("          %p %p %p %p, next: %p\n", addr->addr, addr->netmask, addr->broadaddr, addr->dstaddr, addr->next);
 			dump((unsigned char *)addr, sizeof(pcap_addr_t), 10);
 			addr = addr->next;
 		}
 		iff = iff->next;
 	}
 }
 
 static void dump_unit_table(void) {
 	int		chassis, geoslot;
 	iface_t	*p;
 
 	printf("%c:%c %s %s\n", 'C', 'S', "fd", "IP Address");
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {
 			if (units[chassis][geoslot].ip != NULL)
 				printf("%d:%d %2d %s\n", chassis, geoslot, units[chassis][geoslot].fd, units[chassis][geoslot].ip);
 			p = units[chassis][geoslot].iface;
 			while (p) {
 				char *n = (p->name)			? p->name			: "";
 				char *i = (p->IOPname)		? p->IOPname		: "";
 				p = p->next;
 				printf("   %12s    -> %12s\n", i, n);
 			}
 		}
 	}
 }
 
 static int find_unit_by_fd(int fd, int *chassis, int *geoslot, unit_t **unit_ptr) {
 	int		c, s;
 
 	for (c = 0; c <= MAX_CHASSIS; c++) {
 		for (s = 0; s <= MAX_GEOSLOT; s++) {
 			if (units[c][s].fd == fd || units[c][s].find_fd == fd) {
 				if (chassis)	*chassis = c;
 				if (geoslot)	*geoslot = s;
 				if (unit_ptr)	*unit_ptr = &units[c][s];
 				return 1;
 			}
 		}
 	}
 	return 0;
 }
 
 static int read_client_nbytes(int fd, int count, unsigned char *buf) {
 	unit_t			*u;
 	int				chassis, geoslot;
 	int				len;
 
 	find_unit_by_fd(fd, &chassis, &geoslot, &u);
 	while (count) {
 		if ((len = recv(fd, buf, count, 0)) <= 0)	return -1;	/* read in whatever data was sent to us */
 		count -= len;
 		buf += len;
 	}															/* till we have everything we are looking for */
 	return 0;
 }
 
 static void empty_unit_iface(unit_t *u) {
 	iface_t	*p, *cur;
 
 	cur = u->iface;
 	while (cur) {											/* loop over all the interface entries */
 		if (cur->name)			free(cur->name);			/* throwing away the contents if they exist */
 		if (cur->IOPname)		free(cur->IOPname);
 		p = cur->next;
 		free(cur);											/* then throw away the structure itself */
 		cur = p;
 	}
 	u->iface = 0;											/* and finally remember that there are no remaining structure */
 }
 
 static void empty_unit(int chassis, int geoslot) {
 	unit_t	*u = &units[chassis][geoslot];
 
 	empty_unit_iface(u);
 	if (u->imsg) {											/* then if an inbound message buffer exists */
 		void *bigger_buffer;
 
 		bigger_buffer = (char *)realloc(u->imsg, 1);				/* and re-allocate the old large buffer into a new small one */
 		if (bigger_buffer == NULL) {	/* oops, realloc call failed */
 			fprintf(stderr, "Warning...call to realloc() failed, value of errno is %d\n", errno);
 			return;
 		}
 		u->imsg = bigger_buffer;
 	}
 }
 
 static void empty_unit_table(void) {
 	int		chassis, geoslot;
 
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {
 			if (units[chassis][geoslot].ip != NULL) {
 				free(units[chassis][geoslot].ip);			/* get rid of the malloc'ed space that holds the IP address */
 				units[chassis][geoslot].ip = 0;				/* then set the pointer to NULL */
 			}
 			empty_unit(chassis, geoslot);
 		}
 	}
 }
 
 static char *find_nth_interface_name(int n) {
 	int		chassis, geoslot;
 	iface_t	*p;
 	char	*last_name = 0;
 
 	if (n < 0) n = 0;												/* ensure we are working with a valid number */
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {			/* scan the table... */
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {
 			if (units[chassis][geoslot].ip != NULL) {
 				p = units[chassis][geoslot].iface;
 				while (p) {											/* and all interfaces... */
 					if (p->IOPname) last_name = p->name;			/* remembering the last name found */
 					if (n-- == 0) return last_name;					/* and if we hit the instance requested */
 					p = p->next;
 				}
 			}
 		}
 	}
 											/* if we couldn't fine the selected entry */
 	if (last_name)	return last_name;		/* ... but we did have at least one entry... return the last entry found */
 	return "";								/* ... but if there wasn't any entry... return an empty string instead */
 }
 
 int acn_parse_hosts_file(char *errbuf) {				/* returns: -1 = error, 0 = OK */
 	FILE	*fp;
 	char	buf[MAX_LINE_SIZE];
 	char	*ptr, *ptr2;
 	int		pos;
 	int		chassis, geoslot;
 	unit_t	*u;
 
 	empty_unit_table();
 	if ((fp = fopen("/etc/hosts", "r")) == NULL) {										/* try to open the hosts file and if it fails */
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Cannot open '/etc/hosts' for reading.");	/* return the nohostsfile error response */
 		return -1;
 	}
 	while (fgets(buf, MAX_LINE_SIZE-1, fp)) {			/* while looping over the file */
 
 		pos = strcspn(buf, "#\n\r");					/* find the first comment character or EOL */
 		*(buf + pos) = '\0';							/* and clobber it and anything that follows it */
 
 		pos = strspn(buf, " \t");						/* then find the first non-white space */
 		if (pos == strlen(buf))							/* if there is nothing but white space on the line */
 			continue;									/* ignore that empty line */
 		ptr = buf + pos;								/* and skip over any of that leading whitespace */
 
 		if ((ptr2 = strstr(ptr, "_I_")) == NULL)		/* skip any lines that don't have names that look like they belong to IOPs */
 			continue;
 		if (*(ptr2 + 4) != '_')							/* and skip other lines that have names that don't look like ACN components */
 			continue;
 		*(ptr + strcspn(ptr, " \t")) = '\0';			/* null terminate the IP address so its a standalone string */
 
 		chassis = *(ptr2 + 3) - '0';					/* extract the chassis number */
 		geoslot = *(ptr2 + 5) - '0';					/* and geo-slot number */
 		if (chassis < 1 || chassis > MAX_CHASSIS ||
 			geoslot < 1 || geoslot > MAX_GEOSLOT) {		/* if the chassis and/or slot numbers appear to be bad... */
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Invalid ACN name in '/etc/hosts'.");	/* warn the user */
 			continue;																	/* and ignore the entry */
 		}
 		if ((ptr2 = (char *)malloc(strlen(ptr) + 1)) == NULL) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
 			continue;
 		}
 		strcpy(ptr2, ptr);								/* copy the IP address into our malloc'ed memory */
 		u = &units[chassis][geoslot];
 		u->ip = ptr2;									/* and remember the whole shebang */
 		u->chassis = chassis;
 		u->geoslot = geoslot;
 	}
 	fclose(fp);
 	if (*errbuf)	return -1;
 	else			return 0;
 }
 
 static int open_with_IOP(unit_t  *u, int flag) {
 	int					sockfd;
 	char				*ip;
 
 	if (u->serv_addr == NULL) {
 		u->serv_addr = malloc(sizeof(struct sockaddr_in));
 
 		/* since we called malloc(), lets check to see if we actually got the memory	*/
 		if (u->serv_addr == NULL) {	/* oops, we didn't get the memory requested	*/
 			fprintf(stderr, "malloc() request for u->serv_addr failed, value of errno is: %d\n", errno);
 			return 0;
 		}
 
 	}
 	ip = u->ip;
 	/* bzero() is deprecated, replaced with memset()	*/
 	memset((char *)u->serv_addr, 0, sizeof(struct sockaddr_in));
 	u->serv_addr->sin_family		= AF_INET;
 	u->serv_addr->sin_addr.s_addr	= inet_addr(ip);
 	u->serv_addr->sin_port			= htons(IOP_SNIFFER_PORT);
 
 	if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		fprintf(stderr, "pcap can't open a socket for connecting to IOP at %s\n", ip);
 		return 0;
 	}
 	if (connect(sockfd, (struct sockaddr *)u->serv_addr, sizeof(struct sockaddr_in)) < 0) {
 		fprintf(stderr, "pcap can't connect to IOP at %s\n", ip);
 		return 0;
 	}
 	if (flag == LIVE)	u->fd = sockfd;
 	else				u->find_fd = sockfd;
 	u->first_time = 0;
 	return sockfd;			/* return the non-zero file descriptor as a 'success' indicator */
 }
 
 static void close_with_IOP(int chassis, int geoslot, int flag) {
 	int		*id;
 
 	if (flag == LIVE)	id = &units[chassis][geoslot].fd;
 	else				id = &units[chassis][geoslot].find_fd;
 
 	if (*id) {										/* this was the last time, so... if we are connected... */
 		close(*id);									/* disconnect us */
 		*id = 0;									/* and forget that the descriptor exists because we are not open */
 	}
 }
 
 static void pcap_cleanup_acn(pcap_t *handle) {
 	int		chassis, geoslot;
 	unit_t	*u;
 
 	if (find_unit_by_fd(handle->fd, &chassis, &geoslot, &u) == 0)
 		return;
 	close_with_IOP(chassis, geoslot, LIVE);
 	if (u)
 		u->first_time = 0;
 	pcap_cleanup_live_common(handle);
 }
 
 static void send_to_fd(int fd, int len, unsigned char *str) {
 	int		nwritten;
 	int		chassis, geoslot;
 
 	while (len > 0) {
 		if ((nwritten = write(fd, str, len)) <= 0) {
 			find_unit_by_fd(fd, &chassis, &geoslot, NULL);
 			if (units[chassis][geoslot].fd == fd)			close_with_IOP(chassis, geoslot, LIVE);
 			else if (units[chassis][geoslot].find_fd == fd)	close_with_IOP(chassis, geoslot, FIND);
 			empty_unit(chassis, geoslot);
 			return;
 		}
 		len -= nwritten;
 		str += nwritten;
 	}
 }
 
 static void acn_freealldevs(void) {
 
 	pcap_if_t	*iff, *next_iff;
 	pcap_addr_t	*addr, *next_addr;
 
 	for (iff = acn_if_list; iff != NULL; iff = next_iff) {
 		next_iff = iff->next;
 		for (addr = iff->addresses; addr != NULL; addr = next_addr) {
 			next_addr = addr->next;
 			if (addr->addr)			free(addr->addr);
 			if (addr->netmask)		free(addr->netmask);
 			if (addr->broadaddr)	free(addr->broadaddr);
 			if (addr->dstaddr)		free(addr->dstaddr);
 			free(addr);
 		}
 		if (iff->name)			free(iff->name);
 		if (iff->description)	free(iff->description);
 		free(iff);
 	}
 }
 
 static void nonUnified_IOP_port_name(char *buf, size_t bufsize, const char *proto, unit_t *u) {
 
 	pcap_snprintf(buf, bufsize, "%s_%d_%d", proto, u->chassis, u->geoslot);
 }
 
 static void unified_IOP_port_name(char *buf, size_t bufsize, const char *proto, unit_t *u, int IOPportnum) {
 	int			portnum;
 
 	portnum = ((u->chassis - 1) * 64) + ((u->geoslot - 1) * 8) + IOPportnum + 1;
 	pcap_snprintf(buf, bufsize, "%s_%d", proto, portnum);
 }
 
 static char *translate_IOP_to_pcap_name(unit_t *u, char *IOPname, bpf_u_int32 iftype) {
 	iface_t		*iface_ptr, *iface;
 	char		*name;
 	char		buf[32];
 	char		*proto;
 	char		*port;
 	int			IOPportnum = 0;
 
 	iface = malloc(sizeof(iface_t));		/* get memory for a structure */
 	if (iface == NULL) {	/* oops, we didn't get the memory requested	*/
 		fprintf(stderr, "Error...couldn't allocate memory for interface structure...value of errno is: %d\n", errno);
 		return NULL;
 	}
 	memset((char *)iface, 0, sizeof(iface_t));	/* bzero is deprecated(), replaced with memset() */
 
 	iface->iftype = iftype;					/* remember the interface type of this interface */
 
 	name = malloc(strlen(IOPname) + 1);		/* get memory for the IOP's name */
         if (name == NULL) {    /* oops, we didn't get the memory requested     */
                 fprintf(stderr, "Error...couldn't allocate memory for IOPname...value of errno is: %d\n", errno);
                 return NULL;
         }
 
 	strcpy(name, IOPname);					/* and copy it in */
 	iface->IOPname = name;					/* and stick it into the structure */
 
 	if (strncmp(IOPname, "lo", 2) == 0) {
 		IOPportnum = atoi(&IOPname[2]);
 		switch (iftype) {
 			case DLT_EN10MB:
 				nonUnified_IOP_port_name(buf, sizeof buf, "lo", u);
 				break;
 			default:
 				unified_IOP_port_name(buf, sizeof buf, "???", u, IOPportnum);
 				break;
 		}
 	} else if (strncmp(IOPname, "eth", 3) == 0) {
 		IOPportnum = atoi(&IOPname[3]);
 		switch (iftype) {
 			case DLT_EN10MB:
 				nonUnified_IOP_port_name(buf, sizeof buf, "eth", u);
 				break;
 			default:
 				unified_IOP_port_name(buf, sizeof buf, "???", u, IOPportnum);
 				break;
 		}
 	} else if (strncmp(IOPname, "wan", 3) == 0) {
 		IOPportnum = atoi(&IOPname[3]);
 		switch (iftype) {
 			case DLT_SITA:
 				unified_IOP_port_name(buf, sizeof buf, "wan", u, IOPportnum);
 				break;
 			default:
 				unified_IOP_port_name(buf, sizeof buf, "???", u, IOPportnum);
 				break;
 		}
 	} else {
 		fprintf(stderr, "Error... invalid IOP name %s\n", IOPname);
 		return NULL;
 	}
 
 	name = malloc(strlen(buf) + 1);			/* get memory for that name */
         if (name == NULL) {    /* oops, we didn't get the memory requested     */
                 fprintf(stderr, "Error...couldn't allocate memory for IOP port name...value of errno is: %d\n", errno);
                 return NULL;
         }
 
 	strcpy(name, buf);						/* and copy it in */
 	iface->name = name;						/* and stick it into the structure */
 
 	if (u->iface == 0) {					/* if this is the first name */
 		u->iface = iface;					/* stick this entry at the head of the list */
 	} else {
 		iface_ptr = u->iface;
 		while (iface_ptr->next) {			/* othewise scan the list */
 			iface_ptr = iface_ptr->next;	/* till we're at the last entry */
 		}
 		iface_ptr->next = iface;			/* then tack this entry on the end of the list */
 	}
 	return iface->name;
 }
 
 static int if_sort(char *s1, char *s2) {
 	char	*s1_p2, *s2_p2;
 	char	str1[MAX_LINE_SIZE], str2[MAX_LINE_SIZE];
 	int		s1_p1_len, s2_p1_len;
 	int		retval;
 
 	if ((s1_p2 = strchr(s1, '_'))) {	/* if an underscore is found... */
 		s1_p1_len = s1_p2 - s1;			/* the prefix length is the difference in pointers */
 		s1_p2++;						/* the suffix actually starts _after_ the underscore */
 	} else {							/* otherwise... */
 		s1_p1_len = strlen(s1);			/* the prefix length is the length of the string itself */
 		s1_p2 = 0;						/* and there is no suffix */
 	}
 	if ((s2_p2 = strchr(s2, '_'))) {	/* now do the same for the second string */
 		s2_p1_len = s2_p2 - s2;
 		s2_p2++;
 	} else {
 		s2_p1_len = strlen(s2);
 		s2_p2 = 0;
 	}
 	strncpy(str1, s1, (s1_p1_len > sizeof(str1)) ? s1_p1_len : sizeof(str1));   *(str1 + s1_p1_len) = 0;
 	strncpy(str2, s2, (s2_p1_len > sizeof(str2)) ? s2_p1_len : sizeof(str2));   *(str2 + s2_p1_len) = 0;
 	retval = strcmp(str1, str2);
 	if (retval != 0) return retval;		/* if they are not identical, then we can quit now and return the indication */
 	return strcmp(s1_p2, s2_p2);		/* otherwise we return the result of comparing the 2nd half of the string */
 }
 
 static void sort_if_table(void) {
 	pcap_if_t	*p1, *p2, *prev, *temp;
 	int			has_swapped;
 
 	if (!acn_if_list) return;				/* nothing to do if the list is empty */
 
 	while (1) {
 		p1 = acn_if_list;					/* start at the head of the list */
 		prev = 0;
 		has_swapped = 0;
 		while ((p2 = p1->next)) {
 			if (if_sort(p1->name, p2->name) > 0) {
 				if (prev) {					/* we are swapping things that are _not_ at the head of the list */
 					temp = p2->next;
 					prev->next = p2;
 					p2->next = p1;
 					p1->next = temp;
 				} else {					/* special treatment if we are swapping with the head of the list */
 					temp = p2->next;
 					acn_if_list= p2;
 					p2->next = p1;
 					p1->next = temp;
 				}
 				p1 = p2;
 				prev = p1;
 				has_swapped = 1;
 			}
 			prev = p1;
 			p1 = p1->next;
 		}
 		if (has_swapped == 0)
 			return;
 	}
 	return;
 }
 
 static int process_client_data (char *errbuf) {								/* returns: -1 = error, 0 = OK */
 	int					chassis, geoslot;
 	unit_t				*u;
 	pcap_if_t			*iff, *prev_iff;
 	pcap_addr_t			*addr, *prev_addr;
 	char				*ptr;
 	int					address_count;
 	struct sockaddr_in	*s;
 	char				*newname;
 	bpf_u_int32				interfaceType;
 	unsigned char		flags;
 	void *bigger_buffer;
 
 	prev_iff = 0;
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {				/* now loop over all the devices */
 			u = &units[chassis][geoslot];
 			empty_unit_iface(u);
 			ptr = u->imsg;													/* point to the start of the msg for this IOP */
 			while (ptr < (u->imsg + u->len)) {
 				if ((iff = malloc(sizeof(pcap_if_t))) == NULL) {
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno, "malloc");
 					return -1;
 				}
 				memset((char *)iff, 0, sizeof(pcap_if_t)); /* bzero() is deprecated, replaced with memset() */
 				if (acn_if_list == 0)	acn_if_list = iff;					/* remember the head of the list */
 				if (prev_iff)			prev_iff->next = iff;				/* insert a forward link */
 
 				if (*ptr) {													/* if there is a count for the name */
 					if ((iff->name = malloc(*ptr + 1)) == NULL) {			/* get that amount of space */
-						pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+						pcap_fmt_errmsg_for_errno(errbuf,
+						    PCAP_ERRBUF_SIZE, errno,
+						    "malloc");
 						return -1;
 					}
 					memcpy(iff->name, (ptr + 1), *ptr);						/* copy the name into the malloc'ed space */
 					*(iff->name + *ptr) = 0;								/* and null terminate the string */
 					ptr += *ptr;											/* now move the pointer forwards by the length of the count plus the length of the string */
 				}
 				ptr++;
 
 				if (*ptr) {													/* if there is a count for the description */
 					if ((iff->description = malloc(*ptr + 1)) == NULL) {	/* get that amount of space */
-						pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+						pcap_fmt_errmsg_for_errno(errbuf,
+						    PCAP_ERRBUF_SIZE, errno,
+						    "malloc");
 						return -1;
 					}
 					memcpy(iff->description, (ptr + 1), *ptr);				/* copy the name into the malloc'ed space */
 					*(iff->description + *ptr) = 0;							/* and null terminate the string */
 					ptr += *ptr;											/* now move the pointer forwards by the length of the count plus the length of the string */
 				}
 				ptr++;
 
 				interfaceType = ntohl(*(bpf_u_int32 *)ptr);
 				ptr += 4;													/* skip over the interface type */
 
 				flags = *ptr++;
 				if (flags) iff->flags = PCAP_IF_LOOPBACK;					/* if this is a loopback style interface, lets mark it as such */
 
 				address_count = *ptr++;
 
 				prev_addr = 0;
 				while (address_count--) {
 					if ((addr = malloc(sizeof(pcap_addr_t))) == NULL) {
-						pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+						pcap_fmt_errmsg_for_errno(errbuf,
+						    PCAP_ERRBUF_SIZE, errno,
+						    "malloc");
 						return -1;
 					}
  					memset((char *)addr, 0, sizeof(pcap_addr_t)); /* bzero() is deprecated, replaced with memset() */
 					if (iff->addresses == 0) iff->addresses = addr;
 					if (prev_addr) prev_addr->next = addr;							/* insert a forward link */
 					if (*ptr) {														/* if there is a count for the address */
 						if ((s = malloc(sizeof(struct sockaddr_in))) == NULL) {		/* get that amount of space */
-							pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+							pcap_fmt_errmsg_for_errno(errbuf,
+							    PCAP_ERRBUF_SIZE,
+							    errno, "malloc");
 							return -1;
 						}
 						memset((char *)s, 0, sizeof(struct sockaddr_in)); /* bzero() is deprecated, replaced with memset() */
 						addr->addr = (struct sockaddr *)s;
 						s->sin_family		= AF_INET;
 						s->sin_addr.s_addr	= *(bpf_u_int32 *)(ptr + 1);			/* copy the address in */
 						ptr += *ptr;										/* now move the pointer forwards according to the specified length of the address */
 					}
 					ptr++;													/* then forwards one more for the 'length of the address' field */
 					if (*ptr) {												/* process any netmask */
 						if ((s = malloc(sizeof(struct sockaddr_in))) == NULL) {
-							pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+							pcap_fmt_errmsg_for_errno(errbuf,
+							    PCAP_ERRBUF_SIZE,
+							    errno, "malloc");
 							return -1;
 						}
 						/* bzero() is deprecated, replaced with memset() */
 						memset((char *)s, 0, sizeof(struct sockaddr_in));
 
 						addr->netmask = (struct sockaddr *)s;
 						s->sin_family		= AF_INET;
 						s->sin_addr.s_addr	= *(bpf_u_int32*)(ptr + 1);
 						ptr += *ptr;
 					}
 					ptr++;
 					if (*ptr) {												/* process any broadcast address */
 						if ((s = malloc(sizeof(struct sockaddr_in))) == NULL) {
-							pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+							pcap_fmt_errmsg_for_errno(errbuf,
+							    PCAP_ERRBUF_SIZE,
+							    errno, "malloc");
 							return -1;
 						}
 						/* bzero() is deprecated, replaced with memset() */
 						memset((char *)s, 0, sizeof(struct sockaddr_in));
 
 						addr->broadaddr = (struct sockaddr *)s;
 						s->sin_family		= AF_INET;
 						s->sin_addr.s_addr	= *(bpf_u_int32*)(ptr + 1);
 						ptr += *ptr;
 					}
 					ptr++;
 					if (*ptr) {												/* process any destination address */
 						if ((s = malloc(sizeof(struct sockaddr_in))) == NULL) {
-							pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "malloc: %s", pcap_strerror(errno));
+							pcap_fmt_errmsg_for_errno(errbuf,
+							    PCAP_ERRBUF_SIZE,
+							    errno, "malloc");
 							return -1;
 						}
 						/* bzero() is deprecated, replaced with memset() */
 						memset((char *)s, 0, sizeof(struct sockaddr_in));
 
 						addr->dstaddr = (struct sockaddr *)s;
 						s->sin_family		= AF_INET;
 						s->sin_addr.s_addr	= *(bpf_u_int32*)(ptr + 1);
 						ptr += *ptr;
 					}
 					ptr++;
 					prev_addr = addr;
 				}
 				prev_iff = iff;
 
 				newname = translate_IOP_to_pcap_name(u, iff->name, interfaceType);		/* add a translation entry and get a point to the mangled name */
 				bigger_buffer = realloc(iff->name, strlen(newname) + 1));
 				if (bigger_buffer == NULL) {	/* we now re-write the name stored in the interface list */
-					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "realloc: %s", pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(errbuf,
+					    PCAP_ERRBUF_SIZE, errno, "realloc");
 					return -1;
 				}
 				iff->name = bigger_buffer;
 				strcpy(iff->name, newname);												/* to this new name */
 			}
 		}
 	}
 	return 0;
 }
 
 static int read_client_data (int fd) {
 	unsigned char	buf[256];
 	int				chassis, geoslot;
 	unit_t			*u;
 	int				len;
 
 	find_unit_by_fd(fd, &chassis, &geoslot, &u);
 
 	if ((len = recv(fd, buf, sizeof(buf), 0)) <= 0)	return 0;	/* read in whatever data was sent to us */
 
 	if ((u->imsg = realloc(u->imsg, (u->len + len))) == NULL)	/* extend the buffer for the new data */
 		return 0;
 	memcpy((u->imsg + u->len), buf, len);						/* append the new data */
 	u->len += len;
 	return 1;
 }
 
 static void wait_for_all_answers(void) {
 	int		retval;
 	struct	timeval tv;
 	int		fd;
 	int		chassis, geoslot;
 
 	tv.tv_sec = 2;
 	tv.tv_usec = 0;
 
 	while (1) {
 		int flag = 0;
 		fd_set working_set;
 
 		for (fd = 0; fd <= max_fs; fd++) {								/* scan the list of descriptors we may be listening to */
 			if (FD_ISSET(fd, &readfds)) flag = 1;						/* and see if there are any still set */
 		}
 		if (flag == 0) return;											/* we are done, when they are all gone */
 
 		memcpy(&working_set, &readfds, sizeof(readfds));				/* otherwise, we still have to listen for more stuff, till we timeout */
 		retval = select(max_fs + 1, &working_set, NULL, NULL, &tv);
 		if (retval == -1) {												/* an error occured !!!!! */
 			return;
 		} else if (retval == 0) {										/* timeout occured, so process what we've got sofar and return */
 			printf("timeout\n");
 			return;
 		} else {
 			for (fd = 0; fd <= max_fs; fd++) {							/* scan the list of things to do, and do them */
 				if (FD_ISSET(fd, &working_set)) {
 					if (read_client_data(fd) == 0) {					/* if the socket has closed */
 						FD_CLR(fd, &readfds);							/* and descriptors we listen to for errors */
 						find_unit_by_fd(fd, &chassis, &geoslot, NULL);
 						close_with_IOP(chassis, geoslot, FIND);			/* and close out connection to him */
 					}
 				}
 			}
 		}
 	}
 }
 
 static char *get_error_response(int fd, char *errbuf) {		/* return a pointer on error, NULL on no error */
 	char	byte;
 	int		len = 0;
 
 	while (1) {
 		recv(fd, &byte, 1, 0);							/* read another byte in */
 		if (errbuf && (len++ < PCAP_ERRBUF_SIZE)) {		/* and if there is still room in the buffer */
 			*errbuf++ = byte;							/* stick it in */
 			*errbuf = '\0';								/* ensure the string is null terminated just in case we might exceed the buffer's size */
 		}
 		if (byte == '\0') {
 			if (len > 1)	{ return errbuf;	}
 			else			{ return NULL;		}
 		}
 	}
 }
 
 int acn_findalldevs(char *errbuf) {								/* returns: -1 = error, 0 = OK */
 	int		chassis, geoslot;
 	unit_t	*u;
 
 	FD_ZERO(&readfds);
 	max_fs = 0;
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {
 			u = &units[chassis][geoslot];
 			if (u->ip && (open_with_IOP(u, FIND))) {			/* connect to the remote IOP */
 				send_to_fd(u->find_fd, 1, (unsigned char *)"\0");
 				if (get_error_response(u->find_fd, errbuf))
 					close_with_IOP(chassis, geoslot, FIND);
 				else {
 					if (u->find_fd > max_fs)
 						max_fs = u->find_fd;								/* remember the highest number currently in use */
 					FD_SET(u->find_fd, &readfds);						/* we are going to want to read this guy's response to */
 					u->len = 0;
 					send_to_fd(u->find_fd, 1, (unsigned char *)"Q");		/* this interface query request */
 				}
 			}
 		}
 	}
 	wait_for_all_answers();
 	if (process_client_data(errbuf))
 		return -1;
 	sort_if_table();
 	return 0;
 }
 
 static int pcap_stats_acn(pcap_t *handle, struct pcap_stat *ps) {
 	unsigned char	buf[12];
 
 	send_to_fd(handle->fd, 1, (unsigned char *)"S");						/* send the get_stats command to the IOP */
 
 	if (read_client_nbytes(handle->fd, sizeof(buf), buf) == -1) return -1;	/* try reading the required bytes */
 
 	ps->ps_recv		= ntohl(*(uint32_t *)&buf[0]);							/* break the buffer into its three 32 bit components */
 	ps->ps_drop		= ntohl(*(uint32_t *)&buf[4]);
 	ps->ps_ifdrop	= ntohl(*(uint32_t *)&buf[8]);
 
 	return 0;
 }
 
 static int acn_open_live(const char *name, char *errbuf, int *linktype) {		/* returns 0 on error, else returns the file descriptor */
 	int			chassis, geoslot;
 	unit_t		*u;
 	iface_t		*p;
-	pcap_if_t	*alldevsp;
+	pcap_if_list_t	devlist;
 
-	pcap_platform_finddevs(&alldevsp, errbuf);
+	pcap_platform_finddevs(&devlist, errbuf);
 	for (chassis = 0; chassis <= MAX_CHASSIS; chassis++) {										/* scan the table... */
 		for (geoslot = 0; geoslot <= MAX_GEOSLOT; geoslot++) {
 			u = &units[chassis][geoslot];
 			if (u->ip != NULL) {
 				p = u->iface;
 				while (p) {																		/* and all interfaces... */
 					if (p->IOPname && p->name && (strcmp(p->name, name) == 0)) {				/* and if we found the interface we want... */
 						*linktype = p->iftype;
 						open_with_IOP(u, LIVE);													/* start a connection with that IOP */
 						send_to_fd(u->fd, strlen(p->IOPname)+1, (unsigned char *)p->IOPname);	/* send the IOP's interface name, and a terminating null */
 						if (get_error_response(u->fd, errbuf)) {
 							return -1;
 						}
 						return u->fd;															/* and return that open descriptor */
 					}
 					p = p->next;
 				}
 			}
 		}
 	}
 	return -1;																				/* if the interface wasn't found, return an error */
 }
 
 static void acn_start_monitor(int fd, int snaplen, int timeout, int promiscuous, int direction) {
 	unsigned char	buf[8];
 	unit_t			*u;
 
 	//printf("acn_start_monitor()\n");				// fulko
 	find_unit_by_fd(fd, NULL, NULL, &u);
 	if (u->first_time == 0) {
 		buf[0]					= 'M';
 		*(uint32_t *)&buf[1]	= htonl(snaplen);
 		buf[5]					= timeout;
 		buf[6]					= promiscuous;
 		buf[7]					= direction;
 	//printf("acn_start_monitor() first time\n");				// fulko
 		send_to_fd(fd, 8, buf);								/* send the start monitor command with its parameters to the IOP */
 		u->first_time = 1;
 	}
 	//printf("acn_start_monitor() complete\n");				// fulko
 }
 
 static int pcap_inject_acn(pcap_t *p, const void *buf _U_, size_t size _U_) {
 	strlcpy(p->errbuf, "Sending packets isn't supported on ACN adapters",
 	    PCAP_ERRBUF_SIZE);
 	return (-1);
 }
 
 static int pcap_setfilter_acn(pcap_t *handle, struct bpf_program *bpf) {
 	int				fd = handle->fd;
 	int				count;
 	struct bpf_insn	*p;
 	uint16_t		shortInt;
 	uint32_t		longInt;
 
 	send_to_fd(fd, 1, (unsigned char *)"F");			/* BPF filter follows command */
 	count = bpf->bf_len;
 	longInt = htonl(count);
 	send_to_fd(fd, 4, (unsigned char *)&longInt);		/* send the instruction sequence count */
 	p = bpf->bf_insns;
 	while (count--) {									/* followed by the list of instructions */
 		shortInt = htons(p->code);
 		longInt = htonl(p->k);
 		send_to_fd(fd, 2, (unsigned char *)&shortInt);
 		send_to_fd(fd, 1, (unsigned char *)&p->jt);
 		send_to_fd(fd, 1, (unsigned char *)&p->jf);
 		send_to_fd(fd, 4, (unsigned char *)&longInt);
 		p++;
 	}
 	if (get_error_response(fd, NULL))
 		return -1;
 	return 0;
 }
 
 static int pcap_setdirection_acn(pcap_t *handle, pcap_direction_t d) {
 	pcap_snprintf(handle->errbuf, sizeof(handle->errbuf),
 	    "Setting direction is not supported on ACN adapters");
 	return -1;
 }
 
 static int acn_read_n_bytes_with_timeout(pcap_t *handle, int count) {
 	struct		timeval tv;
 	int			retval, fd;
 	fd_set		r_fds;
 	fd_set		w_fds;
 	u_char		*bp;
 	int			len = 0;
 	int			offset = 0;
 
 	tv.tv_sec = 5;
 	tv.tv_usec = 0;
 
 	fd = handle->fd;
 	FD_ZERO(&r_fds);
 	FD_SET(fd, &r_fds);
 	memcpy(&w_fds, &r_fds, sizeof(r_fds));
 	bp = handle->bp;
 	while (count) {
 		retval = select(fd + 1, &w_fds, NULL, NULL, &tv);
 		if (retval == -1) {											/* an error occured !!!!! */
 //			fprintf(stderr, "error during packet data read\n");
 			return -1;												/* but we need to return a good indication to prevent unneccessary popups */
 		} else if (retval == 0) {									/* timeout occured, so process what we've got sofar and return */
 //			fprintf(stderr, "timeout during packet data read\n");
 			return -1;
 		} else {
 			if ((len = recv(fd, (bp + offset), count, 0)) <= 0) {
 //				fprintf(stderr, "premature exit during packet data rx\n");
 				return -1;
 			}
 			count -= len;
 			offset += len;
 		}
 	}
 	return 0;
 }
 
 static int pcap_read_acn(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user) {
 	#define HEADER_SIZE (4 * 4)
 	unsigned char		packet_header[HEADER_SIZE];
 	struct pcap_pkthdr	pcap_header;
 
 	//printf("pcap_read_acn()\n");			// fulko
 	acn_start_monitor(handle->fd, handle->snapshot, handle->opt.timeout, handle->opt.promisc, handle->direction);	/* maybe tell him to start monitoring */
 	//printf("pcap_read_acn() after start monitor\n");			// fulko
 
 	handle->bp = packet_header;
 	if (acn_read_n_bytes_with_timeout(handle, HEADER_SIZE) == -1) return 0;			/* try to read a packet header in so we can get the sizeof the packet data */
 
 	pcap_header.ts.tv_sec	= ntohl(*(uint32_t *)&packet_header[0]);				/* tv_sec */
 	pcap_header.ts.tv_usec	= ntohl(*(uint32_t *)&packet_header[4]);				/* tv_usec */
 	pcap_header.caplen		= ntohl(*(uint32_t *)&packet_header[8]);				/* caplen */
 	pcap_header.len			= ntohl(*(uint32_t *)&packet_header[12]);				/* len */
 
 	handle->bp = (u_char *)handle->buffer + handle->offset;									/* start off the receive pointer at the right spot */
 	if (acn_read_n_bytes_with_timeout(handle, pcap_header.caplen) == -1) return 0;	/* then try to read in the rest of the data */
 
 	callback(user, &pcap_header, handle->bp);										/* call the user supplied callback function */
 	return 1;
 }
 
 static int pcap_activate_sita(pcap_t *handle) {
 	int		fd;
 
 	if (handle->opt.rfmon) {
 		/*
 		 * No monitor mode on SITA devices (they're not Wi-Fi
 		 * devices).
 		 */
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	/* Initialize some components of the pcap structure. */
 
 	handle->inject_op = pcap_inject_acn;
 	handle->setfilter_op = pcap_setfilter_acn;
 	handle->setdirection_op = pcap_setdirection_acn;
 	handle->set_datalink_op = NULL;	/* can't change data link type */
 	handle->getnonblock_op = pcap_getnonblock_fd;
 	handle->setnonblock_op = pcap_setnonblock_fd;
 	handle->cleanup_op = pcap_cleanup_acn;
 	handle->read_op = pcap_read_acn;
 	handle->stats_op = pcap_stats_acn;
 
 	fd = acn_open_live(handle->opt.device, handle->errbuf,
 	    &handle->linktype);
 	if (fd == -1)
 		return PCAP_ERROR;
+
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+		handle->snapshot = MAXIMUM_SNAPLEN;
+
 	handle->fd = fd;
 	handle->bufsize = handle->snapshot;
 
 	/* Allocate the buffer */
 
 	handle->buffer	 = malloc(handle->bufsize + handle->offset);
 	if (!handle->buffer) {
-	        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		pcap_cleanup_acn(handle);
 		return PCAP_ERROR;
 	}
 
 	/*
 	 * "handle->fd" is a socket, so "select()" and "poll()"
 	 * should work on it.
 	 */
 	handle->selectable_fd = handle->fd;
 
 	return 0;
 }
 
 pcap_t *pcap_create_interface(const char *device _U_, char *ebuf) {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, 0);
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_sita;
 	return (p);
 }
 
-int pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf) {
+int pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf) {
 
 	//printf("pcap_findalldevs()\n");				// fulko
 
 	*alldevsp = 0;												/* initialize the returned variables before we do anything */
 	strcpy(errbuf, "");
 	if (acn_parse_hosts_file(errbuf))							/* scan the hosts file for potential IOPs */
 		{
 		//printf("pcap_findalldevs() returning BAD after parsehosts\n");				// fulko
 		return -1;
 		}
 	//printf("pcap_findalldevs() got hostlist now finding devs\n");				// fulko
 	if (acn_findalldevs(errbuf))								/* then ask the IOPs for their monitorable devices */
 		{
 		//printf("pcap_findalldevs() returning BAD after findalldevs\n");				// fulko
 		return -1;
 		}
-	*alldevsp = acn_if_list;
+	devlistp->beginning = acn_if_list;
 	acn_if_list = 0;											/* then forget our list head, because someone will call pcap_freealldevs() to empty the malloc'ed stuff */
 	//printf("pcap_findalldevs() returning ZERO OK\n");				// fulko
 	return 0;
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return PCAP_VERSION_STRING " (SITA-only)";
 }
Index: vendor/libpcap/dist/pcap-snf.c
===================================================================
--- vendor/libpcap/dist/pcap-snf.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-snf.c	(revision 333789)
@@ -1,520 +1,621 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#ifndef _WIN32
 #include <sys/param.h>
+#endif /* !_WIN32 */
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include <ctype.h>
+#ifndef _WIN32
 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
+#endif /* !_WIN32 */
 
 #include <snf.h>
 #if SNF_VERSION_API >= 0x0003
 #define SNF_HAVE_INJECT_API
 #endif
 
 #include "pcap-int.h"
 #include "pcap-snf.h"
 
 /*
  * Private data for capturing on SNF devices.
  */
 struct pcap_snf {
 	snf_handle_t snf_handle; /* opaque device handle */
 	snf_ring_t   snf_ring;   /* opaque device ring handle */
 #ifdef SNF_HAVE_INJECT_API
-        snf_inject_t snf_inj;    /* inject handle, if inject is used */
+	snf_inject_t snf_inj;    /* inject handle, if inject is used */
 #endif
-        int          snf_timeout;
-        int          snf_boardnum;
+	int          snf_timeout;
+	int          snf_boardnum;
 };
 
 static int
 snf_set_datalink(pcap_t *p, int dlt)
 {
 	p->linktype = dlt;
 	return (0);
 }
 
 static int
 snf_pcap_stats(pcap_t *p, struct pcap_stat *ps)
 {
 	struct snf_ring_stats stats;
 	struct pcap_snf *snfps = p->priv;
 	int rc;
 
 	if ((rc = snf_ring_getstats(snfps->snf_ring, &stats))) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snf_get_stats: %s",
-			 pcap_strerror(rc));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    rc, "snf_get_stats");
 		return -1;
 	}
 	ps->ps_recv = stats.ring_pkt_recv + stats.ring_pkt_overflow;
 	ps->ps_drop = stats.ring_pkt_overflow;
 	ps->ps_ifdrop = stats.nic_pkt_overflow + stats.nic_pkt_bad;
 	return 0;
 }
 
 static void
 snf_platform_cleanup(pcap_t *p)
 {
 	struct pcap_snf *ps = p->priv;
 
 #ifdef SNF_HAVE_INJECT_API
-        if (ps->snf_inj)
-                snf_inject_close(ps->snf_inj);
+	if (ps->snf_inj)
+		snf_inject_close(ps->snf_inj);
 #endif
 	snf_ring_close(ps->snf_ring);
 	snf_close(ps->snf_handle);
 	pcap_cleanup_live_common(p);
 }
 
 static int
-snf_getnonblock(pcap_t *p, char *errbuf)
+snf_getnonblock(pcap_t *p)
 {
 	struct pcap_snf *ps = p->priv;
 
 	return (ps->snf_timeout == 0);
 }
 
 static int
-snf_setnonblock(pcap_t *p, int nonblock, char *errbuf)
+snf_setnonblock(pcap_t *p, int nonblock)
 {
 	struct pcap_snf *ps = p->priv;
 
 	if (nonblock)
 		ps->snf_timeout = 0;
 	else {
 		if (p->opt.timeout <= 0)
 			ps->snf_timeout = -1; /* forever */
 		else
 			ps->snf_timeout = p->opt.timeout;
 	}
 	return (0);
 }
 
 #define _NSEC_PER_SEC 1000000000
 
 static inline
 struct timeval
 snf_timestamp_to_timeval(const int64_t ts_nanosec, const int tstamp_precision)
 {
 	struct timeval tv;
 	long tv_nsec;
+        const static struct timeval zero_timeval;
 
-	if (ts_nanosec == 0)
-		return (struct timeval) { 0, 0 };
+        if (ts_nanosec == 0)
+                return zero_timeval;
 
 	tv.tv_sec = ts_nanosec / _NSEC_PER_SEC;
 	tv_nsec = (ts_nanosec % _NSEC_PER_SEC);
 
 	/* libpcap expects tv_usec to be nanos if using nanosecond precision. */
 	if (tstamp_precision == PCAP_TSTAMP_PRECISION_NANO)
 		tv.tv_usec = tv_nsec;
 	else
 		tv.tv_usec = tv_nsec / 1000;
 
 	return tv;
 }
 
 static int
 snf_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_snf *ps = p->priv;
 	struct pcap_pkthdr hdr;
 	int i, flags, err, caplen, n;
 	struct snf_recv_req req;
 	int nonblock, timeout;
 
 	if (!p)
 		return -1;
 
 	n = 0;
 	timeout = ps->snf_timeout;
 	while (n < cnt || PACKET_COUNT_IS_UNLIMITED(cnt)) {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 */
 		if (p->break_loop) {
 			if (n == 0) {
 				p->break_loop = 0;
 				return (-2);
 			} else {
 				return (n);
 			}
 		}
 
 		err = snf_ring_recv(ps->snf_ring, timeout, &req);
 
 		if (err) {
 			if (err == EBUSY || err == EAGAIN) {
 				return (n);
 			}
 			else if (err == EINTR) {
 				timeout = 0;
 				continue;
 			}
 			else {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snf_read: %s",
-				 	 pcap_strerror(err));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, err, "snf_read");
 				return -1;
 			}
 		}
 
 		caplen = req.length;
 		if (caplen > p->snapshot)
 			caplen = p->snapshot;
 
 		if ((p->fcode.bf_insns == NULL) ||
 		     bpf_filter(p->fcode.bf_insns, req.pkt_addr, req.length, caplen)) {
 			hdr.ts = snf_timestamp_to_timeval(req.timestamp, p->opt.tstamp_precision);
 			hdr.caplen = caplen;
 			hdr.len = req.length;
 			callback(user, &hdr, req.pkt_addr);
 		}
 		n++;
 
 		/* After one successful packet is received, we won't block
 		* again for that timeout. */
 		if (timeout != 0)
 			timeout = 0;
 	}
 	return (n);
 }
 
 static int
 snf_setfilter(pcap_t *p, struct bpf_program *fp)
 {
 	if (!p)
 		return -1;
 	if (!fp) {
 		strncpy(p->errbuf, "setfilter: No filter specified",
 			sizeof(p->errbuf));
 		return -1;
 	}
 
 	/* Make our private copy of the filter */
 
 	if (install_bpf_program(p, fp) < 0)
 		return -1;
 
 	return (0);
 }
 
 static int
 snf_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
 {
 #ifdef SNF_HAVE_INJECT_API
 	struct pcap_snf *ps = p->priv;
-        int rc;
-        if (ps->snf_inj == NULL) {
-                rc = snf_inject_open(ps->snf_boardnum, 0, &ps->snf_inj);
-                if (rc) {
-                        pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-                                "snf_inject_open: %s", pcap_strerror(rc));
-                        return (-1);
-                }
-        }
+	int rc;
+	if (ps->snf_inj == NULL) {
+		rc = snf_inject_open(ps->snf_boardnum, 0, &ps->snf_inj);
+		if (rc) {
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    rc, "snf_inject_open");
+			return (-1);
+		}
+	}
 
-        rc = snf_inject_send(ps->snf_inj, -1, 0, buf, size);
-        if (!rc) {
-                return (size);
-        }
-        else {
-                pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snf_inject_send: %s",
-                         pcap_strerror(rc));
-                return (-1);
-        }
+	rc = snf_inject_send(ps->snf_inj, -1, 0, buf, size);
+	if (!rc) {
+		return (size);
+	}
+	else {
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    rc, "snf_inject_send");
+		return (-1);
+	}
 #else
 	strlcpy(p->errbuf, "Sending packets isn't supported with this snf version",
 	    PCAP_ERRBUF_SIZE);
 	return (-1);
 #endif
 }
 
 static int
 snf_activate(pcap_t* p)
 {
 	struct pcap_snf *ps = p->priv;
 	char *device = p->opt.device;
 	const char *nr = NULL;
 	int err;
 	int flags = -1, ring_id = -1;
 
 	if (device == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			 "device is NULL: %s", pcap_strerror(errno));
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "device is NULL");
 		return -1;
 	}
 
 	/* In Libpcap, we set pshared by default if NUM_RINGS is set to > 1.
 	 * Since libpcap isn't thread-safe */
 	if ((nr = getenv("SNF_FLAGS")) && *nr)
 		flags = strtol(nr, NULL, 0);
 	else if ((nr = getenv("SNF_NUM_RINGS")) && *nr && atoi(nr) > 1)
 		flags = SNF_F_PSHARED;
 	else
 		nr = NULL;
 
+
+        /* Allow pcap_set_buffer_size() to set dataring_size.
+         * Default is zero which allows setting from env SNF_DATARING_SIZE.
+         * pcap_set_buffer_size() is in bytes while snf_open() accepts values
+         * between 0 and 1048576 in Megabytes. Values in this range are
+         * mapped to 1MB.
+         */
 	err = snf_open(ps->snf_boardnum,
 			0, /* let SNF API parse SNF_NUM_RINGS, if set */
 			NULL, /* default RSS, or use SNF_RSS_FLAGS env */
-			0, /* default to SNF_DATARING_SIZE from env */
+                        (p->opt.buffer_size > 0 && p->opt.buffer_size < 1048576) ? 1048576 : p->opt.buffer_size, /* default to SNF_DATARING_SIZE from env */
 			flags, /* may want pshared */
 			&ps->snf_handle);
 	if (err != 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			 "snf_open failed: %s", pcap_strerror(err));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    err, "snf_open failed");
 		return -1;
 	}
 
 	if ((nr = getenv("SNF_PCAP_RING_ID")) && *nr) {
 		ring_id = (int) strtol(nr, NULL, 0);
 	}
 	err = snf_ring_open_id(ps->snf_handle, ring_id, &ps->snf_ring);
 	if (err != 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			 "snf_ring_open_id(ring=%d) failed: %s",
-			 ring_id, pcap_strerror(err));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    err, "snf_ring_open_id(ring=%d) failed", ring_id);
 		return -1;
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 	if (p->opt.timeout <= 0)
 		ps->snf_timeout = -1;
 	else
 		ps->snf_timeout = p->opt.timeout;
 
 	err = snf_start(ps->snf_handle);
 	if (err != 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			 "snf_start failed: %s", pcap_strerror(err));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    err, "snf_start failed");
 		return -1;
 	}
 
 	/*
 	 * "select()" and "poll()" don't work on snf descriptors.
 	 */
+#ifndef _WIN32
 	p->selectable_fd = -1;
+#endif /* !_WIN32 */
 	p->linktype = DLT_EN10MB;
 	p->read_op = snf_read;
 	p->inject_op = snf_inject;
 	p->setfilter_op = snf_setfilter;
 	p->setdirection_op = NULL; /* Not implemented.*/
 	p->set_datalink_op = snf_set_datalink;
 	p->getnonblock_op = snf_getnonblock;
 	p->setnonblock_op = snf_setnonblock;
 	p->stats_op = snf_pcap_stats;
 	p->cleanup_op = snf_platform_cleanup;
 #ifdef SNF_HAVE_INJECT_API
-        ps->snf_inj = NULL;
+	ps->snf_inj = NULL;
 #endif
 	return 0;
 }
 
 #define MAX_DESC_LENGTH 128
 int
-snf_findalldevs(pcap_if_t **devlistp, char *errbuf)
+snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	pcap_if_t *devlist = NULL,*curdev,*prevdev;
-	pcap_addr_t *curaddr;
+	pcap_if_t *dev;
+#ifdef _WIN32
+	struct sockaddr_in addr;
+#endif
 	struct snf_ifaddrs *ifaddrs, *ifa;
+	char name[MAX_DESC_LENGTH];
 	char desc[MAX_DESC_LENGTH];
-	int ret;
+	int ret, allports = 0, merge = 0;
+	const char *nr = NULL;
 
-	if (snf_init(SNF_VERSION_API))
+	if (snf_init(SNF_VERSION_API)) {
+		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "snf_getifaddrs: snf_init failed");
 		return (-1);
+	}
 
 	if (snf_getifaddrs(&ifaddrs) || ifaddrs == NULL)
 	{
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			"snf_getifaddrs: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "snf_getifaddrs");
 		return (-1);
 	}
-	ifa = ifaddrs;
-	while (ifa)
-	{
-		/*
-		 * Allocate a new entry
-		 */
-		curdev = (pcap_if_t *)malloc(sizeof(pcap_if_t));
-		if (curdev == NULL) {
-		(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			"snf_findalldevs malloc: %s", pcap_strerror(errno));
+	if ((nr = getenv("SNF_FLAGS")) && *nr) {
+		errno = 0;
+		merge = strtol(nr, NULL, 0);
+		if (errno) {
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				"snf_getifaddrs: SNF_FLAGS is not a valid number");
 			return (-1);
 		}
-		if (devlist == NULL) /* save first entry */
-			devlist = curdev;
-		else
-			prevdev->next = curdev;
+		merge = merge & SNF_F_AGGREGATE_PORTMASK;
+	}
+
+	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->snf_ifa_next) {
 		/*
-		 * Fill in the entry.
+		 * Myricom SNF adapter ports may appear as regular
+		 * network interfaces, which would already have been
+		 * added to the list of adapters by pcap_platform_finddevs()
+		 * if this isn't an SNF-only version of libpcap.
+		 *
+		 * Our create routine intercepts pcap_create() calls for
+		 * those interfaces and arranges that they will be
+		 * opened using the SNF API instead.
+		 *
+		 * So if we already have an entry for the device, we
+		 * don't add an additional entry for it, we just
+		 * update the description for it, if any, to indicate
+		 * which snfN device it is.  Otherwise, we add an entry
+		 * for it.
+		 *
+		 * In either case, if SNF_F_AGGREGATE_PORTMASK is set
+		 * in SNF_FLAGS, we add this port to the bitmask
+		 * of ports, which we use to generate a device
+		 * we can use to capture on all ports.
+		 *
+		 * Generate the description string.  If port aggregation
+		 * is set, use 2^{port number} as the unit number,
+		 * rather than {port number}.
+		 *
+		 * XXX - do entries in this list have IP addresses for
+		 * the port?  If so, should we add them to the
+		 * entry for the device, if they're not already in the
+		 * list of IP addresses for the device?
+ 		 */
+		(void)pcap_snprintf(desc,MAX_DESC_LENGTH,"Myricom %ssnf%d",
+			merge ? "Merge Bitmask Port " : "",
+			merge ? 1 << ifa->snf_ifa_portnum : ifa->snf_ifa_portnum);
+		/*
+		 * Add the port to the bitmask.
 		 */
-		curdev->next = NULL;
-		curdev->name = strdup(ifa->snf_ifa_name);
-		if (curdev->name == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "snf_findalldevs strdup: %s", pcap_strerror(errno));
-			free(curdev);
-			return (-1);
-		}
-		(void)pcap_snprintf(desc,MAX_DESC_LENGTH,"Myricom snf%d",
-				ifa->snf_ifa_portnum);
-		curdev->description = strdup(desc);
-		if (curdev->description == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			"snf_findalldevs strdup1: %s", pcap_strerror(errno));
-			free(curdev->name);
-			free(curdev);
-			return (-1);
-		}
-		curdev->addresses = NULL;
-		curdev->flags = 0;
+		if (merge)
+			allports |= 1 << ifa->snf_ifa_portnum;
+		/*
+		 * See if there's already an entry for the device
+		 * with the name ifa->snf_ifa_name.
+		 */
+		dev = find_dev(devlistp, ifa->snf_ifa_name);
+		if (dev != NULL) {
+			/*
+			 * Yes.  Update its description.
+			 */
+			char *desc_str;
 
-		curaddr = (pcap_addr_t *)malloc(sizeof(pcap_addr_t));
-		if (curaddr == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			     "snf_findalldevs malloc1: %s", pcap_strerror(errno));
-			free(curdev->description);
-			free(curdev->name);
-			free(curdev);
-			return (-1);
+			desc_str = strdup(desc);
+			if (desc_str == NULL) {
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "snf_findalldevs strdup");
+				return -1;
+			}
+			free(dev->description);
+			dev->description = desc_str;
+		} else {
+			/*
+			 * No.  Add an entry for it.
+			 *
+			 * XXX - is there a notion of "up" or "running",
+			 * and can we determine whether something's
+			 * plugged into the adapter and set
+			 * PCAP_IF_CONNECTION_STATUS_CONNECTED or
+			 * PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
+			 */
+			dev = add_dev(devlistp, ifa->snf_ifa_name, 0, desc,
+			    errbuf);
+			if (dev == NULL)
+				return -1;
+#ifdef _WIN32
+			/*
+			 * On Windows, fill in IP# from device name
+			 */
+                        ret = inet_pton(AF_INET, dev->name, &addr.sin_addr);
+                        if (ret == 1) {
+                        	/*
+                        	 * Successful conversion of device name
+                        	 * to IPv4 address.
+                        	 */
+	                        addr.sin_family = AF_INET;
+        	                if (add_addr_to_dev(dev, &addr, sizeof(addr),
+                	            NULL, 0, NULL, 0, NULL, 0, errbuf) == -1)
+                        		return -1;
+                        } else if (ret == -1) {
+				/*
+				 * Error.
+				 */
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "sinf_findalldevs inet_pton");
+                                return -1;
+                        }
+#endif _WIN32
 		}
-		curdev->addresses = curaddr;
-		curaddr->next = NULL;
-		curaddr->addr = (struct sockaddr*)malloc(sizeof(struct sockaddr_storage));
-		if (curaddr->addr == NULL) {
-			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "malloc2: %s", pcap_strerror(errno));
-			free(curdev->description);
-			free(curdev->name);
-			free(curaddr);
-			free(curdev);
-			return (-1);
-		}
-		curaddr->addr->sa_family = AF_INET;
-		curaddr->netmask = NULL;
-		curaddr->broadaddr = NULL;
-		curaddr->dstaddr = NULL;
-		curaddr->next = NULL;
-
-		prevdev = curdev;
-		ifa = ifa->snf_ifa_next;
 	}
 	snf_freeifaddrs(ifaddrs);
-	*devlistp = devlist;
-
 	/*
-	 * There are no platform-specific devices since each device
-	 * exists as a regular Ethernet device.
-	 */
+	 * Create a snfX entry if port aggregation is enabled
+       	 */
+	if (merge) {
+		/*
+		 * Add a new entry with all ports bitmask
+		 */
+		(void)pcap_snprintf(name,MAX_DESC_LENGTH,"snf%d",allports);
+		(void)pcap_snprintf(desc,MAX_DESC_LENGTH,"Myricom Merge Bitmask All Ports snf%d",
+			allports);
+		/*
+		 * XXX - is there any notion of "up" and "running" that
+		 * would apply to this device, given that it handles
+		 * multiple ports?
+		 *
+		 * Presumably, there's no notion of "connected" vs.
+		 * "disconnected", as "is this plugged into a network?"
+		 * would be a per-port property.
+		 */
+		if (add_dev(devlistp, name,
+		    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, desc,
+		    errbuf) == NULL)
+			return (-1);
+		/*
+		 * XXX - should we give it a list of addresses with all
+		 * the addresses for all the ports?
+		 */
+	}
+
 	return 0;
 }
 
 pcap_t *
 snf_create(const char *device, char *ebuf, int *is_ours)
 {
 	pcap_t *p;
 	int boardnum = -1;
 	struct snf_ifaddrs *ifaddrs, *ifa;
 	size_t devlen;
 	struct pcap_snf *ps;
 
 	if (snf_init(SNF_VERSION_API)) {
 		/* Can't initialize the API, so no SNF devices */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/*
 	 * Match a given interface name to our list of interface names, from
 	 * which we can obtain the intended board number
 	 */
 	if (snf_getifaddrs(&ifaddrs) || ifaddrs == NULL) {
 		/* Can't get SNF addresses */
 		*is_ours = 0;
 		return NULL;
 	}
 	devlen = strlen(device) + 1;
 	ifa = ifaddrs;
 	while (ifa) {
-		if (!strncmp(device, ifa->snf_ifa_name, devlen)) {
+		if (strncmp(device, ifa->snf_ifa_name, devlen) == 0) {
 			boardnum = ifa->snf_ifa_boardnum;
 			break;
 		}
 		ifa = ifa->snf_ifa_next;
 	}
 	snf_freeifaddrs(ifaddrs);
 
 	if (ifa == NULL) {
 		/*
 		 * If we can't find the device by name, support the name "snfX"
 		 * and "snf10gX" where X is the board number.
 		 */
 		if (sscanf(device, "snf10g%d", &boardnum) != 1 &&
 		    sscanf(device, "snf%d", &boardnum) != 1) {
 			/* Nope, not a supported name */
 			*is_ours = 0;
 			return NULL;
-		    }
+		}
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_snf));
 	if (p == NULL)
 		return NULL;
 	ps = p->priv;
 
 	/*
 	 * We support microsecond and nanosecond time stamps.
 	 */
 	p->tstamp_precision_count = 2;
 	p->tstamp_precision_list = malloc(2 * sizeof(u_int));
 	if (p->tstamp_precision_list == NULL) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE, errno,
+		    "malloc");
 		pcap_close(p);
 		return NULL;
 	}
 	p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
 	p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
 
 	p->activate_op = snf_activate;
 	ps->snf_boardnum = boardnum;
 	return p;
 }
 
 #ifdef SNF_ONLY
 /*
  * This libpcap build supports only SNF cards, not regular network
  * interfaces..
  */
 
 /*
- * There are no regular interfaces, just DAG interfaces.
+ * There are no regular interfaces, just SNF interfaces.
  */
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	*alldevsp = NULL;
 	return (0);
 }
 
 /*
  * Attempts to open a regular interface fail.
  */
 pcap_t *
 pcap_create_interface(const char *device, char *errbuf)
 {
 	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 	    "This version of libpcap only supports SNF cards");
 	return NULL;
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING " (SNF-only)");
 }
 #endif
Index: vendor/libpcap/dist/pcap-snf.h
===================================================================
--- vendor/libpcap/dist/pcap-snf.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-snf.h	(revision 333789)
@@ -1,2 +1,2 @@
 pcap_t *snf_create(const char *, char *, int *);
-int snf_findalldevs(pcap_if_t **devlistp, char *errbuf);
+int snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf);
Index: vendor/libpcap/dist/pcap-snit.c
===================================================================
--- vendor/libpcap/dist/pcap-snit.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-snit.c	(revision 333789)
@@ -1,460 +1,506 @@
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * Modifications made to accommodate the new SunOS4.0 NIT facility by
  * Micky Liu, micky@cunixc.cc.columbia.edu, Columbia University in May, 1989.
  * This module now handles the STREAMS based NIT.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/dir.h>
 #include <sys/fcntlcom.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stropts.h>
 
 #include <net/if.h>
 #include <net/nit.h>
 #include <net/nit_if.h>
 #include <net/nit_pf.h>
 #include <net/nit_buf.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * The chunk size for NIT.  This is the amount of buffering
  * done for read calls.
  */
 #define CHUNKSIZE (2*1024)
 
 /*
  * The total buffer space used by NIT.
  */
 #define BUFSPACE (4*CHUNKSIZE)
 
 /* Forwards */
 static int nit_setflags(int, int, int, char *);
 
 /*
  * Private data for capturing on STREAMS NIT devices.
  */
 struct pcap_snit {
 	struct pcap_stat stat;
 };
 
 static int
 pcap_stats_snit(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_snit *psn = p->priv;
 
 	/*
 	 * "ps_recv" counts packets handed to the filter, not packets
 	 * that passed the filter.  As filtering is done in userland,
 	 * this does not include packets dropped because we ran out
 	 * of buffer space.
 	 *
 	 * "ps_drop" counts packets dropped inside the "/dev/nit"
 	 * device because of flow control requirements or resource
 	 * exhaustion; it doesn't count packets dropped by the
 	 * interface driver, or packets dropped upstream.  As filtering
 	 * is done in userland, it counts packets regardless of whether
 	 * they would've passed the filter.
 	 *
 	 * These statistics don't include packets not yet read from the
 	 * kernel by libpcap or packets not yet read from libpcap by the
 	 * application.
 	 */
 	*ps = psn->stat;
 	return (0);
 }
 
 static int
 pcap_read_snit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_snit *psn = p->priv;
 	register int cc, n;
 	register u_char *bp, *cp, *ep;
 	register struct nit_bufhdr *hdrp;
 	register struct nit_iftime *ntp;
 	register struct nit_iflen *nlp;
 	register struct nit_ifdrops *ndp;
 	register int caplen;
 
 	cc = p->cc;
 	if (cc == 0) {
 		cc = read(p->fd, (char *)p->buffer, p->bufsize);
 		if (cc < 0) {
 			if (errno == EWOULDBLOCK)
 				return (0);
-			pcap_snprintf(p->errbuf, sizeof(p->errbuf), "pcap_read: %s",
-				pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+			    errno, "pcap_read");
 			return (-1);
 		}
 		bp = (u_char *)p->buffer;
 	} else
 		bp = p->bp;
 
 	/*
 	 * loop through each snapshot in the chunk
 	 */
 	n = 0;
 	ep = bp + cc;
 	while (bp < ep) {
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (p->break_loop) {
 			if (n == 0) {
 				p->break_loop = 0;
 				return (-2);
 			} else {
 				p->bp = bp;
 				p->cc = ep - bp;
 				return (n);
 			}
 		}
 
 		++psn->stat.ps_recv;
 		cp = bp;
 
 		/* get past NIT buffer  */
 		hdrp = (struct nit_bufhdr *)cp;
 		cp += sizeof(*hdrp);
 
 		/* get past NIT timer   */
 		ntp = (struct nit_iftime *)cp;
 		cp += sizeof(*ntp);
 
 		ndp = (struct nit_ifdrops *)cp;
 		psn->stat.ps_drop = ndp->nh_drops;
 		cp += sizeof *ndp;
 
 		/* get past packet len  */
 		nlp = (struct nit_iflen *)cp;
 		cp += sizeof(*nlp);
 
 		/* next snapshot        */
 		bp += hdrp->nhb_totlen;
 
 		caplen = nlp->nh_pktlen;
 		if (caplen > p->snapshot)
 			caplen = p->snapshot;
 
 		if (bpf_filter(p->fcode.bf_insns, cp, nlp->nh_pktlen, caplen)) {
 			struct pcap_pkthdr h;
 			h.ts = ntp->nh_timestamp;
 			h.len = nlp->nh_pktlen;
 			h.caplen = caplen;
 			(*callback)(user, &h, cp);
 			if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
 				p->cc = ep - bp;
 				p->bp = bp;
 				return (n);
 			}
 		}
 	}
 	p->cc = 0;
 	return (n);
 }
 
 static int
 pcap_inject_snit(pcap_t *p, const void *buf, size_t size)
 {
 	struct strbuf ctl, data;
 
 	/*
 	 * XXX - can we just do
 	 *
 	ret = write(pd->f, buf, size);
 	 */
 	ctl.len = sizeof(*sa);	/* XXX - what was this? */
 	ctl.buf = (char *)sa;
 	data.buf = buf;
 	data.len = size;
 	ret = putmsg(p->fd, &ctl, &data);
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	return (ret);
 }
 
 static int
 nit_setflags(pcap_t *p)
 {
 	bpf_u_int32 flags;
 	struct strioctl si;
 	u_int zero = 0;
 	struct timeval timeout;
 
 	if (p->opt.immediate) {
 		/*
 		 * Set the chunk size to zero, so that chunks get sent
 		 * up immediately.
 		 */
 		si.ic_cmd = NIOCSCHUNK;
 		si.ic_len = sizeof(zero);
 		si.ic_dp = (char *)&zero;
 		if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCSCHUNK: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "NIOCSCHUNK");
 			return (-1);
 		}
 	}
 	si.ic_timout = INFTIM;
 	if (p->opt.timeout != 0) {
 		timeout.tv_sec = p->opt.timeout / 1000;
 		timeout.tv_usec = (p->opt.timeout * 1000) % 1000000;
 		si.ic_cmd = NIOCSTIME;
 		si.ic_len = sizeof(timeout);
 		si.ic_dp = (char *)&timeout;
 		if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCSTIME: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "NIOCSTIME");
 			return (-1);
 		}
 	}
 	flags = NI_TIMESTAMP | NI_LEN | NI_DROPS;
 	if (p->opt.promisc)
 		flags |= NI_PROMISC;
 	si.ic_cmd = NIOCSFLAGS;
 	si.ic_len = sizeof(flags);
 	si.ic_dp = (char *)&flags;
 	if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCSFLAGS: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "NIOCSFLAGS");
 		return (-1);
 	}
 	return (0);
 }
 
 static int
 pcap_activate_snit(pcap_t *p)
 {
 	struct strioctl si;		/* struct for ioctl() */
 	struct ifreq ifr;		/* interface request struct */
 	int chunksize = CHUNKSIZE;
 	int fd;
 	static const char dev[] = "/dev/nit";
+	int err;
 
 	if (p->opt.rfmon) {
 		/*
 		 * No monitor mode on SunOS 4.x (no Wi-Fi devices on
 		 * hardware supported by SunOS 4.x).
 		 */
 		return (PCAP_ERROR_RFMON_NOTSUP);
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 	if (p->snapshot < 96)
 		/*
 		 * NIT requires a snapshot length of at least 96.
 		 */
 		p->snapshot = 96;
 
 	/*
 	 * Initially try a read/write open (to allow the inject
 	 * method to work).  If that fails due to permission
 	 * issues, fall back to read-only.  This allows a
 	 * non-root user to be granted specific access to pcap
 	 * capabilities via file permissions.
 	 *
 	 * XXX - we should have an API that has a flag that
 	 * controls whether to open read-only or read-write,
 	 * so that denial of permission to send (or inability
 	 * to send, if sending packets isn't supported on
 	 * the device in question) can be indicated at open
 	 * time.
 	 */
 	p->fd = fd = open(dev, O_RDWR);
 	if (fd < 0 && errno == EACCES)
 		p->fd = fd = open(dev, O_RDONLY);
 	if (fd < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev,
-		    pcap_strerror(errno));
+		if (errno == EACCES)
+			err = PCAP_ERROR_PERM_DENIED;
+		else
+			err = PCAP_ERROR;
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s", dev);
 		goto bad;
 	}
 
 	/* arrange to get discrete messages from the STREAM and use NIT_BUF */
 	if (ioctl(fd, I_SRDOPT, (char *)RMSGD) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "I_SRDOPT: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "I_SRDOPT");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	if (ioctl(fd, I_PUSH, "nbuf") < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "push nbuf: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "push nbuf");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 	/* set the chunksize */
 	si.ic_cmd = NIOCSCHUNK;
 	si.ic_timout = INFTIM;
 	si.ic_len = sizeof(chunksize);
 	si.ic_dp = (char *)&chunksize;
 	if (ioctl(fd, I_STR, (char *)&si) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCSCHUNK: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "NIOCSCHUNK");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 
 	/* request the interface */
 	strncpy(ifr.ifr_name, p->opt.device, sizeof(ifr.ifr_name));
 	ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 	si.ic_cmd = NIOCBIND;
 	si.ic_len = sizeof(ifr);
 	si.ic_dp = (char *)&ifr;
 	if (ioctl(fd, I_STR, (char *)&si) < 0) {
 		/*
 		 * XXX - is there an error that means "no such device"?
 		 * Is there one that means "that device doesn't support
 		 * STREAMS NIT"?
 		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCBIND: %s: %s",
-			ifr.ifr_name, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "NIOCBIND: %s", ifr.ifr_name);
+		err = PCAP_ERROR;
 		goto bad;
 	}
 
 	/* set the snapshot length */
 	si.ic_cmd = NIOCSSNAP;
 	si.ic_len = sizeof(p->snapshot);
 	si.ic_dp = (char *)&p->snapshot;
 	if (ioctl(fd, I_STR, (char *)&si) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "NIOCSSNAP: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "NIOCSSNAP");
+		err = PCAP_ERROR;
 		goto bad;
 	}
-	if (nit_setflags(p) < 0)
+	if (nit_setflags(p) < 0) {
+		err = PCAP_ERROR;
 		goto bad;
+	}
 
 	(void)ioctl(fd, I_FLUSH, (char *)FLUSHR);
 	/*
 	 * NIT supports only ethernets.
 	 */
 	p->linktype = DLT_EN10MB;
 
 	p->bufsize = BUFSPACE;
 	p->buffer = malloc(p->bufsize);
 	if (p->buffer == NULL) {
-		strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		err = PCAP_ERROR;
 		goto bad;
 	}
 
 	/*
 	 * "p->fd" is an FD for a STREAMS device, so "select()" and
 	 * "poll()" should work on it.
 	 */
 	p->selectable_fd = p->fd;
 
 	/*
 	 * This is (presumably) a real Ethernet capture; give it a
 	 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 	 * that an application can let you choose it, in case you're
 	 * capturing DOCSIS traffic that a Cisco Cable Modem
 	 * Termination System is putting out onto an Ethernet (it
 	 * doesn't put an Ethernet header onto the wire, it puts raw
 	 * DOCSIS frames out on the wire inside the low-level
 	 * Ethernet framing).
 	 */
 	p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 	/*
 	 * If that fails, just leave the list empty.
 	 */
 	if (p->dlt_list != NULL) {
 		p->dlt_list[0] = DLT_EN10MB;
 		p->dlt_list[1] = DLT_DOCSIS;
 		p->dlt_count = 2;
 	}
 
 	p->read_op = pcap_read_snit;
 	p->inject_op = pcap_inject_snit;
 	p->setfilter_op = install_bpf_program;	/* no kernel filtering */
 	p->setdirection_op = NULL;	/* Not implemented. */
 	p->set_datalink_op = NULL;	/* can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_snit;
 
 	return (0);
  bad:
 	pcap_cleanup_live_common(p);
-	return (PCAP_ERROR);
+	return (err);
 }
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_snit));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_snit;
 	return (p);
 }
 
 /*
  * XXX - there's probably a NIOCBIND error that means "that device
  * doesn't support NIT"; if so, we should try an NIOCBIND and use that.
  */
 static int
 can_be_bound(const char *name _U_)
 {
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do.
+	 * XXX - is there a way to find out whether an adapter has
+	 * something plugged into it?
+	 */
+	return (0);
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	return (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound));
+	return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+	    get_if_flags));
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-snoop.c
===================================================================
--- vendor/libpcap/dist/pcap-snoop.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-snoop.c	(revision 333789)
@@ -1,435 +1,467 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
 #include <net/raw.h>
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 /*
  * Private data for capturing on snoop devices.
  */
 struct pcap_snoop {
 	struct pcap_stat stat;
 };
 
 static int
 pcap_read_snoop(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_snoop *psn = p->priv;
 	int cc;
 	register struct snoopheader *sh;
 	register u_int datalen;
 	register u_int caplen;
 	register u_char *cp;
 
 again:
 	/*
 	 * Has "pcap_breakloop()" been called?
 	 */
 	if (p->break_loop) {
 		/*
 		 * Yes - clear the flag that indicates that it
 		 * has, and return -2 to indicate that we were
 		 * told to break out of the loop.
 		 */
 		p->break_loop = 0;
 		return (-2);
 	}
 	cc = read(p->fd, (char *)p->buffer, p->bufsize);
 	if (cc < 0) {
 		/* Don't choke when we get ptraced */
 		switch (errno) {
 
 		case EINTR:
 			goto again;
 
 		case EWOULDBLOCK:
 			return (0);			/* XXX */
 		}
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-		    "read: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "read");
 		return (-1);
 	}
 	sh = (struct snoopheader *)p->buffer;
 	datalen = sh->snoop_packetlen;
 
 	/*
 	 * XXX - Sigh, snoop_packetlen is a 16 bit quantity.  If we
 	 * got a short length, but read a full sized snoop pakcet,
 	 * assume we overflowed and add back the 64K...
 	 */
 	if (cc == (p->snapshot + sizeof(struct snoopheader)) &&
 	    (datalen < p->snapshot))
 		datalen += (64 * 1024);
 
 	caplen = (datalen < p->snapshot) ? datalen : p->snapshot;
 	cp = (u_char *)(sh + 1) + p->offset;		/* XXX */
 
 	/*
 	 * XXX unfortunately snoop loopback isn't exactly like
 	 * BSD's.  The address family is encoded in the first 2
 	 * bytes rather than the first 4 bytes!  Luckily the last
 	 * two snoop loopback bytes are zeroed.
 	 */
 	if (p->linktype == DLT_NULL && *((short *)(cp + 2)) == 0) {
 		u_int *uip = (u_int *)cp;
 		*uip >>= 16;
 	}
 
 	if (p->fcode.bf_insns == NULL ||
 	    bpf_filter(p->fcode.bf_insns, cp, datalen, caplen)) {
 		struct pcap_pkthdr h;
 		++psn->stat.ps_recv;
 		h.ts.tv_sec = sh->snoop_timestamp.tv_sec;
 		h.ts.tv_usec = sh->snoop_timestamp.tv_usec;
 		h.len = datalen;
 		h.caplen = caplen;
 		(*callback)(user, &h, cp);
 		return (1);
 	}
 	return (0);
 }
 
 static int
 pcap_inject_snoop(pcap_t *p, const void *buf, size_t size)
 {
 	int ret;
 
 	/*
 	 * XXX - libnet overwrites the source address with what I
 	 * presume is the interface's address; is that required?
 	 */
 	ret = write(p->fd, buf, size);
 	if (ret == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "send");
 		return (-1);
 	}
 	return (ret);
 }
 
 static int
 pcap_stats_snoop(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_snoop *psn = p->priv;
 	register struct rawstats *rs;
 	struct rawstats rawstats;
 
 	rs = &rawstats;
 	memset(rs, 0, sizeof(*rs));
 	if (ioctl(p->fd, SIOCRAWSTATS, (char *)rs) < 0) {
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-		    "SIOCRAWSTATS: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+		    errno, "SIOCRAWSTATS");
 		return (-1);
 	}
 
 	/*
 	 * "ifdrops" are those dropped by the network interface
 	 * due to resource shortages or hardware errors.
 	 *
 	 * "sbdrops" are those dropped due to socket buffer limits.
 	 *
 	 * As filter is done in userland, "sbdrops" counts packets
 	 * regardless of whether they would've passed the filter.
 	 *
 	 * XXX - does this count *all* Snoop or Drain sockets,
 	 * rather than just this socket?  If not, why does it have
 	 * both Snoop and Drain statistics?
 	 */
 	psn->stat.ps_drop =
 	    rs->rs_snoop.ss_ifdrops + rs->rs_snoop.ss_sbdrops +
 	    rs->rs_drain.ds_ifdrops + rs->rs_drain.ds_sbdrops;
 
 	/*
 	 * "ps_recv" counts only packets that passed the filter.
 	 * As filtering is done in userland, this does not include
 	 * packets dropped because we ran out of buffer space.
 	 */
 	*ps = psn->stat;
 	return (0);
 }
 
 /* XXX can't disable promiscuous */
 static int
 pcap_activate_snoop(pcap_t *p)
 {
 	int fd;
 	struct sockaddr_raw sr;
 	struct snoopfilter sf;
 	u_int v;
 	int ll_hdrlen;
 	int snooplen;
 	struct ifreq ifr;
 
 	fd = socket(PF_RAW, SOCK_RAW, RAWPROTO_SNOOP);
 	if (fd < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "snoop socket");
 		goto bad;
 	}
 	p->fd = fd;
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_family = AF_RAW;
 	(void)strncpy(sr.sr_ifname, p->opt.device, sizeof(sr.sr_ifname));
 	if (bind(fd, (struct sockaddr *)&sr, sizeof(sr))) {
 		/*
 		 * XXX - there's probably a particular bind error that
 		 * means "there's no such device" and a particular bind
 		 * error that means "that device doesn't support snoop";
 		 * they might be the same error, if they both end up
 		 * meaning "snoop doesn't know about that device".
 		 */
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop bind: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "snoop bind");
 		goto bad;
 	}
 	memset(&sf, 0, sizeof(sf));
 	if (ioctl(fd, SIOCADDSNOOP, &sf) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCADDSNOOP: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCADDSNOOP");
 		goto bad;
 	}
 	if (p->opt.buffer_size != 0)
 		v = p->opt.buffer_size;
 	else
 		v = 64 * 1024;	/* default to 64K buffer size */
 	(void)setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char *)&v, sizeof(v));
 	/*
 	 * XXX hack - map device name to link layer type
 	 */
 	if (strncmp("et", p->opt.device, 2) == 0 ||	/* Challenge 10 Mbit */
 	    strncmp("ec", p->opt.device, 2) == 0 ||	/* Indigo/Indy 10 Mbit,
 							   O2 10/100 */
 	    strncmp("ef", p->opt.device, 2) == 0 ||	/* O200/2000 10/100 Mbit */
 	    strncmp("eg", p->opt.device, 2) == 0 ||	/* Octane/O2xxx/O3xxx Gigabit */
 	    strncmp("gfe", p->opt.device, 3) == 0 ||	/* GIO 100 Mbit */
 	    strncmp("fxp", p->opt.device, 3) == 0 ||	/* Challenge VME Enet */
 	    strncmp("ep", p->opt.device, 2) == 0 ||	/* Challenge 8x10 Mbit EPLEX */
 	    strncmp("vfe", p->opt.device, 3) == 0 ||	/* Challenge VME 100Mbit */
 	    strncmp("fa", p->opt.device, 2) == 0 ||
 	    strncmp("qaa", p->opt.device, 3) == 0 ||
 	    strncmp("cip", p->opt.device, 3) == 0 ||
 	    strncmp("el", p->opt.device, 2) == 0) {
 		p->linktype = DLT_EN10MB;
 		p->offset = RAW_HDRPAD(sizeof(struct ether_header));
 		ll_hdrlen = sizeof(struct ether_header);
 		/*
 		 * This is (presumably) a real Ethernet capture; give it a
 		 * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
 		 * that an application can let you choose it, in case you're
 		 * capturing DOCSIS traffic that a Cisco Cable Modem
 		 * Termination System is putting out onto an Ethernet (it
 		 * doesn't put an Ethernet header onto the wire, it puts raw
 		 * DOCSIS frames out on the wire inside the low-level
 		 * Ethernet framing).
 		 *
 		 * XXX - are there any sorts of "fake Ethernet" that have
 		 * Ethernet link-layer headers but that *shouldn't offer
 		 * DLT_DOCSIS as a Cisco CMTS won't put traffic onto it
 		 * or get traffic bridged onto it?  "el" is for ATM LANE
 		 * Ethernet devices, so that might be the case for them;
 		 * the same applies for "qaa" classical IP devices.  If
 		 * "fa" devices are for FORE SPANS, that'd apply to them
 		 * as well; what are "cip" devices - some other ATM
 		 * Classical IP devices?
 		 */
 		p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 		/*
 		 * If that fails, just leave the list empty.
 		 */
 		if (p->dlt_list != NULL) {
 			p->dlt_list[0] = DLT_EN10MB;
 			p->dlt_list[1] = DLT_DOCSIS;
 			p->dlt_count = 2;
 		}
 	} else if (strncmp("ipg", p->opt.device, 3) == 0 ||
 		   strncmp("rns", p->opt.device, 3) == 0 ||	/* O2/200/2000 FDDI */
 		   strncmp("xpi", p->opt.device, 3) == 0) {
 		p->linktype = DLT_FDDI;
 		p->offset = 3;				/* XXX yeah? */
 		ll_hdrlen = 13;
 	} else if (strncmp("ppp", p->opt.device, 3) == 0) {
 		p->linktype = DLT_RAW;
 		ll_hdrlen = 0;	/* DLT_RAW meaning "no PPP header, just the IP packet"? */
 	} else if (strncmp("qfa", p->opt.device, 3) == 0) {
 		p->linktype = DLT_IP_OVER_FC;
 		ll_hdrlen = 24;
 	} else if (strncmp("pl", p->opt.device, 2) == 0) {
 		p->linktype = DLT_RAW;
 		ll_hdrlen = 0;	/* Cray UNICOS/mp pseudo link */
 	} else if (strncmp("lo", p->opt.device, 2) == 0) {
 		p->linktype = DLT_NULL;
 		ll_hdrlen = 4;
 	} else {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "snoop: unknown physical layer type");
 		goto bad;
 	}
 
 	if (p->opt.rfmon) {
 		/*
 		 * No monitor mode on Irix (no Wi-Fi devices on
 		 * hardware supported by Irix).
 		 */
 		return (PCAP_ERROR_RFMON_NOTSUP);
 	}
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
 #ifdef SIOCGIFMTU
 	/*
 	 * XXX - IRIX appears to give you an error if you try to set the
 	 * capture length to be greater than the MTU, so let's try to get
 	 * the MTU first and, if that succeeds, trim the snap length
 	 * to be no greater than the MTU.
 	 */
 	(void)strncpy(ifr.ifr_name, p->opt.device, sizeof(ifr.ifr_name));
 	if (ioctl(fd, SIOCGIFMTU, (char *)&ifr) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCGIFMTU: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFMTU");
 		goto bad;
 	}
 	/*
 	 * OK, we got it.
 	 *
 	 * XXX - some versions of IRIX 6.5 define "ifr_mtu" and have an
 	 * "ifru_metric" member of the "ifr_ifru" union in an "ifreq"
 	 * structure, others don't.
 	 *
 	 * I've no idea what's going on, so, if "ifr_mtu" isn't defined,
 	 * we define it as "ifr_metric", as using that field appears to
 	 * work on the versions that lack "ifr_mtu" (and, on those that
 	 * don't lack it, "ifru_metric" and "ifru_mtu" are both "int"
 	 * members of the "ifr_ifru" union, which suggests that they
 	 * may be interchangeable in this case).
 	 */
 #ifndef ifr_mtu
 #define ifr_mtu	ifr_metric
 #endif
 	if (p->snapshot > ifr.ifr_mtu + ll_hdrlen)
 		p->snapshot = ifr.ifr_mtu + ll_hdrlen;
 #endif
 
 	/*
 	 * The argument to SIOCSNOOPLEN is the number of link-layer
 	 * payload bytes to capture - it doesn't count link-layer
 	 * header bytes.
 	 */
 	snooplen = p->snapshot - ll_hdrlen;
 	if (snooplen < 0)
 		snooplen = 0;
 	if (ioctl(fd, SIOCSNOOPLEN, &snooplen) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCSNOOPLEN: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCSNOOPLEN");
 		goto bad;
 	}
 	v = 1;
 	if (ioctl(fd, SIOCSNOOPING, &v) < 0) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCSNOOPING: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCSNOOPING");
 		goto bad;
 	}
 
 	p->bufsize = 4096;				/* XXX */
 	p->buffer = malloc(p->bufsize);
 	if (p->buffer == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		goto bad;
 	}
 
 	/*
 	 * "p->fd" is a socket, so "select()" should work on it.
 	 */
 	p->selectable_fd = p->fd;
 
 	p->read_op = pcap_read_snoop;
 	p->inject_op = pcap_inject_snoop;
 	p->setfilter_op = install_bpf_program;	/* no kernel filtering */
 	p->setdirection_op = NULL;	/* Not implemented. */
 	p->set_datalink_op = NULL;	/* can't change data link type */
 	p->getnonblock_op = pcap_getnonblock_fd;
 	p->setnonblock_op = pcap_setnonblock_fd;
 	p->stats_op = pcap_stats_snoop;
 
 	return (0);
  bad:
 	pcap_cleanup_live_common(p);
 	return (PCAP_ERROR);
 }
 
 pcap_t *
 pcap_create_interface(const char *device _U_, char *ebuf)
 {
 	pcap_t *p;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_snoop));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = pcap_activate_snoop;
 	return (p);
 }
 
 /*
  * XXX - there's probably a particular bind error that means "that device
  * doesn't support snoop"; if so, we should try a bind and use that.
  */
 static int
 can_be_bound(const char *name _U_)
 {
 	return (1);
 }
 
+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+	/*
+	 * Nothing we can do.
+	 * XXX - is there a way to find out whether an adapter has
+	 * something plugged into it?
+	 */
+	return (0);
+}
+
 int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
-	return (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound));
+	return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+	    get_if_flags));
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+	return (PCAP_VERSION_STRING);
 }
Index: vendor/libpcap/dist/pcap-tc.c
===================================================================
--- vendor/libpcap/dist/pcap-tc.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-tc.c	(revision 333789)
@@ -1,1284 +1,1307 @@
 /*
  * Copyright (c) 2008 CACE Technologies, Davis (California)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of CACE Technologies nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <pcap.h>
 #include <pcap-int.h>
 
 #include "pcap-tc.h"
 
 #include <malloc.h>
 #include <memory.h>
 #include <string.h>
 #include <errno.h>
 
 #ifdef _WIN32
 #include <tchar.h>
 #endif
 
 typedef TC_STATUS	(TC_CALLCONV *TcFcnQueryPortList)			(PTC_PORT *ppPorts, PULONG pLength);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnFreePortList)			(TC_PORT *pPorts);
 
 typedef PCHAR		(TC_CALLCONV *TcFcnStatusGetString)			(TC_STATUS status);
 
 typedef PCHAR		(TC_CALLCONV *TcFcnPortGetName)				(TC_PORT port);
 typedef PCHAR		(TC_CALLCONV *TcFcnPortGetDescription)		(TC_PORT port);
 
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceOpenByName)		(PCHAR name, PTC_INSTANCE pInstance);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceClose)			(TC_INSTANCE instance);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceSetFeature)		(TC_INSTANCE instance, ULONG feature, ULONG value);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceQueryFeature)	(TC_INSTANCE instance, ULONG feature, PULONG pValue);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceReceivePackets)	(TC_INSTANCE instance, PTC_PACKETS_BUFFER pBuffer);
 typedef HANDLE		(TC_CALLCONV *TcFcnInstanceGetReceiveWaitHandle) (TC_INSTANCE instance);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceTransmitPackets)	(TC_INSTANCE instance, TC_PACKETS_BUFFER pBuffer);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnInstanceQueryStatistics)	(TC_INSTANCE instance, PTC_STATISTICS pStatistics);
 
 typedef TC_STATUS	(TC_CALLCONV *TcFcnPacketsBufferCreate)		(ULONG size, PTC_PACKETS_BUFFER pBuffer);
 typedef VOID		(TC_CALLCONV *TcFcnPacketsBufferDestroy)	(TC_PACKETS_BUFFER buffer);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnPacketsBufferQueryNextPacket)(TC_PACKETS_BUFFER buffer, PTC_PACKET_HEADER pHeader, PVOID *ppData);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnPacketsBufferCommitNextPacket)(TC_PACKETS_BUFFER buffer, PTC_PACKET_HEADER pHeader, PVOID pData);
 
 typedef VOID		(TC_CALLCONV *TcFcnStatisticsDestroy)		(TC_STATISTICS statistics);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnStatisticsUpdate)		(TC_STATISTICS statistics);
 typedef TC_STATUS	(TC_CALLCONV *TcFcnStatisticsQueryValue)	(TC_STATISTICS statistics, ULONG counterId, PULONGLONG pValue);
 
 typedef enum LONG
 {
 	TC_API_UNLOADED = 0,
 	TC_API_LOADED,
 	TC_API_CANNOT_LOAD,
 	TC_API_LOADING
 }
 	TC_API_LOAD_STATUS;
 
 
 typedef struct _TC_FUNCTIONS
 {
 	TC_API_LOAD_STATUS			LoadStatus;
 #ifdef _WIN32
 	HMODULE						hTcApiDllHandle;
 #endif
 	TcFcnQueryPortList			QueryPortList;
 	TcFcnFreePortList			FreePortList;
 	TcFcnStatusGetString		StatusGetString;
 
 	TcFcnPortGetName			PortGetName;
 	TcFcnPortGetDescription		PortGetDescription;
 
 	TcFcnInstanceOpenByName		InstanceOpenByName;
 	TcFcnInstanceClose			InstanceClose;
 	TcFcnInstanceSetFeature		InstanceSetFeature;
 	TcFcnInstanceQueryFeature	InstanceQueryFeature;
 	TcFcnInstanceReceivePackets	InstanceReceivePackets;
 #ifdef _WIN32
 	TcFcnInstanceGetReceiveWaitHandle InstanceGetReceiveWaitHandle;
 #endif
 	TcFcnInstanceTransmitPackets InstanceTransmitPackets;
 	TcFcnInstanceQueryStatistics InstanceQueryStatistics;
 
 	TcFcnPacketsBufferCreate	PacketsBufferCreate;
 	TcFcnPacketsBufferDestroy	PacketsBufferDestroy;
 	TcFcnPacketsBufferQueryNextPacket	PacketsBufferQueryNextPacket;
 	TcFcnPacketsBufferCommitNextPacket  PacketsBufferCommitNextPacket;
 
 	TcFcnStatisticsDestroy		StatisticsDestroy;
 	TcFcnStatisticsUpdate		StatisticsUpdate;
 	TcFcnStatisticsQueryValue	StatisticsQueryValue;
 }
 	TC_FUNCTIONS;
 
 static pcap_if_t* TcCreatePcapIfFromPort(TC_PORT port);
 static int TcSetDatalink(pcap_t *p, int dlt);
-static int TcGetNonBlock(pcap_t *p, char *errbuf);
-static int TcSetNonBlock(pcap_t *p, int nonblock, char *errbuf);
+static int TcGetNonBlock(pcap_t *p);
+static int TcSetNonBlock(pcap_t *p, int nonblock);
 static void TcCleanup(pcap_t *p);
 static int TcInject(pcap_t *p, const void *buf, size_t size);
 static int TcRead(pcap_t *p, int cnt, pcap_handler callback, u_char *user);
 static int TcStats(pcap_t *p, struct pcap_stat *ps);
 static int TcSetFilter(pcap_t *p, struct bpf_program *fp);
 #ifdef _WIN32
 static struct pcap_stat *TcStatsEx(pcap_t *p, int *pcap_stat_size);
 static int TcSetBuff(pcap_t *p, int dim);
 static int TcSetMode(pcap_t *p, int mode);
 static int TcSetMinToCopy(pcap_t *p, int size);
 static HANDLE TcGetReceiveWaitHandle(pcap_t *p);
 static int TcOidGetRequest(pcap_t *p, bpf_u_int32 oid, void *data, size_t *lenp);
 static int TcOidSetRequest(pcap_t *p, bpf_u_int32 oid, const void *data, size_t *lenp);
 static u_int TcSendqueueTransmit(pcap_t *p, pcap_send_queue *queue, int sync);
 static int TcSetUserBuffer(pcap_t *p, int size);
 static int TcLiveDump(pcap_t *p, char *filename, int maxsize, int maxpacks);
 static int TcLiveDumpEnded(pcap_t *p, int sync);
 static PAirpcapHandle TcGetAirPcapHandle(pcap_t *p);
 #endif
 
 #ifdef _WIN32
 TC_FUNCTIONS g_TcFunctions =
 {
 	TC_API_UNLOADED, /* LoadStatus */
 	NULL,  /* hTcApiDllHandle */
 	NULL,  /* QueryPortList */
 	NULL,  /* FreePortList */
 	NULL,  /* StatusGetString */
 	NULL,  /* PortGetName */
 	NULL,  /* PortGetDescription */
 	NULL,  /* InstanceOpenByName */
 	NULL,  /* InstanceClose */
 	NULL,  /* InstanceSetFeature */
 	NULL,  /* InstanceQueryFeature */
 	NULL,  /* InstanceReceivePackets */
 	NULL,  /* InstanceGetReceiveWaitHandle */
 	NULL,  /* InstanceTransmitPackets */
 	NULL,  /* InstanceQueryStatistics */
 	NULL,  /* PacketsBufferCreate */
 	NULL,  /* PacketsBufferDestroy */
 	NULL,  /* PacketsBufferQueryNextPacket */
 	NULL,  /* PacketsBufferCommitNextPacket */
 	NULL,  /* StatisticsDestroy */
 	NULL,  /* StatisticsUpdate */
 	NULL  /* StatisticsQueryValue */
 };
 #else
 TC_FUNCTIONS g_TcFunctions =
 {
 	TC_API_LOADED, /* LoadStatus */
 	TcQueryPortList,
 	TcFreePortList,
 	TcStatusGetString,
 	TcPortGetName,
 	TcPortGetDescription,
 	TcInstanceOpenByName,
 	TcInstanceClose,
 	TcInstanceSetFeature,
 	TcInstanceQueryFeature,
 	TcInstanceReceivePackets,
 #ifdef _WIN32
 	TcInstanceGetReceiveWaitHandle,
 #endif
 	TcInstanceTransmitPackets,
 	TcInstanceQueryStatistics,
 	TcPacketsBufferCreate,
 	TcPacketsBufferDestroy,
 	TcPacketsBufferQueryNextPacket,
 	TcPacketsBufferCommitNextPacket,
 	TcStatisticsDestroy,
 	TcStatisticsUpdate,
 	TcStatisticsQueryValue,
 };
 #endif
 
 #define MAX_TC_PACKET_SIZE	9500
 
 #pragma pack(push, 1)
 
 #define PPH_PH_FLAG_PADDING	((UCHAR)0x01)
 #define PPH_PH_VERSION		((UCHAR)0x00)
 
 typedef struct _PPI_PACKET_HEADER
 {
 	UCHAR	PphVersion;
 	UCHAR	PphFlags;
 	USHORT	PphLength;
 	ULONG	PphDlt;
 }
 	PPI_PACKET_HEADER, *PPPI_PACKET_HEADER;
 
 typedef struct _PPI_FIELD_HEADER
 {
 	USHORT PfhType;
 	USHORT PfhLength;
 }
 	PPI_FIELD_HEADER, *PPPI_FIELD_HEADER;
 
 
 #define		PPI_FIELD_TYPE_AGGREGATION_EXTENSION	((UCHAR)0x08)
 
 typedef struct _PPI_FIELD_AGGREGATION_EXTENSION
 {
 	ULONG		InterfaceId;
 }
 	PPI_FIELD_AGGREGATION_EXTENSION, *PPPI_FIELD_AGGREGATION_EXTENSION;
 
 
 #define		PPI_FIELD_TYPE_802_3_EXTENSION			((UCHAR)0x09)
 
 #define PPI_FLD_802_3_EXT_FLAG_FCS_PRESENT			((ULONG)0x00000001)
 
 typedef struct _PPI_FIELD_802_3_EXTENSION
 {
 	ULONG		Flags;
 	ULONG		Errors;
 }
 	PPI_FIELD_802_3_EXTENSION, *PPPI_FIELD_802_3_EXTENSION;
 
 typedef struct _PPI_HEADER
 {
 	PPI_PACKET_HEADER PacketHeader;
 	PPI_FIELD_HEADER  AggregationFieldHeader;
 	PPI_FIELD_AGGREGATION_EXTENSION AggregationField;
 	PPI_FIELD_HEADER  Dot3FieldHeader;
 	PPI_FIELD_802_3_EXTENSION Dot3Field;
 }
 	PPI_HEADER, *PPPI_HEADER;
 #pragma pack(pop)
 
 #ifdef _WIN32
 //
 // This wrapper around loadlibrary appends the system folder (usually c:\windows\system32)
 // to the relative path of the DLL, so that the DLL is always loaded from an absolute path
 // (It's no longer possible to load airpcap.dll from the application folder).
 // This solves the DLL Hijacking issue discovered in August 2010
 // http://blog.metasploit.com/2010/08/exploiting-dll-hijacking-flaws.html
 //
 HMODULE LoadLibrarySafe(LPCTSTR lpFileName)
 {
   TCHAR path[MAX_PATH];
   TCHAR fullFileName[MAX_PATH];
   UINT res;
   HMODULE hModule = NULL;
   do
   {
 	res = GetSystemDirectory(path, MAX_PATH);
 
 	if (res == 0)
 	{
 		//
 		// some bad failure occurred;
 		//
 		break;
 	}
 
 	if (res > MAX_PATH)
 	{
 		//
 		// the buffer was not big enough
 		//
 		SetLastError(ERROR_INSUFFICIENT_BUFFER);
 		break;
 	}
 
 	if (res + 1 + _tcslen(lpFileName) + 1 < MAX_PATH)
 	{
 		memcpy(fullFileName, path, res * sizeof(TCHAR));
 		fullFileName[res] = _T('\\');
 		memcpy(&fullFileName[res + 1], lpFileName, (_tcslen(lpFileName) + 1) * sizeof(TCHAR));
 
 		hModule = LoadLibrary(fullFileName);
 	}
 	else
 	{
 		SetLastError(ERROR_INSUFFICIENT_BUFFER);
 	}
 
   }while(FALSE);
 
   return hModule;
 }
 
 /*
  * NOTE: this function should be called by the pcap functions that can theoretically
  *       deal with the Tc library for the first time, namely listing the adapters and
  *       opening one. All the other ones (close, read, write, set parameters) work
  *       on an open instance of TC, so we do not care to call this function
  */
 TC_API_LOAD_STATUS LoadTcFunctions(void)
 {
 	TC_API_LOAD_STATUS currentStatus;
 
 	do
 	{
 		currentStatus = InterlockedCompareExchange((LONG*)&g_TcFunctions.LoadStatus, TC_API_LOADING, TC_API_UNLOADED);
 
 		while(currentStatus == TC_API_LOADING)
 		{
 			currentStatus = InterlockedCompareExchange((LONG*)&g_TcFunctions.LoadStatus, TC_API_LOADING, TC_API_LOADING);
 			Sleep(10);
 		}
 
 		/*
 		 * at this point we are either in the LOADED state, unloaded state (i.e. we are the ones loading everything)
 		 * or in cannot load
 		 */
 		if(currentStatus  == TC_API_LOADED)
 		{
 			return TC_API_LOADED;
 		}
 
 		if (currentStatus == TC_API_CANNOT_LOAD)
 		{
 			return TC_API_CANNOT_LOAD;
 		}
 
 		currentStatus = TC_API_CANNOT_LOAD;
 
 		g_TcFunctions.hTcApiDllHandle = LoadLibrarySafe("TcApi.dll");
 		if (g_TcFunctions.hTcApiDllHandle == NULL)	break;
 
 		g_TcFunctions.QueryPortList					= (TcFcnQueryPortList)			GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcQueryPortList");
 		g_TcFunctions.FreePortList					= (TcFcnFreePortList)			GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcFreePortList");
 
 		g_TcFunctions.StatusGetString				= (TcFcnStatusGetString)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcStatusGetString");
 
 		g_TcFunctions.PortGetName					= (TcFcnPortGetName)			GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPortGetName");
 		g_TcFunctions.PortGetDescription			= (TcFcnPortGetDescription)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPortGetDescription");
 
 		g_TcFunctions.InstanceOpenByName			= (TcFcnInstanceOpenByName)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceOpenByName");
 		g_TcFunctions.InstanceClose					= (TcFcnInstanceClose)			GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceClose");
 		g_TcFunctions.InstanceSetFeature			= (TcFcnInstanceSetFeature)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceSetFeature");
 		g_TcFunctions.InstanceQueryFeature			= (TcFcnInstanceQueryFeature)	GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceQueryFeature");
 		g_TcFunctions.InstanceReceivePackets		= (TcFcnInstanceReceivePackets)	GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceReceivePackets");
 		g_TcFunctions.InstanceGetReceiveWaitHandle	= (TcFcnInstanceGetReceiveWaitHandle)GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceGetReceiveWaitHandle");
 		g_TcFunctions.InstanceTransmitPackets		= (TcFcnInstanceTransmitPackets)GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceTransmitPackets");
 		g_TcFunctions.InstanceQueryStatistics		= (TcFcnInstanceQueryStatistics)GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcInstanceQueryStatistics");
 
 		g_TcFunctions.PacketsBufferCreate			= (TcFcnPacketsBufferCreate)	GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPacketsBufferCreate");
 		g_TcFunctions.PacketsBufferDestroy			= (TcFcnPacketsBufferDestroy)	GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPacketsBufferDestroy");
 		g_TcFunctions.PacketsBufferQueryNextPacket	= (TcFcnPacketsBufferQueryNextPacket)GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPacketsBufferQueryNextPacket");
 		g_TcFunctions.PacketsBufferCommitNextPacket	= (TcFcnPacketsBufferCommitNextPacket)GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcPacketsBufferCommitNextPacket");
 
 		g_TcFunctions.StatisticsDestroy				= (TcFcnStatisticsDestroy)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcStatisticsDestroy");
 		g_TcFunctions.StatisticsUpdate				= (TcFcnStatisticsUpdate)		GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcStatisticsUpdate");
 		g_TcFunctions.StatisticsQueryValue			= (TcFcnStatisticsQueryValue)	GetProcAddress(g_TcFunctions.hTcApiDllHandle, "TcStatisticsQueryValue");
 
 		if (   g_TcFunctions.QueryPortList == NULL
 			|| g_TcFunctions.FreePortList == NULL
 			|| g_TcFunctions.StatusGetString == NULL
 			|| g_TcFunctions.PortGetName == NULL
 			|| g_TcFunctions.PortGetDescription == NULL
 			|| g_TcFunctions.InstanceOpenByName == NULL
 			|| g_TcFunctions.InstanceClose == NULL
 			|| g_TcFunctions.InstanceSetFeature	 == NULL
 			|| g_TcFunctions.InstanceQueryFeature == NULL
 			|| g_TcFunctions.InstanceReceivePackets == NULL
 			|| g_TcFunctions.InstanceGetReceiveWaitHandle == NULL
 			|| g_TcFunctions.InstanceTransmitPackets == NULL
 			|| g_TcFunctions.InstanceQueryStatistics == NULL
 			|| g_TcFunctions.PacketsBufferCreate == NULL
 			|| g_TcFunctions.PacketsBufferDestroy == NULL
 			|| g_TcFunctions.PacketsBufferQueryNextPacket == NULL
 			|| g_TcFunctions.PacketsBufferCommitNextPacket == NULL
 			|| g_TcFunctions.StatisticsDestroy == NULL
 			|| g_TcFunctions.StatisticsUpdate == NULL
 			|| g_TcFunctions.StatisticsQueryValue == NULL
 		)
 		{
 			break;
 		}
 
 		/*
 		 * everything got loaded, yay!!
 		 */
 		currentStatus = TC_API_LOADED;
 	}while(FALSE);
 
 	if (currentStatus != TC_API_LOADED)
 	{
 		if (g_TcFunctions.hTcApiDllHandle != NULL)
 		{
 			FreeLibrary(g_TcFunctions.hTcApiDllHandle);
 			g_TcFunctions.hTcApiDllHandle = NULL;
 		}
 	}
 
 	InterlockedExchange((LONG*)&g_TcFunctions.LoadStatus, currentStatus);
 
 	return currentStatus;
 }
 #else
 // static linking
 TC_API_LOAD_STATUS LoadTcFunctions(void)
 {
 	return TC_API_LOADED;
 }
 #endif
 
 /*
  * Private data for capturing on TurboCap devices.
  */
 struct pcap_tc {
 	TC_INSTANCE TcInstance;
 	TC_PACKETS_BUFFER TcPacketsBuffer;
 	ULONG TcAcceptedCount;
 	u_char *PpiPacket;
 };
 
 int
-TcFindAllDevs(pcap_if_t **alldevsp, char *errbuf)
+TcFindAllDevs(pcap_if_list_t *devlist, char *errbuf)
 {
 	TC_API_LOAD_STATUS loadStatus;
 	ULONG numPorts;
 	PTC_PORT pPorts = NULL;
 	TC_STATUS status;
 	int result = 0;
 	pcap_if_t *dev, *cursor;
 	ULONG i;
 
 	do
 	{
 		loadStatus = LoadTcFunctions();
 
 		if (loadStatus != TC_API_LOADED)
 		{
 			result = 0;
 			break;
 		}
 
 		/*
 		 * enumerate the ports, and add them to the list
 		 */
 		status = g_TcFunctions.QueryPortList(&pPorts, &numPorts);
 
 		if (status != TC_SUCCESS)
 		{
 			result = 0;
 			break;
 		}
 
 		for (i = 0; i < numPorts; i++)
 		{
 			/*
 			 * transform the port into an entry in the list
 			 */
 			dev = TcCreatePcapIfFromPort(pPorts[i]);
 
 			if (dev != NULL)
 			{
 				/*
 				 * append it at the end
 				 */
-				if (*alldevsp == NULL)
+				if (devlistp->beginning == NULL)
 				{
-					*alldevsp = dev;
+					devlistp->beginning = dev;
 				}
 				else
 				{
-					for(cursor = *alldevsp; cursor->next != NULL; cursor = cursor->next);
+					for (cursor = devlistp->beginning;
+					    cursor->next != NULL;
+					    cursor = cursor->next);
 					cursor->next = dev;
 				}
 			}
 		}
 
 		if (numPorts > 0)
 		{
 			/*
 			 * ignore the result here
 			 */
 			status = g_TcFunctions.FreePortList(pPorts);
 		}
 
 	}while(FALSE);
 
 	return result;
 }
 
 static pcap_if_t* TcCreatePcapIfFromPort(TC_PORT port)
 {
 	CHAR *name;
 	CHAR *description;
 	pcap_if_t *newIf = NULL;
 
 	newIf = (pcap_if_t*)malloc(sizeof(*newIf));
 	if (newIf == NULL)
 	{
 		return NULL;
 	}
 
 	memset(newIf, 0, sizeof(*newIf));
 
 	name = g_TcFunctions.PortGetName(port);
 	description = g_TcFunctions.PortGetDescription(port);
 
 	newIf->name = (char*)malloc(strlen(name) + 1);
 	if (newIf->name == NULL)
 	{
 		free(newIf);
 		return NULL;
 	}
 
 	newIf->description = (char*)malloc(strlen(description) + 1);
 	if (newIf->description == NULL)
 	{
 		free(newIf->name);
 		free(newIf);
 		return NULL;
 	}
 
 	strcpy(newIf->name, name);
 	strcpy(newIf->description, description);
 
 	newIf->addresses = NULL;
 	newIf->next = NULL;
 	newIf->flags = 0;
 
 	return newIf;
 
 }
 
 static int
 TcActivate(pcap_t *p)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATUS status;
 	ULONG timeout;
 	PPPI_HEADER pPpiHeader;
 
 	if (p->opt.rfmon)
 	{
 		/*
 		 * No monitor mode on Tc cards; they're Ethernet
 		 * capture adapters.
 		 */
 		return PCAP_ERROR_RFMON_NOTSUP;
 	}
 
 	pt->PpiPacket = malloc(sizeof(PPI_HEADER) + MAX_TC_PACKET_SIZE);
 
 	if (pt->PpiPacket == NULL)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Error allocating memory");
 		return PCAP_ERROR;
 	}
 
 	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+		p->snapshot = MAXIMUM_SNAPLEN;
+
+	/*
 	 * Initialize the PPI fixed fields
 	 */
 	pPpiHeader = (PPPI_HEADER)pt->PpiPacket;
 	pPpiHeader->PacketHeader.PphDlt = DLT_EN10MB;
 	pPpiHeader->PacketHeader.PphLength = sizeof(PPI_HEADER);
 	pPpiHeader->PacketHeader.PphFlags = 0;
 	pPpiHeader->PacketHeader.PphVersion = 0;
 
 	pPpiHeader->AggregationFieldHeader.PfhLength = sizeof(PPI_FIELD_AGGREGATION_EXTENSION);
 	pPpiHeader->AggregationFieldHeader.PfhType = PPI_FIELD_TYPE_AGGREGATION_EXTENSION;
 
 	pPpiHeader->Dot3FieldHeader.PfhLength = sizeof(PPI_FIELD_802_3_EXTENSION);
 	pPpiHeader->Dot3FieldHeader.PfhType = PPI_FIELD_TYPE_802_3_EXTENSION;
 
 	status = g_TcFunctions.InstanceOpenByName(p->opt.device, &pt->TcInstance);
 
 	if (status != TC_SUCCESS)
 	{
 		/* Adapter detected but we are not able to open it. Return failure. */
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Error opening TurboCap adapter: %s", g_TcFunctions.StatusGetString(status));
 		return PCAP_ERROR;
 	}
 
 	p->linktype = DLT_EN10MB;
 	p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2);
 	/*
 	 * If that fails, just leave the list empty.
 	 */
 	if (p->dlt_list != NULL) {
 		p->dlt_list[0] = DLT_EN10MB;
 		p->dlt_list[1] = DLT_PPI;
 		p->dlt_count = 2;
 	}
 
 	/*
 	 * ignore promiscuous mode
 	 * p->opt.promisc
 	 */
 
 
 	/*
 	 * ignore all the buffer sizes
 	 */
 
 	/*
 	 * enable reception
 	 */
 	status = g_TcFunctions.InstanceSetFeature(pt->TcInstance, TC_INST_FT_RX_STATUS, 1);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,"Error enabling reception on a TurboCap instance: %s", g_TcFunctions.StatusGetString(status));
 		goto bad;
 	}
 
 	/*
 	 * enable transmission
 	 */
 	status = g_TcFunctions.InstanceSetFeature(pt->TcInstance, TC_INST_FT_TX_STATUS, 1);
 	/*
 	 * Ignore the error here.
 	 */
 
 	p->inject_op = TcInject;
 	/*
 	 * if the timeout is -1, it means immediate return, no timeout
 	 * if the timeout is 0, it means INFINITE
 	 */
 
 	if (p->opt.timeout == 0)
 	{
 		timeout = 0xFFFFFFFF;
 	}
 	else
 	if (p->opt.timeout < 0)
 	{
 		/*
 		 *  we insert a minimal timeout here
 		 */
 		timeout = 10;
 	}
 	else
 	{
 		timeout = p->opt.timeout;
 	}
 
 	status = g_TcFunctions.InstanceSetFeature(pt->TcInstance, TC_INST_FT_READ_TIMEOUT, timeout);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,"Error setting the read timeout a TurboCap instance: %s", g_TcFunctions.StatusGetString(status));
 		goto bad;
 	}
 
 	p->read_op = TcRead;
 	p->setfilter_op = TcSetFilter;
 	p->setdirection_op = NULL;	/* Not implemented. */
 	p->set_datalink_op = TcSetDatalink;
 	p->getnonblock_op = TcGetNonBlock;
 	p->setnonblock_op = TcSetNonBlock;
 	p->stats_op = TcStats;
 #ifdef _WIN32
 	p->stats_ex_op = TcStatsEx;
 	p->setbuff_op = TcSetBuff;
 	p->setmode_op = TcSetMode;
 	p->setmintocopy_op = TcSetMinToCopy;
 	p->getevent_op = TcGetReceiveWaitHandle;
 	p->oid_get_request_op = TcOidGetRequest;
 	p->oid_set_request_op = TcOidSetRequest;
 	p->sendqueue_transmit_op = TcSendqueueTransmit;
 	p->setuserbuffer_op = TcSetUserBuffer;
 	p->live_dump_op = TcLiveDump;
 	p->live_dump_ended_op = TcLiveDumpEnded;
 	p->get_airpcap_handle_op = TcGetAirPcapHandle;
 #else
 	p->selectable_fd = -1;
 #endif
 
 	p->cleanup_op = TcCleanup;
 
 	return 0;
 bad:
 	TcCleanup(p);
 	return PCAP_ERROR;
 }
 
 pcap_t *
 TcCreate(const char *device, char *ebuf, int *is_ours)
 {
 	ULONG numPorts;
 	PTC_PORT pPorts = NULL;
 	TC_STATUS status;
 	int is_tc;
 	ULONG i;
 	pcap_t *p;
 
 	if (LoadTcFunctions() != TC_API_LOADED)
 	{
 		/*
 		 * XXX - report this as an error rather than as
 		 * "not a TurboCap device"?
 		 */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/*
 	 * enumerate the ports, and add them to the list
 	 */
 	status = g_TcFunctions.QueryPortList(&pPorts, &numPorts);
 
 	if (status != TC_SUCCESS)
 	{
 		/*
 		 * XXX - report this as an error rather than as
 		 * "not a TurboCap device"?
 		 */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	is_tc = FALSE;
 	for (i = 0; i < numPorts; i++)
 	{
 		if (strcmp(g_TcFunctions.PortGetName(pPorts[i]), device) == 0)
 		{
 			is_tc = TRUE;
 			break;
 		}
 	}
 
 	if (numPorts > 0)
 	{
 		/*
 		 * ignore the result here
 		 */
 		(void)g_TcFunctions.FreePortList(pPorts);
 	}
 
 	if (!is_tc)
 	{
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_tc));
 	if (p == NULL)
 		return NULL;
 
 	p->activate_op = TcActivate;
+	/*
+	 * Set these up front, so that, even if our client tries
+	 * to set non-blocking mode before we're activated, or
+	 * query the state of non-blocking mode, they get an error,
+	 * rather than having the non-blocking mode option set
+	 * for use later.
+	 */
+	p->getnonblock_op = TcGetNonBlock;
+	p->setnonblock_op = TcSetNonBlock;
 	return p;
 }
 
 static int TcSetDatalink(pcap_t *p, int dlt)
 {
 	/*
-	 * always return 0, as the check is done by pcap_set_datalink
+	 * We don't have to do any work here; pcap_set_datalink() checks
+	 * whether the value is in the list of DLT_ values we
+	 * supplied, so we don't have to, and, if it is valid, sets
+	 * p->linktype to the new value; we don't have to do anything
+	 * in hardware, we just use what's in p->linktype.
+	 *
+	 * We do have to have a routine, however, so that pcap_set_datalink()
+	 * doesn't think we don't support setting the link-layer header
+	 * type at all.
 	 */
 	return 0;
 }
 
-static int TcGetNonBlock(pcap_t *p, char *errbuf)
+static int TcGetNonBlock(pcap_t *p)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Getting the non blocking status is not available for TurboCap ports");
-	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "Getting the non blocking status is not available for TurboCap ports");
-		return -1;
-
+	    "Non-blocking mode isn't supported for TurboCap ports");
+	return -1;
 }
-static int TcSetNonBlock(pcap_t *p, int nonblock, char *errbuf)
+
+static int TcSetNonBlock(pcap_t *p, int nonblock)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-		    "Setting the non blocking status is not available for TurboCap ports");
-	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "Setting the non blocking status is not available for TurboCap ports");
-		return -1;
+	    "Non-blocking mode isn't supported for TurboCap ports");
+	return -1;
 }
 
-
 static void TcCleanup(pcap_t *p)
 {
 	struct pcap_tc *pt = p->priv;
 
 	if (pt->TcPacketsBuffer != NULL)
 	{
 		g_TcFunctions.PacketsBufferDestroy(pt->TcPacketsBuffer);
 		pt->TcPacketsBuffer = NULL;
 	}
 	if (pt->TcInstance != NULL)
 	{
 		/*
 		 * here we do not check for the error values
 		 */
 		g_TcFunctions.InstanceClose(pt->TcInstance);
 		pt->TcInstance = NULL;
 	}
 
 	if (pt->PpiPacket != NULL)
 	{
 		free(pt->PpiPacket);
 		pt->PpiPacket = NULL;
 	}
 
 	pcap_cleanup_live_common(p);
 }
 
 /* Send a packet to the network */
 static int TcInject(pcap_t *p, const void *buf, size_t size)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATUS status;
 	TC_PACKETS_BUFFER buffer;
 	TC_PACKET_HEADER header;
 
 	if (size >= 0xFFFF)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: the TurboCap API does not support packets larger than 64k");
 		return -1;
 	}
 
 	status = g_TcFunctions.PacketsBufferCreate(sizeof(TC_PACKET_HEADER) + TC_ALIGN_USHORT_TO_64BIT((USHORT)size), &buffer);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: TcPacketsBufferCreate failure: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return -1;
 	}
 
 	/*
 	 * we assume that the packet is without the checksum, as common with WinPcap
 	 */
 	memset(&header, 0, sizeof(header));
 
 	header.Length = (USHORT)size;
 	header.CapturedLength = header.Length;
 
 	status = g_TcFunctions.PacketsBufferCommitNextPacket(buffer, &header, (PVOID)buf);
 
 	if (status == TC_SUCCESS)
 	{
 		status = g_TcFunctions.InstanceTransmitPackets(pt->TcInstance, buffer);
 
 		if (status != TC_SUCCESS)
 		{
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: TcInstanceTransmitPackets failure: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		}
 	}
 	else
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send error: TcPacketsBufferCommitNextPacket failure: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 	}
 
 	g_TcFunctions.PacketsBufferDestroy(buffer);
 
 	if (status != TC_SUCCESS)
 	{
 		return -1;
 	}
 	else
 	{
 		return 0;
 	}
 }
 
 static int TcRead(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATUS status;
 	int n = 0;
 
 	/*
 	 * Has "pcap_breakloop()" been called?
 	 */
 	if (p->break_loop)
 	{
 		/*
 		 * Yes - clear the flag that indicates that it
 		 * has, and return -2 to indicate that we were
 		 * told to break out of the loop.
 		 */
 		p->break_loop = 0;
 		return -2;
 	}
 
 	if (pt->TcPacketsBuffer == NULL)
 	{
 		status = g_TcFunctions.InstanceReceivePackets(pt->TcInstance, &pt->TcPacketsBuffer);
 		if (status != TC_SUCCESS)
 		{
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error, TcInstanceReceivePackets failure: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 			return -1;
 		}
 	}
 
 	while (TRUE)
 	{
 		struct pcap_pkthdr hdr;
 		TC_PACKET_HEADER tcHeader;
 		PVOID data;
 		ULONG filterResult;
 
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (p->break_loop)
 		{
 			if (n == 0)
 			{
 				p->break_loop = 0;
 				return -2;
 			}
 			else
 			{
 				return n;
 			}
 		}
 
 		if (pt->TcPacketsBuffer == NULL)
 		{
 			break;
 		}
 
 		status = g_TcFunctions.PacketsBufferQueryNextPacket(pt->TcPacketsBuffer, &tcHeader, &data);
 
 		if (status == TC_ERROR_END_OF_BUFFER)
 		{
 			g_TcFunctions.PacketsBufferDestroy(pt->TcPacketsBuffer);
 			pt->TcPacketsBuffer = NULL;
 			break;
 		}
 
 		if (status != TC_SUCCESS)
 		{
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "read error, TcPacketsBufferQueryNextPacket failure: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 			return -1;
 		}
 
 		/* No underlaying filtering system. We need to filter on our own */
 		if (p->fcode.bf_insns)
 		{
 			filterResult = bpf_filter(p->fcode.bf_insns, data, tcHeader.Length, tcHeader.CapturedLength);
 
 			if (filterResult == 0)
 			{
 				continue;
 			}
 
 			if (filterResult > tcHeader.CapturedLength)
 			{
 				filterResult = tcHeader.CapturedLength;
 			}
 		}
 		else
 		{
 			filterResult = tcHeader.CapturedLength;
 		}
 
 		pt->TcAcceptedCount ++;
 
 		hdr.ts.tv_sec = (bpf_u_int32)(tcHeader.Timestamp / (ULONGLONG)(1000  * 1000 * 1000));
 		hdr.ts.tv_usec = (bpf_u_int32)((tcHeader.Timestamp % (ULONGLONG)(1000  * 1000 * 1000)) / 1000);
 
 		if (p->linktype == DLT_EN10MB)
 		{
 			hdr.caplen = filterResult;
 			hdr.len = tcHeader.Length;
 			(*callback)(user, &hdr, data);
 		}
 		else
 		{
 			PPPI_HEADER pPpiHeader = (PPPI_HEADER)pt->PpiPacket;
 			PVOID data2 = pPpiHeader + 1;
 
 			pPpiHeader->AggregationField.InterfaceId = TC_PH_FLAGS_RX_PORT_ID(tcHeader.Flags);
 			pPpiHeader->Dot3Field.Errors = tcHeader.Errors;
 			if (tcHeader.Flags & TC_PH_FLAGS_CHECKSUM)
 			{
 				pPpiHeader->Dot3Field.Flags = PPI_FLD_802_3_EXT_FLAG_FCS_PRESENT;
 			}
 			else
 			{
 				pPpiHeader->Dot3Field.Flags = 0;
 			}
 
 			if (filterResult <= MAX_TC_PACKET_SIZE)
 			{
 				memcpy(data2, data, filterResult);
 				hdr.caplen = sizeof(PPI_HEADER) + filterResult;
 				hdr.len = sizeof(PPI_HEADER) + tcHeader.Length;
 			}
 			else
 			{
 				memcpy(data2, data, MAX_TC_PACKET_SIZE);
 				hdr.caplen = sizeof(PPI_HEADER) + MAX_TC_PACKET_SIZE;
 				hdr.len = sizeof(PPI_HEADER) + tcHeader.Length;
 			}
 
 			(*callback)(user, &hdr, pt->PpiPacket);
 
 		}
 
 		if (++n >= cnt && cnt > 0)
 		{
 			return n;
 		}
 	}
 
 	return n;
 }
 
 static int
 TcStats(pcap_t *p, struct pcap_stat *ps)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATISTICS statistics;
 	TC_STATUS status;
 	ULONGLONG counter;
 	struct pcap_stat s;
 
 	status = g_TcFunctions.InstanceQueryStatistics(pt->TcInstance, &statistics);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcInstanceQueryStatistics: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return -1;
 	}
 
 	memset(&s, 0, sizeof(s));
 
 	status = g_TcFunctions.StatisticsQueryValue(statistics, TC_COUNTER_INSTANCE_TOTAL_RX_PACKETS, &counter);
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcStatisticsQueryValue: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return -1;
 	}
 	if (counter <= (ULONGLONG)0xFFFFFFFF)
 	{
 		s.ps_recv = (ULONG)counter;
 	}
 	else
 	{
 		s.ps_recv = 0xFFFFFFFF;
 	}
 
 	status = g_TcFunctions.StatisticsQueryValue(statistics, TC_COUNTER_INSTANCE_RX_DROPPED_PACKETS, &counter);
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcStatisticsQueryValue: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return -1;
 	}
 	if (counter <= (ULONGLONG)0xFFFFFFFF)
 	{
 		s.ps_ifdrop = (ULONG)counter;
 		s.ps_drop = (ULONG)counter;
 	}
 	else
 	{
 		s.ps_ifdrop = 0xFFFFFFFF;
 		s.ps_drop = 0xFFFFFFFF;
 	}
 
-#if defined(_WIN32) && defined(HAVE_REMOTE)
+#if defined(_WIN32) && defined(ENABLE_REMOTE)
 	s.ps_capt = pt->TcAcceptedCount;
 #endif
 	*ps = s;
 
 	return 0;
 }
 
 
 /*
  * We filter at user level, since the kernel driver does't process the packets
  */
 static int
 TcSetFilter(pcap_t *p, struct bpf_program *fp)
 {
 	if(!fp)
 	{
 		strncpy(p->errbuf, "setfilter: No filter specified", sizeof(p->errbuf));
 		return -1;
 	}
 
 	/* Install a user level filter */
 	if (install_bpf_program(p, fp) < 0)
 	{
-		pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			"setfilter, unable to install the filter: %s", pcap_strerror(errno));
 		return -1;
 	}
 
 	return 0;
 }
 
 #ifdef _WIN32
 static struct pcap_stat *
 TcStatsEx(pcap_t *p, int *pcap_stat_size)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATISTICS statistics;
 	TC_STATUS status;
 	ULONGLONG counter;
 
 	*pcap_stat_size = sizeof (p->stat);
 
 	status = g_TcFunctions.InstanceQueryStatistics(pt->TcInstance, &statistics);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcInstanceQueryStatistics: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return NULL;
 	}
 
 	memset(&p->stat, 0, sizeof(p->stat));
 
 	status = g_TcFunctions.StatisticsQueryValue(statistics, TC_COUNTER_INSTANCE_TOTAL_RX_PACKETS, &counter);
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcStatisticsQueryValue: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return NULL;
 	}
 	if (counter <= (ULONGLONG)0xFFFFFFFF)
 	{
 		p->stat.ps_recv = (ULONG)counter;
 	}
 	else
 	{
 		p->stat.ps_recv = 0xFFFFFFFF;
 	}
 
 	status = g_TcFunctions.StatisticsQueryValue(statistics, TC_COUNTER_INSTANCE_RX_DROPPED_PACKETS, &counter);
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error in TcStatisticsQueryValue: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 		return NULL;
 	}
 	if (counter <= (ULONGLONG)0xFFFFFFFF)
 	{
 		p->stat.ps_ifdrop = (ULONG)counter;
 		p->stat.ps_drop = (ULONG)counter;
 	}
 	else
 	{
 		p->stat.ps_ifdrop = 0xFFFFFFFF;
 		p->stat.ps_drop = 0xFFFFFFFF;
 	}
 
-#ifdef HAVE_REMOTE
+#if defined(_WIN32) && defined(ENABLE_REMOTE)
 	p->stat.ps_capt = pt->TcAcceptedCount;
 #endif
 
 	return &p->stat;
 }
 
 /* Set the dimension of the kernel-level capture buffer */
 static int
 TcSetBuff(pcap_t *p, int dim)
 {
 	/*
 	 * XXX turbocap has an internal way of managing buffers.
 	 * And at the moment it's not configurable, so we just
 	 * silently ignore the request to set the buffer.
 	 */
 	return 0;
 }
 
 static int
 TcSetMode(pcap_t *p, int mode)
 {
 	if (mode != MODE_CAPT)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Mode %u not supported by TurboCap devices. TurboCap only supports capture.", mode);
 		return -1;
 	}
 
 	return 0;
 }
 
 static int
 TcSetMinToCopy(pcap_t *p, int size)
 {
 	struct pcap_tc *pt = p->priv;
 	TC_STATUS status;
 
 	if (size < 0)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Mintocopy cannot be less than 0.");
 		return -1;
 	}
 
 	status = g_TcFunctions.InstanceSetFeature(pt->TcInstance, TC_INST_FT_MINTOCOPY, (ULONG)size);
 
 	if (status != TC_SUCCESS)
 	{
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "TurboCap error setting the mintocopy: %s (%08x)", g_TcFunctions.StatusGetString(status), status);
 	}
 
 	return 0;
 }
 
 static HANDLE
 TcGetReceiveWaitHandle(pcap_t *p)
 {
 	struct pcap_tc *pt = p->priv;
 
 	return g_TcFunctions.InstanceGetReceiveWaitHandle(pt->TcInstance);
 }
 
 static int
 TcOidGetRequest(pcap_t *p, bpf_u_int32 oid _U_, void *data _U_, size_t *lenp _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "An OID get request cannot be performed on a TurboCap device");
 	return PCAP_ERROR;
 }
 
 static int
 TcOidSetRequest(pcap_t *p, bpf_u_int32 oid _U_, const void *data _U_,
     size_t *lenp _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "An OID set request cannot be performed on a TurboCap device");
 	return PCAP_ERROR;
 }
 
 static u_int
 TcSendqueueTransmit(pcap_t *p, pcap_send_queue *queue _U_, int sync _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Packets cannot be bulk transmitted on a TurboCap device");
 	return 0;
 }
 
 static int
 TcSetUserBuffer(pcap_t *p, int size _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "The user buffer cannot be set on a TurboCap device");
 	return -1;
 }
 
 static int
 TcLiveDump(pcap_t *p, char *filename _U_, int maxsize _U_, int maxpacks _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Live packet dumping cannot be performed on a TurboCap device");
 	return -1;
 }
 
 static int
 TcLiveDumpEnded(pcap_t *p, int sync _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Live packet dumping cannot be performed on a TurboCap device");
 	return -1;
 }
 
 static PAirpcapHandle
 TcGetAirPcapHandle(pcap_t *p _U_)
 {
 	return NULL;
 }
 #endif
Index: vendor/libpcap/dist/pcap-tc.h
===================================================================
--- vendor/libpcap/dist/pcap-tc.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-tc.h	(revision 333789)
@@ -1,54 +1,54 @@
 /*
  * Copyright (c) 2008 CACE Technologies, Davis (California)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of CACE Technologies nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef __PCAP_TC_H__
 #define __PCAP_TC_H__
 
 /*
  * needed because gcc headers do not have C_ASSERT
  */
 #ifndef C_ASSERT
 #define C_ASSERT(a)
 #endif
 
 #include <TcApi.h>
 
 /*
  * functions used effectively by the pcap library
  */
 
 pcap_t *
 TcCreate(const char *device, char *ebuf, int *is_ours);
 
 int
-TcFindAllDevs(pcap_if_t **alldevsp, char *errbuf);
+TcFindAllDevs(pcap_if_list_t *devlistp, char *errbuf);
 
 #endif
Index: vendor/libpcap/dist/pcap-tstamp.manmisc.in
===================================================================
--- vendor/libpcap/dist/pcap-tstamp.manmisc.in	(revision 333788)
+++ vendor/libpcap/dist/pcap-tstamp.manmisc.in	(revision 333789)
@@ -1,175 +1,177 @@
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP-TSTAMP @MAN_MISC_INFO@ "8 March 2015"
 .SH NAME
 pcap-tstamp \- packet time stamps in libpcap
 .SH DESCRIPTION
 When capturing traffic, each packet is given a time stamp representing,
 for incoming packets, the arrival time of the packet and, for outgoing
 packets, the transmission time of the packet.  This time is an
 approximation of the arrival or transmission time.  If it is supplied by
 the operating system running on the host on which the capture is being
 done, there are several reasons why it might not precisely represent the
 arrival or transmission time:
 .IP
 if the time stamp is applied to the packet when the networking stack
 receives the packet, the networking stack might not see the packet until
 an interrupt is delivered for the packet or a timer event causes the
 networking device driver to poll for packets, and the time stamp might
 not be applied until the packet has had some processing done by other
 code in the networking stack, so there might be a significant delay
 between the time when the last bit of the packet is received by the
 capture device and when the networking stack time-stamps the packet;
 .IP
 the timer used to generate the time stamps might have low resolution,
 for example, it might be a timer updated once per host operating system
 timer tick, with the host operating system timer ticking once every few
 milliseconds;
 .IP
 a high-resolution timer might use a counter that runs at a rate
 dependent on the processor clock speed, and that clock speed might be
 adjusted upwards or downwards over time and the timer might not be able
 to compensate for all those adjustments;
 .IP
 the host operating system's clock might be adjusted over time to match a
 time standard to which the host is being synchronized, which might be
 done by temporarily slowing down or speeding up the clock or by making a
 single adjustment;
 .IP
 different CPU cores on a multi-core or multi-processor system might be
 running at different speeds, or might not have time counters all
 synchronized, so packets time-stamped by different cores might not have
 consistent time stamps.
 .LP
 In addition, packets time-stamped by different cores might be
 time-stamped in one order and added to the queue of packets for libpcap
 to read in another order, so time stamps might not be monotonically
 increasing.
 .LP
 Some capture devices on some platforms can provide time stamps for
 packets; those time stamps are usually high-resolution time stamps, and
 are usually applied to the packet when the first or last bit of the
 packet arrives, and are thus more accurate than time stamps provided by
 the host operating system.  Those time stamps might not, however, be
 synchronized with the host operating system's clock, so that, for
 example, the time stamp of a packet might not correspond to the time
 stamp of an event on the host triggered by the arrival of that packet.
 .LP
 Depending on the capture device and the software on the host, libpcap
 might allow different types of time stamp to be used.  The
 .BR pcap_list_tstamp_types (3PCAP)
 routine provides, for a packet capture handle created by
 .BR pcap_create (3PCAP)
 but not yet activated by
 .BR pcap_activate (3PCAP),
 a list of time stamp types supported by the capture device for that
 handle.
 The list might be empty, in which case no choice of time stamp type is
 offered for that capture device.  If the list is not empty, the
 .BR pcap_set_tstamp_type (3PCAP)
 routine can be used after a
 .B pcap_create()
 call and before a
 .B pcap_activate()
 call to specify the type of time stamp to be used on the device.
 The time stamp types are listed here; the first value is the #define to
 use in code, the second value is the value returned by
 .B pcap_tstamp_type_val_to_name()
 and accepted by
 .BR pcap_tstamp_type_name_to_val() .
 .RS 5
 .TP 5
 .BR PCAP_TSTAMP_HOST " - " host
 Time stamp provided by the host on which the capture is being done.  The
 precision of this time stamp is unspecified; it might or might not be
 synchronized with the host operating system's clock.
 .TP 5
 .BR PCAP_TSTAMP_HOST_LOWPREC " - " host_lowprec
 Time stamp provided by the host on which the capture is being done.
 This is a low-precision time stamp, synchronized with the host operating
 system's clock.
 .TP 5
 .BR PCAP_TSTAMP_HOST_HIPREC " - " host_hiprec
 Time stamp provided by the host on which the capture is being done.
 This is a high-precision time stamp; it might or might not be
 synchronized with the host operating system's clock.  It might be more
 expensive to fetch than
 .BR PCAP_TSTAMP_HOST_LOWPREC .
 .TP 5
 .BR PCAP_TSTAMP_ADAPTER " - " adapter
 Time stamp provided by the network adapter on which the capture is being
 done.  This is a high-precision time stamp, synchronized with the host
 operating system's clock.
 .TP 5
 .BR PCAP_TSTAMP_ADAPTER_UNSYNCED " - " adapter_unsynced
 Time stamp provided by the network adapter on which the capture is being
 done.  This is a high-precision time stamp; it is not synchronized with
 the host operating system's clock.
 .RE
 .LP
 By default, when performing a live capture or reading from a savefile,
 time stamps are supplied as seconds since January 1, 1970, 00:00:00 UTC,
 and microseconds since that seconds value, even if higher-resolution
 time stamps are available from the capture device or in the savefile.
 If, when reading a savefile, the time stamps in the file have a higher
 resolution than one microsecond, the additional digits of resolution are
 discarded.
 .LP
 The
 .BR pcap_set_tstamp_precision (3PCAP)
 routine can be used after a
 .B pcap_create()
 call and after a
 .B pcap_activate()
 call to specify the resolution of the time stamps to get for the device.
 If the hardware or software cannot supply a higher-resolution time
 stamp, the
 .B pcap_set_tstamp_precision()
 call will fail, and the time stamps supplied after the
 .B pcap_activate()
 call will have microsecond resolution.
 .LP
 When opening a savefile, the
 .BR pcap_open_offline_with_tstamp_precision (3PCAP)
 and
 .BR pcap_fopen_offline_with_tstamp_precision (3PCAP)
 routines can be used to specify the resolution of time stamps to be read
 from the file; if the time stamps in the file have a lower resolution,
 the fraction-of-a-second portion of the time stamps will be scaled to
 the specified resolution.
 .LP
 The
 .BR pcap_get_tstamp_precision (3PCAP)
 routine returns the resolution of time stamps that will be supplied;
 when capturing packets, this does not reflect the actual precision of
 the time stamp supplied by the hardware or operating system and, when
 reading a savefile, this does not indicate the actual precision of time
 stamps in the file.
 .SH SEE ALSO
+.na
 pcap_set_tstamp_type(3PCAP),
 pcap_list_tstamp_types(3PCAP),
 pcap_tstamp_type_val_to_name(3PCAP),
 pcap_tstamp_type_name_to_val(3PCAP),
 pcap_set_tstamp_precision(3PCAP),
 pcap_open_offline_with_tstamp_precision(3PCAP),
-pcap_fopen_offline_with_tstamp_precision(3PCAP),
-pcap_get_tstamp_precision(3PCAP)
+\%pcap_fopen_offline_with_tstamp_precision(3PCAP),
+\%pcap_get_tstamp_precision(3PCAP)
+.ad
Index: vendor/libpcap/dist/pcap-types.h
===================================================================
--- vendor/libpcap/dist/pcap-types.h	(nonexistent)
+++ vendor/libpcap/dist/pcap-types.h	(revision 333789)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2009 CACE Technologies, Inc. Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef pcap_types_h
+#define pcap_types_h
+
+/*
+ * Get u_int defined, by hook or by crook.
+ */
+#ifdef _WIN32
+
+  /*
+   * This defines u_int.
+   */
+  #include <winsock2.h>
+#else /* _WIN32 */
+  /*
+   * This defines u_int, among other types.
+   */
+  #include <sys/types.h>
+#endif
+
+#endif /* pcap_types_h */

Property changes on: vendor/libpcap/dist/pcap-types.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/pcap-usb-linux.c
===================================================================
--- vendor/libpcap/dist/pcap-usb-linux.c	(revision 333788)
+++ vendor/libpcap/dist/pcap-usb-linux.c	(revision 333789)
@@ -1,979 +1,1198 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * USB sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
  * Modifications: Kris Katterjohn <katterjohn@gmail.com>
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
 #include "pcap-usb-linux.h"
 #include "pcap/usb.h"
 
 #ifdef NEED_STRERROR_H
 #include "strerror.h"
 #endif
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <dirent.h>
 #include <byteswap.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include <sys/utsname.h>
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
 /*
  * We might need <linux/compiler.h> to define __user for
  * <linux/usbdevice_fs.h>.
  */
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
 #endif /* HAVE_LINUX_COMPILER_H */
 #include <linux/usbdevice_fs.h>
 #endif /* HAVE_LINUX_USBDEVICE_FS_H */
 
 #define USB_IFACE "usbmon"
 #define USB_TEXT_DIR_OLD "/sys/kernel/debug/usbmon"
 #define USB_TEXT_DIR "/sys/kernel/debug/usb/usbmon"
 #define SYS_USB_BUS_DIR "/sys/bus/usb/devices"
 #define PROC_USB_BUS_DIR "/proc/bus/usb"
 #define USB_LINE_LEN 4096
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define htols(s) s
 #define htoll(l) l
 #define htol64(ll) ll
 #else
 #define htols(s) bswap_16(s)
 #define htoll(l) bswap_32(l)
 #define htol64(ll) bswap_64(ll)
 #endif
 
 struct mon_bin_stats {
-	u_int32_t queued;
-	u_int32_t dropped;
+	uint32_t queued;
+	uint32_t dropped;
 };
 
 struct mon_bin_get {
 	pcap_usb_header *hdr;
 	void *data;
 	size_t data_len;   /* Length of data (can be zero) */
 };
 
 struct mon_bin_mfetch {
 	int32_t *offvec;   /* Vector of events fetched */
 	int32_t nfetch;    /* Number of events to fetch (out: fetched) */
 	int32_t nflush;    /* Number of events to flush */
 };
 
 #define MON_IOC_MAGIC 0x92
 
 #define MON_IOCQ_URB_LEN _IO(MON_IOC_MAGIC, 1)
 #define MON_IOCX_URB  _IOWR(MON_IOC_MAGIC, 2, struct mon_bin_hdr)
 #define MON_IOCG_STATS _IOR(MON_IOC_MAGIC, 3, struct mon_bin_stats)
 #define MON_IOCT_RING_SIZE _IO(MON_IOC_MAGIC, 4)
 #define MON_IOCQ_RING_SIZE _IO(MON_IOC_MAGIC, 5)
 #define MON_IOCX_GET   _IOW(MON_IOC_MAGIC, 6, struct mon_bin_get)
 #define MON_IOCX_MFETCH _IOWR(MON_IOC_MAGIC, 7, struct mon_bin_mfetch)
 #define MON_IOCH_MFLUSH _IO(MON_IOC_MAGIC, 8)
 
 #define MON_BIN_SETUP 	0x1 /* setup hdr is present*/
 #define MON_BIN_SETUP_ZERO 	0x2 /* setup buffer is not available */
 #define MON_BIN_DATA_ZERO 	0x4 /* data buffer is not available */
 #define MON_BIN_ERROR 	0x8
 
 /*
  * Private data for capturing on Linux USB.
  */
 struct pcap_usb_linux {
 	u_char *mmapbuf;	/* memory-mapped region pointer */
 	size_t mmapbuflen;	/* size of region */
 	int bus_index;
 	u_int packets_read;
 };
 
 /* forward declaration */
 static int usb_activate(pcap_t *);
 static int usb_stats_linux(pcap_t *, struct pcap_stat *);
 static int usb_stats_linux_bin(pcap_t *, struct pcap_stat *);
 static int usb_read_linux(pcap_t *, int , pcap_handler , u_char *);
 static int usb_read_linux_bin(pcap_t *, int , pcap_handler , u_char *);
 static int usb_read_linux_mmap(pcap_t *, int , pcap_handler , u_char *);
 static int usb_inject_linux(pcap_t *, const void *, size_t);
 static int usb_setdirection_linux(pcap_t *, pcap_direction_t);
 static void usb_cleanup_linux_mmap(pcap_t *);
 
+static int
+have_binary_usbmon(void)
+{
+	struct utsname utsname;
+	char *version_component, *endp;
+	int major, minor, subminor;
+
+	if (uname(&utsname) == 0) {
+		/*
+		 * 2.6.21 is the first release with the binary-mode
+		 * USB monitoring.
+		 */
+		version_component = utsname.release;
+		major = strtol(version_component, &endp, 10);
+		if (endp != version_component && *endp == '.') {
+			/*
+			 * OK, that was a valid major version.
+			 * Is it 3 or greater?  If so, we have binary
+			 * mode support.
+			 */
+			if (major >= 3)
+				return 1;
+
+			/*
+			 * Is it 1 or less?  If so, we don't have binary
+			 * mode support.  (In fact, we don't have any
+			 * USB monitoring....)
+			 */
+			if (major <= 1)
+				return 0;
+		}
+
+		/*
+		 * OK, this is a 2.x kernel.
+		 * What's the minor version?
+		 */
+		version_component = endp + 1;
+		minor = strtol(version_component, &endp, 10);
+		if (endp != version_component &&
+		    (*endp == '.' || *endp == '\0')) {
+			/*
+			 * OK, that was a valid minor version.
+			 * Is is 2.6 or later?  (There shouldn't be a
+			 * "later", as 2.6.x went to 3.x, but we'll
+			 * check anyway.)
+			 */
+			if (minor < 6) {
+				/*
+				 * No, so no binary support (did 2.4 have
+				 * any USB monitoring at all?)
+				 */
+				return 0;
+			}
+
+			/*
+			 * OK, this is a 2.6.x kernel.
+			 * What's the subminor version?
+			 */
+			version_component = endp + 1;
+			subminor = strtol(version_component, &endp, 10);
+			if (endp != version_component &&
+			    (*endp == '.' || *endp == '\0')) {
+				/*
+				 * OK, that was a valid subminor version.
+				 * Is it 21 or greater?
+				 */
+				if (subminor >= 21) {
+					/*
+					 * Yes - we have binary mode
+					 * support.
+					 */
+					return 1;
+				}
+			}
+		}
+	}
+
+	/*
+	 * Either uname() failed, in which case we just say "no binary
+	 * mode support", or we don't have binary mode support.
+	 */
+	return 0;
+}
+
 /* facility to add an USB device to the device list*/
 static int
-usb_dev_add(pcap_if_t** alldevsp, int n, char *err_str)
+usb_dev_add(pcap_if_list_t *devlistp, int n, char *err_str)
 {
 	char dev_name[10];
 	char dev_descr[30];
 	pcap_snprintf(dev_name, 10, USB_IFACE"%d", n);
-	pcap_snprintf(dev_descr, 30, "USB bus number %d", n);
+	/*
+	 * XXX - is there any notion of "up" and "running"?
+	 */
+	if (n == 0) {
+		/*
+		 * As this refers to all buses, there's no notion of
+		 * "connected" vs. "disconnected", as that's a property
+		 * that would apply to a particular USB interface.
+		 */
+		if (add_dev(devlistp, dev_name,
+		    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
+		    "All USB buses", err_str) == NULL)
+			return -1;
+	} else {
+		/*
+		 * XXX - is there a way to determine whether anything's
+		 * plugged into this bus interface or not, and set
+		 * PCAP_IF_CONNECTION_STATUS_CONNECTED or
+		 * PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
+		 */
+		pcap_snprintf(dev_descr, 30, "USB bus number %d", n);
+		if (add_dev(devlistp, dev_name, 0, dev_descr, err_str) == NULL)
+			return -1;
+	}
 
-	if (pcap_add_if(alldevsp, dev_name, 0,
-	    dev_descr, err_str) < 0)
-		return -1;
 	return 0;
 }
 
 int
-usb_findalldevs(pcap_if_t **alldevsp, char *err_str)
+usb_findalldevs(pcap_if_list_t *devlistp, char *err_str)
 {
-	int fd;
+	char usb_mon_dir[PATH_MAX];
+	char *usb_mon_prefix;
+	size_t usb_mon_prefix_len;
 	struct dirent* data;
 	int ret = 0;
 	DIR* dir;
 	int n;
 	char* name;
 	size_t len;
 
-	/*
-	 * Do we have a "scan all buses" device?
-	 * First, try the binary device.
-	 */
-	fd = open(LINUX_USB_MON_DEV"0", O_RDONLY, 0);
-	if (fd >= 0) {
+	if (have_binary_usbmon()) {
 		/*
-		 * Yes.
+		 * We have binary-mode support.
+		 * What do the device names look like?
+		 * Split LINUX_USB_MON_DEV into a directory that we'll
+		 * scan and a file name prefix that we'll check for.
 		 */
-		close(fd);
-		if (pcap_add_if(alldevsp, "usbmon0", 0, "All USB buses",
-		    err_str) < 0)
-			return -1;
-	} else {
-		/*
-		 * No binary device; do we have the text device?
-		 */
-		fd = open(USB_TEXT_DIR"/0t", O_RDONLY, 0);
-		if (fd < 0) {
+		strlcpy(usb_mon_dir, LINUX_USB_MON_DEV, sizeof usb_mon_dir);
+		usb_mon_prefix = strrchr(usb_mon_dir, '/');
+		if (usb_mon_prefix == NULL) {
 			/*
-			 * Not at the new location; try the old location.
+			 * This "shouldn't happen".  Just give up if it
+			 * does.
 			 */
-			fd = open(USB_TEXT_DIR_OLD"/0t", O_RDONLY, 0);
+			return 0;
 		}
-		if (fd >= 0) {
-			/*
-			 * We found it.
-			 */
-			close(fd);
-			if (pcap_add_if(alldevsp, "usbmon0", 0, "All USB buses",
-			    err_str) < 0)
-				return -1;
+		*usb_mon_prefix++ = '\0';
+		usb_mon_prefix_len = strlen(usb_mon_prefix);
+
+		/*
+		 * Open the directory and scan it.
+		 */
+		dir = opendir(usb_mon_dir);
+		if (dir != NULL) {
+			while ((ret == 0) && ((data = readdir(dir)) != 0)) {
+				name = data->d_name;
+
+				/*
+				 * Is this a usbmon device?
+				 */
+				if (strncmp(name, usb_mon_prefix, usb_mon_prefix_len) != 0)
+					continue;	/* no */
+
+				/*
+				 * What's the device number?
+				 */
+				if (sscanf(&name[usb_mon_prefix_len], "%d", &n) == 0)
+					continue;	/* failed */
+
+				ret = usb_dev_add(devlistp, n, err_str);
+			}
+
+			closedir(dir);
 		}
-	}
+		return 0;
+	} else {
+		/*
+		 * We have only text mode support.
+		 * We don't look for the text devices because we can't
+		 * look for them without root privileges, and we don't
+		 * want to require root privileges to enumerate devices
+		 * (we want to let the user to try a device and get
+		 * an error, rather than seeing no devices and asking
+		 * "why am I not seeing devices" and forcing a long
+		 * process of poking to figure out whether it's "no
+		 * privileges" or "your kernel is too old" or "the
+		 * usbmon module isn't loaded" or...).
+		 *
+		 * Instead, we look to see what buses we have.
+		 * If the kernel is so old that it doesn't have
+		 * binary-mode support, it's also so old that
+		 * it doesn't have a "scan all buses" device.
+		 *
+		 * First, try scanning sysfs USB bus directory.
+		 */
+		dir = opendir(SYS_USB_BUS_DIR);
+		if (dir != NULL) {
+			while ((ret == 0) && ((data = readdir(dir)) != 0)) {
+				name = data->d_name;
 
-	/*
-	 * Now look for individual USB buses.
-	 *
-	 * First, try scanning sysfs USB bus directory.
-	 */
-	dir = opendir(SYS_USB_BUS_DIR);
-	if (dir != NULL) {
-		while ((ret == 0) && ((data = readdir(dir)) != 0)) {
-			name = data->d_name;
+				if (strncmp(name, "usb", 3) != 0)
+					continue;
 
-			if (strncmp(name, "usb", 3) != 0)
-				continue;
+				if (sscanf(&name[3], "%d", &n) == 0)
+					continue;
 
-			if (sscanf(&name[3], "%d", &n) == 0)
-				continue;
+				ret = usb_dev_add(devlistp, n, err_str);
+			}
 
-			ret = usb_dev_add(alldevsp, n, err_str);
+			closedir(dir);
+			return 0;
 		}
 
-		closedir(dir);
-		return ret;
-	}
+		/* That didn't work; try scanning procfs USB bus directory. */
+		dir = opendir(PROC_USB_BUS_DIR);
+		if (dir != NULL) {
+			while ((ret == 0) && ((data = readdir(dir)) != 0)) {
+				name = data->d_name;
+				len = strlen(name);
 
-	/* That didn't work; try scanning procfs USB bus directory. */
-	dir = opendir(PROC_USB_BUS_DIR);
-	if (dir != NULL) {
-		while ((ret == 0) && ((data = readdir(dir)) != 0)) {
-			name = data->d_name;
-			len = strlen(name);
+				/* if this file name does not end with a number it's not of our interest */
+				if ((len < 1) || !isdigit(name[--len]))
+					continue;
+				while (isdigit(name[--len]));
+				if (sscanf(&name[len+1], "%d", &n) != 1)
+					continue;
 
-			/* if this file name does not end with a number it's not of our interest */
-			if ((len < 1) || !isdigit(name[--len]))
-				continue;
-			while (isdigit(name[--len]));
-			if (sscanf(&name[len+1], "%d", &n) != 1)
-				continue;
+				ret = usb_dev_add(devlistp, n, err_str);
+			}
 
-			ret = usb_dev_add(alldevsp, n, err_str);
+			closedir(dir);
+			return ret;
 		}
 
-		closedir(dir);
-		return ret;
+		/* neither of them worked */
+		return 0;
 	}
-
-	/* neither of them worked */
-	return 0;
 }
 
 static
 int usb_mmap(pcap_t* handle)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	int len = ioctl(handle->fd, MON_IOCQ_RING_SIZE);
 	if (len < 0)
 		return 0;
 
 	handlep->mmapbuflen = len;
 	handlep->mmapbuf = mmap(0, handlep->mmapbuflen, PROT_READ,
 	    MAP_SHARED, handle->fd, 0);
 	return handlep->mmapbuf != MAP_FAILED;
 }
 
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
 
 #define CTRL_TIMEOUT    (5*1000)        /* milliseconds */
 
 #define USB_DIR_IN		0x80
 #define USB_TYPE_STANDARD	0x00
 #define USB_RECIP_DEVICE	0x00
 
 #define USB_REQ_GET_DESCRIPTOR	6
 
 #define USB_DT_DEVICE		1
 
 /* probe the descriptors of the devices attached to the bus */
 /* the descriptors will end up in the captured packet stream */
 /* and be decoded by external apps like wireshark */
 /* without these identifying probes packet data can't be fully decoded */
 static void
 probe_devices(int bus)
 {
 	struct usbdevfs_ctrltransfer ctrl;
 	struct dirent* data;
 	int ret = 0;
-	char buf[40];
+	char buf[sizeof("/dev/bus/usb/000/") + NAME_MAX];
 	DIR* dir;
 
 	/* scan usb bus directories for device nodes */
 	pcap_snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d", bus);
 	dir = opendir(buf);
 	if (!dir)
 		return;
 
 	while ((ret >= 0) && ((data = readdir(dir)) != 0)) {
 		int fd;
 		char* name = data->d_name;
 
 		if (name[0] == '.')
 			continue;
 
 		pcap_snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name);
 
 		fd = open(buf, O_RDWR);
 		if (fd == -1)
 			continue;
 
 		/*
 		 * Sigh.  Different kernels have different member names
 		 * for this structure.
 		 */
-#ifdef HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE
+#ifdef HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE
 		ctrl.bRequestType = USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE;
 		ctrl.bRequest = USB_REQ_GET_DESCRIPTOR;
 		ctrl.wValue = USB_DT_DEVICE << 8;
 		ctrl.wIndex = 0;
  		ctrl.wLength = sizeof(buf);
 #else
 		ctrl.requesttype = USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE;
 		ctrl.request = USB_REQ_GET_DESCRIPTOR;
 		ctrl.value = USB_DT_DEVICE << 8;
 		ctrl.index = 0;
  		ctrl.length = sizeof(buf);
 #endif
 		ctrl.data = buf;
 		ctrl.timeout = CTRL_TIMEOUT;
 
 		ret = ioctl(fd, USBDEVFS_CONTROL, &ctrl);
 
 		close(fd);
 	}
 	closedir(dir);
 }
 #endif /* HAVE_LINUX_USBDEVICE_FS_H */
 
 pcap_t *
 usb_create(const char *device, char *ebuf, int *is_ours)
 {
 	const char *cp;
 	char *cpend;
 	long devnum;
 	pcap_t *p;
 
 	/* Does this look like a USB monitoring device? */
 	cp = strrchr(device, '/');
 	if (cp == NULL)
 		cp = device;
 	/* Does it begin with USB_IFACE? */
 	if (strncmp(cp, USB_IFACE, sizeof USB_IFACE - 1) != 0) {
 		/* Nope, doesn't begin with USB_IFACE */
 		*is_ours = 0;
 		return NULL;
 	}
 	/* Yes - is USB_IFACE followed by a number? */
 	cp += sizeof USB_IFACE - 1;
 	devnum = strtol(cp, &cpend, 10);
 	if (cpend == cp || *cpend != '\0') {
 		/* Not followed by a number. */
 		*is_ours = 0;
 		return NULL;
 	}
 	if (devnum < 0) {
 		/* Followed by a non-valid number. */
 		*is_ours = 0;
 		return NULL;
 	}
 
 	/* OK, it's probably ours. */
 	*is_ours = 1;
 
 	p = pcap_create_common(ebuf, sizeof (struct pcap_usb_linux));
 	if (p == NULL)
 		return (NULL);
 
 	p->activate_op = usb_activate;
 	return (p);
 }
 
 static int
 usb_activate(pcap_t* handle)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	char 		full_path[USB_LINE_LEN];
 
+	/*
+	 * Turn a negative snapshot value (invalid), a snapshot value of
+	 * 0 (unspecified), or a value bigger than the normal maximum
+	 * value, into the maximum allowed value.
+	 *
+	 * If some application really *needs* a bigger snapshot
+	 * length, we should just increase MAXIMUM_SNAPLEN.
+	 */
+	if (handle->snapshot <= 0 || handle->snapshot > MAXIMUM_SNAPLEN)
+		handle->snapshot = MAXIMUM_SNAPLEN;
+
 	/* Initialize some components of the pcap structure. */
 	handle->bufsize = handle->snapshot;
 	handle->offset = 0;
 	handle->linktype = DLT_USB_LINUX;
 
 	handle->inject_op = usb_inject_linux;
 	handle->setfilter_op = install_bpf_program; /* no kernel filtering */
 	handle->setdirection_op = usb_setdirection_linux;
 	handle->set_datalink_op = NULL;	/* can't change data link type */
 	handle->getnonblock_op = pcap_getnonblock_fd;
 	handle->setnonblock_op = pcap_setnonblock_fd;
 
 	/*get usb bus index from device name */
 	if (sscanf(handle->opt.device, USB_IFACE"%d", &handlep->bus_index) != 1)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			"Can't get USB bus index from %s", handle->opt.device);
 		return PCAP_ERROR;
 	}
 
-	/*now select the read method: try to open binary interface */
-	pcap_snprintf(full_path, USB_LINE_LEN, LINUX_USB_MON_DEV"%d", handlep->bus_index);
-	handle->fd = open(full_path, O_RDONLY, 0);
-	if (handle->fd >= 0)
+	if (have_binary_usbmon())
 	{
-		if (handle->opt.rfmon) {
+		/*
+		 * We have binary-mode support.
+		 * Try to open the binary interface.
+		 */
+		pcap_snprintf(full_path, USB_LINE_LEN, LINUX_USB_MON_DEV"%d", handlep->bus_index);
+		handle->fd = open(full_path, O_RDONLY, 0);
+		if (handle->fd < 0)
+		{
 			/*
+			 * The attempt failed; why?
+			 */
+			switch (errno) {
+
+			case ENOENT:
+				/*
+				 * The device doesn't exist.
+				 * That could either mean that there's
+				 * no support for monitoring USB buses
+				 * (which probably means "the usbmon
+				 * module isn't loaded") or that there
+				 * is but that *particular* device
+				 * doesn't exist (no "scan all buses"
+				 * device if the bus index is 0, no
+				 * such bus if the bus index isn't 0).
+				 */
+				return PCAP_ERROR_NO_SUCH_DEVICE;
+
+			case EACCES:
+				/*
+				 * We didn't have permission to open it.
+				 */
+				return PCAP_ERROR_PERM_DENIED;
+
+			default:
+				/*
+				 * Something went wrong.
+				 */
+				pcap_fmt_errmsg_for_errno(handle->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "Can't open USB bus file %s", full_path);
+				return PCAP_ERROR;
+			}
+		}
+
+		if (handle->opt.rfmon)
+		{
+			/*
 			 * Monitor mode doesn't apply to USB devices.
 			 */
 			close(handle->fd);
 			return PCAP_ERROR_RFMON_NOTSUP;
 		}
 
-		/* binary api is available, try to use fast mmap access */
-		if (usb_mmap(handle)) {
+		/* try to use fast mmap access */
+		if (usb_mmap(handle))
+		{
 			handle->linktype = DLT_USB_LINUX_MMAPPED;
 			handle->stats_op = usb_stats_linux_bin;
 			handle->read_op = usb_read_linux_mmap;
 			handle->cleanup_op = usb_cleanup_linux_mmap;
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
 			probe_devices(handlep->bus_index);
 #endif
 
 			/*
-			 * "handle->fd" is a real file, so "select()" and
-			 * "poll()" work on it.
+			 * "handle->fd" is a real file, so
+			 * "select()" and "poll()" work on it.
 			 */
 			handle->selectable_fd = handle->fd;
 			return 0;
 		}
 
 		/* can't mmap, use plain binary interface access */
 		handle->stats_op = usb_stats_linux_bin;
 		handle->read_op = usb_read_linux_bin;
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
 		probe_devices(handlep->bus_index);
 #endif
 	}
 	else {
-		/*Binary interface not available, try open text interface */
+		/*
+		 * We don't have binary mode support.
+		 * Try opening the text-mode device.
+		 */
 		pcap_snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR"/%dt", handlep->bus_index);
 		handle->fd = open(full_path, O_RDONLY, 0);
 		if (handle->fd < 0)
 		{
 			if (errno == ENOENT)
 			{
 				/*
 				 * Not found at the new location; try
 				 * the old location.
 				 */
 				pcap_snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%dt", handlep->bus_index);
 				handle->fd = open(full_path, O_RDONLY, 0);
 			}
 			if (handle->fd < 0) {
-				/* no more fallback, give it up*/
-				pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-					"Can't open USB bus file %s: %s", full_path, strerror(errno));
-				return PCAP_ERROR;
+				/*
+				 * Is the problem that we didn't have
+				 * sufficient permission to open it?
+				 */
+				if (errno == EACCES) {
+					/*
+					 * Yes - return that error.
+					 */
+					return PCAP_ERROR_PERM_DENIED;
+				}
+
+				/*
+				 * No - was the problem something other
+				 * than "it doesn't exist"?
+				 */
+				if (errno != ENOENT) {
+					/*
+					 * Yes - return *that* error.
+					 */
+					pcap_fmt_errmsg_for_errno(handle->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "Can't open USB bus file %s",
+					    full_path);
+					return PCAP_ERROR;
+				}
+
+				/*
+				 * No.  Report that as "no such device".
+				 * (That could mean "no such USB bus"
+				 * or "monitoring not supported".)
+				 */
+				return PCAP_ERROR_NO_SUCH_DEVICE;
 			}
 		}
 
-		if (handle->opt.rfmon) {
+		if (handle->opt.rfmon)
+		{
 			/*
 			 * Monitor mode doesn't apply to USB devices.
 			 */
 			close(handle->fd);
 			return PCAP_ERROR_RFMON_NOTSUP;
 		}
 
 		handle->stats_op = usb_stats_linux;
 		handle->read_op = usb_read_linux;
 	}
 
 	/*
 	 * "handle->fd" is a real file, so "select()" and "poll()"
 	 * work on it.
 	 */
 	handle->selectable_fd = handle->fd;
 
 	/* for plain binary access and text access we need to allocate the read
 	 * buffer */
 	handle->buffer = malloc(handle->bufsize);
 	if (!handle->buffer) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			 "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		close(handle->fd);
 		return PCAP_ERROR;
 	}
 	return 0;
 }
 
 static inline int
 ascii_to_int(char c)
 {
 	return c < 'A' ? c- '0': ((c<'a') ? c - 'A' + 10: c-'a'+10);
 }
 
 /*
  * see <linux-kernel-source>/Documentation/usb/usbmon.txt and
  * <linux-kernel-source>/drivers/usb/mon/mon_text.c for urb string
  * format description
  */
 static int
-usb_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+usb_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
 	/* see:
 	* /usr/src/linux/Documentation/usb/usbmon.txt
 	* for message format
 	*/
 	struct pcap_usb_linux *handlep = handle->priv;
 	unsigned timestamp;
 	int tag, cnt, ep_num, dev_addr, dummy, ret, urb_len, data_len;
 	char etype, pipeid1, pipeid2, status[16], urb_tag, line[USB_LINE_LEN];
 	char *string = line;
 	u_char * rawdata = handle->buffer;
 	struct pcap_pkthdr pkth;
 	pcap_usb_header* uhdr = (pcap_usb_header*)handle->buffer;
 	u_char urb_transfer=0;
 	int incoming=0;
 
 	/* ignore interrupt system call errors */
 	do {
 		ret = read(handle->fd, line, USB_LINE_LEN - 1);
 		if (handle->break_loop)
 		{
 			handle->break_loop = 0;
 			return -2;
 		}
 	} while ((ret == -1) && (errno == EINTR));
 	if (ret < 0)
 	{
 		if (errno == EAGAIN)
 			return 0;	/* no data there */
 
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't read from fd %d: %s", handle->fd, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't read from fd %d", handle->fd);
 		return -1;
 	}
 
 	/* read urb header; %n argument may increment return value, but it's
 	* not mandatory, so does not count on it*/
 	string[ret] = 0;
 	ret = sscanf(string, "%x %d %c %c%c:%d:%d %s%n", &tag, &timestamp, &etype,
 		&pipeid1, &pipeid2, &dev_addr, &ep_num, status,
 		&cnt);
 	if (ret < 8)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		    "Can't parse USB bus message '%s', too few tokens (expected 8 got %d)",
 		    string, ret);
 		return -1;
 	}
 	uhdr->id = tag;
 	uhdr->device_address = dev_addr;
 	uhdr->bus_id = handlep->bus_index;
 	uhdr->status = 0;
 	string += cnt;
 
 	/* don't use usbmon provided timestamp, since it have low precision*/
 	if (gettimeofday(&pkth.ts, NULL) < 0)
 	{
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			"Can't get timestamp for message '%s' %d:%s",
-			string, errno, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't get timestamp for message '%s'", string);
 		return -1;
 	}
 	uhdr->ts_sec = pkth.ts.tv_sec;
 	uhdr->ts_usec = pkth.ts.tv_usec;
 
 	/* parse endpoint information */
 	if (pipeid1 == 'C')
 		urb_transfer = URB_CONTROL;
 	else if (pipeid1 == 'Z')
 		urb_transfer = URB_ISOCHRONOUS;
 	else if (pipeid1 == 'I')
 		urb_transfer = URB_INTERRUPT;
 	else if (pipeid1 == 'B')
 		urb_transfer = URB_BULK;
 	if (pipeid2 == 'i') {
 		ep_num |= URB_TRANSFER_IN;
 		incoming = 1;
 	}
 	if (etype == 'C')
 		incoming = !incoming;
 
 	/* direction check*/
 	if (incoming)
 	{
 		if (handle->direction == PCAP_D_OUT)
 			return 0;
 	}
 	else
 		if (handle->direction == PCAP_D_IN)
 			return 0;
 	uhdr->event_type = etype;
 	uhdr->transfer_type = urb_transfer;
 	uhdr->endpoint_number = ep_num;
 	pkth.caplen = sizeof(pcap_usb_header);
 	rawdata += sizeof(pcap_usb_header);
 
 	/* check if this is a setup packet */
 	ret = sscanf(status, "%d", &dummy);
 	if (ret != 1)
 	{
 		/* this a setup packet, setup data can be filled with underscore if
 		* usbmon has not been able to read them, so we must parse this fields as
 		* strings */
 		pcap_usb_setup* shdr;
 		char str1[3], str2[3], str3[5], str4[5], str5[5];
 		ret = sscanf(string, "%s %s %s %s %s%n", str1, str2, str3, str4,
 		str5, &cnt);
 		if (ret < 5)
 		{
 			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 				"Can't parse USB bus message '%s', too few tokens (expected 5 got %d)",
 				string, ret);
 			return -1;
 		}
 		string += cnt;
 
 		/* try to convert to corresponding integer */
 		shdr = &uhdr->setup;
 		shdr->bmRequestType = strtoul(str1, 0, 16);
 		shdr->bRequest = strtoul(str2, 0, 16);
 		shdr->wValue = htols(strtoul(str3, 0, 16));
 		shdr->wIndex = htols(strtoul(str4, 0, 16));
 		shdr->wLength = htols(strtoul(str5, 0, 16));
 
 		uhdr->setup_flag = 0;
 	}
 	else
 		uhdr->setup_flag = 1;
 
 	/* read urb data */
 	ret = sscanf(string, " %d%n", &urb_len, &cnt);
 	if (ret < 1)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 		  "Can't parse urb length from '%s'", string);
 		return -1;
 	}
 	string += cnt;
 
 	/* urb tag is not present if urb length is 0, so we can stop here
 	 * text parsing */
 	pkth.len = urb_len+pkth.caplen;
 	uhdr->urb_len = urb_len;
 	uhdr->data_flag = 1;
 	data_len = 0;
 	if (uhdr->urb_len == 0)
 		goto got;
 
 	/* check for data presence; data is present if and only if urb tag is '=' */
 	if (sscanf(string, " %c", &urb_tag) != 1)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			"Can't parse urb tag from '%s'", string);
 		return -1;
 	}
 
 	if (urb_tag != '=')
 		goto got;
 
 	/* skip urb tag and following space */
 	string += 3;
 
 	/* if we reach this point we got some urb data*/
 	uhdr->data_flag = 0;
 
 	/* read all urb data; if urb length is greater then the usbmon internal
 	 * buffer length used by the kernel to spool the URB, we get only
 	 * a partial information.
 	 * At least until linux 2.6.17 there is no way to set usbmon intenal buffer
 	 * length and default value is 130. */
 	while ((string[0] != 0) && (string[1] != 0) && (pkth.caplen < (bpf_u_int32)handle->snapshot))
 	{
 		rawdata[0] = ascii_to_int(string[0]) * 16 + ascii_to_int(string[1]);
 		rawdata++;
 		string+=2;
 		if (string[0] == ' ')
 			string++;
 		pkth.caplen++;
 		data_len++;
 	}
 
 got:
 	uhdr->data_len = data_len;
 	if (pkth.caplen > (bpf_u_int32)handle->snapshot)
 		pkth.caplen = (bpf_u_int32)handle->snapshot;
 
 	if (handle->fcode.bf_insns == NULL ||
 	    bpf_filter(handle->fcode.bf_insns, handle->buffer,
 	      pkth.len, pkth.caplen)) {
 		handlep->packets_read++;
 		callback(user, &pkth, handle->buffer);
 		return 1;
 	}
 	return 0;	/* didn't pass filter */
 }
 
 static int
-usb_inject_linux(pcap_t *handle, const void *buf, size_t size)
+usb_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
 	pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "
 		"USB devices");
 	return (-1);
 }
 
 static int
 usb_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	int dummy, ret, consumed, cnt;
 	char string[USB_LINE_LEN];
 	char token[USB_LINE_LEN];
 	char * ptr = string;
 	int fd;
 
 	pcap_snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handlep->bus_index);
 	fd = open(string, O_RDONLY, 0);
 	if (fd < 0)
 	{
 		if (errno == ENOENT)
 		{
 			/*
 			 * Not found at the new location; try the old
 			 * location.
 			 */
 			pcap_snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handlep->bus_index);
 			fd = open(string, O_RDONLY, 0);
 		}
 		if (fd < 0) {
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-				"Can't open USB stats file %s: %s",
-				string, strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno,
+			    "Can't open USB stats file %s", string);
 			return -1;
 		}
 	}
 
 	/* read stats line */
 	do {
 		ret = read(fd, string, USB_LINE_LEN-1);
 	} while ((ret == -1) && (errno == EINTR));
 	close(fd);
 
 	if (ret < 0)
 	{
 		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
 			"Can't read stats from fd %d ", fd);
 		return -1;
 	}
 	string[ret] = 0;
 
 	/* extract info on dropped urbs */
 	for (consumed=0; consumed < ret; ) {
 		/* from the sscanf man page:
  		 * The C standard says: "Execution of a %n directive does
  		 * not increment the assignment count returned at the completion
 		 * of  execution" but the Corrigendum seems to contradict this.
 		 * Do not make any assumptions on the effect of %n conversions
 		 * on the return value and explicitly check for cnt assignmet*/
 		int ntok;
 
 		cnt = -1;
 		ntok = sscanf(ptr, "%s%n", token, &cnt);
 		if ((ntok < 1) || (cnt < 0))
 			break;
 		consumed += cnt;
 		ptr += cnt;
 		if (strcmp(token, "nreaders") == 0)
 			ret = sscanf(ptr, "%d", &stats->ps_drop);
 		else
 			ret = sscanf(ptr, "%d", &dummy);
 		if (ntok != 1)
 			break;
 		consumed += cnt;
 		ptr += cnt;
 	}
 
 	stats->ps_recv = handlep->packets_read;
 	stats->ps_ifdrop = 0;
 	return 0;
 }
 
 static int
 usb_setdirection_linux(pcap_t *p, pcap_direction_t d)
 {
 	p->direction = d;
 	return 0;
 }
 
 
 static int
 usb_stats_linux_bin(pcap_t *handle, struct pcap_stat *stats)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	int ret;
 	struct mon_bin_stats st;
 	ret = ioctl(handle->fd, MON_IOCG_STATS, &st);
 	if (ret < 0)
 	{
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			"Can't read stats from fd %d:%s ", handle->fd, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't read stats from fd %d", handle->fd);
 		return -1;
 	}
 
 	stats->ps_recv = handlep->packets_read + st.queued;
 	stats->ps_drop = st.dropped;
 	stats->ps_ifdrop = 0;
 	return 0;
 }
 
 /*
  * see <linux-kernel-source>/Documentation/usb/usbmon.txt and
  * <linux-kernel-source>/drivers/usb/mon/mon_bin.c binary ABI
  */
 static int
-usb_read_linux_bin(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+usb_read_linux_bin(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	struct mon_bin_get info;
 	int ret;
 	struct pcap_pkthdr pkth;
 	u_int clen = handle->snapshot - sizeof(pcap_usb_header);
 
 	/* the usb header is going to be part of 'packet' data*/
 	info.hdr = (pcap_usb_header*) handle->buffer;
 	info.data = (u_char *)handle->buffer + sizeof(pcap_usb_header);
 	info.data_len = clen;
 
 	/* ignore interrupt system call errors */
 	do {
 		ret = ioctl(handle->fd, MON_IOCX_GET, &info);
 		if (handle->break_loop)
 		{
 			handle->break_loop = 0;
 			return -2;
 		}
 	} while ((ret == -1) && (errno == EINTR));
 	if (ret < 0)
 	{
 		if (errno == EAGAIN)
 			return 0;	/* no data there */
 
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't read from fd %d: %s", handle->fd, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't read from fd %d", handle->fd);
 		return -1;
 	}
 
 	/* we can get less that than really captured from kernel, depending on
 	 * snaplen, so adjust header accordingly */
 	if (info.hdr->data_len < clen)
 		clen = info.hdr->data_len;
 	info.hdr->data_len = clen;
 	pkth.caplen = clen + sizeof(pcap_usb_header);
 	pkth.len = info.hdr->data_len + sizeof(pcap_usb_header);
 	pkth.ts.tv_sec = info.hdr->ts_sec;
 	pkth.ts.tv_usec = info.hdr->ts_usec;
 
 	if (handle->fcode.bf_insns == NULL ||
 	    bpf_filter(handle->fcode.bf_insns, handle->buffer,
 	      pkth.len, pkth.caplen)) {
 		handlep->packets_read++;
 		callback(user, &pkth, handle->buffer);
 		return 1;
 	}
 
 	return 0;	/* didn't pass filter */
 }
 
 /*
  * see <linux-kernel-source>/Documentation/usb/usbmon.txt and
  * <linux-kernel-source>/drivers/usb/mon/mon_bin.c binary ABI
  */
 #define VEC_SIZE 32
 static int
 usb_read_linux_mmap(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 	struct mon_bin_mfetch fetch;
 	int32_t vec[VEC_SIZE];
 	struct pcap_pkthdr pkth;
 	pcap_usb_header* hdr;
 	int nflush = 0;
 	int packets = 0;
 	u_int clen, max_clen;
 
 	max_clen = handle->snapshot - sizeof(pcap_usb_header);
 
 	for (;;) {
 		int i, ret;
 		int limit = max_packets - packets;
 		if (limit <= 0)
 			limit = VEC_SIZE;
 		if (limit > VEC_SIZE)
 			limit = VEC_SIZE;
 
 		/* try to fetch as many events as possible*/
 		fetch.offvec = vec;
 		fetch.nfetch = limit;
 		fetch.nflush = nflush;
 		/* ignore interrupt system call errors */
 		do {
 			ret = ioctl(handle->fd, MON_IOCX_MFETCH, &fetch);
 			if (handle->break_loop)
 			{
 				handle->break_loop = 0;
 				return -2;
 			}
 		} while ((ret == -1) && (errno == EINTR));
 		if (ret < 0)
 		{
 			if (errno == EAGAIN)
 				return 0;	/* no data there */
 
-			pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-			    "Can't mfetch fd %d: %s", handle->fd, strerror(errno));
+			pcap_fmt_errmsg_for_errno(handle->errbuf,
+			    PCAP_ERRBUF_SIZE, errno, "Can't mfetch fd %d",
+			    handle->fd);
 			return -1;
 		}
 
 		/* keep track of processed events, we will flush them later */
 		nflush = fetch.nfetch;
 		for (i=0; i<fetch.nfetch; ++i) {
 			/* discard filler */
 			hdr = (pcap_usb_header*) &handlep->mmapbuf[vec[i]];
 			if (hdr->event_type == '@')
 				continue;
 
 			/* we can get less that than really captured from kernel, depending on
 	 		* snaplen, so adjust header accordingly */
 			clen = max_clen;
 			if (hdr->data_len < clen)
 				clen = hdr->data_len;
 
 			/* get packet info from header*/
 			pkth.caplen = clen + sizeof(pcap_usb_header_mmapped);
 			pkth.len = hdr->data_len + sizeof(pcap_usb_header_mmapped);
 			pkth.ts.tv_sec = hdr->ts_sec;
 			pkth.ts.tv_usec = hdr->ts_usec;
 
 			if (handle->fcode.bf_insns == NULL ||
 			    bpf_filter(handle->fcode.bf_insns, (u_char*) hdr,
 			      pkth.len, pkth.caplen)) {
 				handlep->packets_read++;
 				callback(user, &pkth, (u_char*) hdr);
 				packets++;
 			}
 		}
 
 		/* with max_packets specifying "unlimited" we stop afer the first chunk*/
 		if (PACKET_COUNT_IS_UNLIMITED(max_packets) || (packets == max_packets))
 			break;
 	}
 
 	/* flush pending events*/
 	if (ioctl(handle->fd, MON_IOCH_MFLUSH, nflush) == -1) {
-		pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-		    "Can't mflush fd %d: %s", handle->fd, strerror(errno));
+		pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't mflush fd %d", handle->fd);
 		return -1;
 	}
 	return packets;
 }
 
 static void
 usb_cleanup_linux_mmap(pcap_t* handle)
 {
 	struct pcap_usb_linux *handlep = handle->priv;
 
 	/* if we have a memory-mapped buffer, unmap it */
 	if (handlep->mmapbuf != NULL) {
 		munmap(handlep->mmapbuf, handlep->mmapbuflen);
 		handlep->mmapbuf = NULL;
 	}
 	pcap_cleanup_live_common(handle);
 }
Index: vendor/libpcap/dist/pcap-usb-linux.h
===================================================================
--- vendor/libpcap/dist/pcap-usb-linux.h	(revision 333788)
+++ vendor/libpcap/dist/pcap-usb-linux.h	(revision 333789)
@@ -1,38 +1,38 @@
 /*
  * Copyright (c) 2006 Paolo Abeni (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  * products derived from this software without specific prior written
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * USB sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
  */
 
 /*
  * Prototypes for USB-related functions
  */
-int usb_findalldevs(pcap_if_t **alldevsp, char *err_str);
+int usb_findalldevs(pcap_if_list_t *devlistp, char *err_str);
 pcap_t *usb_create(const char *device, char *ebuf, int *is_ours);
Index: vendor/libpcap/dist/pcap.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap.3pcap.in	(revision 333789)
@@ -1,937 +1,945 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP 3PCAP "8 March 2015"
+.TH PCAP 3PCAP "20 January 2017"
 .SH NAME
 pcap \- Packet Capture library
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .LP
 .ft B
 .ft
 .fi
 .SH DESCRIPTION
 The Packet Capture library
 provides a high level interface to packet capture systems. All packets
 on the network, even those destined for other hosts, are accessible
 through this mechanism.
 It also supports saving captured packets to a ``savefile'', and reading
 packets from a ``savefile''.
 .SS Opening a capture handle for reading
 To open a handle for a live capture, given the name of the network or
 other interface on which the capture should be done, call
 .BR pcap_create (),
 set the appropriate options on the handle, and then activate it with
 .BR pcap_activate ().
 .PP
 To obtain a list of devices that can be opened for a live capture, call
 .BR pcap_findalldevs ();
 to free the list returned by
 .BR pcap_findalldevs (),
 call
 .BR pcap_freealldevs ().
 .BR pcap_lookupdev ()
 will return the first device on that list that is not a ``loopback``
 network interface.
 .PP
 To open a handle for a ``savefile'' from which to read packets, given the
 pathname of the ``savefile'', call
 .BR pcap_open_offline ();
 to set up a handle for a ``savefile'', given a
 .B "FILE\ *"
 referring to a file already opened for reading, call
 .BR pcap_fopen_offline ().
 .PP
 In order to get a ``fake''
 .B pcap_t
 for use in routines that require a
 .B pcap_t
 as an argument, such as routines to open a ``savefile'' for writing and
 to compile a filter expression, call
 .BR pcap_open_dead ().
 .PP
 .BR pcap_create (),
 .BR pcap_open_offline (),
 .BR pcap_fopen_offline (),
 and
 .BR pcap_open_dead ()
 return a pointer to a
 .BR pcap_t ,
 which is the handle used for reading packets from the capture stream or
 the ``savefile'', and for finding out information about the capture
 stream or ``savefile''.
 To close a handle, use
 .BR pcap_close ().
 .PP
 The options that can be set on a capture handle include
 .IP "snapshot length"
 If, when capturing, you capture the entire contents of the packet, that
 requires more CPU time to copy the packet to your application, more disk
 and possibly network bandwidth to write the packet data to a file, and
 more disk space to save the packet.  If you don't need the entire
 contents of the packet - for example, if you are only interested in the
 TCP headers of packets - you can set the "snapshot length" for the
 capture to an appropriate value.  If the snapshot length is set to
 .IR snaplen ,
 and
 .I snaplen
 is less
 than the size of a packet that is captured, only the first
 .I snaplen
 bytes of that packet will be captured and provided as packet data.
 .IP
 A snapshot length of 65535 should be sufficient, on most if not all
 networks, to capture all the data available from the packet.
 .IP
 The snapshot length is set with
 .BR pcap_set_snaplen ().
 .IP "promiscuous mode"
 On broadcast LANs such as Ethernet, if the network isn't switched, or if
 the adapter is connected to a "mirror port" on a switch to which all
 packets passing through the switch are sent, a network adapter receives
 all packets on the LAN, including unicast or multicast packets not sent
 to a network address that the network adapter isn't configured to
 recognize.
 .IP
 Normally, the adapter will discard those packets; however, many network
 adapters support "promiscuous mode", which is a mode in which all
 packets, even if they are not sent to an address that the adapter
 recognizes, are provided to the host.  This is useful for passively
 capturing traffic between two or more other hosts for analysis.
 .IP
 Note that even if an application does not set promiscuous mode, the
 adapter could well be in promiscuous mode for some other reason.
 .IP
 For now, this doesn't work on the "any" device; if an argument of "any"
 or NULL is supplied, the setting of promiscuous mode is ignored.
 .IP
 Promiscuous mode is set with
 .BR pcap_set_promisc ().
 .IP "monitor mode"
 On IEEE 802.11 wireless LANs, even if an adapter is in promiscuous mode,
 it will supply to the host only frames for the network with which it's
 associated.  It might also supply only data frames, not management or
 control frames, and might not provide the 802.11 header or radio
 information pseudo-header for those frames.
 .IP
 In "monitor mode", sometimes also called "rfmon mode" (for "Radio
 Frequency MONitor"), the adapter will supply all frames that it
 receives, with 802.11 headers, and might supply a pseudo-header with
 radio information about the frame as well.
 .IP
 Note that in monitor mode the adapter might disassociate from the
 network with which it's associated, so that you will not be able to use
 any wireless networks with that adapter.  This could prevent accessing
 files on a network server, or resolving host names or network addresses,
 if you are capturing in monitor mode and are not connected to another
 network with another adapter.
 .IP
 Monitor mode is set with
 .BR pcap_set_rfmon (),
 and
 .BR pcap_can_set_rfmon ()
 can be used to determine whether an adapter can be put into monitor
 mode.
-.IP "read timeout"
+.IP "packet buffer timeout"
 If, when capturing, packets are delivered as soon as they arrive, the
 application capturing the packets will be woken up for each packet as it
 arrives, and might have to make one or more calls to the operating
 system to fetch each packet.
 .IP
 If, instead, packets are not delivered as soon as they arrive, but are
-delivered after a short delay (called a "read timeout"), more than one
-packet can be accumulated before the packets are delivered, so that a
-single wakeup would be done for multiple packets, and each set of calls
-made to the operating system would supply multiple packets, rather than
-a single packet.  This reduces the per-packet CPU overhead if packets
-are arriving at a high rate, increasing the number of packets per second
-that can be captured.
+delivered after a short delay (called a "packet buffer timeout"), more
+than one packet can be accumulated before the packets are delivered, so
+that a single wakeup would be done for multiple packets, and each set of
+calls made to the operating system would supply multiple packets, rather
+than a single packet.  This reduces the per-packet CPU overhead if
+packets are arriving at a high rate, increasing the number of packets
+per second that can be captured.
 .IP
-The read timeout is required so that an application won't wait for the
-operating system's capture buffer to fill up before packets are
+The packet buffer timeout is required so that an application won't wait
+for the operating system's capture buffer to fill up before packets are
 delivered; if packets are arriving slowly, that wait could take an
 arbitrarily long period of time.
 .IP
-Not all platforms support a read timeout; on platforms that
-don't, the read timeout is ignored.  A zero value for the timeout,
-on platforms that support a read timeout,
-will cause a read to wait forever to allow enough packets to
-arrive, with no timeout.
+Not all platforms support a packet buffer timeout; on platforms that
+don't, the packet buffer timeout is ignored.  A zero value for the
+timeout, on platforms that support a packet buffer timeout, will cause a
+read to wait forever to allow enough packets to arrive, with no timeout.
+A negative value is invalid; the result of setting the timeout to a
+negative value is unpredictable.
 .IP
 .BR NOTE :
-the read timeout cannot be used to cause calls that read
+the packet buffer timeout cannot be used to cause calls that read
 packets to return within a limited period of time, because, on some
-platforms, the read timeout isn't supported, and, on other platforms,
-the timer doesn't start until at least one packet arrives.  This means
-that the read timeout should
+platforms, the packet buffer timeout isn't supported, and, on other
+platforms, the timer doesn't start until at least one packet arrives. 
+This means that the packet buffer timeout should
 .B NOT
 be used, for example, in an interactive application to allow the packet
 capture loop to ``poll'' for user input periodically, as there's no
 guarantee that a call reading packets will return after the timeout
 expires even if no packets have arrived.
 .IP
-The read timeout is set with
+The packet buffer timeout is set with
 .BR pcap_set_timeout ().
 .IP "buffer size"
 Packets that arrive for a capture are stored in a buffer, so that they
 do not have to be read by the application as soon as they arrive.  On
 some platforms, the buffer's size can be set; a size that's too small
 could mean that, if too many packets are being captured and the snapshot
 length doesn't limit the amount of data that's buffered, packets could
 be dropped if the buffer fills up before the application can read
 packets from it, while a size that's too large could use more
 non-pageable operating system memory than is necessary to prevent
 packets from being dropped.
 .IP
 The buffer size is set with
 .BR pcap_set_buffer_size ().
 .IP "timestamp type"
 On some platforms, the time stamp given to packets on live captures can
 come from different sources that can have different resolutions or that
 can have different relationships to the time values for the current time
 supplied by routines on the native operating system.  See
 .BR pcap-tstamp (@MAN_MISC_INFO@)
 for a list of time stamp types.
 .IP
 The time stamp type is set with
 .BR pcap_set_tstamp_type ().
 .PP
 Reading packets from a network interface may require that you have
 special privileges:
 .TP
 .B Under SunOS 3.x or 4.x with NIT or BPF:
 You must have read access to
 .I /dev/nit
 or
 .IR /dev/bpf* .
 .TP
 .B Under Solaris with DLPI:
 You must have read/write access to the network pseudo device, e.g.
 .IR /dev/le .
 On at least some versions of Solaris, however, this is not sufficient to
 allow
 .I tcpdump
 to capture in promiscuous mode; on those versions of Solaris, you must
 be root, or the application capturing packets
 must be installed setuid to root, in order to capture in promiscuous
 mode.  Note that, on many (perhaps all) interfaces, if you don't capture
 in promiscuous mode, you will not see any outgoing packets, so a capture
 not done in promiscuous mode may not be very useful.
 .IP
 In newer versions of Solaris, you must have been given the
 .B net_rawaccess
 privilege; this is both necessary and sufficient to give you access to the
 network pseudo-device - there is no need to change the privileges on
 that device.  A user can be given that privilege by, for example, adding
 that privilege to the user's
 .B defaultpriv
 key with the
-.B usermod (1M)
+.B usermod (@MAN_ADMIN_COMMANDS@)
 command.
 .TP
 .B Under HP-UX with DLPI:
 You must be root or the application capturing packets must be installed
 setuid to root.
 .TP
 .B Under IRIX with snoop:
 You must be root or the application capturing packets must be installed
 setuid to root.
 .TP
 .B Under Linux:
 You must be root or the application capturing packets must be installed
 setuid to root (unless your distribution has a kernel
 that supports capability bits such as CAP_NET_RAW and code to allow
 those capability bits to be given to particular accounts and to cause
 those bits to be set on a user's initial processes when they log in, in
 which case you  must have CAP_NET_RAW in order to capture and
 CAP_NET_ADMIN to enumerate network devices with, for example, the
 .B \-D
 flag).
 .TP
 .B Under ULTRIX and Digital UNIX/Tru64 UNIX:
 Any user may capture network traffic.
 However, no user (not even the super-user) can capture in promiscuous
 mode on an interface unless the super-user has enabled promiscuous-mode
 operation on that interface using
 .IR pfconfig (8),
 and no user (not even the super-user) can capture unicast traffic
 received by or sent by the machine on an interface unless the super-user
 has enabled copy-all-mode operation on that interface using
 .IR pfconfig ,
 so
 .I useful
 packet capture on an interface probably requires that either
 promiscuous-mode or copy-all-mode operation, or both modes of
 operation, be enabled on that interface.
 .TP
-.B Under BSD (this includes Mac OS X):
+.B Under BSD (this includes macOS):
 You must have read access to
 .I /dev/bpf*
 on systems that don't have a cloning BPF device, or to
 .I /dev/bpf
 on systems that do.
-On BSDs with a devfs (this includes Mac OS X), this might involve more
+On BSDs with a devfs (this includes macOS), this might involve more
 than just having somebody with super-user access setting the ownership
 or permissions on the BPF devices - it might involve configuring devfs
 to set the ownership or permissions every time the system is booted,
 if the system even supports that; if it doesn't support that, you might
 have to find some other way to make that happen at boot time.
 .PP
 Reading a saved packet file doesn't require special privileges.
 .PP
 The packets read from the handle may include a ``pseudo-header''
 containing various forms of packet meta-data, and probably includes a
 link-layer header whose contents can differ for different network
 interfaces.  To determine the format of the packets supplied by the
 handle, call
 .BR pcap_datalink ();
 .I http://www.tcpdump.org/linktypes.html
 lists the values it returns and describes the packet formats that
 correspond to those values.
 .PP
 Do
 .B NOT
 assume that the packets for a given capture or ``savefile`` will have
 any given link-layer header type, such as
 .B DLT_EN10MB
 for Ethernet.  For example, the "any" device on Linux will have a
 link-layer header type of
 .B DLT_LINUX_SLL
 even if all devices on the system at the time the "any" device is opened
 have some other data link type, such as
 .B DLT_EN10MB
 for Ethernet.
 .PP
 To obtain the
 .B "FILE\ *"
 corresponding to a
 .B pcap_t
 opened for a ``savefile'', call
 .BR pcap_file ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_create (3PCAP)
 get a
 .B pcap_t
 for live capture
 .TP
 .BR pcap_activate (3PCAP)
 activate a
 .B pcap_t
 for live capture
 .TP
 .BR pcap_findalldevs (3PCAP)
 get a list of devices that can be opened for a live capture
 .TP
 .BR pcap_freealldevs (3PCAP)
 free list of devices
 .TP
 .BR pcap_lookupdev (3PCAP)
 get first non-loopback device on that list
 .TP
 .BR pcap_open_offline (3PCAP)
 open a
 .B pcap_t
 for a ``savefile'', given a pathname
 .TP
 .BR pcap_open_offline_with_tstamp_precision (3PCAP)
 open a
 .B pcap_t
 for a ``savefile'', given a pathname, and specify the precision to
 provide for packet time stamps
 .TP
 .BR pcap_fopen_offline (3PCAP)
 open a
 .B pcap_t
 for a ``savefile'', given a
 .B "FILE\ *"
 .TP
 .BR pcap_fopen_offline_with_tstamp_precision (3PCAP)
 open a
 .B pcap_t
 for a ``savefile'', given a
 .BR "FILE\ *" ,
 and specify the precision to provide for packet time stamps
 .TP
 .BR pcap_open_dead (3PCAP)
 create a ``fake''
 .B pcap_t
 .TP
 .BR pcap_close (3PCAP)
 close a
 .B pcap_t
 .TP
 .BR pcap_set_snaplen (3PCAP)
 set the snapshot length for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_snapshot (3PCAP)
 get the snapshot length for a
 .B pcap_t
 .TP
 .BR pcap_set_promisc (3PCAP)
 set promiscuous mode for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
+.BR pcap_set_protocol (3PCAP)
+set capture protocol for a not-yet-activated
+.B pcap_t
+for live capture (Linux only)
+.TP
 .BR pcap_set_rfmon (3PCAP)
 set monitor mode for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_can_set_rfmon (3PCAP)
 determine whether monitor mode can be set for a
 .B pcap_t
 for live capture
 .TP
 .BR pcap_set_timeout (3PCAP)
-set read timeout for a not-yet-activated
+set packet buffer timeout for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_set_buffer_size (3PCAP)
 set buffer size for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_set_tstamp_type (3PCAP)
 set time stamp type for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_list_tstamp_types (3PCAP)
 get list of available time stamp types for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_free_tstamp_types (3PCAP)
 free list of available time stamp types
 .TP
 .BR pcap_tstamp_type_val_to_name (3PCAP)
 get name for a time stamp type
 .TP
 .BR pcap_tstamp_type_val_to_description (3PCAP)
 get description for a time stamp type
 .TP
 .BR pcap_tstamp_type_name_to_val (3PCAP)
 get time stamp type corresponding to a name
 .TP
 .BR pcap_set_tstamp_precision (3PCAP)
 set time stamp precision for a not-yet-activated
 .B pcap_t
 for live capture
 .TP
 .BR pcap_get_tstamp_precision (3PCAP)
 get the time stamp precision of a
 .B pcap_t
 for live capture
 .TP
 .BR pcap_datalink (3PCAP)
 get link-layer header type for a
 .B pcap_t
 .TP
 .BR pcap_file (3PCAP)
 get the
 .B "FILE\ *"
 for a
 .B pcap_t
 opened for a ``savefile''
 .TP
 .BR pcap_is_swapped (3PCAP)
 determine whether a ``savefile'' being read came from a machine with the
 opposite byte order
 .TP
 .BR pcap_major_version (3PCAP)
 .PD 0
 .TP
 .BR pcap_minor_version (3PCAP)
 get the major and minor version of the file format version for a
 ``savefile''
 .PD
 .RE
 .SS Selecting a link-layer header type for a live capture
 Some devices may provide more than one link-layer header type.  To
 obtain a list of all link-layer header types provided by a device, call
 .BR pcap_list_datalinks ()
 on an activated
 .B pcap_t
 for the device.
 To free a list of link-layer header types, call
 .BR pcap_free_datalinks ().
 To set the link-layer header type for a device, call
 .BR pcap_set_datalink ().
 This should be done after the device has been activated but before any
 packets are read and before any filters are compiled or installed.
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_list_datalinks (3PCAP)
 get a list of link-layer header types for a device
 .TP
 .BR pcap_free_datalinks (3PCAP)
 free list of link-layer header types
 .TP
 .BR pcap_set_datalink (3PCAP)
 set link-layer header type for a device
 .TP
 .BR pcap_datalink_val_to_name (3PCAP)
 get name for a link-layer header type
 .TP
 .BR pcap_datalink_val_to_description (3PCAP)
 get description for a link-layer header type
 .TP
 .BR pcap_datalink_name_to_val (3PCAP)
 get link-layer header type corresponding to a name
 .RE
 .SS Reading packets
 Packets are read with
 .BR pcap_dispatch ()
 or
 .BR pcap_loop (),
 which process one or more packets, calling a callback routine for each
 packet, or with
 .BR pcap_next ()
 or
 .BR pcap_next_ex (),
 which return the next packet.
 The callback for
 .BR pcap_dispatch ()
 and
 .BR pcap_loop ()
 is supplied a pointer to a
 .IR "struct pcap_pkthdr" ,
 which includes the following members:
 .RS
 .TP
 .B ts
 a
 .I struct timeval
 containing the time when the packet was captured
 .TP
 .B caplen
 a
 .I bpf_u_int32
 giving the number of bytes of the packet that are available from the
 capture
 .TP
 .B len
 a
 .I bpf_u_int32
 giving the length of the packet, in bytes (which might be more than the
 number of bytes available from the capture, if the length of the packet
 is larger than the maximum number of bytes to capture).
 .RE
 .PP
 The callback is also supplied a
 .I const u_char
 pointer to the first
 .B caplen
 (as given in the
 .I struct pcap_pkthdr
 mentioned above)
 bytes of data from the packet.  This won't necessarily be the entire
 packet; to capture the entire packet, you will have to provide a value
 for
 .I snaplen
 in your call to
 .BR pcap_set_snaplen ()
 that is sufficiently large to get all of the packet's data - a value of
 65535 should be sufficient on most if not all networks).  When reading
 from a ``savefile'', the snapshot length specified when the capture was
 performed will limit the amount of packet data available.
 .PP
 .BR pcap_next ()
 is passed an argument that points to a
 .I struct pcap_pkthdr
 structure, and fills it in with the time stamp and length values for the
 packet.  It returns a
 .I const u_char
 to the first
 .B caplen
 bytes of the packet on success, and NULL on error.
 .PP
 .BR pcap_next_ex ()
 is passed two pointer arguments, one of which points to a
 .IR struct pcap_pkthdr *
 and one of which points to a
 .IR "const u_char" *.
 It sets the first pointer to point to a
 .I struct pcap_pkthdr
 structure with the time stamp and length values for the packet, and sets
 the second pointer to point to the first
 .B caplen
 bytes of the packet.
 .PP
 To force the loop in
 .BR pcap_dispatch ()
 or
 .BR pcap_loop ()
 to terminate, call
 .BR pcap_breakloop ().
 .PP
 By default, when reading packets from an interface opened for a live
 capture,
 .BR pcap_dispatch (),
 .BR pcap_next (),
 and
 .BR pcap_next_ex ()
 will, if no packets are currently available to be read, block waiting
 for packets to become available.  On some, but
 .I not
-all, platforms, if a read timeout was specified, the wait will terminate
-after the read timeout expires; applications should be prepared for
-this, as it happens on some platforms, but should not rely on it, as it
-does not happen on other platforms.  Note that the wait might, or might
-not, terminate even if no packets are available; applications should be
-prepared for this to happen, but must not rely on it happening.
+all, platforms, if a packet buffer timeout was specified, the wait will
+terminate after the packet buffer timeout expires; applications should
+be prepared for this, as it happens on some platforms, but should not
+rely on it, as it does not happen on other platforms.  Note that the
+wait might, or might not, terminate even if no packets are available;
+applications should be prepared for this to happen, but must not rely on
+it happening.
 .PP
 A handle can be put into ``non-blocking mode'', so that those routines
 will, rather than blocking, return an indication that no packets are
 available to read.  Call
 .BR pcap_setnonblock ()
 to put a handle into non-blocking mode or to take it out of non-blocking
 mode; call
 .BR pcap_getnonblock ()
 to determine whether a handle is in non-blocking mode.  Note that
 non-blocking mode does not work correctly in Mac OS X 10.6.
 .PP
 Non-blocking mode is often combined with routines such as
 .BR select (2)
 or
 .BR poll (2)
 or other routines a platform offers to wait for any of a set of
 descriptors to be ready to read.  To obtain, for a handle, a descriptor
 that can be used in those routines, call
 .BR pcap_get_selectable_fd ().
 Not all handles have such a descriptor available;
 .BR pcap_get_selectable_fd ()
 will return \-1 if no such descriptor exists.  In addition, for various
 reasons, one or more of those routines will not work properly with the
 descriptor; the documentation for
 .BR pcap_get_selectable_fd ()
 gives details.  Note that, just as an attempt to read packets from a
 .B pcap_t
-may not return any packets if the read timeout expires, a
+may not return any packets if the packet buffer timeout expires, a
 .BR select (),
 .BR poll (),
-or other such call may, if the read timeout expires, indicate that a
-descriptor is ready to read even if there are no packets available to
-read.
+or other such call may, if the packet buffer timeout expires, indicate
+that a descriptor is ready to read even if there are no packets
+available to read.
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_dispatch (3PCAP)
 read a bufferful of packets from a
 .B pcap_t
 open for a live capture or the full set of packets from a
 .B pcap_t
 open for a ``savefile''
 .TP
 .BR pcap_loop (3PCAP)
 read packets from a
 .B pcap_t
 until an interrupt or error occurs
 .TP
 .BR pcap_next (3PCAP)
 read the next packet from a
 .B pcap_t
 without an indication whether an error occurred
 .TP
 .BR pcap_next_ex (3PCAP)
 read the next packet from a
 .B pcap_t
 with an error indication on an error
 .TP
 .BR pcap_breakloop (3PCAP)
 prematurely terminate the loop in
 .BR pcap_dispatch ()
 or
 .BR pcap_loop ()
 .TP
 .BR pcap_setnonblock (3PCAP)
 set or clear non-blocking mode on a
 .B pcap_t
 .TP
 .BR pcap_getnonblock (3PCAP)
 get the state of non-blocking mode for a
 .B pcap_t
 .TP
 .BR pcap_get_selectable_fd (3PCAP)
 attempt to get a descriptor for a
 .B pcap_t
 that can be used in calls such as
 .BR select (2)
 and
 .BR poll (2)
 .RE
 .SS Filters
 In order to cause only certain packets to be returned when reading
 packets, a filter can be set on a handle.  For a live capture, the
 filtering will be performed in kernel mode, if possible, to avoid
 copying ``uninteresting'' packets from the kernel to user mode.
 .PP
 A filter can be specified as a text string; the syntax and semantics of
 the string are as described by
 .BR pcap-filter (@MAN_MISC_INFO@).
 A filter string is compiled into a program in a pseudo-machine-language
 by
 .BR pcap_compile ()
 and the resulting program can be made a filter for a handle with
 .BR pcap_setfilter ().
 The result of
 .BR pcap_compile ()
 can be freed with a call to
 .BR pcap_freecode ().
 .BR pcap_compile ()
 may require a network mask for certain expressions in the filter string;
 .BR pcap_lookupnet ()
 can be used to find the network address and network mask for a given
 capture device.
 .PP
 A compiled filter can also be applied directly to a packet that has been
 read using
 .BR pcap_offline_filter ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_compile (3PCAP)
 compile filter expression to a pseudo-machine-language code program
 .TP
 .BR pcap_freecode (3PCAP)
 free a filter program
 .TP
 .BR pcap_setfilter (3PCAP)
 set filter for a
 .B pcap_t
 .TP
 .BR pcap_lookupnet (3PCAP)
 get network address and network mask for a capture device
 .TP
 .BR pcap_offline_filter (3PCAP)
 apply a filter program to a packet
 .RE
 .SS Incoming and outgoing packets
 By default, libpcap will attempt to capture both packets sent by the
 machine and packets received by the machine.  To limit it to capturing
 only packets received by the machine or, if possible, only packets sent
 by the machine, call
 .BR pcap_setdirection ().
 .TP
 .BR Routines
 .RS
 .TP
 .BR pcap_setdirection (3PCAP)
 specify whether to capture incoming packets, outgoing packets, or both
 .RE
 .SS Capture statistics
 To get statistics about packets received and dropped in a live capture,
 call
 .BR pcap_stats ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_stats (3PCAP)
 get capture statistics
 .RE
 .SS Opening a handle for writing captured packets
 To open a ``savefile`` to which to write packets, given the pathname the
 ``savefile'' should have, call
 .BR pcap_dump_open ().
 To open a ``savefile`` to which to write packets, given the pathname the
 ``savefile'' should have, call
 .BR pcap_dump_open ();
 to set up a handle for a ``savefile'', given a
 .B "FILE\ *"
 referring to a file already opened for writing, call
 .BR pcap_dump_fopen ().
 They each return pointers to a
 .BR pcap_dumper_t ,
 which is the handle used for writing packets to the ``savefile''.  If it
 succeeds, it will have created the file if it doesn't exist and
 truncated the file if it does exist.
 To close a
 .BR pcap_dumper_t ,
 call
 .BR pcap_dump_close ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_dump_open (3PCAP)
 open a
 .B pcap_dumper_t
 for a ``savefile``, given a pathname
 .TP
 .BR pcap_dump_fopen (3PCAP)
 open a
 .B pcap_dumper_t
 for a ``savefile``, given a
 .B "FILE\ *"
 .TP
 .BR pcap_dump_close (3PCAP)
 close a
 .B pcap_dumper_t
 .TP
 .BR pcap_dump_file (3PCAP)
 get the
 .B "FILE\ *"
 for a
 .B pcap_dumper_t
 opened for a ``savefile''
 .RE
 .SS Writing packets
 To write a packet to a
 .BR pcap_dumper_t ,
 call
 .BR pcap_dump ().
 Packets written with
 .BR pcap_dump ()
 may be buffered, rather than being immediately written to the
 ``savefile''.  Closing the
 .B pcap_dumper_t
 will cause all buffered-but-not-yet-written packets to be written to the
 ``savefile''.
 To force all packets written to the
 .BR pcap_dumper_t ,
 and not yet written to the ``savefile'' because they're buffered by the
 .BR pcap_dumper_t ,
 to be written to the ``savefile'', without closing the
 .BR pcap_dumper_t ,
 call
 .BR pcap_dump_flush ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_dump (3PCAP)
 write packet to a
 .B pcap_dumper_t
 .TP
 .BR pcap_dump_flush (3PCAP)
 flush buffered packets written to a
 .B pcap_dumper_t
 to the ``savefile''
 .TP
 .BR pcap_dump_ftell (3PCAP)
 get current file position for a
 .B pcap_dumper_t
 .RE
 .SS Injecting packets
 If you have the required privileges, you can inject packets onto a
 network with a
 .B pcap_t
 for a live capture, using
 .BR pcap_inject ()
 or
 .BR pcap_sendpacket ().
 (The two routines exist for compatibility with both OpenBSD and WinPcap;
 they perform the same function, but have different return values.)
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_inject (3PCAP)
 .PD 0
 .TP
 .BR pcap_sendpacket (3PCAP)
 transmit a packet
 .PD
 .RE
 .SS Reporting errors
 Some routines return error or warning status codes; to convert them to a
 string, use
 .BR pcap_statustostr ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_statustostr (3PCAP)
 get a string for an error or warning status code
 .RE
 .SS Getting library version information
 To get a string giving version information about libpcap, call
 .BR pcap_lib_version ().
 .TP
 .B Routines
 .RS
 .TP
 .BR pcap_lib_version (3PCAP)
 get library version string
 .RE
 .SH BACKWARDS COMPATIBILITY
 .PP
 In versions of libpcap prior to 1.0, the
 .B pcap.h
 header file was not in a
 .B pcap
 directory on most platforms; if you are writing an application that must
 work on versions of libpcap prior to 1.0, include
 .BR <pcap.h> ,
 which will include
 .B <pcap/pcap.h>
 for you, rather than including
 .BR <pcap/pcap.h> .
 .PP
 .BR pcap_create ()
 and
 .BR pcap_activate ()
 were not available in versions of libpcap prior to 1.0; if you are
 writing an application that must work on versions of libpcap prior to
 1.0, either use
 .BR pcap_open_live ()
 to get a handle for a live capture or, if you want to be able to use the
 additional capabilities offered by using
 .BR pcap_create ()
 and
 .BR pcap_activate (),
 use an
 .BR autoconf (1)
 script or some other configuration script to check whether the libpcap
 1.0 APIs are available and use them only if they are.
 .SH SEE ALSO
 autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
-usermod(1M)
+usermod(@MAN_ADMIN_COMMANDS@)
 .SH AUTHORS
 The original authors of libpcap are:
 .LP
 Van Jacobson,
 Craig Leres and
 Steven McCanne, all of the
 Lawrence Berkeley National Laboratory, University of California, Berkeley, CA.
 .LP
 The current version is available from "The Tcpdump Group"'s Web site at
 .LP
 .RS
 .I http://www.tcpdump.org/
 .RE
 .SH BUGS
-Please send problems, bugs, questions, desirable enhancements, etc. to:
+To report a security issue please send an e-mail to security@tcpdump.org.
 .LP
-.RS
-tcpdump-workers@lists.tcpdump.org
-.RE
+To report bugs and other problems, contribute patches, request a
+feature, provide generic feedback etc please see the file
+.I CONTRIBUTING
+in the libpcap source tree root.
Index: vendor/libpcap/dist/pcap.c
===================================================================
--- vendor/libpcap/dist/pcap.c	(revision 333788)
+++ vendor/libpcap/dist/pcap.c	(revision 333789)
@@ -1,2327 +1,3946 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
+#include <pcap-types.h>
+#ifndef _WIN32
+#include <sys/param.h>
+#ifndef MSDOS
+#include <sys/file.h>
 #endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
 #endif
-#include <sys/types.h>
+
+struct mbuf;		/* Squelch compiler warnings on some platforms for */
+struct rtentry;		/* declarations in <net/if.h> */
+#include <net/if.h>
+#include <netinet/in.h>
 #endif /* _WIN32 */
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__MINGW32__)
 #include <unistd.h>
 #endif
 #include <fcntl.h>
 #include <errno.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#else
+#define INT_MAX		2147483647
+#endif
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #ifdef MSDOS
 #include "pcap-dos.h"
 #endif
 
 #include "pcap-int.h"
 
+#include "optimize.h"
+
 #ifdef HAVE_DAG_API
 #include "pcap-dag.h"
 #endif /* HAVE_DAG_API */
 
 #ifdef HAVE_SEPTEL_API
 #include "pcap-septel.h"
 #endif /* HAVE_SEPTEL_API */
 
 #ifdef HAVE_SNF_API
 #include "pcap-snf.h"
 #endif /* HAVE_SNF_API */
 
 #ifdef HAVE_TC_API
 #include "pcap-tc.h"
 #endif /* HAVE_TC_API */
 
 #ifdef PCAP_SUPPORT_USB
 #include "pcap-usb-linux.h"
 #endif
 
 #ifdef PCAP_SUPPORT_BT
 #include "pcap-bt-linux.h"
 #endif
 
 #ifdef PCAP_SUPPORT_BT_MONITOR
 #include "pcap-bt-monitor-linux.h"
 #endif
 
 #ifdef PCAP_SUPPORT_NETFILTER
 #include "pcap-netfilter-linux.h"
 #endif
 
+#ifdef PCAP_SUPPORT_NETMAP
+#include "pcap-netmap.h"
+#endif
+
 #ifdef PCAP_SUPPORT_DBUS
 #include "pcap-dbus.h"
 #endif
 
+#ifdef PCAP_SUPPORT_RDMASNIFF
+#include "pcap-rdmasniff.h"
+#endif
+
+#ifdef _WIN32
+/*
+ * DllMain(), required when built as a Windows DLL.
+ */
+BOOL WINAPI DllMain(
+  HANDLE hinstDLL,
+  DWORD dwReason,
+  LPVOID lpvReserved
+)
+{
+	return (TRUE);
+}
+
+/*
+ * Start WinSock.
+ * Exported in case some applications using WinPcap called it,
+ * even though it wasn't exported.
+ */
+int
+wsockinit(void)
+{
+	WORD wVersionRequested;
+	WSADATA wsaData;
+	static int err = -1;
+	static int done = 0;
+
+	if (done)
+		return (err);
+
+	wVersionRequested = MAKEWORD( 1, 1);
+	err = WSAStartup( wVersionRequested, &wsaData );
+	atexit ((void(*)(void))WSACleanup);
+	done = 1;
+
+	if ( err != 0 )
+		err = -1;
+	return (err);
+}
+
+/*
+ * This is the exported function; new programs should call this.
+ */
+int
+pcap_wsockinit(void)
+{
+       return (wsockinit());
+}
+#endif /* _WIN32 */
+
+/*
+ * String containing the library version.
+ * Not explicitly exported via a header file - the right API to use
+ * is pcap_lib_version() - but some programs included it, so we
+ * provide it.
+ *
+ * We declare it here, right before defining it, to squelch any
+ * warnings we might get from compilers about the lack of a
+ * declaration.
+ */
+PCAP_API char pcap_version[];
+PCAP_API_DEF char pcap_version[] = PACKAGE_VERSION;
+
 static int
 pcap_not_initialized(pcap_t *pcap)
 {
+	if (pcap->activated) {
+		/* A module probably forgot to set the function pointer */
+		(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+		    "This operation isn't properly handled by that device");
+		return (PCAP_ERROR);
+	}
 	/* in case the caller doesn't check for PCAP_ERROR_NOT_ACTIVATED */
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "This handle hasn't been activated yet");
 	/* this means 'not initialized' */
 	return (PCAP_ERROR_NOT_ACTIVATED);
 }
 
 #ifdef _WIN32
 static void *
 pcap_not_initialized_ptr(pcap_t *pcap)
 {
+	if (pcap->activated) {
+		/* A module probably forgot to set the function pointer */
+		(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+		    "This operation isn't properly handled by that device");
+		return (NULL);
+	}
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "This handle hasn't been activated yet");
 	return (NULL);
 }
 
 static HANDLE
 pcap_getevent_not_initialized(pcap_t *pcap)
 {
+	if (pcap->activated) {
+		/* A module probably forgot to set the function pointer */
+		(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+		    "This operation isn't properly handled by that device");
+		return (INVALID_HANDLE_VALUE);
+	}
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "This handle hasn't been activated yet");
 	return (INVALID_HANDLE_VALUE);
 }
 
 static u_int
 pcap_sendqueue_transmit_not_initialized(pcap_t *pcap, pcap_send_queue* queue, int sync)
 {
+	if (pcap->activated) {
+		/* A module probably forgot to set the function pointer */
+		(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+		    "This operation isn't properly handled by that device");
+		return (0);
+	}
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "This handle hasn't been activated yet");
 	return (0);
 }
 
 static PAirpcapHandle
 pcap_get_airpcap_handle_not_initialized(pcap_t *pcap)
 {
+	if (pcap->activated) {
+		/* A module probably forgot to set the function pointer */
+		(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+		    "This operation isn't properly handled by that device");
+		return (NULL);
+	}
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "This handle hasn't been activated yet");
 	return (NULL);
 }
 #endif
 
 /*
  * Returns 1 if rfmon mode can be set on the pcap_t, 0 if it can't,
  * a PCAP_ERROR value on an error.
  */
 int
 pcap_can_set_rfmon(pcap_t *p)
 {
 	return (p->can_set_rfmon_op(p));
 }
 
 /*
  * For systems where rfmon mode is never supported.
  */
 static int
 pcap_cant_set_rfmon(pcap_t *p _U_)
 {
 	return (0);
 }
 
 /*
  * Sets *tstamp_typesp to point to an array 1 or more supported time stamp
  * types; the return value is the number of supported time stamp types.
  * The list should be freed by a call to pcap_free_tstamp_types() when
  * you're done with it.
  *
  * A return value of 0 means "you don't get a choice of time stamp type",
  * in which case *tstamp_typesp is set to null.
  *
  * PCAP_ERROR is returned on error.
  */
 int
 pcap_list_tstamp_types(pcap_t *p, int **tstamp_typesp)
 {
 	if (p->tstamp_type_count == 0) {
 		/*
 		 * We don't support multiple time stamp types.
 		 */
 		*tstamp_typesp = NULL;
 	} else {
 		*tstamp_typesp = (int*)calloc(sizeof(**tstamp_typesp),
 		    p->tstamp_type_count);
 		if (*tstamp_typesp == NULL) {
-			(void)pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			    "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+			    errno, "malloc");
 			return (PCAP_ERROR);
 		}
 		(void)memcpy(*tstamp_typesp, p->tstamp_type_list,
 		    sizeof(**tstamp_typesp) * p->tstamp_type_count);
 	}
 	return (p->tstamp_type_count);
 }
 
 /*
  * In Windows, you might have a library built with one version of the
  * C runtime library and an application built with another version of
  * the C runtime library, which means that the library might use one
  * version of malloc() and free() and the application might use another
  * version of malloc() and free().  If so, that means something
  * allocated by the library cannot be freed by the application, so we
  * need to have a pcap_free_tstamp_types() routine to free up the list
  * allocated by pcap_list_tstamp_types(), even though it's just a wrapper
  * around free().
  */
 void
 pcap_free_tstamp_types(int *tstamp_type_list)
 {
 	free(tstamp_type_list);
 }
 
 /*
  * Default one-shot callback; overridden for capture types where the
  * packet data cannot be guaranteed to be available after the callback
  * returns, so that a copy must be made.
  */
 void
 pcap_oneshot(u_char *user, const struct pcap_pkthdr *h, const u_char *pkt)
 {
 	struct oneshot_userdata *sp = (struct oneshot_userdata *)user;
 
 	*sp->hdr = *h;
 	*sp->pkt = pkt;
 }
 
 const u_char *
 pcap_next(pcap_t *p, struct pcap_pkthdr *h)
 {
 	struct oneshot_userdata s;
 	const u_char *pkt;
 
 	s.hdr = h;
 	s.pkt = &pkt;
 	s.pd = p;
 	if (pcap_dispatch(p, 1, p->oneshot_callback, (u_char *)&s) <= 0)
 		return (0);
 	return (pkt);
 }
 
 int
 pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header,
     const u_char **pkt_data)
 {
 	struct oneshot_userdata s;
 
 	s.hdr = &p->pcap_header;
 	s.pkt = pkt_data;
 	s.pd = p;
 
 	/* Saves a pointer to the packet headers */
 	*pkt_header= &p->pcap_header;
 
 	if (p->rfile != NULL) {
 		int status;
 
 		/* We are on an offline capture */
 		status = pcap_offline_read(p, 1, p->oneshot_callback,
 		    (u_char *)&s);
 
 		/*
 		 * Return codes for pcap_offline_read() are:
 		 *   -  0: EOF
 		 *   - -1: error
 		 *   - >1: OK
 		 * The first one ('0') conflicts with the return code of
 		 * 0 from pcap_read() meaning "no packets arrived before
 		 * the timeout expired", so we map it to -2 so you can
 		 * distinguish between an EOF from a savefile and a
 		 * "no packets arrived before the timeout expired, try
 		 * again" from a live capture.
 		 */
 		if (status == 0)
 			return (-2);
 		else
 			return (status);
 	}
 
 	/*
 	 * Return codes for pcap_read() are:
 	 *   -  0: timeout
 	 *   - -1: error
 	 *   - -2: loop was broken out of with pcap_breakloop()
 	 *   - >1: OK
 	 * The first one ('0') conflicts with the return code of 0 from
 	 * pcap_offline_read() meaning "end of file".
 	*/
 	return (p->read_op(p, 1, p->oneshot_callback, (u_char *)&s));
 }
 
+/*
+ * Implementation of a pcap_if_list_t.
+ */
+struct pcap_if_list {
+	pcap_if_t *beginning;
+};
+
 static struct capture_source_type {
-	int (*findalldevs_op)(pcap_if_t **, char *);
+	int (*findalldevs_op)(pcap_if_list_t *, char *);
 	pcap_t *(*create_op)(const char *, char *, int *);
 } capture_source_types[] = {
 #ifdef HAVE_DAG_API
 	{ dag_findalldevs, dag_create },
 #endif
 #ifdef HAVE_SEPTEL_API
 	{ septel_findalldevs, septel_create },
 #endif
 #ifdef HAVE_SNF_API
 	{ snf_findalldevs, snf_create },
 #endif
 #ifdef HAVE_TC_API
 	{ TcFindAllDevs, TcCreate },
 #endif
 #ifdef PCAP_SUPPORT_BT
 	{ bt_findalldevs, bt_create },
 #endif
 #ifdef PCAP_SUPPORT_BT_MONITOR
 	{ bt_monitor_findalldevs, bt_monitor_create },
 #endif
 #ifdef PCAP_SUPPORT_USB
 	{ usb_findalldevs, usb_create },
 #endif
 #ifdef PCAP_SUPPORT_NETFILTER
 	{ netfilter_findalldevs, netfilter_create },
 #endif
+#ifdef PCAP_SUPPORT_NETMAP
+	{ pcap_netmap_findalldevs, pcap_netmap_create },
+#endif
 #ifdef PCAP_SUPPORT_DBUS
 	{ dbus_findalldevs, dbus_create },
 #endif
+#ifdef PCAP_SUPPORT_RDMASNIFF
+	{ rdmasniff_findalldevs, rdmasniff_create },
+#endif
 	{ NULL, NULL }
 };
 
 /*
  * Get a list of all capture sources that are up and that we can open.
  * Returns -1 on error, 0 otherwise.
  * The list, as returned through "alldevsp", may be null if no interfaces
  * were up and could be opened.
  */
 int
 pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf)
 {
 	size_t i;
+	pcap_if_list_t devlist;
 
 	/*
 	 * Find all the local network interfaces on which we
 	 * can capture.
 	 */
-	if (pcap_platform_finddevs(alldevsp, errbuf) == -1)
+	devlist.beginning = NULL;
+	if (pcap_platform_finddevs(&devlist, errbuf) == -1) {
+		/*
+		 * Failed - free all of the entries we were given
+		 * before we failed.
+		 */
+		if (devlist.beginning != NULL)
+			pcap_freealldevs(devlist.beginning);
+		*alldevsp = NULL;
 		return (-1);
+	}
 
 	/*
 	 * Ask each of the non-local-network-interface capture
 	 * source types what interfaces they have.
 	 */
 	for (i = 0; capture_source_types[i].findalldevs_op != NULL; i++) {
-		if (capture_source_types[i].findalldevs_op(alldevsp, errbuf) == -1) {
+		if (capture_source_types[i].findalldevs_op(&devlist, errbuf) == -1) {
 			/*
 			 * We had an error; free the list we've been
 			 * constructing.
 			 */
-			if (*alldevsp != NULL) {
-				pcap_freealldevs(*alldevsp);
-				*alldevsp = NULL;
+			if (devlist.beginning != NULL)
+				pcap_freealldevs(devlist.beginning);
+			*alldevsp = NULL;
+			return (-1);
+		}
+	}
+
+	/*
+	 * Return the first entry of the list of all devices.
+	 */
+	*alldevsp = devlist.beginning;
+	return (0);
+}
+
+static struct sockaddr *
+dup_sockaddr(struct sockaddr *sa, size_t sa_length)
+{
+	struct sockaddr *newsa;
+
+	if ((newsa = malloc(sa_length)) == NULL)
+		return (NULL);
+	return (memcpy(newsa, sa, sa_length));
+}
+
+/*
+ * Construct a "figure of merit" for an interface, for use when sorting
+ * the list of interfaces, in which interfaces that are up are superior
+ * to interfaces that aren't up, interfaces that are up and running are
+ * superior to interfaces that are up but not running, and non-loopback
+ * interfaces that are up and running are superior to loopback interfaces,
+ * and interfaces with the same flags have a figure of merit that's higher
+ * the lower the instance number.
+ *
+ * The goal is to try to put the interfaces most likely to be useful for
+ * capture at the beginning of the list.
+ *
+ * The figure of merit, which is lower the "better" the interface is,
+ * has the uppermost bit set if the interface isn't running, the bit
+ * below that set if the interface isn't up, the bit below that set
+ * if the interface is a loopback interface, and the interface index
+ * in the 29 bits below that.  (Yes, we assume u_int is 32 bits.)
+ */
+static u_int
+get_figure_of_merit(pcap_if_t *dev)
+{
+	const char *cp;
+	u_int n;
+
+	if (strcmp(dev->name, "any") == 0) {
+		/*
+		 * Give the "any" device an artificially high instance
+		 * number, so it shows up after all other non-loopback
+		 * interfaces.
+		 */
+		n = 0x1FFFFFFF;	/* 29 all-1 bits */
+	} else {
+		/*
+		 * A number at the end of the device name string is
+		 * assumed to be an instance number.  Add 1 to the
+		 * instance number, and use 0 for "no instance
+		 * number", so we don't put "no instance number"
+		 * devices and "instance 0" devices together.
+		 */
+		cp = dev->name + strlen(dev->name) - 1;
+		while (cp-1 >= dev->name && *(cp-1) >= '0' && *(cp-1) <= '9')
+			cp--;
+		if (*cp >= '0' && *cp <= '9')
+			n = atoi(cp) + 1;
+		else
+			n = 0;
+	}
+	if (!(dev->flags & PCAP_IF_RUNNING))
+		n |= 0x80000000;
+	if (!(dev->flags & PCAP_IF_UP))
+		n |= 0x40000000;
+
+	/*
+	 * Give non-wireless interfaces that aren't disconnected a better
+	 * figure of merit than interfaces that are disconnected, as
+	 * "disconnected" should indicate that the interface isn't
+	 * plugged into a network and thus won't give you any traffic.
+	 *
+	 * For wireless interfaces, it means "associated with a network",
+	 * which we presume not to necessarily prevent capture, as you
+	 * might run the adapter in some flavor of monitor mode.
+	 */
+	if (!(dev->flags & PCAP_IF_WIRELESS) &&
+	    (dev->flags & PCAP_IF_CONNECTION_STATUS) == PCAP_IF_CONNECTION_STATUS_DISCONNECTED)
+		n |= 0x20000000;
+
+	/*
+	 * Sort loopback devices after non-loopback devices, *except* for
+	 * disconnected devices.
+	 */
+	if (dev->flags & PCAP_IF_LOOPBACK)
+		n |= 0x10000000;
+
+	return (n);
+}
+
+#ifndef _WIN32
+/*
+ * Try to get a description for a given device.
+ * Returns a mallocated description if it could and NULL if it couldn't.
+ *
+ * XXX - on FreeBSDs that support it, should it get the sysctl named
+ * "dev.{adapter family name}.{adapter unit}.%desc" to get a description
+ * of the adapter?  Note that "dev.an.0.%desc" is "Aironet PC4500/PC4800"
+ * with my Cisco 350 card, so the name isn't entirely descriptive.  The
+ * "dev.an.0.%pnpinfo" has a better description, although one might argue
+ * that the problem is really a driver bug - if it can find out that it's
+ * a Cisco 340 or 350, rather than an old Aironet card, it should use
+ * that in the description.
+ *
+ * Do NetBSD, DragonflyBSD, or OpenBSD support this as well?  FreeBSD
+ * and OpenBSD let you get a description, but it's not generated by the OS,
+ * it's set with another ioctl that ifconfig supports; we use that to get
+ * a description in FreeBSD and OpenBSD, but if there is no such
+ * description available, it still might be nice to get some description
+ * string based on the device type or something such as that.
+ *
+ * In macOS, the System Configuration framework can apparently return
+ * names in 10.4 and later.
+ *
+ * It also appears that freedesktop.org's HAL offers an "info.product"
+ * string, but the HAL specification says it "should not be used in any
+ * UI" and "subsystem/capability specific properties" should be used
+ * instead and, in any case, I think HAL is being deprecated in
+ * favor of other stuff such as DeviceKit.  DeviceKit doesn't appear
+ * to have any obvious product information for devices, but maybe
+ * I haven't looked hard enough.
+ *
+ * Using the System Configuration framework, or HAL, or DeviceKit, or
+ * whatever, would require that libpcap applications be linked with
+ * the frameworks/libraries in question.  That shouldn't be a problem
+ * for programs linking with the shared version of libpcap (unless
+ * you're running on AIX - which I think is the only UN*X that doesn't
+ * support linking a shared library with other libraries on which it
+ * depends, and having an executable linked only with the first shared
+ * library automatically pick up the other libraries when started -
+ * and using HAL or whatever).  Programs linked with the static
+ * version of libpcap would have to use pcap-config with the --static
+ * flag in order to get the right linker flags in order to pick up
+ * the additional libraries/frameworks; those programs need that anyway
+ * for libpcap 1.1 and beyond on Linux, as, by default, it requires
+ * -lnl.
+ *
+ * Do any other UN*Xes, or desktop environments support getting a
+ * description?
+ */
+static char *
+#ifdef SIOCGIFDESCR
+get_if_description(const char *name)
+{
+	char *description = NULL;
+	int s;
+	struct ifreq ifrdesc;
+#ifndef IFDESCRSIZE
+	size_t descrlen = 64;
+#else
+	size_t descrlen = IFDESCRSIZE;
+#endif /* IFDESCRSIZE */
+
+	/*
+	 * Get the description for the interface.
+	 */
+	memset(&ifrdesc, 0, sizeof ifrdesc);
+	strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
+	s = socket(AF_INET, SOCK_DGRAM, 0);
+	if (s >= 0) {
+#ifdef __FreeBSD__
+		/*
+		 * On FreeBSD, if the buffer isn't big enough for the
+		 * description, the ioctl succeeds, but the description
+		 * isn't copied, ifr_buffer.length is set to the description
+		 * length, and ifr_buffer.buffer is set to NULL.
+		 */
+		for (;;) {
+			free(description);
+			if ((description = malloc(descrlen)) != NULL) {
+				ifrdesc.ifr_buffer.buffer = description;
+				ifrdesc.ifr_buffer.length = descrlen;
+				if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0) {
+					if (ifrdesc.ifr_buffer.buffer ==
+					    description)
+						break;
+					else
+						descrlen = ifrdesc.ifr_buffer.length;
+				} else {
+					/*
+					 * Failed to get interface description.
+					 */
+					free(description);
+					description = NULL;
+					break;
+				}
+			} else
+				break;
+		}
+#else /* __FreeBSD__ */
+		/*
+		 * The only other OS that currently supports
+		 * SIOCGIFDESCR is OpenBSD, and it has no way
+		 * to get the description length - it's clamped
+		 * to a maximum of IFDESCRSIZE.
+		 */
+		if ((description = malloc(descrlen)) != NULL) {
+			ifrdesc.ifr_data = (caddr_t)description;
+			if (ioctl(s, SIOCGIFDESCR, &ifrdesc) != 0) {
+				/*
+				 * Failed to get interface description.
+				 */
+				free(description);
+				description = NULL;
 			}
+		}
+#endif /* __FreeBSD__ */
+		close(s);
+		if (description != NULL && strlen(description) == 0) {
+			/*
+			 * Description is empty, so discard it.
+			 */
+			free(description);
+			description = NULL;
+		}
+	}
+
+#ifdef __FreeBSD__
+	/*
+	 * For FreeBSD, if we didn't get a description, and this is
+	 * a device with a name of the form usbusN, label it as a USB
+	 * bus.
+	 */
+	if (description == NULL) {
+		if (strncmp(name, "usbus", 5) == 0) {
+			/*
+			 * OK, it begins with "usbus".
+			 */
+			long busnum;
+			char *p;
+
+			errno = 0;
+			busnum = strtol(name + 5, &p, 10);
+			if (errno == 0 && p != name + 5 && *p == '\0' &&
+			    busnum >= 0 && busnum <= INT_MAX) {
+				/*
+				 * OK, it's a valid number that's not
+				 * bigger than INT_MAX.  Construct
+				 * a description from it.
+				 */
+				static const char descr_prefix[] = "USB bus number ";
+				size_t descr_size;
+
+				/*
+				 * Allow enough room for a 32-bit bus number.
+				 * sizeof (descr_prefix) includes the
+				 * terminating NUL.
+				 */
+				descr_size = sizeof (descr_prefix) + 10;
+				description = malloc(descr_size);
+				if (description != NULL) {
+					pcap_snprintf(description, descr_size,
+					    "%s%ld", descr_prefix, busnum);
+				}
+			}
+		}
+	}
+#endif
+	return (description);
+#else /* SIOCGIFDESCR */
+get_if_description(const char *name _U_)
+{
+	return (NULL);
+#endif /* SIOCGIFDESCR */
+}
+
+/*
+ * Look for a given device in the specified list of devices.
+ *
+ * If we find it, return a pointer to its entry.
+ *
+ * If we don't find it, attempt to add an entry for it, with the specified
+ * IFF_ flags and description, and, if that succeeds, return a pointer to
+ * the new entry, otherwise return NULL and set errbuf to an error message.
+ */
+pcap_if_t *
+find_or_add_if(pcap_if_list_t *devlistp, const char *name,
+    bpf_u_int32 if_flags, get_if_flags_func get_flags_func, char *errbuf)
+{
+	bpf_u_int32 pcap_flags;
+
+	/*
+	 * Convert IFF_ flags to pcap flags.
+	 */
+	pcap_flags = 0;
+#ifdef IFF_LOOPBACK
+	if (if_flags & IFF_LOOPBACK)
+		pcap_flags |= PCAP_IF_LOOPBACK;
+#else
+	/*
+	 * We don't have IFF_LOOPBACK, so look at the device name to
+	 * see if it looks like a loopback device.
+	 */
+	if (name[0] == 'l' && name[1] == 'o' &&
+	    (isdigit((unsigned char)(name[2])) || name[2] == '\0')
+		pcap_flags |= PCAP_IF_LOOPBACK;
+#endif
+#ifdef IFF_UP
+	if (if_flags & IFF_UP)
+		pcap_flags |= PCAP_IF_UP;
+#endif
+#ifdef IFF_RUNNING
+	if (if_flags & IFF_RUNNING)
+		pcap_flags |= PCAP_IF_RUNNING;
+#endif
+
+	/*
+	 * Attempt to find an entry for this device; if we don't find one,
+	 * attempt to add one.
+	 */
+	return (find_or_add_dev(devlistp, name, pcap_flags,
+	    get_flags_func, get_if_description(name), errbuf));
+}
+
+/*
+ * Look for a given device in the specified list of devices.
+ *
+ * If we find it, then, if the specified address isn't null, add it to
+ * the list of addresses for the device and return 0.
+ *
+ * If we don't find it, attempt to add an entry for it, with the specified
+ * IFF_ flags and description, and, if that succeeds, add the specified
+ * address to its list of addresses if that address is non-null, and
+ * return 0, otherwise return -1 and set errbuf to an error message.
+ *
+ * (We can get called with a null address because we might get a list
+ * of interface name/address combinations from the underlying OS, with
+ * the address being absent in some cases, rather than a list of
+ * interfaces with each interface having a list of addresses, so this
+ * call may be the only call made to add to the list, and we want to
+ * add interfaces even if they have no addresses.)
+ */
+int
+add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
+    bpf_u_int32 if_flags, get_if_flags_func get_flags_func,
+    struct sockaddr *addr, size_t addr_size,
+    struct sockaddr *netmask, size_t netmask_size,
+    struct sockaddr *broadaddr, size_t broadaddr_size,
+    struct sockaddr *dstaddr, size_t dstaddr_size,
+    char *errbuf)
+{
+	pcap_if_t *curdev;
+
+	/*
+	 * Check whether the device exists and, if not, add it.
+	 */
+	curdev = find_or_add_if(devlistp, name, if_flags, get_flags_func,
+	    errbuf);
+	if (curdev == NULL) {
+		/*
+		 * Error - give up.
+		 */
+		return (-1);
+	}
+
+	if (addr == NULL) {
+		/*
+		 * There's no address to add; this entry just meant
+		 * "here's a new interface".
+		 */
+		return (0);
+	}
+
+	/*
+	 * "curdev" is an entry for this interface, and we have an
+	 * address for it; add an entry for that address to the
+	 * interface's list of addresses.
+	 */
+	return (add_addr_to_dev(curdev, addr, addr_size, netmask,
+	    netmask_size, broadaddr, broadaddr_size, dstaddr,
+	    dstaddr_size, errbuf));
+}
+#endif /* _WIN32 */
+
+/*
+ * Add an entry to the list of addresses for an interface.
+ * "curdev" is the entry for that interface.
+ */
+int
+add_addr_to_dev(pcap_if_t *curdev,
+    struct sockaddr *addr, size_t addr_size,
+    struct sockaddr *netmask, size_t netmask_size,
+    struct sockaddr *broadaddr, size_t broadaddr_size,
+    struct sockaddr *dstaddr, size_t dstaddr_size,
+    char *errbuf)
+{
+	pcap_addr_t *curaddr, *prevaddr, *nextaddr;
+
+	/*
+	 * Allocate the new entry and fill it in.
+	 */
+	curaddr = (pcap_addr_t *)malloc(sizeof(pcap_addr_t));
+	if (curaddr == NULL) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		return (-1);
+	}
+
+	curaddr->next = NULL;
+	if (addr != NULL && addr_size != 0) {
+		curaddr->addr = (struct sockaddr *)dup_sockaddr(addr, addr_size);
+		if (curaddr->addr == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			free(curaddr);
 			return (-1);
 		}
+	} else
+		curaddr->addr = NULL;
+
+	if (netmask != NULL && netmask_size != 0) {
+		curaddr->netmask = (struct sockaddr *)dup_sockaddr(netmask, netmask_size);
+		if (curaddr->netmask == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			if (curaddr->addr != NULL)
+				free(curaddr->addr);
+			free(curaddr);
+			return (-1);
+		}
+	} else
+		curaddr->netmask = NULL;
+
+	if (broadaddr != NULL && broadaddr_size != 0) {
+		curaddr->broadaddr = (struct sockaddr *)dup_sockaddr(broadaddr, broadaddr_size);
+		if (curaddr->broadaddr == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			if (curaddr->netmask != NULL)
+				free(curaddr->netmask);
+			if (curaddr->addr != NULL)
+				free(curaddr->addr);
+			free(curaddr);
+			return (-1);
+		}
+	} else
+		curaddr->broadaddr = NULL;
+
+	if (dstaddr != NULL && dstaddr_size != 0) {
+		curaddr->dstaddr = (struct sockaddr *)dup_sockaddr(dstaddr, dstaddr_size);
+		if (curaddr->dstaddr == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			if (curaddr->broadaddr != NULL)
+				free(curaddr->broadaddr);
+			if (curaddr->netmask != NULL)
+				free(curaddr->netmask);
+			if (curaddr->addr != NULL)
+				free(curaddr->addr);
+			free(curaddr);
+			return (-1);
+		}
+	} else
+		curaddr->dstaddr = NULL;
+
+	/*
+	 * Find the end of the list of addresses.
+	 */
+	for (prevaddr = curdev->addresses; prevaddr != NULL; prevaddr = nextaddr) {
+		nextaddr = prevaddr->next;
+		if (nextaddr == NULL) {
+			/*
+			 * This is the end of the list.
+			 */
+			break;
+		}
 	}
 
+	if (prevaddr == NULL) {
+		/*
+		 * The list was empty; this is the first member.
+		 */
+		curdev->addresses = curaddr;
+	} else {
+		/*
+		 * "prevaddr" is the last member of the list; append
+		 * this member to it.
+		 */
+		prevaddr->next = curaddr;
+	}
+
 	return (0);
 }
 
+/*
+ * Look for a given device in the specified list of devices.
+ *
+ * If we find it, return 0 and set *curdev_ret to point to it.
+ *
+ * If we don't find it, attempt to add an entry for it, with the specified
+ * flags and description, and, if that succeeds, return 0, otherwise
+ * return -1 and set errbuf to an error message.
+ */
+pcap_if_t *
+find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
+    get_if_flags_func get_flags_func, const char *description, char *errbuf)
+{
+	pcap_if_t *curdev;
+
+	/*
+	 * Is there already an entry in the list for this device?
+	 */
+	curdev = find_dev(devlistp, name);
+	if (curdev != NULL) {
+		/*
+		 * Yes, return it.
+		 */
+		return (curdev);
+	}
+
+	/*
+	 * No, we didn't find it.
+	 */
+
+	/*
+	 * Try to get additional flags for the device.
+	 */
+	if ((*get_flags_func)(name, &flags, errbuf) == -1) {
+		/*
+		 * Failed.
+		 */
+		return (NULL);
+	}
+
+	/*
+	 * Now, try to add it to the list of devices.
+	 */
+	return (add_dev(devlistp, name, flags, description, errbuf));
+}
+
+/*
+ * Look for a given device in the specified list of devices, and return
+ * the entry for it if we find it or NULL if we don't.
+ */
+pcap_if_t *
+find_dev(pcap_if_list_t *devlistp, const char *name)
+{
+	pcap_if_t *curdev;
+
+	/*
+	 * Is there an entry in the list for this device?
+	 */
+	for (curdev = devlistp->beginning; curdev != NULL;
+	    curdev = curdev->next) {
+		if (strcmp(name, curdev->name) == 0) {
+			/*
+			 * We found it, so, yes, there is.  No need to
+			 * add it.  Provide the entry we found to our
+			 * caller.
+			 */
+			return (curdev);
+		}
+	}
+
+	/*
+	 * No.
+	 */
+	return (NULL);
+}
+
+/*
+ * Attempt to add an entry for a device, with the specified flags
+ * and description, and, if that succeeds, return 0 and return a pointer
+ * to the new entry, otherwise return NULL and set errbuf to an error
+ * message.
+ *
+ * If we weren't given a description, try to get one.
+ */
+pcap_if_t *
+add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
+    const char *description, char *errbuf)
+{
+	pcap_if_t *curdev, *prevdev, *nextdev;
+	u_int this_figure_of_merit, nextdev_figure_of_merit;
+
+	curdev = malloc(sizeof(pcap_if_t));
+	if (curdev == NULL) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		return (NULL);
+	}
+
+	/*
+	 * Fill in the entry.
+	 */
+	curdev->next = NULL;
+	curdev->name = strdup(name);
+	if (curdev->name == NULL) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		free(curdev);
+		return (NULL);
+	}
+	if (description == NULL) {
+		/*
+		 * We weren't handed a description for the interface.
+		 */
+		curdev->description = NULL;
+	} else {
+		/*
+		 * We were handed a description; make a copy.
+		 */
+		curdev->description = strdup(description);
+		if (curdev->description == NULL) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			free(curdev->name);
+			free(curdev);
+			return (NULL);
+		}
+	}
+	curdev->addresses = NULL;	/* list starts out as empty */
+	curdev->flags = flags;
+
+	/*
+	 * Add it to the list, in the appropriate location.
+	 * First, get the "figure of merit" for this interface.
+	 */
+	this_figure_of_merit = get_figure_of_merit(curdev);
+
+	/*
+	 * Now look for the last interface with an figure of merit
+	 * less than or equal to the new interface's figure of merit.
+	 *
+	 * We start with "prevdev" being NULL, meaning we're before
+	 * the first element in the list.
+	 */
+	prevdev = NULL;
+	for (;;) {
+		/*
+		 * Get the interface after this one.
+		 */
+		if (prevdev == NULL) {
+			/*
+			 * The next element is the first element.
+			 */
+			nextdev = devlistp->beginning;
+		} else
+			nextdev = prevdev->next;
+
+		/*
+		 * Are we at the end of the list?
+		 */
+		if (nextdev == NULL) {
+			/*
+			 * Yes - we have to put the new entry after "prevdev".
+			 */
+			break;
+		}
+
+		/*
+		 * Is the new interface's figure of merit less
+		 * than the next interface's figure of merit,
+		 * meaning that the new interface is better
+		 * than the next interface?
+		 */
+		nextdev_figure_of_merit = get_figure_of_merit(nextdev);
+		if (this_figure_of_merit < nextdev_figure_of_merit) {
+			/*
+			 * Yes - we should put the new entry
+			 * before "nextdev", i.e. after "prevdev".
+			 */
+			break;
+		}
+
+		prevdev = nextdev;
+	}
+
+	/*
+	 * Insert before "nextdev".
+	 */
+	curdev->next = nextdev;
+
+	/*
+	 * Insert after "prevdev" - unless "prevdev" is null,
+	 * in which case this is the first interface.
+	 */
+	if (prevdev == NULL) {
+		/*
+		 * This is the first interface.  Make it
+		 * the first element in the list of devices.
+		 */
+		devlistp->beginning = curdev;
+	} else
+		prevdev->next = curdev;
+	return (curdev);
+}
+
+/*
+ * Free a list of interfaces.
+ */
+void
+pcap_freealldevs(pcap_if_t *alldevs)
+{
+	pcap_if_t *curdev, *nextdev;
+	pcap_addr_t *curaddr, *nextaddr;
+
+	for (curdev = alldevs; curdev != NULL; curdev = nextdev) {
+		nextdev = curdev->next;
+
+		/*
+		 * Free all addresses.
+		 */
+		for (curaddr = curdev->addresses; curaddr != NULL; curaddr = nextaddr) {
+			nextaddr = curaddr->next;
+			if (curaddr->addr)
+				free(curaddr->addr);
+			if (curaddr->netmask)
+				free(curaddr->netmask);
+			if (curaddr->broadaddr)
+				free(curaddr->broadaddr);
+			if (curaddr->dstaddr)
+				free(curaddr->dstaddr);
+			free(curaddr);
+		}
+
+		/*
+		 * Free the name string.
+		 */
+		free(curdev->name);
+
+		/*
+		 * Free the description string, if any.
+		 */
+		if (curdev->description != NULL)
+			free(curdev->description);
+
+		/*
+		 * Free the interface.
+		 */
+		free(curdev);
+	}
+}
+
+/*
+ * pcap-npf.c has its own pcap_lookupdev(), for compatibility reasons, as
+ * it actually returns the names of all interfaces, with a NUL separator
+ * between them; some callers may depend on that.
+ *
+ * MS-DOS has its own pcap_lookupdev(), but that might be useful only
+ * as an optimization.
+ *
+ * In all other cases, we just use pcap_findalldevs() to get a list of
+ * devices, and pick from that list.
+ */
+#if !defined(HAVE_PACKET32) && !defined(MSDOS)
+/*
+ * Return the name of a network interface attached to the system, or NULL
+ * if none can be found.  The interface must be configured up; the
+ * lowest unit number is preferred; loopback is ignored.
+ */
+char *
+pcap_lookupdev(char *errbuf)
+{
+	pcap_if_t *alldevs;
+#ifdef _WIN32
+  /*
+   * Windows - use the same size as the old WinPcap 3.1 code.
+   * XXX - this is probably bigger than it needs to be.
+   */
+  #define IF_NAMESIZE 8192
+#else
+  /*
+   * UN*X - use the system's interface name size.
+   * XXX - that might not be large enough for capture devices
+   * that aren't regular network interfaces.
+   */
+  /* for old BSD systems, including bsdi3 */
+  #ifndef IF_NAMESIZE
+  #define IF_NAMESIZE IFNAMSIZ
+  #endif
+#endif
+	static char device[IF_NAMESIZE + 1];
+	char *ret;
+
+	if (pcap_findalldevs(&alldevs, errbuf) == -1)
+		return (NULL);
+
+	if (alldevs == NULL || (alldevs->flags & PCAP_IF_LOOPBACK)) {
+		/*
+		 * There are no devices on the list, or the first device
+		 * on the list is a loopback device, which means there
+		 * are no non-loopback devices on the list.  This means
+		 * we can't return any device.
+		 *
+		 * XXX - why not return a loopback device?  If we can't
+		 * capture on it, it won't be on the list, and if it's
+		 * on the list, there aren't any non-loopback devices,
+		 * so why not just supply it as the default device?
+		 */
+		(void)strlcpy(errbuf, "no suitable device found",
+		    PCAP_ERRBUF_SIZE);
+		ret = NULL;
+	} else {
+		/*
+		 * Return the name of the first device on the list.
+		 */
+		(void)strlcpy(device, alldevs->name, sizeof(device));
+		ret = device;
+	}
+
+	pcap_freealldevs(alldevs);
+	return (ret);
+}
+#endif /* !defined(HAVE_PACKET32) && !defined(MSDOS) */
+
+#if !defined(_WIN32) && !defined(MSDOS)
+/*
+ * We don't just fetch the entire list of devices, search for the
+ * particular device, and use its first IPv4 address, as that's too
+ * much work to get just one device's netmask.
+ *
+ * If we had an API to get attributes for a given device, we could
+ * use that.
+ */
+int
+pcap_lookupnet(const char *device, bpf_u_int32 *netp, bpf_u_int32 *maskp,
+    char *errbuf)
+{
+	register int fd;
+	register struct sockaddr_in *sin4;
+	struct ifreq ifr;
+
+	/*
+	 * The pseudo-device "any" listens on all interfaces and therefore
+	 * has the network address and -mask "0.0.0.0" therefore catching
+	 * all traffic. Using NULL for the interface is the same as "any".
+	 */
+	if (!device || strcmp(device, "any") == 0
+#ifdef HAVE_DAG_API
+	    || strstr(device, "dag") != NULL
+#endif
+#ifdef HAVE_SEPTEL_API
+	    || strstr(device, "septel") != NULL
+#endif
+#ifdef PCAP_SUPPORT_BT
+	    || strstr(device, "bluetooth") != NULL
+#endif
+#ifdef PCAP_SUPPORT_USB
+	    || strstr(device, "usbmon") != NULL
+#endif
+#ifdef HAVE_SNF_API
+	    || strstr(device, "snf") != NULL
+#endif
+#ifdef PCAP_SUPPORT_NETMAP
+	    || strncmp(device, "netmap:", 7) == 0
+	    || strncmp(device, "vale", 4) == 0
+#endif
+	    ) {
+		*netp = *maskp = 0;
+		return 0;
+	}
+
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "socket");
+		return (-1);
+	}
+	memset(&ifr, 0, sizeof(ifr));
+#ifdef linux
+	/* XXX Work around Linux kernel bug */
+	ifr.ifr_addr.sa_family = AF_INET;
+#endif
+	(void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
+		if (errno == EADDRNOTAVAIL) {
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "%s: no IPv4 address assigned", device);
+		} else {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "SIOCGIFADDR: %s", device);
+		}
+		(void)close(fd);
+		return (-1);
+	}
+	sin4 = (struct sockaddr_in *)&ifr.ifr_addr;
+	*netp = sin4->sin_addr.s_addr;
+	memset(&ifr, 0, sizeof(ifr));
+#ifdef linux
+	/* XXX Work around Linux kernel bug */
+	ifr.ifr_addr.sa_family = AF_INET;
+#endif
+	(void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "SIOCGIFNETMASK: %s", device);
+		(void)close(fd);
+		return (-1);
+	}
+	(void)close(fd);
+	*maskp = sin4->sin_addr.s_addr;
+	if (*maskp == 0) {
+		if (IN_CLASSA(*netp))
+			*maskp = IN_CLASSA_NET;
+		else if (IN_CLASSB(*netp))
+			*maskp = IN_CLASSB_NET;
+		else if (IN_CLASSC(*netp))
+			*maskp = IN_CLASSC_NET;
+		else {
+			(void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "inet class for 0x%x unknown", *netp);
+			return (-1);
+		}
+	}
+	*netp &= *maskp;
+	return (0);
+}
+#endif /* !defined(_WIN32) && !defined(MSDOS) */
+
+#ifdef ENABLE_REMOTE
+#include "pcap-rpcap.h"
+
+/*
+ * Extract a substring from a string.
+ */
+static char *
+get_substring(const char *p, size_t len, char *ebuf)
+{
+	char *token;
+
+	token = malloc(len + 1);
+	if (token == NULL) {
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		return (NULL);
+	}
+	memcpy(token, p, len);
+	token[len] = '\0';
+	return (token);
+}
+
+/*
+ * Parse a capture source that might be a URL.
+ *
+ * If the source is not a URL, *schemep, *userinfop, *hostp, and *portp
+ * are set to NULL, *pathp is set to point to the source, and 0 is
+ * returned.
+ *
+ * If source is a URL, and the URL refers to a local device (a special
+ * case of rpcap:), *schemep, *userinfop, *hostp, and *portp are set
+ * to NULL, *pathp is set to point to the device name, and 0 is returned.
+ *
+ * If source is a URL, and it's not a special case that refers to a local
+ * device, and the parse succeeds:
+ *
+ *    *schemep is set to point to an allocated string containing the scheme;
+ *
+ *    if user information is present in the URL, *userinfop is set to point
+ *    to an allocated string containing the user information, otherwise
+ *    it's set to NULL;
+ *
+ *    if host information is present in the URL, *hostp is set to point
+ *    to an allocated string containing the host information, otherwise
+ *    it's set to NULL;
+ *
+ *    if a port number is present in the URL, *portp is set to point
+ *    to an allocated string containing the port number, otherwise
+ *    it's set to NULL;
+ *
+ *    *pathp is set to point to an allocated string containing the
+ *    path;
+ *
+ * and 0 is returned.
+ *
+ * If the parse fails, ebuf is set to an error string, and -1 is returned.
+ */
+static int
+pcap_parse_source(const char *source, char **schemep, char **userinfop,
+    char **hostp, char **portp, char **pathp, char *ebuf)
+{
+	char *colonp;
+	size_t scheme_len;
+	char *scheme;
+	const char *endp;
+	size_t authority_len;
+	char *authority;
+	char *parsep, *atsignp, *bracketp;
+	char *userinfo, *host, *port, *path;
+
+	/*
+	 * Start out returning nothing.
+	 */
+	*schemep = NULL;
+	*userinfop = NULL;
+	*hostp = NULL;
+	*portp = NULL;
+	*pathp = NULL;
+
+	/*
+	 * RFC 3986 says:
+	 *
+	 *   URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+	 *
+	 *   hier-part   = "//" authority path-abempty
+	 *               / path-absolute
+	 *               / path-rootless
+	 *               / path-empty
+	 *
+	 *   authority   = [ userinfo "@" ] host [ ":" port ]
+	 *
+	 *   userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+         *
+         * Step 1: look for the ":" at the end of the scheme.
+	 * A colon in the source is *NOT* sufficient to indicate that
+	 * this is a URL, as interface names on some platforms might
+	 * include colons (e.g., I think some Solaris interfaces
+	 * might).
+	 */
+	colonp = strchr(source, ':');
+	if (colonp == NULL) {
+		/*
+		 * The source is the device to open.
+		 * Return a NULL pointer for the scheme, user information,
+		 * host, and port, and return the device as the path.
+		 */
+		*pathp = strdup(source);
+		if (*pathp == NULL) {
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			return (-1);
+		}
+		return (0);
+	}
+
+	/*
+	 * All schemes must have "//" after them, i.e. we only support
+	 * hier-part   = "//" authority path-abempty, not
+	 * hier-part   = path-absolute
+	 * hier-part   = path-rootless
+	 * hier-part   = path-empty
+	 *
+	 * We need that in order to distinguish between a local device
+	 * name that happens to contain a colon and a URI.
+	 */
+	if (strncmp(colonp + 1, "//", 2) != 0) {
+		/*
+		 * The source is the device to open.
+		 * Return a NULL pointer for the scheme, user information,
+		 * host, and port, and return the device as the path.
+		 */
+		*pathp = strdup(source);
+		if (*pathp == NULL) {
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			return (-1);
+		}
+		return (0);
+	}
+
+	/*
+	 * XXX - check whether the purported scheme could be a scheme?
+	 */
+
+	/*
+	 * OK, this looks like a URL.
+	 * Get the scheme.
+	 */
+	scheme_len = colonp - source;
+	scheme = malloc(scheme_len + 1);
+	if (scheme == NULL) {
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		return (-1);
+	}
+	memcpy(scheme, source, scheme_len);
+	scheme[scheme_len] = '\0';
+
+	/*
+	 * Treat file: specially - take everything after file:// as
+	 * the pathname.
+	 */
+	if (pcap_strcasecmp(scheme, "file") == 0) {
+		*schemep = scheme;
+		*pathp = strdup(colonp + 3);
+		if (*pathp == NULL) {
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			return (-1);
+		}
+		return (0);
+	}
+
+	/*
+	 * The WinPcap documentation says you can specify a local
+	 * interface with "rpcap://{device}"; we special-case
+	 * that here.  If the scheme is "rpcap", and there are
+	 * no slashes past the "//", we just return the device.
+	 *
+	 * XXX - %-escaping?
+	 */
+	if (pcap_strcasecmp(scheme, "rpcap") == 0 &&
+	    strchr(colonp + 3, '/') == NULL) {
+		/*
+		 * Local device.
+		 *
+		 * Return a NULL pointer for the scheme, user information,
+		 * host, and port, and return the device as the path.
+		 */
+		free(scheme);
+		*pathp = strdup(colonp + 3);
+		if (*pathp == NULL) {
+			pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+			    errno, "malloc");
+			return (-1);
+		}
+		return (0);
+	}
+
+	/*
+	 * OK, now start parsing the authority.
+	 * Get token, terminated with / or terminated at the end of
+	 * the string.
+	 */
+	authority_len = strcspn(colonp + 3, "/");
+	authority = get_substring(colonp + 3, authority_len, ebuf);
+	if (authority == NULL) {
+		/*
+		 * Error.
+		 */
+		free(scheme);
+		return (-1);
+	}
+	endp = colonp + 3 + authority_len;
+
+	/*
+	 * Now carve the authority field into its components.
+	 */
+	parsep = authority;
+
+	/*
+	 * Is there a userinfo field?
+	 */
+	atsignp = strchr(parsep, '@');
+	if (atsignp != NULL) {
+		/*
+		 * Yes.
+		 */
+		size_t userinfo_len;
+
+		userinfo_len = atsignp - parsep;
+		userinfo = get_substring(parsep, userinfo_len, ebuf);
+		if (userinfo == NULL) {
+			/*
+			 * Error.
+			 */
+			free(authority);
+			free(scheme);
+			return (-1);
+		}
+		parsep = atsignp + 1;
+	} else {
+		/*
+		 * No.
+		 */
+		userinfo = NULL;
+	}
+
+	/*
+	 * Is there a host field?
+	 */
+	if (*parsep == '\0') {
+		/*
+		 * No; there's no host field or port field.
+		 */
+		host = NULL;
+		port = NULL;
+	} else {
+		/*
+		 * Yes.
+		 */
+		size_t host_len;
+
+		/*
+		 * Is it an IP-literal?
+		 */
+		if (*parsep == '[') {
+			/*
+			 * Yes.
+			 * Treat verything up to the closing square
+			 * bracket as the IP-Literal; we don't worry
+			 * about whether it's a valid IPv6address or
+			 * IPvFuture.
+			 */
+			bracketp = strchr(parsep, ']');
+			if (bracketp == NULL) {
+				/*
+				 * There's no closing square bracket.
+				 */
+				pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
+				    "IP-literal in URL doesn't end with ]");
+				free(userinfo);
+				free(authority);
+				free(scheme);
+				return (-1);
+			}
+			if (*(bracketp + 1) != '\0' &&
+			    *(bracketp + 1) != ':') {
+				/*
+				 * There's extra crud after the
+				 * closing square bracketn.
+				 */
+				pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE,
+				    "Extra text after IP-literal in URL");
+				free(userinfo);
+				free(authority);
+				free(scheme);
+				return (-1);
+			}
+			host_len = (bracketp - 1) - parsep;
+			host = get_substring(parsep + 1, host_len, ebuf);
+			if (host == NULL) {
+				/*
+				 * Error.
+				 */
+				free(userinfo);
+				free(authority);
+				free(scheme);
+				return (-1);
+			}
+			parsep = bracketp + 1;
+		} else {
+			/*
+			 * No.
+			 * Treat everything up to a : or the end of
+			 * the string as the host.
+			 */
+			host_len = strcspn(parsep, ":");
+			host = get_substring(parsep, host_len, ebuf);
+			if (host == NULL) {
+				/*
+				 * Error.
+				 */
+				free(userinfo);
+				free(authority);
+				free(scheme);
+				return (-1);
+			}
+			parsep = parsep + host_len;
+		}
+
+		/*
+		 * Is there a port field?
+		 */
+		if (*parsep == ':') {
+			/*
+			 * Yes.  It's the rest of the authority field.
+			 */
+			size_t port_len;
+
+			parsep++;
+			port_len = strlen(parsep);
+			port = get_substring(parsep, port_len, ebuf);
+			if (port == NULL) {
+				/*
+				 * Error.
+				 */
+				free(host);
+				free(userinfo);
+				free(authority);
+				free(scheme);
+				return (-1);
+			}
+		} else {
+			/*
+			 * No.
+			 */
+			port = NULL;
+		}
+	}
+	free(authority);
+
+	/*
+	 * Everything else is the path.  Strip off the leading /.
+	 */
+	if (*endp == '\0')
+		path = strdup("");
+	else
+		path = strdup(endp + 1);
+	if (path == NULL) {
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
+		free(port);
+		free(host);
+		free(userinfo);
+		free(scheme);
+		return (-1);
+	}
+	*schemep = scheme;
+	*userinfop = userinfo;
+	*hostp = host;
+	*portp = port;
+	*pathp = path;
+	return (0);
+}
+
+int
+pcap_createsrcstr(char *source, int type, const char *host, const char *port,
+    const char *name, char *errbuf)
+{
+	switch (type) {
+
+	case PCAP_SRC_FILE:
+		strlcpy(source, PCAP_SRC_FILE_STRING, PCAP_BUF_SIZE);
+		if (name != NULL && *name != '\0') {
+			strlcat(source, name, PCAP_BUF_SIZE);
+			return (0);
+		} else {
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "The file name cannot be NULL.");
+			return (-1);
+		}
+
+	case PCAP_SRC_IFREMOTE:
+		strlcpy(source, PCAP_SRC_IF_STRING, PCAP_BUF_SIZE);
+		if (host != NULL && *host != '\0') {
+			if (strchr(host, ':') != NULL) {
+				/*
+				 * The host name contains a colon, so it's
+				 * probably an IPv6 address, and needs to
+				 * be included in square brackets.
+				 */
+				strlcat(source, "[", PCAP_BUF_SIZE);
+				strlcat(source, host, PCAP_BUF_SIZE);
+				strlcat(source, "]", PCAP_BUF_SIZE);
+			} else
+				strlcat(source, host, PCAP_BUF_SIZE);
+
+			if (port != NULL && *port != '\0') {
+				strlcat(source, ":", PCAP_BUF_SIZE);
+				strlcat(source, port, PCAP_BUF_SIZE);
+			}
+
+			strlcat(source, "/", PCAP_BUF_SIZE);
+		} else {
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "The host name cannot be NULL.");
+			return (-1);
+		}
+
+		if (name != NULL && *name != '\0')
+			strlcat(source, name, PCAP_BUF_SIZE);
+
+		return (0);
+
+	case PCAP_SRC_IFLOCAL:
+		strlcpy(source, PCAP_SRC_IF_STRING, PCAP_BUF_SIZE);
+
+		if (name != NULL && *name != '\0')
+			strlcat(source, name, PCAP_BUF_SIZE);
+
+		return (0);
+
+	default:
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "The interface type is not valid.");
+		return (-1);
+	}
+}
+
+int
+pcap_parsesrcstr(const char *source, int *type, char *host, char *port,
+    char *name, char *errbuf)
+{
+	char *scheme, *tmpuserinfo, *tmphost, *tmpport, *tmppath;
+
+	/* Initialization stuff */
+	if (host)
+		*host = '\0';
+	if (port)
+		*port = '\0';
+	if (name)
+		*name = '\0';
+
+	/* Parse the source string */
+	if (pcap_parse_source(source, &scheme, &tmpuserinfo, &tmphost,
+	    &tmpport, &tmppath, errbuf) == -1) {
+		/*
+		 * Fail.
+		 */
+		return (-1);
+	}
+
+	if (scheme == NULL) {
+		/*
+		 * Local device.
+		 */
+		if (name && tmppath)
+			strlcpy(name, tmppath, PCAP_BUF_SIZE);
+		if (type)
+			*type = PCAP_SRC_IFLOCAL;
+		free(tmppath);
+		free(tmpport);
+		free(tmphost);
+		free(tmpuserinfo);
+		return (0);
+	}
+
+	if (strcmp(scheme, "rpcap") == 0) {
+		/*
+		 * rpcap://
+		 *
+		 * pcap_parse_source() has already handled the case of
+		 * rpcap://device
+		 */
+		if (host && tmphost) {
+			if (tmpuserinfo)
+				pcap_snprintf(host, PCAP_BUF_SIZE, "%s@%s",
+				    tmpuserinfo, tmphost);
+			else
+				strlcpy(host, tmphost, PCAP_BUF_SIZE);
+		}
+		if (port && tmpport)
+			strlcpy(port, tmpport, PCAP_BUF_SIZE);
+		if (name && tmppath)
+			strlcpy(name, tmppath, PCAP_BUF_SIZE);
+		if (type)
+			*type = PCAP_SRC_IFREMOTE;
+		free(tmppath);
+		free(tmpport);
+		free(tmphost);
+		free(tmpuserinfo);
+		free(scheme);
+		return (0);
+	}
+
+	if (strcmp(scheme, "file") == 0) {
+		/*
+		 * file://
+		 */
+		if (name && tmppath)
+			strlcpy(name, tmppath, PCAP_BUF_SIZE);
+		if (type)
+			*type = PCAP_SRC_FILE;
+		free(tmppath);
+		free(tmpport);
+		free(tmphost);
+		free(tmpuserinfo);
+		free(scheme);
+		return (0);
+	}
+
+	/*
+	 * Neither rpcap: nor file:; just treat the entire string
+	 * as a local device.
+	 */
+	if (name)
+		strlcpy(name, source, PCAP_BUF_SIZE);
+	if (type)
+		*type = PCAP_SRC_IFLOCAL;
+	free(tmppath);
+	free(tmpport);
+	free(tmphost);
+	free(tmpuserinfo);
+	free(scheme);
+	return (0);
+}
+#endif
+
 pcap_t *
 pcap_create(const char *device, char *errbuf)
 {
 	size_t i;
 	int is_theirs;
 	pcap_t *p;
 	char *device_str;
 
 	/*
 	 * A null device name is equivalent to the "any" device -
 	 * which might not be supported on this platform, but
 	 * this means that you'll get a "not supported" error
 	 * rather than, say, a crash when we try to dereference
 	 * the null pointer.
 	 */
 	if (device == NULL)
 		device_str = strdup("any");
 	else {
 #ifdef _WIN32
 		/*
 		 * If the string appears to be little-endian UCS-2/UTF-16,
 		 * convert it to ASCII.
 		 *
 		 * XXX - to UTF-8 instead?  Or report an error if any
 		 * character isn't ASCII?
 		 */
 		if (device[0] != '\0' && device[1] == '\0') {
 			size_t length;
 
 			length = wcslen((wchar_t *)device);
 			device_str = (char *)malloc(length + 1);
 			if (device_str == NULL) {
-				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-				    "malloc: %s", pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "malloc");
 				return (NULL);
 			}
 
 			pcap_snprintf(device_str, length + 1, "%ws",
 			    (const wchar_t *)device);
 		} else
 #endif
 			device_str = strdup(device);
 	}
 	if (device_str == NULL) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-		    "malloc: %s", pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		return (NULL);
 	}
 
 	/*
 	 * Try each of the non-local-network-interface capture
 	 * source types until we find one that works for this
 	 * device or run out of types.
 	 */
 	for (i = 0; capture_source_types[i].create_op != NULL; i++) {
 		is_theirs = 0;
 		p = capture_source_types[i].create_op(device_str, errbuf,
 		    &is_theirs);
 		if (is_theirs) {
 			/*
 			 * The device name refers to a device of the
 			 * type in question; either it succeeded,
 			 * in which case p refers to a pcap_t to
 			 * later activate for the device, or it
 			 * failed, in which case p is null and we
 			 * should return that to report the failure
 			 * to create.
 			 */
 			if (p == NULL) {
 				/*
 				 * We assume the caller filled in errbuf.
 				 */
 				free(device_str);
 				return (NULL);
 			}
 			p->opt.device = device_str;
 			return (p);
 		}
 	}
 
 	/*
 	 * OK, try it as a regular network interface.
 	 */
 	p = pcap_create_interface(device_str, errbuf);
 	if (p == NULL) {
 		/*
 		 * We assume the caller filled in errbuf.
 		 */
 		free(device_str);
 		return (NULL);
 	}
 	p->opt.device = device_str;
 	return (p);
 }
 
+/*
+ * Set nonblocking mode on an unactivated pcap_t; this sets a flag
+ * checked by pcap_activate(), which sets the mode after calling
+ * the activate routine.
+ */
+static int
+pcap_setnonblock_unactivated(pcap_t *p, int nonblock)
+{
+	p->opt.nonblock = nonblock;
+	return (0);
+}
+
 static void
 initialize_ops(pcap_t *p)
 {
 	/*
 	 * Set operation pointers for operations that only work on
 	 * an activated pcap_t to point to a routine that returns
 	 * a "this isn't activated" error.
 	 */
 	p->read_op = (read_op_t)pcap_not_initialized;
 	p->inject_op = (inject_op_t)pcap_not_initialized;
 	p->setfilter_op = (setfilter_op_t)pcap_not_initialized;
 	p->setdirection_op = (setdirection_op_t)pcap_not_initialized;
 	p->set_datalink_op = (set_datalink_op_t)pcap_not_initialized;
 	p->getnonblock_op = (getnonblock_op_t)pcap_not_initialized;
-	p->setnonblock_op = (setnonblock_op_t)pcap_not_initialized;
 	p->stats_op = (stats_op_t)pcap_not_initialized;
 #ifdef _WIN32
 	p->stats_ex_op = (stats_ex_op_t)pcap_not_initialized_ptr;
 	p->setbuff_op = (setbuff_op_t)pcap_not_initialized;
 	p->setmode_op = (setmode_op_t)pcap_not_initialized;
 	p->setmintocopy_op = (setmintocopy_op_t)pcap_not_initialized;
 	p->getevent_op = pcap_getevent_not_initialized;
 	p->oid_get_request_op = (oid_get_request_op_t)pcap_not_initialized;
 	p->oid_set_request_op = (oid_set_request_op_t)pcap_not_initialized;
 	p->sendqueue_transmit_op = pcap_sendqueue_transmit_not_initialized;
 	p->setuserbuffer_op = (setuserbuffer_op_t)pcap_not_initialized;
 	p->live_dump_op = (live_dump_op_t)pcap_not_initialized;
 	p->live_dump_ended_op = (live_dump_ended_op_t)pcap_not_initialized;
 	p->get_airpcap_handle_op = pcap_get_airpcap_handle_not_initialized;
 #endif
 
 	/*
 	 * Default cleanup operation - implementations can override
 	 * this, but should call pcap_cleanup_live_common() after
 	 * doing their own additional cleanup.
 	 */
 	p->cleanup_op = pcap_cleanup_live_common;
 
 	/*
 	 * In most cases, the standard one-shot callback can
 	 * be used for pcap_next()/pcap_next_ex().
 	 */
 	p->oneshot_callback = pcap_oneshot;
 }
 
 static pcap_t *
 pcap_alloc_pcap_t(char *ebuf, size_t size)
 {
 	char *chunk;
 	pcap_t *p;
 
 	/*
 	 * Allocate a chunk of memory big enough for a pcap_t
 	 * plus a structure following it of size "size".  The
 	 * structure following it is a private data structure
 	 * for the routines that handle this pcap_t.
 	 */
 	chunk = malloc(sizeof (pcap_t) + size);
 	if (chunk == NULL) {
-		pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+		    errno, "malloc");
 		return (NULL);
 	}
 	memset(chunk, 0, sizeof (pcap_t) + size);
 
 	/*
 	 * Get a pointer to the pcap_t at the beginning.
 	 */
 	p = (pcap_t *)chunk;
 
-#ifndef _WIN32
+#ifdef _WIN32
+	p->handle = INVALID_HANDLE_VALUE;	/* not opened yet */
+#else /* _WIN32 */
 	p->fd = -1;	/* not opened yet */
+#ifndef MSDOS
 	p->selectable_fd = -1;
-#endif
+	p->required_select_timeout = NULL;
+#endif /* MSDOS */
+#endif /* _WIN32 */
 
 	if (size == 0) {
 		/* No private data was requested. */
 		p->priv = NULL;
 	} else {
 		/*
 		 * Set the pointer to the private data; that's the structure
 		 * of size "size" following the pcap_t.
 		 */
 		p->priv = (void *)(chunk + sizeof (pcap_t));
 	}
 
 	return (p);
 }
 
 pcap_t *
 pcap_create_common(char *ebuf, size_t size)
 {
 	pcap_t *p;
 
 	p = pcap_alloc_pcap_t(ebuf, size);
 	if (p == NULL)
 		return (NULL);
 
 	/*
 	 * Default to "can't set rfmon mode"; if it's supported by
 	 * a platform, the create routine that called us can set
 	 * the op to its routine to check whether a particular
 	 * device supports it.
 	 */
 	p->can_set_rfmon_op = pcap_cant_set_rfmon;
 
+	/*
+	 * If pcap_setnonblock() is called on a not-yet-activated
+	 * pcap_t, default to setting a flag and turning
+	 * on non-blocking mode when activated.
+	 */
+	p->setnonblock_op = pcap_setnonblock_unactivated;
+
 	initialize_ops(p);
 
 	/* put in some defaults*/
- 	p->snapshot = MAXIMUM_SNAPLEN;	/* max packet size */
+	p->snapshot = 0;		/* max packet size unspecified */
 	p->opt.timeout = 0;		/* no timeout specified */
 	p->opt.buffer_size = 0;		/* use the platform's default */
 	p->opt.promisc = 0;
 	p->opt.rfmon = 0;
 	p->opt.immediate = 0;
 	p->opt.tstamp_type = -1;	/* default to not setting time stamp type */
 	p->opt.tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;
+	/*
+	 * Platform-dependent options.
+	 */
+#ifdef __linux__
+	p->opt.protocol = 0;
+#endif
+#ifdef _WIN32
+	p->opt.nocapture_local = 0;
+#endif
 
 	/*
 	 * Start out with no BPF code generation flags set.
 	 */
 	p->bpf_codegen_flags = 0;
 
 	return (p);
 }
 
 int
 pcap_check_activated(pcap_t *p)
 {
 	if (p->activated) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "can't perform "
 			" operation on activated capture");
 		return (-1);
 	}
 	return (0);
 }
 
 int
 pcap_set_snaplen(pcap_t *p, int snaplen)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
-
-	/*
-	 * Turn invalid values, or excessively large values, into
-	 * the maximum allowed value.
-	 *
-	 * If some application really *needs* a bigger snapshot
-	 * length, we should just increase MAXIMUM_SNAPLEN.
-	 */
-	if (snaplen <= 0 || snaplen > MAXIMUM_SNAPLEN)
-		snaplen = MAXIMUM_SNAPLEN;
 	p->snapshot = snaplen;
 	return (0);
 }
 
 int
 pcap_set_promisc(pcap_t *p, int promisc)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	p->opt.promisc = promisc;
 	return (0);
 }
 
 int
 pcap_set_rfmon(pcap_t *p, int rfmon)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	p->opt.rfmon = rfmon;
 	return (0);
 }
 
 int
 pcap_set_timeout(pcap_t *p, int timeout_ms)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	p->opt.timeout = timeout_ms;
 	return (0);
 }
 
 int
 pcap_set_tstamp_type(pcap_t *p, int tstamp_type)
 {
 	int i;
 
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 
 	/*
 	 * The argument should have been u_int, but that's too late
 	 * to change now - it's an API.
 	 */
 	if (tstamp_type < 0)
 		return (PCAP_WARNING_TSTAMP_TYPE_NOTSUP);
 
 	/*
 	 * If p->tstamp_type_count is 0, we only support PCAP_TSTAMP_HOST;
 	 * the default time stamp type is PCAP_TSTAMP_HOST.
 	 */
 	if (p->tstamp_type_count == 0) {
 		if (tstamp_type == PCAP_TSTAMP_HOST) {
 			p->opt.tstamp_type = tstamp_type;
 			return (0);
 		}
 	} else {
 		/*
 		 * Check whether we claim to support this type of time stamp.
 		 */
 		for (i = 0; i < p->tstamp_type_count; i++) {
 			if (p->tstamp_type_list[i] == (u_int)tstamp_type) {
 				/*
 				 * Yes.
 				 */
 				p->opt.tstamp_type = tstamp_type;
 				return (0);
 			}
 		}
 	}
 
 	/*
 	 * We don't support this type of time stamp.
 	 */
 	return (PCAP_WARNING_TSTAMP_TYPE_NOTSUP);
 }
 
 int
 pcap_set_immediate_mode(pcap_t *p, int immediate)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	p->opt.immediate = immediate;
 	return (0);
 }
 
 int
 pcap_set_buffer_size(pcap_t *p, int buffer_size)
 {
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	if (buffer_size <= 0) {
 		/*
 		 * Silently ignore invalid values.
 		 */
 		return (0);
 	}
 	p->opt.buffer_size = buffer_size;
 	return (0);
 }
 
 int
 pcap_set_tstamp_precision(pcap_t *p, int tstamp_precision)
 {
 	int i;
 
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 
 	/*
 	 * The argument should have been u_int, but that's too late
 	 * to change now - it's an API.
 	 */
 	if (tstamp_precision < 0)
 		return (PCAP_ERROR_TSTAMP_PRECISION_NOTSUP);
 
 	/*
 	 * If p->tstamp_precision_count is 0, we only support setting
 	 * the time stamp precision to microsecond precision; every
 	 * pcap module *MUST* support microsecond precision, even if
 	 * it does so by converting the native precision to
 	 * microseconds.
 	 */
 	if (p->tstamp_precision_count == 0) {
 		if (tstamp_precision == PCAP_TSTAMP_PRECISION_MICRO) {
 			p->opt.tstamp_precision = tstamp_precision;
 			return (0);
 		}
 	} else {
 		/*
 		 * Check whether we claim to support this precision of
 		 * time stamp.
 		 */
 		for (i = 0; i < p->tstamp_precision_count; i++) {
 			if (p->tstamp_precision_list[i] == (u_int)tstamp_precision) {
 				/*
 				 * Yes.
 				 */
 				p->opt.tstamp_precision = tstamp_precision;
 				return (0);
 			}
 		}
 	}
 
 	/*
 	 * We don't support this time stamp precision.
 	 */
 	return (PCAP_ERROR_TSTAMP_PRECISION_NOTSUP);
 }
 
 int
 pcap_get_tstamp_precision(pcap_t *p)
 {
         return (p->opt.tstamp_precision);
 }
 
 int
 pcap_activate(pcap_t *p)
 {
 	int status;
 
 	/*
 	 * Catch attempts to re-activate an already-activated
 	 * pcap_t; this should, for example, catch code that
 	 * calls pcap_open_live() followed by pcap_activate(),
 	 * as some code that showed up in a Stack Exchange
 	 * question did.
 	 */
 	if (pcap_check_activated(p))
 		return (PCAP_ERROR_ACTIVATED);
 	status = p->activate_op(p);
-	if (status >= 0)
+	if (status >= 0) {
+		/*
+		 * If somebody requested non-blocking mode before
+		 * calling pcap_activate(), turn it on now.
+		 */
+		if (p->opt.nonblock) {
+			status = p->setnonblock_op(p, 1);
+			if (status < 0) {
+				/*
+				 * Failed.  Undo everything done by
+				 * the activate operation.
+				 */
+				p->cleanup_op(p);
+				initialize_ops(p);
+				return (status);
+			}
+		}
 		p->activated = 1;
-	else {
+	} else {
 		if (p->errbuf[0] == '\0') {
 			/*
 			 * No error message supplied by the activate routine;
 			 * for the benefit of programs that don't specially
 			 * handle errors other than PCAP_ERROR, return the
 			 * error message corresponding to the status.
 			 */
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s",
 			    pcap_statustostr(status));
 		}
 
 		/*
 		 * Undo any operation pointer setting, etc. done by
 		 * the activate operation.
 		 */
 		initialize_ops(p);
 	}
 	return (status);
 }
 
 pcap_t *
 pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, char *errbuf)
 {
 	pcap_t *p;
 	int status;
+#ifdef ENABLE_REMOTE
+	char host[PCAP_BUF_SIZE + 1];
+	char port[PCAP_BUF_SIZE + 1];
+	char name[PCAP_BUF_SIZE + 1];
+	int srctype;
 
+	/*
+	 * Retrofit - we have to make older applications compatible with
+	 * remote capture.
+	 * So we're calling pcap_open_remote() from here; this is a very
+	 * dirty hack.
+	 * Obviously, we cannot exploit all the new features; for instance,
+	 * we cannot send authentication, we cannot use a UDP data connection,
+	 * and so on.
+	 */
+	if (pcap_parsesrcstr(device, &srctype, host, port, name, errbuf))
+		return (NULL);
+
+	if (srctype == PCAP_SRC_IFREMOTE) {
+		/*
+		 * Although we already have host, port and iface, we prefer
+		 * to pass only 'device' to pcap_open_rpcap(), so that it has
+		 * to call pcap_parsesrcstr() again.
+		 * This is less optimized, but much clearer.
+		 */
+		return (pcap_open_rpcap(device, snaplen,
+		    promisc ? PCAP_OPENFLAG_PROMISCUOUS : 0, to_ms,
+		    NULL, errbuf));
+	}
+	if (srctype == PCAP_SRC_FILE) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "unknown URL scheme \"file\"");
+		return (NULL);
+	}
+	if (srctype == PCAP_SRC_IFLOCAL) {
+		/*
+		 * If it starts with rpcap://, that refers to a local device
+		 * (no host part in the URL). Remove the rpcap://, and
+		 * fall through to the regular open path.
+		 */
+		if (strncmp(device, PCAP_SRC_IF_STRING, strlen(PCAP_SRC_IF_STRING)) == 0) {
+			size_t len = strlen(device) - strlen(PCAP_SRC_IF_STRING) + 1;
+
+			if (len > 0)
+				device += strlen(PCAP_SRC_IF_STRING);
+		}
+	}
+#endif	/* ENABLE_REMOTE */
+
 	p = pcap_create(device, errbuf);
 	if (p == NULL)
 		return (NULL);
 	status = pcap_set_snaplen(p, snaplen);
 	if (status < 0)
 		goto fail;
 	status = pcap_set_promisc(p, promisc);
 	if (status < 0)
 		goto fail;
 	status = pcap_set_timeout(p, to_ms);
 	if (status < 0)
 		goto fail;
 	/*
 	 * Mark this as opened with pcap_open_live(), so that, for
 	 * example, we show the full list of DLT_ values, rather
 	 * than just the ones that are compatible with capturing
 	 * when not in monitor mode.  That allows existing applications
 	 * to work the way they used to work, but allows new applications
 	 * that know about the new open API to, for example, find out the
 	 * DLT_ values that they can select without changing whether
 	 * the adapter is in monitor mode or not.
 	 */
 	p->oldstyle = 1;
 	status = pcap_activate(p);
 	if (status < 0)
 		goto fail;
 	return (p);
 fail:
 	if (status == PCAP_ERROR)
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", device,
 		    p->errbuf);
 	else if (status == PCAP_ERROR_NO_SUCH_DEVICE ||
 	    status == PCAP_ERROR_PERM_DENIED ||
 	    status == PCAP_ERROR_PROMISC_PERM_DENIED)
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s (%s)", device,
 		    pcap_statustostr(status), p->errbuf);
 	else
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", device,
 		    pcap_statustostr(status));
 	pcap_close(p);
 	return (NULL);
 }
 
 pcap_t *
 pcap_open_offline_common(char *ebuf, size_t size)
 {
 	pcap_t *p;
 
 	p = pcap_alloc_pcap_t(ebuf, size);
 	if (p == NULL)
 		return (NULL);
 
 	p->opt.tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;
 
 	return (p);
 }
 
 int
 pcap_dispatch(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	return (p->read_op(p, cnt, callback, user));
 }
 
 int
 pcap_loop(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	register int n;
 
 	for (;;) {
 		if (p->rfile != NULL) {
 			/*
 			 * 0 means EOF, so don't loop if we get 0.
 			 */
 			n = pcap_offline_read(p, cnt, callback, user);
 		} else {
 			/*
 			 * XXX keep reading until we get something
 			 * (or an error occurs)
 			 */
 			do {
 				n = p->read_op(p, cnt, callback, user);
 			} while (n == 0);
 		}
 		if (n <= 0)
 			return (n);
 		if (!PACKET_COUNT_IS_UNLIMITED(cnt)) {
 			cnt -= n;
 			if (cnt <= 0)
 				return (0);
 		}
 	}
 }
 
 /*
  * Force the loop in "pcap_read()" or "pcap_read_offline()" to terminate.
  */
 void
 pcap_breakloop(pcap_t *p)
 {
 	p->break_loop = 1;
 }
 
 int
 pcap_datalink(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->linktype);
 }
 
 int
 pcap_datalink_ext(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->linktype_ext);
 }
 
 int
 pcap_list_datalinks(pcap_t *p, int **dlt_buffer)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	if (p->dlt_count == 0) {
 		/*
 		 * We couldn't fetch the list of DLTs, which means
 		 * this platform doesn't support changing the
 		 * DLT for an interface.  Return a list of DLTs
 		 * containing only the DLT this device supports.
 		 */
 		*dlt_buffer = (int*)malloc(sizeof(**dlt_buffer));
 		if (*dlt_buffer == NULL) {
-			(void)pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			    "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+			    errno, "malloc");
 			return (PCAP_ERROR);
 		}
 		**dlt_buffer = p->linktype;
 		return (1);
 	} else {
 		*dlt_buffer = (int*)calloc(sizeof(**dlt_buffer), p->dlt_count);
 		if (*dlt_buffer == NULL) {
-			(void)pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-			    "malloc: %s", pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+			    errno, "malloc");
 			return (PCAP_ERROR);
 		}
 		(void)memcpy(*dlt_buffer, p->dlt_list,
 		    sizeof(**dlt_buffer) * p->dlt_count);
 		return (p->dlt_count);
 	}
 }
 
 /*
  * In Windows, you might have a library built with one version of the
  * C runtime library and an application built with another version of
  * the C runtime library, which means that the library might use one
  * version of malloc() and free() and the application might use another
  * version of malloc() and free().  If so, that means something
  * allocated by the library cannot be freed by the application, so we
  * need to have a pcap_free_datalinks() routine to free up the list
  * allocated by pcap_list_datalinks(), even though it's just a wrapper
  * around free().
  */
 void
 pcap_free_datalinks(int *dlt_list)
 {
 	free(dlt_list);
 }
 
 int
 pcap_set_datalink(pcap_t *p, int dlt)
 {
 	int i;
 	const char *dlt_name;
 
 	if (dlt < 0)
 		goto unsupported;
 
 	if (p->dlt_count == 0 || p->set_datalink_op == NULL) {
 		/*
 		 * We couldn't fetch the list of DLTs, or we don't
 		 * have a "set datalink" operation, which means
 		 * this platform doesn't support changing the
 		 * DLT for an interface.  Check whether the new
 		 * DLT is the one this interface supports.
 		 */
 		if (p->linktype != dlt)
 			goto unsupported;
 
 		/*
 		 * It is, so there's nothing we need to do here.
 		 */
 		return (0);
 	}
 	for (i = 0; i < p->dlt_count; i++)
 		if (p->dlt_list[i] == (u_int)dlt)
 			break;
 	if (i >= p->dlt_count)
 		goto unsupported;
 	if (p->dlt_count == 2 && p->dlt_list[0] == DLT_EN10MB &&
 	    dlt == DLT_DOCSIS) {
 		/*
 		 * This is presumably an Ethernet device, as the first
 		 * link-layer type it offers is DLT_EN10MB, and the only
 		 * other type it offers is DLT_DOCSIS.  That means that
 		 * we can't tell the driver to supply DOCSIS link-layer
 		 * headers - we're just pretending that's what we're
 		 * getting, as, presumably, we're capturing on a dedicated
 		 * link to a Cisco Cable Modem Termination System, and
 		 * it's putting raw DOCSIS frames on the wire inside low-level
 		 * Ethernet framing.
 		 */
 		p->linktype = dlt;
 		return (0);
 	}
 	if (p->set_datalink_op(p, dlt) == -1)
 		return (-1);
 	p->linktype = dlt;
 	return (0);
 
 unsupported:
 	dlt_name = pcap_datalink_val_to_name(dlt);
 	if (dlt_name != NULL) {
 		(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 		    "%s is not one of the DLTs supported by this device",
 		    dlt_name);
 	} else {
 		(void) pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 		    "DLT %d is not one of the DLTs supported by this device",
 		    dlt);
 	}
 	return (-1);
 }
 
 /*
  * This array is designed for mapping upper and lower case letter
  * together for a case independent comparison.  The mappings are
  * based upon ascii character sequences.
  */
 static const u_char charmap[] = {
 	(u_char)'\000', (u_char)'\001', (u_char)'\002', (u_char)'\003',
 	(u_char)'\004', (u_char)'\005', (u_char)'\006', (u_char)'\007',
 	(u_char)'\010', (u_char)'\011', (u_char)'\012', (u_char)'\013',
 	(u_char)'\014', (u_char)'\015', (u_char)'\016', (u_char)'\017',
 	(u_char)'\020', (u_char)'\021', (u_char)'\022', (u_char)'\023',
 	(u_char)'\024', (u_char)'\025', (u_char)'\026', (u_char)'\027',
 	(u_char)'\030', (u_char)'\031', (u_char)'\032', (u_char)'\033',
 	(u_char)'\034', (u_char)'\035', (u_char)'\036', (u_char)'\037',
 	(u_char)'\040', (u_char)'\041', (u_char)'\042', (u_char)'\043',
 	(u_char)'\044', (u_char)'\045', (u_char)'\046', (u_char)'\047',
 	(u_char)'\050', (u_char)'\051', (u_char)'\052', (u_char)'\053',
 	(u_char)'\054', (u_char)'\055', (u_char)'\056', (u_char)'\057',
 	(u_char)'\060', (u_char)'\061', (u_char)'\062', (u_char)'\063',
 	(u_char)'\064', (u_char)'\065', (u_char)'\066', (u_char)'\067',
 	(u_char)'\070', (u_char)'\071', (u_char)'\072', (u_char)'\073',
 	(u_char)'\074', (u_char)'\075', (u_char)'\076', (u_char)'\077',
 	(u_char)'\100', (u_char)'\141', (u_char)'\142', (u_char)'\143',
 	(u_char)'\144', (u_char)'\145', (u_char)'\146', (u_char)'\147',
 	(u_char)'\150', (u_char)'\151', (u_char)'\152', (u_char)'\153',
 	(u_char)'\154', (u_char)'\155', (u_char)'\156', (u_char)'\157',
 	(u_char)'\160', (u_char)'\161', (u_char)'\162', (u_char)'\163',
 	(u_char)'\164', (u_char)'\165', (u_char)'\166', (u_char)'\167',
 	(u_char)'\170', (u_char)'\171', (u_char)'\172', (u_char)'\133',
 	(u_char)'\134', (u_char)'\135', (u_char)'\136', (u_char)'\137',
 	(u_char)'\140', (u_char)'\141', (u_char)'\142', (u_char)'\143',
 	(u_char)'\144', (u_char)'\145', (u_char)'\146', (u_char)'\147',
 	(u_char)'\150', (u_char)'\151', (u_char)'\152', (u_char)'\153',
 	(u_char)'\154', (u_char)'\155', (u_char)'\156', (u_char)'\157',
 	(u_char)'\160', (u_char)'\161', (u_char)'\162', (u_char)'\163',
 	(u_char)'\164', (u_char)'\165', (u_char)'\166', (u_char)'\167',
 	(u_char)'\170', (u_char)'\171', (u_char)'\172', (u_char)'\173',
 	(u_char)'\174', (u_char)'\175', (u_char)'\176', (u_char)'\177',
 	(u_char)'\200', (u_char)'\201', (u_char)'\202', (u_char)'\203',
 	(u_char)'\204', (u_char)'\205', (u_char)'\206', (u_char)'\207',
 	(u_char)'\210', (u_char)'\211', (u_char)'\212', (u_char)'\213',
 	(u_char)'\214', (u_char)'\215', (u_char)'\216', (u_char)'\217',
 	(u_char)'\220', (u_char)'\221', (u_char)'\222', (u_char)'\223',
 	(u_char)'\224', (u_char)'\225', (u_char)'\226', (u_char)'\227',
 	(u_char)'\230', (u_char)'\231', (u_char)'\232', (u_char)'\233',
 	(u_char)'\234', (u_char)'\235', (u_char)'\236', (u_char)'\237',
 	(u_char)'\240', (u_char)'\241', (u_char)'\242', (u_char)'\243',
 	(u_char)'\244', (u_char)'\245', (u_char)'\246', (u_char)'\247',
 	(u_char)'\250', (u_char)'\251', (u_char)'\252', (u_char)'\253',
 	(u_char)'\254', (u_char)'\255', (u_char)'\256', (u_char)'\257',
 	(u_char)'\260', (u_char)'\261', (u_char)'\262', (u_char)'\263',
 	(u_char)'\264', (u_char)'\265', (u_char)'\266', (u_char)'\267',
 	(u_char)'\270', (u_char)'\271', (u_char)'\272', (u_char)'\273',
 	(u_char)'\274', (u_char)'\275', (u_char)'\276', (u_char)'\277',
 	(u_char)'\300', (u_char)'\341', (u_char)'\342', (u_char)'\343',
 	(u_char)'\344', (u_char)'\345', (u_char)'\346', (u_char)'\347',
 	(u_char)'\350', (u_char)'\351', (u_char)'\352', (u_char)'\353',
 	(u_char)'\354', (u_char)'\355', (u_char)'\356', (u_char)'\357',
 	(u_char)'\360', (u_char)'\361', (u_char)'\362', (u_char)'\363',
 	(u_char)'\364', (u_char)'\365', (u_char)'\366', (u_char)'\367',
 	(u_char)'\370', (u_char)'\371', (u_char)'\372', (u_char)'\333',
 	(u_char)'\334', (u_char)'\335', (u_char)'\336', (u_char)'\337',
 	(u_char)'\340', (u_char)'\341', (u_char)'\342', (u_char)'\343',
 	(u_char)'\344', (u_char)'\345', (u_char)'\346', (u_char)'\347',
 	(u_char)'\350', (u_char)'\351', (u_char)'\352', (u_char)'\353',
 	(u_char)'\354', (u_char)'\355', (u_char)'\356', (u_char)'\357',
 	(u_char)'\360', (u_char)'\361', (u_char)'\362', (u_char)'\363',
 	(u_char)'\364', (u_char)'\365', (u_char)'\366', (u_char)'\367',
 	(u_char)'\370', (u_char)'\371', (u_char)'\372', (u_char)'\373',
 	(u_char)'\374', (u_char)'\375', (u_char)'\376', (u_char)'\377',
 };
 
 int
 pcap_strcasecmp(const char *s1, const char *s2)
 {
 	register const u_char	*cm = charmap,
 				*us1 = (const u_char *)s1,
 				*us2 = (const u_char *)s2;
 
 	while (cm[*us1] == cm[*us2++])
 		if (*us1++ == '\0')
 			return(0);
 	return (cm[*us1] - cm[*--us2]);
 }
 
 struct dlt_choice {
 	const char *name;
 	const char *description;
 	int	dlt;
 };
 
 #define DLT_CHOICE(code, description) { #code, description, DLT_ ## code }
 #define DLT_CHOICE_SENTINEL { NULL, NULL, 0 }
 
 static struct dlt_choice dlt_choices[] = {
 	DLT_CHOICE(NULL, "BSD loopback"),
 	DLT_CHOICE(EN10MB, "Ethernet"),
 	DLT_CHOICE(IEEE802, "Token ring"),
 	DLT_CHOICE(ARCNET, "BSD ARCNET"),
 	DLT_CHOICE(SLIP, "SLIP"),
 	DLT_CHOICE(PPP, "PPP"),
 	DLT_CHOICE(FDDI, "FDDI"),
 	DLT_CHOICE(ATM_RFC1483, "RFC 1483 LLC-encapsulated ATM"),
 	DLT_CHOICE(RAW, "Raw IP"),
 	DLT_CHOICE(SLIP_BSDOS, "BSD/OS SLIP"),
 	DLT_CHOICE(PPP_BSDOS, "BSD/OS PPP"),
 	DLT_CHOICE(ATM_CLIP, "Linux Classical IP-over-ATM"),
 	DLT_CHOICE(PPP_SERIAL, "PPP over serial"),
 	DLT_CHOICE(PPP_ETHER, "PPPoE"),
 	DLT_CHOICE(SYMANTEC_FIREWALL, "Symantec Firewall"),
 	DLT_CHOICE(C_HDLC, "Cisco HDLC"),
 	DLT_CHOICE(IEEE802_11, "802.11"),
 	DLT_CHOICE(FRELAY, "Frame Relay"),
 	DLT_CHOICE(LOOP, "OpenBSD loopback"),
 	DLT_CHOICE(ENC, "OpenBSD encapsulated IP"),
 	DLT_CHOICE(LINUX_SLL, "Linux cooked"),
 	DLT_CHOICE(LTALK, "Localtalk"),
 	DLT_CHOICE(PFLOG, "OpenBSD pflog file"),
 	DLT_CHOICE(PFSYNC, "Packet filter state syncing"),
 	DLT_CHOICE(PRISM_HEADER, "802.11 plus Prism header"),
 	DLT_CHOICE(IP_OVER_FC, "RFC 2625 IP-over-Fibre Channel"),
 	DLT_CHOICE(SUNATM, "Sun raw ATM"),
 	DLT_CHOICE(IEEE802_11_RADIO, "802.11 plus radiotap header"),
 	DLT_CHOICE(ARCNET_LINUX, "Linux ARCNET"),
 	DLT_CHOICE(JUNIPER_MLPPP, "Juniper Multi-Link PPP"),
 	DLT_CHOICE(JUNIPER_MLFR, "Juniper Multi-Link Frame Relay"),
 	DLT_CHOICE(JUNIPER_ES, "Juniper Encryption Services PIC"),
 	DLT_CHOICE(JUNIPER_GGSN, "Juniper GGSN PIC"),
 	DLT_CHOICE(JUNIPER_MFR, "Juniper FRF.16 Frame Relay"),
 	DLT_CHOICE(JUNIPER_ATM2, "Juniper ATM2 PIC"),
 	DLT_CHOICE(JUNIPER_SERVICES, "Juniper Advanced Services PIC"),
 	DLT_CHOICE(JUNIPER_ATM1, "Juniper ATM1 PIC"),
 	DLT_CHOICE(APPLE_IP_OVER_IEEE1394, "Apple IP-over-IEEE 1394"),
 	DLT_CHOICE(MTP2_WITH_PHDR, "SS7 MTP2 with Pseudo-header"),
 	DLT_CHOICE(MTP2, "SS7 MTP2"),
 	DLT_CHOICE(MTP3, "SS7 MTP3"),
 	DLT_CHOICE(SCCP, "SS7 SCCP"),
 	DLT_CHOICE(DOCSIS, "DOCSIS"),
 	DLT_CHOICE(LINUX_IRDA, "Linux IrDA"),
 	DLT_CHOICE(IEEE802_11_RADIO_AVS, "802.11 plus AVS radio information header"),
 	DLT_CHOICE(JUNIPER_MONITOR, "Juniper Passive Monitor PIC"),
 	DLT_CHOICE(BACNET_MS_TP, "BACnet MS/TP"),
 	DLT_CHOICE(PPP_PPPD, "PPP for pppd, with direction flag"),
 	DLT_CHOICE(JUNIPER_PPPOE, "Juniper PPPoE"),
 	DLT_CHOICE(JUNIPER_PPPOE_ATM, "Juniper PPPoE/ATM"),
 	DLT_CHOICE(GPRS_LLC, "GPRS LLC"),
 	DLT_CHOICE(GPF_T, "GPF-T"),
 	DLT_CHOICE(GPF_F, "GPF-F"),
 	DLT_CHOICE(JUNIPER_PIC_PEER, "Juniper PIC Peer"),
 	DLT_CHOICE(ERF_ETH,	"Ethernet with Endace ERF header"),
 	DLT_CHOICE(ERF_POS, "Packet-over-SONET with Endace ERF header"),
 	DLT_CHOICE(LINUX_LAPD, "Linux vISDN LAPD"),
 	DLT_CHOICE(JUNIPER_ETHER, "Juniper Ethernet"),
 	DLT_CHOICE(JUNIPER_PPP, "Juniper PPP"),
 	DLT_CHOICE(JUNIPER_FRELAY, "Juniper Frame Relay"),
 	DLT_CHOICE(JUNIPER_CHDLC, "Juniper C-HDLC"),
 	DLT_CHOICE(MFR, "FRF.16 Frame Relay"),
 	DLT_CHOICE(JUNIPER_VP, "Juniper Voice PIC"),
 	DLT_CHOICE(A429, "Arinc 429"),
 	DLT_CHOICE(A653_ICM, "Arinc 653 Interpartition Communication"),
 	DLT_CHOICE(USB_FREEBSD, "USB with FreeBSD header"),
 	DLT_CHOICE(BLUETOOTH_HCI_H4, "Bluetooth HCI UART transport layer"),
 	DLT_CHOICE(IEEE802_16_MAC_CPS, "IEEE 802.16 MAC Common Part Sublayer"),
 	DLT_CHOICE(USB_LINUX, "USB with Linux header"),
 	DLT_CHOICE(CAN20B, "Controller Area Network (CAN) v. 2.0B"),
 	DLT_CHOICE(IEEE802_15_4_LINUX, "IEEE 802.15.4 with Linux padding"),
 	DLT_CHOICE(PPI, "Per-Packet Information"),
 	DLT_CHOICE(IEEE802_16_MAC_CPS_RADIO, "IEEE 802.16 MAC Common Part Sublayer plus radiotap header"),
 	DLT_CHOICE(JUNIPER_ISM, "Juniper Integrated Service Module"),
 	DLT_CHOICE(IEEE802_15_4, "IEEE 802.15.4 with FCS"),
 	DLT_CHOICE(SITA, "SITA pseudo-header"),
 	DLT_CHOICE(ERF, "Endace ERF header"),
 	DLT_CHOICE(RAIF1, "Ethernet with u10 Networks pseudo-header"),
 	DLT_CHOICE(IPMB, "IPMB"),
 	DLT_CHOICE(JUNIPER_ST, "Juniper Secure Tunnel"),
 	DLT_CHOICE(BLUETOOTH_HCI_H4_WITH_PHDR, "Bluetooth HCI UART transport layer plus pseudo-header"),
 	DLT_CHOICE(AX25_KISS, "AX.25 with KISS header"),
 	DLT_CHOICE(IEEE802_15_4_NONASK_PHY, "IEEE 802.15.4 with non-ASK PHY data"),
 	DLT_CHOICE(MPLS, "MPLS with label as link-layer header"),
 	DLT_CHOICE(LINUX_EVDEV, "Linux evdev events"),
 	DLT_CHOICE(USB_LINUX_MMAPPED, "USB with padded Linux header"),
 	DLT_CHOICE(DECT, "DECT"),
 	DLT_CHOICE(AOS, "AOS Space Data Link protocol"),
 	DLT_CHOICE(WIHART, "Wireless HART"),
 	DLT_CHOICE(FC_2, "Fibre Channel FC-2"),
 	DLT_CHOICE(FC_2_WITH_FRAME_DELIMS, "Fibre Channel FC-2 with frame delimiters"),
 	DLT_CHOICE(IPNET, "Solaris ipnet"),
 	DLT_CHOICE(CAN_SOCKETCAN, "CAN-bus with SocketCAN headers"),
 	DLT_CHOICE(IPV4, "Raw IPv4"),
 	DLT_CHOICE(IPV6, "Raw IPv6"),
 	DLT_CHOICE(IEEE802_15_4_NOFCS, "IEEE 802.15.4 without FCS"),
 	DLT_CHOICE(DBUS, "D-Bus"),
 	DLT_CHOICE(JUNIPER_VS, "Juniper Virtual Server"),
 	DLT_CHOICE(JUNIPER_SRX_E2E, "Juniper SRX E2E"),
 	DLT_CHOICE(JUNIPER_FIBRECHANNEL, "Juniper Fibre Channel"),
 	DLT_CHOICE(DVB_CI, "DVB-CI"),
 	DLT_CHOICE(MUX27010, "MUX27010"),
 	DLT_CHOICE(STANAG_5066_D_PDU, "STANAG 5066 D_PDUs"),
 	DLT_CHOICE(JUNIPER_ATM_CEMIC, "Juniper ATM CEMIC"),
 	DLT_CHOICE(NFLOG, "Linux netfilter log messages"),
 	DLT_CHOICE(NETANALYZER, "Ethernet with Hilscher netANALYZER pseudo-header"),
 	DLT_CHOICE(NETANALYZER_TRANSPARENT, "Ethernet with Hilscher netANALYZER pseudo-header and with preamble and SFD"),
 	DLT_CHOICE(IPOIB, "RFC 4391 IP-over-Infiniband"),
 	DLT_CHOICE(MPEG_2_TS, "MPEG-2 transport stream"),
 	DLT_CHOICE(NG40, "ng40 protocol tester Iub/Iur"),
 	DLT_CHOICE(NFC_LLCP, "NFC LLCP PDUs with pseudo-header"),
 	DLT_CHOICE(INFINIBAND, "InfiniBand"),
 	DLT_CHOICE(SCTP, "SCTP"),
 	DLT_CHOICE(USBPCAP, "USB with USBPcap header"),
 	DLT_CHOICE(RTAC_SERIAL, "Schweitzer Engineering Laboratories RTAC packets"),
 	DLT_CHOICE(BLUETOOTH_LE_LL, "Bluetooth Low Energy air interface"),
 	DLT_CHOICE(NETLINK, "Linux netlink"),
 	DLT_CHOICE(BLUETOOTH_LINUX_MONITOR, "Bluetooth Linux Monitor"),
 	DLT_CHOICE(BLUETOOTH_BREDR_BB, "Bluetooth Basic Rate/Enhanced Data Rate baseband packets"),
 	DLT_CHOICE(BLUETOOTH_LE_LL_WITH_PHDR, "Bluetooth Low Energy air interface with pseudo-header"),
 	DLT_CHOICE(PROFIBUS_DL, "PROFIBUS data link layer"),
 	DLT_CHOICE(PKTAP, "Apple DLT_PKTAP"),
 	DLT_CHOICE(EPON, "Ethernet with 802.3 Clause 65 EPON preamble"),
 	DLT_CHOICE(IPMI_HPM_2, "IPMI trace packets"),
 	DLT_CHOICE(ZWAVE_R1_R2, "Z-Wave RF profile R1 and R2 packets"),
 	DLT_CHOICE(ZWAVE_R3, "Z-Wave RF profile R3 packets"),
 	DLT_CHOICE(WATTSTOPPER_DLM, "WattStopper Digital Lighting Management (DLM) and Legrand Nitoo Open protocol"),
 	DLT_CHOICE(ISO_14443, "ISO 14443 messages"),
 	DLT_CHOICE(RDS, "IEC 62106 Radio Data System groups"),
+	DLT_CHOICE(USB_DARWIN, "USB with Darwin header"),
+	DLT_CHOICE(OPENFLOW, "OpenBSD DLT_OPENFLOW"),
+	DLT_CHOICE(SDLC, "IBM SDLC frames"),
+	DLT_CHOICE(TI_LLN_SNIFFER, "TI LLN sniffer frames"),
+	DLT_CHOICE(VSOCK, "Linux vsock"),
+	DLT_CHOICE(NORDIC_BLE, "Nordic Semiconductor Bluetooth LE sniffer frames"),
+	DLT_CHOICE(DOCSIS31_XRA31, "Excentis XRA-31 DOCSIS 3.1 RF sniffer frames"),
+	DLT_CHOICE(ETHERNET_MPACKET, "802.3br mPackets"),
+	DLT_CHOICE(DISPLAYPORT_AUX, "DisplayPort AUX channel monitoring data"),
 	DLT_CHOICE_SENTINEL
 };
 
 int
 pcap_datalink_name_to_val(const char *name)
 {
 	int i;
 
 	for (i = 0; dlt_choices[i].name != NULL; i++) {
 		if (pcap_strcasecmp(dlt_choices[i].name, name) == 0)
 			return (dlt_choices[i].dlt);
 	}
 	return (-1);
 }
 
 const char *
 pcap_datalink_val_to_name(int dlt)
 {
 	int i;
 
 	for (i = 0; dlt_choices[i].name != NULL; i++) {
 		if (dlt_choices[i].dlt == dlt)
 			return (dlt_choices[i].name);
 	}
 	return (NULL);
 }
 
 const char *
 pcap_datalink_val_to_description(int dlt)
 {
 	int i;
 
 	for (i = 0; dlt_choices[i].name != NULL; i++) {
 		if (dlt_choices[i].dlt == dlt)
 			return (dlt_choices[i].description);
 	}
 	return (NULL);
 }
 
 struct tstamp_type_choice {
 	const char *name;
 	const char *description;
 	int	type;
 };
 
 static struct tstamp_type_choice tstamp_type_choices[] = {
 	{ "host", "Host", PCAP_TSTAMP_HOST },
 	{ "host_lowprec", "Host, low precision", PCAP_TSTAMP_HOST_LOWPREC },
 	{ "host_hiprec", "Host, high precision", PCAP_TSTAMP_HOST_HIPREC },
 	{ "adapter", "Adapter", PCAP_TSTAMP_ADAPTER },
 	{ "adapter_unsynced", "Adapter, not synced with system time", PCAP_TSTAMP_ADAPTER_UNSYNCED },
 	{ NULL, NULL, 0 }
 };
 
 int
 pcap_tstamp_type_name_to_val(const char *name)
 {
 	int i;
 
 	for (i = 0; tstamp_type_choices[i].name != NULL; i++) {
 		if (pcap_strcasecmp(tstamp_type_choices[i].name, name) == 0)
 			return (tstamp_type_choices[i].type);
 	}
 	return (PCAP_ERROR);
 }
 
 const char *
 pcap_tstamp_type_val_to_name(int tstamp_type)
 {
 	int i;
 
 	for (i = 0; tstamp_type_choices[i].name != NULL; i++) {
 		if (tstamp_type_choices[i].type == tstamp_type)
 			return (tstamp_type_choices[i].name);
 	}
 	return (NULL);
 }
 
 const char *
 pcap_tstamp_type_val_to_description(int tstamp_type)
 {
 	int i;
 
 	for (i = 0; tstamp_type_choices[i].name != NULL; i++) {
 		if (tstamp_type_choices[i].type == tstamp_type)
 			return (tstamp_type_choices[i].description);
 	}
 	return (NULL);
 }
 
 int
 pcap_snapshot(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->snapshot);
 }
 
 int
 pcap_is_swapped(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->swapped);
 }
 
 int
 pcap_major_version(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->version_major);
 }
 
 int
 pcap_minor_version(pcap_t *p)
 {
 	if (!p->activated)
 		return (PCAP_ERROR_NOT_ACTIVATED);
 	return (p->version_minor);
 }
 
+int
+pcap_bufsize(pcap_t *p)
+{
+	if (!p->activated)
+		return (PCAP_ERROR_NOT_ACTIVATED);
+	return (p->bufsize);
+}
+
 FILE *
 pcap_file(pcap_t *p)
 {
 	return (p->rfile);
 }
 
 int
 pcap_fileno(pcap_t *p)
 {
 #ifndef _WIN32
 	return (p->fd);
 #else
-	if (p->adapter != NULL)
-		return ((int)(DWORD)p->adapter->hFile);
+	if (p->handle != INVALID_HANDLE_VALUE)
+		return ((int)(DWORD)p->handle);
 	else
 		return (PCAP_ERROR);
 #endif
 }
 
 #if !defined(_WIN32) && !defined(MSDOS)
 int
 pcap_get_selectable_fd(pcap_t *p)
 {
 	return (p->selectable_fd);
 }
+
+struct timeval *
+pcap_get_required_select_timeout(pcap_t *p)
+{
+	return (p->required_select_timeout);
+}
 #endif
 
 void
 pcap_perror(pcap_t *p, const char *prefix)
 {
 	fprintf(stderr, "%s: %s\n", prefix, p->errbuf);
 }
 
 char *
 pcap_geterr(pcap_t *p)
 {
 	return (p->errbuf);
 }
 
 int
 pcap_getnonblock(pcap_t *p, char *errbuf)
 {
 	int ret;
 
-	ret = p->getnonblock_op(p, errbuf);
+	ret = p->getnonblock_op(p);
 	if (ret == -1) {
 		/*
-		 * In case somebody depended on the bug wherein
-		 * the error message was put into p->errbuf
-		 * by pcap_getnonblock_fd().
+		 * The get nonblock operation sets p->errbuf; this
+		 * function *shouldn't* have had a separate errbuf
+		 * argument, as it didn't need one, but I goofed
+		 * when adding it.
+		 *
+		 * We copy the error message to errbuf, so callers
+		 * can find it in either place.
 		 */
-		strlcpy(p->errbuf, errbuf, PCAP_ERRBUF_SIZE);
+		strlcpy(errbuf, p->errbuf, PCAP_ERRBUF_SIZE);
 	}
 	return (ret);
 }
 
 /*
  * Get the current non-blocking mode setting, under the assumption that
  * it's just the standard POSIX non-blocking flag.
  */
 #if !defined(_WIN32) && !defined(MSDOS)
 int
-pcap_getnonblock_fd(pcap_t *p, char *errbuf)
+pcap_getnonblock_fd(pcap_t *p)
 {
 	int fdflags;
 
 	fdflags = fcntl(p->fd, F_GETFL, 0);
 	if (fdflags == -1) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "F_GETFL: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "F_GETFL");
 		return (-1);
 	}
 	if (fdflags & O_NONBLOCK)
 		return (1);
 	else
 		return (0);
 }
 #endif
 
 int
 pcap_setnonblock(pcap_t *p, int nonblock, char *errbuf)
 {
 	int ret;
 
-	ret = p->setnonblock_op(p, nonblock, errbuf);
+	ret = p->setnonblock_op(p, nonblock);
 	if (ret == -1) {
 		/*
-		 * In case somebody depended on the bug wherein
-		 * the error message was put into p->errbuf
-		 * by pcap_setnonblock_fd().
+		 * The set nonblock operation sets p->errbuf; this
+		 * function *shouldn't* have had a separate errbuf
+		 * argument, as it didn't need one, but I goofed
+		 * when adding it.
+		 *
+		 * We copy the error message to errbuf, so callers
+		 * can find it in either place.
 		 */
-		strlcpy(p->errbuf, errbuf, PCAP_ERRBUF_SIZE);
+		strlcpy(errbuf, p->errbuf, PCAP_ERRBUF_SIZE);
 	}
 	return (ret);
 }
 
 #if !defined(_WIN32) && !defined(MSDOS)
 /*
  * Set non-blocking mode, under the assumption that it's just the
  * standard POSIX non-blocking flag.  (This can be called by the
  * per-platform non-blocking-mode routine if that routine also
  * needs to do some additional work.)
  */
 int
-pcap_setnonblock_fd(pcap_t *p, int nonblock, char *errbuf)
+pcap_setnonblock_fd(pcap_t *p, int nonblock)
 {
 	int fdflags;
 
 	fdflags = fcntl(p->fd, F_GETFL, 0);
 	if (fdflags == -1) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "F_GETFL: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "F_GETFL");
 		return (-1);
 	}
 	if (nonblock)
 		fdflags |= O_NONBLOCK;
 	else
 		fdflags &= ~O_NONBLOCK;
 	if (fcntl(p->fd, F_SETFL, fdflags) == -1) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "F_SETFL: %s",
-		    pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "F_SETFL");
 		return (-1);
 	}
 	return (0);
 }
 #endif
 
 #ifdef _WIN32
 /*
  * Generate a string for a Win32-specific error (i.e. an error generated when
  * calling a Win32 API).
  * For errors occurred during standard C calls, we still use pcap_strerror()
  */
 void
 pcap_win32_err_to_str(DWORD error, char *errbuf)
 {
 	size_t errlen;
 	char *p;
 
 	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, errbuf,
 	    PCAP_ERRBUF_SIZE, NULL);
 
 	/*
 	 * "FormatMessage()" "helpfully" sticks CR/LF at the end of the
 	 * message.  Get rid of it.
 	 */
 	errlen = strlen(errbuf);
 	if (errlen >= 2) {
 		errbuf[errlen - 1] = '\0';
 		errbuf[errlen - 2] = '\0';
 	}
 	p = strchr(errbuf, '\0');
 	pcap_snprintf (p, PCAP_ERRBUF_SIZE+1-(p-errbuf), " (%lu)", error);
 }
 #endif
 
 /*
  * Generate error strings for PCAP_ERROR_ and PCAP_WARNING_ values.
  */
 const char *
 pcap_statustostr(int errnum)
 {
 	static char ebuf[15+10+1];
 
 	switch (errnum) {
 
 	case PCAP_WARNING:
 		return("Generic warning");
 
 	case PCAP_WARNING_TSTAMP_TYPE_NOTSUP:
 		return ("That type of time stamp is not supported by that device");
 
 	case PCAP_WARNING_PROMISC_NOTSUP:
 		return ("That device doesn't support promiscuous mode");
 
 	case PCAP_ERROR:
 		return("Generic error");
 
 	case PCAP_ERROR_BREAK:
 		return("Loop terminated by pcap_breakloop");
 
 	case PCAP_ERROR_NOT_ACTIVATED:
 		return("The pcap_t has not been activated");
 
 	case PCAP_ERROR_ACTIVATED:
 		return ("The setting can't be changed after the pcap_t is activated");
 
 	case PCAP_ERROR_NO_SUCH_DEVICE:
 		return ("No such device exists");
 
 	case PCAP_ERROR_RFMON_NOTSUP:
 		return ("That device doesn't support monitor mode");
 
 	case PCAP_ERROR_NOT_RFMON:
 		return ("That operation is supported only in monitor mode");
 
 	case PCAP_ERROR_PERM_DENIED:
 		return ("You don't have permission to capture on that device");
 
 	case PCAP_ERROR_IFACE_NOT_UP:
 		return ("That device is not up");
 
 	case PCAP_ERROR_CANTSET_TSTAMP_TYPE:
 		return ("That device doesn't support setting the time stamp type");
 
 	case PCAP_ERROR_PROMISC_PERM_DENIED:
 		return ("You don't have permission to capture in promiscuous mode on that device");
 
 	case PCAP_ERROR_TSTAMP_PRECISION_NOTSUP:
 		return ("That device doesn't support that time stamp precision");
 	}
 	(void)pcap_snprintf(ebuf, sizeof ebuf, "Unknown error: %d", errnum);
 	return(ebuf);
 }
 
 /*
  * Not all systems have strerror().
  */
 const char *
 pcap_strerror(int errnum)
 {
 #ifdef HAVE_STRERROR
 #ifdef _WIN32
 	static char errbuf[PCAP_ERRBUF_SIZE];
-	errno_t errno;
-	errno = strerror_s(errbuf, PCAP_ERRBUF_SIZE, errnum);
-	if (errno != 0) /* errno = 0 if successful */
+	errno_t err = strerror_s(errbuf, PCAP_ERRBUF_SIZE, errnum);
+
+	if (err != 0) /* err = 0 if successful */
 		strlcpy(errbuf, "strerror_s() error", PCAP_ERRBUF_SIZE);
 	return (errbuf);
 #else
 	return (strerror(errnum));
 #endif /* _WIN32 */
 #else
 	extern int sys_nerr;
 	extern const char *const sys_errlist[];
 	static char errbuf[PCAP_ERRBUF_SIZE];
 
 	if ((unsigned int)errnum < sys_nerr)
 		return ((char *)sys_errlist[errnum]);
 	(void)pcap_snprintf(errbuf, sizeof errbuf, "Unknown error: %d", errnum);
 	return (errbuf);
 #endif
 }
 
 int
 pcap_setfilter(pcap_t *p, struct bpf_program *fp)
 {
 	return (p->setfilter_op(p, fp));
 }
 
 /*
  * Set direction flag, which controls whether we accept only incoming
  * packets, only outgoing packets, or both.
  * Note that, depending on the platform, some or all direction arguments
  * might not be supported.
  */
 int
 pcap_setdirection(pcap_t *p, pcap_direction_t d)
 {
 	if (p->setdirection_op == NULL) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "Setting direction is not implemented on this platform");
 		return (-1);
 	} else
 		return (p->setdirection_op(p, d));
 }
 
 int
 pcap_stats(pcap_t *p, struct pcap_stat *ps)
 {
 	return (p->stats_op(p, ps));
 }
 
-static int
-pcap_stats_dead(pcap_t *p, struct pcap_stat *ps _U_)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "Statistics aren't available from a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 #ifdef _WIN32
 struct pcap_stat *
 pcap_stats_ex(pcap_t *p, int *pcap_stat_size)
 {
 	return (p->stats_ex_op(p, pcap_stat_size));
 }
 
 int
 pcap_setbuff(pcap_t *p, int dim)
 {
 	return (p->setbuff_op(p, dim));
 }
 
-static int
-pcap_setbuff_dead(pcap_t *p, int dim)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "The kernel buffer size cannot be set on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 int
 pcap_setmode(pcap_t *p, int mode)
 {
 	return (p->setmode_op(p, mode));
 }
 
-static int
-pcap_setmode_dead(pcap_t *p, int mode)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "impossible to set mode on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 int
 pcap_setmintocopy(pcap_t *p, int size)
 {
 	return (p->setmintocopy_op(p, size));
 }
 
-static int
-pcap_setmintocopy_dead(pcap_t *p, int size)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "The mintocopy parameter cannot be set on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 HANDLE
 pcap_getevent(pcap_t *p)
 {
 	return (p->getevent_op(p));
 }
 
-static HANDLE
-pcap_getevent_dead(pcap_t *p)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "A pcap_open_dead pcap_t has no event handle");
-	return (INVALID_HANDLE_VALUE);
-}
-
 int
 pcap_oid_get_request(pcap_t *p, bpf_u_int32 oid, void *data, size_t *lenp)
 {
 	return (p->oid_get_request_op(p, oid, data, lenp));
 }
 
-static int
-pcap_oid_get_request_dead(pcap_t *p, bpf_u_int32 oid _U_, void *data _U_,
-    size_t *lenp _U_)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "An OID get request cannot be performed on a pcap_open_dead pcap_t");
-	return (PCAP_ERROR);
-}
-
 int
 pcap_oid_set_request(pcap_t *p, bpf_u_int32 oid, const void *data, size_t *lenp)
 {
 	return (p->oid_set_request_op(p, oid, data, lenp));
 }
 
-static int
-pcap_oid_set_request_dead(pcap_t *p, bpf_u_int32 oid _U_, const void *data _U_,
-    size_t *lenp _U_)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "An OID set request cannot be performed on a pcap_open_dead pcap_t");
-	return (PCAP_ERROR);
-}
-
 pcap_send_queue *
 pcap_sendqueue_alloc(u_int memsize)
 {
 	pcap_send_queue *tqueue;
 
 	/* Allocate the queue */
 	tqueue = (pcap_send_queue *)malloc(sizeof(pcap_send_queue));
 	if (tqueue == NULL){
 		return (NULL);
 	}
 
 	/* Allocate the buffer */
 	tqueue->buffer = (char *)malloc(memsize);
 	if (tqueue->buffer == NULL) {
 		free(tqueue);
 		return (NULL);
 	}
 
 	tqueue->maxlen = memsize;
 	tqueue->len = 0;
 
 	return (tqueue);
 }
 
 void
 pcap_sendqueue_destroy(pcap_send_queue *queue)
 {
 	free(queue->buffer);
 	free(queue);
 }
 
 int
 pcap_sendqueue_queue(pcap_send_queue *queue, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data)
 {
 	if (queue->len + sizeof(struct pcap_pkthdr) + pkt_header->caplen > queue->maxlen){
 		return (-1);
 	}
 
 	/* Copy the pcap_pkthdr header*/
 	memcpy(queue->buffer + queue->len, pkt_header, sizeof(struct pcap_pkthdr));
 	queue->len += sizeof(struct pcap_pkthdr);
 
 	/* copy the packet */
 	memcpy(queue->buffer + queue->len, pkt_data, pkt_header->caplen);
 	queue->len += pkt_header->caplen;
 
 	return (0);
 }
 
 u_int
 pcap_sendqueue_transmit(pcap_t *p, pcap_send_queue *queue, int sync)
 {
 	return (p->sendqueue_transmit_op(p, queue, sync));
 }
 
-static u_int
-pcap_sendqueue_transmit_dead(pcap_t *p, pcap_send_queue *queue, int sync)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "Packets cannot be transmitted on a pcap_open_dead pcap_t");
-	return (0);
-}
-
 int
 pcap_setuserbuffer(pcap_t *p, int size)
 {
 	return (p->setuserbuffer_op(p, size));
 }
 
-static int
-pcap_setuserbuffer_dead(pcap_t *p, int size)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "The user buffer cannot be set on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 int
 pcap_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks)
 {
 	return (p->live_dump_op(p, filename, maxsize, maxpacks));
 }
 
-static int
-pcap_live_dump_dead(pcap_t *p, char *filename, int maxsize, int maxpacks)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 int
 pcap_live_dump_ended(pcap_t *p, int sync)
 {
 	return (p->live_dump_ended_op(p, sync));
 }
 
-static int
-pcap_live_dump_ended_dead(pcap_t *p, int sync)
-{
-	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-	    "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
-	return (-1);
-}
-
 PAirpcapHandle
 pcap_get_airpcap_handle(pcap_t *p)
 {
 	PAirpcapHandle handle;
 
 	handle = p->get_airpcap_handle_op(p);
 	if (handle == NULL) {
 		(void)pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 		    "This isn't an AirPcap device");
 	}
 	return (handle);
 }
-
-static PAirpcapHandle
-pcap_get_airpcap_handle_dead(pcap_t *p)
-{
-	return (NULL);
-}
 #endif
 
 /*
  * On some platforms, we need to clean up promiscuous or monitor mode
  * when we close a device - and we want that to happen even if the
  * application just exits without explicitl closing devices.
  * On those platforms, we need to register a "close all the pcaps"
  * routine to be called when we exit, and need to maintain a list of
  * pcaps that need to be closed to clean up modes.
  *
  * XXX - not thread-safe.
  */
 
 /*
  * List of pcaps on which we've done something that needs to be
  * cleaned up.
  * If there are any such pcaps, we arrange to call "pcap_close_all()"
  * when we exit, and have it close all of them.
  */
 static struct pcap *pcaps_to_close;
 
 /*
  * TRUE if we've already called "atexit()" to cause "pcap_close_all()" to
  * be called on exit.
  */
 static int did_atexit;
 
 static void
 pcap_close_all(void)
 {
 	struct pcap *handle;
 
 	while ((handle = pcaps_to_close) != NULL)
 		pcap_close(handle);
 }
 
 int
 pcap_do_addexit(pcap_t *p)
 {
 	/*
 	 * If we haven't already done so, arrange to have
 	 * "pcap_close_all()" called when we exit.
 	 */
 	if (!did_atexit) {
 		if (atexit(pcap_close_all) != 0) {
 			/*
 			 * "atexit()" failed; let our caller know.
 			 */
 			strlcpy(p->errbuf, "atexit failed", PCAP_ERRBUF_SIZE);
 			return (0);
 		}
 		did_atexit = 1;
 	}
 	return (1);
 }
 
 void
 pcap_add_to_pcaps_to_close(pcap_t *p)
 {
 	p->next = pcaps_to_close;
 	pcaps_to_close = p;
 }
 
 void
 pcap_remove_from_pcaps_to_close(pcap_t *p)
 {
 	pcap_t *pc, *prevpc;
 
 	for (pc = pcaps_to_close, prevpc = NULL; pc != NULL;
 	    prevpc = pc, pc = pc->next) {
 		if (pc == p) {
 			/*
 			 * Found it.  Remove it from the list.
 			 */
 			if (prevpc == NULL) {
 				/*
 				 * It was at the head of the list.
 				 */
 				pcaps_to_close = pc->next;
 			} else {
 				/*
 				 * It was in the middle of the list.
 				 */
 				prevpc->next = pc->next;
 			}
 			break;
 		}
 	}
 }
 
 void
 pcap_cleanup_live_common(pcap_t *p)
 {
 	if (p->buffer != NULL) {
 		free(p->buffer);
 		p->buffer = NULL;
 	}
 	if (p->dlt_list != NULL) {
 		free(p->dlt_list);
 		p->dlt_list = NULL;
 		p->dlt_count = 0;
 	}
 	if (p->tstamp_type_list != NULL) {
 		free(p->tstamp_type_list);
 		p->tstamp_type_list = NULL;
 		p->tstamp_type_count = 0;
 	}
 	if (p->tstamp_precision_list != NULL) {
 		free(p->tstamp_precision_list);
 		p->tstamp_precision_list = NULL;
 		p->tstamp_precision_count = 0;
 	}
 	pcap_freecode(&p->fcode);
 #if !defined(_WIN32) && !defined(MSDOS)
 	if (p->fd >= 0) {
 		close(p->fd);
 		p->fd = -1;
 	}
 	p->selectable_fd = -1;
 #endif
 }
 
-static void
-pcap_cleanup_dead(pcap_t *p _U_)
-{
-	/* Nothing to do. */
-}
-
-pcap_t *
-pcap_open_dead_with_tstamp_precision(int linktype, int snaplen, u_int precision)
-{
-	pcap_t *p;
-
-	switch (precision) {
-
-	case PCAP_TSTAMP_PRECISION_MICRO:
-	case PCAP_TSTAMP_PRECISION_NANO:
-		break;
-
-	default:
-		return NULL;
-	}
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return NULL;
-	memset (p, 0, sizeof(*p));
-	p->snapshot = snaplen;
-	p->linktype = linktype;
-	p->opt.tstamp_precision = precision;
-	p->stats_op = pcap_stats_dead;
-#ifdef _WIN32
-	p->stats_ex_op = (stats_ex_op_t)pcap_not_initialized_ptr;
-	p->setbuff_op = pcap_setbuff_dead;
-	p->setmode_op = pcap_setmode_dead;
-	p->setmintocopy_op = pcap_setmintocopy_dead;
-	p->getevent_op = pcap_getevent_dead;
-	p->oid_get_request_op = pcap_oid_get_request_dead;
-	p->oid_set_request_op = pcap_oid_set_request_dead;
-	p->sendqueue_transmit_op = pcap_sendqueue_transmit_dead;
-	p->setuserbuffer_op = pcap_setuserbuffer_dead;
-	p->live_dump_op = pcap_live_dump_dead;
-	p->live_dump_ended_op = pcap_live_dump_ended_dead;
-	p->get_airpcap_handle_op = pcap_get_airpcap_handle_dead;
-#endif
-	p->cleanup_op = pcap_cleanup_dead;
-
-	/*
-	 * A "dead" pcap_t never requires special BPF code generation.
-	 */
-	p->bpf_codegen_flags = 0;
-
-	p->activated = 1;
-	return (p);
-}
-
-pcap_t *
-pcap_open_dead(int linktype, int snaplen)
-{
-	return (pcap_open_dead_with_tstamp_precision(linktype, snaplen,
-	    PCAP_TSTAMP_PRECISION_MICRO));
-}
-
 /*
  * API compatible with WinPcap's "send a packet" routine - returns -1
  * on error, 0 otherwise.
  *
  * XXX - what if we get a short write?
  */
 int
 pcap_sendpacket(pcap_t *p, const u_char *buf, int size)
 {
 	if (p->inject_op(p, buf, size) == -1)
 		return (-1);
 	return (0);
 }
 
 /*
  * API compatible with OpenBSD's "send a packet" routine - returns -1 on
  * error, number of bytes written otherwise.
  */
 int
 pcap_inject(pcap_t *p, const void *buf, size_t size)
 {
 	return (p->inject_op(p, buf, size));
 }
 
 void
 pcap_close(pcap_t *p)
 {
 	if (p->opt.device != NULL)
 		free(p->opt.device);
 	p->cleanup_op(p);
 	free(p);
 }
 
 /*
  * Given a BPF program, a pcap_pkthdr structure for a packet, and the raw
  * data for the packet, check whether the packet passes the filter.
  * Returns the return value of the filter program, which will be zero if
  * the packet doesn't pass and non-zero if the packet does pass.
  */
 int
 pcap_offline_filter(const struct bpf_program *fp, const struct pcap_pkthdr *h,
     const u_char *pkt)
 {
 	const struct bpf_insn *fcode = fp->bf_insns;
 
 	if (fcode != NULL)
 		return (bpf_filter(fcode, pkt, h->len, h->caplen));
 	else
 		return (0);
 }
 
-#include "pcap_version.h"
+static int
+pcap_can_set_rfmon_dead(pcap_t *p)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Rfmon mode doesn't apply on a pcap_open_dead pcap_t");
+	return (PCAP_ERROR);
+}
 
+static int
+pcap_read_dead(pcap_t *p, int cnt _U_, pcap_handler callback _U_,
+    u_char *user _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Packets aren't available from a pcap_open_dead pcap_t");
+	return (-1);
+}
+
+static int
+pcap_inject_dead(pcap_t *p, const void *buf _U_, size_t size _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Packets can't be sent on a pcap_open_dead pcap_t");
+	return (-1);
+}
+
+static int
+pcap_setfilter_dead(pcap_t *p, struct bpf_program *fp _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "A filter cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
+}
+
+static int
+pcap_setdirection_dead(pcap_t *p, pcap_direction_t d _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "The packet direction cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
+}
+
+static int
+pcap_set_datalink_dead(pcap_t *p, int dlt _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "The link-layer header type cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
+}
+
+static int
+pcap_getnonblock_dead(pcap_t *p)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "A pcap_open_dead pcap_t does not have a non-blocking mode setting");
+	return (-1);
+}
+
+static int
+pcap_setnonblock_dead(pcap_t *p, int nonblock _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "A pcap_open_dead pcap_t does not have a non-blocking mode setting");
+	return (-1);
+}
+
+static int
+pcap_stats_dead(pcap_t *p, struct pcap_stat *ps _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Statistics aren't available from a pcap_open_dead pcap_t");
+	return (-1);
+}
+
 #ifdef _WIN32
+struct pcap_stat *
+pcap_stats_ex_dead(pcap_t *p, int *pcap_stat_size _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Statistics aren't available from a pcap_open_dead pcap_t");
+	return (NULL);
+}
 
-static char *full_pcap_version_string;
+static int
+pcap_setbuff_dead(pcap_t *p, int dim)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "The kernel buffer size cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
+}
 
-#ifdef HAVE_VERSION_H
-/*
- * libpcap being built for Windows, as part of a WinPcap/Npcap source
- * tree.  Include version.h from that source tree to get the WinPcap/Npcap
- * version.
- *
- * XXX - it'd be nice if we could somehow generate the WinPcap version number
- * when building WinPcap.  (It'd be nice to do so for the packet.dll version
- * number as well.)
- */
-#include "../../version.h"
+static int
+pcap_setmode_dead(pcap_t *p, int mode)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "impossible to set mode on a pcap_open_dead pcap_t");
+	return (-1);
+}
 
-static const char wpcap_version_string[] = WINPCAP_VER_STRING;
-static const char pcap_version_string_fmt[] =
-	WINPCAP_PRODUCT_NAME " version %s, based on %s";
-static const char pcap_version_string_packet_dll_fmt[] =
-	WINPCAP_PRODUCT_NAME " version %s (packet.dll version %s), based on %s";
+static int
+pcap_setmintocopy_dead(pcap_t *p, int size)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "The mintocopy parameter cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
+}
 
-const char *
-pcap_lib_version(void)
+static HANDLE
+pcap_getevent_dead(pcap_t *p)
 {
-	char *packet_version_string;
-	size_t full_pcap_version_string_len;
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "A pcap_open_dead pcap_t has no event handle");
+	return (INVALID_HANDLE_VALUE);
+}
 
-	if (full_pcap_version_string == NULL) {
-		/*
-		 * Generate the version string.
-		 */
-		packet_version_string = PacketGetVersion();
-		if (strcmp(wpcap_version_string, packet_version_string) == 0) {
-			/*
-			 * WinPcap version string and packet.dll version
-			 * string are the same; just report the WinPcap
-			 * version.
-			 */
-			full_pcap_version_string_len =
-			    (sizeof pcap_version_string_fmt - 4) +
-			    strlen(wpcap_version_string) +
-			    strlen(pcap_version_string);
-			full_pcap_version_string =
-			    malloc(full_pcap_version_string_len);
-			if (full_pcap_version_string == NULL)
-				return (NULL);
-			pcap_snprintf(full_pcap_version_string,
-			    full_pcap_version_string_len,
-			    pcap_version_string_fmt,
-			    wpcap_version_string,
-			    pcap_version_string);
-		} else {
-			/*
-			 * WinPcap version string and packet.dll version
-			 * string are different; that shouldn't be the
-			 * case (the two libraries should come from the
-			 * same version of WinPcap), so we report both
-			 * versions.
-			 */
-			full_pcap_version_string_len =
-			    (sizeof pcap_version_string_packet_dll_fmt - 6) +
-			    strlen(wpcap_version_string) +
-			    strlen(packet_version_string) +
-			    strlen(pcap_version_string);
-			full_pcap_version_string = malloc(full_pcap_version_string_len);
-			if (full_pcap_version_string == NULL)
-				return (NULL);
-			pcap_snprintf(full_pcap_version_string,
-			    full_pcap_version_string_len,
-			    pcap_version_string_packet_dll_fmt,
-			    wpcap_version_string,
-			    packet_version_string,
-			    pcap_version_string);
-		}
-	}
-	return (full_pcap_version_string);
+static int
+pcap_oid_get_request_dead(pcap_t *p, bpf_u_int32 oid _U_, void *data _U_,
+    size_t *lenp _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "An OID get request cannot be performed on a pcap_open_dead pcap_t");
+	return (PCAP_ERROR);
 }
 
-#else /* HAVE_VERSION_H */
+static int
+pcap_oid_set_request_dead(pcap_t *p, bpf_u_int32 oid _U_, const void *data _U_,
+    size_t *lenp _U_)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "An OID set request cannot be performed on a pcap_open_dead pcap_t");
+	return (PCAP_ERROR);
+}
 
-/*
- * libpcap being built for Windows, not as part of a WinPcap/Npcap source
- * tree.
- */
-static const char pcap_version_string_packet_dll_fmt[] =
-	"%s (packet.dll version %s)";
-const char *
-pcap_lib_version(void)
+static u_int
+pcap_sendqueue_transmit_dead(pcap_t *p, pcap_send_queue *queue, int sync)
 {
-	char *packet_version_string;
-	size_t full_pcap_version_string_len;
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Packets cannot be transmitted on a pcap_open_dead pcap_t");
+	return (0);
+}
 
-	if (full_pcap_version_string == NULL) {
-		/*
-		 * Generate the version string.  Report the packet.dll
-		 * version.
-		 */
-		packet_version_string = PacketGetVersion();
-		full_pcap_version_string_len =
-		    (sizeof pcap_version_string_packet_dll_fmt - 4) +
-		    strlen(pcap_version_string) +
-		    strlen(packet_version_string);
-		full_pcap_version_string = malloc(full_pcap_version_string_len);
-		if (full_pcap_version_string == NULL)
-			return (NULL);
-		pcap_snprintf(full_pcap_version_string,
-		    full_pcap_version_string_len,
-		    pcap_version_string_packet_dll_fmt,
-		    pcap_version_string,
-		    packet_version_string);
-	}
-	return (full_pcap_version_string);
+static int
+pcap_setuserbuffer_dead(pcap_t *p, int size)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "The user buffer cannot be set on a pcap_open_dead pcap_t");
+	return (-1);
 }
 
-#endif /* HAVE_VERSION_H */
+static int
+pcap_live_dump_dead(pcap_t *p, char *filename, int maxsize, int maxpacks)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
+	return (-1);
+}
 
-#elif defined(MSDOS)
+static int
+pcap_live_dump_ended_dead(pcap_t *p, int sync)
+{
+	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+	    "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
+	return (-1);
+}
 
-static char *full_pcap_version_string;
+static PAirpcapHandle
+pcap_get_airpcap_handle_dead(pcap_t *p)
+{
+	return (NULL);
+}
+#endif /* _WIN32 */
 
-const char *
-pcap_lib_version (void)
+static void
+pcap_cleanup_dead(pcap_t *p _U_)
 {
-	char *packet_version_string;
-	size_t full_pcap_version_string_len;
-	static char dospfx[] = "DOS-";
+	/* Nothing to do. */
+}
 
-	if (full_pcap_version_string == NULL) {
+pcap_t *
+pcap_open_dead_with_tstamp_precision(int linktype, int snaplen, u_int precision)
+{
+	pcap_t *p;
+
+	switch (precision) {
+
+	case PCAP_TSTAMP_PRECISION_MICRO:
+	case PCAP_TSTAMP_PRECISION_NANO:
+		break;
+
+	default:
 		/*
-		 * Generate the version string.
+		 * This doesn't really matter, but we don't have any way
+		 * to report particular errors, so the only failure we
+		 * should have is a memory allocation failure.  Just
+		 * pick microsecond precision.
 		 */
-		full_pcap_version_string_len =
-		    sizeof dospfx + strlen(pcap_version_string);
-		full_pcap_version_string =
-		    malloc(full_pcap_version_string_len);
-		if (full_pcap_version_string == NULL)
-			return (NULL);
-		strcpy(full_pcap_version_string, dospfx);
-		strcat(full_pcap_version_string, pcap_version_string);
+		precision = PCAP_TSTAMP_PRECISION_MICRO;
+		break;
 	}
-	return (full_pcap_version_string);
-}
+	p = malloc(sizeof(*p));
+	if (p == NULL)
+		return NULL;
+	memset (p, 0, sizeof(*p));
+	p->snapshot = snaplen;
+	p->linktype = linktype;
+	p->opt.tstamp_precision = precision;
+	p->can_set_rfmon_op = pcap_can_set_rfmon_dead;
+	p->read_op = pcap_read_dead;
+	p->inject_op = pcap_inject_dead;
+	p->setfilter_op = pcap_setfilter_dead;
+	p->setdirection_op = pcap_setdirection_dead;
+	p->set_datalink_op = pcap_set_datalink_dead;
+	p->getnonblock_op = pcap_getnonblock_dead;
+	p->setnonblock_op = pcap_setnonblock_dead;
+	p->stats_op = pcap_stats_dead;
+#ifdef _WIN32
+	p->stats_ex_op = pcap_stats_ex_dead;
+	p->setbuff_op = pcap_setbuff_dead;
+	p->setmode_op = pcap_setmode_dead;
+	p->setmintocopy_op = pcap_setmintocopy_dead;
+	p->getevent_op = pcap_getevent_dead;
+	p->oid_get_request_op = pcap_oid_get_request_dead;
+	p->oid_set_request_op = pcap_oid_set_request_dead;
+	p->sendqueue_transmit_op = pcap_sendqueue_transmit_dead;
+	p->setuserbuffer_op = pcap_setuserbuffer_dead;
+	p->live_dump_op = pcap_live_dump_dead;
+	p->live_dump_ended_op = pcap_live_dump_ended_dead;
+	p->get_airpcap_handle_op = pcap_get_airpcap_handle_dead;
+#endif
+	p->cleanup_op = pcap_cleanup_dead;
 
-#else /* UN*X */
+	/*
+	 * A "dead" pcap_t never requires special BPF code generation.
+	 */
+	p->bpf_codegen_flags = 0;
 
-const char *
-pcap_lib_version(void)
+	p->activated = 1;
+	return (p);
+}
+
+pcap_t *
+pcap_open_dead(int linktype, int snaplen)
 {
-	return (pcap_version_string);
+	return (pcap_open_dead_with_tstamp_precision(linktype, snaplen,
+	    PCAP_TSTAMP_PRECISION_MICRO));
 }
-#endif
 
 #ifdef YYDEBUG
 /*
  * Set the internal "debug printout" flag for the filter expression parser.
  * The code to print that stuff is present only if YYDEBUG is defined, so
  * the flag, and the routine to set it, are defined only if YYDEBUG is
  * defined.
  *
  * This is intended for libpcap developers, not for general use.
  * If you want to set these in a program, you'll have to declare this
  * routine yourself, with the appropriate DLL import attribute on Windows;
  * it's not declared in any header file, and won't be declared in any
  * header file provided by libpcap.
  */
 PCAP_API void pcap_set_parser_debug(int value);
 
 PCAP_API_DEF void
 pcap_set_parser_debug(int value)
 {
-	extern int pcap_debug;
-
 	pcap_debug = value;
-}
-#endif
-
-#ifdef BDEBUG
-/*
- * Set the internal "debug printout" flag for the filter expression optimizer.
- * The code to print that stuff is present only if BDEBUG is defined, so
- * the flag, and the routine to set it, are defined only if BDEBUG is
- * defined.
- *
- * This is intended for libpcap developers, not for general use.
- * If you want to set these in a program, you'll have to declare this
- * routine yourself, with the appropriate DLL import attribute on Windows;
- * it's not declared in any header file, and won't be declared in any
- * header file provided by libpcap.
- */
-PCAP_API void pcap_set_optimizer_debug(int value);
-
-PCAP_API_DEF void
-pcap_set_optimizer_debug(int value)
-{
-	extern int pcap_optimizer_debug;
-
-	pcap_optimizer_debug = value;
 }
 #endif
Index: vendor/libpcap/dist/pcap_breakloop.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_breakloop.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_breakloop.3pcap	(revision 333789)
@@ -1,98 +1,110 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_BREAKLOOP 3PCAP "8 March 2015"
 .SH NAME
 pcap_breakloop \- force a pcap_dispatch() or pcap_loop() call to return
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 void pcap_breakloop(pcap_t *);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_breakloop()
 sets a flag that will force
 .B pcap_dispatch()
 or
 .B pcap_loop()
 to return rather than looping; they will return the number of packets
 that have been processed so far, or \-2 if no packets have been
 processed so far.
 .PP
 This routine is safe to use inside a signal handler on UNIX or a console
 control handler on Windows, as it merely sets a flag that is checked
 within the loop.
 .PP
 The flag is checked in loops reading packets from the OS - a signal by
 itself will not necessarily terminate those loops - as well as in loops
 processing a set of packets returned by the OS.
 .ft B
 Note that if you are catching signals on UNIX systems that support
 restarting system calls after a signal, and calling pcap_breakloop()
 in the signal handler, you must specify, when catching those signals,
 that system calls should NOT be restarted by that signal.  Otherwise,
 if the signal interrupted a call reading packets in a live capture,
 when your signal handler returns after calling pcap_breakloop(), the
 call will be restarted, and the loop will not terminate until more
 packets arrive and the call completes.
 .ft R
 .PP
 .ft B
 Note also that, in a multi-threaded application, if one thread is
 blocked in pcap_dispatch(), pcap_loop(), pcap_next(), or pcap_next_ex(),
 a call to pcap_breakloop() in a different thread will not unblock that
-thread; you will need to use whatever mechanism the OS provides for
+thread.
+.ft R
+You will need to use whatever mechanism the OS provides for
 breaking a thread out of blocking calls in order to unblock the thread,
-such as thread cancellation in systems that support POSIX threads.
+such as thread cancellation or thread signalling in systems that support
+POSIX threads, or
+.B SetEvent()
+on the result of
+.B pcap_getevent()
+on a
+.B pcap_t
+on which the thread is blocked on Windows.  Asynchronous procedure calls
+will not work on Windows, as a thread blocked on a
+.B pcap_t
+will not be in an alertable state.
 .ft R
 .PP
 Note that
 .B pcap_next()
 and
 .B pcap_next_ex()
 will, on some platforms, loop reading packets from the OS; that loop
 will not necessarily be terminated by a signal, so
 .B pcap_breakloop()
 should be used to terminate packet processing even if
 .B pcap_next()
 or
 .B pcap_next_ex()
 is being used.
 .PP
 .B pcap_breakloop()
 does not guarantee that no further packets will be processed by
 .B pcap_dispatch()
 or
 .B pcap_loop()
 after it is called; at most one more packet might be processed.
 .PP
 If \-2 is returned from
 .B pcap_dispatch()
 or
 .BR pcap_loop() ,
 the flag is cleared, so a subsequent call will resume reading packets.
 If a positive number is returned, the flag is not cleared, so a
 subsequent call will return \-2 and clear the flag.
 .SH SEE ALSO
 pcap(3PCAP), pcap_loop(3PCAP), pcap_next_ex(3PCAP)
Index: vendor/libpcap/dist/pcap_compile.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap_compile.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_compile.3pcap.in	(revision 333789)
@@ -1,70 +1,80 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_COMPILE 3PCAP "7 April 2014"
 .SH NAME
 pcap_compile \- compile a filter expression
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_compile(pcap_t *p, struct bpf_program *fp,
 .ti +8
 const char *str, int optimize, bpf_u_int32 netmask);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_compile()
 is used to compile the string
 .I str
 into a filter program.  See
 .BR pcap-filter (@MAN_MISC_INFO@)
 for the syntax of that string.
 .I program
 is a pointer to a
 .I bpf_program
 struct and is filled in by
 .BR pcap_compile() .
 .I optimize
 controls whether optimization on the resulting code is performed.
 .I netmask
 specifies the IPv4 netmask of the network on which packets are being
 captured; it is used only when checking for IPv4 broadcast addresses in
 the filter program.  If the netmask of the network on which packets are
 being captured isn't known to the program, or if packets are being
 captured on the Linux "any" pseudo-interface that can capture on more
 than one network, a value of PCAP_NETMASK_UNKNOWN can be supplied; tests
 for IPv4 broadcast addresses will fail to compile, but all other tests in
 the filter program will be OK.
+.LP
+NOTE: in libpcap 1.8.0 and later,
+.B pcap_compile()
+can be used in multiple threads within a single process.  However, in
+earlier versions of libpcap, it is
+.I not
+safe to use
+.B pcap_compile()
+in multiple threads in a single process without some form of mutual
+exclusion allowing only one thread to call it at any given time.
 .SH RETURN VALUE
 .B pcap_compile()
 returns 0 on success and \-1 on failure.
 If \-1 is returned,
 .B pcap_geterr()
 or
 .B pcap_perror()
 may be called with
 .I p
 as an argument to fetch or display the error text.
 .SH SEE ALSO
 pcap(3PCAP), pcap_setfilter(3PCAP), pcap_freecode(3PCAP),
 pcap_geterr(3PCAP), pcap-filter(@MAN_MISC_INFO@)
Index: vendor/libpcap/dist/pcap_dump_ftell.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_dump_ftell.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_dump_ftell.3pcap	(revision 333789)
@@ -1,42 +1,57 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_DUMP_FTELL 3PCAP "3 January 2014"
 .SH NAME
-pcap_dump_ftell \- get the current file offset for a savefile being written
+pcap_dump_ftell, pcap_dump_ftell64 \- get the current file offset for a savefile being written
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 long pcap_dump_ftell(pcap_dumper_t *p);
+.ft B
+int64_t pcap_dump_ftell64(pcap_dumper_t *p);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_dump_ftell()
 returns the current file position for the ``savefile'', representing the
 number of bytes written by
 .B pcap_dump_open()
 and
 .BR pcap_dump() .
+\-1 is returned on error.
+If the current file position does not fit in a
+.BR long ,
+it will be truncated; this can happen on 32-bit UNIX-like systems with
+large file support and on Windows.
+.B pcap_dump_ftell64()
+returns the current file position in a
+.BR int64_t ,
+so if file offsets that don't fit in a
+.B long
+but that fit in a
+.B int64_t
+are supported, this will return the file offset without truncation.
 \-1 is returned on error.
 .SH SEE ALSO
 pcap(3PCAP), pcap_dump_open(3PCAP), pcap_dump(3PCAP)
Index: vendor/libpcap/dist/pcap_dump_open.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap_dump_open.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_dump_open.3pcap.in	(revision 333789)
@@ -1,96 +1,96 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_DUMP_OPEN 3PCAP "16 February 2015"
 .SH NAME
 pcap_dump_open, pcap_dump_fopen \- open a file to which to write packets
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .nf
 .LP
 .ft B
 pcap_dumper_t *pcap_dump_open(pcap_t *p, const char *fname);
 pcap_dumper_t *pcap_dump_open_append(pcap_t *p, const char *fname);
 pcap_dumper_t *pcap_dump_fopen(pcap_t *p, FILE *fp);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_dump_open()
 is called to open a ``savefile'' for writing.
 .I fname
 specifies the name of the file to open. The file will have
 the same format as those used by
 .BR tcpdump (1)
 and
 .BR tcpslice (1).
 The name "-" is a synonym
 for
 .BR stdout .
 .PP
 .B pcap_dump_fopen()
 is called to write data to an existing open stream
 .IR fp .
 Note that on Windows, that stream should be opened in binary mode.
 .PP
 .I p
 is a capture or ``savefile'' handle returned by an earlier call to
 .B pcap_create()
 and activated by an earlier call to
 .BR pcap_activate() ,
 or returned by an earlier call to
 .BR pcap_open_offline() ,
 .BR pcap_open_live() ,
 or
 .BR pcap_open_dead() .
 The time stamp precision, link-layer type, and snapshot length from
 .I p
 are used as the link-layer type and snapshot length of the output file.
 .PP
 .B pcap_dump_open_append()
 is like
 .B pcap_dump_open
 but does not create the file if it does not exist and, if it does
 already exist, and is a pcap file with the same byte order as the host
 opening the file, and has the same time stamp precision, link-layer
 header type, and snapshot length as
 .IR p ,
 it will write new packets at the end of the file.
 .SH RETURN VALUES
 A pointer to a
 .B pcap_dumper_t
 structure to use in subsequent
 .B pcap_dump()
 and
 .B pcap_dump_close()
 calls is returned on success.
 .B NULL
 is returned on failure.
 If
 .B NULL
 is returned,
 .B pcap_geterr(\fIp\fB)
 can be used to get the error text.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP),
-pcap_open_offline(3PCAP), pcap_open_live(3PCAP), pcap_open_dead(3PCAP),
+\%pcap_open_offline(3PCAP), pcap_open_live(3PCAP), pcap_open_dead(3PCAP),
 pcap_dump(3PCAP), pcap_dump_close(3PCAP), pcap_geterr(3PCAP),
-pcap-savefile(@MAN_FILE_FORMATS@)
+\%pcap-savefile(@MAN_FILE_FORMATS@)
Index: vendor/libpcap/dist/pcap_fileno.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_fileno.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_fileno.3pcap	(revision 333789)
@@ -1,66 +1,66 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_FILENO 3PCAP "7 April 2014"
 .SH NAME
 pcap_fileno \- get the file descriptor for a live capture
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_fileno(pcap_t *p);
 .ft
 .fi
 .SH DESCRIPTION
 If
 .I p
 refers to a network device that was opened for a live capture using
 a combination of
 .B pcap_create()
 and
 .BR pcap_activate() ,
 or using
 .BR pcap_open_live() ,
 .B pcap_fileno()
 returns the file descriptor from which captured packets are read.
 .LP
 If
 .I p
 refers to a ``savefile'' that was opened using functions such as
 .BR pcap_open_offline()
 or
 .BR pcap_fopen_offline() ,
 a ``dead''
 .B pcap_t
 opened using
 .BR pcap_open_dead() ,
 or a
 .B pcap_t
 that was created with
 .B pcap_create()
 but that has not yet been activated with
 .BR pcap_activate() ,
 it returns \-1.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP),
 pcap_open_live(3PCAP), pcap_open_offline(3PCAP),
-pcap_fopen_offline(3PCAP), pcap_open_dead(3PCAP)
+\%pcap_fopen_offline(3PCAP), pcap_open_dead(3PCAP)
Index: vendor/libpcap/dist/pcap_findalldevs.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_findalldevs.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_findalldevs.3pcap	(revision 333789)
@@ -1,190 +1,214 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_FINDALLDEVS 3PCAP "7 April 2014"
 .SH NAME
 pcap_findalldevs, pcap_freealldevs \- get a list of capture devices, and
 free that list
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .nf
 .ft B
 char errbuf[PCAP_ERRBUF_SIZE];
 .ft
 .LP
 .ft B
 int pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf);
 void pcap_freealldevs(pcap_if_t *alldevs);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_findalldevs()
 constructs a list of network devices that can be opened with
 .B pcap_create()
 and
 .B pcap_activate()
 or with
 .BR pcap_open_live() .
 (Note that there may be network devices that cannot be opened by the
 process calling
 .BR pcap_findalldevs() ,
 because, for example, that process does not have sufficient privileges
 to open them for capturing; if so, those devices will not appear on the
 list.)
 If
 .B pcap_findalldevs()
 succeeds, the pointer pointed to by
 .I alldevsp
 is set to point to the first element of the list, or to
 .B NULL
 if no devices were found (this is considered success).
 Each element of the list is of type
 .BR pcap_if_t ,
 and has the following members:
 .RS
 .TP
 .B next
 if not
 .BR NULL ,
 a pointer to the next element in the list;
 .B NULL
 for the last element of the list
 .TP
 .B name
 a pointer to a string giving a name for the device to pass to
 .B pcap_open_live()
 .TP
 .B description
 if not
 .BR NULL ,
 a pointer to a string giving a human-readable description of the device
 .TP
 .B addresses
 a pointer to the first element of a list of network addresses for the
 device,
 or
 .B NULL
 if the device has no addresses
 .TP
 .B flags
 device flags:
 .RS
 .TP
 .B PCAP_IF_LOOPBACK
 set if the device is a loopback interface
 .TP
 .B PCAP_IF_UP
 set if the device is up
 .TP
 .B PCAP_IF_RUNNING
 set if the device is running
+.TP
+.B PCAP_IF_WIRELESS
+set if the device is a wireless interface; this includes IrDA as well as
+radio-based networks such as IEEE 802.15.4 and IEEE 802.11, so it
+doesn't just mean Wi-Fi
+.TP
+.B PCAP_IF_CONNECTION_STATUS
+a bitmask for an indication of whether the adapter is connected or not;
+for wireless interfaces, "connected" means "associated with a network"
+.TP
+The possible values for the connection status bits are:
+.TP
+.B PCAP_IF_CONNECTION_STATUS_UNKNOWN
+it's unknown whether the adapter is connected or not
+.TP
+.B PCAP_IF_CONNECTION_STATUS_CONNECTED
+the adapter is connected
+.TP
+.B PCAP_IF_CONNECTION_STATUS_DISCONNECTED
+the adapter is disconnected
+.TP
+.B PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE
+the notion of "connected" and "disconnected" don't apply to this
+interface; for example, it doesn't apply to a loopback device
 .RE
 .RE
 .PP
 Each element of the list of addresses is of type
 .BR pcap_addr_t ,
 and has the following members:
 .RS
 .TP
 .B next
 if not
 .BR NULL ,
 a pointer to the next element in the list;
 .B NULL
 for the last element of the list
 .TP
 .B addr
 a pointer to a
 .B "struct sockaddr"
 containing an address
 .TP
 .B netmask
 if not
 .BR NULL ,
 a pointer to a
 .B "struct sockaddr"
 that contains the netmask corresponding to the address pointed to by
 .B addr
 .TP
 .B broadaddr
 if not
 .BR NULL ,
 a pointer to a
 .B "struct sockaddr"
 that contains the broadcast address corresponding to the address pointed
 to by
 .BR addr ;
 may be null if the device doesn't support broadcasts
 .TP
 .B dstaddr
 if not
 .BR NULL ,
 a pointer to a
 .B "struct sockaddr"
 that contains the destination address corresponding to the address pointed
 to by
 .BR addr ;
 may be null if the device isn't a point-to-point interface
 .RE
 .PP
 Note that the addresses in the list of addresses might be IPv4
 addresses, IPv6 addresses, or some other type of addresses, so you must
 check the
 .B sa_family
 member of the
 .B "struct sockaddr"
 before interpreting the contents of the address; do not assume that the
 addresses are all IPv4 addresses, or even all IPv4 or IPv6 addresses.
 IPv4 addresses have the value
 .BR AF_INET ,
 IPv6 addresses have the value
 .B AF_INET6
 (which older operating systems that don't support IPv6 might not
 define), and other addresses have other values.  Whether other addresses
 are returned, and what types they might have is platform-dependent.
 For IPv4 addresses, the
 .B "struct sockaddr"
 pointer can be interpreted as if it pointed to a
 .BR "struct sockaddr_in" ;
 for IPv6 addresses, it can be interpreted as if it pointed to a
 .BR "struct sockaddr_in6".
 .PP
 The list of devices must be freed with
 .BR pcap_freealldevs() ,
 which frees the list pointed to by
 .IR alldevs .
 .SH RETURN VALUE
 .B pcap_findalldevs()
 returns 0 on success and \-1 on failure; as indicated, finding no
 devices is considered success, rather than failure, so 0 will be
 returned in that case.
 If \-1 is returned,
 .I errbuf
 is filled in with an appropriate error message.
 .I errbuf
 is assumed to be able to hold at least
 .B PCAP_ERRBUF_SIZE
 chars.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP),
 pcap_open_live(3PCAP)
Index: vendor/libpcap/dist/pcap_get_required_select_timeout.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_get_required_select_timeout.3pcap	(nonexistent)
+++ vendor/libpcap/dist/pcap_get_required_select_timeout.3pcap	(revision 333789)
@@ -0,0 +1,84 @@
+.\" Copyright (c) 1994, 1996, 1997
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that: (1) source code distributions
+.\" retain the above copyright notice and this paragraph in its entirety, (2)
+.\" distributions including binary code include the above copyright notice and
+.\" this paragraph in its entirety in the documentation or other materials
+.\" provided with the distribution, and (3) all advertising materials mentioning
+.\" features or use of this software display the following acknowledgement:
+.\" ``This product includes software developed by the University of California,
+.\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+.\" the University nor the names of its contributors may 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.
+.\"
+.TH PCAP_GET_REQUIRED_SELECT_TIMEOUT 3PCAP "19 January 2018"
+.SH NAME
+pcap_get_required_select_timeout \- get a file descriptor on which a
+select() can be done for a live capture
+.SH SYNOPSIS
+.nf
+.ft B
+#include <pcap/pcap.h>
+.ft
+.LP
+.ft B
+struct timeval *pcap_get_required_select_timeout(pcap_t *p);
+.ft
+.fi
+.SH DESCRIPTION
+.B pcap_get_required_select_timeout()
+returns, on UNIX, a pointer to a
+.B struct timeval
+containing a value that must be used as the minimum timeout in
+.BR select() ,
+.BR poll() ,
+.BR epoll_wait() ,
+and
+.B kevent()
+calls if
+.B pcap_get_selectable_fd()
+returns \-1.
+.PP
+The timeout that should be used in those calls must be no larger than
+the smallest of all timeouts returned by
+.B pcap_get_required_select_timeout()
+for devices from which packets will be captured.
+.PP
+The device for which
+.B pcap_get_selectable_fd()
+returned \-1 must be put in non-blocking mode with
+.BR pcap_setnonblock() ,
+and an attempt must always be made to read packets from the device
+when the
+.BR select() ,
+.BR poll() ,
+.BR epoll_wait() ,
+or
+.B kevent()
+call returns.
+.PP
+Note that a device on which a read can be done without blocking may,
+on some platforms, not have any packets to read if the packet buffer
+timeout has expired.  A call to
+.B pcap_dispatch()
+or
+.B pcap_next_ex()
+will return 0 in this case, but will not block.
+.PP
+.B pcap_get_required_select_timeout()
+is not available on Windows.
+.SH RETURN VALUE
+A pointer to a
+.B struct timeval
+is returned if the timeout is required; otherwise
+.B NULL
+is returned.
+.SH SEE ALSO
+pcap(3PCAP), pcap_get_selectable_fd(3PCAP), select(2), poll(2),
+epoll_wait(2), kqueue(2)
Index: vendor/libpcap/dist/pcap_get_selectable_fd.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_get_selectable_fd.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_get_selectable_fd.3pcap	(revision 333789)
@@ -1,133 +1,145 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP_GET_SELECTABLE_FD 3PCAP "18 October 2014"
+.TH PCAP_GET_SELECTABLE_FD 3PCAP "20 January 2017"
 .SH NAME
 pcap_get_selectable_fd \- get a file descriptor on which a select() can
 be done for a live capture
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_get_selectable_fd(pcap_t *p);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_get_selectable_fd()
 returns, on UNIX, a file descriptor number for a file descriptor on
 which one can
 do a
 .BR select() ,
 .BR poll() ,
+.BR epoll_wait() ,
+.BR kevent() ,
 or other such call
 to wait for it to be possible to read packets without blocking, if such
-a descriptor exists, or \-1, if no such descriptor exists.  Some network
-devices opened with
+a descriptor exists, or \-1, if no such descriptor exists.
+.PP
+Some network devices opened with
 .B pcap_create()
 and
 .BR pcap_activate() ,
 or with
 .BR pcap_open_live() ,
-do not support
-.B select()
-or
-.B poll()
-(for example, regular network devices on FreeBSD 4.3 and 4.4, and Endace
-DAG devices), so \-1 is returned for those devices.
+do not support those calls (for example, regular network devices on
+FreeBSD 4.3 and 4.4, and Endace DAG devices), so \-1 is returned for
+those devices.  In that case, those calls must be given a timeout less
+than or equal to the timeout returned by
+.B pcap_get_required_select_timeout()
+for the device for which
+.B pcap_get_selectable_fd()
+returned \-1, the device must be put in non-blocking mode with a call to
+.BR pcap_setnonblock() ,
+and an attempt must always be made to read packets from the device
+when the call returns.  If
+.B pcap_get_required_select_timeout()
+returns
+.BR NULL ,
+it is not possible to wait for packets to arrive on the device in an
+event loop.
 .PP
-Note that a descriptor on which a read can be done without blocking may,
-on some platforms, not have any packets to read if the read timeout has
-expired.  A call to
+Note that a device on which a read can be done without blocking may,
+on some platforms, not have any packets to read if the packet buffer
+timeout has expired.  A call to
 .B pcap_dispatch()
+or
+.B pcap_next_ex()
 will return 0 in this case, but will not block.
 .PP
 Note that in:
 .IP
 FreeBSD prior to FreeBSD 4.6;
 .IP
 NetBSD prior to NetBSD 3.0;
 .IP
 OpenBSD prior to OpenBSD 2.4;
 .IP
 Mac OS X prior to Mac OS X 10.7;
 .PP
-.B select()
+.BR select() ,
+.BR poll() ,
 and
-.B poll()
+.B kevent()
 do not work correctly on BPF devices;
 .B pcap_get_selectable_fd()
 will return a file descriptor on most of those versions (the exceptions
 being FreeBSD 4.3 and 4.4), but a simple
-.B select()
+.BR select() ,
+.BR poll() ,
 or
-.B poll()
-will not indicate that the descriptor is readable until a full buffer's
-worth of packets is received, even if the read timeout expires before
-then.  To work around this, an application that uses
-.B select()
-or
-.B poll()
-to wait for packets to arrive must put the
+.B kevent()
+call will not indicate that the descriptor is readable until a full
+buffer's worth of packets is received, even if the packet timeout
+expires before then.  To work around this, code that uses
+those calls to wait for packets to arrive must put the
 .B pcap_t
-in non-blocking mode, and must arrange that the
-.B select()
-or
-.B poll()
-have a timeout less than or equal to the read timeout,
+in non-blocking mode, and must arrange that the call
+have a timeout less than or equal to the packet buffer timeout,
 and must try to read packets after that timeout expires, regardless of
-whether
-.B select()
-or
-.B poll()
-indicated that the file descriptor for the
+whether the call indicated that the file descriptor for the
 .B pcap_t
 is ready to be read or not.  (That workaround will not work in FreeBSD
-4.3 and later; however, in FreeBSD 4.6 and later,
-.B select()
-and
-.B poll()
+4.3 and later; however, in FreeBSD 4.6 and later, those calls
 work correctly on BPF devices, so the workaround isn't necessary,
 although it does no harm.)
 .PP
 Note also that
 .B poll()
+and
+.B kevent()
 doesn't work on character special files, including BPF devices, in Mac
 OS X 10.4 and 10.5, so, while
 .B select()
 can be used on the descriptor returned by
 .BR pcap_get_selectable_fd() ,
 .B poll()
-cannot be used on it those versions of Mac OS X.  Kqueues also don't
-work on that descriptor.
+and
+.B kevent()
+cannot be used on it those versions of Mac OS X.
 .BR poll() ,
-but not kqueues, work on that descriptor in Mac OS X releases prior to
+but not
+.BR kevent() ,
+works on that descriptor in Mac OS X releases prior to
 10.4;
 .B poll()
-and kqueues work on that descriptor in Mac OS X 10.6 and later.
+and
+.B kevent()
+work on that descriptor in Mac OS X 10.6 and later.
 .PP
 .B pcap_get_selectable_fd()
 is not available on Windows.
 .SH RETURN VALUE
 A selectable file descriptor is returned if one exists; otherwise, \-1
 is returned.
 .SH SEE ALSO
-pcap(3PCAP), select(2), poll(2)
+pcap(3PCAP), pcap_get_required_select_timeout(3PCAP),
+pcap_setnonblock(3PCAP), select(2), poll(2), epoll_wait(2), kqueue(2)
Index: vendor/libpcap/dist/pcap_lookupdev.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_lookupdev.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_lookupdev.3pcap	(revision 333789)
@@ -1,60 +1,80 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_LOOKUPDEV 3PCAP "3 January 2014"
 .SH NAME
 pcap_lookupdev \- find the default device on which to capture
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .nf
 .ft B
 char errbuf[PCAP_ERRBUF_SIZE];
 .ft
 .LP
 .ft B
-char *pcap_lookupdev(char *errbuf);
+[DEPRECATED] char *pcap_lookupdev(char *errbuf);
 .ft
 .fi
 .SH DESCRIPTION
+.B This interface is obsoleted by
+.BR pcap_findalldevs (3PCAP).
+To find a default device on which to capture, call
+.B pcap_findalldevs()
+and, if the list it returns is not empty, use the first device in the
+list.  (If the list is empty, there are no devices on which capture is
+possible.)
+.LP
 .B pcap_lookupdev()
 returns a pointer to a string giving the name of a network device
 suitable for use with
 .B pcap_create()
 and
 .BR pcap_activate() ,
 or with
 .BR pcap_open_live() ,
 and with
 .BR pcap_lookupnet() .
 If there is an error,
 .B NULL
 is returned and
 .I errbuf
 is filled in with an appropriate error message.
 .I errbuf
 is assumed to be able to hold at least
 .B PCAP_ERRBUF_SIZE
 chars.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP),
 pcap_open_live(3PCAP), pcap_lookupnet(3PCAP)
+.SH BUGS
+The pointer returned by
+.B pcap_lookupdev()
+points to a static buffer; subsequent calls to
+.B pcap_lookupdev()
+in the same thread, or calls to
+.B pcap_lookupdev()
+in another thread, may overwrite that buffer.
+.LP
+In WinPcap, this function may return a UTF-16 string rather than an
+ASCII or UTF-8 string.
+
Index: vendor/libpcap/dist/pcap_loop.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_loop.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_loop.3pcap	(revision 333789)
@@ -1,199 +1,199 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP_LOOP 3PCAP "18 October 2014"
+.TH PCAP_LOOP 3PCAP "20 January 2017"
 .SH NAME
 pcap_loop, pcap_dispatch \- process packets from a live capture or savefile
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 typedef void (*pcap_handler)(u_char *user, const struct pcap_pkthdr *h,
 .ti +8
 			     const u_char *bytes);
 .ft
 .LP
 .ft B
 int pcap_loop(pcap_t *p, int cnt,
 .ti +8
 pcap_handler callback, u_char *user);
 int pcap_dispatch(pcap_t *p, int cnt,
 .ti +8
 pcap_handler callback, u_char *user);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_loop()
 processes packets from a live capture or ``savefile'' until
 .I cnt
 packets are processed, the end of the ``savefile'' is
 reached when reading from a ``savefile'',
 .B pcap_breakloop()
 is called, or an error occurs.
 It does
 .B not
-return when live read timeouts occur.
+return when live packet buffer timeouts occur.
 A value of \-1 or 0 for
 .I cnt
 is equivalent to infinity, so that packets are processed until another
 ending condition occurs.
 .PP
 .B pcap_dispatch()
 processes packets from a live capture or ``savefile'' until
 .I cnt
 packets are processed, the end of the current bufferful of packets is
 reached when doing a live capture, the end of the ``savefile'' is
 reached when reading from a ``savefile'',
 .B pcap_breakloop()
 is called, or an error occurs.
 Thus, when doing a live capture,
 .I cnt
 is the maximum number of packets to process before returning, but is not
 a minimum number; when reading a live capture, only one
 bufferful of packets is read at a time, so fewer than
 .I cnt
 packets may be processed. A value of \-1 or 0 for
 .I cnt
 causes all the packets received in one buffer to be processed when
 reading a live capture, and causes all the packets in the file to be
 processed when reading a ``savefile''.
 .PP
 Note that, when doing a live capture on some platforms, if the read
 timeout expires when there are no packets available,
 .B pcap_dispatch()
 will return 0, even when not in non-blocking mode, as there are no
 packets to process.  Applications should be prepared for this to happen,
 but must not rely on it happening.
 .PP
 .ft B
 (In older versions of libpcap, the behavior when
 \fIcnt\fP
 was 0 was undefined; different platforms and devices behaved
 differently, so code that must work with older versions of libpcap
 should use \-1, not 0, as the value of
 \fIcnt\fP.)
 .ft R
 .PP
 .I callback
 specifies a
 .I pcap_handler
 routine to be called with three arguments:
 a
 .I u_char
 pointer which is passed in the
 .I user
 argument to
 .B pcap_loop()
 or
 .BR pcap_dispatch() ,
 a
 .I const struct pcap_pkthdr
 pointer pointing to the packet time stamp and lengths, and a
 .I const u_char
 pointer to the first
 .B caplen
 (as given in the
 .I struct pcap_pkthdr
 a pointer to which is passed to the callback routine)
 bytes of data from the packet.  The
 .I struct pcap_pkthdr
 and the packet data are not to be freed by the callback routine, and are
 not guaranteed to be valid after the callback routine returns; if the
 code needs them to be valid after the callback, it must make a copy of
 them.
 .PP
 The bytes of data from the packet begin with a link-layer header.  The
 format of the link-layer header is indicated by the return value of the
 .B pcap_datalink()
 routine when handed the
 .B pcap_t
 value also passed to
 .B pcap_loop()
 or
 .BR pcap_dispatch() .
 .I http://www.tcpdump.org/linktypes.html
 lists the values
 .B pcap_datalink()
 can return and describes the packet formats that
 correspond to those values.  The value it returns will be valid for all
 packets received unless and until
 .B pcap_set_datalink()
 is called; after a successful call to
 .BR pcap_set_datalink() ,
 all subsequent packets will have a link-layer header of the type
 specified by the link-layer header type value passed to
 .BR pcap_set_datalink() .
 .PP
 Do
 .B NOT
 assume that the packets for a given capture or ``savefile`` will have
 any given link-layer header type, such as
 .B DLT_EN10MB
 for Ethernet.  For example, the "any" device on Linux will have a
 link-layer header type of
 .B DLT_LINUX_SLL
 even if all devices on the system at the time the "any" device is opened
 have some other data link type, such as
 .B DLT_EN10MB
 for Ethernet.
 .SH RETURN VALUE
 .B pcap_loop()
 returns 0 if
 .I cnt
 is exhausted or if, when reading from a ``savefile'', no more packets
 are available.  It returns \-1 if an error occurs or \-2 if the loop
 terminated due to a call to
 .B pcap_breakloop()
 before any packets were processed.
 It does
 .B not
-return when live read timeouts occur; instead, it attempts to read more
-packets.
+return when live packet buffer timeouts occur; instead, it attempts to
+read more packets.
 .PP
 .B pcap_dispatch()
 returns the number of packets processed on success; this can be 0 if no
 packets were read from a live capture (if, for example, they were
 discarded because they didn't pass the packet filter, or if, on
-platforms that support a read timeout that starts before any packets
-arrive, the timeout expires before any packets arrive, or if the file
-descriptor for the capture device is in non-blocking mode and no packets
-were available to be read) or if no more packets are available in a
-``savefile.''  It returns \-1 if an error occurs or \-2 if the loop
+platforms that support a packet buffer timeout that starts before any
+packets arrive, the timeout expires before any packets arrive, or if the
+file descriptor for the capture device is in non-blocking mode and no
+packets were available to be read) or if no more packets are available
+in a ``savefile.'' It returns \-1 if an error occurs or \-2 if the loop
 terminated due to a call to
 .B pcap_breakloop()
 before any packets were processed.
 .ft B
 If your application uses pcap_breakloop(),
 make sure that you explicitly check for \-1 and \-2, rather than just
 checking for a return value < 0.
 .ft R
 .PP
 If \-1 is returned,
 .B pcap_geterr()
 or
 .B pcap_perror()
 may be called with
 .I p
 as an argument to fetch or display the error text.
 .SH SEE ALSO
 pcap(3PCAP), pcap_geterr(3PCAP), pcap_breakloop(3PCAP),
 pcap_datalink(3PCAP)
Index: vendor/libpcap/dist/pcap_major_version.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_major_version.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_major_version.3pcap	(revision 333789)
@@ -1,54 +1,54 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_MAJOR_VERSION 3PCAP "7 April 2014"
 .SH NAME
 pcap_major_version, pcap_minor_version \- get the version number of a savefile
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_major_version(pcap_t *p);
 int pcap_minor_version(pcap_t *p);
 .ft
 .fi
 .SH DESCRIPTION
 If
 .I p
 refers to a ``savefile'',
 .B pcap_major_version()
 returns the major number of the file format of the ``savefile'' and
 .B pcap_minor_version()
 returns the minor number of the file format of the ``savefile''.  The
 version number is stored in the ``savefile''; note that the meaning of
 its values depends on the type of ``savefile'' (for example, pcap or
-pcap-NG).
+pcapng).
 .PP
 If
 .I p
 refers to a live capture, the values returned by
 .B pcap_major_version()
 and
 .B pcap_minor_version()
 are not meaningful.
 .SH SEE ALSO
 pcap(3PCAP)
Index: vendor/libpcap/dist/pcap_next_ex.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_next_ex.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_next_ex.3pcap	(revision 333789)
@@ -1,141 +1,140 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP_NEXT_EX 3PCAP "7 April 2014"
+.TH PCAP_NEXT_EX 3PCAP "20 January 2017"
 .SH NAME
 pcap_next_ex, pcap_next \- read the next packet from a pcap_t
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header,
 .ti +8
 const u_char **pkt_data);
 const u_char *pcap_next(pcap_t *p, struct pcap_pkthdr *h);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_next_ex()
 reads the next packet and returns a success/failure indication.
 If the packet was read without problems, the pointer pointed to by the
 .I pkt_header
 argument is set to point to the
 .I pcap_pkthdr
 struct for the packet, and the
 pointer pointed to by the
 .I pkt_data
 argument is set to point to the data in the packet.  The
 .I struct pcap_pkthdr
 and the packet data are not to be freed by the caller, and are not
 guaranteed to be valid after the next call to
 .BR pcap_next_ex() ,
 .BR pcap_next() ,
 .BR pcap_loop() ,
 or
 .BR pcap_dispatch() ;
 if the code needs them to remain valid, it must make a copy of them.
 .PP
 .B pcap_next()
 reads the next packet (by calling
 .B pcap_dispatch()
 with a
 .I cnt
 of 1) and returns a
 .I u_char
 pointer to the data in that packet.  The
 packet data is not to be freed by the caller, and is not
 guaranteed to be valid after the next call to
 .BR pcap_next_ex() ,
 .BR pcap_next() ,
 .BR pcap_loop() ,
 or
 .BR pcap_dispatch() ;
 if the code needs it to remain valid, it must make a copy of it.
 The
 .I pcap_pkthdr
 structure pointed to by
 .I h
 is filled in with the appropriate values for the packet.
 .PP
 The bytes of data from the packet begin with a link-layer header.  The
 format of the link-layer header is indicated by the return value of the
 .B pcap_datalink()
 routine when handed the
 .B pcap_t
 value also passed to
 .B pcap_loop()
 or
 .BR pcap_dispatch() .
 .I http://www.tcpdump.org/linktypes.html
 lists the values
 .B pcap_datalink()
 can return and describes the packet formats that
 correspond to those values.  The value it returns will be valid for all
 packets received unless and until
 .B pcap_set_datalink()
 is called; after a successful call to
 .BR pcap_set_datalink() ,
 all subsequent packets will have a link-layer header of the type
 specified by the link-layer header type value passed to
 .BR pcap_set_datalink() .
 .PP
 Do
 .B NOT
 assume that the packets for a given capture or ``savefile`` will have
 any given link-layer header type, such as
 .B DLT_EN10MB
 for Ethernet.  For example, the "any" device on Linux will have a
 link-layer header type of
 .B DLT_LINUX_SLL
 even if all devices on the system at the time the "any" device is opened
 have some other data link type, such as
 .B DLT_EN10MB
 for Ethernet.
 .SH RETURN VALUE
 .B pcap_next_ex()
-returns 1 if the packet was read without problems, 0
-if packets are being read from a live capture and the timeout expired,
-\-1 if an error occurred while reading the packet, and \-2 if
-packets are being read from a ``savefile'' and there are no more
-packets to read from the savefile.
-If \-1 is returned,
+returns 1 if the packet was read without problems, 0 if packets are
+being read from a live capture and the packet buffer timeout expired,
+\-1 if an error occurred while reading the packet, and \-2 if packets
+are being read from a ``savefile'' and there are no more packets to read
+from the savefile.  If \-1 is returned,
 .B pcap_geterr()
 or
 .B pcap_perror()
 may be called with
 .I p
 as an argument to fetch or display the error text.
 .PP
 .B pcap_next()
 returns a pointer to the packet data on success, and returns
 .B NULL
-if an error occurred, or if no packets were read from a live
-capture (if, for example, they were discarded because they didn't pass
-the packet filter, or if, on platforms that support a read timeout that
-starts before any packets arrive, the timeout expires before any packets
-arrive, or if the file descriptor for the capture device is in
+if an error occurred, or if no packets were read from a live capture
+(if, for example, they were discarded because they didn't pass the
+packet filter, or if, on platforms that support a packet buffer timeout
+that starts before any packets arrive, the timeout expires before any
+packets arrive, or if the file descriptor for the capture device is in
 non-blocking mode and no packets were available to be read), or if no
-more packets are available in a ``savefile.''  Unfortunately, there is
-no way to determine whether an error occurred or not.
+more packets are available in a ``savefile.'' Unfortunately, there is no
+way to determine whether an error occurred or not.
 .SH SEE ALSO
 pcap(3PCAP), pcap_geterr(3PCAP), pcap_dispatch(3PCAP),
 pcap_datalink(3PCAP)
Index: vendor/libpcap/dist/pcap_open_dead.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap_open_dead.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_open_dead.3pcap.in	(revision 333789)
@@ -1,79 +1,79 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_OPEN_DEAD 3PCAP "3 January 2014"
 .SH NAME
 pcap_open_dead, pcap_open_dead_with_tstamp_precision \- open a fake
 pcap_t for compiling filters or opening a capture for output
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 pcap_t *pcap_open_dead(int linktype, int snaplen);
 pcap_t *pcap_open_dead_with_tstamp_precision(int linktype, int snaplen,
     u_int precision);
 .ft
 .fi
 .SH DESCRIPTION
 .PP
 .B pcap_open_dead()
 and
 .B pcap_open_dead_with_tstamp_precision()
 are used for creating a
 .B pcap_t
 structure to use when calling the other functions in libpcap.  It is
 typically used when just using libpcap for compiling BPF code; it can
 also be used if using
 .BR pcap_dump_open() ,
 .BR pcap_dump() ,
 and
 .B pcap_dump_close()
 to write a savefile if there is no
 .B pcap_t
 that supplies the packets to be written.
 .PP
 .I linktype
 specifies the link-layer type for the
 .BR pcap_t .
 .PP
 .I snaplen
 specifies the snapshot length for the
 .BR pcap_t .
 .PP
 When
 .BR pcap_open_dead_with_tstamp_precision() ,
 is used to create a
 .B pcap_t
 for use with
 .BR pcap_dump_open() ,
 .I precision
 specifies the time stamp precision for packets;
 .B PCAP_TSTAMP_PRECISION_MICRO
 should be specified if the packets to be written have time stamps in
 seconds and microseconds, and
 .B PCAP_TSTAMP_PRECISION_NANO
 should be specified if the packets to be written have time stamps in
 seconds and nanoseconds.  Its value does not affect
 .BR pcap_compile() .
 .SH SEE ALSO
 pcap(3PCAP), pcap_compile(3PCAP), pcap_dump_open(3PCAP),
-pcap-linktype(@MAN_MISC_INFO@)
+\%pcap-linktype(@MAN_MISC_INFO@)
Index: vendor/libpcap/dist/pcap_open_live.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_open_live.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_open_live.3pcap	(revision 333789)
@@ -1,87 +1,90 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP_OPEN_LIVE 3PCAP "3 January 2014"
+.TH PCAP_OPEN_LIVE 3PCAP "20 January 2017"
 .SH NAME
 pcap_open_live \- open a device for capturing
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .nf
 .ft B
 char errbuf[PCAP_ERRBUF_SIZE];
 .ft
 .LP
 .ft B
 pcap_t *pcap_open_live(const char *device, int snaplen,
 .ti +8
 int promisc, int to_ms, char *errbuf);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_open_live()
 is used to obtain a packet capture handle to look
 at packets on the network.
 .I device
 is a string that specifies the network device to open; on Linux systems
 with 2.2 or later kernels, a
 .I device
 argument of "any" or
 .B NULL
 can be used to capture packets from all interfaces.
 .PP
 .I snaplen
 specifies the snapshot length to be set on the handle.
 .PP
 .I promisc
 specifies if the interface is to be put into promiscuous mode.
 .PP
 .I to_ms
-specifies the read timeout in milliseconds.
+specifies the packet buffer timeout, as a non-negative value, in
+milliseconds.  (See
+.BR pcap (3PCAP)
+for an explanation of the packet buffer timeout.)
 .SH RETURN VALUE
 .B pcap_open_live()
 returns a
 .I pcap_t *
 on success and
 .B NULL
 on failure.
 If
 .B NULL
 is returned,
 .I errbuf
 is filled in with an appropriate error message.
 .I errbuf
 may also be set to warning text when
 .B pcap_open_live()
 succeeds; to detect this case the caller should store a zero-length string in
 .I errbuf
 before calling
 .B pcap_open_live()
 and display the warning to the user if
 .I errbuf
 is no longer a zero-length string.
 .I errbuf
 is assumed to be able to hold at least
 .B PCAP_ERRBUF_SIZE
 chars.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP)
Index: vendor/libpcap/dist/pcap_open_offline.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap_open_offline.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_open_offline.3pcap.in	(revision 333789)
@@ -1,109 +1,109 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_OPEN_OFFLINE 3PCAP "3 January 2014"
 .SH NAME
 pcap_open_offline, pcap_open_offline_with_tstamp_precision,
 pcap_fopen_offline, pcap_fopen_offline_with_tstamp_precision \- open a saved capture file for reading
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .nf
 .ft B
 char errbuf[PCAP_ERRBUF_SIZE];
 .ft
 .LP
 .ft B
 pcap_t *pcap_open_offline(const char *fname, char *errbuf);
 pcap_t *pcap_open_offline_with_tstamp_precision(const char *fname,
     u_int precision, char *errbuf);
 pcap_t *pcap_fopen_offline(FILE *fp, char *errbuf);
 pcap_t *pcap_fopen_offline_with_tstamp_precision(FILE *fp,
     u_int precision, char *errbuf);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_open_offline()
 and
 .B pcap_open_offline_with_tstamp_precision()
 are called to open a ``savefile'' for reading.
 .PP
 .I fname
 specifies the name of the file to open. The file can have the pcap file
 format as described in
 .BR pcap-savefile (@MAN_FILE_FORMATS@),
 which is the file format used by, among other programs,
 .BR tcpdump (1)
 and
 .BR tcpslice (1),
-or can have the pcap-ng file format, although not all pcap-ng files can
+or can have the pcapng file format, although not all pcapng files can
 be read.
 The name "-" is a synonym for
 .BR stdin .
 .PP
 .B pcap_open_offline_with_tstamp_precision()
 takes an additional
 .I precision
 argument specifying the time stamp precision desired;
 if
 .B PCAP_TSTAMP_PRECISION_MICRO
 is specified, packet time stamps will be supplied in seconds and
 microseconds,
 and if
 .B PCAP_TSTAMP_PRECISION_NANO
 is specified, packet time stamps will be supplied in seconds and
 nanoseconds.  If the time stamps in the file do not have the same
 precision as the requested precision, they will be scaled up or down as
 necessary before being supplied.
 .PP
 Alternatively, you may call
 .B pcap_fopen_offline()
 or
 .B pcap_fopen_offline_with_tstamp_precision()
 to read dumped data from an existing open stream
 .IR fp .
 .B pcap_fopen_offline_with_tstamp_precision() takes an additional
 .I precision
 argument as described above.
 Note that on Windows, that stream should be opened in binary mode.
 .SH RETURN VALUE
 .BR pcap_open_offline() ,
 .BR pcap_open_offline_with_tstamp_precision() ,
 .BR pcap_fopen_offline() ,
 and
 .B pcap_fopen_offline_with_tstamp_precision()
 return a
 .I pcap_t *
 on success and
 .B NULL
 on failure.
 If
 .B NULL
 is returned,
 .I errbuf
 is filled in with an appropriate error message.
 .I errbuf
 is assumed to be able to hold at least
 .B PCAP_ERRBUF_SIZE
 chars.
 .SH SEE ALSO
 pcap(3PCAP), pcap-savefile(@MAN_FILE_FORMATS@)
Index: vendor/libpcap/dist/pcap_set_protocol.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_set_protocol.3pcap	(nonexistent)
+++ vendor/libpcap/dist/pcap_set_protocol.3pcap	(revision 333789)
@@ -0,0 +1,67 @@
+.\" Copyright (c) 1994, 1996, 1997
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that: (1) source code distributions
+.\" retain the above copyright notice and this paragraph in its entirety, (2)
+.\" distributions including binary code include the above copyright notice and
+.\" this paragraph in its entirety in the documentation or other materials
+.\" provided with the distribution, and (3) all advertising materials mentioning
+.\" features or use of this software display the following acknowledgement:
+.\" ``This product includes software developed by the University of California,
+.\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+.\" the University nor the names of its contributors may 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.
+.\"
+.TH PCAP_SET_PROTOCOL 3PCAP "3 January 2014"
+.SH NAME
+pcap_set_protocol \- set capture protocol for a not-yet-activated
+capture handle
+.SH SYNOPSIS
+.nf
+.ft B
+#include <pcap/pcap.h>
+.LP
+.ft B
+int pcap_set_protocol(pcap_t *p, int protocol);
+.ft
+.fi
+.SH DESCRIPTION
+On network interface devices on Linux,
+.B pcap_set_protocol()
+sets the protocol to be used in the
+.BR socket (2)
+call to create a capture socket when the handle is activated.  The
+argument is a link-layer protocol value, such as the values in the
+.B <linux/if_ether.h>
+header file, specified in host byte order.
+If
+.I protocol
+is non-zero, packets of that protocol will be captured when the
+handle is activated, otherwise, all packets will be captured.  This
+function is only provided on Linux, and, if it is used on any device
+other than a network interface, it will have no effect.
+.LP
+It should not be used in portable code; instead, a filter should be
+specified with
+.BR pcap_setfilter() .
+.LP
+If a given network interface provides a standard link-layer header, with
+a standard packet type, but provides some packet types with a different
+socket-layer protocol type from the one in the link-layer header, that
+packet type cannot be filtered with a filter specified with
+.B pcap_setfilter()
+but can be filtered by specifying the socket-layer protocol type using
+.BR pcap_set_protocol() .
+.SH RETURN VALUE
+.B pcap_set_protocol()
+returns 0 on success or
+.B PCAP_ERROR_ACTIVATED
+if called on a capture handle that has been activated.
+.SH SEE ALSO
+pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP), socket(2),
+pcap_setfilter(3PCAP)
Index: vendor/libpcap/dist/pcap_set_timeout.3pcap
===================================================================
--- vendor/libpcap/dist/pcap_set_timeout.3pcap	(revision 333788)
+++ vendor/libpcap/dist/pcap_set_timeout.3pcap	(revision 333789)
@@ -1,50 +1,53 @@
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
-.TH PCAP_SET_TIMEOUT 3PCAP "1 December 2015"
+.TH PCAP_SET_TIMEOUT 3PCAP "20 January 2017"
 .SH NAME
-pcap_set_timeout \- set the read timeout for a not-yet-activated
-capture handle
+pcap_set_timeout \- set the packet buffer timeout for a
+not-yet-activated capture handle
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .LP
 .ft B
 int pcap_set_timeout(pcap_t *p, int to_ms);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_set_timeout()
-sets the read timeout that will be used on a capture handle when
-the handle is activated to
+sets the packet buffer timeout that will be used on a capture handle
+when the handle is activated to
 .IR to_ms ,
-which is in units of milliseconds.
+which is in units of milliseconds.  (See
+.BR pcap (3PCAP)
+for an explanation of the packet buffer timeout.)
 .LP
-The behavior, if the timeout isn't specified, is undefined.  We
+The behavior, if the timeout isn't specified, is undefined, as is the
+behavior if the timeout is set to zero or to a negative value.  We
 recommend always setting the timeout to a non-zero value unless
 immediate mode is set, in which case the timeout has no effect.
 .SH RETURN VALUE
 .B pcap_set_timeout()
 returns 0 on success or
 .B PCAP_ERROR_ACTIVATED
 if called on a capture handle that has been activated.
 .SH SEE ALSO
 pcap(3PCAP), pcap_create(3PCAP), pcap_activate(3PCAP),
-pcap_set_immediate_mode(3PCAP)
+\%pcap_set_immediate_mode(3PCAP)
Index: vendor/libpcap/dist/pcap_set_tstamp_type.3pcap.in
===================================================================
--- vendor/libpcap/dist/pcap_set_tstamp_type.3pcap.in	(revision 333788)
+++ vendor/libpcap/dist/pcap_set_tstamp_type.3pcap.in	(revision 333789)
@@ -1,65 +1,65 @@
 .\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that: (1) source code distributions
 .\" retain the above copyright notice and this paragraph in its entirety, (2)
 .\" distributions including binary code include the above copyright notice and
 .\" this paragraph in its entirety in the documentation or other materials
 .\" provided with the distribution, and (3) all advertising materials mentioning
 .\" features or use of this software display the following acknowledgement:
 .\" ``This product includes software developed by the University of California,
 .\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
 .\" the University nor the names of its contributors may 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.
 .\"
 .TH PCAP_SET_TSTAMP_TYPE 3PCAP "5 December 2014"
 .SH NAME
 pcap_set_tstamp_type \- set the time stamp type to be used by a
 capture device
 .SH SYNOPSIS
 .nf
 .ft B
 #include <pcap/pcap.h>
 .ft
 .LP
 .ft B
 int pcap_set_tstamp_type(pcap_t *p, int tstamp_type);
 .ft
 .fi
 .SH DESCRIPTION
 .B pcap_set_tstamp_type()
-sets the the type of time stamp desired for packets captured on the pcap
+sets the type of time stamp desired for packets captured on the pcap
 descriptor to the type specified by
 .IR tstamp_type .
 It must be called on a pcap descriptor created by
 .B pcap_create()
 that has not yet been activated by
 .BR pcap_activate() .
 .B pcap_list_tstamp_types()
 will give a list of the time stamp types supported by a given capture
 device.
 See
 .BR pcap-tstamp (@MAN_MISC_INFO@)
 for a list of all the time stamp types.
 .SH RETURN VALUE
 .B pcap_set_tstamp_type()
 returns 0 on success if the specified time stamp type is expected to be
 supported by the capture device,
 .B PCAP_WARNING_TSTAMP_TYPE_NOTSUP
 if the specified time stamp type is not supported by the
 capture device,
 .B PCAP_ERROR_ACTIVATED
 if called on a capture handle that has been activated, and
 .B PCAP_ERROR_CANTSET_TSTAMP_TYPE
 if the capture device doesn't support setting the time stamp type.
 .SH SEE ALSO
 pcap(3PCAP),
 pcap_list_tstamp_types(3PCAP),
 pcap_tstamp_type_name_to_val(3PCAP),
 pcap-tstamp(@MAN_MISC_INFO@)
Index: vendor/libpcap/dist/portability.h
===================================================================
--- vendor/libpcap/dist/portability.h	(revision 333788)
+++ vendor/libpcap/dist/portability.h	(revision 333789)
@@ -1,216 +1,164 @@
 /*
  * Copyright (c) 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the Computer Systems
  *	Engineering Group at Lawrence Berkeley Laboratory.
  * 4. Neither the name of the University nor of the Laboratory may be used
  *    to endorse or promote products derived from this software without
  *    specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef portability_h
 #define	portability_h
 
 /*
  * Helpers for portability between Windows and UN*X and between different
  * flavors of UN*X.
  */
 
+#include "pcap/funcattrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef HAVE_STRLCPY
  /*
   * Macro that does the same thing as strlcpy().
   */
- #ifdef _MSC_VER
+ #if defined(_MSC_VER) || defined(__MINGW32__)
   /*
    * strncpy_s() is supported at least back to Visual
    * Studio 2005.
    */
   #define strlcpy(x, y, z) \
 	strncpy_s((x), (z), (y), _TRUNCATE)
 
  #else
   #define strlcpy(x, y, z) \
 	(strncpy((x), (y), (z)), \
 	 ((z) <= 0 ? 0 : ((x)[(z) - 1] = '\0')), \
 	 (void) strlen((y)))
  #endif
 #endif
 
-/*
- * For flagging arguments as format strings in MSVC.
- */
-#if _MSC_VER >= 1400
- #include <sal.h>
- #if _MSC_VER > 1400
-  #define FORMAT_STRING(p) _Printf_format_string_ p
+#ifndef HAVE_STRLCAT
+ /*
+  * Macro that does the same thing as strlcat().
+  */
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+  /*
+   * strncat_s() is supported at least back to Visual
+   * Studio 2005.
+   */
+  #define strlcat(x, y, z) \
+	strncat_s((x), (z), (y), _TRUNCATE)
  #else
-  #define FORMAT_STRING(p) __format_string p
+  /*
+   * ANSI C says strncat() always null-terminates its first argument,
+   * so 1) we don't need to explicitly null-terminate the string
+   * ourselves and 2) we need to leave room for the null terminator.
+   */
+  #define strlcat(x, y, z) \
+	strncat((x), (y), (z) - strlen((x)) - 1)
  #endif
-#else
- #define FORMAT_STRING(p) p
 #endif
 
 #ifdef _MSC_VER
-  #define strdup	_strdup
-  #define sscanf	sscanf_s
-  #define setbuf(x, y) \
-	setvbuf((x), (y), _IONBF, 0)
-  #define fopen(x, y) \
-	fopen_safe((x), (y))
-  FILE *fopen_safe(const char *filename, const char* mode);
-#endif
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-  #define strlcat(x, y, z) \
-	strncat_s((x), (z), (y), _TRUNCATE)
-#endif
-
-#ifdef _MSC_VER
   /*
-   * MSVC.
+   * If <crtdbg.h> has been included, and _DEBUG is defined, and
+   * __STDC__ is zero, <crtdbg.h> will define strdup() to call
+   * _strdup_dbg().  So if it's already defined, don't redefine
+   * it.
    */
-  #if _MSC_VER >= 1900
-    /*
-     * VS 2015 or newer; we have snprintf() function.
-     */
-    #define HAVE_SNPRINTF
+  #ifndef strdup
+  #define strdup	_strdup
   #endif
 #endif
 
 /*
  * On Windows, snprintf(), with that name and with C99 behavior - i.e.,
  * guaranteeing that the formatted string is null-terminated - didn't
  * appear until Visual Studio 2015.  Prior to that, the C runtime had
  * only _snprintf(), which *doesn't* guarantee that the string is
  * null-terminated if it is truncated due to the buffer being too
  * small.  We therefore can't just define snprintf to be _snprintf
  * and define vsnprintf to be _vsnprintf, as we're relying on null-
  * termination of strings in all cases.
  *
  * We also want to allow this to be built with versions of Visual Studio
  * prior to VS 2015, so we can't rely on snprintf() being present.
  *
  * And we want to make sure that, if we support plugins in the future,
  * a routine with C99 snprintf() behavior will be available to them.
  * We also don't want it to collide with the C library snprintf() if
  * there is one.
  *
  * So we make pcap_snprintf() and pcap_vsnprintf() available, either by
  * #defining them to be snprintf or vsnprintf, respectively, or by
  * defining our own versions and exporting them.
  */
 #ifdef HAVE_SNPRINTF
 #define pcap_snprintf snprintf
 #else
-extern int pcap_snprintf(char *, size_t, FORMAT_STRING(const char *), ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-    __attribute__((format (printf, 3, 4)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-    ;
+extern int pcap_snprintf(char *, size_t, PCAP_FORMAT_STRING(const char *), ...)
+    PCAP_PRINTFLIKE(3, 4);
 #endif
 
 #ifdef HAVE_VSNPRINTF
 #define pcap_vsnprintf vsnprintf
 #else
 extern int pcap_vsnprintf(char *, size_t, const char *, va_list ap);
 #endif
 
 #ifdef HAVE_STRTOK_R
   #define pcap_strtok_r	strtok_r
 #else
-  #ifdef _MSC_VER
+  #ifdef _WIN32
     /*
      * Microsoft gives it a different name.
      */
     #define pcap_strtok_r	strtok_s
   #else
     /*
      * Define it ourselves.
      */
     #define NEED_STRTOK_R
-    extern int pcap_strtok_r(char *, const char *, char **);
+    extern char *pcap_strtok_r(char *, const char *, char **);
   #endif
 #endif /* HAVE_STRTOK_R */
 
 #ifdef _WIN32
-  /*
-   * These may be defined by <inttypes.h>.
-   *
-   * XXX - for MSVC, we always want the _MSC_EXTENSIONS versions.
-   * What about other compilers?  If, as the MinGW Web site says MinGW
-   * does, the other compilers just use Microsoft's run-time library,
-   * then they should probably use the _MSC_EXTENSIONS even if the
-   * compiler doesn't define _MSC_EXTENSIONS.
-   *
-   * XXX - we currently aren't using any of these, but this allows
-   * their use in the future.
-   */
-  #ifndef PRId64
-    #ifdef _MSC_EXTENSIONS
-      #define PRId64	"I64d"
-    #else
-      #define PRId64	"lld"
-    #endif
-  #endif /* PRId64 */
-
-  #ifndef PRIo64
-    #ifdef _MSC_EXTENSIONS
-      #define PRIo64	"I64o"
-    #else
-      #define PRIo64	"llo"
-    #endif
-  #endif /* PRIo64 */
-
-  #ifndef PRIx64
-    #ifdef _MSC_EXTENSIONS
-      #define PRIx64	"I64x"
-    #else
-      #define PRIx64	"llx"
-    #endif
-  #endif
-
-  #ifndef PRIu64
-    #ifdef _MSC_EXTENSIONS
-      #define PRIu64	"I64u"
-    #else
-      #define PRIu64	"llu"
-    #endif
-  #endif
-
   #if !defined(__cplusplus)
     #define inline __inline
   #endif
 #endif /* _WIN32 */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
Index: vendor/libpcap/dist/rpcap-protocol.c
===================================================================
--- vendor/libpcap/dist/rpcap-protocol.c	(nonexistent)
+++ vendor/libpcap/dist/rpcap-protocol.c	(revision 333789)
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>		/* for strlen(), ... */
+#include <stdlib.h>		/* for malloc(), free(), ... */
+#include <stdarg.h>		/* for functions with variable number of arguments */
+#include <errno.h>		/* for the errno variable */
+#include "sockutils.h"
+#include "portability.h"
+#include "rpcap-protocol.h"
+#include <pcap/pcap.h>
+
+/*
+ * This file contains functions used both by the rpcap client and the
+ * rpcap daemon.
+ */
+
+/*
+ * This function sends a RPCAP error to our peer.
+ *
+ * It has to be called when the main program detects an error.
+ * It will send to our peer the 'buffer' specified by the user.
+ * This function *does not* request a RPCAP CLOSE connection. A CLOSE
+ * command must be sent explicitly by the program, since we do not know
+ * whether the error can be recovered in some way or if it is a
+ * non-recoverable one.
+ *
+ * \param sock: the socket we are currently using.
+ *
+ * \param ver: the protocol version we want to put in the reply.
+ *
+ * \param errcode: a integer which tells the other party the type of error
+ * we had.
+ *
+ * \param error: an user-allocated (and '0' terminated) buffer that contains
+ * the error description that has to be transmitted to our peer. The
+ * error message cannot be longer than PCAP_ERRBUF_SIZE.
+ *
+ * \param errbuf: a pointer to a user-allocated buffer (of size
+ * PCAP_ERRBUF_SIZE) that will contain the error message (in case there
+ * is one). It could be network problem.
+ *
+ * \return '0' if everything is fine, '-1' if some errors occurred. The
+ * error message is returned in the 'errbuf' variable.
+ */
+int
+rpcap_senderror(SOCKET sock, uint8 ver, unsigned short errcode, const char *error, char *errbuf)
+{
+	char sendbuf[RPCAP_NETBUF_SIZE];	/* temporary buffer in which data to be sent is buffered */
+	int sendbufidx = 0;			/* index which keeps the number of bytes currently buffered */
+	uint16 length;
+
+	length = (uint16)strlen(error);
+
+	if (length > PCAP_ERRBUF_SIZE)
+		length = PCAP_ERRBUF_SIZE;
+
+	rpcap_createhdr((struct rpcap_header *) sendbuf, ver, RPCAP_MSG_ERROR, errcode, length);
+
+	if (sock_bufferize(NULL, sizeof(struct rpcap_header), NULL, &sendbufidx,
+		RPCAP_NETBUF_SIZE, SOCKBUF_CHECKONLY, errbuf, PCAP_ERRBUF_SIZE))
+		return -1;
+
+	if (sock_bufferize(error, length, sendbuf, &sendbufidx,
+		RPCAP_NETBUF_SIZE, SOCKBUF_BUFFERIZE, errbuf, PCAP_ERRBUF_SIZE))
+		return -1;
+
+	if (sock_send(sock, sendbuf, sendbufidx, errbuf, PCAP_ERRBUF_SIZE) < 0)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * This function fills in a structure of type rpcap_header.
+ *
+ * It is provided just because the creation of an rpcap header is a common
+ * task. It accepts all the values that appears into an rpcap_header, and
+ * it puts them in place using the proper hton() calls.
+ *
+ * \param header: a pointer to a user-allocated buffer which will contain
+ * the serialized header, ready to be sent on the network.
+ *
+ * \param ver: a value (in the host byte order) which will be placed into the
+ * header.ver field and that represents the protocol version number of the
+ * current message.
+ *
+ * \param type: a value (in the host byte order) which will be placed into the
+ * header.type field and that represents the type of the current message.
+ *
+ * \param value: a value (in the host byte order) which will be placed into
+ * the header.value field and that has a message-dependent meaning.
+ *
+ * \param length: a value (in the host by order) which will be placed into
+ * the header.length field, representing the payload length of the message.
+ *
+ * \return Nothing. The serialized header is returned into the 'header'
+ * variable.
+ */
+void
+rpcap_createhdr(struct rpcap_header *header, uint8 ver, uint8 type, uint16 value, uint32 length)
+{
+	memset(header, 0, sizeof(struct rpcap_header));
+
+	header->ver = ver;
+	header->type = type;
+	header->value = htons(value);
+	header->plen = htonl(length);
+}
+
+/*
+ * Convert a message type to a string containing the type name.
+ */
+static const char *requests[] =
+{
+	NULL,				/* not a valid message type */
+	"RPCAP_MSG_ERROR",
+	"RPCAP_MSG_FINDALLIF_REQ",
+	"RPCAP_MSG_OPEN_REQ",
+	"RPCAP_MSG_STARTCAP_REQ",
+	"RPCAP_MSG_UPDATEFILTER_REQ",
+	"RPCAP_MSG_CLOSE",
+	"RPCAP_MSG_PACKET",
+	"RPCAP_MSG_AUTH_REQ",
+	"RPCAP_MSG_STATS_REQ",
+	"RPCAP_MSG_ENDCAP_REQ",
+	"RPCAP_MSG_SETSAMPLING_REQ",
+};
+#define NUM_REQ_TYPES	(sizeof requests / sizeof requests[0])
+
+static const char *replies[] =
+{
+	NULL,
+	NULL,			/* this would be a reply to RPCAP_MSG_ERROR */
+	"RPCAP_MSG_FINDALLIF_REPLY",
+	"RPCAP_MSG_OPEN_REPLY",
+	"RPCAP_MSG_STARTCAP_REPLY",
+	"RPCAP_MSG_UPDATEFILTER_REPLY",
+	NULL,			/* this would be a reply to RPCAP_MSG_CLOSE */
+	NULL,			/* this would be a reply to RPCAP_MSG_PACKET */
+	"RPCAP_MSG_AUTH_REPLY",
+	"RPCAP_MSG_STATS_REPLY",
+	"RPCAP_MSG_ENDCAP_REPLY",
+	"RPCAP_MSG_SETSAMPLING_REPLY",
+};
+#define NUM_REPLY_TYPES	(sizeof replies / sizeof replies[0])
+
+const char *
+rpcap_msg_type_string(uint8 type)
+{
+	if (type & RPCAP_MSG_IS_REPLY) {
+		type &= ~RPCAP_MSG_IS_REPLY;
+		if (type >= NUM_REPLY_TYPES)
+			return NULL;
+		return replies[type];
+	} else {
+		if (type >= NUM_REQ_TYPES)
+			return NULL;
+		return requests[type];
+	}
+}

Property changes on: vendor/libpcap/dist/rpcap-protocol.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/rpcap-protocol.h
===================================================================
--- vendor/libpcap/dist/rpcap-protocol.h	(nonexistent)
+++ vendor/libpcap/dist/rpcap-protocol.h	(revision 333789)
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+ * Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
+ * All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef __RPCAP_PROTOCOL_H__
+#define __RPCAP_PROTOCOL_H__
+
+#define RPCAP_DEFAULT_NETPORT "2002" /* Default port on which the RPCAP daemon is waiting for connections. */
+/* Default port on which the client workstation is waiting for connections in case of active mode. */
+#define RPCAP_DEFAULT_NETPORT_ACTIVE "2003"
+#define RPCAP_DEFAULT_NETADDR ""	/* Default network address on which the RPCAP daemon binds to. */
+
+/*
+ * Minimum and maximum supported versions of the protocol.
+ *
+ * If new message types are added, the protocol version MUST be changed,
+ * so that a client knows, from the negotiated protocol version, what
+ * messages can be sent to the server.
+ *
+ * If the format of an existing message type is changed, the protocol
+ * version MUST be changed, so that each side knows, from the negotiated
+ * protocol version, what format should be used.
+ *
+ * The RPCAP_MSG_ERROR format MUST not change, as it's used to, among
+ * other things, report "incorrect version number" errors, where, if
+ * the format changed, the sender of the message might not know what
+ * versions the recipient would understand, or might know a version
+ * they support (the version number they sent) but might not know
+ * the format of the message in that version.
+ *
+ * Other message versions SHOULD not change, as that would complicate
+ * the process of interpreting the message, making it version-dependent.
+ * Introducing a new message with a new format is preferable.
+ *
+ * Version negotiation is done as part of the authentication process:
+ *
+ * The client sends an authentication request, with the version number
+ * in the request being the maximum version it supports.
+ *
+ * If the server supports that version, it attempts to authenticate the
+ * client, and replies as appropriate, with the version number in the
+ * reply being that version.
+ *
+ * If the server doesn't support that version because it's too large,
+ * it replies with a RPCAP_MSG_ERROR message, with the maximum version
+ * they support as the version number in the reply, and with the error
+ * code being PCAP_ERR_WRONGVER.
+ *
+ * If the server doesn't support that version because it's too small,
+ * it replies with a RPCAP_MSG_ERROR message, with that version as
+ * the version number in the reply, and with the error code being
+ * PCAP_ERR_WRONGVER.
+ *
+ * If the client supports that version, it retries the authentication
+ * with that version and, if that fails for any reason, including
+ * PCAP_ERR_WRONGVER, fails.  Otherwise, it fails, telling its caller
+ * that there's no version that both support.
+ *
+ * This requires that the set of versions supported by a client or
+ * server be a range of integers, with no gaps.  Thus:
+ *
+ * the client's version set is [Cmin, Cmax], with Cmin <= Cmax;
+ *
+ * the server's version set is [Smin, Smax], with Smin <= Smax;
+ *
+ * the client sends Cmax as the version number in the initial
+ * authentication request;
+ *
+ * if the server doesn't support the version sent by the client,
+ * either Smax < Cmax or Smin > Cmax (because the client sent Cmax
+ * to the server, and the server doesn't support it);
+ *
+ * if Smax < Cmax:
+ *
+ *    the server sends Smax as the version number in the RPCAP_MSG_ERROR/
+ *    PCAP_ERR_WRONGVER message - the client will accept this because
+ *    Cmax != 0, as these numbers are unsigned, and this means that
+ *    this isn't an old client that rejects all messages with a non-zero
+ *    version number, it's a new client that accepts RPCAP_MSG_ERROR
+ *    messages no matter what the version is;
+ *
+ *    if Smax >= Cmin, both the client and the server can use it, and
+ *    the client retries with Smax;
+ *
+ *    if Smax < Cmin, there is no version the client and server can
+ *    both support.
+ *
+ * if Smin > Cmax:
+ *
+ *    the server sends Cmax as the version number in the RPCAP_MSG_ERROR/
+ *    PCAP_ERR_WRONGVER message - the client will accept this because
+ *    Cmax is a valid client version number.
+ *
+ *    the client will retry with Cmax, get the same version failure,
+ *    and report that there is no version the client and server can
+ *    both support (as the version sets are disjoint).
+ *
+ * Old negotiation-unaware clients just send version 0 and, if they
+ * get back PCAP_ERR_WRONGVER, treat it as a fatal error.  This
+ * means they'll fail to talk to any server that can't handle
+ * version 0, which is the appropriate thing to do, as they can
+ * only use version 0.
+ *
+ * Old negotiation-unaware servers fail if they get a version other
+ * than 0, sending back PCAP_ERR_WRONGVER with version 0, which is
+ * the only version, and thus both the minimum and maximum version,
+ * they support.  The client will either fail if it doesn't support
+ * version 0, or will retry with version 0 and succeed, so it will
+ * fail with servers that can't handle version 0 or will negotiate
+ * version 0 with servers that can handle version 0.
+ */
+#define RPCAP_MIN_VERSION 0
+#define RPCAP_MAX_VERSION 0
+
+/*
+ * Version numbers are unsigned, so if RPCAP_MIN_VERSION is 0, they
+ * are >= the minimum version, by definition; don't check against
+ * RPCAP_MIN_VERSION, as you may get compiler warnings that the
+ * comparison will always succeed.
+ */
+#if RPCAP_MIN_VERSION == 0
+#define RPCAP_VERSION_IS_SUPPORTED(v)	((v) <= RPCAP_MAX_VERSION)
+#else
+#define RPCAP_VERSION_IS_SUPPORTED(v)	\
+	((v) >= RPCAP_MIN_VERSION && (v) <= RPCAP_MAX_VERSION)
+#endif
+
+/*
+ * Separators used for the host list.
+ *
+ * It is used:
+ * - by the rpcapd daemon, when you types a list of allowed connecting hosts
+ * - by the rpcap client in active mode, when the client waits for incoming
+ * connections from other hosts
+ */
+#define RPCAP_HOSTLIST_SEP " ,;\n\r"
+
+/*********************************************************
+ *                                                       *
+ * Protocol messages formats                             *
+ *                                                       *
+ *********************************************************/
+/*
+ * WARNING: This file defines some structures that are used to transfer
+ * data on the network.
+ * Note that your compiler MUST not insert padding into these structures
+ * for better alignment.
+ * These structures have been created in order to be correctly aligned to
+ * a 32-bit boundary, but be careful in any case.
+ */
+
+/*
+ * WARNING: These typedefs MUST be of a specific size.
+ * You might have to change them on your platform.
+ *
+ * XXX - use the C99 types?  Microsoft's newer versions of Visual Studio
+ * support them.
+ */
+typedef unsigned char uint8;	/* 8-bit unsigned integer */
+typedef unsigned short uint16;	/* 16-bit unsigned integer */
+typedef unsigned int uint32;	/* 32-bit unsigned integer */
+typedef int int32;		/* 32-bit signed integer */
+
+/* Common header for all the RPCAP messages */
+struct rpcap_header
+{
+	uint8 ver;	/* RPCAP version number */
+	uint8 type;	/* RPCAP message type (error, findalldevs, ...) */
+	uint16 value;	/* Message-dependent value (not always used) */
+	uint32 plen;	/* Length of the payload of this RPCAP message */
+};
+
+/* Format of the message for the interface description (findalldevs command) */
+struct rpcap_findalldevs_if
+{
+	uint16 namelen;	/* Length of the interface name */
+	uint16 desclen;	/* Length of the interface description */
+	uint32 flags;	/* Interface flags */
+	uint16 naddr;	/* Number of addresses */
+	uint16 dummy;	/* Must be zero */
+};
+
+/*
+ * Format of an address as sent over the wire.
+ *
+ * Do *NOT* use struct sockaddr_storage, as the layout for that is
+ * machine-dependent.
+ *
+ * RFC 2553 gives two sample layouts, both of which are 128 bytes long,
+ * both of which are aligned on an 8-byte boundary, and both of which
+ * have 2 bytes before the address data.
+ *
+ * However, one has a 2-byte address family value at the beginning
+ * and the other has a 1-byte address length value and a 1-byte
+ * address family value; this reflects the fact that the original
+ * BSD sockaddr structure had a 2-byte address family value, which
+ * was later changed to a 1-byte address length value and a 1-byte
+ * address family value, when support for variable-length OSI
+ * network-layer addresses was added.
+ *
+ * Furthermore, Solaris's struct sockaddr_storage is 256 bytes
+ * long.
+ *
+ * This structure is supposed to be aligned on an 8-byte boundary;
+ * the message header is 8 bytes long, so we don't have to do
+ * anything to ensure it's aligned on that boundary within a packet,
+ * so we just define it as 128 bytes long, with a 2-byte address
+ * family.  (We only support IPv4 and IPv6 addresses, which are fixed-
+ * length.)  That way, it's the same size as sockaddr_storage on
+ * Windows, and it'll look like what an older Windows client will
+ * expect.
+ *
+ * In addition, do *NOT* use the host's AF_ value for an address,
+ * as the value for AF_INET6 is machine-dependent.  We use the
+ * Windows value, so it'll look like what an older Windows client
+ * will expect.
+ *
+ * (The Windows client is the only one that has been distributed
+ * as a standard part of *pcap; UN*X clients are probably built
+ * from source by the user or administrator, so they're in a
+ * better position to upgrade an old client.  Therefore, we
+ * try to make what goes over the wire look like what comes
+ * from a Windows server.)
+ */
+struct rpcap_sockaddr
+{
+	uint16	family;			/* Address family */
+	char	data[128-2];		/* Data */
+};
+
+/*
+ * Format of an IPv4 address as sent over the wire.
+ */
+#define RPCAP_AF_INET	2		/* Value on all OSes */
+struct rpcap_sockaddr_in
+{
+	uint16	family;			/* Address family */
+	uint16	port;			/* Port number */
+	uint32	addr;			/* IPv4 address */
+	uint8	zero[8];		/* Padding */
+};
+
+/*
+ * Format of an IPv6 address as sent over the wire.
+ */
+#define RPCAP_AF_INET6	23		/* Value on Windows */
+struct rpcap_sockaddr_in6
+{
+	uint16	family;			/* Address family */
+	uint16	port;			/* Port number */
+	uint32	flowinfo;		/* IPv6 flow information */
+	uint8	addr[16];		/* IPv6 address */
+	uint32	scope_id;		/* Scope zone index */
+};
+
+/* Format of the message for the address listing (findalldevs command) */
+struct rpcap_findalldevs_ifaddr
+{
+	struct rpcap_sockaddr addr;		/* Network address */
+	struct rpcap_sockaddr netmask;		/* Netmask for that address */
+	struct rpcap_sockaddr broadaddr;	/* Broadcast address for that address */
+	struct rpcap_sockaddr dstaddr;		/* P2P destination address for that address */
+};
+
+/*
+ * \brief Format of the message of the connection opening reply (open command).
+ *
+ * This structure transfers over the network some of the values useful on the client side.
+ */
+struct rpcap_openreply
+{
+	int32 linktype;	/* Link type */
+	int32 tzoff;	/* Timezone offset */
+};
+
+/* Format of the message that starts a remote capture (startcap command) */
+struct rpcap_startcapreq
+{
+	uint32 snaplen;		/* Length of the snapshot (number of bytes to capture for each packet) */
+	uint32 read_timeout;	/* Read timeout in milliseconds */
+	uint16 flags;		/* Flags (see RPCAP_STARTCAPREQ_FLAG_xxx) */
+	uint16 portdata;	/* Network port on which the client is waiting at (if 'serveropen') */
+};
+
+/* Format of the reply message that devoted to start a remote capture (startcap reply command) */
+struct rpcap_startcapreply
+{
+	int32 bufsize;		/* Size of the user buffer allocated by WinPcap; it can be different from the one we chose */
+	uint16 portdata;	/* Network port on which the server is waiting at (passive mode only) */
+	uint16 dummy;		/* Must be zero */
+};
+
+/*
+ * \brief Format of the header which encapsulates captured packets when transmitted on the network.
+ *
+ * This message requires the general header as well, since we want to be able to exchange
+ * more information across the network in the future (for example statistics, and kind like that).
+ */
+struct rpcap_pkthdr
+{
+	uint32 timestamp_sec;	/* 'struct timeval' compatible, it represents the 'tv_sec' field */
+	uint32 timestamp_usec;	/* 'struct timeval' compatible, it represents the 'tv_usec' field */
+	uint32 caplen;		/* Length of portion present in the capture */
+	uint32 len;		/* Real length this packet (off wire) */
+	uint32 npkt;		/* Ordinal number of the packet (i.e. the first one captured has '1', the second one '2', etc) */
+};
+
+/* General header used for the pcap_setfilter() command; keeps just the number of BPF instructions */
+struct rpcap_filter
+{
+	uint16 filtertype;	/* type of the filter transferred (BPF instructions, ...) */
+	uint16 dummy;		/* Must be zero */
+	uint32 nitems;		/* Number of items contained into the filter (e.g. BPF instructions for BPF filters) */
+};
+
+/* Structure that keeps a single BPF instuction; it is repeated 'ninsn' times according to the 'rpcap_filterbpf' header */
+struct rpcap_filterbpf_insn
+{
+	uint16 code;	/* opcode of the instruction */
+	uint8 jt;	/* relative offset to jump to in case of 'true' */
+	uint8 jf;	/* relative offset to jump to in case of 'false' */
+	int32 k;	/* instruction-dependent value */
+};
+
+/* Structure that keeps the data required for the authentication on the remote host */
+struct rpcap_auth
+{
+	uint16 type;	/* Authentication type */
+	uint16 dummy;	/* Must be zero */
+	uint16 slen1;	/* Length of the first authentication item (e.g. username) */
+	uint16 slen2;	/* Length of the second authentication item (e.g. password) */
+};
+
+/* Structure that keeps the statistics about the number of packets captured, dropped, etc. */
+struct rpcap_stats
+{
+	uint32 ifrecv;		/* Packets received by the kernel filter (i.e. pcap_stats.ps_recv) */
+	uint32 ifdrop;		/* Packets dropped by the network interface (e.g. not enough buffers) (i.e. pcap_stats.ps_ifdrop) */
+	uint32 krnldrop;	/* Packets dropped by the kernel filter (i.e. pcap_stats.ps_drop) */
+	uint32 svrcapt;		/* Packets captured by the RPCAP daemon and sent on the network */
+};
+
+/* Structure that is needed to set sampling parameters */
+struct rpcap_sampling
+{
+	uint8 method;	/* Sampling method */
+	uint8 dummy1;	/* Must be zero */
+	uint16 dummy2;	/* Must be zero */
+	uint32 value;	/* Parameter related to the sampling method */
+};
+
+/* Messages field coding */
+#define RPCAP_MSG_IS_REPLY		0x080	/* Flag indicating a reply */
+
+#define RPCAP_MSG_ERROR			1	/* Message that keeps an error notification */
+#define RPCAP_MSG_FINDALLIF_REQ		2	/* Request to list all the remote interfaces */
+#define RPCAP_MSG_OPEN_REQ		3	/* Request to open a remote device */
+#define RPCAP_MSG_STARTCAP_REQ		4	/* Request to start a capture on a remote device */
+#define RPCAP_MSG_UPDATEFILTER_REQ	5	/* Send a compiled filter into the remote device */
+#define RPCAP_MSG_CLOSE			6	/* Close the connection with the remote peer */
+#define RPCAP_MSG_PACKET		7	/* This is a 'data' message, which carries a network packet */
+#define RPCAP_MSG_AUTH_REQ		8	/* Message that keeps the authentication parameters */
+#define RPCAP_MSG_STATS_REQ		9	/* It requires to have network statistics */
+#define RPCAP_MSG_ENDCAP_REQ		10	/* Stops the current capture, keeping the device open */
+#define RPCAP_MSG_SETSAMPLING_REQ	11	/* Set sampling parameters */
+
+#define RPCAP_MSG_FINDALLIF_REPLY	(RPCAP_MSG_FINDALLIF_REQ | RPCAP_MSG_IS_REPLY)		/* Keeps the list of all the remote interfaces */
+#define RPCAP_MSG_OPEN_REPLY		(RPCAP_MSG_OPEN_REQ | RPCAP_MSG_IS_REPLY)		/* The remote device has been opened correctly */
+#define RPCAP_MSG_STARTCAP_REPLY	(RPCAP_MSG_STARTCAP_REQ | RPCAP_MSG_IS_REPLY)		/* The capture is starting correctly */
+#define RPCAP_MSG_UPDATEFILTER_REPLY	(RPCAP_MSG_UPDATEFILTER_REQ | RPCAP_MSG_IS_REPLY)	/* The filter has been applied correctly on the remote device */
+#define RPCAP_MSG_AUTH_REPLY		(RPCAP_MSG_AUTH_REQ | RPCAP_MSG_IS_REPLY)		/* Sends a message that says 'ok, authorization successful' */
+#define RPCAP_MSG_STATS_REPLY		(RPCAP_MSG_STATS_REQ | RPCAP_MSG_IS_REPLY)		/* Message that keeps the network statistics */
+#define RPCAP_MSG_ENDCAP_REPLY		(RPCAP_MSG_ENDCAP_REQ | RPCAP_MSG_IS_REPLY)		/* Confirms that the capture stopped successfully */
+#define RPCAP_MSG_SETSAMPLING_REPLY	(RPCAP_MSG_SETSAMPLING_REQ | RPCAP_MSG_IS_REPLY)		/* Confirms that the capture stopped successfully */
+
+#define RPCAP_STARTCAPREQ_FLAG_PROMISC		0x00000001	/* Enables promiscuous mode (default: disabled) */
+#define RPCAP_STARTCAPREQ_FLAG_DGRAM		0x00000002	/* Use a datagram (i.e. UDP) connection for the data stream (default: use TCP)*/
+#define RPCAP_STARTCAPREQ_FLAG_SERVEROPEN	0x00000004	/* The server has to open the data connection toward the client */
+#define RPCAP_STARTCAPREQ_FLAG_INBOUND		0x00000008	/* Capture only inbound packets (take care: the flag has no effect with promiscuous enabled) */
+#define RPCAP_STARTCAPREQ_FLAG_OUTBOUND		0x00000010	/* Capture only outbound packets (take care: the flag has no effect with promiscuous enabled) */
+
+#define RPCAP_UPDATEFILTER_BPF 1			/* This code tells us that the filter is encoded with the BPF/NPF syntax */
+
+/* Network error codes */
+#define PCAP_ERR_NETW		1	/* Network error */
+#define PCAP_ERR_INITTIMEOUT	2	/* The RPCAP initial timeout has expired */
+#define PCAP_ERR_AUTH		3	/* Generic authentication error */
+#define PCAP_ERR_FINDALLIF	4	/* Generic findalldevs error */
+#define PCAP_ERR_NOREMOTEIF	5	/* The findalldevs was ok, but the remote end had no interfaces to list */
+#define PCAP_ERR_OPEN		6	/* Generic pcap_open error */
+#define PCAP_ERR_UPDATEFILTER	7	/* Generic updatefilter error */
+#define PCAP_ERR_GETSTATS	8	/* Generic pcap_stats error */
+#define PCAP_ERR_READEX		9	/* Generic pcap_next_ex error */
+#define PCAP_ERR_HOSTNOAUTH	10	/* The host is not authorized to connect to this server */
+#define PCAP_ERR_REMOTEACCEPT	11	/* Generic pcap_remoteaccept error */
+#define PCAP_ERR_STARTCAPTURE	12	/* Generic pcap_startcapture error */
+#define PCAP_ERR_ENDCAPTURE	13	/* Generic pcap_endcapture error */
+#define PCAP_ERR_RUNTIMETIMEOUT	14	/* The RPCAP run-time timeout has expired */
+#define PCAP_ERR_SETSAMPLING	15	/* Error during the settings of sampling parameters */
+#define PCAP_ERR_WRONGMSG	16	/* The other end endpoint sent a message which has not been recognized */
+#define PCAP_ERR_WRONGVER	17	/* The other end endpoint has a version number that is not compatible with our */
+
+/*
+ * \brief Buffer used by socket functions to send-receive packets.
+ * In case you plan to have messages larger than this value, you have to increase it.
+ */
+#define RPCAP_NETBUF_SIZE 64000
+
+/*********************************************************
+ *                                                       *
+ * Routines used by the rpcap client and rpcap daemon    *
+ *                                                       *
+ *********************************************************/
+
+#include "sockutils.h"
+
+extern void rpcap_createhdr(struct rpcap_header *header, uint8 ver, uint8 type, uint16 value, uint32 length);
+extern const char *rpcap_msg_type_string(uint8 type);
+extern int rpcap_senderror(SOCKET sock, uint8 ver, uint16 errcode, const char *error, char *errbuf);
+
+#endif

Property changes on: vendor/libpcap/dist/rpcap-protocol.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/savefile.c
===================================================================
--- vendor/libpcap/dist/savefile.c	(revision 333788)
+++ vendor/libpcap/dist/savefile.c	(revision 333789)
@@ -1,534 +1,513 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * savefile.c - supports offline use of tcpdump
  *	Extraction/creation by Jeffrey Mogul, DECWRL
  *	Modified by Steve McCanne, LBL.
  *
  * Used to save the received packet headers, after filtering, to
  * a file, and then read them later.
  * The first record in the file contains saved values for the machine
  * dependent values so we can print the dump file on any architecture.
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#include <pcap-types.h>
 #ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
+#include <io.h>
+#include <fcntl.h>
 #endif /* _WIN32 */
 
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "pcap-int.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #include "sf-pcap.h"
-#include "sf-pcap-ng.h"
+#include "sf-pcapng.h"
 
 #ifdef _WIN32
 /*
  * These aren't exported on Windows, because they would only work if both
  * WinPcap and the code using it were to use the Universal CRT; otherwise,
  * a FILE structure in WinPcap and a FILE structure in the code using it
  * could be different if they're using different versions of the C runtime.
  *
  * Instead, pcap/pcap.h defines them as macros that wrap the hopen versions,
  * with the wrappers calling _fileno() and _get_osfhandle() themselves,
  * so that they convert the appropriate CRT version's FILE structure to
  * a HANDLE (which is OS-defined, not CRT-defined, and is part of the Win32
  * and Win64 ABIs).
  */
 static pcap_t *pcap_fopen_offline_with_tstamp_precision(FILE *, u_int, char *);
 static pcap_t *pcap_fopen_offline(FILE *, char *);
 #endif
 
 /*
  * Setting O_BINARY on DOS/Windows is a bit tricky
  */
 #if defined(_WIN32)
   #define SET_BINMODE(f)  _setmode(_fileno(f), _O_BINARY)
 #elif defined(MSDOS)
   #if defined(__HIGHC__)
   #define SET_BINMODE(f)  setmode(f, O_BINARY)
   #else
   #define SET_BINMODE(f)  setmode(fileno(f), O_BINARY)
   #endif
 #endif
 
 static int
-sf_getnonblock(pcap_t *p, char *errbuf)
+sf_getnonblock(pcap_t *p _U_)
 {
 	/*
 	 * This is a savefile, not a live capture file, so never say
 	 * it's in non-blocking mode.
 	 */
 	return (0);
 }
 
 static int
-sf_setnonblock(pcap_t *p, int nonblock, char *errbuf)
+sf_setnonblock(pcap_t *p, int nonblock _U_)
 {
 	/*
 	 * This is a savefile, not a live capture file, so reject
 	 * requests to put it in non-blocking mode.  (If it's a
 	 * pipe, it could be put in non-blocking mode, but that
 	 * would significantly complicate the code to read packets,
 	 * as it would have to handle reading partial packets and
 	 * keeping the state of the read.)
 	 */
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Savefiles cannot be put into non-blocking mode");
 	return (-1);
 }
 
 static int
-sf_stats(pcap_t *p, struct pcap_stat *ps)
+sf_stats(pcap_t *p, struct pcap_stat *ps _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Statistics aren't available from savefiles");
 	return (-1);
 }
 
 #ifdef _WIN32
 static struct pcap_stat *
 sf_stats_ex(pcap_t *p, int *size)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Statistics aren't available from savefiles");
 	return (NULL);
 }
 
 static int
 sf_setbuff(pcap_t *p, int dim)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "The kernel buffer size cannot be set while reading from a file");
 	return (-1);
 }
 
 static int
 sf_setmode(pcap_t *p, int mode)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "impossible to set mode while reading from a file");
 	return (-1);
 }
 
 static int
 sf_setmintocopy(pcap_t *p, int size)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "The mintocopy parameter cannot be set while reading from a file");
 	return (-1);
 }
 
 static HANDLE
 sf_getevent(pcap_t *pcap)
 {
 	(void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
 	    "The read event cannot be retrieved while reading from a file");
 	return (INVALID_HANDLE_VALUE);
 }
 
 static int
 sf_oid_get_request(pcap_t *p, bpf_u_int32 oid _U_, void *data _U_,
     size_t *lenp _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "An OID get request cannot be performed on a file");
 	return (PCAP_ERROR);
 }
 
 static int
 sf_oid_set_request(pcap_t *p, bpf_u_int32 oid _U_, const void *data _U_,
     size_t *lenp _U_)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "An OID set request cannot be performed on a file");
 	return (PCAP_ERROR);
 }
 
 static u_int
 sf_sendqueue_transmit(pcap_t *p, pcap_send_queue *queue, int sync)
 {
 	strlcpy(p->errbuf, "Sending packets isn't supported on savefiles",
 	    PCAP_ERRBUF_SIZE);
 	return (0);
 }
 
 static int
 sf_setuserbuffer(pcap_t *p, int size)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "The user buffer cannot be set when reading from a file");
 	return (-1);
 }
 
 static int
 sf_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Live packet dumping cannot be performed when reading from a file");
 	return (-1);
 }
 
 static int
 sf_live_dump_ended(pcap_t *p, int sync)
 {
 	pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 	    "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
 	return (-1);
 }
 
 static PAirpcapHandle
 sf_get_airpcap_handle(pcap_t *pcap)
 {
 	return (NULL);
 }
 #endif
 
 static int
 sf_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
 {
 	strlcpy(p->errbuf, "Sending packets isn't supported on savefiles",
 	    PCAP_ERRBUF_SIZE);
 	return (-1);
 }
 
 /*
  * Set direction flag: Which packets do we accept on a forwarding
  * single device? IN, OUT or both?
  */
 static int
-sf_setdirection(pcap_t *p, pcap_direction_t d)
+sf_setdirection(pcap_t *p, pcap_direction_t d _U_)
 {
 	pcap_snprintf(p->errbuf, sizeof(p->errbuf),
 	    "Setting direction is not supported on savefiles");
 	return (-1);
 }
 
 void
 sf_cleanup(pcap_t *p)
 {
 	if (p->rfile != stdin)
 		(void)fclose(p->rfile);
 	if (p->buffer != NULL)
 		free(p->buffer);
 	pcap_freecode(&p->fcode);
 }
 
-/*
-* fopen's safe version on Windows.
-*/
-#ifdef _MSC_VER
-FILE *fopen_safe(const char *filename, const char* mode)
-{
-	FILE *fp = NULL;
-	errno_t errno;
-	errno = fopen_s(&fp, filename, mode);
-	if (errno == 0)
-		return fp;
-	else
-		return NULL;
-}
-#endif
-
 pcap_t *
 pcap_open_offline_with_tstamp_precision(const char *fname, u_int precision,
 					char *errbuf)
 {
 	FILE *fp;
 	pcap_t *p;
 
 	if (fname == NULL) {
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "A null pointer was supplied as the file name");
 		return (NULL);
 	}
 	if (fname[0] == '-' && fname[1] == '\0')
 	{
 		fp = stdin;
 #if defined(_WIN32) || defined(MSDOS)
 		/*
 		 * We're reading from the standard input, so put it in binary
 		 * mode, as savefiles are binary files.
 		 */
 		SET_BINMODE(fp);
 #endif
 	}
 	else {
-#if !defined(_WIN32) && !defined(MSDOS)
-		fp = fopen(fname, "r");
-#else
+		/*
+		 * "b" is supported as of C90, so *all* UN*Xes should
+		 * support it, even though it does nothing.  It's
+		 * required on Windows, as the file is a binary file
+		 * and must be read in binary mode.
+		 */
 		fp = fopen(fname, "rb");
-#endif
 		if (fp == NULL) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", fname,
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "%s", fname);
 			return (NULL);
 		}
 	}
 	p = pcap_fopen_offline_with_tstamp_precision(fp, precision, errbuf);
 	if (p == NULL) {
 		if (fp != stdin)
 			fclose(fp);
 	}
 	return (p);
 }
 
 pcap_t *
 pcap_open_offline(const char *fname, char *errbuf)
 {
 	return (pcap_open_offline_with_tstamp_precision(fname,
 	    PCAP_TSTAMP_PRECISION_MICRO, errbuf));
 }
 
 #ifdef _WIN32
 pcap_t* pcap_hopen_offline_with_tstamp_precision(intptr_t osfd, u_int precision,
     char *errbuf)
 {
 	int fd;
 	FILE *file;
 
 	fd = _open_osfhandle(osfd, _O_RDONLY);
 	if ( fd < 0 )
 	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "_open_osfhandle");
 		return NULL;
 	}
 
 	file = _fdopen(fd, "rb");
 	if ( file == NULL )
 	{
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "_fdopen");
 		return NULL;
 	}
 
 	return pcap_fopen_offline_with_tstamp_precision(file, precision,
 	    errbuf);
 }
 
 pcap_t* pcap_hopen_offline(intptr_t osfd, char *errbuf)
 {
 	return pcap_hopen_offline_with_tstamp_precision(osfd,
 	    PCAP_TSTAMP_PRECISION_MICRO, errbuf);
 }
 #endif
 
 static pcap_t *(*check_headers[])(bpf_u_int32, FILE *, u_int, char *, int *) = {
 	pcap_check_header,
 	pcap_ng_check_header
 };
 
 #define	N_FILE_TYPES	(sizeof check_headers / sizeof check_headers[0])
 
 #ifdef _WIN32
 static
 #endif
 pcap_t *
 pcap_fopen_offline_with_tstamp_precision(FILE *fp, u_int precision,
     char *errbuf)
 {
 	register pcap_t *p;
 	bpf_u_int32 magic;
 	size_t amt_read;
 	u_int i;
 	int err;
 
 	/*
 	 * Read the first 4 bytes of the file; the network analyzer dump
-	 * file formats we support (pcap and pcap-ng), and several other
+	 * file formats we support (pcap and pcapng), and several other
 	 * formats we might support in the future (such as snoop, DOS and
 	 * Windows Sniffer, and Microsoft Network Monitor) all have magic
 	 * numbers that are unique in their first 4 bytes.
 	 */
 	amt_read = fread((char *)&magic, 1, sizeof(magic), fp);
 	if (amt_read != sizeof(magic)) {
 		if (ferror(fp)) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
 		} else {
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			    "truncated dump file; tried to read %lu file header bytes, only got %lu",
 			    (unsigned long)sizeof(magic),
 			    (unsigned long)amt_read);
 		}
 		return (NULL);
 	}
 
 	/*
 	 * Try all file types.
 	 */
 	for (i = 0; i < N_FILE_TYPES; i++) {
 		p = (*check_headers[i])(magic, fp, precision, errbuf, &err);
 		if (p != NULL) {
 			/* Yup, that's it. */
 			goto found;
 		}
 		if (err) {
 			/*
 			 * Error trying to read the header.
 			 */
 			return (NULL);
 		}
 	}
 
 	/*
 	 * Well, who knows what this mess is....
 	 */
 	pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "unknown file format");
 	return (NULL);
 
 found:
 	p->rfile = fp;
 
 	/* Padding only needed for live capture fcode */
 	p->fddipad = 0;
 
 #if !defined(_WIN32) && !defined(MSDOS)
 	/*
 	 * You can do "select()" and "poll()" on plain files on most
 	 * platforms, and should be able to do so on pipes.
 	 *
 	 * You can't do "select()" on anything other than sockets in
 	 * Windows, so, on Win32 systems, we don't have "selectable_fd".
 	 */
 	p->selectable_fd = fileno(fp);
 #endif
 
 	p->read_op = pcap_offline_read;
 	p->inject_op = sf_inject;
 	p->setfilter_op = install_bpf_program;
 	p->setdirection_op = sf_setdirection;
 	p->set_datalink_op = NULL;	/* we don't support munging link-layer headers */
 	p->getnonblock_op = sf_getnonblock;
 	p->setnonblock_op = sf_setnonblock;
 	p->stats_op = sf_stats;
 #ifdef _WIN32
 	p->stats_ex_op = sf_stats_ex;
 	p->setbuff_op = sf_setbuff;
 	p->setmode_op = sf_setmode;
 	p->setmintocopy_op = sf_setmintocopy;
 	p->getevent_op = sf_getevent;
 	p->oid_get_request_op = sf_oid_get_request;
 	p->oid_set_request_op = sf_oid_set_request;
 	p->sendqueue_transmit_op = sf_sendqueue_transmit;
 	p->setuserbuffer_op = sf_setuserbuffer;
 	p->live_dump_op = sf_live_dump;
 	p->live_dump_ended_op = sf_live_dump_ended;
 	p->get_airpcap_handle_op = sf_get_airpcap_handle;
 #endif
 
 	/*
 	 * For offline captures, the standard one-shot callback can
 	 * be used for pcap_next()/pcap_next_ex().
 	 */
 	p->oneshot_callback = pcap_oneshot;
 
 	/*
 	 * Savefiles never require special BPF code generation.
 	 */
 	p->bpf_codegen_flags = 0;
 
 	p->activated = 1;
 
 	return (p);
 }
 
 #ifdef _WIN32
 static
 #endif
 pcap_t *
 pcap_fopen_offline(FILE *fp, char *errbuf)
 {
 	return (pcap_fopen_offline_with_tstamp_precision(fp,
 	    PCAP_TSTAMP_PRECISION_MICRO, errbuf));
 }
 
 /*
  * Read packets from a capture file, and call the callback for each
  * packet.
  * If cnt > 0, return after 'cnt' packets, otherwise continue until eof.
  */
 int
 pcap_offline_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
 	struct bpf_insn *fcode;
 	int status = 0;
 	int n = 0;
 	u_char *data;
 
 	while (status == 0) {
 		struct pcap_pkthdr h;
 
 		/*
 		 * Has "pcap_breakloop()" been called?
 		 * If so, return immediately - if we haven't read any
 		 * packets, clear the flag and return -2 to indicate
 		 * that we were told to break out of the loop, otherwise
 		 * leave the flag set, so that the *next* call will break
 		 * out of the loop without having read any packets, and
 		 * return the number of packets we've processed so far.
 		 */
 		if (p->break_loop) {
 			if (n == 0) {
 				p->break_loop = 0;
 				return (-2);
 			} else
 				return (n);
 		}
 
 		status = p->next_packet_op(p, &h, &data);
 		if (status) {
 			if (status == 1)
 				return (0);
 			return (status);
 		}
 
 		if ((fcode = p->fcode.bf_insns) == NULL ||
 		    bpf_filter(fcode, data, h.len, h.caplen)) {
 			(*callback)(user, &h, data);
 			if (++n >= cnt && cnt > 0)
 				break;
 		}
 	}
 	/*XXX this breaks semantics tcpslice expects */
 	return (n);
 }
Index: vendor/libpcap/dist/scanner.l
===================================================================
--- vendor/libpcap/dist/scanner.l	(revision 333788)
+++ vendor/libpcap/dist/scanner.l	(revision 333789)
@@ -1,484 +1,533 @@
 %top {
 /* Must come first for _LARGE_FILE_API on AIX. */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
+
+/*
+ * Must come first to avoid warnings on Windows.
+ *
+ * Flex-generated scanners may only include <inttypes.h> if __STDC_VERSION__
+ * is defined with a value >= 199901, meaning "full C99", and MSVC may not
+ * define it with that value, because it isn't 100% C99-compliant, even
+ * though it has an <inttypes.h> capable of defining everything the Flex
+ * scanner needs.
+ *
+ * We, however, will include it if we know we have an MSVC version that has
+ * it; this means that we may define the INTn_MAX and UINTn_MAX values in
+ * scanner.c, and then include <stdint.h>, which may define them differently
+ * (same value, but different string of characters), causing compiler warnings.
+ *
+ * If we include it here, and they're defined, that'll prevent scanner.c
+ * from defining them.  So we include <pcap/pcap-inttypes.h>, to get
+ * <inttypes.h> if we have it.
+ */
+#include <pcap/pcap-inttypes.h>
+
+#include "diag-control.h"
 }
 
 /*
  * We want a reentrant scanner.
  */
 %option reentrant
 
 /*
  * And we need to pass the compiler state to the scanner.
  */
 %option extra-type="compiler_state_t *"
 
 /*
  * We don't use input, so don't generate code for it.
  */
 %option noinput
 
 /*
  * We don't use unput, so don't generate code for it.
  */
 %option nounput
 
 /*
  * We don't read from the terminal.
  */
 %option never-interactive
 
 /*
  * We want to stop processing when we get to the end of the input.
  */
 %option noyywrap
 
 /*
  * We want to generate code that can be used by a reentrant parser
  * generated by Bison or Berkeley YACC.
  */
 %option bison-bridge
 
 %{
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  */
 
-#ifdef _WIN32
-  #include <pcap-stdinc.h>
-#else
-  #if HAVE_INTTYPES_H
-    #include <inttypes.h>
-  #elif HAVE_STDINT_H
-    #include <stdint.h>
-  #endif
-  #ifdef HAVE_SYS_BITYPES_H
-    #include <sys/bitypes.h>
-  #endif
-  #include <sys/types.h>
-#endif
-
 #include <ctype.h>
 #include <string.h>
 
 #include "pcap-int.h"
 
 #include "gencode.h"
 
 #include "grammar.h"
 
 /*
  * Earlier versions of Flex don't declare these, so we declare them
  * ourselves to squelch warnings.
  */
 int pcap_get_column(yyscan_t);
 void pcap_set_column(int, yyscan_t);
 
 #ifdef INET6
 
 #ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
 /*
  * To quote the MSDN page for getaddrinfo() at
  *
  *    https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520(v=vs.85).aspx
  *
  * "Support for getaddrinfo on Windows 2000 and older versions
  * The getaddrinfo function was added to the Ws2_32.dll on Windows XP and
  * later. To execute an application that uses this function on earlier
  * versions of Windows, then you need to include the Ws2tcpip.h and
  * Wspiapi.h files. When the Wspiapi.h include file is added, the
  * getaddrinfo function is defined to the WspiapiGetAddrInfo inline
  * function in the Wspiapi.h file. At runtime, the WspiapiGetAddrInfo
  * function is implemented in such a way that if the Ws2_32.dll or the
  * Wship6.dll (the file containing getaddrinfo in the IPv6 Technology
  * Preview for Windows 2000) does not include getaddrinfo, then a
  * version of getaddrinfo is implemented inline based on code in the
  * Wspiapi.h header file. This inline code will be used on older Windows
  * platforms that do not natively support the getaddrinfo function."
  *
- * We use getaddrinfo(), so we include Wspiapi.h here.  pcap-stdinc.h
- * includes Ws2tcpip.h, so we don't need to include it ourselves.
+ * We use getaddrinfo(), so we include Wspiapi.h here.
  */
-#include <Wspiapi.h>
+#include <wspiapi.h>
 #else /* _WIN32 */
 #include <sys/socket.h>	/* for "struct sockaddr" in "struct addrinfo" */
 #include <netdb.h>	/* for "struct addrinfo" */
 #endif /* _WIN32 */
 
 /* Workaround for AIX 4.3 */
 #if !defined(AI_NUMERICHOST)
 #define AI_NUMERICHOST 0x04
 #endif
 
 #endif /*INET6*/
 
 #include <pcap/namedb.h>
 #include "grammar.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 static int stoi(char *);
 static inline int xdtoi(int);
 
+/*
+ * Disable diagnostics in the code generated by Flex.
+ */
+DIAG_OFF_FLEX
+
 %}
 
 N		([0-9]+|(0X|0x)[0-9A-Fa-f]+)
 B		([0-9A-Fa-f][0-9A-Fa-f]?)
 B2		([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])
 W		([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
 
 %a 18400
 %o 21500
 %e 7600
 %k 4550
 %p 27600
 %n 2000
 
 V680		{W}:{W}:{W}:{W}:{W}:{W}:{W}:{W}
 
 V670		::{W}:{W}:{W}:{W}:{W}:{W}:{W}
 V671		{W}::{W}:{W}:{W}:{W}:{W}:{W}
 V672		{W}:{W}::{W}:{W}:{W}:{W}:{W}
 V673		{W}:{W}:{W}::{W}:{W}:{W}:{W}
 V674		{W}:{W}:{W}:{W}::{W}:{W}:{W}
 V675		{W}:{W}:{W}:{W}:{W}::{W}:{W}
 V676		{W}:{W}:{W}:{W}:{W}:{W}::{W}
 V677		{W}:{W}:{W}:{W}:{W}:{W}:{W}::
 
 V660		::{W}:{W}:{W}:{W}:{W}:{W}
 V661		{W}::{W}:{W}:{W}:{W}:{W}
 V662		{W}:{W}::{W}:{W}:{W}:{W}
 V663		{W}:{W}:{W}::{W}:{W}:{W}
 V664		{W}:{W}:{W}:{W}::{W}:{W}
 V665		{W}:{W}:{W}:{W}:{W}::{W}
 V666		{W}:{W}:{W}:{W}:{W}:{W}::
 
 V650		::{W}:{W}:{W}:{W}:{W}
 V651		{W}::{W}:{W}:{W}:{W}
 V652		{W}:{W}::{W}:{W}:{W}
 V653		{W}:{W}:{W}::{W}:{W}
 V654		{W}:{W}:{W}:{W}::{W}
 V655		{W}:{W}:{W}:{W}:{W}::
 
 V640		::{W}:{W}:{W}:{W}
 V641		{W}::{W}:{W}:{W}
 V642		{W}:{W}::{W}:{W}
 V643		{W}:{W}:{W}::{W}
 V644		{W}:{W}:{W}:{W}::
 
 V630		::{W}:{W}:{W}
 V631		{W}::{W}:{W}
 V632		{W}:{W}::{W}
 V633		{W}:{W}:{W}::
 
 V620		::{W}:{W}
 V621		{W}::{W}
 V622		{W}:{W}::
 
 V610		::{W}
 V611		{W}::
 
 V600		::
 
 V6604		{W}:{W}:{W}:{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 
 V6504		::{W}:{W}:{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6514		{W}::{W}:{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6524		{W}:{W}::{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6534		{W}:{W}:{W}::{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6544		{W}:{W}:{W}:{W}::{W}:{N}\.{N}\.{N}\.{N}
 V6554		{W}:{W}:{W}:{W}:{W}::{N}\.{N}\.{N}\.{N}
 
 V6404		::{W}:{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6414		{W}::{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6424		{W}:{W}::{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6434		{W}:{W}:{W}::{W}:{N}\.{N}\.{N}\.{N}
 V6444		{W}:{W}:{W}:{W}::{N}\.{N}\.{N}\.{N}
 
 V6304		::{W}:{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6314		{W}::{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6324		{W}:{W}::{W}:{N}\.{N}\.{N}\.{N}
 V6334		{W}:{W}:{W}::{N}\.{N}\.{N}\.{N}
 
 V6204		::{W}:{W}:{N}\.{N}\.{N}\.{N}
 V6214		{W}::{W}:{N}\.{N}\.{N}\.{N}
 V6224		{W}:{W}::{N}\.{N}\.{N}\.{N}
 
 V6104		::{W}:{N}\.{N}\.{N}\.{N}
 V6114		{W}::{N}\.{N}\.{N}\.{N}
 
 V6004		::{N}\.{N}\.{N}\.{N}
 
 
 V6		({V680}|{V670}|{V671}|{V672}|{V673}|{V674}|{V675}|{V676}|{V677}|{V660}|{V661}|{V662}|{V663}|{V664}|{V665}|{V666}|{V650}|{V651}|{V652}|{V653}|{V654}|{V655}|{V640}|{V641}|{V642}|{V643}|{V644}|{V630}|{V631}|{V632}|{V633}|{V620}|{V621}|{V622}|{V610}|{V611}|{V600}|{V6604}|{V6504}|{V6514}|{V6524}|{V6534}|{V6544}|{V6554}|{V6404}|{V6414}|{V6424}|{V6434}|{V6444}|{V6304}|{V6314}|{V6324}|{V6334}|{V6204}|{V6214}|{V6224}|{V6104}|{V6114}|{V6004})
 
 MAC		({B}:{B}:{B}:{B}:{B}:{B}|{B}\-{B}\-{B}\-{B}\-{B}\-{B}|{B}\.{B}\.{B}\.{B}\.{B}\.{B}|{B2}\.{B2}\.{B2}|{B2}{3})
 
 
 
 %%
 dst		return DST;
 src		return SRC;
 
 link|ether|ppp|slip  return LINK;
 fddi|tr|wlan	return LINK;
 arp		return ARP;
 rarp		return RARP;
 ip		return IP;
 sctp		return SCTP;
 tcp		return TCP;
 udp		return UDP;
 icmp		return ICMP;
 igmp		return IGMP;
 igrp		return IGRP;
 pim		return PIM;
 vrrp		return VRRP;
 carp		return CARP;
 radio		return RADIO;
 
 ip6		return IPV6;
 icmp6		return ICMPV6;
 ah		return AH;
 esp		return ESP;
 
 atalk		return ATALK;
 aarp		return AARP;
 decnet		return DECNET;
 lat		return LAT;
 sca		return SCA;
 moprc		return MOPRC;
 mopdl		return MOPDL;
 
 iso		return ISO;
 esis		return ESIS;
 es-is		return ESIS;
 isis		return ISIS;
 is-is		return ISIS;
 l1              return L1;
 l2              return L2;
 iih             return IIH;
 lsp             return LSP;
 snp             return SNP;
 csnp            return CSNP;
 psnp            return PSNP;
 
 clnp		return CLNP;
 
 stp		return STP;
 
 ipx		return IPX;
 
 netbeui		return NETBEUI;
 
 host		return HOST;
 net		return NET;
 mask		return NETMASK;
 port		return PORT;
 portrange	return PORTRANGE;
 proto		return PROTO;
 protochain	{
 #ifdef NO_PROTOCHAIN
 		  bpf_error(yyextra, "%s not supported", yytext);
 #else
 		  return PROTOCHAIN;
 #endif
 		}
 
 gateway		return GATEWAY;
 
 type		return TYPE;
 subtype		return SUBTYPE;
 direction|dir	return DIR;
 address1|addr1	return ADDR1;
 address2|addr2	return ADDR2;
 address3|addr3	return ADDR3;
 address4|addr4	return ADDR4;
 ra		return RA;
 ta		return TA;
 
 less		return LESS;
 greater		return GREATER;
 byte		return CBYTE;
 broadcast	return TK_BROADCAST;
 multicast	return TK_MULTICAST;
 
 and|"&&"	return AND;
 or|"||"		return OR;
 not		return '!';
 
 len|length	return LEN;
 inbound		return INBOUND;
 outbound	return OUTBOUND;
 
 vlan		return VLAN;
 mpls		return MPLS;
 pppoed		return PPPOED;
 pppoes		return PPPOES;
 geneve		return GENEVE;
 
 lane		return LANE;
 llc		return LLC;
 metac		return METAC;
 bcc		return BCC;
 oam		return OAM;
 oamf4		return OAMF4;
 oamf4ec		return OAMF4EC;
 oamf4sc		return OAMF4SC;
 sc		return SC;
 ilmic		return ILMIC;
 vpi		return VPI;
 vci		return VCI;
 connectmsg	return CONNECTMSG;
 metaconnect	return METACONNECT;
 
 on|ifname	return PF_IFNAME;
 rset|ruleset	return PF_RSET;
 rnr|rulenum	return PF_RNR;
 srnr|subrulenum	return PF_SRNR;
 reason		return PF_REASON;
 action		return PF_ACTION;
 
 fisu		return FISU;
 lssu		return LSSU;
 lsu		return LSSU;
 msu		return MSU;
 hfisu		return HFISU;
 hlssu		return HLSSU;
 hmsu		return HMSU;
 sio		return SIO;
 opc		return OPC;
 dpc		return DPC;
 sls		return SLS;
 hsio		return HSIO;
 hopc		return HOPC;
 hdpc		return HDPC;
 hsls		return HSLS;
 
 [ \r\n\t]		;
 [+\-*/%:\[\]!<>()&|\^=]	return yytext[0];
 ">="			return GEQ;
 "<="			return LEQ;
 "!="			return NEQ;
 "=="			return '=';
 "<<"			return LSH;
 ">>"			return RSH;
 ${B}			{ yylval->e = pcap_ether_aton(((char *)yytext)+1);
 			  if (yylval->e == NULL)
 				bpf_error(yyextra, "malloc");
 			  return AID; }
 {MAC}			{ yylval->e = pcap_ether_aton((char *)yytext);
 			  if (yylval->e == NULL)
 				bpf_error(yyextra, "malloc");
 			  return EID; }
 {N}			{ yylval->i = stoi((char *)yytext); return NUM; }
 ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})	{
 			yylval->s = sdup(yyextra, (char *)yytext); return HID; }
 {V6}			{
 #ifdef INET6
 			  struct addrinfo hints, *res;
 			  memset(&hints, 0, sizeof(hints));
 			  hints.ai_family = AF_INET6;
 			  hints.ai_flags = AI_NUMERICHOST;
 			  if (getaddrinfo(yytext, NULL, &hints, &res))
 				bpf_error(yyextra, "bogus IPv6 address %s", yytext);
 			  else {
 				freeaddrinfo(res);
 				yylval->s = sdup(yyextra, (char *)yytext); return HID6;
 			  }
 #else
 			  bpf_error(yyextra, "IPv6 address %s not supported", yytext);
 #endif /*INET6*/
 			}
 {B}:+({B}:+)+		{ bpf_error(yyextra, "bogus ethernet address %s", yytext); }
 icmptype		{ yylval->i = 0; return NUM; }
 icmpcode		{ yylval->i = 1; return NUM; }
 icmp-echoreply		{ yylval->i = 0; return NUM; }
 icmp-unreach		{ yylval->i = 3; return NUM; }
 icmp-sourcequench	{ yylval->i = 4; return NUM; }
 icmp-redirect		{ yylval->i = 5; return NUM; }
 icmp-echo		{ yylval->i = 8; return NUM; }
 icmp-routeradvert	{ yylval->i = 9; return NUM; }
 icmp-routersolicit	{ yylval->i = 10; return NUM; }
 icmp-timxceed		{ yylval->i = 11; return NUM; }
 icmp-paramprob		{ yylval->i = 12; return NUM; }
 icmp-tstamp		{ yylval->i = 13; return NUM; }
 icmp-tstampreply	{ yylval->i = 14; return NUM; }
 icmp-ireq		{ yylval->i = 15; return NUM; }
 icmp-ireqreply		{ yylval->i = 16; return NUM; }
 icmp-maskreq		{ yylval->i = 17; return NUM; }
 icmp-maskreply		{ yylval->i = 18; return NUM; }
+
+icmp6type       { yylval->i = 0; return NUM; }
+icmp6code       { yylval->i = 1; return NUM; }
+
+icmp6-echo      { yylval->i = 128; return NUM; }
+icmp6-echoreply { yylval->i = 129; return NUM; }
+icmp6-multicastlistenerquery    { yylval->i = 130; return NUM; }
+icmp6-multicastlistenerreportv1 { yylval->i = 131; return NUM; }
+icmp6-multicastlistenerdone     { yylval->i = 132; return NUM; }
+icmp6-routersolicit   { yylval->i = 133; return NUM; }
+icmp6-routeradvert    { yylval->i = 134; return NUM; }
+icmp6-neighborsolicit { yylval->i = 135; return NUM; }
+icmp6-neighboradvert  { yylval->i = 136; return NUM; }
+icmp6-redirect    { yylval->i = 137; return NUM; }
+icmp6-routerrenum { yylval->i = 138; return NUM; }
+icmp6-nodeinformationquery      { yylval->i = 139; return NUM; }
+icmp6-nodeinformationresponse   { yylval->i = 140; return NUM; }
+icmp6-ineighbordiscoverysolicit { yylval->i = 141; return NUM; }
+icmp6-ineighbordiscoveryadvert  { yylval->i = 142; return NUM; }
+icmp6-multicastlistenerreportv2 { yylval->i = 143; return NUM; }
+icmp6-homeagentdiscoveryrequest { yylval->i = 144; return NUM; }
+icmp6-homeagentdiscoveryreply   { yylval->i = 145; return NUM; }
+icmp6-mobileprefixsolicit       { yylval->i = 146; return NUM; }
+icmp6-mobileprefixadvert        { yylval->i = 147; return NUM; }
+icmp6-certpathsolicit           { yylval->i = 148; return NUM; }
+icmp6-certpathadvert            { yylval->i = 149; return NUM; }
+icmp6-multicastrouteradvert     { yylval->i = 151; return NUM; }
+icmp6-multicastroutersolicit    { yylval->i = 152; return NUM; }
+icmp6-multicastrouterterm       { yylval->i = 153; return NUM; }
+
 tcpflags		{ yylval->i = 13; return NUM; }
 tcp-fin			{ yylval->i = 0x01; return NUM; }
 tcp-syn			{ yylval->i = 0x02; return NUM; }
 tcp-rst			{ yylval->i = 0x04; return NUM; }
 tcp-push		{ yylval->i = 0x08; return NUM; }
 tcp-ack			{ yylval->i = 0x10; return NUM; }
 tcp-urg			{ yylval->i = 0x20; return NUM; }
+tcp-ece			{ yylval->i = 0x40; return NUM; }
+tcp-cwr			{ yylval->i = 0x80; return NUM; }
 [A-Za-z0-9]([-_.A-Za-z0-9]*[.A-Za-z0-9])? {
 			 yylval->s = sdup(yyextra, (char *)yytext); return ID; }
 "\\"[^ !()\n\t]+	{ yylval->s = sdup(yyextra, (char *)yytext + 1); return ID; }
 [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+ {
 			bpf_error(yyextra, "illegal token: %s", yytext); }
 .			{ bpf_error(yyextra, "illegal char '%c'", *yytext); }
 %%
 
+/*
+ * Turn diagnostics back on, so we check the code that we've written.
+ */
+DIAG_ON_FLEX
+
 /* Hex digit to integer. */
 static inline int
-xdtoi(c)
-	register int c;
+xdtoi(int c)
 {
 	if (isdigit(c))
 		return c - '0';
 	else if (islower(c))
 		return c - 'a' + 10;
 	else
 		return c - 'A' + 10;
 }
 
 /*
  * Convert string to integer.  Just like atoi(), but checks for
  * preceding 0x or 0 and uses hex or octal instead of decimal.
  */
 static int
-stoi(s)
-	char *s;
+stoi(char *s)
 {
 	int base = 10;
 	int n = 0;
 
 	if (*s == '0') {
 		if (s[1] == 'x' || s[1] == 'X') {
 			s += 2;
 			base = 16;
 		}
 		else {
 			base = 8;
 			s += 1;
 		}
 	}
 	while (*s)
 		n = n * base + xdtoi(*s++);
 
 	return n;
 }
Index: vendor/libpcap/dist/sf-pcap.c
===================================================================
--- vendor/libpcap/dist/sf-pcap.c	(revision 333788)
+++ vendor/libpcap/dist/sf-pcap.c	(revision 333789)
@@ -1,958 +1,1080 @@
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  * retain the above copyright notice and this paragraph in its entirety, (2)
  * distributions including binary code include the above copyright notice and
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * ``This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may 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.
  *
  * sf-pcap.c - libpcap-file-format-specific code from savefile.c
  *	Extraction/creation by Jeffrey Mogul, DECWRL
  *	Modified by Steve McCanne, LBL.
  *
  * Used to save the received packet headers, after filtering, to
  * a file, and then read them later.
  * The first record in the file contains saved values for the machine
  * dependent values so we can print the dump file on any architecture.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header$ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#include <pcap-types.h>
 #ifdef _WIN32
-#include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
+#include <io.h>
+#include <fcntl.h>
 #endif /* _WIN32 */
 
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "pcap-int.h"
 
 #include "pcap-common.h"
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 
 #include "sf-pcap.h"
 
 /*
  * Setting O_BINARY on DOS/Windows is a bit tricky
  */
 #if defined(_WIN32)
   #define SET_BINMODE(f)  _setmode(_fileno(f), _O_BINARY)
 #elif defined(MSDOS)
   #if defined(__HIGHC__)
   #define SET_BINMODE(f)  setmode(f, O_BINARY)
   #else
   #define SET_BINMODE(f)  setmode(fileno(f), O_BINARY)
   #endif
 #endif
 
 /*
  * Standard libpcap format.
  */
 #define TCPDUMP_MAGIC		0xa1b2c3d4
 
 /*
  * Alexey Kuznetzov's modified libpcap format.
  */
 #define KUZNETZOV_TCPDUMP_MAGIC	0xa1b2cd34
 
 /*
  * Reserved for Francisco Mesquita <francisco.mesquita@radiomovel.pt>
  * for another modified format.
  */
 #define FMESQUITA_TCPDUMP_MAGIC	0xa1b234cd
 
 /*
  * Navtel Communcations' format, with nanosecond timestamps,
  * as per a request from Dumas Hwang <dumas.hwang@navtelcom.com>.
  */
 #define NAVTEL_TCPDUMP_MAGIC	0xa12b3c4d
 
 /*
  * Normal libpcap format, except for seconds/nanoseconds timestamps,
  * as per a request by Ulf Lamping <ulf.lamping@web.de>
  */
 #define NSEC_TCPDUMP_MAGIC	0xa1b23c4d
 
 /*
  * Mechanism for storing information about a capture in the upper
  * 6 bits of a linktype value in a capture file.
  *
  * LT_LINKTYPE_EXT(x) extracts the additional information.
  *
  * The rest of the bits are for a value describing the link-layer
  * value.  LT_LINKTYPE(x) extracts that value.
  */
 #define LT_LINKTYPE(x)		((x) & 0x03FFFFFF)
 #define LT_LINKTYPE_EXT(x)	((x) & 0xFC000000)
 
 static int pcap_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char **datap);
 
 /*
  * Private data for reading pcap savefiles.
  */
 typedef enum {
 	NOT_SWAPPED,
 	SWAPPED,
 	MAYBE_SWAPPED
 } swapped_type_t;
 
 typedef enum {
 	PASS_THROUGH,
 	SCALE_UP,
 	SCALE_DOWN
 } tstamp_scale_type_t;
 
 struct pcap_sf {
 	size_t hdrsize;
 	swapped_type_t lengths_swapped;
 	tstamp_scale_type_t scale_type;
 };
 
 /*
  * Check whether this is a pcap savefile and, if it is, extract the
  * relevant information from the header.
  */
 pcap_t *
 pcap_check_header(bpf_u_int32 magic, FILE *fp, u_int precision, char *errbuf,
 		  int *err)
 {
 	struct pcap_file_header hdr;
 	size_t amt_read;
 	pcap_t *p;
 	int swapped = 0;
 	struct pcap_sf *ps;
 
 	/*
 	 * Assume no read errors.
 	 */
 	*err = 0;
 
 	/*
 	 * Check whether the first 4 bytes of the file are the magic
 	 * number for a pcap savefile, or for a byte-swapped pcap
 	 * savefile.
 	 */
 	if (magic != TCPDUMP_MAGIC && magic != KUZNETZOV_TCPDUMP_MAGIC &&
 	    magic != NSEC_TCPDUMP_MAGIC) {
 		magic = SWAPLONG(magic);
 		if (magic != TCPDUMP_MAGIC && magic != KUZNETZOV_TCPDUMP_MAGIC &&
 		    magic != NSEC_TCPDUMP_MAGIC)
 			return (NULL);	/* nope */
 		swapped = 1;
 	}
 
 	/*
 	 * They are.  Put the magic number in the header, and read
 	 * the rest of the header.
 	 */
 	hdr.magic = magic;
 	amt_read = fread(((char *)&hdr) + sizeof hdr.magic, 1,
 	    sizeof(hdr) - sizeof(hdr.magic), fp);
 	if (amt_read != sizeof(hdr) - sizeof(hdr.magic)) {
 		if (ferror(fp)) {
-			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
 		} else {
 			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			    "truncated dump file; tried to read %lu file header bytes, only got %lu",
 			    (unsigned long)sizeof(hdr),
 			    (unsigned long)amt_read);
 		}
 		*err = 1;
 		return (NULL);
 	}
 
 	/*
 	 * If it's a byte-swapped capture file, byte-swap the header.
 	 */
 	if (swapped) {
 		hdr.version_major = SWAPSHORT(hdr.version_major);
 		hdr.version_minor = SWAPSHORT(hdr.version_minor);
 		hdr.thiszone = SWAPLONG(hdr.thiszone);
 		hdr.sigfigs = SWAPLONG(hdr.sigfigs);
 		hdr.snaplen = SWAPLONG(hdr.snaplen);
 		hdr.linktype = SWAPLONG(hdr.linktype);
 	}
 
 	if (hdr.version_major < PCAP_VERSION_MAJOR) {
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "archaic pcap savefile format");
 		*err = 1;
 		return (NULL);
 	}
 
 	/*
 	 * currently only versions 2.[0-4] are supported with
 	 * the exception of 543.0 for DG/UX tcpdump.
 	 */
 	if (! ((hdr.version_major == PCAP_VERSION_MAJOR &&
 		hdr.version_minor <= PCAP_VERSION_MINOR) ||
 	       (hdr.version_major == 543 &&
 		hdr.version_minor == 0))) {
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 			 "unsupported pcap savefile version %u.%u",
 			 hdr.version_major, hdr.version_minor);
 		*err = 1;
 		return NULL;
 	}
 
-	if (hdr.snaplen > MAXIMUM_SNAPLEN) {
-		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
-			 "invalid file capture length %u, bigger than "
-			 "maximum of %u", hdr.snaplen, MAXIMUM_SNAPLEN);
-		*err = 1;
-		return NULL;
-	}
-
 	/*
 	 * OK, this is a good pcap file.
 	 * Allocate a pcap_t for it.
 	 */
 	p = pcap_open_offline_common(errbuf, sizeof (struct pcap_sf));
 	if (p == NULL) {
 		/* Allocation failed. */
 		*err = 1;
 		return (NULL);
 	}
 	p->swapped = swapped;
 	p->version_major = hdr.version_major;
 	p->version_minor = hdr.version_minor;
 	p->tzoff = hdr.thiszone;
 	p->snapshot = hdr.snaplen;
+	if (p->snapshot <= 0) {
+		/*
+		 * Bogus snapshot length; use the maximum for this
+		 * link-layer type as a fallback.
+		 *
+		 * XXX - the only reason why snapshot is signed is
+		 * that pcap_snapshot() returns an int, not an
+		 * unsigned int.
+		 */
+		p->snapshot = max_snaplen_for_dlt(hdr.linktype);
+	}
 	p->linktype = linktype_to_dlt(LT_LINKTYPE(hdr.linktype));
 	p->linktype_ext = LT_LINKTYPE_EXT(hdr.linktype);
 
 	p->next_packet_op = pcap_next_packet;
 
 	ps = p->priv;
 
 	p->opt.tstamp_precision = precision;
 
 	/*
 	 * Will we need to scale the timestamps to match what the
 	 * user wants?
 	 */
 	switch (precision) {
 
 	case PCAP_TSTAMP_PRECISION_MICRO:
 		if (magic == NSEC_TCPDUMP_MAGIC) {
 			/*
 			 * The file has nanoseconds, the user
 			 * wants microseconds; scale the
 			 * precision down.
 			 */
 			ps->scale_type = SCALE_DOWN;
 		} else {
 			/*
 			 * The file has microseconds, the
 			 * user wants microseconds; nothing to do.
 			 */
 			ps->scale_type = PASS_THROUGH;
 		}
 		break;
 
 	case PCAP_TSTAMP_PRECISION_NANO:
 		if (magic == NSEC_TCPDUMP_MAGIC) {
 			/*
 			 * The file has nanoseconds, the
 			 * user wants nanoseconds; nothing to do.
 			 */
 			ps->scale_type = PASS_THROUGH;
 		} else {
 			/*
 			 * The file has microoseconds, the user
 			 * wants nanoseconds; scale the
 			 * precision up.
 			 */
 			ps->scale_type = SCALE_UP;
 		}
 		break;
 
 	default:
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		    "unknown time stamp resolution %u", precision);
 		free(p);
 		*err = 1;
 		return (NULL);
 	}
 
 	/*
 	 * We interchanged the caplen and len fields at version 2.3,
 	 * in order to match the bpf header layout.  But unfortunately
 	 * some files were written with version 2.3 in their headers
 	 * but without the interchanged fields.
 	 *
 	 * In addition, DG/UX tcpdump writes out files with a version
 	 * number of 543.0, and with the caplen and len fields in the
 	 * pre-2.3 order.
 	 */
 	switch (hdr.version_major) {
 
 	case 2:
 		if (hdr.version_minor < 3)
 			ps->lengths_swapped = SWAPPED;
 		else if (hdr.version_minor == 3)
 			ps->lengths_swapped = MAYBE_SWAPPED;
 		else
 			ps->lengths_swapped = NOT_SWAPPED;
 		break;
 
 	case 543:
 		ps->lengths_swapped = SWAPPED;
 		break;
 
 	default:
 		ps->lengths_swapped = NOT_SWAPPED;
 		break;
 	}
 
 	if (magic == KUZNETZOV_TCPDUMP_MAGIC) {
 		/*
 		 * XXX - the patch that's in some versions of libpcap
 		 * changes the packet header but not the magic number,
 		 * and some other versions with this magic number have
 		 * some extra debugging information in the packet header;
 		 * we'd have to use some hacks^H^H^H^H^Hheuristics to
 		 * detect those variants.
 		 *
 		 * Ethereal does that, but it does so by trying to read
 		 * the first two packets of the file with each of the
 		 * record header formats.  That currently means it seeks
 		 * backwards and retries the reads, which doesn't work
 		 * on pipes.  We want to be able to read from a pipe, so
 		 * that strategy won't work; we'd have to buffer some
 		 * data ourselves and read from that buffer in order to
 		 * make that work.
 		 */
 		ps->hdrsize = sizeof(struct pcap_sf_patched_pkthdr);
 
 		if (p->linktype == DLT_EN10MB) {
 			/*
 			 * This capture might have been done in raw mode
 			 * or cooked mode.
 			 *
 			 * If it was done in cooked mode, p->snapshot was
 			 * passed to recvfrom() as the buffer size, meaning
 			 * that the most packet data that would be copied
 			 * would be p->snapshot.  However, a faked Ethernet
 			 * header would then have been added to it, so the
 			 * most data that would be in a packet in the file
 			 * would be p->snapshot + 14.
 			 *
 			 * We can't easily tell whether the capture was done
 			 * in raw mode or cooked mode, so we'll assume it was
 			 * cooked mode, and add 14 to the snapshot length.
 			 * That means that, for a raw capture, the snapshot
 			 * length will be misleading if you use it to figure
 			 * out why a capture doesn't have all the packet data,
 			 * but there's not much we can do to avoid that.
 			 */
 			p->snapshot += 14;
 		}
 	} else
 		ps->hdrsize = sizeof(struct pcap_sf_pkthdr);
 
 	/*
 	 * Allocate a buffer for the packet data.
+	 * Choose the minimum of the file's snapshot length and 2K bytes;
+	 * that should be enough for most network packets - we'll grow it
+	 * if necessary.  That way, we don't allocate a huge chunk of
+	 * memory just because there's a huge snapshot length, as the
+	 * snapshot length might be larger than the size of the largest
+	 * packet.
 	 */
 	p->bufsize = p->snapshot;
-	if (p->bufsize <= 0) {
-		/*
-		 * Bogus snapshot length; use the maximum as a fallback.
-		 */
-		p->bufsize = MAXIMUM_SNAPLEN;
-	}
+	if (p->bufsize > 2048)
+		p->bufsize = 2048;
 	p->buffer = malloc(p->bufsize);
 	if (p->buffer == NULL) {
 		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory");
 		free(p);
 		*err = 1;
 		return (NULL);
 	}
 
 	p->cleanup_op = sf_cleanup;
 
 	return (p);
 }
 
 /*
+ * Grow the packet buffer to the specified size.
+ */
+static int
+grow_buffer(pcap_t *p, u_int bufsize)
+{
+	void *bigger_buffer;
+
+	bigger_buffer = realloc(p->buffer, bufsize);
+	if (bigger_buffer == NULL) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "out of memory");
+		return (0);
+	}
+	p->buffer = bigger_buffer;
+	p->bufsize = bufsize;
+	return (1);
+}
+
+/*
  * Read and return the next packet from the savefile.  Return the header
  * in hdr and a pointer to the contents in data.  Return 0 on success, 1
  * if there were no more packets, and -1 on an error.
  */
 static int
 pcap_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char **data)
 {
 	struct pcap_sf *ps = p->priv;
 	struct pcap_sf_patched_pkthdr sf_hdr;
 	FILE *fp = p->rfile;
 	size_t amt_read;
 	bpf_u_int32 t;
 
 	/*
 	 * Read the packet header; the structure we use as a buffer
 	 * is the longer structure for files generated by the patched
 	 * libpcap, but if the file has the magic number for an
 	 * unpatched libpcap we only read as many bytes as the regular
 	 * header has.
 	 */
 	amt_read = fread(&sf_hdr, 1, ps->hdrsize, fp);
 	if (amt_read != ps->hdrsize) {
 		if (ferror(fp)) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "error reading dump file: %s",
-			    pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
 			return (-1);
 		} else {
 			if (amt_read != 0) {
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "truncated dump file; tried to read %lu header bytes, only got %lu",
 				    (unsigned long)ps->hdrsize,
 				    (unsigned long)amt_read);
 				return (-1);
 			}
 			/* EOF */
 			return (1);
 		}
 	}
 
 	if (p->swapped) {
 		/* these were written in opposite byte order */
 		hdr->caplen = SWAPLONG(sf_hdr.caplen);
 		hdr->len = SWAPLONG(sf_hdr.len);
 		hdr->ts.tv_sec = SWAPLONG(sf_hdr.ts.tv_sec);
 		hdr->ts.tv_usec = SWAPLONG(sf_hdr.ts.tv_usec);
 	} else {
 		hdr->caplen = sf_hdr.caplen;
 		hdr->len = sf_hdr.len;
 		hdr->ts.tv_sec = sf_hdr.ts.tv_sec;
 		hdr->ts.tv_usec = sf_hdr.ts.tv_usec;
 	}
 
 	switch (ps->scale_type) {
 
 	case PASS_THROUGH:
 		/*
 		 * Just pass the time stamp through.
 		 */
 		break;
 
 	case SCALE_UP:
 		/*
 		 * File has microseconds, user wants nanoseconds; convert
 		 * it.
 		 */
 		hdr->ts.tv_usec = hdr->ts.tv_usec * 1000;
 		break;
 
 	case SCALE_DOWN:
 		/*
 		 * File has nanoseconds, user wants microseconds; convert
 		 * it.
 		 */
 		hdr->ts.tv_usec = hdr->ts.tv_usec / 1000;
 		break;
 	}
 
 	/* Swap the caplen and len fields, if necessary. */
 	switch (ps->lengths_swapped) {
 
 	case NOT_SWAPPED:
 		break;
 
 	case MAYBE_SWAPPED:
 		if (hdr->caplen <= hdr->len) {
 			/*
 			 * The captured length is <= the actual length,
 			 * so presumably they weren't swapped.
 			 */
 			break;
 		}
 		/* FALLTHROUGH */
 
 	case SWAPPED:
 		t = hdr->caplen;
 		hdr->caplen = hdr->len;
 		hdr->len = t;
 		break;
 	}
 
-	if (hdr->caplen > p->bufsize) {
+	/*
+	 * Is the packet bigger than we consider sane?
+	 */
+	if (hdr->caplen > max_snaplen_for_dlt(p->linktype)) {
 		/*
+		 * Yes.  This may be a damaged or fuzzed file.
+		 *
+		 * Is it bigger than the snapshot length?
+		 * (We don't treat that as an error if it's not
+		 * bigger than the maximum we consider sane; see
+		 * below.)
+		 */
+		if (hdr->caplen > (bpf_u_int32)p->snapshot) {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "invalid packet capture length %u, bigger than "
+			    "snaplen of %d", hdr->caplen, p->snapshot);
+		} else {
+			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+			    "invalid packet capture length %u, bigger than "
+			    "maximum of %u", hdr->caplen,
+			    max_snaplen_for_dlt(p->linktype));
+		}
+		return (-1);
+	}
+
+	if (hdr->caplen > (bpf_u_int32)p->snapshot) {
+		/*
+		 * The packet is bigger than the snapshot length
+		 * for this file.
+		 *
 		 * This can happen due to Solaris 2.3 systems tripping
 		 * over the BUFMOD problem and not setting the snapshot
-		 * correctly in the savefile header.
-		 * This can also happen with a corrupted savefile or a
-		 * savefile built/modified by a fuzz tester.
-		 * If the caplen isn't grossly wrong, try to salvage.
+		 * length correctly in the savefile header.
+		 *
+		 * libpcap 0.4 and later on Solaris 2.3 should set the
+		 * snapshot length correctly in the pcap file header,
+		 * even though they don't set a snapshot length in bufmod
+		 * (the buggy bufmod chops off the *beginning* of the
+		 * packet if a snapshot length is specified); they should
+		 * also reduce the captured length, as supplied to the
+		 * per-packet callback, to the snapshot length if it's
+		 * greater than the snapshot length, so the code using
+		 * libpcap should see the packet cut off at the snapshot
+		 * length, even though the full packet is copied up to
+		 * userland.
+		 *
+		 * However, perhaps some versions of libpcap failed to
+		 * set the snapshot length currectly in the file header
+		 * or the per-packet header, or perhaps this is a
+		 * corrupted safefile or a savefile built/modified by a
+		 * fuzz tester, so we check anyway.  We grow the buffer
+		 * to be big enough for the snapshot length, read up
+		 * to the snapshot length, discard the rest of the
+		 * packet, and report the snapshot length as the captured
+		 * length; we don't want to hand our caller a packet
+		 * bigger than the snapshot length, because they might
+		 * be assuming they'll never be handed such a packet,
+		 * and might copy the packet into a snapshot-length-
+		 * sized buffer, assuming it'll fit.
 		 */
 		size_t bytes_to_discard;
 		size_t bytes_to_read, bytes_read;
 		char discard_buf[4096];
 
-		if (hdr->caplen > MAXIMUM_SNAPLEN) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-			    "invalid packet capture length %u, bigger than "
-			    "maximum of %u", hdr->caplen, MAXIMUM_SNAPLEN);
-			return (-1);
+		if (hdr->caplen > p->bufsize) {
+			/*
+			 * Grow the buffer to the snapshot length.
+			 */
+			if (!grow_buffer(p, p->snapshot))
+				return (-1);
 		}
 
 		/*
-		 * XXX - we don't grow the buffer here because some
-		 * program might assume that it will never get packets
-		 * bigger than the snapshot length; for example, it might
-		 * copy data from our buffer to a buffer of its own,
-		 * allocated based on the return value of pcap_snapshot().
-		 *
-		 * Read the first p->bufsize bytes into the buffer.
+		 * Read the first p->snapshot bytes into the buffer.
 		 */
-		amt_read = fread(p->buffer, 1, p->bufsize, fp);
-		if (amt_read != p->bufsize) {
+		amt_read = fread(p->buffer, 1, p->snapshot, fp);
+		if (amt_read != (bpf_u_int32)p->snapshot) {
 			if (ferror(fp)) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "error reading dump file: %s",
-				    pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				     PCAP_ERRBUF_SIZE, errno,
+				    "error reading dump file");
 			} else {
 				/*
 				 * Yes, this uses hdr->caplen; technically,
 				 * it's true, because we would try to read
 				 * and discard the rest of those bytes, and
 				 * that would fail because we got EOF before
 				 * the read finished.
 				 */
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "truncated dump file; tried to read %u captured bytes, only got %lu",
-				    hdr->caplen, (unsigned long)amt_read);
+				    p->snapshot, (unsigned long)amt_read);
 			}
 			return (-1);
 		}
 
 		/*
 		 * Now read and discard what's left.
 		 */
-		bytes_to_discard = hdr->caplen - p->bufsize;
+		bytes_to_discard = hdr->caplen - p->snapshot;
 		bytes_read = amt_read;
 		while (bytes_to_discard != 0) {
 			bytes_to_read = bytes_to_discard;
 			if (bytes_to_read > sizeof (discard_buf))
 				bytes_to_read = sizeof (discard_buf);
 			amt_read = fread(discard_buf, 1, bytes_to_read, fp);
 			bytes_read += amt_read;
 			if (amt_read != bytes_to_read) {
 				if (ferror(fp)) {
-					pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-					    "error reading dump file: %s",
-					    pcap_strerror(errno));
+					pcap_fmt_errmsg_for_errno(p->errbuf,
+					    PCAP_ERRBUF_SIZE, errno,
+					    "error reading dump file");
 				} else {
 					pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 					    "truncated dump file; tried to read %u captured bytes, only got %lu",
 					    hdr->caplen, (unsigned long)bytes_read);
 				}
 				return (-1);
 			}
 			bytes_to_discard -= amt_read;
 		}
 
 		/*
 		 * Adjust caplen accordingly, so we don't get confused later
 		 * as to how many bytes we have to play with.
 		 */
-		hdr->caplen = p->bufsize;
+		hdr->caplen = p->snapshot;
 	} else {
+		if (hdr->caplen > p->bufsize) {
+			/*
+			 * Grow the buffer to the next power of 2, or
+			 * the snaplen, whichever is lower.
+			 */
+			u_int new_bufsize;
+
+			new_bufsize = hdr->caplen;
+			/*
+			 * http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+			 */
+			new_bufsize--;
+			new_bufsize |= new_bufsize >> 1;
+			new_bufsize |= new_bufsize >> 2;
+			new_bufsize |= new_bufsize >> 4;
+			new_bufsize |= new_bufsize >> 8;
+			new_bufsize |= new_bufsize >> 16;
+			new_bufsize++;
+
+			if (new_bufsize > (u_int)p->snapshot)
+				new_bufsize = p->snapshot;
+
+			if (!grow_buffer(p, new_bufsize))
+				return (-1);
+		}
+
 		/* read the packet itself */
 		amt_read = fread(p->buffer, 1, hdr->caplen, fp);
 		if (amt_read != hdr->caplen) {
 			if (ferror(fp)) {
-				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-				    "error reading dump file: %s",
-				    pcap_strerror(errno));
+				pcap_fmt_errmsg_for_errno(p->errbuf,
+				    PCAP_ERRBUF_SIZE, errno,
+				    "error reading dump file");
 			} else {
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "truncated dump file; tried to read %u captured bytes, only got %lu",
 				    hdr->caplen, (unsigned long)amt_read);
 			}
 			return (-1);
 		}
 	}
 	*data = p->buffer;
 
 	if (p->swapped)
 		swap_pseudo_headers(p->linktype, hdr, *data);
 
 	return (0);
 }
 
 static int
 sf_write_header(pcap_t *p, FILE *fp, int linktype, int thiszone, int snaplen)
 {
 	struct pcap_file_header hdr;
 
 	hdr.magic = p->opt.tstamp_precision == PCAP_TSTAMP_PRECISION_NANO ? NSEC_TCPDUMP_MAGIC : TCPDUMP_MAGIC;
 	hdr.version_major = PCAP_VERSION_MAJOR;
 	hdr.version_minor = PCAP_VERSION_MINOR;
 
 	hdr.thiszone = thiszone;
 	hdr.snaplen = snaplen;
 	hdr.sigfigs = 0;
 	hdr.linktype = linktype;
 
 	if (fwrite((char *)&hdr, sizeof(hdr), 1, fp) != 1)
 		return (-1);
 
 	return (0);
 }
 
 /*
  * Output a packet to the initialized dump file.
  */
 void
 pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
 	register FILE *f;
 	struct pcap_sf_pkthdr sf_hdr;
 
 	f = (FILE *)user;
 	sf_hdr.ts.tv_sec  = h->ts.tv_sec;
 	sf_hdr.ts.tv_usec = h->ts.tv_usec;
 	sf_hdr.caplen     = h->caplen;
 	sf_hdr.len        = h->len;
 	/* XXX we should check the return status */
 	(void)fwrite(&sf_hdr, sizeof(sf_hdr), 1, f);
 	(void)fwrite(sp, h->caplen, 1, f);
 }
 
 static pcap_dumper_t *
 pcap_setup_dump(pcap_t *p, int linktype, FILE *f, const char *fname)
 {
 
 #if defined(_WIN32) || defined(MSDOS)
 	/*
 	 * If we're writing to the standard output, put it in binary
 	 * mode, as savefiles are binary files.
 	 *
 	 * Otherwise, we turn off buffering.
 	 * XXX - why?  And why not on the standard output?
 	 */
 	if (f == stdout)
 		SET_BINMODE(f);
 	else
-		setbuf(f, NULL);
+		setvbuf(f, NULL, _IONBF, 0);
 #endif
 	if (sf_write_header(p, f, linktype, p->tzoff, p->snapshot) == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Can't write to %s: %s",
-		    fname, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't write to %s", fname);
 		if (f != stdout)
 			(void)fclose(f);
 		return (NULL);
 	}
 	return ((pcap_dumper_t *)f);
 }
 
 /*
  * Initialize so that sf_write() will output to the file named 'fname'.
  */
 pcap_dumper_t *
 pcap_dump_open(pcap_t *p, const char *fname)
 {
 	FILE *f;
 	int linktype;
 
 	/*
 	 * If this pcap_t hasn't been activated, it doesn't have a
 	 * link-layer type, so we can't use it.
 	 */
 	if (!p->activated) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: not-yet-activated pcap_t passed to pcap_dump_open",
 		    fname);
 		return (NULL);
 	}
 	linktype = dlt_to_linktype(p->linktype);
 	if (linktype == -1) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: link-layer type %d isn't supported in savefiles",
 		    fname, p->linktype);
 		return (NULL);
 	}
 	linktype |= p->linktype_ext;
 
 	if (fname == NULL) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "A null pointer was supplied as the file name");
 		return NULL;
 	}
 	if (fname[0] == '-' && fname[1] == '\0') {
 		f = stdout;
 		fname = "standard output";
 	} else {
-#if !defined(_WIN32) && !defined(MSDOS)
-		f = fopen(fname, "w");
-#else
+		/*
+		 * "b" is supported as of C90, so *all* UN*Xes should
+		 * support it, even though it does nothing.  It's
+		 * required on Windows, as the file is a binary file
+		 * and must be written in binary mode.
+		 */
 		f = fopen(fname, "wb");
-#endif
 		if (f == NULL) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
-			    fname, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "%s", fname);
 			return (NULL);
 		}
 	}
 	return (pcap_setup_dump(p, linktype, f, fname));
 }
 
 /*
  * Initialize so that sf_write() will output to the given stream.
  */
 pcap_dumper_t *
 pcap_dump_fopen(pcap_t *p, FILE *f)
 {
 	int linktype;
 
 	linktype = dlt_to_linktype(p->linktype);
 	if (linktype == -1) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "stream: link-layer type %d isn't supported in savefiles",
 		    p->linktype);
 		return (NULL);
 	}
 	linktype |= p->linktype_ext;
 
 	return (pcap_setup_dump(p, linktype, f, "stream"));
 }
 
 pcap_dumper_t *
 pcap_dump_open_append(pcap_t *p, const char *fname)
 {
 	FILE *f;
 	int linktype;
 	size_t amt_read;
 	struct pcap_file_header ph;
 
 	linktype = dlt_to_linktype(p->linktype);
 	if (linktype == -1) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "%s: link-layer type %d isn't supported in savefiles",
 		    fname, linktype);
 		return (NULL);
 	}
 
 	if (fname == NULL) {
 		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 		    "A null pointer was supplied as the file name");
 		return NULL;
 	}
 	if (fname[0] == '-' && fname[1] == '\0')
 		return (pcap_setup_dump(p, linktype, stdout, "standard output"));
 
-#if !defined(_WIN32) && !defined(MSDOS)
-	f = fopen(fname, "r+");
-#else
+	/*
+	 * "b" is supported as of C90, so *all* UN*Xes should support it,
+	 * even though it does nothing.  It's required on Windows, as the
+	 * file is a binary file and must be read in binary mode.
+	 */
 	f = fopen(fname, "rb+");
-#endif
 	if (f == NULL) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
-		    fname, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "%s", fname);
 		return (NULL);
 	}
 
 	/*
 	 * Try to read a pcap header.
 	 */
 	amt_read = fread(&ph, 1, sizeof (ph), f);
 	if (amt_read != sizeof (ph)) {
 		if (ferror(f)) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
-			    fname, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "%s", fname);
 			fclose(f);
 			return (NULL);
 		} else if (feof(f) && amt_read > 0) {
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: truncated pcap file header", fname);
 			fclose(f);
 			return (NULL);
 		}
 	}
 
 #if defined(_WIN32) || defined(MSDOS)
 	/*
 	 * We turn off buffering.
 	 * XXX - why?  And why not on the standard output?
 	 */
-	setbuf(f, NULL);
+	setvbuf(f, NULL, _IONBF, 0);
 #endif
 
 	/*
 	 * If a header is already present and:
 	 *
 	 *	it's not for a pcap file of the appropriate resolution
 	 *	and the right byte order for this machine;
 	 *
 	 *	the link-layer header types don't match;
 	 *
 	 *	the snapshot lengths don't match;
 	 *
 	 * return an error.
 	 */
 	if (amt_read > 0) {
 		/*
 		 * A header is already present.
 		 * Do the checks.
 		 */
 		switch (ph.magic) {
 
 		case TCPDUMP_MAGIC:
 			if (p->opt.tstamp_precision != PCAP_TSTAMP_PRECISION_MICRO) {
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "%s: different time stamp precision, cannot append to file", fname);
 				fclose(f);
 				return (NULL);
 			}
 			break;
 
 		case NSEC_TCPDUMP_MAGIC:
 			if (p->opt.tstamp_precision != PCAP_TSTAMP_PRECISION_NANO) {
 				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 				    "%s: different time stamp precision, cannot append to file", fname);
 				fclose(f);
 				return (NULL);
 			}
 			break;
 
 		case SWAPLONG(TCPDUMP_MAGIC):
 		case SWAPLONG(NSEC_TCPDUMP_MAGIC):
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: different byte order, cannot append to file", fname);
 			fclose(f);
 			return (NULL);
 
 		case KUZNETZOV_TCPDUMP_MAGIC:
 		case SWAPLONG(KUZNETZOV_TCPDUMP_MAGIC):
 		case NAVTEL_TCPDUMP_MAGIC:
 		case SWAPLONG(NAVTEL_TCPDUMP_MAGIC):
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: not a pcap file to which we can append", fname);
 			fclose(f);
 			return (NULL);
 
 		default:
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: not a pcap file", fname);
 			fclose(f);
 			return (NULL);
 		}
 
 		/*
 		 * Good version?
 		 */
 		if (ph.version_major != PCAP_VERSION_MAJOR ||
 		    ph.version_minor != PCAP_VERSION_MINOR) {
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: version is %u.%u, cannot append to file", fname,
 			    ph.version_major, ph.version_minor);
 			fclose(f);
 			return (NULL);
 		}
 		if ((bpf_u_int32)linktype != ph.linktype) {
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: different linktype, cannot append to file", fname);
 			fclose(f);
 			return (NULL);
 		}
 		if ((bpf_u_int32)p->snapshot != ph.snaplen) {
 			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 			    "%s: different snaplen, cannot append to file", fname);
 			fclose(f);
 			return (NULL);
 		}
 	} else {
 		/*
 		 * A header isn't present; attempt to write it.
 		 */
 		if (sf_write_header(p, f, linktype, p->tzoff, p->snapshot) == -1) {
-			pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Can't write to %s: %s",
-			    fname, pcap_strerror(errno));
+			pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "Can't write to %s", fname);
 			(void)fclose(f);
 			return (NULL);
 		}
 	}
 
 	/*
 	 * Start writing at the end of the file.
 	 */
 	if (fseek(f, 0, SEEK_END) == -1) {
-		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Can't seek to end of %s: %s",
-		    fname, pcap_strerror(errno));
+		pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+		    errno, "Can't seek to end of %s", fname);
 		(void)fclose(f);
 		return (NULL);
 	}
 	return ((pcap_dumper_t *)f);
 }
 
 FILE *
 pcap_dump_file(pcap_dumper_t *p)
 {
 	return ((FILE *)p);
 }
 
 long
 pcap_dump_ftell(pcap_dumper_t *p)
 {
 	return (ftell((FILE *)p));
 }
+
+#if defined(HAVE_FSEEKO)
+/*
+ * We have fseeko(), so we have ftello().
+ * If we have large file support (files larger than 2^31-1 bytes),
+ * ftello() will give us a current file position with more than 32
+ * bits.
+ */
+int64_t
+pcap_dump_ftell64(pcap_dumper_t *p)
+{
+	return (ftello((FILE *)p));
+}
+#elif defined(_MSC_VER)
+/*
+ * We have Visual Studio; we support only 2005 and later, so we have
+ * _ftelli64().
+ */
+int64_t
+pcap_dump_ftell64(pcap_dumper_t *p)
+{
+	return (_ftelli64((FILE *)p));
+}
+#else
+/*
+ * We don't have ftello() or _ftelli64(), so fall back on ftell().
+ * Either long is 64 bits, in which case ftell() should suffice,
+ * or this is probably an older 32-bit UN*X without large file
+ * support, which means you'll probably get errors trying to
+ * write files > 2^31-1, so it won't matter anyway.
+ *
+ * XXX - what about MinGW?
+ */
+int64_t
+pcap_dump_ftell64(pcap_dumper_t *p)
+{
+	return (ftell((FILE *)p));
+}
+#endif
 
 int
 pcap_dump_flush(pcap_dumper_t *p)
 {
 
 	if (fflush((FILE *)p) == EOF)
 		return (-1);
 	else
 		return (0);
 }
 
 void
 pcap_dump_close(pcap_dumper_t *p)
 {
 
 #ifdef notyet
 	if (ferror((FILE *)p))
 		return-an-error;
 	/* XXX should check return from fclose() too */
 #endif
 	(void)fclose((FILE *)p);
 }
Index: vendor/libpcap/dist/sf-pcapng.c
===================================================================
--- vendor/libpcap/dist/sf-pcapng.c	(nonexistent)
+++ vendor/libpcap/dist/sf-pcapng.c	(revision 333789)
@@ -0,0 +1,1464 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may 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.
+ *
+ * sf-pcapng.c - pcapng-file-format-specific code from savefile.c
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pcap/pcap-inttypes.h>
+
+#include <errno.h>
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "pcap-int.h"
+
+#include "pcap-common.h"
+
+#ifdef HAVE_OS_PROTO_H
+#include "os-proto.h"
+#endif
+
+#include "sf-pcapng.h"
+
+/*
+ * Block types.
+ */
+
+/*
+ * Common part at the beginning of all blocks.
+ */
+struct block_header {
+	bpf_u_int32	block_type;
+	bpf_u_int32	total_length;
+};
+
+/*
+ * Common trailer at the end of all blocks.
+ */
+struct block_trailer {
+	bpf_u_int32	total_length;
+};
+
+/*
+ * Common options.
+ */
+#define OPT_ENDOFOPT	0	/* end of options */
+#define OPT_COMMENT	1	/* comment string */
+
+/*
+ * Option header.
+ */
+struct option_header {
+	u_short		option_code;
+	u_short		option_length;
+};
+
+/*
+ * Structures for the part of each block type following the common
+ * part.
+ */
+
+/*
+ * Section Header Block.
+ */
+#define BT_SHB			0x0A0D0D0A
+
+struct section_header_block {
+	bpf_u_int32	byte_order_magic;
+	u_short		major_version;
+	u_short		minor_version;
+	uint64_t	section_length;
+	/* followed by options and trailer */
+};
+
+/*
+ * Byte-order magic value.
+ */
+#define BYTE_ORDER_MAGIC	0x1A2B3C4D
+
+/*
+ * Current version number.  If major_version isn't PCAP_NG_VERSION_MAJOR,
+ * that means that this code can't read the file.
+ */
+#define PCAP_NG_VERSION_MAJOR	1
+#define PCAP_NG_VERSION_MINOR	0
+
+/*
+ * Interface Description Block.
+ */
+#define BT_IDB			0x00000001
+
+struct interface_description_block {
+	u_short		linktype;
+	u_short		reserved;
+	bpf_u_int32	snaplen;
+	/* followed by options and trailer */
+};
+
+/*
+ * Options in the IDB.
+ */
+#define IF_NAME		2	/* interface name string */
+#define IF_DESCRIPTION	3	/* interface description string */
+#define IF_IPV4ADDR	4	/* interface's IPv4 address and netmask */
+#define IF_IPV6ADDR	5	/* interface's IPv6 address and prefix length */
+#define IF_MACADDR	6	/* interface's MAC address */
+#define IF_EUIADDR	7	/* interface's EUI address */
+#define IF_SPEED	8	/* interface's speed, in bits/s */
+#define IF_TSRESOL	9	/* interface's time stamp resolution */
+#define IF_TZONE	10	/* interface's time zone */
+#define IF_FILTER	11	/* filter used when capturing on interface */
+#define IF_OS		12	/* string OS on which capture on this interface was done */
+#define IF_FCSLEN	13	/* FCS length for this interface */
+#define IF_TSOFFSET	14	/* time stamp offset for this interface */
+
+/*
+ * Enhanced Packet Block.
+ */
+#define BT_EPB			0x00000006
+
+struct enhanced_packet_block {
+	bpf_u_int32	interface_id;
+	bpf_u_int32	timestamp_high;
+	bpf_u_int32	timestamp_low;
+	bpf_u_int32	caplen;
+	bpf_u_int32	len;
+	/* followed by packet data, options, and trailer */
+};
+
+/*
+ * Simple Packet Block.
+ */
+#define BT_SPB			0x00000003
+
+struct simple_packet_block {
+	bpf_u_int32	len;
+	/* followed by packet data and trailer */
+};
+
+/*
+ * Packet Block.
+ */
+#define BT_PB			0x00000002
+
+struct packet_block {
+	u_short		interface_id;
+	u_short		drops_count;
+	bpf_u_int32	timestamp_high;
+	bpf_u_int32	timestamp_low;
+	bpf_u_int32	caplen;
+	bpf_u_int32	len;
+	/* followed by packet data, options, and trailer */
+};
+
+/*
+ * Block cursor - used when processing the contents of a block.
+ * Contains a pointer into the data being processed and a count
+ * of bytes remaining in the block.
+ */
+struct block_cursor {
+	u_char		*data;
+	size_t		data_remaining;
+	bpf_u_int32	block_type;
+};
+
+typedef enum {
+	PASS_THROUGH,
+	SCALE_UP_DEC,
+	SCALE_DOWN_DEC,
+	SCALE_UP_BIN,
+	SCALE_DOWN_BIN
+} tstamp_scale_type_t;
+
+/*
+ * Per-interface information.
+ */
+struct pcap_ng_if {
+	u_int tsresol;			/* time stamp resolution */
+	tstamp_scale_type_t scale_type;	/* how to scale */
+	u_int scale_factor;		/* time stamp scale factor for power-of-10 tsresol */
+	uint64_t tsoffset;		/* time stamp offset */
+};
+
+/*
+ * Per-pcap_t private data.
+ *
+ * max_blocksize is the maximum size of a block that we'll accept.  We
+ * reject blocks bigger than this, so we don't consume too much memory
+ * with a truly huge block.  It can change as we see IDBs with different
+ * link-layer header types.  (Currently, we don't support IDBs with
+ * different link-layer header types, but we will support it in the
+ * future, when we offer file-reading APIs that support it.)
+ *
+ * XXX - that's an issue on ILP32 platforms, where the maximum block
+ * size of 2^31-1 would eat all but one byte of the entire address space.
+ * It's less of an issue on ILP64/LLP64 platforms, but the actual size
+ * of the address space may be limited by 1) the number of *significant*
+ * address bits (currently, x86-64 only supports 48 bits of address), 2)
+ * any limitations imposed by the operating system; 3) any limitations
+ * imposed by the amount of available backing store for anonymous pages,
+ * so we impose a limit regardless of the size of a pointer.
+ */
+struct pcap_ng_sf {
+	u_int user_tsresol;		/* time stamp resolution requested by the user */
+	u_int max_blocksize;		/* don't grow buffer size past this */
+	bpf_u_int32 ifcount;		/* number of interfaces seen in this capture */
+	bpf_u_int32 ifaces_size;	/* size of array below */
+	struct pcap_ng_if *ifaces;	/* array of interface information */
+};
+
+/*
+ * Maximum block size for a given maximum snapshot length; we calculate
+ * this based
+ *
+ * We define it as the size of an EPB with a max_snaplen-sized
+ * packet and 128KB of options.
+ */
+#define MAX_BLOCKSIZE(max_snaplen)	(sizeof (struct block_header) + \
+					 sizeof (struct enhanced_packet_block) + \
+					 (max_snaplen) + 131072 + \
+					 sizeof (struct block_trailer))
+
+static void pcap_ng_cleanup(pcap_t *p);
+static int pcap_ng_next_packet(pcap_t *p, struct pcap_pkthdr *hdr,
+    u_char **data);
+
+static int
+read_bytes(FILE *fp, void *buf, size_t bytes_to_read, int fail_on_eof,
+    char *errbuf)
+{
+	size_t amt_read;
+
+	amt_read = fread(buf, 1, bytes_to_read, fp);
+	if (amt_read != bytes_to_read) {
+		if (ferror(fp)) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
+		} else {
+			if (amt_read == 0 && !fail_on_eof)
+				return (0);	/* EOF */
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "truncated dump file; tried to read %lu bytes, only got %lu",
+			    (unsigned long)bytes_to_read,
+			    (unsigned long)amt_read);
+		}
+		return (-1);
+	}
+	return (1);
+}
+
+static int
+read_block(FILE *fp, pcap_t *p, struct block_cursor *cursor, char *errbuf)
+{
+	struct pcap_ng_sf *ps;
+	int status;
+	struct block_header bhdr;
+	u_char *bdata;
+	size_t data_remaining;
+
+	ps = p->priv;
+
+	status = read_bytes(fp, &bhdr, sizeof(bhdr), 0, errbuf);
+	if (status <= 0)
+		return (status);	/* error or EOF */
+
+	if (p->swapped) {
+		bhdr.block_type = SWAPLONG(bhdr.block_type);
+		bhdr.total_length = SWAPLONG(bhdr.total_length);
+	}
+
+	/*
+	 * Is this block "too big"?
+	 *
+	 * We choose 16MB as "too big", for now, so that we handle
+	 * "reasonably" large buffers but don't chew up all the
+	 * memory if we read a malformed file.
+	 */
+	if (bhdr.total_length > 16*1024*1024) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "pcapng block size %u > maximum %u",
+		    bhdr.total_length, 16*1024*1024);
+		    return (-1);
+	}
+
+	/*
+	 * Is this block "too small" - i.e., is it shorter than a block
+	 * header plus a block trailer?
+	 */
+	if (bhdr.total_length < sizeof(struct block_header) +
+	    sizeof(struct block_trailer)) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "block in pcapng dump file has a length of %u < %lu",
+		    bhdr.total_length,
+		    (unsigned long)(sizeof(struct block_header) + sizeof(struct block_trailer)));
+		return (-1);
+	}
+
+	/*
+	 * Is the buffer big enough?
+	 */
+	if (p->bufsize < bhdr.total_length) {
+		/*
+		 * No - make it big enough, unless it's too big.
+		 */
+		void *bigger_buffer;
+
+		if (bhdr.total_length > ps->max_blocksize) {
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "block is larger than maximum block size %u",
+			    ps->max_blocksize);
+			return (-1);
+		}
+		bigger_buffer = realloc(p->buffer, bhdr.total_length);
+		if (bigger_buffer == NULL) {
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory");
+			return (-1);
+		}
+		p->buffer = bigger_buffer;
+	}
+
+	/*
+	 * Copy the stuff we've read to the buffer, and read the rest
+	 * of the block.
+	 */
+	memcpy(p->buffer, &bhdr, sizeof(bhdr));
+	bdata = (u_char *)p->buffer + sizeof(bhdr);
+	data_remaining = bhdr.total_length - sizeof(bhdr);
+	if (read_bytes(fp, bdata, data_remaining, 1, errbuf) == -1)
+		return (-1);
+
+	/*
+	 * Initialize the cursor.
+	 */
+	cursor->data = bdata;
+	cursor->data_remaining = data_remaining - sizeof(struct block_trailer);
+	cursor->block_type = bhdr.block_type;
+	return (1);
+}
+
+static void *
+get_from_block_data(struct block_cursor *cursor, size_t chunk_size,
+    char *errbuf)
+{
+	void *data;
+
+	/*
+	 * Make sure we have the specified amount of data remaining in
+	 * the block data.
+	 */
+	if (cursor->data_remaining < chunk_size) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "block of type %u in pcapng dump file is too short",
+		    cursor->block_type);
+		return (NULL);
+	}
+
+	/*
+	 * Return the current pointer, and skip past the chunk.
+	 */
+	data = cursor->data;
+	cursor->data += chunk_size;
+	cursor->data_remaining -= chunk_size;
+	return (data);
+}
+
+static struct option_header *
+get_opthdr_from_block_data(pcap_t *p, struct block_cursor *cursor, char *errbuf)
+{
+	struct option_header *opthdr;
+
+	opthdr = get_from_block_data(cursor, sizeof(*opthdr), errbuf);
+	if (opthdr == NULL) {
+		/*
+		 * Option header is cut short.
+		 */
+		return (NULL);
+	}
+
+	/*
+	 * Byte-swap it if necessary.
+	 */
+	if (p->swapped) {
+		opthdr->option_code = SWAPSHORT(opthdr->option_code);
+		opthdr->option_length = SWAPSHORT(opthdr->option_length);
+	}
+
+	return (opthdr);
+}
+
+static void *
+get_optvalue_from_block_data(struct block_cursor *cursor,
+    struct option_header *opthdr, char *errbuf)
+{
+	size_t padded_option_len;
+	void *optvalue;
+
+	/* Pad option length to 4-byte boundary */
+	padded_option_len = opthdr->option_length;
+	padded_option_len = ((padded_option_len + 3)/4)*4;
+
+	optvalue = get_from_block_data(cursor, padded_option_len, errbuf);
+	if (optvalue == NULL) {
+		/*
+		 * Option value is cut short.
+		 */
+		return (NULL);
+	}
+
+	return (optvalue);
+}
+
+static int
+process_idb_options(pcap_t *p, struct block_cursor *cursor, u_int *tsresol,
+    uint64_t *tsoffset, int *is_binary, char *errbuf)
+{
+	struct option_header *opthdr;
+	void *optvalue;
+	int saw_tsresol, saw_tsoffset;
+	u_char tsresol_opt;
+	u_int i;
+
+	saw_tsresol = 0;
+	saw_tsoffset = 0;
+	while (cursor->data_remaining != 0) {
+		/*
+		 * Get the option header.
+		 */
+		opthdr = get_opthdr_from_block_data(p, cursor, errbuf);
+		if (opthdr == NULL) {
+			/*
+			 * Option header is cut short.
+			 */
+			return (-1);
+		}
+
+		/*
+		 * Get option value.
+		 */
+		optvalue = get_optvalue_from_block_data(cursor, opthdr,
+		    errbuf);
+		if (optvalue == NULL) {
+			/*
+			 * Option value is cut short.
+			 */
+			return (-1);
+		}
+
+		switch (opthdr->option_code) {
+
+		case OPT_ENDOFOPT:
+			if (opthdr->option_length != 0) {
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Interface Description Block has opt_endofopt option with length %u != 0",
+				    opthdr->option_length);
+				return (-1);
+			}
+			goto done;
+
+		case IF_TSRESOL:
+			if (opthdr->option_length != 1) {
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Interface Description Block has if_tsresol option with length %u != 1",
+				    opthdr->option_length);
+				return (-1);
+			}
+			if (saw_tsresol) {
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Interface Description Block has more than one if_tsresol option");
+				return (-1);
+			}
+			saw_tsresol = 1;
+			memcpy(&tsresol_opt, optvalue, sizeof(tsresol_opt));
+			if (tsresol_opt & 0x80) {
+				/*
+				 * Resolution is negative power of 2.
+				 */
+				*is_binary = 1;
+				*tsresol = 1 << (tsresol_opt & 0x7F);
+			} else {
+				/*
+				 * Resolution is negative power of 10.
+				 */
+				*is_binary = 0;
+				*tsresol = 1;
+				for (i = 0; i < tsresol_opt; i++)
+					*tsresol *= 10;
+			}
+			if (*tsresol == 0) {
+				/*
+				 * Resolution is too high.
+				 */
+				if (tsresol_opt & 0x80) {
+					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+					    "Interface Description Block if_tsresol option resolution 2^-%u is too high",
+					    tsresol_opt & 0x7F);
+				} else {
+					pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+					    "Interface Description Block if_tsresol option resolution 10^-%u is too high",
+					    tsresol_opt);
+				}
+				return (-1);
+			}
+			break;
+
+		case IF_TSOFFSET:
+			if (opthdr->option_length != 8) {
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Interface Description Block has if_tsoffset option with length %u != 8",
+				    opthdr->option_length);
+				return (-1);
+			}
+			if (saw_tsoffset) {
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "Interface Description Block has more than one if_tsoffset option");
+				return (-1);
+			}
+			saw_tsoffset = 1;
+			memcpy(tsoffset, optvalue, sizeof(*tsoffset));
+			if (p->swapped)
+				*tsoffset = SWAPLL(*tsoffset);
+			break;
+
+		default:
+			break;
+		}
+	}
+
+done:
+	return (0);
+}
+
+static int
+add_interface(pcap_t *p, struct block_cursor *cursor, char *errbuf)
+{
+	struct pcap_ng_sf *ps;
+	u_int tsresol;
+	uint64_t tsoffset;
+	int is_binary;
+
+	ps = p->priv;
+
+	/*
+	 * Count this interface.
+	 */
+	ps->ifcount++;
+
+	/*
+	 * Grow the array of per-interface information as necessary.
+	 */
+	if (ps->ifcount > ps->ifaces_size) {
+		/*
+		 * We need to grow the array.
+		 */
+		bpf_u_int32 new_ifaces_size;
+		struct pcap_ng_if *new_ifaces;
+
+		if (ps->ifaces_size == 0) {
+			/*
+			 * It's currently empty.
+			 *
+			 * (The Clang static analyzer doesn't do enough,
+			 * err, umm, dataflow *analysis* to realize that
+			 * ps->ifaces_size == 0 if ps->ifaces == NULL,
+			 * and so complains about a possible zero argument
+			 * to realloc(), so we check for the former
+			 * condition to shut it up.
+			 *
+			 * However, it doesn't complain that one of the
+			 * multiplications below could overflow, which is
+			 * a real, albeit extremely unlikely, problem (you'd
+			 * need a pcapng file with tens of millions of
+			 * interfaces).)
+			 */
+			new_ifaces_size = 1;
+			new_ifaces = malloc(sizeof (struct pcap_ng_if));
+		} else {
+			/*
+			 * It's not currently empty; double its size.
+			 * (Perhaps overkill once we have a lot of interfaces.)
+			 *
+			 * Check for overflow if we double it.
+			 */
+			if (ps->ifaces_size * 2 < ps->ifaces_size) {
+				/*
+				 * The maximum number of interfaces before
+				 * ps->ifaces_size overflows is the largest
+				 * possible 32-bit power of 2, as we do
+				 * size doubling.
+				 */
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "more than %u interfaces in the file",
+				    0x80000000U);
+				return (0);
+			}
+
+			/*
+			 * ps->ifaces_size * 2 doesn't overflow, so it's
+			 * safe to multiply.
+			 */
+			new_ifaces_size = ps->ifaces_size * 2;
+
+			/*
+			 * Now make sure that's not so big that it overflows
+			 * if we multiply by sizeof (struct pcap_ng_if).
+			 *
+			 * That can happen on 32-bit platforms, with a 32-bit
+			 * size_t; it shouldn't happen on 64-bit platforms,
+			 * with a 64-bit size_t, as new_ifaces_size is
+			 * 32 bits.
+			 */
+			if (new_ifaces_size * sizeof (struct pcap_ng_if) < new_ifaces_size) {
+				/*
+				 * As this fails only with 32-bit size_t,
+				 * the multiplication was 32x32->32, and
+				 * the largest 32-bit value that can safely
+				 * be multiplied by sizeof (struct pcap_ng_if)
+				 * without overflow is the largest 32-bit
+				 * (unsigned) value divided by
+				 * sizeof (struct pcap_ng_if).
+				 */
+				pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+				    "more than %u interfaces in the file",
+				    0xFFFFFFFFU / ((u_int)sizeof (struct pcap_ng_if)));
+				return (0);
+			}
+			new_ifaces = realloc(ps->ifaces, new_ifaces_size * sizeof (struct pcap_ng_if));
+		}
+		if (new_ifaces == NULL) {
+			/*
+			 * We ran out of memory.
+			 * Give up.
+			 */
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "out of memory for per-interface information (%u interfaces)",
+			    ps->ifcount);
+			return (0);
+		}
+		ps->ifaces_size = new_ifaces_size;
+		ps->ifaces = new_ifaces;
+	}
+
+	/*
+	 * Set the default time stamp resolution and offset.
+	 */
+	tsresol = 1000000;	/* microsecond resolution */
+	is_binary = 0;		/* which is a power of 10 */
+	tsoffset = 0;		/* absolute timestamps */
+
+	/*
+	 * Now look for various time stamp options, so we know
+	 * how to interpret the time stamps for this interface.
+	 */
+	if (process_idb_options(p, cursor, &tsresol, &tsoffset, &is_binary,
+	    errbuf) == -1)
+		return (0);
+
+	ps->ifaces[ps->ifcount - 1].tsresol = tsresol;
+	ps->ifaces[ps->ifcount - 1].tsoffset = tsoffset;
+
+	/*
+	 * Determine whether we're scaling up or down or not
+	 * at all for this interface.
+	 */
+	if (tsresol == ps->user_tsresol) {
+		/*
+		 * The resolution is the resolution the user wants,
+		 * so we don't have to do scaling.
+		 */
+		ps->ifaces[ps->ifcount - 1].scale_type = PASS_THROUGH;
+	} else if (tsresol > ps->user_tsresol) {
+		/*
+		 * The resolution is greater than what the user wants,
+		 * so we have to scale the timestamps down.
+		 */
+		if (is_binary)
+			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_DOWN_BIN;
+		else {
+			/*
+			 * Calculate the scale factor.
+			 */
+			ps->ifaces[ps->ifcount - 1].scale_factor = tsresol/ps->user_tsresol;
+			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_DOWN_DEC;
+		}
+	} else {
+		/*
+		 * The resolution is less than what the user wants,
+		 * so we have to scale the timestamps up.
+		 */
+		if (is_binary)
+			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_UP_BIN;
+		else {
+			/*
+			 * Calculate the scale factor.
+			 */
+			ps->ifaces[ps->ifcount - 1].scale_factor = ps->user_tsresol/tsresol;
+			ps->ifaces[ps->ifcount - 1].scale_type = SCALE_UP_DEC;
+		}
+	}
+	return (1);
+}
+
+/*
+ * Check whether this is a pcapng savefile and, if it is, extract the
+ * relevant information from the header.
+ */
+pcap_t *
+pcap_ng_check_header(bpf_u_int32 magic, FILE *fp, u_int precision, char *errbuf,
+    int *err)
+{
+	size_t amt_read;
+	bpf_u_int32 total_length;
+	bpf_u_int32 byte_order_magic;
+	struct block_header *bhdrp;
+	struct section_header_block *shbp;
+	pcap_t *p;
+	int swapped = 0;
+	struct pcap_ng_sf *ps;
+	int status;
+	struct block_cursor cursor;
+	struct interface_description_block *idbp;
+
+	/*
+	 * Assume no read errors.
+	 */
+	*err = 0;
+
+	/*
+	 * Check whether the first 4 bytes of the file are the block
+	 * type for a pcapng savefile.
+	 */
+	if (magic != BT_SHB) {
+		/*
+		 * XXX - check whether this looks like what the block
+		 * type would be after being munged by mapping between
+		 * UN*X and DOS/Windows text file format and, if it
+		 * does, look for the byte-order magic number in
+		 * the appropriate place and, if we find it, report
+		 * this as possibly being a pcapng file transferred
+		 * between UN*X and Windows in text file format?
+		 */
+		return (NULL);	/* nope */
+	}
+
+	/*
+	 * OK, they are.  However, that's just \n\r\r\n, so it could,
+	 * conceivably, be an ordinary text file.
+	 *
+	 * It could not, however, conceivably be any other type of
+	 * capture file, so we can read the rest of the putative
+	 * Section Header Block; put the block type in the common
+	 * header, read the rest of the common header and the
+	 * fixed-length portion of the SHB, and look for the byte-order
+	 * magic value.
+	 */
+	amt_read = fread(&total_length, 1, sizeof(total_length), fp);
+	if (amt_read < sizeof(total_length)) {
+		if (ferror(fp)) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
+			*err = 1;
+			return (NULL);	/* fail */
+		}
+
+		/*
+		 * Possibly a weird short text file, so just say
+		 * "not pcapng".
+		 */
+		return (NULL);
+	}
+	amt_read = fread(&byte_order_magic, 1, sizeof(byte_order_magic), fp);
+	if (amt_read < sizeof(byte_order_magic)) {
+		if (ferror(fp)) {
+			pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+			    errno, "error reading dump file");
+			*err = 1;
+			return (NULL);	/* fail */
+		}
+
+		/*
+		 * Possibly a weird short text file, so just say
+		 * "not pcapng".
+		 */
+		return (NULL);
+	}
+	if (byte_order_magic != BYTE_ORDER_MAGIC) {
+		byte_order_magic = SWAPLONG(byte_order_magic);
+		if (byte_order_magic != BYTE_ORDER_MAGIC) {
+			/*
+			 * Not a pcapng file.
+			 */
+			return (NULL);
+		}
+		swapped = 1;
+		total_length = SWAPLONG(total_length);
+	}
+
+	/*
+	 * Check the sanity of the total length.
+	 */
+	if (total_length < sizeof(*bhdrp) + sizeof(*shbp) + sizeof(struct block_trailer)) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "Section Header Block in pcapng dump file has a length of %u < %lu",
+		    total_length,
+		    (unsigned long)(sizeof(*bhdrp) + sizeof(*shbp) + sizeof(struct block_trailer)));
+		*err = 1;
+		return (NULL);
+	}
+
+	/*
+	 * OK, this is a good pcapng file.
+	 * Allocate a pcap_t for it.
+	 */
+	p = pcap_open_offline_common(errbuf, sizeof (struct pcap_ng_sf));
+	if (p == NULL) {
+		/* Allocation failed. */
+		*err = 1;
+		return (NULL);
+	}
+	p->swapped = swapped;
+	ps = p->priv;
+
+	/*
+	 * What precision does the user want?
+	 */
+	switch (precision) {
+
+	case PCAP_TSTAMP_PRECISION_MICRO:
+		ps->user_tsresol = 1000000;
+		break;
+
+	case PCAP_TSTAMP_PRECISION_NANO:
+		ps->user_tsresol = 1000000000;
+		break;
+
+	default:
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "unknown time stamp resolution %u", precision);
+		free(p);
+		*err = 1;
+		return (NULL);
+	}
+
+	p->opt.tstamp_precision = precision;
+
+	/*
+	 * Allocate a buffer into which to read blocks.  We default to
+	 * the maximum of:
+	 *
+	 *	the total length of the SHB for which we read the header;
+	 *
+	 *	2K, which should be more than large enough for an Enhanced
+	 *	Packet Block containing a full-size Ethernet frame, and
+	 *	leaving room for some options.
+	 *
+	 * If we find a bigger block, we reallocate the buffer, up to
+	 * the maximum size.  We start out with a maximum size based
+	 * on a maximum snapshot length of MAXIMUM_SNAPLEN; if we see
+	 * any link-layer header types with a larger maximum snapshot
+	 * length, we boost the maximum.
+	 */
+	p->bufsize = 2048;
+	if (p->bufsize < total_length)
+		p->bufsize = total_length;
+	p->buffer = malloc(p->bufsize);
+	if (p->buffer == NULL) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory");
+		free(p);
+		*err = 1;
+		return (NULL);
+	}
+	ps->max_blocksize = MAX_BLOCKSIZE(MAXIMUM_SNAPLEN);
+
+	/*
+	 * Copy the stuff we've read to the buffer, and read the rest
+	 * of the SHB.
+	 */
+	bhdrp = (struct block_header *)p->buffer;
+	shbp = (struct section_header_block *)((u_char *)p->buffer + sizeof(struct block_header));
+	bhdrp->block_type = magic;
+	bhdrp->total_length = total_length;
+	shbp->byte_order_magic = byte_order_magic;
+	if (read_bytes(fp,
+	    (u_char *)p->buffer + (sizeof(magic) + sizeof(total_length) + sizeof(byte_order_magic)),
+	    total_length - (sizeof(magic) + sizeof(total_length) + sizeof(byte_order_magic)),
+	    1, errbuf) == -1)
+		goto fail;
+
+	if (p->swapped) {
+		/*
+		 * Byte-swap the fields we've read.
+		 */
+		shbp->major_version = SWAPSHORT(shbp->major_version);
+		shbp->minor_version = SWAPSHORT(shbp->minor_version);
+
+		/*
+		 * XXX - we don't care about the section length.
+		 */
+	}
+	/* currently only SHB version 1.0 is supported */
+	if (! (shbp->major_version == PCAP_NG_VERSION_MAJOR &&
+	       shbp->minor_version == PCAP_NG_VERSION_MINOR)) {
+		pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "unsupported pcapng savefile version %u.%u",
+		    shbp->major_version, shbp->minor_version);
+		goto fail;
+	}
+	p->version_major = shbp->major_version;
+	p->version_minor = shbp->minor_version;
+
+	/*
+	 * Save the time stamp resolution the user requested.
+	 */
+	p->opt.tstamp_precision = precision;
+
+	/*
+	 * Now start looking for an Interface Description Block.
+	 */
+	for (;;) {
+		/*
+		 * Read the next block.
+		 */
+		status = read_block(fp, p, &cursor, errbuf);
+		if (status == 0) {
+			/* EOF - no IDB in this file */
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "the capture file has no Interface Description Blocks");
+			goto fail;
+		}
+		if (status == -1)
+			goto fail;	/* error */
+		switch (cursor.block_type) {
+
+		case BT_IDB:
+			/*
+			 * Get a pointer to the fixed-length portion of the
+			 * IDB.
+			 */
+			idbp = get_from_block_data(&cursor, sizeof(*idbp),
+			    errbuf);
+			if (idbp == NULL)
+				goto fail;	/* error */
+
+			/*
+			 * Byte-swap it if necessary.
+			 */
+			if (p->swapped) {
+				idbp->linktype = SWAPSHORT(idbp->linktype);
+				idbp->snaplen = SWAPLONG(idbp->snaplen);
+			}
+
+			/*
+			 * Try to add this interface.
+			 */
+			if (!add_interface(p, &cursor, errbuf))
+				goto fail;
+
+			goto done;
+
+		case BT_EPB:
+		case BT_SPB:
+		case BT_PB:
+			/*
+			 * Saw a packet before we saw any IDBs.  That's
+			 * not valid, as we don't know what link-layer
+			 * encapsulation the packet has.
+			 */
+			pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+			    "the capture file has a packet block before any Interface Description Blocks");
+			goto fail;
+
+		default:
+			/*
+			 * Just ignore it.
+			 */
+			break;
+		}
+	}
+
+done:
+	p->tzoff = 0;	/* XXX - not used in pcap */
+	p->snapshot = idbp->snaplen;
+	if (p->snapshot <= 0) {
+		/*
+		 * Bogus snapshot length; use the maximum for this
+		 * link-layer type as a fallback.
+		 *
+		 * XXX - the only reason why snapshot is signed is
+		 * that pcap_snapshot() returns an int, not an
+		 * unsigned int.
+		 */
+		p->snapshot = max_snaplen_for_dlt(idbp->linktype);
+	}
+	p->linktype = linktype_to_dlt(idbp->linktype);
+	p->linktype_ext = 0;
+
+	/*
+	 * If the maximum block size for a packet with the maximum
+	 * snapshot length for this DLT_ is bigger than the current
+	 * maximum block size, increase the maximum.
+	 */
+	if (MAX_BLOCKSIZE(max_snaplen_for_dlt(p->linktype)) > ps->max_blocksize)
+		ps->max_blocksize = MAX_BLOCKSIZE(max_snaplen_for_dlt(p->linktype));
+
+	p->next_packet_op = pcap_ng_next_packet;
+	p->cleanup_op = pcap_ng_cleanup;
+
+	return (p);
+
+fail:
+	free(ps->ifaces);
+	free(p->buffer);
+	free(p);
+	*err = 1;
+	return (NULL);
+}
+
+static void
+pcap_ng_cleanup(pcap_t *p)
+{
+	struct pcap_ng_sf *ps = p->priv;
+
+	free(ps->ifaces);
+	sf_cleanup(p);
+}
+
+/*
+ * Read and return the next packet from the savefile.  Return the header
+ * in hdr and a pointer to the contents in data.  Return 0 on success, 1
+ * if there were no more packets, and -1 on an error.
+ */
+static int
+pcap_ng_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char **data)
+{
+	struct pcap_ng_sf *ps = p->priv;
+	struct block_cursor cursor;
+	int status;
+	struct enhanced_packet_block *epbp;
+	struct simple_packet_block *spbp;
+	struct packet_block *pbp;
+	bpf_u_int32 interface_id = 0xFFFFFFFF;
+	struct interface_description_block *idbp;
+	struct section_header_block *shbp;
+	FILE *fp = p->rfile;
+	uint64_t t, sec, frac;
+
+	/*
+	 * Look for an Enhanced Packet Block, a Simple Packet Block,
+	 * or a Packet Block.
+	 */
+	for (;;) {
+		/*
+		 * Read the block type and length; those are common
+		 * to all blocks.
+		 */
+		status = read_block(fp, p, &cursor, p->errbuf);
+		if (status == 0)
+			return (1);	/* EOF */
+		if (status == -1)
+			return (-1);	/* error */
+		switch (cursor.block_type) {
+
+		case BT_EPB:
+			/*
+			 * Get a pointer to the fixed-length portion of the
+			 * EPB.
+			 */
+			epbp = get_from_block_data(&cursor, sizeof(*epbp),
+			    p->errbuf);
+			if (epbp == NULL)
+				return (-1);	/* error */
+
+			/*
+			 * Byte-swap it if necessary.
+			 */
+			if (p->swapped) {
+				/* these were written in opposite byte order */
+				interface_id = SWAPLONG(epbp->interface_id);
+				hdr->caplen = SWAPLONG(epbp->caplen);
+				hdr->len = SWAPLONG(epbp->len);
+				t = ((uint64_t)SWAPLONG(epbp->timestamp_high)) << 32 |
+				    SWAPLONG(epbp->timestamp_low);
+			} else {
+				interface_id = epbp->interface_id;
+				hdr->caplen = epbp->caplen;
+				hdr->len = epbp->len;
+				t = ((uint64_t)epbp->timestamp_high) << 32 |
+				    epbp->timestamp_low;
+			}
+			goto found;
+
+		case BT_SPB:
+			/*
+			 * Get a pointer to the fixed-length portion of the
+			 * SPB.
+			 */
+			spbp = get_from_block_data(&cursor, sizeof(*spbp),
+			    p->errbuf);
+			if (spbp == NULL)
+				return (-1);	/* error */
+
+			/*
+			 * SPB packets are assumed to have arrived on
+			 * the first interface.
+			 */
+			interface_id = 0;
+
+			/*
+			 * Byte-swap it if necessary.
+			 */
+			if (p->swapped) {
+				/* these were written in opposite byte order */
+				hdr->len = SWAPLONG(spbp->len);
+			} else
+				hdr->len = spbp->len;
+
+			/*
+			 * The SPB doesn't give the captured length;
+			 * it's the minimum of the snapshot length
+			 * and the packet length.
+			 */
+			hdr->caplen = hdr->len;
+			if (hdr->caplen > (bpf_u_int32)p->snapshot)
+				hdr->caplen = p->snapshot;
+			t = 0;	/* no time stamps */
+			goto found;
+
+		case BT_PB:
+			/*
+			 * Get a pointer to the fixed-length portion of the
+			 * PB.
+			 */
+			pbp = get_from_block_data(&cursor, sizeof(*pbp),
+			    p->errbuf);
+			if (pbp == NULL)
+				return (-1);	/* error */
+
+			/*
+			 * Byte-swap it if necessary.
+			 */
+			if (p->swapped) {
+				/* these were written in opposite byte order */
+				interface_id = SWAPSHORT(pbp->interface_id);
+				hdr->caplen = SWAPLONG(pbp->caplen);
+				hdr->len = SWAPLONG(pbp->len);
+				t = ((uint64_t)SWAPLONG(pbp->timestamp_high)) << 32 |
+				    SWAPLONG(pbp->timestamp_low);
+			} else {
+				interface_id = pbp->interface_id;
+				hdr->caplen = pbp->caplen;
+				hdr->len = pbp->len;
+				t = ((uint64_t)pbp->timestamp_high) << 32 |
+				    pbp->timestamp_low;
+			}
+			goto found;
+
+		case BT_IDB:
+			/*
+			 * Interface Description Block.  Get a pointer
+			 * to its fixed-length portion.
+			 */
+			idbp = get_from_block_data(&cursor, sizeof(*idbp),
+			    p->errbuf);
+			if (idbp == NULL)
+				return (-1);	/* error */
+
+			/*
+			 * Byte-swap it if necessary.
+			 */
+			if (p->swapped) {
+				idbp->linktype = SWAPSHORT(idbp->linktype);
+				idbp->snaplen = SWAPLONG(idbp->snaplen);
+			}
+
+			/*
+			 * If the link-layer type or snapshot length
+			 * differ from the ones for the first IDB we
+			 * saw, quit.
+			 *
+			 * XXX - just discard packets from those
+			 * interfaces?
+			 */
+			if (p->linktype != idbp->linktype) {
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "an interface has a type %u different from the type of the first interface",
+				    idbp->linktype);
+				return (-1);
+			}
+			if ((bpf_u_int32)p->snapshot != idbp->snaplen) {
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "an interface has a snapshot length %u different from the type of the first interface",
+				    idbp->snaplen);
+				return (-1);
+			}
+
+			/*
+			 * Try to add this interface.
+			 */
+			if (!add_interface(p, &cursor, p->errbuf))
+				return (-1);
+			break;
+
+		case BT_SHB:
+			/*
+			 * Section Header Block.  Get a pointer
+			 * to its fixed-length portion.
+			 */
+			shbp = get_from_block_data(&cursor, sizeof(*shbp),
+			    p->errbuf);
+			if (shbp == NULL)
+				return (-1);	/* error */
+
+			/*
+			 * Assume the byte order of this section is
+			 * the same as that of the previous section.
+			 * We'll check for that later.
+			 */
+			if (p->swapped) {
+				shbp->byte_order_magic =
+				    SWAPLONG(shbp->byte_order_magic);
+				shbp->major_version =
+				    SWAPSHORT(shbp->major_version);
+			}
+
+			/*
+			 * Make sure the byte order doesn't change;
+			 * pcap_is_swapped() shouldn't change its
+			 * return value in the middle of reading a capture.
+			 */
+			switch (shbp->byte_order_magic) {
+
+			case BYTE_ORDER_MAGIC:
+				/*
+				 * OK.
+				 */
+				break;
+
+			case SWAPLONG(BYTE_ORDER_MAGIC):
+				/*
+				 * Byte order changes.
+				 */
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "the file has sections with different byte orders");
+				return (-1);
+
+			default:
+				/*
+				 * Not a valid SHB.
+				 */
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "the file has a section with a bad byte order magic field");
+				return (-1);
+			}
+
+			/*
+			 * Make sure the major version is the version
+			 * we handle.
+			 */
+			if (shbp->major_version != PCAP_NG_VERSION_MAJOR) {
+				pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+				    "unknown pcapng savefile major version number %u",
+				    shbp->major_version);
+				return (-1);
+			}
+
+			/*
+			 * Reset the interface count; this section should
+			 * have its own set of IDBs.  If any of them
+			 * don't have the same interface type, snapshot
+			 * length, or resolution as the first interface
+			 * we saw, we'll fail.  (And if we don't see
+			 * any IDBs, we'll fail when we see a packet
+			 * block.)
+			 */
+			ps->ifcount = 0;
+			break;
+
+		default:
+			/*
+			 * Not a packet block, IDB, or SHB; ignore it.
+			 */
+			break;
+		}
+	}
+
+found:
+	/*
+	 * Is the interface ID an interface we know?
+	 */
+	if (interface_id >= ps->ifcount) {
+		/*
+		 * Yes.  Fail.
+		 */
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "a packet arrived on interface %u, but there's no Interface Description Block for that interface",
+		    interface_id);
+		return (-1);
+	}
+
+	if (hdr->caplen > (bpf_u_int32)p->snapshot) {
+		pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+		    "invalid packet capture length %u, bigger than "
+		    "snaplen of %d", hdr->caplen, p->snapshot);
+		return (-1);
+	}
+
+	/*
+	 * Convert the time stamp to seconds and fractions of a second,
+	 * with the fractions being in units of the file-supplied resolution.
+	 */
+	sec = t / ps->ifaces[interface_id].tsresol + ps->ifaces[interface_id].tsoffset;
+	frac = t % ps->ifaces[interface_id].tsresol;
+
+	/*
+	 * Convert the fractions from units of the file-supplied resolution
+	 * to units of the user-requested resolution.
+	 */
+	switch (ps->ifaces[interface_id].scale_type) {
+
+	case PASS_THROUGH:
+		/*
+		 * The interface resolution is what the user wants,
+		 * so we're done.
+		 */
+		break;
+
+	case SCALE_UP_DEC:
+		/*
+		 * The interface resolution is less than what the user
+		 * wants; scale the fractional part up to the units of
+		 * the resolution the user requested by multiplying by
+		 * the quotient of the user-requested resolution and the
+		 * file-supplied resolution.
+		 *
+		 * Those resolutions are both powers of 10, and the user-
+		 * requested resolution is greater than the file-supplied
+		 * resolution, so the quotient in question is an integer.
+		 * We've calculated that quotient already, so we just
+		 * multiply by it.
+		 */
+		frac *= ps->ifaces[interface_id].scale_factor;
+		break;
+
+	case SCALE_UP_BIN:
+		/*
+		 * The interface resolution is less than what the user
+		 * wants; scale the fractional part up to the units of
+		 * the resolution the user requested by multiplying by
+		 * the quotient of the user-requested resolution and the
+		 * file-supplied resolution.
+		 *
+		 * The file-supplied resolution is a power of 2, so the
+		 * quotient is not an integer, so, in order to do this
+		 * entirely with integer arithmetic, we multiply by the
+		 * user-requested resolution and divide by the file-
+		 * supplied resolution.
+		 *
+		 * XXX - Is there something clever we could do here,
+		 * given that we know that the file-supplied resolution
+		 * is a power of 2?  Doing a multiplication followed by
+		 * a division runs the risk of overflowing, and involves
+		 * two non-simple arithmetic operations.
+		 */
+		frac *= ps->user_tsresol;
+		frac /= ps->ifaces[interface_id].tsresol;
+		break;
+
+	case SCALE_DOWN_DEC:
+		/*
+		 * The interface resolution is greater than what the user
+		 * wants; scale the fractional part up to the units of
+		 * the resolution the user requested by multiplying by
+		 * the quotient of the user-requested resolution and the
+		 * file-supplied resolution.
+		 *
+		 * Those resolutions are both powers of 10, and the user-
+		 * requested resolution is less than the file-supplied
+		 * resolution, so the quotient in question isn't an
+		 * integer, but its reciprocal is, and we can just divide
+		 * by the reciprocal of the quotient.  We've calculated
+		 * the reciprocal of that quotient already, so we must
+		 * divide by it.
+		 */
+		frac /= ps->ifaces[interface_id].scale_factor;
+		break;
+
+
+	case SCALE_DOWN_BIN:
+		/*
+		 * The interface resolution is greater than what the user
+		 * wants; convert the fractional part to units of the
+		 * resolution the user requested by multiplying by the
+		 * quotient of the user-requested resolution and the
+		 * file-supplied resolution.  We do that by multiplying
+		 * by the user-requested resolution and dividing by the
+		 * file-supplied resolution, as the quotient might not
+		 * fit in an integer.
+		 *
+		 * The file-supplied resolution is a power of 2, so the
+		 * quotient is not an integer, and neither is its
+		 * reciprocal, so, in order to do this entirely with
+		 * integer arithmetic, we multiply by the user-requested
+		 * resolution and divide by the file-supplied resolution.
+		 *
+		 * XXX - Is there something clever we could do here,
+		 * given that we know that the file-supplied resolution
+		 * is a power of 2?  Doing a multiplication followed by
+		 * a division runs the risk of overflowing, and involves
+		 * two non-simple arithmetic operations.
+		 */
+		frac *= ps->user_tsresol;
+		frac /= ps->ifaces[interface_id].tsresol;
+		break;
+	}
+#ifdef _WIN32
+	/*
+	 * tv_sec and tv_used in the Windows struct timeval are both
+	 * longs.
+	 */
+	hdr->ts.tv_sec = (long)sec;
+	hdr->ts.tv_usec = (long)frac;
+#else
+	/*
+	 * tv_sec in the UN*X struct timeval is a time_t; tv_usec is
+	 * suseconds_t in UN*Xes that work the way the current Single
+	 * UNIX Standard specify - but not all older UN*Xes necessarily
+	 * support that type, so just cast to int.
+	 */
+	hdr->ts.tv_sec = (time_t)sec;
+	hdr->ts.tv_usec = (int)frac;
+#endif
+
+	/*
+	 * Get a pointer to the packet data.
+	 */
+	*data = get_from_block_data(&cursor, hdr->caplen, p->errbuf);
+	if (*data == NULL)
+		return (-1);
+
+	if (p->swapped)
+		swap_pseudo_headers(p->linktype, hdr, *data);
+
+	return (0);
+}

Property changes on: vendor/libpcap/dist/sf-pcapng.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/sf-pcapng.h
===================================================================
--- vendor/libpcap/dist/sf-pcapng.h	(nonexistent)
+++ vendor/libpcap/dist/sf-pcapng.h	(revision 333789)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may 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.
+ *
+ * sf-pcapng.h - pcapng-file-format-specific routines
+ *
+ * Used to read pcapng savefiles.
+ */
+
+#ifndef sf_pcapng_h
+#define	sf_pcapng_h
+
+extern pcap_t *pcap_ng_check_header(bpf_u_int32 magic, FILE *fp,
+    u_int precision, char *errbuf, int *err);
+
+#endif

Property changes on: vendor/libpcap/dist/sf-pcapng.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/sockutils.c
===================================================================
--- vendor/libpcap/dist/sockutils.c	(revision 333788)
+++ vendor/libpcap/dist/sockutils.c	(revision 333789)
@@ -1,1230 +1,1489 @@
 /*
  * Copyright (c) 2002 - 2003
  * NetGroup, Politecnico di Torino (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the Politecnico di Torino nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /*
  * \file sockutils.c
  *
  * The goal of this file is to provide a common set of primitives for socket
  * manipulation.
  *
  * Although the socket interface defined in the RFC 2553 (and its updates)
  * is excellent, there are still differences between the behavior of those
  * routines on UN*X and Windows, and between UN*Xes.
  *
  * These calls provide an interface similar to the socket interface, but
  * that hides the differences between operating systems.  It does not
  * attempt to significantly improve on the socket interface in other
  * ways.
  */
 
-#include <string.h>	/* for strerror() */
+#include "ftmacros.h"
+
+#include <string.h>
 #include <errno.h>	/* for the errno variable */
 #include <stdio.h>	/* for the stderr file */
 #include <stdlib.h>	/* for malloc() and free() */
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
 #define INT_MAX		2147483647
 #endif
 
-#include "portability.h"
+#include "pcap-int.h"
+
 #include "sockutils.h"
+#include "portability.h"
 
 #ifdef _WIN32
   /*
    * Winsock initialization.
    *
    * Ask for WinSock 2.2.
    */
   #define WINSOCK_MAJOR_VERSION 2
   #define WINSOCK_MINOR_VERSION 2
 
   static int sockcount = 0;	/*!< Variable that allows calling the WSAStartup() only one time */
 #endif
 
 /* Some minor differences between UNIX and Win32 */
 #ifdef _WIN32
   #define SHUT_WR SD_SEND	/* The control code for shutdown() is different in Win32 */
 #endif
 
 /* Size of the buffer that has to keep error messages */
 #define SOCK_ERRBUF_SIZE 1024
 
 /* Constants; used in order to keep strings here */
 #define SOCKET_NO_NAME_AVAILABLE "No name available"
 #define SOCKET_NO_PORT_AVAILABLE "No port available"
 #define SOCKET_NAME_NULL_DAD "Null address (possibly DAD Phase)"
 
+/*
+ * On UN*X, send() and recv() return ssize_t.
+ *
+ * On Windows, send() and recv() return an int.
+ *
+ *   Wth MSVC, there *is* no ssize_t.
+ *
+ *   With MinGW, there is an ssize_t type; it is either an int (32 bit)
+ *   or a long long (64 bit). 
+ *
+ * So, on Windows, if we don't have ssize_t defined, define it as an
+ * int, so we can use it, on all platforms, as the type of variables
+ * that hold the return values from send() and recv().
+ */
+#if defined(_WIN32) && !defined(_SSIZE_T_DEFINED)
+typedef int ssize_t;
+#endif
+
 /****************************************************
  *                                                  *
  * Locally defined functions                        *
  *                                                  *
  ****************************************************/
 
 static int sock_ismcastaddr(const struct sockaddr *saddr);
 
 /****************************************************
  *                                                  *
  * Function bodies                                  *
  *                                                  *
  ****************************************************/
 
 /*
- * \brief It retrieves the error message after an error occurred in the socket interface.
- *
- * This function is defined because of the different way errors are returned in UNIX
- * and Win32. This function provides a consistent way to retrieve the error message
- * (after a socket error occurred) on all the platforms.
- *
- * \param caller: a pointer to a user-allocated string which contains a message that has
- * to be printed *before* the true error message. It could be, for example, 'this error
- * comes from the recv() call at line 31'. It may be NULL.
- *
- * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
- * error message. This buffer has to be at least 'errbuflen' in length.
- * It can be NULL; in this case the error cannot be printed.
- *
- * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
- * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
- *
- * \return No return values. The error message is returned in the 'string' parameter.
+ * Format an error message given an errno value (UN*X) or a WinSock error
+ * (Windows).
  */
-void sock_geterror(const char *caller, char *errbuf, int errbuflen)
+void sock_fmterror(const char *caller, int errcode, char *errbuf, int errbuflen)
 {
 #ifdef _WIN32
 	int retval;
-	int code;
 	TCHAR message[SOCK_ERRBUF_SIZE];	/* It will be char (if we're using ascii) or wchar_t (if we're using unicode) */
 
 	if (errbuf == NULL)
 		return;
 
-	code = GetLastError();
-
 	retval = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
 		FORMAT_MESSAGE_MAX_WIDTH_MASK,
-		NULL, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		NULL, errcode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		message, sizeof(message) / sizeof(TCHAR), NULL);
 
 	if (retval == 0)
 	{
 		if ((caller) && (*caller))
 			pcap_snprintf(errbuf, errbuflen, "%sUnable to get the exact error message", caller);
 		else
 			pcap_snprintf(errbuf, errbuflen, "Unable to get the exact error message");
-		return;
 	}
 	else
 	{
 		if ((caller) && (*caller))
-			pcap_snprintf(errbuf, errbuflen, "%s%s (code %d)", caller, message, code);
+			pcap_snprintf(errbuf, errbuflen, "%s%s (code %d)", caller, message, errcode);
 		else
-			pcap_snprintf(errbuf, errbuflen, "%s (code %d)", message, code);
+			pcap_snprintf(errbuf, errbuflen, "%s (code %d)", message, errcode);
 	}
 #else
 	char *message;
 
 	if (errbuf == NULL)
 		return;
 
-	message = strerror(errno);
+	message = strerror(errcode);
 
 	if ((caller) && (*caller))
-		pcap_snprintf(errbuf, errbuflen, "%s%s (code %d)", caller, message, errno);
+		pcap_snprintf(errbuf, errbuflen, "%s%s (code %d)", caller, message, errcode);
 	else
-		pcap_snprintf(errbuf, errbuflen, "%s (code %d)", message, errno);
+		pcap_snprintf(errbuf, errbuflen, "%s (code %d)", message, errcode);
 #endif
 }
 
 /*
+ * \brief It retrieves the error message after an error occurred in the socket interface.
+ *
+ * This function is defined because of the different way errors are returned in UNIX
+ * and Win32. This function provides a consistent way to retrieve the error message
+ * (after a socket error occurred) on all the platforms.
+ *
+ * \param caller: a pointer to a user-allocated string which contains a message that has
+ * to be printed *before* the true error message. It could be, for example, 'this error
+ * comes from the recv() call at line 31'. It may be NULL.
+ *
+ * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
+ * error message. This buffer has to be at least 'errbuflen' in length.
+ * It can be NULL; in this case the error cannot be printed.
+ *
+ * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
+ * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
+ *
+ * \return No return values. The error message is returned in the 'string' parameter.
+ */
+void sock_geterror(const char *caller, char *errbuf, int errbuflen)
+{
+#ifdef _WIN32
+	if (errbuf == NULL)
+		return;
+	sock_fmterror(caller, GetLastError(), errbuf, errbuflen);
+#else
+	if (errbuf == NULL)
+		return;
+	sock_fmterror(caller, errno, errbuf, errbuflen);
+#endif
+}
+
+/*
  * \brief It initializes sockets.
  *
  * This function is pretty useless on UNIX, since socket initialization is not required.
  * However it is required on Win32. In UNIX, this function appears to be completely empty.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
  * in the 'errbuf' variable.
  */
+#ifdef _WIN32
 int sock_init(char *errbuf, int errbuflen)
 {
-#ifdef _WIN32
 	if (sockcount == 0)
 	{
 		WSADATA wsaData;			/* helper variable needed to initialize Winsock */
 
 		if (WSAStartup(MAKEWORD(WINSOCK_MAJOR_VERSION,
 		    WINSOCK_MINOR_VERSION), &wsaData) != 0)
 		{
 			if (errbuf)
 				pcap_snprintf(errbuf, errbuflen, "Failed to initialize Winsock\n");
 
 			WSACleanup();
 
 			return -1;
 		}
 	}
 
 	sockcount++;
+#else
+int sock_init(char *errbuf _U_, int errbuflen _U_)
+{
 #endif
-
 	return 0;
 }
 
 /*
  * \brief It deallocates sockets.
  *
  * This function is pretty useless on UNIX, since socket deallocation is not required.
  * However it is required on Win32. In UNIX, this function appears to be completely empty.
  *
  * \return No error values.
  */
 void sock_cleanup(void)
 {
 #ifdef _WIN32
 	sockcount--;
 
 	if (sockcount == 0)
 		WSACleanup();
 #endif
 }
 
 /*
  * \brief It checks if the sockaddr variable contains a multicast address.
  *
  * \return '0' if the address is multicast, '-1' if it is not.
  */
 static int sock_ismcastaddr(const struct sockaddr *saddr)
 {
 	if (saddr->sa_family == PF_INET)
 	{
 		struct sockaddr_in *saddr4 = (struct sockaddr_in *) saddr;
 		if (IN_MULTICAST(ntohl(saddr4->sin_addr.s_addr))) return 0;
 		else return -1;
 	}
 	else
 	{
 		struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) saddr;
 		if (IN6_IS_ADDR_MULTICAST(&saddr6->sin6_addr)) return 0;
 		else return -1;
 	}
 }
 
 /*
  * \brief It initializes a network connection both from the client and the server side.
  *
  * In case of a client socket, this function calls socket() and connect().
  * In the meanwhile, it checks for any socket error.
  * If an error occurs, it writes the error message into 'errbuf'.
  *
  * In case of a server socket, the function calls socket(), bind() and listen().
  *
  * This function is usually preceeded by the sock_initaddress().
  *
  * \param addrinfo: pointer to an addrinfo variable which will be used to
  * open the socket and such. This variable is the one returned by the previous call to
  * sock_initaddress().
  *
  * \param server: '1' if this is a server socket, '0' otherwise.
  *
  * \param nconn: number of the connections that are allowed to wait into the listen() call.
  * This value has no meanings in case of a client socket.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return the socket that has been opened (that has to be used in the following sockets calls)
- * if everything is fine, '0' if some errors occurred. The error message is returned
+ * if everything is fine, INVALID_SOCKET if some errors occurred. The error message is returned
  * in the 'errbuf' variable.
  */
 SOCKET sock_open(struct addrinfo *addrinfo, int server, int nconn, char *errbuf, int errbuflen)
 {
 	SOCKET sock;
+#if defined(SO_NOSIGPIPE) || defined(IPV6_V6ONLY) || defined(IPV6_BINDV6ONLY)
+	int on = 1;
+#endif
 
 	sock = socket(addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol);
-	if (sock == -1)
+	if (sock == INVALID_SOCKET)
 	{
 		sock_geterror("socket(): ", errbuf, errbuflen);
-		return -1;
+		return INVALID_SOCKET;
 	}
 
+	/*
+	 * Disable SIGPIPE, if we have SO_NOSIGPIPE.  We don't want to
+	 * have to deal with signals if the peer closes the connection,
+	 * especially in client programs, which may not even be aware that
+	 * they're sending to sockets.
+	 */
+#ifdef SO_NOSIGPIPE
+	if (setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (char *)&on,
+	    sizeof (int)) == -1)
+	{
+		sock_geterror("setsockopt(SO_NOSIGPIPE)", errbuf, errbuflen);
+		closesocket(sock);
+		return INVALID_SOCKET;
+	}
+#endif
 
 	/* This is a server socket */
 	if (server)
 	{
-#ifdef BSD
+#if defined(IPV6_V6ONLY) || defined(IPV6_BINDV6ONLY)
 		/*
-		 * Force the use of IPv6-only addresses; in BSD you can accept both v4 and v6
-		 * connections if you have a "NULL" pointer as the nodename in the getaddrinfo()
-		 * This behavior is not clear in the RFC 2553, so each system implements the
-		 * bind() differently from this point of view
+		 * Force the use of IPv6-only addresses.
+		 *
+		 * RFC 3493 indicates that you can support IPv4 on an
+		 * IPv6 socket:
+		 *
+		 *    https://tools.ietf.org/html/rfc3493#section-3.7
+		 *
+		 * and that this is the default behavior.  This means
+		 * that if we first create an IPv6 socket bound to the
+		 * "any" address, it is, in effect, also bound to the
+		 * IPv4 "any" address, so when we create an IPv4 socket
+		 * and try to bind it to the IPv4 "any" address, it gets
+		 * EADDRINUSE.
+		 *
+		 * Not all network stacks support IPv4 on IPv6 sockets;
+		 * pre-NT 6 Windows stacks don't support it, and the
+		 * OpenBSD stack doesn't support it for security reasons
+		 * (see the OpenBSD inet6(4) man page).  Therefore, we
+		 * don't want to rely on this behavior.
+		 *
+		 * So we try to disable it, using either the IPV6_V6ONLY
+		 * option from RFC 3493:
+		 *
+		 *    https://tools.ietf.org/html/rfc3493#section-5.3
+		 *
+		 * or the IPV6_BINDV6ONLY option from older UN*Xes.
 		 */
+#ifndef IPV6_V6ONLY
+  /* For older systems */
+  #define IPV6_V6ONLY IPV6_BINDV6ONLY
+#endif /* IPV6_V6ONLY */
 		if (addrinfo->ai_family == PF_INET6)
 		{
-			int on;
-
-			if (setsockopt(sock, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (int)) == -1)
+			if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+			    (char *)&on, sizeof (int)) == -1)
 			{
 				if (errbuf)
-					pcap_snprintf(errbuf, errbuflen, "setsockopt(IPV6_BINDV6ONLY)");
-				return -1;
+					pcap_snprintf(errbuf, errbuflen, "setsockopt(IPV6_V6ONLY)");
+				closesocket(sock);
+				return INVALID_SOCKET;
 			}
 		}
-#endif
+#endif /* defined(IPV6_V6ONLY) || defined(IPV6_BINDV6ONLY) */
 
 		/* WARNING: if the address is a mcast one, I should place the proper Win32 code here */
 		if (bind(sock, addrinfo->ai_addr, (int) addrinfo->ai_addrlen) != 0)
 		{
 			sock_geterror("bind(): ", errbuf, errbuflen);
-			return -1;
+			closesocket(sock);
+			return INVALID_SOCKET;
 		}
 
 		if (addrinfo->ai_socktype == SOCK_STREAM)
 			if (listen(sock, nconn) == -1)
 			{
 				sock_geterror("listen(): ", errbuf, errbuflen);
-				return -1;
+				closesocket(sock);
+				return INVALID_SOCKET;
 			}
 
 		/* server side ended */
 		return sock;
 	}
 	else	/* we're the client */
 	{
 		struct addrinfo *tempaddrinfo;
 		char *errbufptr;
 		size_t bufspaceleft;
 
 		tempaddrinfo = addrinfo;
 		errbufptr = errbuf;
 		bufspaceleft = errbuflen;
 		*errbufptr = 0;
 
 		/*
 		 * We have to loop though all the addinfo returned.
 		 * For instance, we can have both IPv6 and IPv4 addresses, but the service we're trying
 		 * to connect to is unavailable in IPv6, so we have to try in IPv4 as well
 		 */
 		while (tempaddrinfo)
 		{
 
 			if (connect(sock, tempaddrinfo->ai_addr, (int) tempaddrinfo->ai_addrlen) == -1)
 			{
 				size_t msglen;
 				char TmpBuffer[100];
 				char SocketErrorMessage[SOCK_ERRBUF_SIZE];
 
 				/*
 				 * We have to retrieve the error message before any other socket call completes, otherwise
 				 * the error message is lost
 				 */
 				sock_geterror(NULL, SocketErrorMessage, sizeof(SocketErrorMessage));
 
 				/* Returns the numeric address of the host that triggered the error */
 				sock_getascii_addrport((struct sockaddr_storage *) tempaddrinfo->ai_addr, TmpBuffer, sizeof(TmpBuffer), NULL, 0, NI_NUMERICHOST, TmpBuffer, sizeof(TmpBuffer));
 
 				pcap_snprintf(errbufptr, bufspaceleft,
 				    "Is the server properly installed on %s?  connect() failed: %s", TmpBuffer, SocketErrorMessage);
 
 				/* In case more then one 'connect' fails, we manage to keep all the error messages */
 				msglen = strlen(errbufptr);
 
 				errbufptr[msglen] = ' ';
 				errbufptr[msglen + 1] = 0;
 
 				bufspaceleft = bufspaceleft - (msglen + 1);
 				errbufptr += (msglen + 1);
 
 				tempaddrinfo = tempaddrinfo->ai_next;
 			}
 			else
 				break;
 		}
 
 		/*
 		 * Check how we exit from the previous loop
 		 * If tempaddrinfo is equal to NULL, it means that all the connect() failed.
 		 */
 		if (tempaddrinfo == NULL)
 		{
 			closesocket(sock);
-			return -1;
+			return INVALID_SOCKET;
 		}
 		else
 			return sock;
 	}
 }
 
 /*
  * \brief Closes the present (TCP and UDP) socket connection.
  *
  * This function sends a shutdown() on the socket in order to disable send() calls
  * (while recv() ones are still allowed). Then, it closes the socket.
  *
  * \param sock: the socket identifier of the connection that has to be closed.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
  * in the 'errbuf' variable.
  */
 int sock_close(SOCKET sock, char *errbuf, int errbuflen)
 {
 	/*
 	 * SHUT_WR: subsequent calls to the send function are disallowed.
 	 * For TCP sockets, a FIN will be sent after all data is sent and
 	 * acknowledged by the Server.
 	 */
 	if (shutdown(sock, SHUT_WR))
 	{
 		sock_geterror("shutdown(): ", errbuf, errbuflen);
 		/* close the socket anyway */
 		closesocket(sock);
 		return -1;
 	}
 
 	closesocket(sock);
 	return 0;
 }
 
 /*
  * \brief Checks that the address, port and flags given are valids and it returns an 'addrinfo' structure.
  *
  * This function basically calls the getaddrinfo() calls, and it performs a set of sanity checks
  * to control that everything is fine (e.g. a TCP socket cannot have a mcast address, and such).
  * If an error occurs, it writes the error message into 'errbuf'.
  *
  * \param host: a pointer to a string identifying the host. It can be
  * a host name, a numeric literal address, or NULL or "" (useful
  * in case of a server socket which has to bind to all addresses).
  *
  * \param port: a pointer to a user-allocated buffer containing the network port to use.
  *
  * \param hints: an addrinfo variable (passed by reference) containing the flags needed to create the
  * addrinfo structure appropriately.
  *
  * \param addrinfo: it represents the true returning value. This is a pointer to an addrinfo variable
  * (passed by reference), which will be allocated by this function and returned back to the caller.
  * This variable will be used in the next sockets calls.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
  * in the 'errbuf' variable. The addrinfo variable that has to be used in the following sockets calls is
  * returned into the addrinfo parameter.
  *
  * \warning The 'addrinfo' variable has to be deleted by the programmer by calling freeaddrinfo() when
  * it is no longer needed.
  *
  * \warning This function requires the 'hints' variable as parameter. The semantic of this variable is the same
  * of the one of the corresponding variable used into the standard getaddrinfo() socket function. We suggest
  * the programmer to look at that function in order to set the 'hints' variable appropriately.
  */
 int sock_initaddress(const char *host, const char *port,
     struct addrinfo *hints, struct addrinfo **addrinfo, char *errbuf, int errbuflen)
 {
 	int retval;
 
 	retval = getaddrinfo(host, port, hints, addrinfo);
 	if (retval != 0)
 	{
 		/*
 		 * if the getaddrinfo() fails, you have to use gai_strerror(), instead of using the standard
 		 * error routines (errno) in UNIX; Winsock suggests using the GetLastError() instead.
 		 */
 		if (errbuf)
 		{
 #ifdef _WIN32
 			sock_geterror("getaddrinfo(): ", errbuf, errbuflen);
 #else
 			pcap_snprintf(errbuf, errbuflen, "getaddrinfo() %s", gai_strerror(retval));
 #endif
 		}
 		return -1;
 	}
 	/*
 	 * \warning SOCKET: I should check all the accept() in order to bind to all addresses in case
 	 * addrinfo has more han one pointers
 	 */
 
 	/*
 	 * This software only supports PF_INET and PF_INET6.
 	 *
 	 * XXX - should we just check that at least *one* address is
 	 * either PF_INET or PF_INET6, and, when using the list,
 	 * ignore all addresses that are neither?  (What, no IPX
 	 * support? :-))
 	 */
 	if (((*addrinfo)->ai_family != PF_INET) &&
 	    ((*addrinfo)->ai_family != PF_INET6))
 	{
 		if (errbuf)
 			pcap_snprintf(errbuf, errbuflen, "getaddrinfo(): socket type not supported");
+		freeaddrinfo(*addrinfo);
+		*addrinfo = NULL;
 		return -1;
 	}
 
 	/*
 	 * You can't do multicast (or broadcast) TCP.
 	 */
 	if (((*addrinfo)->ai_socktype == SOCK_STREAM) &&
 	    (sock_ismcastaddr((*addrinfo)->ai_addr) == 0))
 	{
 		if (errbuf)
 			pcap_snprintf(errbuf, errbuflen, "getaddrinfo(): multicast addresses are not valid when using TCP streams");
+		freeaddrinfo(*addrinfo);
+		*addrinfo = NULL;
 		return -1;
 	}
 
 	return 0;
 }
 
 /*
  * \brief It sends the amount of data contained into 'buffer' on the given socket.
  *
  * This function basically calls the send() socket function and it checks that all
  * the data specified in 'buffer' (of size 'size') will be sent. If an error occurs,
  * it writes the error message into 'errbuf'.
  * In case the socket buffer does not have enough space, it loops until all data
  * has been sent.
  *
  * \param socket: the connected socket currently opened.
  *
  * \param buffer: a char pointer to a user-allocated buffer in which data is contained.
  *
  * \param size: number of bytes that have to be sent.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
- * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
- * in the 'errbuf' variable.
+ * \return '0' if everything is fine, '-1' if an error other than
+ * "connection reset" or "peer has closed the receive side" occurred,
+ * '-2' if we got one of those errors.
+ * For errors, an error message is returned in the 'errbuf' variable.
  */
-int sock_send(SOCKET socket, const char *buffer, int size, char *errbuf, int errbuflen)
+int sock_send(SOCKET sock, const char *buffer, size_t size,
+    char *errbuf, int errbuflen)
 {
-	int nsent;
+	int remaining;
+	ssize_t nsent;
 
-send:
-#ifdef linux
-	/*
-	 * Another pain... in Linux there's this flag
-	 * MSG_NOSIGNAL
-	 * Requests not to send SIGPIPE on errors on stream-oriented
-	 * sockets when the other end breaks the connection.
-	 * The EPIPE error is still returned.
-	 */
-	nsent = send(socket, buffer, size, MSG_NOSIGNAL);
-#else
-	nsent = send(socket, buffer, size, 0);
-#endif
-
-	if (nsent == -1)
+	if (size > INT_MAX)
 	{
-		sock_geterror("send(): ", errbuf, errbuflen);
+		if (errbuf)
+		{
+			pcap_snprintf(errbuf, errbuflen,
+			    "Can't send more than %u bytes with sock_recv",
+			    INT_MAX);
+		}
 		return -1;
 	}
+	remaining = (int)size;
 
-	if (nsent != size)
-	{
-		size -= nsent;
+	do {
+#ifdef MSG_NOSIGNAL
+		/*
+		 * Send with MSG_NOSIGNAL, so that we don't get SIGPIPE
+		 * on errors on stream-oriented sockets when the other
+		 * end breaks the connection.
+		 * The EPIPE error is still returned.
+		 */
+		nsent = send(sock, buffer, remaining, MSG_NOSIGNAL);
+#else
+		nsent = send(sock, buffer, remaining, 0);
+#endif
+
+		if (nsent == -1)
+		{
+			/*
+			 * If the client closed the connection out from
+			 * under us, there's no need to log that as an
+			 * error.
+			 */
+			int errcode;
+
+#ifdef _WIN32
+			errcode = GetLastError();
+			if (errcode == WSAECONNRESET ||
+			    errcode == WSAECONNABORTED)
+			{
+				/*
+				 * WSAECONNABORTED appears to be the error
+				 * returned in Winsock when you try to send
+				 * on a connection where the peer has closed
+				 * the receive side.
+				 */
+				return -2;
+			}
+			sock_fmterror("send(): ", errcode, errbuf, errbuflen);
+#else
+			errcode = errno;
+			if (errcode == ECONNRESET || errcode == EPIPE)
+			{
+				/*
+				 * EPIPE is what's returned on UN*X when
+				 * you try to send on a connection when
+				 * the peer has closed the receive side.
+				 */
+				return -2;
+			}
+			sock_fmterror("send(): ", errcode, errbuf, errbuflen);
+#endif
+			return -1;
+		}
+
+		remaining -= nsent;
 		buffer += nsent;
-		goto send;
-	}
+	} while (remaining != 0);
 
 	return 0;
 }
 
 /*
  * \brief It copies the amount of data contained into 'buffer' into 'tempbuf'.
  * and it checks for buffer overflows.
  *
  * This function basically copies 'size' bytes of data contained into 'buffer'
  * into 'tempbuf', starting at offset 'offset'. Before that, it checks that the
  * resulting buffer will not be larger	than 'totsize'. Finally, it updates
  * the 'offset' variable in order to point to the first empty location of the buffer.
  *
  * In case the function is called with 'checkonly' equal to 1, it does not copy
  * the data into the buffer. It only checks for buffer overflows and it updates the
  * 'offset' variable. This mode can be useful when the buffer already contains the
  * data (maybe because the producer writes directly into the target buffer), so
  * only the buffer overflow check has to be made.
  * In this case, both 'buffer' and 'tempbuf' can be NULL values.
  *
  * This function is useful in case the userland application does not know immediately
  * all the data it has to write into the socket. This function provides a way to create
  * the "stream" step by step, appending the new data to the old one. Then, when all the
  * data has been bufferized, the application can call the sock_send() function.
  *
  * \param buffer: a char pointer to a user-allocated buffer that keeps the data
  * that has to be copied.
  *
  * \param size: number of bytes that have to be copied.
  *
  * \param tempbuf: user-allocated buffer (of size 'totsize') in which data
  * has to be copied.
  *
  * \param offset: an index into 'tempbuf' which keeps the location of its first
  * empty location.
  *
  * \param totsize: total size of the buffer in which data is being copied.
  *
  * \param checkonly: '1' if we do not want to copy data into the buffer and we
  * want just do a buffer ovreflow control, '0' if data has to be copied as well.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '0' if everything is fine, '-1' if some errors occurred. The error message
  * is returned in the 'errbuf' variable. When the function returns, 'tempbuf' will
  * have the new string appended, and 'offset' will keep the length of that buffer.
  * In case of 'checkonly == 1', data is not copied, but 'offset' is updated in any case.
  *
  * \warning This function assumes that the buffer in which data has to be stored is
  * large 'totbuf' bytes.
  *
  * \warning In case of 'checkonly', be carefully to call this function *before* copying
  * the data into the buffer. Otherwise, the control about the buffer overflow is useless.
  */
 int sock_bufferize(const char *buffer, int size, char *tempbuf, int *offset, int totsize, int checkonly, char *errbuf, int errbuflen)
 {
 	if ((*offset + size) > totsize)
 	{
 		if (errbuf)
 			pcap_snprintf(errbuf, errbuflen, "Not enough space in the temporary send buffer.");
 		return -1;
 	}
 
 	if (!checkonly)
 		memcpy(tempbuf + (*offset), buffer, size);
 
 	(*offset) += size;
 
 	return 0;
 }
 
 /*
  * \brief It waits on a connected socket and it manages to receive data.
  *
  * This function basically calls the recv() socket function and it checks that no
  * error occurred. If that happens, it writes the error message into 'errbuf'.
  *
  * This function changes its behavior according to the 'receiveall' flag: if we
  * want to receive exactly 'size' byte, it loops on the recv()	until all the requested
  * data is arrived. Otherwise, it returns the data currently available.
  *
  * In case the socket does not have enough data available, it cycles on the recv()
  * until the requested data (of size 'size') is arrived.
  * In this case, it blocks until the number of bytes read is equal to 'size'.
  *
  * \param sock: the connected socket currently opened.
  *
  * \param buffer: a char pointer to a user-allocated buffer in which data has to be stored
  *
  * \param size: size of the allocated buffer. WARNING: this indicates the number of bytes
  * that we are expecting to be read.
  *
- * \param receiveall: if '0' (or SOCK_RECEIVEALL_NO), it returns as soon as some data
- * is ready; otherwise, (or SOCK_RECEIVEALL_YES) it waits until 'size' data has been
- * received (in case the socket does not have enough data available).
+ * \param flags:
  *
+ *   SOCK_RECEIVALL_XXX:
+ *
+ * 	if SOCK_RECEIVEALL_NO, return as soon as some data is ready
+ *	if SOCK_RECEIVALL_YES, wait until 'size' data has been
+ *	    received (in case the socket does not have enough data available).
+ *
+ *   SOCK_EOF_XXX:
+ *
+ *	if SOCK_EOF_ISNT_ERROR, if the first read returns 0, just return 0,
+ *	    and return an error on any subsequent read that returns 0;
+ *	if SOCK_EOF_IS_ERROR, if any read returns 0, return an error.
+ *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return the number of bytes read if everything is fine, '-1' if some errors occurred.
  * The error message is returned in the 'errbuf' variable.
  */
 
-/*
- * On UN*X, recv() returns ssize_t.
- * On Windows, there *is* no ssize_t, and it returns an int.
- * Define ssize_t as int on Windows so we can use it as the return value
- * from recv().
- */
-#ifdef _WIN32
-typedef int ssize_t;
-#endif
-
-int sock_recv(SOCKET sock, void *buffer, size_t size, int receiveall,
+int sock_recv(SOCKET sock, void *buffer, size_t size, int flags,
     char *errbuf, int errbuflen)
 {
 	char *bufp = buffer;
 	int remaining;
 	ssize_t nread;
 
 	if (size == 0)
 	{
-		SOCK_ASSERT("I have been requested to read zero bytes", 1);
+		SOCK_DEBUG_MESSAGE("I have been requested to read zero bytes");
 		return 0;
 	}
 	if (size > INT_MAX)
 	{
-		pcap_snprintf(errbuf, errbuflen, "Can't read more than %u bytes with sock_recv",
-		    INT_MAX);
+		if (errbuf)
+		{
+			pcap_snprintf(errbuf, errbuflen,
+			    "Can't read more than %u bytes with sock_recv",
+			    INT_MAX);
+		}
 		return -1;
 	}
 
 	bufp = (char *) buffer;
 	remaining = (int) size;
 
 	/*
 	 * We don't use MSG_WAITALL because it's not supported in
 	 * Win32.
 	 */
 	for (;;) {
 		nread = recv(sock, bufp, remaining, 0);
 
 		if (nread == -1)
 		{
 #ifndef _WIN32
 			if (errno == EINTR)
 				return -3;
 #endif
 			sock_geterror("recv(): ", errbuf, errbuflen);
 			return -1;
 		}
 
 		if (nread == 0)
 		{
-			if (errbuf)
+			if ((flags & SOCK_EOF_IS_ERROR) ||
+			    (remaining != (int) size))
 			{
-				pcap_snprintf(errbuf, errbuflen,
-				    "The other host terminated the connection.");
+				/*
+				 * Either we've already read some data,
+				 * or we're always supposed to return
+				 * an error on EOF.
+				 */
+				if (errbuf)
+				{
+					pcap_snprintf(errbuf, errbuflen,
+					    "The other host terminated the connection.");
+				}
+				return -1;
 			}
-			return -1;
+			else
+				return 0;
 		}
 
 		/*
 		 * Do we want to read the amount requested, or just return
 		 * what we got?
 		 */
-		if (!receiveall)
+		if (!(flags & SOCK_RECEIVEALL_YES))
 		{
 			/*
 			 * Just return what we got.
 			 */
 			return (int) nread;
 		}
 
 		bufp += nread;
 		remaining -= nread;
 
 		if (remaining == 0)
 			return (int) size;
 	}
 }
 
 /*
+ * Receives a datagram from a socket.
+ *
+ * Returns the size of the datagram on success or -1 on error.
+ */
+int sock_recv_dgram(SOCKET sock, void *buffer, size_t size,
+    char *errbuf, int errbuflen)
+{
+	ssize_t nread;
+#ifndef _WIN32
+	struct msghdr message;
+	struct iovec iov;
+#endif
+
+	if (size == 0)
+	{
+		SOCK_DEBUG_MESSAGE("I have been requested to read zero bytes");
+		return 0;
+	}
+	if (size > INT_MAX)
+	{
+		if (errbuf)
+		{
+			pcap_snprintf(errbuf, errbuflen,
+			    "Can't read more than %u bytes with sock_recv_dgram",
+			    INT_MAX);
+		}
+		return -1;
+	}
+
+	/*
+	 * This should be a datagram socket, so we should get the
+	 * entire datagram in one recv() or recvmsg() call, and
+	 * don't need to loop.
+	 */
+#ifdef _WIN32
+	nread = recv(sock, buffer, size, 0);
+	if (nread == SOCKET_ERROR)
+	{
+		/*
+		 * To quote the MSDN documentation for recv(),
+		 * "If the datagram or message is larger than
+		 * the buffer specified, the buffer is filled
+		 * with the first part of the datagram, and recv
+		 * generates the error WSAEMSGSIZE. For unreliable
+		 * protocols (for example, UDP) the excess data is
+		 * lost..."
+		 *
+		 * So if the message is bigger than the buffer
+		 * supplied to us, the excess data is discarded,
+		 * and we'll report an error.
+		 */
+		sock_geterror("recv(): ", errbuf, errbuflen);
+		return -1;
+	}
+#else /* _WIN32 */
+	/*
+	 * The Single UNIX Specification says that a recv() on
+	 * a socket for a message-oriented protocol will discard
+	 * the excess data.  It does *not* indicate that the
+	 * receive will fail with, for example, EMSGSIZE.
+	 *
+	 * Therefore, we use recvmsg(), which appears to be
+	 * the only way to get a "message truncated" indication
+	 * when receiving a message for a message-oriented
+	 * protocol.
+	 */
+	message.msg_name = NULL;	/* we don't care who it's from */
+	message.msg_namelen = 0;
+	iov.iov_base = buffer;
+	iov.iov_len = size;
+	message.msg_iov = &iov;
+	message.msg_iovlen = 1;
+#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+	message.msg_control = NULL;	/* we don't care about control information */
+	message.msg_controllen = 0;
+#endif
+#ifdef HAVE_STRUCT_MSGHDR_MSG_FLAGS
+	message.msg_flags = 0;
+#endif
+	nread = recvmsg(sock, &message, 0);
+	if (nread == -1)
+	{
+		if (errno == EINTR)
+			return -3;
+		sock_geterror("recv(): ", errbuf, errbuflen);
+		return -1;
+	}
+#ifdef HAVE_STRUCT_MSGHDR_MSG_FLAGS
+	/*
+	 * XXX - Solaris supports this, but only if you ask for the
+	 * X/Open version of recvmsg(); should we use that, or will
+	 * that cause other problems?
+	 */
+	if (message.msg_flags & MSG_TRUNC)
+	{
+		/*
+		 * Message was bigger than the specified buffer size.
+		 *
+		 * Report this as an error, as the Microsoft documentation
+		 * implies we'd do in a similar case on Windows.
+		 */
+		pcap_snprintf(errbuf, errbuflen, "recv(): Message too long");
+		return -1;
+	}
+#endif /* HAVE_STRUCT_MSGHDR_MSG_FLAGS */
+#endif /* _WIN32 */
+
+	/*
+	 * The size we're reading fits in an int, so the return value
+	 * will fit in an int.
+	 */
+	return (int)nread;
+}
+
+/*
  * \brief It discards N bytes that are currently waiting to be read on the current socket.
  *
  * This function is useful in case we receive a message we cannot understand (e.g.
  * wrong version number when receiving a network packet), so that we have to discard all
  * data before reading a new message.
  *
  * This function will read 'size' bytes from the socket and discard them.
  * It defines an internal buffer in which data will be copied; however, in case
  * this buffer is not large enough, it will cycle in order to read everything as well.
  *
  * \param sock: the connected socket currently opened.
  *
  * \param size: number of bytes that have to be discarded.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '0' if everything is fine, '-1' if some errors occurred.
  * The error message is returned in the 'errbuf' variable.
  */
 int sock_discard(SOCKET sock, int size, char *errbuf, int errbuflen)
 {
 #define TEMP_BUF_SIZE 32768
 
 	char buffer[TEMP_BUF_SIZE];		/* network buffer, to be used when the message is discarded */
 
 	/*
 	 * A static allocation avoids the need of a 'malloc()' each time we want to discard a message
 	 * Our feeling is that a buffer if 32KB is enough for most of the application;
 	 * in case this is not enough, the "while" loop discards the message by calling the
 	 * sockrecv() several times.
 	 * We do not want to create a bigger variable because this causes the program to exit on
 	 * some platforms (e.g. BSD)
 	 */
 	while (size > TEMP_BUF_SIZE)
 	{
 		if (sock_recv(sock, buffer, TEMP_BUF_SIZE, SOCK_RECEIVEALL_YES, errbuf, errbuflen) == -1)
 			return -1;
 
 		size -= TEMP_BUF_SIZE;
 	}
 
 	/*
 	 * If there is still data to be discarded
 	 * In this case, the data can fit into the temporary buffer
 	 */
 	if (size)
 	{
 		if (sock_recv(sock, buffer, size, SOCK_RECEIVEALL_YES, errbuf, errbuflen) == -1)
 			return -1;
 	}
 
-	SOCK_ASSERT("I'm currently discarding data\n", 1);
+	SOCK_DEBUG_MESSAGE("I'm currently discarding data\n");
 
 	return 0;
 }
 
 /*
  * \brief Checks that one host (identified by the sockaddr_storage structure) belongs to an 'allowed list'.
  *
  * This function is useful after an accept() call in order to check if the connecting
  * host is allowed to connect to me. To do that, we have a buffer that keeps the list of the
  * allowed host; this function checks the sockaddr_storage structure of the connecting host
  * against this host list, and it returns '0' is the host is included in this list.
  *
  * \param hostlist: pointer to a string that contains the list of the allowed host.
  *
  * \param sep: a string that keeps the separators used between the hosts (for example the
  * space character) in the host list.
  *
  * \param from: a sockaddr_storage structure, as it is returned by the accept() call.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return It returns:
  * - '1' if the host list is empty
  * - '0' if the host belongs to the host list (and therefore it is allowed to connect)
  * - '-1' in case the host does not belong to the host list (and therefore it is not allowed to connect
  * - '-2' in case or error. The error message is returned in the 'errbuf' variable.
  */
 int sock_check_hostlist(char *hostlist, const char *sep, struct sockaddr_storage *from, char *errbuf, int errbuflen)
 {
 	/* checks if the connecting host is among the ones allowed */
 	if ((hostlist) && (hostlist[0]))
 	{
 		char *token;					/* temp, needed to separate items into the hostlist */
 		struct addrinfo *addrinfo, *ai_next;
 		char *temphostlist;
 		char *lasts;
 
 		/*
 		 * The problem is that strtok modifies the original variable by putting '0' at the end of each token
 		 * So, we have to create a new temporary string in which the original content is kept
 		 */
 		temphostlist = strdup(hostlist);
 		if (temphostlist == NULL)
 		{
 			sock_geterror("sock_check_hostlist(), malloc() failed", errbuf, errbuflen);
 			return -2;
 		}
 
 		token = pcap_strtok_r(temphostlist, sep, &lasts);
 
 		/* it avoids a warning in the compilation ('addrinfo used but not initialized') */
 		addrinfo = NULL;
 
 		while (token != NULL)
 		{
 			struct addrinfo hints;
 			int retval;
 
 			addrinfo = NULL;
 			memset(&hints, 0, sizeof(struct addrinfo));
 			hints.ai_family = PF_UNSPEC;
 			hints.ai_socktype = SOCK_STREAM;
 
 			retval = getaddrinfo(token, "0", &hints, &addrinfo);
 			if (retval != 0)
 			{
 				if (errbuf)
 					pcap_snprintf(errbuf, errbuflen, "getaddrinfo() %s", gai_strerror(retval));
 
-				SOCK_ASSERT(errbuf, 1);
+				SOCK_DEBUG_MESSAGE(errbuf);
 
 				/* Get next token */
 				token = pcap_strtok_r(NULL, sep, &lasts);
 				continue;
 			}
 
 			/* ai_next is required to preserve the content of addrinfo, in order to deallocate it properly */
 			ai_next = addrinfo;
 			while (ai_next)
 			{
 				if (sock_cmpaddr(from, (struct sockaddr_storage *) ai_next->ai_addr) == 0)
 				{
 					free(temphostlist);
+					freeaddrinfo(addrinfo);
 					return 0;
 				}
 
 				/*
 				 * If we are here, it means that the current address does not matches
 				 * Let's try with the next one in the header chain
 				 */
 				ai_next = ai_next->ai_next;
 			}
 
 			freeaddrinfo(addrinfo);
 			addrinfo = NULL;
 
 			/* Get next token */
 			token = pcap_strtok_r(NULL, sep, &lasts);
 		}
 
 		if (addrinfo)
 		{
 			freeaddrinfo(addrinfo);
 			addrinfo = NULL;
 		}
 
 		if (errbuf)
 			pcap_snprintf(errbuf, errbuflen, "The host is not in the allowed host list. Connection refused.");
 
 		free(temphostlist);
 		return -1;
 	}
 
 	/* No hostlist, so we have to return 'empty list' */
 	return 1;
 }
 
 /*
  * \brief Compares two addresses contained into two sockaddr_storage structures.
  *
  * This function is useful to compare two addresses, given their internal representation,
  * i.e. an sockaddr_storage structure.
  *
  * The two structures do not need to be sockaddr_storage; you can have both 'sockaddr_in' and
  * sockaddr_in6, properly acsted in order to be compliant to the function interface.
  *
  * This function will return '0' if the two addresses matches, '-1' if not.
  *
  * \param first: a sockaddr_storage structure, (for example the one that is returned by an
  * accept() call), containing the first address to compare.
  *
  * \param second: a sockaddr_storage structure containing the second address to compare.
  *
  * \return '0' if the addresses are equal, '-1' if they are different.
  */
 int sock_cmpaddr(struct sockaddr_storage *first, struct sockaddr_storage *second)
 {
 	if (first->ss_family == second->ss_family)
 	{
 		if (first->ss_family == AF_INET)
 		{
 			if (memcmp(&(((struct sockaddr_in *) first)->sin_addr),
 				&(((struct sockaddr_in *) second)->sin_addr),
 				sizeof(struct in_addr)) == 0)
 				return 0;
 		}
 		else /* address family is AF_INET6 */
 		{
 			if (memcmp(&(((struct sockaddr_in6 *) first)->sin6_addr),
 				&(((struct sockaddr_in6 *) second)->sin6_addr),
 				sizeof(struct in6_addr)) == 0)
 				return 0;
 		}
 	}
 
 	return -1;
 }
 
 /*
  * \brief It gets the address/port the system picked for this socket (on connected sockets).
  *
  * It is used to return the address and port the server picked for our socket on the local machine.
  * It works only on:
  * - connected sockets
  * - server sockets
  *
  * On unconnected client sockets it does not work because the system dynamically chooses a port
  * only when the socket calls a send() call.
  *
  * \param sock: the connected socket currently opened.
  *
  * \param address: it contains the address that will be returned by the function. This buffer
  * must be properly allocated by the user. The address can be either literal or numeric depending
  * on the value of 'Flags'.
  *
  * \param addrlen: the length of the 'address' buffer.
  *
  * \param port: it contains the port that will be returned by the function. This buffer
  * must be properly allocated by the user.
  *
  * \param portlen: the length of the 'port' buffer.
  *
  * \param flags: a set of flags (the ones defined into the getnameinfo() standard socket function)
  * that determine if the resulting address must be in numeric / literal form, and so on.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return It returns '-1' if this function succeeds, '0' otherwise.
  * The address and port corresponding are returned back in the buffers 'address' and 'port'.
  * In any case, the returned strings are '0' terminated.
  *
  * \warning If the socket is using a connectionless protocol, the address may not be available
  * until I/O occurs on the socket.
  */
 int sock_getmyinfo(SOCKET sock, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen)
 {
 	struct sockaddr_storage mysockaddr;
 	socklen_t sockaddrlen;
 
 
 	sockaddrlen = sizeof(struct sockaddr_storage);
 
 	if (getsockname(sock, (struct sockaddr *) &mysockaddr, &sockaddrlen) == -1)
 	{
 		sock_geterror("getsockname(): ", errbuf, errbuflen);
 		return 0;
 	}
-	else
-	{
-		/* Returns the numeric address of the host that triggered the error */
-		return sock_getascii_addrport(&mysockaddr, address, addrlen, port, portlen, flags, errbuf, errbuflen);
-	}
 
-	return 0;
+	/* Returns the numeric address of the host that triggered the error */
+	return sock_getascii_addrport(&mysockaddr, address, addrlen, port, portlen, flags, errbuf, errbuflen);
 }
 
 /*
  * \brief It retrieves two strings containing the address and the port of a given 'sockaddr' variable.
  *
  * This function is basically an extended version of the inet_ntop(), which does not exist in
  * Winsock because the same result can be obtained by using the getnameinfo().
  * However, differently from inet_ntop(), this function is able to return also literal names
  * (e.g. 'localhost') dependently from the 'Flags' parameter.
  *
  * The function accepts a sockaddr_storage variable (which can be returned by several functions
  * like bind(), connect(), accept(), and more) and it transforms its content into a 'human'
  * form. So, for instance, it is able to translate an hex address (stored in binary form) into
  * a standard IPv6 address like "::1".
  *
  * The behavior of this function depends on the parameters we have in the 'Flags' variable, which
  * are the ones allowed in the standard getnameinfo() socket function.
  *
  * \param sockaddr: a 'sockaddr_in' or 'sockaddr_in6' structure containing the address that
  * need to be translated from network form into the presentation form. This structure must be
  * zero-ed prior using it, and the address family field must be filled with the proper value.
  * The user must cast any 'sockaddr_in' or 'sockaddr_in6' structures to 'sockaddr_storage' before
  * calling this function.
  *
  * \param address: it contains the address that will be returned by the function. This buffer
  * must be properly allocated by the user. The address can be either literal or numeric depending
  * on the value of 'Flags'.
  *
  * \param addrlen: the length of the 'address' buffer.
  *
  * \param port: it contains the port that will be returned by the function. This buffer
  * must be properly allocated by the user.
  *
  * \param portlen: the length of the 'port' buffer.
  *
  * \param flags: a set of flags (the ones defined into the getnameinfo() standard socket function)
  * that determine if the resulting address must be in numeric / literal form, and so on.
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return It returns '-1' if this function succeeds, '0' otherwise.
  * The address and port corresponding to the given SockAddr are returned back in the buffers 'address'
  * and 'port'.
  * In any case, the returned strings are '0' terminated.
  */
 int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen)
 {
 	socklen_t sockaddrlen;
 	int retval;					/* Variable that keeps the return value; */
 
 	retval = -1;
 
 #ifdef _WIN32
 	if (sockaddr->ss_family == AF_INET)
 		sockaddrlen = sizeof(struct sockaddr_in);
 	else
 		sockaddrlen = sizeof(struct sockaddr_in6);
 #else
 	sockaddrlen = sizeof(struct sockaddr_storage);
 #endif
 
 	if ((flags & NI_NUMERICHOST) == 0)	/* Check that we want literal names */
 	{
 		if ((sockaddr->ss_family == AF_INET6) &&
 			(memcmp(&((struct sockaddr_in6 *) sockaddr)->sin6_addr, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", sizeof(struct in6_addr)) == 0))
 		{
 			if (address)
 				strlcpy(address, SOCKET_NAME_NULL_DAD, addrlen);
 			return retval;
 		}
 	}
 
 	if (getnameinfo((struct sockaddr *) sockaddr, sockaddrlen, address, addrlen, port, portlen, flags) != 0)
 	{
 		/* If the user wants to receive an error message */
 		if (errbuf)
 		{
 			sock_geterror("getnameinfo(): ", errbuf, errbuflen);
 			errbuf[errbuflen - 1] = 0;
 		}
 
 		if (address)
 		{
 			strlcpy(address, SOCKET_NO_NAME_AVAILABLE, addrlen);
 			address[addrlen - 1] = 0;
 		}
 
 		if (port)
 		{
 			strlcpy(port, SOCKET_NO_PORT_AVAILABLE, portlen);
 			port[portlen - 1] = 0;
 		}
 
 		retval = 0;
 	}
 
 	return retval;
 }
 
 /*
  * \brief It translates an address from the 'presentation' form into the 'network' form.
  *
  * This function basically replaces inet_pton(), which does not exist in Winsock because
  * the same result can be obtained by using the getaddrinfo().
  * An additional advantage is that 'Address' can be both a numeric address (e.g. '127.0.0.1',
  * like in inet_pton() ) and a literal name (e.g. 'localhost').
  *
  * This function does the reverse job of sock_getascii_addrport().
  *
  * \param address: a zero-terminated string which contains the name you have to
  * translate. The name can be either literal (e.g. 'localhost') or numeric (e.g. '::1').
  *
  * \param sockaddr: a user-allocated sockaddr_storage structure which will contains the
  * 'network' form of the requested address.
  *
  * \param addr_family: a constant which can assume the following values:
  * - 'AF_INET' if we want to ping an IPv4 host
  * - 'AF_INET6' if we want to ping an IPv6 host
  * - 'AF_UNSPEC' if we do not have preferences about the protocol used to ping the host
  *
  * \param errbuf: a pointer to an user-allocated buffer that will contain the complete
  * error message. This buffer has to be at least 'errbuflen' in length.
  * It can be NULL; in this case the error cannot be printed.
  *
  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
  *
  * \return '-1' if the translation succeeded, '-2' if there was some non critical error, '0'
  * otherwise. In case it fails, the content of the SockAddr variable remains unchanged.
  * A 'non critical error' can occur in case the 'Address' is a literal name, which can be mapped
  * to several network addresses (e.g. 'foo.bar.com' => '10.2.2.2' and '10.2.2.3'). In this case
  * the content of the SockAddr parameter will be the address corresponding to the first mapping.
  *
  * \warning The sockaddr_storage structure MUST be allocated by the user.
  */
 int sock_present2network(const char *address, struct sockaddr_storage *sockaddr, int addr_family, char *errbuf, int errbuflen)
 {
 	int retval;
 	struct addrinfo *addrinfo;
 	struct addrinfo hints;
 
 	memset(&hints, 0, sizeof(hints));
 
 	hints.ai_family = addr_family;
 
 	if ((retval = sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen)) == -1)
 		return 0;
 
 	if (addrinfo->ai_family == PF_INET)
 		memcpy(sockaddr, addrinfo->ai_addr, sizeof(struct sockaddr_in));
 	else
 		memcpy(sockaddr, addrinfo->ai_addr, sizeof(struct sockaddr_in6));
 
 	if (addrinfo->ai_next != NULL)
 	{
 		freeaddrinfo(addrinfo);
 
 		if (errbuf)
 			pcap_snprintf(errbuf, errbuflen, "More than one socket requested; using the first one returned");
 		return -2;
 	}
 
 	freeaddrinfo(addrinfo);
 	return -1;
 }
Index: vendor/libpcap/dist/sockutils.h
===================================================================
--- vendor/libpcap/dist/sockutils.h	(revision 333788)
+++ vendor/libpcap/dist/sockutils.h	(revision 333789)
@@ -1,241 +1,234 @@
 /*
  * Copyright (c) 2002 - 2003
  * NetGroup, Politecnico di Torino (Italy)
  * All rights reserved.
  *
  * 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
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the Politecnico di Torino nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef __SOCKUTILS_H__
 #define __SOCKUTILS_H__
 
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
 #pragma once
 #endif
 
 #ifdef _WIN32
-  /* Windows */
-  /*
-   * Prevents a compiler warning in case this was already defined (to
-   * avoid that windows.h includes winsock.h)
-   */
-  #ifdef _WINSOCKAPI_
-    #undef _WINSOCKAPI_
-  #endif
   /* Need windef.h for defines used in winsock2.h under MingW32 */
   #ifdef __MINGW32__
     #include <windef.h>
   #endif
   #include <winsock2.h>
   #include <ws2tcpip.h>
+
+  /*
+   * Winsock doesn't have this UN*X type; it's used in the UN*X
+   * sockets API.
+   *
+   * XXX - do we need to worry about UN*Xes so old that *they*
+   * don't have it, either?
+   */
+  typedef int socklen_t;
 #else
   /* UN*X */
   #include <stdio.h>
   #include <string.h>	/* for memset() */
   #include <sys/types.h>
   #include <sys/socket.h>
   #include <netdb.h>	/* DNS lookup */
   #include <unistd.h>	/* close() */
   #include <errno.h>	/* errno() */
   #include <netinet/in.h> /* for sockaddr_in, in BSD at least */
   #include <arpa/inet.h>
   #include <net/if.h>
 
   /*!
    * \brief In Winsock, a socket handle is of type SOCKET; in UN*X, it's
    * a file descriptor, and therefore a signed integer.
    * We define SOCKET to be a signed integer on UN*X, so that it can
    * be used on both platforms.
    */
   #ifndef SOCKET
     #define SOCKET int
   #endif
 
   /*!
    * \brief In Winsock, the error return if socket() fails is INVALID_SOCKET;
    * in UN*X, it's -1.
    * We define INVALID_SOCKET to be -1 on UN*X, so that it can be used on
    * both platforms.
    */
   #ifndef INVALID_SOCKET
     #define INVALID_SOCKET -1
   #endif
+
+  /*!
+   * \brief In Winsock, the close() call cannot be used on a socket;
+   * closesocket() must be used.
+   * We define closesocket() to be a wrapper around close() on UN*X,
+   * so that it can be used on both platforms.
+   */
+  #define closesocket(a) close(a)
 #endif
 
 /*
  * MingW headers include this definition, but only for Windows XP and above.
  * MSDN states that this function is available for most versions on Windows.
  */
 #if ((defined(__MINGW32__)) && (_WIN32_WINNT < 0x0501))
 int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
 	char*,DWORD,int);
 #endif
 
 /*
  * \defgroup SockUtils Cross-platform socket utilities (IPv4-IPv6)
  */
 
 /*
  * \addtogroup SockUtils
  * \{
  */
 
 /*
  * \defgroup ExportedStruct Exported Structures and Definitions
  */
 
 /*
  * \addtogroup ExportedStruct
  * \{
  */
 
 /*
- * Some minor differences between UN*X sockets and and Winsock sockets.
- */
-#ifdef _WIN32
-  /*
-   * Winsock doesn't have these UN*X types; they're used in the UN*X
-   * sockets API.
-   *
-   * XXX - do we need to worry about UN*Xes so old that *they* don't
-   * have them, either?
-   */
-  typedef int socklen_t;
-#else
-  /*!
-   * \brief In Winsock, the close() call cannot be used on a socket;
-   * closesocket() must be used.
-   * We define closesocket() to be a wrapper around close() on UN*X,
-   * so that it can be used on both platforms.
-   */
-  #define closesocket(a) close(a)
-#endif
-
-/*
  * \brief DEBUG facility: it prints an error message on the screen (stderr)
  *
  * This macro prints the error on the standard error stream (stderr);
  * if we are working in debug mode (i.e. there is no NDEBUG defined) and we are in
  * Microsoft Visual C++, the error message will appear on the MSVC console as well.
  *
  * When NDEBUG is defined, this macro is empty.
  *
  * \param msg: the message you want to print.
  *
  * \param expr: 'false' if you want to abort the program, 'true' it you want
  * to print the message and continue.
  *
  * \return No return values.
  */
 #ifdef NDEBUG
-  #define SOCK_ASSERT(msg, expr) ((void)0)
+  #define SOCK_DEBUG_MESSAGE(msg) ((void)0)
 #else
-  #include <assert.h>
   #if (defined(_WIN32) && defined(_MSC_VER))
     #include <crtdbg.h>				/* for _CrtDbgReport */
     /* Use MessageBox(NULL, msg, "warning", MB_OK)' instead of the other calls if you want to debug a Win32 service */
     /* Remember to activate the 'allow service to interact with desktop' flag of the service */
-    #define SOCK_ASSERT(msg, expr) { _CrtDbgReport(_CRT_WARN, NULL, 0, NULL, "%s\n", msg); fprintf(stderr, "%s\n", msg); assert(expr); }
+    #define SOCK_DEBUG_MESSAGE(msg) { _CrtDbgReport(_CRT_WARN, NULL, 0, NULL, "%s\n", msg); fprintf(stderr, "%s\n", msg); }
   #else
-    #define SOCK_ASSERT(msg, expr) { fprintf(stderr, "%s\n", msg); assert(expr); }
+    #define SOCK_DEBUG_MESSAGE(msg) { fprintf(stderr, "%s\n", msg); }
   #endif
 #endif
 
 /****************************************************
  *                                                  *
  * Exported functions / definitions                 *
  *                                                  *
  ****************************************************/
 
 /* 'checkonly' flag, into the rpsock_bufferize() */
 #define SOCKBUF_CHECKONLY 1
 /* no 'checkonly' flag, into the rpsock_bufferize() */
 #define SOCKBUF_BUFFERIZE 0
 
 /* no 'server' flag; it opens a client socket */
 #define SOCKOPEN_CLIENT 0
 /* 'server' flag; it opens a server socket */
 #define SOCKOPEN_SERVER 1
 
-/* Changes the behaviour of the sock_recv(); it does not wait to receive all data */
-#define SOCK_RECEIVEALL_NO 0
-/* Changes the behaviour of the sock_recv(); it waits to receive all data */
-#define SOCK_RECEIVEALL_YES 1
+/*
+ * Flags for sock_recv().
+ */
+#define SOCK_RECEIVEALL_NO	0x00000000	/* Don't wait to receive all data */
+#define SOCK_RECEIVEALL_YES	0x00000001	/* Wait to receive all data */
 
+#define SOCK_EOF_ISNT_ERROR	0x00000000	/* Return 0 on EOF */
+#define SOCK_EOF_IS_ERROR	0x00000002	/* Return an error on EOF */
+
 /*
  * \}
  */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * \defgroup ExportedFunc Exported Functions
  */
 
 /*
  * \addtogroup ExportedFunc
  * \{
  */
 
 int sock_init(char *errbuf, int errbuflen);
 void sock_cleanup(void);
-/* It is 'public' because there are calls (like accept() ) which are not managed from inside the sockutils files */
+void sock_fmterror(const char *caller, int errcode, char *errbuf, int errbuflen);
 void sock_geterror(const char *caller, char *errbuf, int errbufsize);
 int sock_initaddress(const char *address, const char *port,
     struct addrinfo *hints, struct addrinfo **addrinfo,
     char *errbuf, int errbuflen);
-int sock_recv(SOCKET socket, void *buffer, size_t size, int receiveall,
+int sock_recv(SOCKET sock, void *buffer, size_t size, int receiveall,
     char *errbuf, int errbuflen);
+int sock_recv_dgram(SOCKET sock, void *buffer, size_t size,
+    char *errbuf, int errbuflen);
 SOCKET sock_open(struct addrinfo *addrinfo, int server, int nconn, char *errbuf, int errbuflen);
 int sock_close(SOCKET sock, char *errbuf, int errbuflen);
 
-int sock_send(SOCKET socket, const char *buffer, int size, char *errbuf, int errbuflen);
+int sock_send(SOCKET sock, const char *buffer, size_t size,
+    char *errbuf, int errbuflen);
 int sock_bufferize(const char *buffer, int size, char *tempbuf, int *offset, int totsize, int checkonly, char *errbuf, int errbuflen);
-int sock_discard(SOCKET socket, int size, char *errbuf, int errbuflen);
+int sock_discard(SOCKET sock, int size, char *errbuf, int errbuflen);
 int	sock_check_hostlist(char *hostlist, const char *sep, struct sockaddr_storage *from, char *errbuf, int errbuflen);
 int sock_cmpaddr(struct sockaddr_storage *first, struct sockaddr_storage *second);
 
 int sock_getmyinfo(SOCKET sock, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen);
 
 int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *address, int addrlen, char *port, int portlen, int flags, char *errbuf, int errbuflen);
 int sock_present2network(const char *address, struct sockaddr_storage *sockaddr, int addr_family, char *errbuf, int errbuflen);
 
 #ifdef __cplusplus
 }
 #endif
 
 /*
  * \}
  */
 
 /*
  * \}
  */
 
 #endif
Index: vendor/libpcap/dist/tests/selpolltest.c
===================================================================
--- vendor/libpcap/dist/tests/selpolltest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/selpolltest.c	(nonexistent)
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-/*
- * Tests how select() and poll() behave on the selectable file descriptor
- * for a pcap_t.
- *
- * This would be significantly different on Windows, as it'd test
- * how WaitForMultipleObjects() would work on the event handle for a
- * pcap_t.
- */
-#include <pcap.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#else
-#include <sys/time.h>	/* older UN*Xes */
-#endif
-#include <poll.h>
-
-char *program_name;
-
-/*
- * This was introduced by Clang:
- *
- *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
- *
- * in some version (which version?); it has been picked up by GCC 5.0.
- */
-#ifndef __has_attribute
-  /*
-   * It's a macro, so you can check whether it's defined to check
-   * whether it's supported.
-   *
-   * If it's not, define it to always return 0, so that we move on to
-   * the fallback checks.
-   */
-  #define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
-   * (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
-   * versions of XL C support this?), or HP aCC A.06.10 and later.
-   */
-  #define PCAP_NORETURN __attribute((noreturn))
-#elif defined( _MSC_VER )
-  #define PCAP_NORETURN __declspec(noreturn)
-#else
-  #define PCAP_NORETURN
-#endif
-
-#if __has_attribute(__format__) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
-   * and later (do any earlier versions of XL C support this?),
-   * or HP aCC A.06.10 and later.
-   */
-  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-  #define PCAP_PRINTFLIKE(x,y)
-#endif
-
-/* Forwards */
-static void countme(u_char *, const struct pcap_pkthdr *, const u_char *);
-static void PCAP_NORETURN usage(void);
-static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static void warning(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static char *copy_argv(char **);
-
-static pcap_t *pd;
-
-int
-main(int argc, char **argv)
-{
-	register int op;
-	bpf_u_int32 localnet, netmask;
-	register char *cp, *cmdbuf, *device;
-	int doselect, dopoll, dotimeout, dononblock;
-	struct bpf_program fcode;
-	char ebuf[PCAP_ERRBUF_SIZE];
-	int selectable_fd;
-	int status;
-	int packet_count;
-
-	device = NULL;
-	doselect = 0;
-	dopoll = 0;
-	dotimeout = 0;
-	dononblock = 0;
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	opterr = 0;
-	while ((op = getopt(argc, argv, "i:sptn")) != -1) {
-		switch (op) {
-
-		case 'i':
-			device = optarg;
-			break;
-
-		case 's':
-			doselect = 1;
-			break;
-
-		case 'p':
-			dopoll = 1;
-			break;
-
-		case 't':
-			dotimeout = 1;
-			break;
-
-		case 'n':
-			dononblock = 1;
-			break;
-
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	if (doselect && dopoll) {
-		fprintf(stderr, "selpolltest: choose select (-s) or poll (-p), but not both\n");
-		return 1;
-	}
-	if (dotimeout && !doselect && !dopoll) {
-		fprintf(stderr, "selpolltest: timeout (-t) requires select (-s) or poll (-p)\n");
-		return 1;
-	}
-	if (device == NULL) {
-		device = pcap_lookupdev(ebuf);
-		if (device == NULL)
-			error("%s", ebuf);
-	}
-	*ebuf = '\0';
-	pd = pcap_open_live(device, 65535, 0, 1000, ebuf);
-	if (pd == NULL)
-		error("%s", ebuf);
-	else if (*ebuf)
-		warning("%s", ebuf);
-	if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-		localnet = 0;
-		netmask = 0;
-		warning("%s", ebuf);
-	}
-	cmdbuf = copy_argv(&argv[optind]);
-
-	if (pcap_compile(pd, &fcode, cmdbuf, 1, netmask) < 0)
-		error("%s", pcap_geterr(pd));
-
-	if (pcap_setfilter(pd, &fcode) < 0)
-		error("%s", pcap_geterr(pd));
-	if (pcap_get_selectable_fd(pd) == -1)
-		error("pcap_get_selectable_fd() fails");
-	if (dononblock) {
-		if (pcap_setnonblock(pd, 1, ebuf) == -1)
-			error("pcap_setnonblock failed: %s", ebuf);
-	}
-	selectable_fd = pcap_get_selectable_fd(pd);
-	printf("Listening on %s\n", device);
-	if (doselect) {
-		for (;;) {
-			fd_set setread, setexcept;
-			struct timeval seltimeout;
-
-			FD_ZERO(&setread);
-			FD_SET(selectable_fd, &setread);
-			FD_ZERO(&setexcept);
-			FD_SET(selectable_fd, &setexcept);
-			if (dotimeout) {
-				seltimeout.tv_sec = 0;
-				seltimeout.tv_usec = 1000;
-				status = select(selectable_fd + 1, &setread,
-				    NULL, &setexcept, &seltimeout);
-			} else {
-				status = select(selectable_fd + 1, &setread,
-				    NULL, &setexcept, NULL);
-			}
-			if (status == -1) {
-				printf("Select returns error (%s)\n",
-				    strerror(errno));
-			} else {
-				if (status == 0)
-					printf("Select timed out: ");
-				else
-					printf("Select returned a descriptor: ");
-				if (FD_ISSET(selectable_fd, &setread))
-					printf("readable, ");
-				else
-					printf("not readable, ");
-				if (FD_ISSET(selectable_fd, &setexcept))
-					printf("exceptional condition\n");
-				else
-					printf("no exceptional condition\n");
-				packet_count = 0;
-				status = pcap_dispatch(pd, -1, countme,
-				    (u_char *)&packet_count);
-				if (status < 0)
-					break;
-				printf("%d packets seen, %d packets counted after select returns\n",
-				    status, packet_count);
-			}
-		}
-	} else if (dopoll) {
-		for (;;) {
-			struct pollfd fd;
-			int polltimeout;
-
-			fd.fd = selectable_fd;
-			fd.events = POLLIN;
-			if (dotimeout)
-				polltimeout = 1;
-			else
-				polltimeout = -1;
-			status = poll(&fd, 1, polltimeout);
-			if (status == -1) {
-				printf("Poll returns error (%s)\n",
-				    strerror(errno));
-			} else {
-				if (status == 0)
-					printf("Poll timed out\n");
-				else {
-					printf("Poll returned a descriptor: ");
-					if (fd.revents & POLLIN)
-						printf("readable, ");
-					else
-						printf("not readable, ");
-					if (fd.revents & POLLERR)
-						printf("exceptional condition, ");
-					else
-						printf("no exceptional condition, ");
-					if (fd.revents & POLLHUP)
-						printf("disconnect, ");
-					else
-						printf("no disconnect, ");
-					if (fd.revents & POLLNVAL)
-						printf("invalid\n");
-					else
-						printf("not invalid\n");
-				}
-				packet_count = 0;
-				status = pcap_dispatch(pd, -1, countme,
-				    (u_char *)&packet_count);
-				if (status < 0)
-					break;
-				printf("%d packets seen, %d packets counted after poll returns\n",
-				    status, packet_count);
-			}
-		}
-	} else {
-		for (;;) {
-			packet_count = 0;
-			status = pcap_dispatch(pd, -1, countme,
-			    (u_char *)&packet_count);
-			if (status < 0)
-				break;
-			printf("%d packets seen, %d packets counted after pcap_dispatch returns\n",
-			    status, packet_count);
-		}
-	}
-	if (status == -2) {
-		/*
-		 * We got interrupted, so perhaps we didn't
-		 * manage to finish a line we were printing.
-		 * Print an extra newline, just in case.
-		 */
-		putchar('\n');
-	}
-	(void)fflush(stdout);
-	if (status == -1) {
-		/*
-		 * Error.  Report it.
-		 */
-		(void)fprintf(stderr, "%s: pcap_loop: %s\n",
-		    program_name, pcap_geterr(pd));
-	}
-	pcap_close(pd);
-	exit(status == -1 ? 1 : 0);
-}
-
-static void
-countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
-{
-	int *counterp = (int *)user;
-
-	(*counterp)++;
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "Usage: %s [ -sptn ] [ -i interface ] [expression]\n",
-	    program_name);
-	exit(1);
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}
-
-/* VARARGS */
-static void
-warning(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-}
-
-/*
- * Copy arg vector into a new buffer, concatenating arguments with spaces.
- */
-static char *
-copy_argv(register char **argv)
-{
-	register char **p;
-	register u_int len = 0;
-	char *buf;
-	char *src, *dst;
-
-	p = argv;
-	if (*p == 0)
-		return 0;
-
-	while (*p)
-		len += strlen(*p++) + 1;
-
-	buf = (char *)malloc(len);
-	if (buf == NULL)
-		error("copy_argv: malloc");
-
-	p = argv;
-	dst = buf;
-	while ((src = *p++) != NULL) {
-		while ((*dst++ = *src++) != '\0')
-			;
-		dst[-1] = ' ';
-	}
-	dst[-1] = '\0';
-
-	return buf;
-}

Property changes on: vendor/libpcap/dist/tests/selpolltest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/can_set_rfmon_test.c
===================================================================
--- vendor/libpcap/dist/tests/can_set_rfmon_test.c	(revision 333788)
+++ vendor/libpcap/dist/tests/can_set_rfmon_test.c	(nonexistent)
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include <pcap.h>
-
-static const char *program_name;
-
-/* Forwards */
-static void error(const char *, ...);
-
-int
-main(int argc, char **argv)
-{
-	const char *cp;
-	pcap_t *pd;
-	char ebuf[PCAP_ERRBUF_SIZE];
-	int status;
-
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s <device>\n", program_name);
-		return 2;
-	}
-
-	pd = pcap_create(argv[1], ebuf);
-	if (pd == NULL)
-		error("%s", ebuf);
-	status = pcap_can_set_rfmon(pd);
-	if (status < 0) {
-		if (status == PCAP_ERROR)
-			error("%s: pcap_can_set_rfmon failed: %s", argv[1],
-			    pcap_geterr(pd));
-		else
-			error("%s: pcap_can_set_rfmon failed: %s", argv[1],
-			    pcap_statustostr(status));
-		return 1;
-	}
-	printf("%s: Monitor mode %s be set\n", argv[1], status ? "can" : "cannot");
-	return 0;
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}

Property changes on: vendor/libpcap/dist/tests/can_set_rfmon_test.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/CMakeLists.txt
===================================================================
--- vendor/libpcap/dist/tests/CMakeLists.txt	(revision 333788)
+++ vendor/libpcap/dist/tests/CMakeLists.txt	(nonexistent)
@@ -1,42 +0,0 @@
-cmake_minimum_required( VERSION 2.8.8 )
-
-project( pcap_tests )
-
-######################################
-# Register targets
-######################################
-
-if( MSVC )
-    file(GLOB PROJECT_SOURCE_LIST_WIN32_C
-        ${pcap_SOURCE_DIR}/missing/getopt.c
-    )
-endif( MSVC )
-
-ADD_EXECUTABLE (can_set_rfmon_test can_set_rfmon_test.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( can_set_rfmon_test pcap )
-
-ADD_EXECUTABLE (capturetest capturetest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( capturetest pcap )
-
-ADD_EXECUTABLE (filtertest filtertest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( filtertest pcap )
-
-ADD_EXECUTABLE (indalldevstest findalldevstest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( indalldevstest pcap )
-
-ADD_EXECUTABLE (opentest opentest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( opentest pcap )
-
-#ADD_EXECUTABLE (pcap_compile_test pcap_compile_test.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-#target_link_libraries ( pcap_compile_test pcap )
-
-ADD_EXECUTABLE (reactivatetest reactivatetest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( reactivatetest pcap )
-
-if( NOT WIN32 )
-    ADD_EXECUTABLE (selpolltest selpolltest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-    target_link_libraries ( selpolltest pcap )
-endif()
-
-ADD_EXECUTABLE (valgrindtest valgrindtest.c ${PROJECT_SOURCE_LIST_WIN32_C} )
-target_link_libraries ( valgrindtest pcap )

Property changes on: vendor/libpcap/dist/tests/CMakeLists.txt
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/valgrindtest.c
===================================================================
--- vendor/libpcap/dist/tests/valgrindtest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/valgrindtest.c	(nonexistent)
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-/*
- * This doesn't actually test libpcap itself; it tests whether
- * valgrind properly handles the APIs libpcap uses.  If it doesn't,
- * we end up getting patches submitted to "fix" references that
- * valgrind claims are being made to uninitialized data, when, in
- * fact, the OS isn't making any such references - or we get
- * valgrind *not* detecting *actual* incorrect references.
- *
- * Both BPF and Linux socket filters aren't handled correctly
- * by some versions of valgrind.  See valgrind bug 318203 for
- * Linux:
- *
- *	https://bugs.kde.org/show_bug.cgi?id=318203
- *
- * and valgrind bug 312989 for OS X:
- *
- *	https://bugs.kde.org/show_bug.cgi?id=312989
- *
- * The fixes for both of those are checked into the official valgrind
- * repository.
- *
- * The unofficial FreeBSD port has similar issues to the official OS X
- * port, for similar reasons.
- */
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-/* BSD-flavored OS - use BPF */
-#define USE_BPF
-#elif defined(linux)
-/* Linux - use socket filters */
-#define USE_SOCKET_FILTERS
-#else
-#error "Unknown platform or platform that doesn't support Valgrind"
-#endif
-
-#if defined(USE_BPF)
-
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-
-/*
- * Make "pcap.h" not include "pcap/bpf.h"; we are going to include the
- * native OS version, as we're going to be doing our own ioctls to
- * make sure that, in the uninitialized-data tests, the filters aren't
- * checked by libpcap before being handed to BPF.
- */
-#define PCAP_DONT_INCLUDE_PCAP_BPF_H
-
-#elif defined(USE_SOCKET_FILTERS)
-
-#include <sys/socket.h>
-#include <linux/types.h>
-#include <linux/filter.h>
-
-#endif
-
-#include <pcap.h>
-
-static char *program_name;
-
-/*
- * This was introduced by Clang:
- *
- *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
- *
- * in some version (which version?); it has been picked up by GCC 5.0.
- */
-#ifndef __has_attribute
-  /*
-   * It's a macro, so you can check whether it's defined to check
-   * whether it's supported.
-   *
-   * If it's not, define it to always return 0, so that we move on to
-   * the fallback checks.
-   */
-  #define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
-   * (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
-   * versions of XL C support this?), or HP aCC A.06.10 and later.
-   */
-  #define PCAP_NORETURN __attribute((noreturn))
-#elif defined( _MSC_VER )
-  #define PCAP_NORETURN __declspec(noreturn)
-#else
-  #define PCAP_NORETURN
-#endif
-
-#if __has_attribute(__format__) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
-   * and later (do any earlier versions of XL C support this?),
-   * or HP aCC A.06.10 and later.
-   */
-  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-  #define PCAP_PRINTFLIKE(x,y)
-#endif
-
-/* Forwards */
-static void PCAP_NORETURN usage(void);
-static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static void warning(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-
-/*
- * On Windows, we need to open the file in binary mode, so that
- * we get all the bytes specified by the size we get from "fstat()".
- * On UNIX, that's not necessary.  O_BINARY is defined on Windows;
- * we define it as 0 if it's not defined, so it does nothing.
- */
-#ifndef O_BINARY
-#define O_BINARY	0
-#endif
-
-static char *
-read_infile(char *fname)
-{
-	register int i, fd, cc;
-	register char *cp;
-	struct stat buf;
-
-	fd = open(fname, O_RDONLY|O_BINARY);
-	if (fd < 0)
-		error("can't open %s: %s", fname, pcap_strerror(errno));
-
-	if (fstat(fd, &buf) < 0)
-		error("can't stat %s: %s", fname, pcap_strerror(errno));
-
-	cp = malloc((u_int)buf.st_size + 1);
-	if (cp == NULL)
-		error("malloc(%d) for %s: %s", (u_int)buf.st_size + 1,
-			fname, pcap_strerror(errno));
-	cc = read(fd, cp, (u_int)buf.st_size);
-	if (cc < 0)
-		error("read %s: %s", fname, pcap_strerror(errno));
-	if (cc != buf.st_size)
-		error("short read %s (%d != %d)", fname, cc, (int)buf.st_size);
-
-	close(fd);
-	/* replace "# comment" with spaces */
-	for (i = 0; i < cc; i++) {
-		if (cp[i] == '#')
-			while (i < cc && cp[i] != '\n')
-				cp[i++] = ' ';
-	}
-	cp[cc] = '\0';
-	return (cp);
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}
-
-/* VARARGS */
-static void
-warning(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-}
-
-/*
- * Copy arg vector into a new buffer, concatenating arguments with spaces.
- */
-static char *
-copy_argv(register char **argv)
-{
-	register char **p;
-	register u_int len = 0;
-	char *buf;
-	char *src, *dst;
-
-	p = argv;
-	if (*p == 0)
-		return 0;
-
-	while (*p)
-		len += strlen(*p++) + 1;
-
-	buf = (char *)malloc(len);
-	if (buf == NULL)
-		error("copy_argv: malloc");
-
-	p = argv;
-	dst = buf;
-	while ((src = *p++) != NULL) {
-		while ((*dst++ = *src++) != '\0')
-			;
-		dst[-1] = ' ';
-	}
-	dst[-1] = '\0';
-
-	return buf;
-}
-
-#define INSN_COUNT	17
-
-int
-main(int argc, char **argv)
-{
-	char *cp, *device;
-	int op;
-	int dorfmon, useactivate;
-	char ebuf[PCAP_ERRBUF_SIZE];
-	char *infile;
-	char *cmdbuf;
-	pcap_t *pd;
-	int status = 0;
-	int pcap_fd;
-#if defined(USE_BPF)
-	struct bpf_program bad_fcode;
-	struct bpf_insn uninitialized[INSN_COUNT];
-#elif defined(USE_SOCKET_FILTERS)
-	struct sock_fprog bad_fcode;
-	struct sock_filter uninitialized[INSN_COUNT];
-#endif
-	struct bpf_program fcode;
-
-	device = NULL;
-	dorfmon = 0;
-	useactivate = 0;
-	infile = NULL;
-
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	opterr = 0;
-	while ((op = getopt(argc, argv, "aF:i:I")) != -1) {
-		switch (op) {
-
-		case 'a':
-			useactivate = 1;
-			break;
-
-		case 'F':
-			infile = optarg;
-			break;
-
-		case 'i':
-			device = optarg;
-			break;
-
-		case 'I':
-			dorfmon = 1;
-			useactivate = 1;	/* required for rfmon */
-			break;
-
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	if (device == NULL) {
-		/*
-		 * No interface specified; get whatever pcap_lookupdev()
-		 * finds.
-		 */
-		device = pcap_lookupdev(ebuf);
-		if (device == NULL) {
-			error("couldn't find interface to use: %s",
-			    ebuf);
-		}
-	}
-
-	if (infile != NULL) {
-		/*
-		 * Filter specified with "-F" and a file containing
-		 * a filter.
-		 */
-		cmdbuf = read_infile(infile);
-	} else {
-		if (optind < argc) {
-			/*
-			 * Filter specified with arguments on the
-			 * command line.
-			 */
-			cmdbuf = copy_argv(&argv[optind+1]);
-		} else {
-			/*
-			 * No filter specified; use an empty string, which
-			 * compiles to an "accept all" filter.
-			 */
-			cmdbuf = "";
-		}
-	}
-
-	if (useactivate) {
-		pd = pcap_create(device, ebuf);
-		if (pd == NULL)
-			error("%s: pcap_create() failed: %s", device, ebuf);
-		status = pcap_set_snaplen(pd, 65535);
-		if (status != 0)
-			error("%s: pcap_set_snaplen failed: %s",
-			    device, pcap_statustostr(status));
-		status = pcap_set_promisc(pd, 1);
-		if (status != 0)
-			error("%s: pcap_set_promisc failed: %s",
-			    device, pcap_statustostr(status));
-		if (dorfmon) {
-			status = pcap_set_rfmon(pd, 1);
-			if (status != 0)
-				error("%s: pcap_set_rfmon failed: %s",
-				    device, pcap_statustostr(status));
-		}
-		status = pcap_set_timeout(pd, 1000);
-		if (status != 0)
-			error("%s: pcap_set_timeout failed: %s",
-			    device, pcap_statustostr(status));
-		status = pcap_activate(pd);
-		if (status < 0) {
-			/*
-			 * pcap_activate() failed.
-			 */
-			error("%s: %s\n(%s)", device,
-			    pcap_statustostr(status), pcap_geterr(pd));
-		} else if (status > 0) {
-			/*
-			 * pcap_activate() succeeded, but it's warning us
-			 * of a problem it had.
-			 */
-			warning("%s: %s\n(%s)", device,
-			    pcap_statustostr(status), pcap_geterr(pd));
-		}
-	} else {
-		*ebuf = '\0';
-		pd = pcap_open_live(device, 65535, 1, 1000, ebuf);
-		if (pd == NULL)
-			error("%s", ebuf);
-		else if (*ebuf)
-			warning("%s", ebuf);
-	}
-
-	pcap_fd = pcap_fileno(pd);
-
-	/*
-	 * Try setting a filter with an uninitialized bpf_program
-	 * structure.  This should cause valgrind to report a
-	 * problem.
-	 *
-	 * We don't check for errors, because it could get an
-	 * error due to a bad pointer or count.
-	 */
-#if defined(USE_BPF)
-	ioctl(pcap_fd, BIOCSETF, &bad_fcode);
-#elif defined(USE_SOCKET_FILTERS)
-	setsockopt(pcap_fd, SOL_SOCKET, SO_ATTACH_FILTER, &bad_fcode,
-	    sizeof(bad_fcode));
-#endif
-
-	/*
-	 * Try setting a filter with an initialized bpf_program
-	 * structure that points to an uninitialized program.
-	 * That should also cause valgrind to report a problem.
-	 *
-	 * We don't check for errors, because it could get an
-	 * error due to a bad pointer or count.
-	 */
-#if defined(USE_BPF)
-	bad_fcode.bf_len = INSN_COUNT;
-	bad_fcode.bf_insns = uninitialized;
-	ioctl(pcap_fd, BIOCSETF, &bad_fcode);
-#elif defined(USE_SOCKET_FILTERS)
-	bad_fcode.len = INSN_COUNT;
-	bad_fcode.filter = uninitialized;
-	setsockopt(pcap_fd, SOL_SOCKET, SO_ATTACH_FILTER, &bad_fcode,
-	    sizeof(bad_fcode));
-#endif
-
-	/*
-	 * Now compile a filter and set the filter with that.
-	 * That should *not* cause valgrind to report a
-	 * problem.
-	 */
-	if (pcap_compile(pd, &fcode, cmdbuf, 1, 0) < 0)
-		error("can't compile filter: %s", pcap_geterr(pd));
-	if (pcap_setfilter(pd, &fcode) < 0)
-		error("can't set filter: %s", pcap_geterr(pd));
-
-	pcap_close(pd);
-	exit(status < 0 ? 1 : 0);
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "%s, with %s\n", program_name,
-	    pcap_lib_version());
-	(void)fprintf(stderr,
-	    "Usage: %s [-aI] [ -F file ] [ -I interface ] [ expression ]\n",
-	    program_name);
-	exit(1);
-}

Property changes on: vendor/libpcap/dist/tests/valgrindtest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/capturetest.c
===================================================================
--- vendor/libpcap/dist/tests/capturetest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/capturetest.c	(nonexistent)
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <limits.h>
-#ifdef _WIN32
-#include "getopt.h"
-#else
-#include <unistd.h>
-#endif
-#include <errno.h>
-#include <sys/types.h>
-
-#include <pcap.h>
-
-static char *program_name;
-
-/*
- * This was introduced by Clang:
- *
- *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
- *
- * in some version (which version?); it has been picked up by GCC 5.0.
- */
-#ifndef __has_attribute
-  /*
-   * It's a macro, so you can check whether it's defined to check
-   * whether it's supported.
-   *
-   * If it's not, define it to always return 0, so that we move on to
-   * the fallback checks.
-   */
-  #define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
-   * (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
-   * versions of XL C support this?), or HP aCC A.06.10 and later.
-   */
-  #define PCAP_NORETURN __attribute((noreturn))
-#elif defined( _MSC_VER )
-  #define PCAP_NORETURN __declspec(noreturn)
-#else
-  #define PCAP_NORETURN
-#endif
-
-#if __has_attribute(__format__) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
-   * and later (do any earlier versions of XL C support this?),
-   * or HP aCC A.06.10 and later.
-   */
-  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-  #define PCAP_PRINTFLIKE(x,y)
-#endif
-
-/* Forwards */
-static void countme(u_char *, const struct pcap_pkthdr *, const u_char *);
-static void PCAP_NORETURN usage(void);
-static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static void warning(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static char *copy_argv(char **);
-
-static pcap_t *pd;
-
-int
-main(int argc, char **argv)
-{
-	register int op;
-	register char *cp, *cmdbuf, *device;
-	long longarg;
-	char *p;
-	int timeout = 1000;
-	int immediate = 0;
-	int nonblock = 0;
-	bpf_u_int32 localnet, netmask;
-	struct bpf_program fcode;
-	char ebuf[PCAP_ERRBUF_SIZE];
-	int status;
-	int packet_count;
-
-	device = NULL;
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	opterr = 0;
-	while ((op = getopt(argc, argv, "i:mnt:")) != -1) {
-		switch (op) {
-
-		case 'i':
-			device = optarg;
-			break;
-
-		case 'm':
-			immediate = 1;
-			break;
-
-		case 'n':
-			nonblock = 1;
-			break;
-
-		case 't':
-			longarg = strtol(optarg, &p, 10);
-			if (p == optarg || *p != '\0') {
-				error("Timeout value \"%s\" is not a number",
-				    optarg);
-				/* NOTREACHED */
-			}
-			if (longarg < 0) {
-				error("Timeout value %ld is negative", longarg);
-				/* NOTREACHED */
-			}
-			if (longarg > INT_MAX) {
-				error("Timeout value %ld is too large (> %d)",
-				    longarg, INT_MAX);
-				/* NOTREACHED */
-			}
-			timeout = (int)longarg;
-			break;
-
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	if (device == NULL) {
-		device = pcap_lookupdev(ebuf);
-		if (device == NULL)
-			error("%s", ebuf);
-	}
-	*ebuf = '\0';
-	pd = pcap_create(device, ebuf);
-	if (pd == NULL)
-		error("%s", ebuf);
-	status = pcap_set_snaplen(pd, 65535);
-	if (status != 0)
-		error("%s: pcap_set_snaplen failed: %s",
-			    device, pcap_statustostr(status));
-	if (immediate) {
-		status = pcap_set_immediate_mode(pd, 1);
-		if (status != 0)
-			error("%s: pcap_set_immediate_mode failed: %s",
-			    device, pcap_statustostr(status));
-	}
-	status = pcap_set_timeout(pd, timeout);
-	if (status != 0)
-		error("%s: pcap_set_timeout failed: %s",
-		    device, pcap_statustostr(status));
-	status = pcap_activate(pd);
-	if (status < 0) {
-		/*
-		 * pcap_activate() failed.
-		 */
-		error("%s: %s\n(%s)", device,
-		    pcap_statustostr(status), pcap_geterr(pd));
-	} else if (status > 0) {
-		/*
-		 * pcap_activate() succeeded, but it's warning us
-		 * of a problem it had.
-		 */
-		warning("%s: %s\n(%s)", device,
-		    pcap_statustostr(status), pcap_geterr(pd));
-	}
-	if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-		localnet = 0;
-		netmask = 0;
-		warning("%s", ebuf);
-	}
-	cmdbuf = copy_argv(&argv[optind]);
-
-	if (pcap_compile(pd, &fcode, cmdbuf, 1, netmask) < 0)
-		error("%s", pcap_geterr(pd));
-
-	if (pcap_setfilter(pd, &fcode) < 0)
-		error("%s", pcap_geterr(pd));
-	if (pcap_setnonblock(pd, nonblock, ebuf) == -1)
-		error("pcap_setnonblock failed: %s", ebuf);
-	printf("Listening on %s\n", device);
-	for (;;) {
-		packet_count = 0;
-		status = pcap_dispatch(pd, -1, countme,
-		    (u_char *)&packet_count);
-		if (status < 0)
-			break;
-		if (status != 0) {
-			printf("%d packets seen, %d packets counted after pcap_dispatch returns\n",
-			    status, packet_count);
-		}
-	}
-	if (status == -2) {
-		/*
-		 * We got interrupted, so perhaps we didn't
-		 * manage to finish a line we were printing.
-		 * Print an extra newline, just in case.
-		 */
-		putchar('\n');
-	}
-	(void)fflush(stdout);
-	if (status == -1) {
-		/*
-		 * Error.  Report it.
-		 */
-		(void)fprintf(stderr, "%s: pcap_loop: %s\n",
-		    program_name, pcap_geterr(pd));
-	}
-	pcap_close(pd);
-	exit(status == -1 ? 1 : 0);
-}
-
-static void
-countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
-{
-	int *counterp = (int *)user;
-
-	(*counterp)++;
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "Usage: %s [ -mn ] [ -i interface ] [ -t timeout] [expression]\n",
-	    program_name);
-	exit(1);
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}
-
-/* VARARGS */
-static void
-warning(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-}
-
-/*
- * Copy arg vector into a new buffer, concatenating arguments with spaces.
- */
-static char *
-copy_argv(register char **argv)
-{
-	register char **p;
-	register u_int len = 0;
-	char *buf;
-	char *src, *dst;
-
-	p = argv;
-	if (*p == 0)
-		return 0;
-
-	while (*p)
-		len += strlen(*p++) + 1;
-
-	buf = (char *)malloc(len);
-	if (buf == NULL)
-		error("copy_argv: malloc");
-
-	p = argv;
-	dst = buf;
-	while ((src = *p++) != NULL) {
-		while ((*dst++ = *src++) != '\0')
-			;
-		dst[-1] = ' ';
-	}
-	dst[-1] = '\0';
-
-	return buf;
-}

Property changes on: vendor/libpcap/dist/tests/capturetest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/findalldevstest.c
===================================================================
--- vendor/libpcap/dist/tests/findalldevstest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/findalldevstest.c	(nonexistent)
@@ -1,161 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <sys/types.h>
-#ifdef _WIN32
-  #include <winsock2.h>
-#else
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-  #include <netdb.h>
-#endif
-
-#include <pcap.h>
-
-static int ifprint(pcap_if_t *d);
-static char *iptos(bpf_u_int32 in);
-
-int main(int argc, char **argv)
-{
-  pcap_if_t *alldevs;
-  pcap_if_t *d;
-  char *s;
-  bpf_u_int32 net, mask;
-  int exit_status = 0;
-
-  char errbuf[PCAP_ERRBUF_SIZE+1];
-  if (pcap_findalldevs(&alldevs, errbuf) == -1)
-  {
-    fprintf(stderr,"Error in pcap_findalldevs: %s\n",errbuf);
-    exit(1);
-  }
-  for(d=alldevs;d;d=d->next)
-  {
-    if (!ifprint(d))
-      exit_status = 2;
-  }
-
-  if ( (s = pcap_lookupdev(errbuf)) == NULL)
-  {
-    fprintf(stderr,"Error in pcap_lookupdev: %s\n",errbuf);
-    exit_status = 2;
-  }
-  else
-  {
-    printf("Preferred device name: %s\n",s);
-  }
-
-  if (pcap_lookupnet(s, &net, &mask, errbuf) < 0)
-  {
-    fprintf(stderr,"Error in pcap_lookupnet: %s\n",errbuf);
-    exit_status = 2;
-  }
-  else
-  {
-    printf("Preferred device is on network: %s/%s\n",iptos(net), iptos(mask));
-  }
-
-  exit(exit_status);
-}
-
-static int ifprint(pcap_if_t *d)
-{
-  pcap_addr_t *a;
-#ifdef INET6
-  char ntop_buf[INET6_ADDRSTRLEN];
-#endif
-  const char *sep;
-  int status = 1; /* success */
-
-  printf("%s\n",d->name);
-  if (d->description)
-    printf("\tDescription: %s\n",d->description);
-  printf("\tFlags: ");
-  sep = "";
-  if (d->flags & PCAP_IF_UP) {
-    printf("%sUP", sep);
-    sep = ", ";
-  }
-  if (d->flags & PCAP_IF_RUNNING) {
-    printf("%sRUNNING", sep);
-    sep = ", ";
-  }
-  if (d->flags & PCAP_IF_LOOPBACK) {
-    printf("%sLOOPBACK", sep);
-    sep = ", ";
-  }
-  printf("\n");
-
-  for(a=d->addresses;a;a=a->next) {
-    if (a->addr != NULL)
-      switch(a->addr->sa_family) {
-      case AF_INET:
-        printf("\tAddress Family: AF_INET\n");
-        if (a->addr)
-          printf("\t\tAddress: %s\n",
-            inet_ntoa(((struct sockaddr_in *)(a->addr))->sin_addr));
-        if (a->netmask)
-          printf("\t\tNetmask: %s\n",
-            inet_ntoa(((struct sockaddr_in *)(a->netmask))->sin_addr));
-        if (a->broadaddr)
-          printf("\t\tBroadcast Address: %s\n",
-            inet_ntoa(((struct sockaddr_in *)(a->broadaddr))->sin_addr));
-        if (a->dstaddr)
-          printf("\t\tDestination Address: %s\n",
-            inet_ntoa(((struct sockaddr_in *)(a->dstaddr))->sin_addr));
-        break;
-#ifdef INET6
-      case AF_INET6:
-        printf("\tAddress Family: AF_INET6\n");
-        if (a->addr)
-          printf("\t\tAddress: %s\n",
-            inet_ntop(AF_INET6,
-               ((struct sockaddr_in6 *)(a->addr))->sin6_addr.s6_addr,
-               ntop_buf, sizeof ntop_buf));
-        if (a->netmask)
-          printf("\t\tNetmask: %s\n",
-            inet_ntop(AF_INET6,
-              ((struct sockaddr_in6 *)(a->netmask))->sin6_addr.s6_addr,
-               ntop_buf, sizeof ntop_buf));
-        if (a->broadaddr)
-          printf("\t\tBroadcast Address: %s\n",
-            inet_ntop(AF_INET6,
-              ((struct sockaddr_in6 *)(a->broadaddr))->sin6_addr.s6_addr,
-               ntop_buf, sizeof ntop_buf));
-        if (a->dstaddr)
-          printf("\t\tDestination Address: %s\n",
-            inet_ntop(AF_INET6,
-              ((struct sockaddr_in6 *)(a->dstaddr))->sin6_addr.s6_addr,
-               ntop_buf, sizeof ntop_buf));
-        break;
-#endif
-      default:
-        printf("\tAddress Family: Unknown (%d)\n", a->addr->sa_family);
-        break;
-      }
-    else
-    {
-      fprintf(stderr, "\tWarning: a->addr is NULL, skipping this address.\n");
-      status = 0;
-    }
-  }
-  printf("\n");
-  return status;
-}
-
-/* From tcptraceroute */
-#define IPTOSBUFFERS	12
-static char *iptos(bpf_u_int32 in)
-{
-	static char output[IPTOSBUFFERS][3*4+3+1];
-	static short which;
-	u_char *p;
-
-	p = (u_char *)&in;
-	which = (which + 1 == IPTOSBUFFERS ? 0 : which + 1);
-	sprintf(output[which], "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
-	return output[which];
-}

Property changes on: vendor/libpcap/dist/tests/findalldevstest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/filtertest.c
===================================================================
--- vendor/libpcap/dist/tests/filtertest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/filtertest.c	(nonexistent)
@@ -1,364 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pcap.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#ifdef _WIN32
-#include "getopt.h"
-#else
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#include <errno.h>
-#ifdef _WIN32
-  #include <winsock2.h>
-  typedef unsigned __int32 in_addr_t;
-#else
-  #include <arpa/inet.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
-/*
- * This was introduced by Clang:
- *
- *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
- *
- * in some version (which version?); it has been picked up by GCC 5.0.
- */
-#ifndef __has_attribute
-  /*
-   * It's a macro, so you can check whether it's defined to check
-   * whether it's supported.
-   *
-   * If it's not, define it to always return 0, so that we move on to
-   * the fallback checks.
-   */
-  #define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
-   * (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
-   * versions of XL C support this?), or HP aCC A.06.10 and later.
-   */
-  #define PCAP_NORETURN __attribute((noreturn))
-#elif defined( _MSC_VER )
-  #define PCAP_NORETURN __declspec(noreturn)
-#else
-  #define PCAP_NORETURN
-#endif
-
-#if __has_attribute(__format__) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
-   * and later (do any earlier versions of XL C support this?),
-   * or HP aCC A.06.10 and later.
-   */
-  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-  #define PCAP_PRINTFLIKE(x,y)
-#endif
-
-static char *program_name;
-
-/* Forwards */
-static void PCAP_NORETURN usage(void);
-static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static void warn(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-
-#ifdef BDEBUG
-int dflag;
-#endif
-
-/*
- * On Windows, we need to open the file in binary mode, so that
- * we get all the bytes specified by the size we get from "fstat()".
- * On UNIX, that's not necessary.  O_BINARY is defined on Windows;
- * we define it as 0 if it's not defined, so it does nothing.
- */
-#ifndef O_BINARY
-#define O_BINARY	0
-#endif
-
-static char *
-read_infile(char *fname)
-{
-	register int i, fd, cc;
-	register char *cp;
-	struct stat buf;
-
-	fd = open(fname, O_RDONLY|O_BINARY);
-	if (fd < 0)
-		error("can't open %s: %s", fname, pcap_strerror(errno));
-
-	if (fstat(fd, &buf) < 0)
-		error("can't stat %s: %s", fname, pcap_strerror(errno));
-
-	cp = malloc((u_int)buf.st_size + 1);
-	if (cp == NULL)
-		error("malloc(%d) for %s: %s", (u_int)buf.st_size + 1,
-			fname, pcap_strerror(errno));
-	cc = read(fd, cp, (u_int)buf.st_size);
-	if (cc < 0)
-		error("read %s: %s", fname, pcap_strerror(errno));
-	if (cc != buf.st_size)
-		error("short read %s (%d != %d)", fname, cc, (int)buf.st_size);
-
-	close(fd);
-	/* replace "# comment" with spaces */
-	for (i = 0; i < cc; i++) {
-		if (cp[i] == '#')
-			while (i < cc && cp[i] != '\n')
-				cp[i++] = ' ';
-	}
-	cp[cc] = '\0';
-	return (cp);
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}
-
-/* VARARGS */
-static void
-warn(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-}
-
-/*
- * Copy arg vector into a new buffer, concatenating arguments with spaces.
- */
-static char *
-copy_argv(register char **argv)
-{
-	register char **p;
-	register u_int len = 0;
-	char *buf;
-	char *src, *dst;
-
-	p = argv;
-	if (*p == 0)
-		return 0;
-
-	while (*p)
-		len += strlen(*p++) + 1;
-
-	buf = (char *)malloc(len);
-	if (buf == NULL)
-		error("copy_argv: malloc");
-
-	p = argv;
-	dst = buf;
-	while ((src = *p++) != NULL) {
-		while ((*dst++ = *src++) != '\0')
-			;
-		dst[-1] = ' ';
-	}
-	dst[-1] = '\0';
-
-	return buf;
-}
-
-int
-main(int argc, char **argv)
-{
-	char *cp;
-	int op;
-#ifndef BDEBUG
-	int dflag;
-#endif
-	char *infile;
-	int Oflag;
-	long snaplen;
-	char *p;
-	int dlt;
-	bpf_u_int32 netmask = PCAP_NETMASK_UNKNOWN;
-	char *cmdbuf;
-	pcap_t *pd;
-	struct bpf_program fcode;
-
-#ifdef _WIN32
-	if(wsockinit() != 0) return 1;
-#endif /* _WIN32 */
-
-#ifndef BDEBUG
-	dflag = 1;
-#else
-	/* if optimizer debugging is enabled, output DOT graph
-	 * `dflag=4' is equivalent to -dddd to follow -d/-dd/-ddd
-	 * convention in tcpdump command line
-	 */
-	dflag = 4;
-#endif
-	infile = NULL;
-	Oflag = 1;
-	snaplen = 68;
-
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	opterr = 0;
-	while ((op = getopt(argc, argv, "dF:m:Os:")) != -1) {
-		switch (op) {
-
-		case 'd':
-			++dflag;
-			break;
-
-		case 'F':
-			infile = optarg;
-			break;
-
-		case 'O':
-			Oflag = 0;
-			break;
-
-		case 'm': {
-			in_addr_t addr;
-
-			addr = inet_addr(optarg);
-			if (addr == (in_addr_t)(-1))
-				error("invalid netmask %s", optarg);
-			netmask = addr;
-			break;
-		}
-
-		case 's': {
-			char *end;
-
-			snaplen = strtol(optarg, &end, 0);
-			if (optarg == end || *end != '\0'
-			    || snaplen < 0 || snaplen > 65535)
-				error("invalid snaplen %s", optarg);
-			else if (snaplen == 0)
-				snaplen = 65535;
-			break;
-		}
-
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	if (optind >= argc) {
-		usage();
-		/* NOTREACHED */
-	}
-
-	dlt = pcap_datalink_name_to_val(argv[optind]);
-	if (dlt < 0) {
-		dlt = (int)strtol(argv[optind], &p, 10);
-		if (p == argv[optind] || *p != '\0')
-			error("invalid data link type %s", argv[optind]);
-	}
-
-	if (infile)
-		cmdbuf = read_infile(infile);
-	else
-		cmdbuf = copy_argv(&argv[optind+1]);
-
-	pd = pcap_open_dead(dlt, snaplen);
-	if (pd == NULL)
-		error("Can't open fake pcap_t");
-
-	if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
-		error("%s", pcap_geterr(pd));
-
-	if (!bpf_validate(fcode.bf_insns, fcode.bf_len))
-		warn("Filter doesn't pass validation");
-
-#ifdef BDEBUG
-	// replace line feed with space
-	for (cp = cmdbuf; *cp != '\0'; ++cp) {
-		if (*cp == '\r' || *cp == '\n') {
-			*cp = ' ';
-		}
-	}
-	// only show machine code if BDEBUG defined, since dflag > 3
-	printf("machine codes for filter: %s\n", cmdbuf);
-#endif
-
-	bpf_dump(&fcode, dflag);
-	pcap_close(pd);
-	exit(0);
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "%s, with %s\n", program_name,
-	    pcap_lib_version());
-	(void)fprintf(stderr,
-	    "Usage: %s [-dO] [ -F file ] [ -m netmask] [ -s snaplen ] dlt [ expression ]\n",
-	    program_name);
-	exit(1);
-}

Property changes on: vendor/libpcap/dist/tests/filtertest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/reactivatetest.c
===================================================================
--- vendor/libpcap/dist/tests/reactivatetest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/reactivatetest.c	(nonexistent)
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#include <pcap.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-/* Forwards */
-static void error(const char *, ...);
-
-int
-main(void)
-{
-	char ebuf[PCAP_ERRBUF_SIZE];
-	pcap_t *pd;
-	int status = 0;
-
-	pd = pcap_open_live("lo0", 65535, 0, 1000, ebuf);
-	if (pd == NULL) {
-		pd = pcap_open_live("lo", 65535, 0, 1000, ebuf);
-		if (pd == NULL) {
-			error("Neither lo0 nor lo could be opened: %s",
-			    ebuf);
-			return 2;
-		}
-	}
-	status = pcap_activate(pd);
-	if (status != PCAP_ERROR_ACTIVATED) {
-		if (status == 0)
-			error("pcap_activate() of opened pcap_t succeeded");
-		else if (status == PCAP_ERROR)
-			error("pcap_activate() of opened pcap_t failed with %s, not PCAP_ERROR_ACTIVATED",
-			    pcap_geterr(pd));
-		else
-			error("pcap_activate() of opened pcap_t failed with %s, not PCAP_ERROR_ACTIVATED",
-			    pcap_statustostr(status));
-	}
-	return 0;
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "reactivatetest: ");
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}

Property changes on: vendor/libpcap/dist/tests/reactivatetest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/opentest.c
===================================================================
--- vendor/libpcap/dist/tests/opentest.c	(revision 333788)
+++ vendor/libpcap/dist/tests/opentest.c	(nonexistent)
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may 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.
- */
-
-#ifndef lint
-static const char copyright[] _U_ =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-#endif
-
-#include <pcap.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#ifdef _WIN32
-#include "getopt.h"
-#else
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-#define MAXIMUM_SNAPLEN		65535
-
-static char *program_name;
-
-/*
- * This was introduced by Clang:
- *
- *     http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
- *
- * in some version (which version?); it has been picked up by GCC 5.0.
- */
-#ifndef __has_attribute
-  /*
-   * It's a macro, so you can check whether it's defined to check
-   * whether it's supported.
-   *
-   * If it's not, define it to always return 0, so that we move on to
-   * the fallback checks.
-   */
-  #define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
-   * (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
-   * versions of XL C support this?), or HP aCC A.06.10 and later.
-   */
-  #define PCAP_NORETURN __attribute((noreturn))
-#elif defined( _MSC_VER )
-  #define PCAP_NORETURN __declspec(noreturn)
-#else
-  #define PCAP_NORETURN
-#endif
-
-#if __has_attribute(__format__) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
-    || (defined(__xlC__) && __xlC__ >= 0x0A01) \
-    || (defined(__HP_aCC) && __HP_aCC >= 61000)
-  /*
-   * Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
-   * and later (do any earlier versions of XL C support this?),
-   * or HP aCC A.06.10 and later.
-   */
-  #define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-  #define PCAP_PRINTFLIKE(x,y)
-#endif
-
-/* Forwards */
-static void PCAP_NORETURN usage(void);
-static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-static void warning(const char *, ...) PCAP_PRINTFLIKE(1, 2);
-
-int
-main(int argc, char **argv)
-{
-	register int op;
-	register char *cp, *device;
-	int dorfmon, dopromisc, snaplen, useactivate, bufsize;
-	char ebuf[PCAP_ERRBUF_SIZE];
-	pcap_t *pd;
-	int status = 0;
-
-	device = NULL;
-	dorfmon = 0;
-	dopromisc = 0;
-	snaplen = MAXIMUM_SNAPLEN;
-	bufsize = 0;
-	useactivate = 0;
-	if ((cp = strrchr(argv[0], '/')) != NULL)
-		program_name = cp + 1;
-	else
-		program_name = argv[0];
-
-	opterr = 0;
-	while ((op = getopt(argc, argv, "i:Ips:aB:")) != -1) {
-		switch (op) {
-
-		case 'i':
-			device = optarg;
-			break;
-
-		case 'I':
-			dorfmon = 1;
-			useactivate = 1;	/* required for rfmon */
-			break;
-
-		case 'p':
-			dopromisc = 1;
-			break;
-
-		case 's': {
-			char *end;
-
-			snaplen = strtol(optarg, &end, 0);
-			if (optarg == end || *end != '\0'
-			    || snaplen < 0 || snaplen > MAXIMUM_SNAPLEN)
-				error("invalid snaplen %s", optarg);
-			else if (snaplen == 0)
-				snaplen = MAXIMUM_SNAPLEN;
-			break;
-		}
-
-		case 'B':
-			bufsize = atoi(optarg)*1024;
-			if (bufsize <= 0)
-				error("invalid packet buffer size %s", optarg);
-			useactivate = 1;	/* required for bufsize */
-			break;
-
-		case 'a':
-			useactivate = 1;
-			break;
-
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	if (device == NULL) {
-		device = pcap_lookupdev(ebuf);
-		if (device == NULL)
-			error("pcap_lookupdev failed: %s", ebuf);
-	}
-	if (useactivate) {
-		pd = pcap_create(device, ebuf);
-		if (pd == NULL)
-			error("%s: pcap_create failed: %s", device, ebuf);
-		status = pcap_set_snaplen(pd, snaplen);
-		if (status != 0)
-			error("%s: pcap_set_snaplen failed: %s",
-			    device, pcap_statustostr(status));
-		if (dopromisc) {
-			status = pcap_set_promisc(pd, 1);
-			if (status != 0)
-				error("%s: pcap_set_promisc failed: %s",
-				    device, pcap_statustostr(status));
-		}
-		if (dorfmon) {
-			status = pcap_set_rfmon(pd, 1);
-			if (status != 0)
-				error("%s: pcap_set_rfmon failed: %s",
-				    device, pcap_statustostr(status));
-		}
-		status = pcap_set_timeout(pd, 1000);
-		if (status != 0)
-			error("%s: pcap_set_timeout failed: %s",
-			    device, pcap_statustostr(status));
-		if (bufsize != 0) {
-			status = pcap_set_buffer_size(pd, bufsize);
-			if (status != 0)
-				error("%s: pcap_set_buffer_size failed: %s",
-				    device, pcap_statustostr(status));
-		}
-		status = pcap_activate(pd);
-		if (status < 0) {
-			/*
-			 * pcap_activate() failed.
-			 */
-			error("%s: %s\n(%s)", device,
-			    pcap_statustostr(status), pcap_geterr(pd));
-		} else if (status > 0) {
-			/*
-			 * pcap_activate() succeeded, but it's warning us
-			 * of a problem it had.
-			 */
-			warning("%s: %s\n(%s)", device,
-			    pcap_statustostr(status), pcap_geterr(pd));
-		} else
-			printf("%s opened successfully\n", device);
-	} else {
-		*ebuf = '\0';
-		pd = pcap_open_live(device, 65535, 0, 1000, ebuf);
-		if (pd == NULL)
-			error("%s", ebuf);
-		else if (*ebuf)
-			warning("%s", ebuf);
-		else
-			printf("%s opened successfully\n", device);
-	}
-	pcap_close(pd);
-	exit(status < 0 ? 1 : 0);
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr,
-	    "Usage: %s [ -Ipa ] [ -i interface ] [ -s snaplen ] [ -B bufsize ]\n",
-	    program_name);
-	exit(1);
-}
-
-/* VARARGS */
-static void
-error(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-	exit(1);
-	/* NOTREACHED */
-}
-
-/* VARARGS */
-static void
-warning(const char *fmt, ...)
-{
-	va_list ap;
-
-	(void)fprintf(stderr, "%s: WARNING: ", program_name);
-	va_start(ap, fmt);
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	if (*fmt) {
-		fmt += strlen(fmt);
-		if (fmt[-1] != '\n')
-			(void)fputc('\n', stderr);
-	}
-}

Property changes on: vendor/libpcap/dist/tests/opentest.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: vendor/libpcap/dist/tests/shb-option-too-long.pcapng
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: vendor/libpcap/dist/tests/shb-option-too-long.pcapng
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: vendor/libpcap/dist/varattrs.h
===================================================================
--- vendor/libpcap/dist/varattrs.h	(nonexistent)
+++ vendor/libpcap/dist/varattrs.h	(revision 333789)
@@ -0,0 +1,59 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef varattrs_h
+#define varattrs_h
+
+#include <pcap/compiler-tests.h>
+
+/*
+ * Attributes to apply to variables, using various compiler-specific
+ * extensions.
+ */
+
+#if __has_attribute(unused) \
+    || PCAP_IS_AT_LEAST_GNUC_VERSION(2,0)
+  /*
+   * Compiler with support for __attribute__((unused)), or GCC 2.0 and
+   * later, so it supports __attribute__((unused)).
+   */
+  #define _U_ __attribute__((unused))
+#else
+  /*
+   * We don't know of any way to mark a variable as unused.
+   */
+  #define _U_
+#endif
+
+#endif

Property changes on: vendor/libpcap/dist/varattrs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property