Module Name: src
Committed By: christos
Date: Wed Nov 19 19:33:31 UTC 2014
Modified Files:
src/external/bsd/libpcap: libpcap2netbsd
src/external/bsd/libpcap/dist: arcnet.h atmuni31.h bpf_dump.c
bpf_image.c dlpisubs.c dlpisubs.h etherent.c ethertype.h
fad-getad.c fad-gifc.c fad-glifc.c fad-null.c fad-sita.c
fad-win32.c gencode.c gencode.h grammar.y ieee80211.h inet.c llc.h
nametoaddr.c nlpid.h optimize.c pcap-bpf.c pcap-bpf.h
pcap-bt-linux.c pcap-bt-linux.h pcap-bt-monitor-linux.c
pcap-bt-monitor-linux.h pcap-can-linux.c pcap-can-linux.h
pcap-canusb-linux.c pcap-canusb-linux.h pcap-common.c pcap-common.h
pcap-config.1 pcap-dag.c pcap-dag.h pcap-dbus.c pcap-dbus.h
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-netfilter-linux.c
pcap-netfilter-linux.h pcap-nit.c pcap-null.c pcap-pf.c
pcap-septel.c pcap-septel.h pcap-sita.c pcap-sita.h pcap-snf.c
pcap-snf.h pcap-snit.c pcap-snoop.c pcap-stdinc.h pcap-usb-linux.c
pcap-usb-linux.h pcap-win32.c pcap.3pcap.in pcap.c pcap.h
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_dump_open.3pcap.in pcap_file.3pcap
pcap_fileno.3pcap pcap_findalldevs.3pcap pcap_freecode.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_open_offline.3pcap.in pcap_set_buffer_size.3pcap
pcap_set_datalink.3pcap pcap_set_immediate_mode.3pcap
pcap_set_promisc.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 ppp.h savefile.c scanner.l
sf-pcap-ng.c sf-pcap-ng.h sf-pcap.c sf-pcap.h sunatmpos.h
src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c
src/external/bsd/libpcap/dist/lbl: os-aix4.h os-hpux11.h os-osf4.h
os-osf5.h os-solaris2.h os-sunos4.h os-ultrix4.h
src/external/bsd/libpcap/dist/pcap: bluetooth.h bpf.h ipnet.h namedb.h
nflog.h pcap.h sll.h usb.h vlan.h
src/external/bsd/libpcap/dist/tests: capturetest.c filtertest.c
findalldevstest.c opentest.c reactivatetest.c selpolltest.c
valgrindtest.c
src/external/bsd/libpcap/include: config.h
src/external/bsd/libpcap/lib: Makefile version.c version.h
Removed Files:
src/external/bsd/libpcap/dist/tests: nonblocktest.c
Log Message:
merge changes
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/libpcap2netbsd
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libpcap/dist/arcnet.h \
src/external/bsd/libpcap/dist/atmuni31.h \
src/external/bsd/libpcap/dist/bpf_dump.c \
src/external/bsd/libpcap/dist/etherent.c \
src/external/bsd/libpcap/dist/ethertype.h \
src/external/bsd/libpcap/dist/fad-sita.c \
src/external/bsd/libpcap/dist/inet.c src/external/bsd/libpcap/dist/llc.h \
src/external/bsd/libpcap/dist/nlpid.h \
src/external/bsd/libpcap/dist/pcap-bpf.h \
src/external/bsd/libpcap/dist/pcap-can-linux.c \
src/external/bsd/libpcap/dist/pcap-can-linux.h \
src/external/bsd/libpcap/dist/pcap-dos.h \
src/external/bsd/libpcap/dist/pcap-enet.c \
src/external/bsd/libpcap/dist/pcap-sita.c \
src/external/bsd/libpcap/dist/pcap-snf.c \
src/external/bsd/libpcap/dist/pcap-snf.h \
src/external/bsd/libpcap/dist/pcap-stdinc.h \
src/external/bsd/libpcap/dist/pcap_activate.3pcap \
src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \
src/external/bsd/libpcap/dist/pcap_close.3pcap \
src/external/bsd/libpcap/dist/pcap_create.3pcap \
src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \
src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \
src/external/bsd/libpcap/dist/pcap_dump.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_close.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_file.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \
src/external/bsd/libpcap/dist/pcap_file.3pcap \
src/external/bsd/libpcap/dist/pcap_fileno.3pcap \
src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap \
src/external/bsd/libpcap/dist/pcap_freecode.3pcap \
src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap \
src/external/bsd/libpcap/dist/pcap_geterr.3pcap \
src/external/bsd/libpcap/dist/pcap_inject.3pcap \
src/external/bsd/libpcap/dist/pcap_lib_version.3pcap \
src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap \
src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap \
src/external/bsd/libpcap/dist/pcap_major_version.3pcap \
src/external/bsd/libpcap/dist/pcap_open_live.3pcap \
src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap \
src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap \
src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap \
src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap \
src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap \
src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap \
src/external/bsd/libpcap/dist/pcap_setdirection.3pcap \
src/external/bsd/libpcap/dist/pcap_setfilter.3pcap \
src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap \
src/external/bsd/libpcap/dist/pcap_stats.3pcap \
src/external/bsd/libpcap/dist/pcap_statustostr.3pcap \
src/external/bsd/libpcap/dist/pcap_strerror.3pcap \
src/external/bsd/libpcap/dist/ppp.h \
src/external/bsd/libpcap/dist/sf-pcap-ng.h \
src/external/bsd/libpcap/dist/sf-pcap.h \
src/external/bsd/libpcap/dist/sunatmpos.h
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/libpcap/dist/bpf_image.c \
src/external/bsd/libpcap/dist/dlpisubs.c \
src/external/bsd/libpcap/dist/dlpisubs.h \
src/external/bsd/libpcap/dist/fad-getad.c \
src/external/bsd/libpcap/dist/fad-gifc.c \
src/external/bsd/libpcap/dist/fad-glifc.c \
src/external/bsd/libpcap/dist/fad-null.c \
src/external/bsd/libpcap/dist/fad-win32.c \
src/external/bsd/libpcap/dist/gencode.h \
src/external/bsd/libpcap/dist/nametoaddr.c \
src/external/bsd/libpcap/dist/pcap-bt-linux.c \
src/external/bsd/libpcap/dist/pcap-bt-linux.h \
src/external/bsd/libpcap/dist/pcap-common.c \
src/external/bsd/libpcap/dist/pcap-dag.c \
src/external/bsd/libpcap/dist/pcap-dag.h \
src/external/bsd/libpcap/dist/pcap-dlpi.c \
src/external/bsd/libpcap/dist/pcap-dos.c \
src/external/bsd/libpcap/dist/pcap-int.h \
src/external/bsd/libpcap/dist/pcap-libdlpi.c \
src/external/bsd/libpcap/dist/pcap-linux.c \
src/external/bsd/libpcap/dist/pcap-nit.c \
src/external/bsd/libpcap/dist/pcap-null.c \
src/external/bsd/libpcap/dist/pcap-pf.c \
src/external/bsd/libpcap/dist/pcap-septel.c \
src/external/bsd/libpcap/dist/pcap-septel.h \
src/external/bsd/libpcap/dist/pcap-snit.c \
src/external/bsd/libpcap/dist/pcap-snoop.c \
src/external/bsd/libpcap/dist/pcap-usb-linux.c \
src/external/bsd/libpcap/dist/pcap-usb-linux.h \
src/external/bsd/libpcap/dist/pcap-win32.c \
src/external/bsd/libpcap/dist/pcap_breakloop.3pcap \
src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap \
src/external/bsd/libpcap/dist/pcap_loop.3pcap \
src/external/bsd/libpcap/dist/pcap_next_ex.3pcap \
src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap \
src/external/bsd/libpcap/dist/pcap_snapshot.3pcap \
src/external/bsd/libpcap/dist/savefile.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/gencode.c \
src/external/bsd/libpcap/dist/optimize.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/grammar.y \
src/external/bsd/libpcap/dist/pcap-bpf.c \
src/external/bsd/libpcap/dist/pcap.3pcap.in \
src/external/bsd/libpcap/dist/pcap.c \
src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in \
src/external/bsd/libpcap/dist/sf-pcap-ng.c \
src/external/bsd/libpcap/dist/sf-pcap.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/libpcap/dist/ieee80211.h \
src/external/bsd/libpcap/dist/pcap-canusb-linux.c \
src/external/bsd/libpcap/dist/pcap-canusb-linux.h \
src/external/bsd/libpcap/dist/pcap-common.h \
src/external/bsd/libpcap/dist/pcap-netfilter-linux.c \
src/external/bsd/libpcap/dist/pcap-netfilter-linux.h \
src/external/bsd/libpcap/dist/pcap-sita.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c \
src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h \
src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/pcap-config.1 \
src/external/bsd/libpcap/dist/pcap-namedb.h \
src/external/bsd/libpcap/dist/pcap.h \
src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/pcap-dbus.c \
src/external/bsd/libpcap/dist/pcap-dbus.h \
src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap \
src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/scanner.l
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libpcap/dist/lbl/os-aix4.h \
src/external/bsd/libpcap/dist/lbl/os-hpux11.h \
src/external/bsd/libpcap/dist/lbl/os-osf4.h \
src/external/bsd/libpcap/dist/lbl/os-osf5.h \
src/external/bsd/libpcap/dist/lbl/os-solaris2.h \
src/external/bsd/libpcap/dist/lbl/os-sunos4.h \
src/external/bsd/libpcap/dist/lbl/os-ultrix4.h
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libpcap/dist/pcap/bluetooth.h \
src/external/bsd/libpcap/dist/pcap/namedb.h \
src/external/bsd/libpcap/dist/pcap/sll.h \
src/external/bsd/libpcap/dist/pcap/usb.h \
src/external/bsd/libpcap/dist/pcap/vlan.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/pcap/bpf.h
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/libpcap/dist/pcap/ipnet.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libpcap/dist/pcap/nflog.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap/pcap.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libpcap/dist/tests/capturetest.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/tests/filtertest.c \
src/external/bsd/libpcap/dist/tests/findalldevstest.c \
src/external/bsd/libpcap/dist/tests/opentest.c \
src/external/bsd/libpcap/dist/tests/reactivatetest.c \
src/external/bsd/libpcap/dist/tests/selpolltest.c \
src/external/bsd/libpcap/dist/tests/valgrindtest.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/tests/nonblocktest.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/include/config.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/lib/version.c \
src/external/bsd/libpcap/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/libpcap2netbsd
diff -u src/external/bsd/libpcap/libpcap2netbsd:1.1 src/external/bsd/libpcap/libpcap2netbsd:1.2
--- src/external/bsd/libpcap/libpcap2netbsd:1.1 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/libpcap2netbsd Wed Nov 19 14:33:30 2014
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libpcap2netbsd,v 1.1 2013/04/06 17:29:53 christos Exp $
+# $NetBSD: libpcap2netbsd,v 1.2 2014/11/19 19:33:30 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
# $ cd /some/where/temporary
# $ tar xpfz /new/libpcap/release/tar/file
# $ sh /usr/src/external/bsd/libpcap/libpcap2netbsd libpcap-x.y.z
-# $ cd libpcap-YYYYMMDD
+# $ cd libpcap-x.y.z
# $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import libpcap-x.y.z" src/external/bsd/libpcap/dist TCPDUMP libpcap-x_y_z
# - check makefiles to see if any extra sources have been added.
# - update distrib/sets if necessary.
@@ -55,33 +55,6 @@ cd $r
### Remove the $'s around RCS tags
cleantags $r
-### Add our NetBSD RCS Id
-find $r -type f -name '*.[chly]' -print | while read c; do
- sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/* \$NetBSD\$ */" >/tmp/libpcap3n$$
-echo "" >>/tmp/libpcap3n$$
-cat $c >> /tmp/libpcap3n$$
-mv /tmp/libpcap3n$$ $c && echo added NetBSD RCS tag to $c
- )
-done
-
-find $r -type f -name '*.[0-9]' -print | while read m; do
- sed 1q < $m | grep -q '\$NetBSD' || (
-echo ".\\\" \$NetBSD\$" >/tmp/libpcap2m$$
-echo ".\\\"" >>/tmp/libpcap2m$$
-cat $m >> /tmp/libpcap2m$$
-mv /tmp/libpcap2m$$ $m && echo added NetBSD RCS tag to $m
- )
-done
-
-find $r -type f -name '*.texi' -print | while read t; do
- sed "2 s/^/@c \$NetBSD\$\\
-/" < $t > /tmp/libpcap4t$$
- mv /tmp/libpcap4t$$ $t && echo added NetBSD RCS tag to $t
-done
-
-echo done
-
### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
find $r -type d -name "CVS" -print | xargs rm -r
Index: src/external/bsd/libpcap/dist/arcnet.h
diff -u src/external/bsd/libpcap/dist/arcnet.h:1.1.1.4 src/external/bsd/libpcap/dist/arcnet.h:1.2
--- src/external/bsd/libpcap/dist/arcnet.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/arcnet.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: arcnet.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/atmuni31.h
diff -u src/external/bsd/libpcap/dist/atmuni31.h:1.1.1.4 src/external/bsd/libpcap/dist/atmuni31.h:1.2
--- src/external/bsd/libpcap/dist/atmuni31.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/atmuni31.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: atmuni31.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1997 Yen Yen Lim and North Dakota State University
* All rights reserved.
Index: src/external/bsd/libpcap/dist/bpf_dump.c
diff -u src/external/bsd/libpcap/dist/bpf_dump.c:1.1.1.4 src/external/bsd/libpcap/dist/bpf_dump.c:1.2
--- src/external/bsd/libpcap/dist/bpf_dump.c:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/bpf_dump.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: bpf_dump.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: bpf_dump.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/etherent.c
diff -u src/external/bsd/libpcap/dist/etherent.c:1.1.1.4 src/external/bsd/libpcap/dist/etherent.c:1.2
--- src/external/bsd/libpcap/dist/etherent.c:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/etherent.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: etherent.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: etherent.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/ethertype.h
diff -u src/external/bsd/libpcap/dist/ethertype.h:1.1.1.4 src/external/bsd/libpcap/dist/ethertype.h:1.2
--- src/external/bsd/libpcap/dist/ethertype.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/ethertype.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: ethertype.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/fad-sita.c
diff -u src/external/bsd/libpcap/dist/fad-sita.c:1.1.1.4 src/external/bsd/libpcap/dist/fad-sita.c:1.2
--- src/external/bsd/libpcap/dist/fad-sita.c:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/fad-sita.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-sita.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* fad-sita.c: Packet capture interface additions for SITA ACN devices
*
@@ -24,6 +26,9 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-sita.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/inet.c
diff -u src/external/bsd/libpcap/dist/inet.c:1.1.1.4 src/external/bsd/libpcap/dist/inet.c:1.2
--- src/external/bsd/libpcap/dist/inet.c:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/inet.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: inet.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -32,6 +34,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: inet.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/llc.h
diff -u src/external/bsd/libpcap/dist/llc.h:1.1.1.4 src/external/bsd/libpcap/dist/llc.h:1.2
--- src/external/bsd/libpcap/dist/llc.h:1.1.1.4 Wed Nov 19 13:04:51 2014
+++ src/external/bsd/libpcap/dist/llc.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: llc.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/nlpid.h
diff -u src/external/bsd/libpcap/dist/nlpid.h:1.1.1.4 src/external/bsd/libpcap/dist/nlpid.h:1.2
--- src/external/bsd/libpcap/dist/nlpid.h:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/nlpid.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: nlpid.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1996
* Juniper Networks, Inc. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-bpf.h
diff -u src/external/bsd/libpcap/dist/pcap-bpf.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap-bpf.h:1.2
--- src/external/bsd/libpcap/dist/pcap-bpf.h:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-bpf.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-bpf.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-can-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-can-linux.c:1.1.1.4 src/external/bsd/libpcap/dist/pcap-can-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-can-linux.c:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-can-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-can-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2009 Felix Obenhuber
* All rights reserved.
@@ -32,6 +34,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-can-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-can-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-can-linux.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap-can-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-can-linux.h:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-can-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-can-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2009 Felix Obenhuber
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-dos.h
diff -u src/external/bsd/libpcap/dist/pcap-dos.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap-dos.h:1.2
--- src/external/bsd/libpcap/dist/pcap-dos.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-dos.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dos.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Internal details for libpcap on DOS.
* 32-bit targets: djgpp, Pharlap or DOS4GW.
Index: src/external/bsd/libpcap/dist/pcap-enet.c
diff -u src/external/bsd/libpcap/dist/pcap-enet.c:1.1.1.4 src/external/bsd/libpcap/dist/pcap-enet.c:1.2
--- src/external/bsd/libpcap/dist/pcap-enet.c:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-enet.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-enet.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Stanford Enetfilter subroutines for tcpdump
*
@@ -7,6 +9,9 @@
* Rayan Zachariassen, CA*Net
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-enet.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-sita.c
diff -u src/external/bsd/libpcap/dist/pcap-sita.c:1.1.1.4 src/external/bsd/libpcap/dist/pcap-sita.c:1.2
--- src/external/bsd/libpcap/dist/pcap-sita.c:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-sita.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-sita.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-sita.c: Packet capture interface additions for SITA ACN devices
*
@@ -24,6 +26,9 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-sita.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-snf.c
diff -u src/external/bsd/libpcap/dist/pcap-snf.c:1.1.1.4 src/external/bsd/libpcap/dist/pcap-snf.c:1.2
--- src/external/bsd/libpcap/dist/pcap-snf.c:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-snf.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,8 @@
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-snf.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
+/* $NetBSD: pcap-snf.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-snf.h
diff -u src/external/bsd/libpcap/dist/pcap-snf.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap-snf.h:1.2
--- src/external/bsd/libpcap/dist/pcap-snf.h:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-snf.h Wed Nov 19 14:33:30 2014
@@ -1,2 +1,4 @@
+/* $NetBSD: pcap-snf.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
pcap_t *snf_create(const char *, char *, int *);
int snf_findalldevs(pcap_if_t **devlistp, char *errbuf);
Index: src/external/bsd/libpcap/dist/pcap-stdinc.h
diff -u src/external/bsd/libpcap/dist/pcap-stdinc.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap-stdinc.h:1.2
--- src/external/bsd/libpcap/dist/pcap-stdinc.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-stdinc.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-stdinc.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
* Copyright (c) 2005 - 2009 CACE Technologies, Inc. Davis (California)
Index: src/external/bsd/libpcap/dist/pcap_activate.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_activate.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_activate.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_activate.3pcap:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_activate.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_activate.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap:1.1.1.4 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_can_set_rfmon.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_close.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_close.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_close.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_close.3pcap:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap_close.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_close.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_create.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_create.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_create.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_create.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_create.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_create.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_datalink_name_to_val.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_datalink_val_to_name.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_dump.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_dump.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_dump.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_dump.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_dump.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_dump.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_dump_close.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_dump_close.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_dump_close.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_dump_close.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_dump_close.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_dump_close.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_dump_file.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_dump_file.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_dump_file.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_dump_file.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_dump_file.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_dump_file.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_dump_flush.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap:1.1.1.4 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_dump_ftell.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_file.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_file.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_file.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_file.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_file.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_file.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_fileno.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_fileno.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_fileno.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_fileno.3pcap:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_fileno.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_fileno.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap:1.1.1.4 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_findalldevs.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_freecode.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_freecode.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_freecode.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_freecode.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_freecode.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_freecode.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_get_selectable_fd.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_geterr.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_geterr.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_geterr.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_geterr.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_geterr.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_geterr.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_inject.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_inject.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_inject.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_inject.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_inject.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_inject.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_lib_version.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_lib_version.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_lib_version.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_lib_version.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_lib_version.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_lib_version.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_lookupdev.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_lookupnet.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_major_version.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_major_version.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_major_version.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_major_version.3pcap:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_major_version.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_major_version.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_open_live.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_open_live.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_open_live.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_open_live.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_open_live.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_open_live.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_buffer_size.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_datalink.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_promisc.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap:1.1.1.4 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_rfmon.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_snaplen.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_timeout.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_setdirection.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_setdirection.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_setdirection.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_setdirection.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_setdirection.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_setdirection.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_setfilter.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_setfilter.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_setfilter.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_setfilter.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_setfilter.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_setfilter.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap:1.1.1.4 Wed Nov 19 13:04:51 2014
+++ src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_setnonblock.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_stats.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_stats.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_stats.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_stats.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_stats.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_stats.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_statustostr.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_statustostr.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_statustostr.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_statustostr.3pcap:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_statustostr.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_statustostr.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_strerror.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_strerror.3pcap:1.1.1.4 src/external/bsd/libpcap/dist/pcap_strerror.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_strerror.3pcap:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_strerror.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_strerror.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/ppp.h
diff -u src/external/bsd/libpcap/dist/ppp.h:1.1.1.4 src/external/bsd/libpcap/dist/ppp.h:1.2
--- src/external/bsd/libpcap/dist/ppp.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/ppp.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: ppp.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Point to Point Protocol (PPP) RFC1331
*
Index: src/external/bsd/libpcap/dist/sf-pcap-ng.h
diff -u src/external/bsd/libpcap/dist/sf-pcap-ng.h:1.1.1.4 src/external/bsd/libpcap/dist/sf-pcap-ng.h:1.2
--- src/external/bsd/libpcap/dist/sf-pcap-ng.h:1.1.1.4 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/sf-pcap-ng.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: sf-pcap-ng.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/sf-pcap.h
diff -u src/external/bsd/libpcap/dist/sf-pcap.h:1.1.1.4 src/external/bsd/libpcap/dist/sf-pcap.h:1.2
--- src/external/bsd/libpcap/dist/sf-pcap.h:1.1.1.4 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/sf-pcap.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: sf-pcap.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/sunatmpos.h
diff -u src/external/bsd/libpcap/dist/sunatmpos.h:1.1.1.4 src/external/bsd/libpcap/dist/sunatmpos.h:1.2
--- src/external/bsd/libpcap/dist/sunatmpos.h:1.1.1.4 Wed Nov 19 13:04:51 2014
+++ src/external/bsd/libpcap/dist/sunatmpos.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: sunatmpos.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1997 Yen Yen Lim and North Dakota State University
* All rights reserved.
Index: src/external/bsd/libpcap/dist/bpf_image.c
diff -u src/external/bsd/libpcap/dist/bpf_image.c:1.1.1.5 src/external/bsd/libpcap/dist/bpf_image.c:1.2
--- src/external/bsd/libpcap/dist/bpf_image.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/bpf_image.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: bpf_image.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: bpf_image.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/dlpisubs.c
diff -u src/external/bsd/libpcap/dist/dlpisubs.c:1.1.1.5 src/external/bsd/libpcap/dist/dlpisubs.c:1.2
--- src/external/bsd/libpcap/dist/dlpisubs.c:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/dlpisubs.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: dlpisubs.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* This code is derived from code formerly in pcap-dlpi.c, originally
* contributed by Atanu Ghosh ([email protected]), University College
@@ -11,6 +13,9 @@
* by pcap-[dlpi,libdlpi].c.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dlpisubs.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/dlpisubs.h
diff -u src/external/bsd/libpcap/dist/dlpisubs.h:1.1.1.5 src/external/bsd/libpcap/dist/dlpisubs.h:1.2
--- src/external/bsd/libpcap/dist/dlpisubs.h:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/dlpisubs.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: dlpisubs.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
#ifndef dlpisubs_h
#define dlpisubs_h
Index: src/external/bsd/libpcap/dist/fad-getad.c
diff -u src/external/bsd/libpcap/dist/fad-getad.c:1.1.1.5 src/external/bsd/libpcap/dist/fad-getad.c:1.2
--- src/external/bsd/libpcap/dist/fad-getad.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/fad-getad.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-getad.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -32,6 +34,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-getad.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/fad-gifc.c
diff -u src/external/bsd/libpcap/dist/fad-gifc.c:1.1.1.5 src/external/bsd/libpcap/dist/fad-gifc.c:1.2
--- src/external/bsd/libpcap/dist/fad-gifc.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/fad-gifc.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-gifc.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -32,6 +34,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-gifc.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/fad-glifc.c
diff -u src/external/bsd/libpcap/dist/fad-glifc.c:1.1.1.5 src/external/bsd/libpcap/dist/fad-glifc.c:1.2
--- src/external/bsd/libpcap/dist/fad-glifc.c:1.1.1.5 Wed Nov 19 13:04:51 2014
+++ src/external/bsd/libpcap/dist/fad-glifc.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-glifc.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -32,6 +34,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-glifc.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/fad-null.c
diff -u src/external/bsd/libpcap/dist/fad-null.c:1.1.1.5 src/external/bsd/libpcap/dist/fad-null.c:1.2
--- src/external/bsd/libpcap/dist/fad-null.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/fad-null.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-null.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
@@ -32,6 +34,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-null.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/fad-win32.c
diff -u src/external/bsd/libpcap/dist/fad-win32.c:1.1.1.5 src/external/bsd/libpcap/dist/fad-win32.c:1.2
--- src/external/bsd/libpcap/dist/fad-win32.c:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/fad-win32.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: fad-win32.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
* Copyright (c) 2005 - 2006 CACE Technologies, Davis (California)
@@ -31,6 +33,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fad-win32.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/gencode.h
diff -u src/external/bsd/libpcap/dist/gencode.h:1.1.1.5 src/external/bsd/libpcap/dist/gencode.h:1.2
--- src/external/bsd/libpcap/dist/gencode.h:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/gencode.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: gencode.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/nametoaddr.c
diff -u src/external/bsd/libpcap/dist/nametoaddr.c:1.1.1.5 src/external/bsd/libpcap/dist/nametoaddr.c:1.2
--- src/external/bsd/libpcap/dist/nametoaddr.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/nametoaddr.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: nametoaddr.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
* The Regents of the University of California. All rights reserved.
@@ -22,6 +24,9 @@
* These functions are not time critical.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: nametoaddr.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-bt-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-bt-linux.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-bt-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-bt-linux.c:1.1.1.5 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap-bt-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-bt-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
@@ -32,6 +34,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-bt-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-bt-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-bt-linux.h:1.1.1.5 src/external/bsd/libpcap/dist/pcap-bt-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-bt-linux.h:1.1.1.5 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap-bt-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-bt-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-common.c
diff -u src/external/bsd/libpcap/dist/pcap-common.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-common.c:1.2
--- src/external/bsd/libpcap/dist/pcap-common.c:1.1.1.5 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap-common.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-common.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
@@ -21,6 +23,9 @@
* pcap-common.c - common code for pcap and pcap-ng files
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-common.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-dag.c
diff -u src/external/bsd/libpcap/dist/pcap-dag.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-dag.c:1.2
--- src/external/bsd/libpcap/dist/pcap-dag.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-dag.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dag.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-dag.c: Packet capture interface for Endace DAG card.
*
@@ -15,6 +17,9 @@
* Stephen Donnelly <[email protected]>
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-dag.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-dag.h
diff -u src/external/bsd/libpcap/dist/pcap-dag.h:1.1.1.5 src/external/bsd/libpcap/dist/pcap-dag.h:1.2
--- src/external/bsd/libpcap/dist/pcap-dag.h:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-dag.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dag.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-dag.c: Packet capture interface for Endace DAG card.
*
Index: src/external/bsd/libpcap/dist/pcap-dlpi.c
diff -u src/external/bsd/libpcap/dist/pcap-dlpi.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-dlpi.c:1.2
--- src/external/bsd/libpcap/dist/pcap-dlpi.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-dlpi.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dlpi.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
@@ -68,6 +70,9 @@
* DL_HP_RAWDLS?
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-dlpi.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-dos.c
diff -u src/external/bsd/libpcap/dist/pcap-dos.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-dos.c:1.2
--- src/external/bsd/libpcap/dist/pcap-dos.c:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-dos.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dos.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* This file is part of DOS-libpcap
* Ported to DOS/DOSX by G. Vanem <[email protected]>
Index: src/external/bsd/libpcap/dist/pcap-int.h
diff -u src/external/bsd/libpcap/dist/pcap-int.h:1.1.1.5 src/external/bsd/libpcap/dist/pcap-int.h:1.2
--- src/external/bsd/libpcap/dist/pcap-int.h:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-int.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-int.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-libdlpi.c
diff -u src/external/bsd/libpcap/dist/pcap-libdlpi.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-libdlpi.c:1.2
--- src/external/bsd/libpcap/dist/pcap-libdlpi.c:1.1.1.5 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-libdlpi.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-libdlpi.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
@@ -24,6 +26,9 @@
* Packet capture routines for DLPI using libdlpi under SunOS 5.11.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-libdlpi.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-linux.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-linux.c:1.1.1.5 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-linux.c: Packet capture interface to the Linux kernel
*
@@ -112,6 +114,9 @@
#define _GNU_SOURCE
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-nit.c
diff -u src/external/bsd/libpcap/dist/pcap-nit.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-nit.c:1.2
--- src/external/bsd/libpcap/dist/pcap-nit.c:1.1.1.5 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap-nit.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-nit.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-nit.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-null.c
diff -u src/external/bsd/libpcap/dist/pcap-null.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-null.c:1.2
--- src/external/bsd/libpcap/dist/pcap-null.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-null.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-null.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-null.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-pf.c
diff -u src/external/bsd/libpcap/dist/pcap-pf.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-pf.c:1.2
--- src/external/bsd/libpcap/dist/pcap-pf.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-pf.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-pf.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -22,6 +24,9 @@
* Extraction/creation by Jeffrey Mogul, DECWRL
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-pf.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-septel.c
diff -u src/external/bsd/libpcap/dist/pcap-septel.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-septel.c:1.2
--- src/external/bsd/libpcap/dist/pcap-septel.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-septel.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-septel.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-septel.c: Packet capture interface for Intel/Septel card.
*
@@ -14,6 +16,9 @@
* (+961 3 485243)
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-septel.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-septel.h
diff -u src/external/bsd/libpcap/dist/pcap-septel.h:1.1.1.5 src/external/bsd/libpcap/dist/pcap-septel.h:1.2
--- src/external/bsd/libpcap/dist/pcap-septel.h:1.1.1.5 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-septel.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-septel.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-septel.c: Packet capture interface for Intel Septel card
*
Index: src/external/bsd/libpcap/dist/pcap-snit.c
diff -u src/external/bsd/libpcap/dist/pcap-snit.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-snit.c:1.2
--- src/external/bsd/libpcap/dist/pcap-snit.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-snit.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-snit.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
@@ -23,6 +25,9 @@
* This module now handles the STREAMS based NIT.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-snit.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-snoop.c
diff -u src/external/bsd/libpcap/dist/pcap-snoop.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-snoop.c:1.2
--- src/external/bsd/libpcap/dist/pcap-snoop.c:1.1.1.5 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-snoop.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-snoop.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-snoop.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-usb-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-usb-linux.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-usb-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-usb-linux.c:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-usb-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-usb-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
@@ -33,6 +35,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-usb-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-usb-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-usb-linux.h:1.1.1.5 src/external/bsd/libpcap/dist/pcap-usb-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-usb-linux.h:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-usb-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-usb-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-win32.c
diff -u src/external/bsd/libpcap/dist/pcap-win32.c:1.1.1.5 src/external/bsd/libpcap/dist/pcap-win32.c:1.2
--- src/external/bsd/libpcap/dist/pcap-win32.c:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-win32.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-win32.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy)
* Copyright (c) 2005 - 2008 CACE Technologies, Davis (California)
Index: src/external/bsd/libpcap/dist/pcap_breakloop.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_breakloop.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_breakloop.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_breakloop.3pcap:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_breakloop.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_breakloop.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_is_swapped.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_loop.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_loop.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_loop.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_loop.3pcap:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_loop.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_loop.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_next_ex.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_next_ex.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_next_ex.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_next_ex.3pcap:1.1.1.5 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap_next_ex.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_next_ex.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap:1.1.1.5 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_offline_filter.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/pcap_snapshot.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_snapshot.3pcap:1.1.1.5 src/external/bsd/libpcap/dist/pcap_snapshot.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_snapshot.3pcap:1.1.1.5 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_snapshot.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_snapshot.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
Index: src/external/bsd/libpcap/dist/savefile.c
diff -u src/external/bsd/libpcap/dist/savefile.c:1.1.1.5 src/external/bsd/libpcap/dist/savefile.c:1.2
--- src/external/bsd/libpcap/dist/savefile.c:1.1.1.5 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/savefile.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: savefile.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
@@ -28,6 +30,9 @@
* dependent values so we can print the dump file on any architecture.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: savefile.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/gencode.c
diff -u src/external/bsd/libpcap/dist/gencode.c:1.6 src/external/bsd/libpcap/dist/gencode.c:1.7
--- src/external/bsd/libpcap/dist/gencode.c:1.6 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/gencode.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gencode.c,v 1.6 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: gencode.c,v 1.7 2014/11/19 19:33:30 christos Exp $ */
/*#define CHASE_CHAIN*/
/*
@@ -21,10 +21,9 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/gencode.c,v 1.309 2008-12-23 20:13:29 guy Exp (LBL)";
-#endif
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: gencode.c,v 1.7 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -401,38 +400,30 @@ syntax(void)
static bpf_u_int32 netmask;
static int snaplen;
int no_optimize;
-#ifdef WIN32
-static int
-pcap_compile_unsafe(pcap_t *p, struct bpf_program *program,
- const char *buf, int optimize, bpf_u_int32 mask);
int
pcap_compile(pcap_t *p, struct bpf_program *program,
const char *buf, int optimize, bpf_u_int32 mask)
{
- int result;
-
- EnterCriticalSection(&g_PcapCompileCriticalSection);
-
- result = pcap_compile_unsafe(p, program, buf, optimize, mask);
-
- LeaveCriticalSection(&g_PcapCompileCriticalSection);
-
- return result;
-}
-
-static int
-pcap_compile_unsafe(pcap_t *p, struct bpf_program *program,
- const char *buf, int optimize, bpf_u_int32 mask)
-#else /* WIN32 */
-int
-pcap_compile(pcap_t *p, struct bpf_program *program,
- const char *buf, int optimize, bpf_u_int32 mask)
-#endif /* WIN32 */
-{
extern int n_errors;
const char * volatile xbuf = buf;
u_int len;
+ int rc;
+
+ /*
+ * XXX - single-thread this code path with pthread calls on
+ * UN*X, if the platform supports pthreads? If that requires
+ * a separate -lpthread, we might not want to do that.
+ */
+#ifdef WIN32
+ extern int wsockinit (void);
+ static int done = 0;
+
+ if (!done)
+ wsockinit();
+ done = 1;
+ EnterCriticalSection(&g_PcapCompileCriticalSection);
+#endif
/*
* If this pcap_t hasn't been activated, it doesn't have a
@@ -441,13 +432,15 @@ pcap_compile(pcap_t *p, struct bpf_progr
if (!p->activated) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"not-yet-activated pcap_t passed to pcap_compile");
- return (-1);
+ rc = -1;
+ goto quit;
}
no_optimize = 0;
n_errors = 0;
root = NULL;
bpf_pcap = p;
init_regs();
+
if (setjmp(top_ctx)) {
#ifdef INET6
if (ai != NULL) {
@@ -457,7 +450,8 @@ pcap_compile(pcap_t *p, struct bpf_progr
#endif
lex_cleanup();
freechunks();
- return (-1);
+ rc = -1;
+ goto quit;
}
netmask = mask;
@@ -466,7 +460,8 @@ pcap_compile(pcap_t *p, struct bpf_progr
if (snaplen == 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"snaplen of 0 rejects all packets");
- return -1;
+ rc = -1;
+ goto quit;
}
lex_init(xbuf ? xbuf : "");
@@ -490,7 +485,16 @@ pcap_compile(pcap_t *p, struct bpf_progr
lex_cleanup();
freechunks();
- return (0);
+
+ rc = 0; /* We're all okay */
+
+quit:
+
+#ifdef WIN32
+ LeaveCriticalSection(&g_PcapCompileCriticalSection);
+#endif
+
+ return (rc);
}
/*
@@ -595,7 +599,7 @@ finish_parse(p)
* worth the effort.
*/
insert_compute_vloffsets(p->head);
-
+
/*
* For DLT_PPI captures, generate a check of the per-packet
* DLT value to make sure it's DLT_IEEE802_11.
@@ -1131,7 +1135,7 @@ init_linktype(p)
return;
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
@@ -2306,7 +2310,7 @@ gen_load_radiotap_llprefixlen()
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.
@@ -2319,7 +2323,7 @@ static struct slist *
gen_load_ppi_llprefixlen()
{
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
@@ -2409,7 +2413,7 @@ gen_load_802_11_header_len(struct slist
* slist of instructions
*/
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
@@ -2460,7 +2464,7 @@ gen_load_802_11_header_len(struct slist
sjset_data_frame_1 = new_stmt(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.
@@ -2479,7 +2483,7 @@ gen_load_802_11_header_len(struct slist
sjset_data_frame_2->s.jf = sjset_qos = new_stmt(JMP(BPF_JSET));
sjset_qos->s.k = 0x80; /* QoS bit */
sappend(s, sjset_qos);
-
+
/*
* If it's set, add 2 to reg_off_macpl, to skip the QoS
* field.
@@ -2750,7 +2754,7 @@ gen_radiotap_llprefixlen(void)
return s;
}
-/*
+/*
* 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.
@@ -2904,6 +2908,7 @@ gen_linktype(proto)
register int proto;
{
struct block *b0, *b1, *b2;
+ const char *description;
/* are we checking MPLS-encapsulated packets? */
if (label_stack_depth > 0) {
@@ -2911,12 +2916,12 @@ gen_linktype(proto)
case ETHERTYPE_IP:
case PPP_IP:
/* FIXME add other L3 proto IDs */
- return gen_mpls_linktype(Q_IP);
+ return gen_mpls_linktype(Q_IP);
case ETHERTYPE_IPV6:
case PPP_IPV6:
/* FIXME add other L3 proto IDs */
- return gen_mpls_linktype(Q_IPV6);
+ return gen_mpls_linktype(Q_IPV6);
default:
bpf_error("unsupported protocol over mpls");
@@ -2988,7 +2993,7 @@ gen_linktype(proto)
case DLT_FDDI:
/*
- * XXX - check for asynchronous frames, as per RFC 1103.
+ * XXX - check for LLC frames.
*/
return gen_llc_linktype(proto);
/*NOTREACHED*/
@@ -3413,26 +3418,43 @@ gen_linktype(proto)
case DLT_AX25_KISS:
bpf_error("AX.25 link-layer type filtering not implemented");
- }
- /*
- * All the types that have no encapsulation should either be
- * handled as DLT_SLIP, DLT_SLIP_BSDOS, and DLT_RAW are, if
- * all packets are IP packets, or should be handled in some
- * special case, if none of them are (if some are and some
- * aren't, the lack of encapsulation is a problem, as we'd
- * have to find some other way of determining the packet type).
- *
- * Therefore, if "off_linktype" is -1, there's an error.
- */
- if (off_linktype == (u_int)-1)
- abort();
+ 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("NFLOG link-layer type filtering not implemented");
- /*
- * Any type not handled above should always have an Ethernet
- * type at an offset of "off_linktype".
- */
- return gen_cmp(OR_LINK, off_linktype, BPF_H, (bpf_int32)proto);
+ default:
+ /*
+ * Does this link-layer header type have a field
+ * indicating the type of the next protocol? If
+ * so, off_linktype will be the offset of that
+ * field in the packet; if not, it will be -1.
+ */
+ if (off_linktype != (u_int)-1) {
+ /*
+ * Yes; assume it's an Ethernet type. (If
+ * it's not, it needs to be handled specially
+ * above.)
+ */
+ return gen_cmp(OR_LINK, off_linktype, BPF_H, (bpf_int32)proto);
+ } else {
+ /*
+ * No; report an error.
+ */
+ description = pcap_datalink_val_to_description(linktype);
+ if (description != NULL) {
+ bpf_error("%s link-layer type filtering not implemented",
+ description);
+ } else {
+ bpf_error("DLT %u link-layer type filtering not implemented",
+ linktype);
+ }
+ }
+ break;
+ }
}
/*
@@ -3461,6 +3483,178 @@ gen_snap(orgcode, ptype)
}
/*
+ * Generate code to match frames with an LLC header.
+ */
+struct block *
+gen_llc(void)
+{
+ struct block *b0, *b1;
+
+ switch (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(OR_LINK, off_linktype, 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(OR_MACPL, 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(A_LLC);
+ return b0;
+
+ case DLT_IEEE802: /* Token Ring */
+ /*
+ * XXX - check for LLC frames.
+ */
+ return gen_true();
+
+ case DLT_FDDI:
+ /*
+ * XXX - check for LLC frames.
+ */
+ return gen_true();
+
+ 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();
+
+ 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();
+ return b0;
+
+ default:
+ bpf_error("'llc' not supported for linktype %d", linktype);
+ /* NOTREACHED */
+ }
+}
+
+struct block *
+gen_llc_i(void)
+{
+ struct block *b0, *b1;
+ struct slist *s;
+
+ /*
+ * Check whether this is an LLC frame.
+ */
+ b0 = gen_llc();
+
+ /*
+ * Load the control byte and test the low-order bit; it must
+ * be clear for I frames.
+ */
+ s = gen_load_a(OR_MACPL, 2, BPF_B);
+ b1 = new_block(JMP(BPF_JSET));
+ b1->s.k = 0x01;
+ b1->stmts = s;
+ gen_not(b1);
+ gen_and(b0, b1);
+ return b1;
+}
+
+struct block *
+gen_llc_s(void)
+{
+ struct block *b0, *b1;
+
+ /*
+ * Check whether this is an LLC frame.
+ */
+ b0 = gen_llc();
+
+ /*
+ * Now compare the low-order 2 bit of the control byte against
+ * the appropriate value for S frames.
+ */
+ b1 = gen_mcmp(OR_MACPL, 2, BPF_B, LLC_S_FMT, 0x03);
+ gen_and(b0, b1);
+ return b1;
+}
+
+struct block *
+gen_llc_u(void)
+{
+ struct block *b0, *b1;
+
+ /*
+ * Check whether this is an LLC frame.
+ */
+ b0 = gen_llc();
+
+ /*
+ * Now compare the low-order 2 bit of the control byte against
+ * the appropriate value for U frames.
+ */
+ b1 = gen_mcmp(OR_MACPL, 2, BPF_B, LLC_U_FMT, 0x03);
+ gen_and(b0, b1);
+ return b1;
+}
+
+struct block *
+gen_llc_s_subtype(bpf_u_int32 subtype)
+{
+ struct block *b0, *b1;
+
+ /*
+ * Check whether this is an LLC frame.
+ */
+ b0 = gen_llc();
+
+ /*
+ * Now check for an S frame with the appropriate type.
+ */
+ b1 = gen_mcmp(OR_MACPL, 2, BPF_B, subtype, LLC_S_CMD_MASK);
+ gen_and(b0, b1);
+ return b1;
+}
+
+struct block *
+gen_llc_u_subtype(bpf_u_int32 subtype)
+{
+ struct block *b0, *b1;
+
+ /*
+ * Check whether this is an LLC frame.
+ */
+ b0 = gen_llc();
+
+ /*
+ * Now check for a U frame with the appropriate type.
+ */
+ b1 = gen_mcmp(OR_MACPL, 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.
*
@@ -4410,7 +4604,7 @@ gen_mpls_linktype(proto)
b1 = gen_mcmp(OR_NET, 0, BPF_B, 0x40, 0xf0);
gen_and(b0, b1);
return b1;
-
+
case Q_IPV6:
/* match the bottom-of-stack bit */
b0 = gen_mcmp(OR_NET, -2, BPF_B, 0x01, 0x01);
@@ -4418,7 +4612,7 @@ gen_mpls_linktype(proto)
b1 = gen_mcmp(OR_NET, 0, BPF_B, 0x60, 0xf0);
gen_and(b0, b1);
return b1;
-
+
default:
abort();
}
@@ -5225,7 +5419,7 @@ gen_portrangeatom(off, v1, v2)
b1 = gen_cmp_ge(OR_TRAN_IPV4, off, BPF_H, v1);
b2 = gen_cmp_le(OR_TRAN_IPV4, off, BPF_H, v2);
- gen_and(b1, b2);
+ gen_and(b1, b2);
return b2;
}
@@ -5327,7 +5521,7 @@ gen_portrangeatom6(off, v1, v2)
b1 = gen_cmp_ge(OR_TRAN_IPV6, off, BPF_H, v1);
b2 = gen_cmp_le(OR_TRAN_IPV6, off, BPF_H, v2);
- gen_and(b1, b2);
+ gen_and(b1, b2);
return b2;
}
@@ -5777,7 +5971,7 @@ gen_check_802_11_data_frame()
b0 = new_block(JMP(BPF_JSET));
b0->s.k = 0x08;
b0->stmts = s;
-
+
s = gen_load_a(OR_LINK, 0, BPF_B);
b1 = new_block(JMP(BPF_JSET));
b1->s.k = 0x04;
@@ -6253,7 +6447,7 @@ gen_scode(name, q)
if (proto != Q_DEFAULT &&
proto != Q_UDP && proto != Q_TCP && proto != Q_SCTP)
bpf_error("illegal qualifier of 'portrange'");
- if (pcap_nametoportrange(name, &port1, &port2, &real_proto) == 0)
+ if (pcap_nametoportrange(name, &port1, &port2, &real_proto) == 0)
bpf_error("unknown port in range '%s'", name);
if (proto == Q_UDP) {
if (real_proto == IPPROTO_TCP)
@@ -6280,7 +6474,7 @@ gen_scode(name, q)
bpf_error("port in range '%s' is tcp", name);
else
/* override PROTO_UNDEF */
- real_proto = IPPROTO_SCTP;
+ real_proto = IPPROTO_SCTP;
}
if (port1 < 0)
bpf_error("illegal port number %d < 0", port1);
@@ -7972,22 +8166,22 @@ gen_mpls(label_num)
* etc.
*/
switch (linktype) {
-
+
case DLT_C_HDLC: /* fall through */
case DLT_EN10MB:
case DLT_NETANALYZER:
case DLT_NETANALYZER_TRANSPARENT:
b0 = gen_linktype(ETHERTYPE_MPLS);
break;
-
+
case DLT_PPP:
b0 = gen_linktype(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("no MPLS support for data link type %d",
linktype);
@@ -8258,7 +8452,7 @@ gen_atmtype_abbrev(type)
return b1;
}
-/*
+/*
* Filtering for MTP2 messages based on li value
* FISU, length is null
* LSSU, length is 1 or 2
Index: src/external/bsd/libpcap/dist/optimize.c
diff -u src/external/bsd/libpcap/dist/optimize.c:1.6 src/external/bsd/libpcap/dist/optimize.c:1.7
--- src/external/bsd/libpcap/dist/optimize.c:1.6 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/optimize.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: optimize.c,v 1.6 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: optimize.c,v 1.7 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
@@ -22,10 +22,9 @@
*
* Optimization module for tcpdump intermediate representation.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/optimize.c,v 1.91 2008-01-02 04:16:46 guy Exp (LBL)";
-#endif
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: optimize.c,v 1.7 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -612,6 +611,12 @@ fold_op(struct stmt *s, int v0, int v1)
a /= b;
break;
+ case BPF_MOD:
+ if (b == 0)
+ bpf_error("modulus by zero");
+ a %= b;
+ break;
+
case BPF_AND:
a &= b;
break;
@@ -620,6 +625,10 @@ fold_op(struct stmt *s, int v0, int v1)
a |= b;
break;
+ case BPF_XOR:
+ a ^= b;
+ break;
+
case BPF_LSH:
a <<= b;
break;
@@ -980,8 +989,10 @@ opt_stmt(struct stmt *s, int val[], int
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);
@@ -992,7 +1003,7 @@ opt_stmt(struct stmt *s, int val[], int
* fixup the generated math code */
if (op == BPF_ADD ||
op == BPF_LSH || op == BPF_RSH ||
- op == BPF_OR) {
+ op == BPF_OR || op == BPF_XOR) {
s->code = NOP;
break;
}
@@ -1015,8 +1026,10 @@ opt_stmt(struct stmt *s, int val[], int
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);
@@ -1043,12 +1056,12 @@ opt_stmt(struct stmt *s, int val[], int
*/
if (alter && vmap[val[A_ATOM]].is_const
&& vmap[val[A_ATOM]].const_val == 0) {
- if (op == BPF_ADD || op == BPF_OR) {
+ 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 ||
+ 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;
Index: src/external/bsd/libpcap/dist/grammar.y
diff -u src/external/bsd/libpcap/dist/grammar.y:1.4 src/external/bsd/libpcap/dist/grammar.y:1.5
--- src/external/bsd/libpcap/dist/grammar.y:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/grammar.y Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grammar.y,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: grammar.y,v 1.5 2014/11/19 19:33:30 christos Exp $ */
%{
/*
@@ -22,10 +22,8 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/grammar.y,v 1.101 2007-11-18 02:03:52 guy Exp (LBL)";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: grammar.y,v 1.5 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,6 +58,7 @@ struct rtentry;
#include <net/pfvar.h>
#include <net/if_pflog.h>
#endif
+#include "llc.h"
#include "ieee80211.h"
#include <pcap/namedb.h>
@@ -134,6 +133,23 @@ static const struct tok ieee80211_data_s
{ 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;
@@ -263,7 +279,7 @@ pfaction_to_num(const char *action)
%type <a> arth narth
%type <i> byteop pname pnum relop irelop
%type <blk> and or paren not null prog
-%type <rblk> other pfvar p80211
+%type <rblk> other pfvar p80211 pllc
%type <i> atmtype atmmultitype
%type <blk> atmfield
%type <blk> atmfieldvalue atmvalue atmlistvalue
@@ -513,6 +529,7 @@ other: pqual TK_BROADCAST { $$ = gen_b
| PPPOES { $$ = gen_pppoes(-1); }
| pfvar { $$ = $1; }
| pqual p80211 { $$ = $2; }
+ | pllc { $$ = $1; }
;
pfvar: PF_IFNAME ID { $$ = gen_pf_ifname($2); }
@@ -582,6 +599,31 @@ type_subtype: ID { int i;
}
;
+pllc: LLC { $$ = gen_llc(); }
+ | LLC ID { if (pcap_strcasecmp($2, "i") == 0)
+ $$ = gen_llc_i();
+ else if (pcap_strcasecmp($2, "s") == 0)
+ $$ = gen_llc_s();
+ else if (pcap_strcasecmp($2, "u") == 0)
+ $$ = gen_llc_u();
+ else {
+ u_int subtype;
+
+ subtype = str2tok($2, llc_s_subtypes);
+ if (subtype != (u_int)-1)
+ $$ = gen_llc_s_subtype(subtype);
+ else {
+ subtype = str2tok($2, llc_u_subtypes);
+ if (subtype == (u_int)-1)
+ bpf_error("unknown LLC type name \"%s\"", $2);
+ $$ = gen_llc_u_subtype(subtype);
+ }
+ }
+ }
+ /* sigh, "rnr" is already a keyword for PF */
+ | LLC PF_RNR { $$ = gen_llc_s_subtype(LLC_RNR); }
+ ;
+
dir: NUM
| ID { if (pcap_strcasecmp($1, "nods") == 0)
$$ = IEEE80211_FC1_DIR_NODS;
@@ -620,8 +662,10 @@ narth: pname '[' arth ']' { $$ = gen_
| arth '-' arth { $$ = gen_arth(BPF_SUB, $1, $3); }
| arth '*' arth { $$ = gen_arth(BPF_MUL, $1, $3); }
| arth '/' arth { $$ = gen_arth(BPF_DIV, $1, $3); }
+ | arth '%' arth { $$ = gen_arth(BPF_MOD, $1, $3); }
| arth '&' arth { $$ = gen_arth(BPF_AND, $1, $3); }
| arth '|' arth { $$ = gen_arth(BPF_OR, $1, $3); }
+ | arth '^' arth { $$ = gen_arth(BPF_XOR, $1, $3); }
| arth LSH arth { $$ = gen_arth(BPF_LSH, $1, $3); }
| arth RSH arth { $$ = gen_arth(BPF_RSH, $1, $3); }
| '-' arth %prec UMINUS { $$ = gen_neg($2); }
@@ -638,7 +682,6 @@ pnum: NUM
| paren pnum ')' { $$ = $2; }
;
atmtype: LANE { $$ = A_LANE; }
- | LLC { $$ = A_LLC; }
| METAC { $$ = A_METAC; }
| BCC { $$ = A_BCC; }
| OAMF4EC { $$ = A_OAMF4EC; }
Index: src/external/bsd/libpcap/dist/pcap-bpf.c
diff -u src/external/bsd/libpcap/dist/pcap-bpf.c:1.4 src/external/bsd/libpcap/dist/pcap-bpf.c:1.5
--- src/external/bsd/libpcap/dist/pcap-bpf.c:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap-bpf.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcap-bpf.c,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: pcap-bpf.c,v 1.5 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1998
@@ -20,10 +20,9 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.116 2008-09-16 18:42:29 guy Exp (LBL)";
-#endif
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-bpf.c,v 1.5 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1042,7 +1041,7 @@ pcap_read_bpf(pcap_t *p, int cnt, pcap_h
#endif
(*callback)(user, &pkthdr, datap);
bp += BPF_WORDALIGN(caplen + hdrlen);
- if (++n >= cnt && cnt > 0) {
+ if (++n >= cnt && !PACKET_COUNT_IS_UNLIMITED(cnt)) {
p->bp = bp;
p->cc = ep - bp;
/*
@@ -1485,6 +1484,9 @@ 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;
@@ -1688,6 +1690,7 @@ pcap_activate_bpf(pcap_t *p)
if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s",
pcap_strerror(errno));
+ status = PCAP_ERROR;
goto bad;
}
@@ -1714,6 +1717,7 @@ pcap_activate_bpf(pcap_t *p)
if (pb->zbuf1 == MAP_FAILED || pb->zbuf2 == MAP_FAILED) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "mmap: %s",
pcap_strerror(errno));
+ status = PCAP_ERROR;
goto bad;
}
memset(&bz, 0, sizeof(bz)); /* bzero() deprecated, replaced with memset() */
@@ -1723,12 +1727,14 @@ pcap_activate_bpf(pcap_t *p)
if (ioctl(fd, BIOCSETZBUF, (caddr_t)&bz) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETZBUF: %s",
pcap_strerror(errno));
+ status = PCAP_ERROR;
goto bad;
}
(void)strncpy(ifrname, p->opt.source, ifnamsiz);
if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSETIF: %s: %s",
p->opt.source, pcap_strerror(errno));
+ status = PCAP_ERROR;
goto bad;
}
v = pb->zbufsize - sizeof(struct bpf_zbuf_header);
@@ -1982,11 +1988,12 @@ pcap_activate_bpf(pcap_t *p)
/*
* Try to put the interface into monitor mode.
*/
- status = monitor_mode(p, 1);
- if (status != 0) {
+ retv = monitor_mode(p, 1);
+ if (retv != 0) {
/*
* We failed.
*/
+ status = retv;
goto bad;
}
Index: src/external/bsd/libpcap/dist/pcap.3pcap.in
diff -u src/external/bsd/libpcap/dist/pcap.3pcap.in:1.4 src/external/bsd/libpcap/dist/pcap.3pcap.in:1.5
--- src/external/bsd/libpcap/dist/pcap.3pcap.in:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap.3pcap.in Wed Nov 19 14:33:30 2014
@@ -1,5 +1,3 @@
-.\" @(#) Header: /tcpdump/master/libpcap/pcap.3pcap.in,v 1.1 2008-10-21 07:33:01 guy Exp
-.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -19,7 +17,7 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.TH PCAP 3PCAP "1 July 2013"
+.TH PCAP 3PCAP "16 April 2014"
.SH NAME
pcap \- Packet Capture library
.SH SYNOPSIS
@@ -423,7 +421,7 @@ get name for a time stamp type
.BR pcap_tstamp_type_val_to_description (3PCAP)
get description for a time stamp type
.TP
-.BR pcap_tstamp_name_to_val (3PCAP)
+.BR pcap_tstamp_type_name_to_val (3PCAP)
get time stamp type corresponding to a name
.TP
.BR pcap_datalink (3PCAP)
@@ -845,12 +843,12 @@ get a string for an error or warning sta
.RE
.SS Getting library version information
To get a string giving version information about libpcap, call
-.BR pcap_library_version ().
+.BR pcap_lib_version ().
.TP
.B Routines
.RS
.TP
-.BR pcap_library_version (3PCAP)
+.BR pcap_lib_version (3PCAP)
get library version string
.RE
.SH BACKWARDS COMPATIBILITY
Index: src/external/bsd/libpcap/dist/pcap.c
diff -u src/external/bsd/libpcap/dist/pcap.c:1.4 src/external/bsd/libpcap/dist/pcap.c:1.5
--- src/external/bsd/libpcap/dist/pcap.c:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcap.c,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: pcap.c,v 1.5 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998
@@ -33,10 +33,8 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/pcap.c,v 1.128 2008-12-23 20:13:29 guy Exp (LBL)";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap.c,v 1.5 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -95,6 +93,10 @@ static const char rcsid[] _U_ =
#include "pcap-bt-linux.h"
#endif
+#ifdef PCAP_SUPPORT_BT_MONITOR
+#include "pcap-bt-monitor-linux.h"
+#endif
+
#ifdef PCAP_SUPPORT_CAN
#include "pcap-can-linux.h"
#endif
@@ -111,7 +113,7 @@ static const char rcsid[] _U_ =
#include "pcap-dbus.h"
#endif
-int
+int
pcap_not_initialized(pcap_t *pcap _U_)
{
/* this means 'not initialized' */
@@ -223,7 +225,7 @@ pcap_next(pcap_t *p, struct pcap_pkthdr
return (pkt);
}
-int
+int
pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header,
const u_char **pkt_data)
{
@@ -326,6 +328,9 @@ struct capture_source_type {
#ifdef PCAP_SUPPORT_BT
{ bt_findalldevs, bt_create },
#endif
+#ifdef PCAP_SUPPORT_BT_MONITOR
+ { bt_monitor_findalldevs, bt_monitor_create },
+#endif
#if PCAP_SUPPORT_CANUSB
{ canusb_findalldevs, canusb_create },
#endif
@@ -357,7 +362,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
/*
* Get the list of regular interfaces first.
- */
+ */
if (pcap_findalldevs_interfaces(alldevsp, errbuf) == -1)
return (-1); /* failure */
@@ -394,6 +399,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
return (-1);
}
}
+
return (0);
}
@@ -508,7 +514,7 @@ pcap_alloc_pcap_t(char *ebuf, size_t siz
#ifndef WIN32
p->fd = -1; /* not opened yet */
p->selectable_fd = -1;
-#endif
+#endif
if (size == 0) {
/* No private data was requested. */
@@ -552,9 +558,9 @@ pcap_create_common(const char *source, c
initialize_ops(p);
/* put in some defaults*/
- pcap_set_snaplen(p, 65535); /* max packet size */
- p->opt.timeout = 0; /* no timeout specified */
- p->opt.buffer_size = 0; /* use the platform's default */
+ pcap_set_snaplen(p, MAXIMUM_SNAPLEN); /* max packet size */
+ 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;
@@ -860,7 +866,7 @@ pcap_loop(pcap_t *p, int cnt, pcap_handl
}
if (n <= 0)
return (n);
- if (cnt > 0) {
+ if (!PACKET_COUNT_IS_UNLIMITED(cnt)) {
cnt -= n;
if (cnt <= 0)
return (0);
@@ -1184,6 +1190,7 @@ static struct dlt_choice dlt_choices[] =
DLT_CHOICE(DLT_AX25_KISS, "AX.25 with KISS header"),
DLT_CHOICE(DLT_IEEE802_15_4_NONASK_PHY, "IEEE 802.15.4 with non-ASK PHY data"),
DLT_CHOICE(DLT_MPLS, "MPLS with label as link-layer header"),
+ DLT_CHOICE(DLT_LINUX_EVDEV, "Linux evdev events"),
DLT_CHOICE(DLT_USB_LINUX_MMAPPED, "USB with padded Linux header"),
DLT_CHOICE(DLT_DECT, "DECT"),
DLT_CHOICE(DLT_AOS, "AOS Space Data Link protocol"),
@@ -1195,16 +1202,33 @@ static struct dlt_choice dlt_choices[] =
DLT_CHOICE(DLT_IPV4, "Raw IPv4"),
DLT_CHOICE(DLT_IPV6, "Raw IPv6"),
DLT_CHOICE(DLT_IEEE802_15_4_NOFCS, "IEEE 802.15.4 without FCS"),
+ DLT_CHOICE(DLT_DBUS, "D-Bus"),
DLT_CHOICE(DLT_JUNIPER_VS, "Juniper Virtual Server"),
DLT_CHOICE(DLT_JUNIPER_SRX_E2E, "Juniper SRX E2E"),
DLT_CHOICE(DLT_JUNIPER_FIBRECHANNEL, "Juniper Fibre Channel"),
DLT_CHOICE(DLT_DVB_CI, "DVB-CI"),
+ DLT_CHOICE(DLT_MUX27010, "MUX27010"),
+ DLT_CHOICE(DLT_STANAG_5066_D_PDU, "STANAG 5066 D_PDUs"),
DLT_CHOICE(DLT_JUNIPER_ATM_CEMIC, "Juniper ATM CEMIC"),
DLT_CHOICE(DLT_NFLOG, "Linux netfilter log messages"),
DLT_CHOICE(DLT_NETANALYZER, "Ethernet with Hilscher netANALYZER pseudo-header"),
DLT_CHOICE(DLT_NETANALYZER_TRANSPARENT, "Ethernet with Hilscher netANALYZER pseudo-header and with preamble and SFD"),
DLT_CHOICE(DLT_IPOIB, "RFC 4391 IP-over-Infiniband"),
- DLT_CHOICE(DLT_DBUS, "D-Bus"),
+ DLT_CHOICE(DLT_MPEG_2_TS, "MPEG-2 transport stream"),
+ DLT_CHOICE(DLT_NG40, "ng40 protocol tester Iub/Iur"),
+ DLT_CHOICE(DLT_NFC_LLCP, "NFC LLCP PDUs with pseudo-header"),
+ DLT_CHOICE(DLT_INFINIBAND, "InfiniBand"),
+ DLT_CHOICE(DLT_SCTP, "SCTP"),
+ DLT_CHOICE(DLT_USBPCAP, "USB with USBPcap header"),
+ DLT_CHOICE(DLT_RTAC_SERIAL, "Schweitzer Engineering Laboratories RTAC packets"),
+ DLT_CHOICE(DLT_BLUETOOTH_LE_LL, "Bluetooth Low Energy air interface"),
+ DLT_CHOICE(DLT_NETLINK, "Linux netlink"),
+ DLT_CHOICE(DLT_BLUETOOTH_LINUX_MONITOR, "Bluetooth Linux Monitor"),
+ DLT_CHOICE(DLT_BLUETOOTH_BREDR_BB, "Bluetooth Basic Rate/Enhanced Data Rate baseband packets"),
+ DLT_CHOICE(DLT_BLUETOOTH_LE_LL_WITH_PHDR, "Bluetooth Low Energy air interface with pseudo-header"),
+ DLT_CHOICE(DLT_PROFIBUS_DL, "PROFIBUS data link layer"),
+ DLT_CHOICE(DLT_PKTAP, "Apple DLT_PKTAP"),
+ DLT_CHOICE(DLT_EPON, "Ethernet with 802.3 Clause 65 EPON preamble"),
DLT_CHOICE_SENTINEL
};
@@ -1460,7 +1484,7 @@ pcap_setnonblock_fd(pcap_t *p, int nonbl
#ifdef WIN32
/*
- * Generate a string for the last Win32-specific error (i.e. an error generated when
+ * Generate a string for the last 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()
*/
@@ -1868,7 +1892,7 @@ pcap_offline_filter(const struct bpf_pro
{
const struct bpf_insn *fcode = fp->bf_insns;
- if (fcode != NULL)
+ if (fcode != NULL)
return (bpf_filter(fcode, pkt, h->len, h->caplen));
else
return (0);
Index: src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in
diff -u src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.4 src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.5
--- src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in Wed Nov 19 14:33:30 2014
@@ -1,5 +1,3 @@
-.\" @(#) Header: /tcpdump/master/libpcap/pcap_open_offline.3pcap.in,v 1.1 2008-10-23 05:56:59 guy Exp
-.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -59,7 +57,7 @@ and
.BR tcpslice (1),
or can have the pcap-ng file format, although not all pcap-ng files can
be read.
-The name "-" in a synonym for
+The name "-" is a synonym for
.BR stdin .
.PP
.B pcap_open_offline_with_tstamp_precision()
Index: src/external/bsd/libpcap/dist/sf-pcap-ng.c
diff -u src/external/bsd/libpcap/dist/sf-pcap-ng.c:1.4 src/external/bsd/libpcap/dist/sf-pcap-ng.c:1.5
--- src/external/bsd/libpcap/dist/sf-pcap-ng.c:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/sf-pcap-ng.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sf-pcap-ng.c,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: sf-pcap-ng.c,v 1.5 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
@@ -28,6 +28,9 @@ static const char rcsid[] _U_ =
"@(#) Header (LBL)";
#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: sf-pcap-ng.c,v 1.5 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -461,7 +464,7 @@ process_idb_options(pcap_t *p, struct bl
return (-1);
}
saw_tsresol = 1;
- tsresol_opt = *(u_int *)optvalue;
+ memcpy(&tsresol_opt, optvalue, sizeof(tsresol_opt));
if (tsresol_opt & 0x80) {
/*
* Resolution is negative power of 2.
@@ -1226,15 +1229,18 @@ found:
break;
case SCALE_UP:
+ case SCALE_DOWN:
/*
- * The interface resolution is less than what the user
- * wants; scale up to that resolution.
+ * The interface resolution is different from what the
+ * user wants; scale up or down to that resolution.
*
* XXX - if ps->ifaces[interface_id].tsresol is a power
* of 10, we could just multiply by the quotient of
- * ps->ifaces[interface_id].tsresol and ps->user_tsresol,
- * as we know that's an integer. That runs less risk of
- * overflow.
+ * ps->ifaces[interface_id].tsresol and ps->user_tsresol
+ * in the scale-up case, and divide by the quotient of
+ * ps->user_tsresol and ps->ifaces[interface_id].tsresol
+ * in the scale-down case, as we know those are integers,
+ * which would involve fewer arithmetic operations.
*
* Is there something clever we could do if
* ps->ifaces[interface_id].tsresol is a power of 2?
@@ -1242,24 +1248,6 @@ found:
frac *= ps->ifaces[interface_id].tsresol;
frac /= ps->user_tsresol;
break;
-
- case SCALE_DOWN:
- /*
- * The interface resolution is greater than what the user
- * wants; scale down to that resolution.
- *
- * XXX - if ps->ifaces[interface_id].tsresol is a power
- * of 10, we could just divide by the quotient of
- * ps->user_tsresol and ps->ifaces[interface_id].tsresol,
- * as we know that's an integer. That runs less risk of
- * overflow.
- *
- * Is there something clever we could do if
- * ps->ifaces[interface_id].tsresol is a power of 2?
- */
- frac *= ps->user_tsresol;
- frac /= ps->ifaces[interface_id].tsresol;
- break;
}
hdr->ts.tv_sec = sec;
hdr->ts.tv_usec = (suseconds_t)frac;
@@ -1271,23 +1259,8 @@ found:
if (*data == NULL)
return (-1);
- if (p->swapped) {
- /*
- * Convert pseudo-headers from the byte order of
- * the host on which the file was saved to our
- * byte order, as necessary.
- */
- switch (p->linktype) {
-
- 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;
- }
- }
+ if (p->swapped)
+ swap_pseudo_headers(p->linktype, hdr, *data);
return (0);
}
Index: src/external/bsd/libpcap/dist/sf-pcap.c
diff -u src/external/bsd/libpcap/dist/sf-pcap.c:1.4 src/external/bsd/libpcap/dist/sf-pcap.c:1.5
--- src/external/bsd/libpcap/dist/sf-pcap.c:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/sf-pcap.c Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sf-pcap.c,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: sf-pcap.c,v 1.5 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
@@ -35,6 +35,9 @@ static const char rcsid[] _U_ =
"@(#) Header (LBL)";
#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: sf-pcap.c,v 1.5 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -373,9 +376,9 @@ pcap_check_header(bpf_u_int32 magic, FIL
p->bufsize = p->snapshot;
if (p->bufsize <= 0) {
/*
- * Bogus snapshot length; use 64KiB as a fallback.
+ * Bogus snapshot length; use the maximum as a fallback.
*/
- p->bufsize = 65536;
+ p->bufsize = MAXIMUM_SNAPLEN;
}
p->buffer = malloc(p->bufsize);
if (p->buffer == NULL) {
@@ -502,7 +505,7 @@ pcap_next_packet(pcap_t *p, struct pcap_
static u_char *tp = NULL;
static size_t tsize = 0;
- if (hdr->caplen > 65535) {
+ if (hdr->caplen > MAXIMUM_SNAPLEN) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"bogus savefile header");
return (-1);
@@ -561,23 +564,8 @@ pcap_next_packet(pcap_t *p, struct pcap_
}
*data = p->buffer;
- if (p->swapped) {
- /*
- * Convert pseudo-headers from the byte order of
- * the host on which the file was saved to our
- * byte order, as necessary.
- */
- switch (p->linktype) {
-
- 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;
- }
- }
+ if (p->swapped)
+ swap_pseudo_headers(p->linktype, hdr, *data);
return (0);
}
Index: src/external/bsd/libpcap/dist/ieee80211.h
diff -u src/external/bsd/libpcap/dist/ieee80211.h:1.1.1.3 src/external/bsd/libpcap/dist/ieee80211.h:1.2
--- src/external/bsd/libpcap/dist/ieee80211.h:1.1.1.3 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/ieee80211.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: ieee80211.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
Index: src/external/bsd/libpcap/dist/pcap-canusb-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-canusb-linux.c:1.1.1.3 src/external/bsd/libpcap/dist/pcap-canusb-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-canusb-linux.c:1.1.1.3 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-canusb-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-canusb-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2009 Felix Obenhuber
* All rights reserved.
@@ -32,6 +34,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-canusb-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-canusb-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-canusb-linux.h:1.1.1.3 src/external/bsd/libpcap/dist/pcap-canusb-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-canusb-linux.h:1.1.1.3 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-canusb-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-canusb-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2009 Felix Obenhuber
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-common.h
diff -u src/external/bsd/libpcap/dist/pcap-common.h:1.1.1.3 src/external/bsd/libpcap/dist/pcap-common.h:1.2
--- src/external/bsd/libpcap/dist/pcap-common.h:1.1.1.3 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-common.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-common.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* We use the "receiver-makes-right" approach to byte order,
Index: src/external/bsd/libpcap/dist/pcap-netfilter-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-netfilter-linux.c:1.1.1.3 src/external/bsd/libpcap/dist/pcap-netfilter-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-netfilter-linux.c:1.1.1.3 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap-netfilter-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-netfilter-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2011 Jakub Zawadzki
* All rights reserved.
@@ -28,6 +30,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-netfilter-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-netfilter-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-netfilter-linux.h:1.1.1.3 src/external/bsd/libpcap/dist/pcap-netfilter-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-netfilter-linux.h:1.1.1.3 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-netfilter-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-netfilter-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2011 Jakub Zawadzki
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-sita.h
diff -u src/external/bsd/libpcap/dist/pcap-sita.h:1.1.1.3 src/external/bsd/libpcap/dist/pcap-sita.h:1.2
--- src/external/bsd/libpcap/dist/pcap-sita.h:1.1.1.3 Wed Nov 19 13:04:55 2014
+++ src/external/bsd/libpcap/dist/pcap-sita.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-sita.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* pcap-sita.h: Packet capture interface for SITA WAN devices
*
Index: src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c
diff -u src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c:1.1.1.1 src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c:1.2
--- src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c:1.1.1.1 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-bt-monitor-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2014 Michal Labedzki for Tieto Corporation
* All rights reserved.
@@ -29,6 +31,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-bt-monitor-linux.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h
diff -u src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h:1.1.1.1 src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h:1.2
--- src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h:1.1.1.1 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-bt-monitor-linux.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2014 Michal Labedzki for Tieto Corporation
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap:1.1.1.1 src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap:1.1.1.1 Sat Apr 6 11:57:47 2013
+++ src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_tstamp_type_name_to_val.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap-config.1
diff -u src/external/bsd/libpcap/dist/pcap-config.1:1.3 src/external/bsd/libpcap/dist/pcap-config.1:1.4
--- src/external/bsd/libpcap/dist/pcap-config.1:1.3 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/dist/pcap-config.1 Wed Nov 19 14:33:30 2014
@@ -1,6 +1,4 @@
-.\" $NetBSD: pcap-config.1,v 1.3 2013/04/06 17:29:53 christos Exp $
-.\"
-.\" @(#) Header: /tcpdump/master/libpcap/pcap-config.1,v 1.1 2008-09-23 18:04:01 guy Exp (LBL)
+.\" $NetBSD: pcap-config.1,v 1.4 2014/11/19 19:33:30 christos Exp $
.\"
.\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
@@ -22,7 +20,7 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.TH PCAP-CONFIG 1 "26 March 2009"
+.TH PCAP-CONFIG 1 "22 May 2009"
.SH NAME
pcap-config \- write libpcap compiler and linker flags to standard output
.SH SYNOPSIS
Index: src/external/bsd/libpcap/dist/pcap-namedb.h
diff -u src/external/bsd/libpcap/dist/pcap-namedb.h:1.3 src/external/bsd/libpcap/dist/pcap-namedb.h:1.4
--- src/external/bsd/libpcap/dist/pcap-namedb.h:1.3 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/dist/pcap-namedb.h Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcap-namedb.h,v 1.3 2013/04/06 17:29:53 christos Exp $ */
+/* $NetBSD: pcap-namedb.h,v 1.4 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1994, 1996
@@ -31,8 +31,6 @@
* 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.
- *
- * @(#) Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.13 2006-10-04 18:13:32 guy Exp (LBL)
*/
/*
Index: src/external/bsd/libpcap/dist/pcap.h
diff -u src/external/bsd/libpcap/dist/pcap.h:1.3 src/external/bsd/libpcap/dist/pcap.h:1.4
--- src/external/bsd/libpcap/dist/pcap.h:1.3 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/dist/pcap.h Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcap.h,v 1.3 2013/04/06 17:29:53 christos Exp $ */
+/* $NetBSD: pcap.h,v 1.4 2014/11/19 19:33:30 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
@@ -31,10 +31,8 @@
* 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.
- *
- * @(#) Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006-10-04 18:09:22 guy Exp (LBL)
*/
-/* $NetBSD: pcap.h,v 1.3 2013/04/06 17:29:53 christos Exp $ */
+/* $NetBSD: pcap.h,v 1.4 2014/11/19 19:33:30 christos Exp $ */
/*
Index: src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in
diff -u src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.3 src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.4
--- src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.3 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in Wed Nov 19 14:33:30 2014
@@ -1,5 +1,3 @@
-.\" @(#) Header: /tcpdump/master/libpcap/pcap_dump_open.3pcap.in,v 1.1 2008-10-23 05:56:59 guy Exp
-.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -43,7 +41,7 @@ the same format as those used by
.BR tcpdump (8)
and
.BR tcpslice (1).
-The name "-" in a synonym
+The name "-" is a synonym
for
.BR stdout .
.PP
Index: src/external/bsd/libpcap/dist/pcap-dbus.c
diff -u src/external/bsd/libpcap/dist/pcap-dbus.c:1.1.1.2 src/external/bsd/libpcap/dist/pcap-dbus.c:1.2
--- src/external/bsd/libpcap/dist/pcap-dbus.c:1.1.1.2 Wed Nov 19 13:04:52 2014
+++ src/external/bsd/libpcap/dist/pcap-dbus.c Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: pcap-dbus.c,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
/*
* Copyright (c) 2012 Jakub Zawadzki
* All rights reserved.
@@ -28,6 +30,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: pcap-dbus.c,v 1.2 2014/11/19 19:33:30 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/pcap-dbus.h
diff -u src/external/bsd/libpcap/dist/pcap-dbus.h:1.1.1.2 src/external/bsd/libpcap/dist/pcap-dbus.h:1.2
--- src/external/bsd/libpcap/dist/pcap-dbus.h:1.1.1.2 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap-dbus.h Wed Nov 19 14:33:30 2014
@@ -1,2 +1,4 @@
+/* $NetBSD: pcap-dbus.h,v 1.2 2014/11/19 19:33:30 christos Exp $ */
+
pcap_t *dbus_create(const char *, char *, int *);
int dbus_findalldevs(pcap_if_t **devlistp, char *errbuf);
Index: src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap:1.1.1.2 src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap:1.1.1.2 Wed Nov 19 13:04:53 2014
+++ src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_set_immediate_mode.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap
diff -u src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap:1.1.1.2 src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap:1.2
--- src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap:1.1.1.2 Wed Nov 19 13:04:54 2014
+++ src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap Wed Nov 19 14:33:30 2014
@@ -1,3 +1,5 @@
+.\" $NetBSD: pcap_tstamp_type_val_to_name.3pcap,v 1.2 2014/11/19 19:33:30 christos Exp $
+.\"
.\"
.\" Copyright (c) 1994, 1996, 1997
.\" The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/scanner.l
diff -u src/external/bsd/libpcap/dist/scanner.l:1.5 src/external/bsd/libpcap/dist/scanner.l:1.6
--- src/external/bsd/libpcap/dist/scanner.l:1.5 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/scanner.l Wed Nov 19 14:33:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scanner.l,v 1.5 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: scanner.l,v 1.6 2014/11/19 19:33:30 christos Exp $ */
%{
/*
@@ -21,11 +21,8 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/scanner.l,v 1.112 2008-02-06 10:21:30 guy Exp (LBL)";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: scanner.l,v 1.6 2014/11/19 19:33:30 christos Exp $");
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -328,7 +325,7 @@ hdpc return HDPC;
hsls return HSLS;
[ \r\n\t] ;
-[+\-*/:\[\]!<>()&|=] return yytext[0];
+[+\-*/%:\[\]!<>()&|\^=] return yytext[0];
">=" return GEQ;
"<=" return LEQ;
"!=" return NEQ;
Index: src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c
diff -u src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.4 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.5
--- src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.4 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c Wed Nov 19 14:33:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.4 2013/04/06 17:29:53 christos Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.5 2014/11/19 19:33:31 christos Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -36,11 +36,6 @@
* @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93
*/
-#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.46 2008-01-02 04:16:46 guy Exp (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -459,6 +454,12 @@ bpf_filter(const struct bpf_insn *pc, co
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;
@@ -467,6 +468,10 @@ bpf_filter(const struct bpf_insn *pc, co
A |= X;
continue;
+ case BPF_ALU|BPF_XOR|BPF_X:
+ A ^= X;
+ continue;
+
case BPF_ALU|BPF_LSH|BPF_X:
A <<= X;
continue;
@@ -491,6 +496,10 @@ bpf_filter(const struct bpf_insn *pc, co
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;
@@ -499,6 +508,10 @@ bpf_filter(const struct bpf_insn *pc, co
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;
@@ -600,13 +613,16 @@ bpf_validate(const struct bpf_insn *f, i
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 by 0.
+ * Check for constant division or modulus
+ * by 0.
*/
if (BPF_SRC(p->code) == BPF_K && p->k == 0)
return 0;
Index: src/external/bsd/libpcap/dist/lbl/os-aix4.h
diff -u src/external/bsd/libpcap/dist/lbl/os-aix4.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-aix4.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-aix4.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-aix4.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-aix4.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-hpux11.h
diff -u src/external/bsd/libpcap/dist/lbl/os-hpux11.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-hpux11.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-hpux11.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-hpux11.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-hpux11.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-osf4.h
diff -u src/external/bsd/libpcap/dist/lbl/os-osf4.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-osf4.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-osf4.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-osf4.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-osf4.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-osf5.h
diff -u src/external/bsd/libpcap/dist/lbl/os-osf5.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-osf5.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-osf5.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-osf5.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-osf5.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-solaris2.h
diff -u src/external/bsd/libpcap/dist/lbl/os-solaris2.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-solaris2.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-solaris2.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-solaris2.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-solaris2.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-sunos4.h
diff -u src/external/bsd/libpcap/dist/lbl/os-sunos4.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-sunos4.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-sunos4.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-sunos4.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-sunos4.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1989, 1990, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/lbl/os-ultrix4.h
diff -u src/external/bsd/libpcap/dist/lbl/os-ultrix4.h:1.1.1.4 src/external/bsd/libpcap/dist/lbl/os-ultrix4.h:1.2
--- src/external/bsd/libpcap/dist/lbl/os-ultrix4.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/lbl/os-ultrix4.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: os-ultrix4.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1990, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/bluetooth.h
diff -u src/external/bsd/libpcap/dist/pcap/bluetooth.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap/bluetooth.h:1.2
--- src/external/bsd/libpcap/dist/pcap/bluetooth.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/bluetooth.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: bluetooth.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/namedb.h
diff -u src/external/bsd/libpcap/dist/pcap/namedb.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap/namedb.h:1.2
--- src/external/bsd/libpcap/dist/pcap/namedb.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/namedb.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: namedb.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1994, 1996
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/sll.h
diff -u src/external/bsd/libpcap/dist/pcap/sll.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap/sll.h:1.2
--- src/external/bsd/libpcap/dist/pcap/sll.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/sll.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: sll.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/usb.h
diff -u src/external/bsd/libpcap/dist/pcap/usb.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap/usb.h:1.2
--- src/external/bsd/libpcap/dist/pcap/usb.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/usb.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: usb.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 2006 Paolo Abeni (Italy)
* All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/vlan.h
diff -u src/external/bsd/libpcap/dist/pcap/vlan.h:1.1.1.4 src/external/bsd/libpcap/dist/pcap/vlan.h:1.2
--- src/external/bsd/libpcap/dist/pcap/vlan.h:1.1.1.4 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/vlan.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: vlan.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/bpf.h
diff -u src/external/bsd/libpcap/dist/pcap/bpf.h:1.5 src/external/bsd/libpcap/dist/pcap/bpf.h:1.6
--- src/external/bsd/libpcap/dist/pcap/bpf.h:1.5 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap/bpf.h Wed Nov 19 14:33:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.5 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: bpf.h,v 1.6 2014/11/19 19:33:31 christos Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -38,8 +38,6 @@
* SUCH DAMAGE.
*
* @(#)bpf.h 7.1 (Berkeley) 5/7/91
- *
- * @(#) Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.32 2008-12-23 20:13:29 guy Exp (LBL)
*/
#error "This is not used in NetBSD, we use <net/bpf.h>"
/*
@@ -1229,7 +1227,96 @@ struct bpf_program {
*/
#define DLT_WIRESHARK_UPPER_PDU 252
-#define DLT_MATCHING_MAX 252 /* highest value in the "matching" range */
+/*
+ * 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
+ * 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
+ * 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
+ * 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
+
+#define DLT_MATCHING_MAX 260 /* highest value in the "matching" range */
/*
* DLT and savefile link type values are split into a class and
@@ -1253,7 +1340,17 @@ struct bpf_program {
/*
* The instruction encodings.
+ *
+ * Please inform [email protected] 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
@@ -1270,6 +1367,7 @@ struct bpf_program {
#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
@@ -1277,6 +1375,8 @@ struct bpf_program {
#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)
@@ -1289,11 +1389,30 @@ struct bpf_program {
#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
@@ -1301,11 +1420,43 @@ struct bpf_program {
/* 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.
Index: src/external/bsd/libpcap/dist/pcap/ipnet.h
diff -u src/external/bsd/libpcap/dist/pcap/ipnet.h:1.1.1.3 src/external/bsd/libpcap/dist/pcap/ipnet.h:1.2
--- src/external/bsd/libpcap/dist/pcap/ipnet.h:1.1.1.3 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/ipnet.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: ipnet.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Index: src/external/bsd/libpcap/dist/pcap/nflog.h
diff -u src/external/bsd/libpcap/dist/pcap/nflog.h:1.1.1.1 src/external/bsd/libpcap/dist/pcap/nflog.h:1.2
--- src/external/bsd/libpcap/dist/pcap/nflog.h:1.1.1.1 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/pcap/nflog.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: nflog.h,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 2013, Petar Alilovic,
* Faculty of Electrical Engineering and Computing, University of Zagreb
Index: src/external/bsd/libpcap/dist/pcap/pcap.h
diff -u src/external/bsd/libpcap/dist/pcap/pcap.h:1.4 src/external/bsd/libpcap/dist/pcap/pcap.h:1.5
--- src/external/bsd/libpcap/dist/pcap/pcap.h:1.4 Tue Dec 31 12:08:23 2013
+++ src/external/bsd/libpcap/dist/pcap/pcap.h Wed Nov 19 14:33:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcap.h,v 1.4 2013/12/31 17:08:23 christos Exp $ */
+/* $NetBSD: pcap.h,v 1.5 2014/11/19 19:33:31 christos Exp $ */
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
@@ -32,8 +32,6 @@
* 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.
- *
- * @(#) Header: /tcpdump/master/libpcap/pcap/pcap.h,v 1.15 2008-10-06 15:27:32 gianluca Exp (LBL)
*/
#ifndef lib_pcap_pcap_h
@@ -137,7 +135,7 @@ struct pcap_file_header {
/*
* 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.
*/
@@ -226,6 +224,8 @@ struct pcap_if {
};
#define PCAP_IF_LOOPBACK 0x00000001 /* interface is loopback */
+#define PCAP_IF_UP 0x00000002 /* interface is up */
+#define PCAP_IF_RUNNING 0x00000004 /* interface is running */
/*
* Representation of an interface address.
Index: src/external/bsd/libpcap/dist/tests/capturetest.c
diff -u src/external/bsd/libpcap/dist/tests/capturetest.c:1.1.1.1 src/external/bsd/libpcap/dist/tests/capturetest.c:1.2
--- src/external/bsd/libpcap/dist/tests/capturetest.c:1.1.1.1 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/capturetest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: capturetest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: capturetest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
Index: src/external/bsd/libpcap/dist/tests/filtertest.c
diff -u src/external/bsd/libpcap/dist/tests/filtertest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/filtertest.c:1.2
--- src/external/bsd/libpcap/dist/tests/filtertest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/filtertest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: filtertest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -25,6 +27,9 @@ static const char copyright[] _U_ =
The Regents of the University of California. All rights reserved.\n";
#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: filtertest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/tests/findalldevstest.c
diff -u src/external/bsd/libpcap/dist/tests/findalldevstest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/findalldevstest.c:1.2
--- src/external/bsd/libpcap/dist/tests/findalldevstest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/findalldevstest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,8 @@
+/* $NetBSD: findalldevstest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: findalldevstest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/dist/tests/opentest.c
diff -u src/external/bsd/libpcap/dist/tests/opentest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/opentest.c:1.2
--- src/external/bsd/libpcap/dist/tests/opentest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/opentest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: opentest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: opentest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
Index: src/external/bsd/libpcap/dist/tests/reactivatetest.c
diff -u src/external/bsd/libpcap/dist/tests/reactivatetest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/reactivatetest.c:1.2
--- src/external/bsd/libpcap/dist/tests/reactivatetest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/reactivatetest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: reactivatetest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: reactivatetest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
Index: src/external/bsd/libpcap/dist/tests/selpolltest.c
diff -u src/external/bsd/libpcap/dist/tests/selpolltest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/selpolltest.c:1.2
--- src/external/bsd/libpcap/dist/tests/selpolltest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/selpolltest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: selpolltest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -19,6 +21,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: selpolltest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
Index: src/external/bsd/libpcap/dist/tests/valgrindtest.c
diff -u src/external/bsd/libpcap/dist/tests/valgrindtest.c:1.1.1.2 src/external/bsd/libpcap/dist/tests/valgrindtest.c:1.2
--- src/external/bsd/libpcap/dist/tests/valgrindtest.c:1.1.1.2 Wed Nov 19 13:04:56 2014
+++ src/external/bsd/libpcap/dist/tests/valgrindtest.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: valgrindtest.c,v 1.2 2014/11/19 19:33:31 christos Exp $ */
+
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
* The Regents of the University of California. All rights reserved.
@@ -25,6 +27,9 @@ static const char copyright[] _U_ =
The Regents of the University of California. All rights reserved.\n";
#endif
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: valgrindtest.c,v 1.2 2014/11/19 19:33:31 christos Exp $");
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/external/bsd/libpcap/include/config.h
diff -u src/external/bsd/libpcap/include/config.h:1.6 src/external/bsd/libpcap/include/config.h:1.7
--- src/external/bsd/libpcap/include/config.h:1.6 Sun Apr 6 21:29:12 2014
+++ src/external/bsd/libpcap/include/config.h Wed Nov 19 14:33:31 2014
@@ -257,6 +257,9 @@
/* target host supports Bluetooth sniffing */
/* #undef PCAP_SUPPORT_BT */
+/* target host supports Bluetooth Monitor */
+/* #undef PCAP_SUPPORT_BT_MONITOR */
+
/* target host supports CAN sniffing */
/* #undef PCAP_SUPPORT_CAN */
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.11 src/external/bsd/libpcap/lib/Makefile:1.12
--- src/external/bsd/libpcap/lib/Makefile:1.11 Sat Apr 6 20:18:55 2013
+++ src/external/bsd/libpcap/lib/Makefile Wed Nov 19 14:33:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/04/07 00:18:55 christos Exp $
+# $NetBSD: Makefile,v 1.12 2014/11/19 19:33:31 christos Exp $
USE_SHLIBDIR=yes
.include <bsd.own.mk>
@@ -67,6 +67,7 @@ pcap_open_live.3pcap \
pcap_open_offline.3pcap \
pcap_set_buffer_size.3pcap \
pcap_set_datalink.3pcap \
+pcap_set_immediate_mode.3pcap \
pcap_set_promisc.3pcap \
pcap_set_rfmon.3pcap \
pcap_set_snaplen.3pcap \
@@ -88,10 +89,12 @@ 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
MANMISCIN= \
Index: src/external/bsd/libpcap/lib/version.c
diff -u src/external/bsd/libpcap/lib/version.c:1.2 src/external/bsd/libpcap/lib/version.c:1.3
--- src/external/bsd/libpcap/lib/version.c:1.2 Sat Apr 6 13:29:12 2013
+++ src/external/bsd/libpcap/lib/version.c Wed Nov 19 14:33:31 2014
@@ -1,3 +1,3 @@
-/* $NetBSD: version.c,v 1.2 2013/04/06 17:29:12 christos Exp $ */
+/* $NetBSD: version.c,v 1.3 2014/11/19 19:33:31 christos Exp $ */
-char pcap_version[] = "1.3.0";
+char pcap_version[] = "1.6.2";
Index: src/external/bsd/libpcap/lib/version.h
diff -u src/external/bsd/libpcap/lib/version.h:1.2 src/external/bsd/libpcap/lib/version.h:1.3
--- src/external/bsd/libpcap/lib/version.h:1.2 Sat Apr 6 13:29:12 2013
+++ src/external/bsd/libpcap/lib/version.h Wed Nov 19 14:33:31 2014
@@ -1,3 +1,3 @@
-/* $NetBSD: version.h,v 1.2 2013/04/06 17:29:12 christos Exp $ */
+/* $NetBSD: version.h,v 1.3 2014/11/19 19:33:31 christos Exp $ */
-static const char pcap_version_string[] = "libpcap version 1.3.0";
+static const char pcap_version_string[] = "libpcap version 1.6.2";
