Merge libpcap 0.3

Update FREEBSD-upgrade to mention bumping library version number.

Suggested-by:	Chris Timmons <skynyrd@opus.cts.cwu.edu>

7 files changed, 52 insertions, 528 deletions

diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade
index b82942f..b8abe2f 100644
--- a/contrib/libpcap/FREEBSD-upgrade
+++ b/contrib/libpcap/FREEBSD-upgrade
@@ -8,21 +8,27 @@ To upgrade to a newer version of libpcap, when it is available:
 
 	2. Use the command:
 		cvs import -m 'Virgin import of LBL libpcap v<version>' \
-			-I SUNOS4 src/contrib/libpcap LBL v<version>
+			-I SUNOS4 -I linux-include \
+			src/contrib/libpcap LBL v<version>
 
 	   For example, to do the import of version 0.2.1, I typed:
 		cvs import -m 'Virgin import of LBL libpcap v0.2.1' \
-			-I SUNOS4 src/contrib/libpcap LBL v0_2_1
+			-I SUNOS4 -I linux-include \
+			src/contrib/libpcap LBL v0_2_1
 
 	3. Follow the instructions printed out in step 2 to resolve any
 	   conflicts between local FreeBSD changes and the newer version.
 
+	4. Update the shared library version number in
+	   src/lib/libpcap/Makefile as described in the
+	   handbook section 18.
+
 Do not, under any circumstances, deviate from this procedure.
 
 To make local changes to libpcap, simply patch and commit to the main
 branch (aka HEAD).  Never make local changes on the LBL branch.
 
-All local changes should be submitted to "tcpdump@ee.lbl.gov" [sic] for
+All local changes should be submitted to "libpcap@ee.lbl.gov" for
 inclusion in the next vendor release of tcpdump and libpcap.
 
 pst@freebsd.org - 19 Aug 1996
diff --git a/contrib/libpcap/aclocal.m4 b/contrib/libpcap/aclocal.m4
deleted file mode 100644
index 2c017f6..0000000
--- a/contrib/libpcap/aclocal.m4
+++ /dev/null
@@ -1,505 +0,0 @@
-dnl @(#) $Header: aclocal.m4,v 1.32 96/07/23 22:55:48 leres Exp $ (LBL)
-dnl
-dnl Copyright (c) 1995, 1996
-dnl	The Regents of the University of California.  All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that: (1) source code distributions
-dnl retain the above copyright notice and this paragraph in its entirety, (2)
-dnl distributions including binary code include the above copyright notice and
-dnl this paragraph in its entirety in the documentation or other materials
-dnl provided with the distribution, and (3) all advertising materials mentioning
-dnl features or use of this software display the following acknowledgement:
-dnl ``This product includes software developed by the University of California,
-dnl Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
-dnl the University nor the names of its contributors may be used to endorse
-dnl or promote products derived from this software without specific prior
-dnl written permission.
-dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-dnl WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-dnl
-dnl LBL autoconf macros
-dnl
-
-dnl
-dnl Determine which compiler we're using (cc or gcc)
-dnl If using gcc, determine the version number
-dnl If using cc, require that it support ansi prototypes
-dnl If using gcc, use -O2 (otherwise use -O)
-dnl If using cc, explicitly specify /usr/local/include
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_C_INIT(copt, incls)
-dnl
-dnl results:
-dnl
-dnl	$1 (copt set)
-dnl	$2 (incls set)
-dnl	CC
-dnl	ac_cv_gcc_vers
-dnl
-AC_DEFUN(AC_LBL_C_INIT,
-    [$1=-O
-    $2=""
-    if test -z "$CC" ; then
-	    case "$target_os" in
-
-	    bsdi*)
-		    AC_CHECK_PROG(SHLICC2, shlicc2, yes, no)
-		    if test $SHLICC2 = yes ; then
-			    CC=shlicc2
-			    export CC
-		    fi
-		    ;;
-	    esac
-    fi
-    AC_PROG_CC
-    if test $ac_cv_prog_gcc = yes ; then
-	    if test "$SHLICC2" = yes ; then
-		    ac_cv_gcc_vers=2
-		    $1=-O2
-	    else
-		    AC_MSG_CHECKING(gcc version)
-		    AC_CACHE_VAL(ac_cv_gcc_vers,
-			ac_cv_gcc_vers=`$CC -v 2>&1 | \
-			    sed -n -e '$s/.* //' -e '$s/\..*//p'`)
-		    AC_MSG_RESULT($ac_cv_gcc_vers)
-		    if test $ac_cv_gcc_vers -gt 1 ; then
-			    $1=-O2
-		    fi
-	    fi
-    else
-	    AC_MSG_CHECKING(that $CC handles ansi prototypes)
-	    AC_CACHE_VAL(ac_cv_cc_ansi_prototypes,
-		AC_TRY_COMPILE(
-		    [#include <sys/types.h>],
-		    [int frob(int, char *)],
-		    ac_cv_cc_ansi_prototypes=yes,
-		    ac_cv_cc_ansi_prototypes=no))
-	    AC_MSG_RESULT($ac_cv_cc_ansi_prototypes)
-	    if test $ac_cv_cc_ansi_prototypes = no ; then
-		    case "$target_os" in
-
-		    hpux*)
-			    AC_MSG_CHECKING(for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE))
-			    savedcflags="$CFLAGS"
-			    CFLAGS="-Aa -D_HPUX_SOURCE $CFLAGS"
-			    AC_CACHE_VAL(ac_cv_cc_hpux_cc_aa,
-				AC_TRY_COMPILE(
-				    [#include <sys/types.h>],
-				    [int frob(int, char *)],
-				    ac_cv_cc_hpux_cc_aa=yes,
-				    ac_cv_cc_hpux_cc_aa=no))
-			    AC_MSG_RESULT($ac_cv_cc_hpux_cc_aa)
-			    if test $ac_cv_cc_hpux_cc_aa = no ; then
-				    AC_MSG_ERROR(see the INSTALL for more info)
-			    fi
-			    CFLAGS="$savedcflags"
-			    V_CCOPT="-Aa $V_CCOPT"
-			    AC_DEFINE(_HPUX_SOURCE)
-			    ;;
-
-		    sni*)
-			    AC_MSG_CHECKING(for SINIX ansi compiler ($CC -kansi))
-			    savedcflags="$CFLAGS"
-			    CFLAGS="-kansi"
-			    AC_CACHE_VAL(ac_cv_cc_sinix_kansi,
-				AC_TRY_COMPILE(
-				    [#include <sys/types.h>],
-				    [int frob(int, char *)],
-				    ac_cv_cc_sinix_kansi=yes,
-				    ac_cv_cc_sinix_kansi=no))
-			    AC_MSG_RESULT($ac_cv_cc_sinix_kansi)
-			    if test $ac_cv_cc_sinix_kansi = no ; then
-				    AC_MSG_ERROR(see the INSTALL for more info)
-			    fi
-			    CFLAGS="$savedcflags"
-			    V_CCOPT="-kansi $V_CCOPT"
-			    ;;
-
-		    *)
-			    AC_MSG_ERROR(see the INSTALL for more info)
-			    ;;
-		    esac
-	    fi
-	    $2=-I/usr/local/include
-
-	    case "$target_os" in
-
-	    irix*)
-		    V_CCOPT="$V_CCOPT -xansi -signed -g3"
-		    ;;
-
-	    osf*)
-		    V_CCOPT="$V_CCOPT -g3"
-		    ;;
-
-	    ultrix*)
-		    AC_MSG_CHECKING(that Ultrix $CC hacks const in prototypes)
-		    AC_CACHE_VAL(ac_cv_cc_const_proto,
-			AC_TRY_COMPILE(
-			    [#include <sys/types.h>],
-			    [struct a { int b; };
-			    void c(const struct a *)],
-			    ac_cv_cc_const_proto=yes,
-			    ac_cv_cc_const_proto=no))
-		    AC_MSG_RESULT($ac_cv_cc_const_proto)
-		    if test $ac_cv_cc_const_proto = no ; then
-			    AC_DEFINE(const,)
-		    fi
-		    ;;
-	    esac
-    fi
-])
-
-dnl
-dnl Use pfopen.c if available and pfopen() not in standard libraries
-dnl Require libpcap
-dnl Look for libpcap in ..
-dnl Use the installed libpcap if there is no local version
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_LIBPCAP(pcapdep, incls)
-dnl
-dnl results:
-dnl
-dnl	$1 (pcapdep set)
-dnl	$2 (incls appended)
-dnl	LIBS
-dnl
-AC_DEFUN(AC_LBL_LIBPCAP,
-    [pfopen=/usr/examples/packetfilter/pfopen.c
-    if test -f $pfopen ; then
-	    AC_CHECK_FUNCS(pfopen)
-	    if test $ac_cv_func_pfopen = "no" ; then
-		    AC_MSG_RESULT(Using $pfopen)
-		    LIBS="$LIBS $pfopen"
-	    fi
-    fi
-    AC_MSG_CHECKING(for local pcap library)
-    libpcap=FAIL
-    places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
-	egrep '/libpcap-[[0-9]]*\.[[0-9]]*(\.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
-    for dir in ../libpcap $places libpcap ; do
-	    if test -r $dir/pcap.c ; then
-		    libpcap=$dir/libpcap.a
-		    d=$dir
-		    dnl continue and select the last one that exists
-	    fi
-    done
-    if test $libpcap = FAIL ; then
-	    AC_MSG_RESULT(not found)
-	    AC_CHECK_LIB(pcap, main, libpcap="-lpcap")
-	    if test $libpcap = FAIL ; then
-		    AC_MSG_ERROR(see the INSTALL doc for more info)
-	    fi
-    else
-	    $1=$libpcap
-	    $2="-I$d $$2"
-	    AC_MSG_RESULT($libpcap)
-    fi
-    LIBS="$libpcap $LIBS"])
-
-dnl
-dnl Define RETSIGTYPE and RETSIGVAL
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_TYPE_SIGNAL
-dnl
-dnl results:
-dnl
-dnl	RETSIGTYPE (defined)
-dnl	RETSIGVAL (defined)
-dnl
-AC_DEFUN(AC_LBL_TYPE_SIGNAL,
-    [AC_TYPE_SIGNAL
-    if test "$ac_cv_type_signal" = void ; then
-	    AC_DEFINE(RETSIGVAL,)
-    else
-	    AC_DEFINE(RETSIGVAL,(0))
-    fi
-    case "$target_os" in
-
-    irix*)
-	    AC_DEFINE(_BSD_SIGNALS)
-	    ;;
-
-    *)
-	    AC_CHECK_FUNCS(sigset)
-	    if test $ac_cv_func_sigset = yes ; then
-		    AC_DEFINE(signal, sigset)
-	    fi
-	    ;;
-    esac])
-
-dnl
-dnl If using gcc, see if fixincludes should be run
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_FIXINCLUDES
-dnl
-AC_DEFUN(AC_LBL_FIXINCLUDES,
-    [if test $ac_cv_prog_gcc = yes ; then
-	    AC_MSG_CHECKING(if fixincludes is needed)
-	    AC_CACHE_VAL(ac_cv_gcc_fixincludes,
-		AC_TRY_COMPILE(
-		    [/*
-		     * This generates a "duplicate case value" when fixincludes
-		     * has not be run.
-		     */
-#		include <sys/types.h>
-#		include <sys/time.h>
-#		include <sys/ioctl.h>
-#		ifdef HAVE_SYS_IOCCOM_H
-#		include <sys/ioccom.h>
-#		endif],
-		    [switch (0) {
-		    case _IO('A', 1):;
-		    case _IO('B', 1):;
-		    }],
-		    ac_cv_gcc_fixincludes=yes,
-		    ac_cv_gcc_fixincludes=no))
-	    AC_MSG_RESULT($ac_cv_gcc_fixincludes)
-	    if test $ac_cv_gcc_fixincludes = no ; then
-		    # Don't cache failure
-		    unset ac_cv_gcc_fixincludes
-		    AC_MSG_ERROR(see the INSTALL for more info)
-	    fi
-    fi])
-
-dnl
-dnl Check for flex, default to lex
-dnl Require flex 2.4 or higher
-dnl Check for bison, default to yacc
-dnl Default to lex/yacc if both flex and bison are not available
-dnl Define the yy prefix string if using flex and bison
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_LEX_AND_YACC(lex, yacc, yyprefix)
-dnl
-dnl results:
-dnl
-dnl	$1 (lex set)
-dnl	$2 (yacc appended)
-dnl	$3 (optional flex and bison -P prefix)
-dnl
-AC_DEFUN(AC_LBL_LEX_AND_YACC,
-    [AC_CHECK_PROGS($1, flex, lex)
-    if test "$$1" = flex ; then
-	    # The -V flag was added in 2.4
-	    AC_MSG_CHECKING(for flex 2.4 or higher)
-	    AC_CACHE_VAL(ac_cv_flex_v24,
-		if flex -V >/dev/null 2>&1; then
-			ac_cv_flex_v24=yes
-		else
-			ac_cv_flex_v24=no
-		fi)
-	    AC_MSG_RESULT($ac_cv_flex_v24)
-	    if test $ac_cv_flex_v24 = no ; then
-		    s="2.4 or higher required"
-		    AC_MSG_WARN(ignoring obsolete flex executable ($s))
-		    $1=lex
-	    fi
-    fi
-    AC_CHECK_PROGS($2, bison, yacc)
-    if test "$$2" = bison ; then
-	    $2="$$2 -y"
-    fi
-    if test "$$1" != lex -a "$$2" = yacc -o "$$1" = lex -a "$$2" != yacc ; then
-	    AC_MSG_WARN(don't have both flex and bison; reverting to lex/yacc)
-	    $1=lex
-	    $2=yacc
-    fi
-    if test "$$1" = flex -a -n "$3" ; then
-	    $1="$$1 -P$3"
-	    $2="$$2 -p $3"
-    fi])
-
-dnl
-dnl Checks to see if union wait is used with WEXITSTATUS()
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_UNION_WAIT
-dnl
-dnl results:
-dnl
-dnl	DECLWAITSTATUS (defined)
-dnl
-AC_DEFUN(AC_LBL_UNION_WAIT,
-    [AC_MSG_CHECKING(if union wait is used)
-    AC_CACHE_VAL(ac_cv_union_wait,
-	AC_TRY_COMPILE([
-    #	include <sys/types.h>
-    #	include <sys/wait.h>],
-	    [int status;
-	    u_int i = WEXITSTATUS(status);
-	    u_int j = waitpid(0, &status, 0);],
-	    ac_cv_union_wait=no,
-	    ac_cv_union_wait=yes))
-    AC_MSG_RESULT($ac_cv_union_wait)
-    if test $ac_cv_union_wait = yes ; then
-	    AC_DEFINE(DECLWAITSTATUS,union wait)
-    else
-	    AC_DEFINE(DECLWAITSTATUS,int)
-    fi])
-
-dnl
-dnl Checks to see if the sockaddr struct has the 4.4 BSD sa_len member
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_SOCKADDR_SA_LEN
-dnl
-dnl results:
-dnl
-dnl	HAVE_SOCKADDR_SA_LEN (defined)
-dnl
-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
-    [AC_MSG_CHECKING(if sockaddr struct has sa_len member)
-    AC_CACHE_VAL(ac_cv_sockaddr_has_sa_len,
-	AC_TRY_COMPILE([
-#	include <sys/types.h>
-#	include <sys/socket.h>],
-	[u_int i = sizeof(((struct sockaddr *)0)->sa_len)],
-	ac_cv_sockaddr_has_sa_len=yes,
-	ac_cv_sockaddr_has_sa_len=no))
-    AC_MSG_RESULT($ac_cv_sockaddr_has_sa_len)
-    if test $ac_cv_sockaddr_has_sa_len = yes ; then
-	    AC_DEFINE(HAVE_SOCKADDR_SA_LEN)
-    fi])
-
-dnl
-dnl Checks to see if -R is used
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_HAVE_RUN_PATH
-dnl
-dnl results:
-dnl
-dnl	ac_cv_have_run_path (yes or no)
-dnl
-AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
-    [AC_MSG_CHECKING(for ${CC-cc} -R)
-    AC_CACHE_VAL(ac_cv_have_run_path,
-	[echo 'main(){}' > conftest.c
-	${CC-cc} -o conftest conftest.c -R/a1/b2/c3 >conftest.out 2>&1
-	if test ! -s conftest.out ; then
-		ac_cv_have_run_path=yes
-	else
-		ac_cv_have_run_path=no
-	fi
-	rm -f conftest*])
-    AC_MSG_RESULT($ac_cv_have_run_path)
-    ])
-
-dnl
-dnl Checks to see if unaligned memory accesses fail
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_UNALIGNED_ACCESS
-dnl
-dnl results:
-dnl
-dnl	LBL_ALIGN (DEFINED)
-dnl
-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
-    [AC_MSG_CHECKING(if unaligned accesses fail)
-    AC_CACHE_VAL(ac_cv_unaligned_fail,
-	[case "$target_cpu" in
-
-	alpha|hp*|mips|sparc)
-		ac_cv_unaligned_fail=yes
-		;;
-
-	*)
-		cat >conftest.c <<EOF
-#		include <sys/types.h>
-#		include <sys/wait.h>
-#		include <stdio.h>
-		unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
-		main() {
-		unsigned int i;
-		pid_t pid;
-		int status;
-		/* avoid "core dumped" message */
-		pid = fork();
-		if (pid <  0)
-			exit(2);
-		if (pid > 0) {
-			/* parent */
-			pid = waitpid(pid, &status, 0);
-			if (pid < 0)
-				exit(3);
-			exit(!WIFEXITED(status));
-		}
-		/* child */
-		i = *(unsigned int *)&a[1];
-		printf("%d\n", i);
-		exit(0);
-		}
-EOF
-		${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
-		    conftest.c $LIBS >/dev/null 2>&1
-		if test ! -x conftest ; then
-			dnl failed to compile for some reason
-			ac_cv_unaligned_fail=yes
-		else
-			./conftest >conftest.out
-			if test ! -s conftest.out ; then
-				ac_cv_unaligned_fail=yes
-			else
-				ac_cv_unaligned_fail=no
-			fi
-		fi
-		rm -f conftest* core core.conftest
-		;;
-	esac])
-    AC_MSG_RESULT($ac_cv_unaligned_fail)
-    if test $ac_cv_unaligned_fail = yes ; then
-	    AC_DEFINE(LBL_ALIGN)
-    fi])
-
-dnl
-dnl If using gcc and the file .devel exists:
-dnl	Compile with -g (if supported) and -Wall
-dnl	If using gcc 2, do extra prototype checking
-dnl	If an os prototype include exists, symlink os-proto.h to it
-dnl
-dnl usage:
-dnl
-dnl	AC_LBL_DEVEL(copt)
-dnl
-dnl results:
-dnl
-dnl	$1 (copt appended)
-dnl	HAVE_OS_PROTO_H (defined)
-dnl	os-proto.h (symlinked)
-dnl
-AC_DEFUN(AC_LBL_DEVEL,
-    [rm -f os-proto.h
-    if test $ac_cv_prog_gcc = yes -a -f .devel ; then
-	    if test $ac_cv_prog_gcc_g = yes ; then
-		    $1="-g $$1"
-	    fi
-	    $1="$$1 -Wall"
-	    if test $ac_cv_gcc_vers -gt 1 ; then
-		    $1="$$1 -Wmissing-prototypes -Wstrict-prototypes"
-	    fi
-	    os=`echo $target_os | sed -e 's/\([[0-9]]\)[[0-9.]][[0-9.]]*$/\1/'`
-	    name="lbl/os-$os.h"
-	    if test -f $name ; then
-		    ln -s $name os-proto.h
-		    AC_DEFINE(HAVE_OS_PROTO_H)
-	    else
-		    AC_MSG_WARN(can't find $name)
-	    fi
-    fi])
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index d218b93..e758c71 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static char rcsid[] =
-    "@(#) $Header: gencode.c,v 1.88 96/07/23 01:30:41 leres Exp $ (LBL)";
+static const char rcsid[] =
+    "@(#) $Header: gencode.c,v 1.91 96/12/11 19:10:23 leres Exp $ (LBL)";
 #endif
 
 #include <sys/types.h>
@@ -416,7 +416,8 @@ gen_bcmp(offset, size, v)
 	b = NULL;
 	while (size >= 4) {
 		register const u_char *p = &v[size - 4];
-		bpf_int32 w = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
+		bpf_int32 w = ((bpf_int32)p[0] << 24) |
+		    ((bpf_int32)p[1] << 16) | ((bpf_int32)p[2] << 8) | p[3];
 
 		tmp = gen_cmp(offset + size - 4, BPF_W, w);
 		if (b != NULL)
@@ -426,7 +427,7 @@ gen_bcmp(offset, size, v)
 	}
 	while (size >= 2) {
 		register const u_char *p = &v[size - 2];
-		bpf_int32 w = (p[0] << 8) | p[1];
+		bpf_int32 w = ((bpf_int32)p[0] << 8) | p[1];
 
 		tmp = gen_cmp(offset + size - 2, BPF_H, w);
 		if (b != NULL)
@@ -513,6 +514,11 @@ init_linktype(type)
 		off_linktype = 6;
 		off_nl = 8;
 		return;
+
+	case DLT_RAW:
+		off_linktype = -1;
+		off_nl = 0;
+		return;
 	}
 	bpf_error("unknown data link type 0x%x", linktype);
 	/* NOTREACHED */
@@ -549,12 +555,14 @@ static struct block *
 gen_linktype(proto)
 	int proto;
 {
+	/* If we're not using encapsulation and checking for IP, we're done */
+	if (off_linktype == -1 && proto == ETHERTYPE_IP)
+		return gen_true();
+
 	switch (linktype) {
+
 	case DLT_SLIP:
-		if (proto == ETHERTYPE_IP)
-			return gen_true();
-		else
-			return gen_false();
+		return gen_false();
 
 	case DLT_PPP:
 		if (proto == ETHERTYPE_IP)
@@ -1235,6 +1243,7 @@ gen_scode(name, q)
 {
 	int proto = q.proto;
 	int dir = q.dir;
+	int tproto;
 	u_char *eaddr;
 	bpf_u_int32 mask, addr, **alist;
 	struct block *b, *tmp;
@@ -1289,10 +1298,13 @@ gen_scode(name, q)
 			alist = pcap_nametoaddr(name);
 			if (alist == NULL || *alist == NULL)
 				bpf_error("unknown host '%s'", name);
-			b = gen_host(**alist++, 0xffffffff, proto, dir);
+			tproto = proto;
+			if (off_linktype == -1 && tproto == Q_DEFAULT)
+				tproto = Q_IP;
+			b = gen_host(**alist++, 0xffffffff, tproto, dir);
 			while (*alist) {
 				tmp = gen_host(**alist++, 0xffffffff,
-					       proto, dir);
+					       tproto, dir);
 				gen_or(b, tmp);
 				b = tmp;
 			}
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index 580c3ea..0803c6d 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -21,8 +21,8 @@
  *
  */
 #ifndef lint
-static char rcsid[] =
-    "@(#) $Header: grammar.y,v 1.54 96/07/17 00:11:34 leres Exp $ (LBL)";
+static const char rcsid[] =
+    "@(#) $Header: grammar.y,v 1.56 96/11/02 21:54:55 leres Exp $ (LBL)";
 #endif
 
 #include <sys/types.h>
@@ -63,7 +63,7 @@ static void
 yyerror(char *msg)
 {
 	++n_errors;
-	bpf_error(msg);
+	bpf_error("%s", msg);
 	/* NOTREACHED */
 }
 
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 7cd5c4d..fc17a30 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -23,8 +23,8 @@
  */
 
 #ifndef lint
-static char rcsid[] =
-    "@(#) $Header: nametoaddr.c,v 1.43 96/07/17 00:11:41 leres Exp $ (LBL)";
+static const char rcsid[] =
+    "@(#) $Header: nametoaddr.c,v 1.45 96/10/17 23:26:53 leres Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -190,7 +190,6 @@ struct eproto eproto_db[] = {
 	{ "sprite", ETHERTYPE_SPRITE },
 	{ "mopdl", ETHERTYPE_MOPDL },
 	{ "moprc", ETHERTYPE_MOPRC },
-	{ "atalk", ETHERTYPE_ATALK },
 	{ "decnet", ETHERTYPE_DN },
 	{ "lat", ETHERTYPE_LAT },
 	{ "sca", ETHERTYPE_SCA },
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index b88a518..fae0c0e 100644
--- a/contrib/libpcap/pcap.3
+++ b/contrib/libpcap/pcap.3
@@ -19,7 +19,7 @@
 .\"
 .\" $Id$
 .\"
-.TH PCAP 3  "18 July 1996"
+.TH PCAP 3  "18 August 1996"
 .SH NAME
 pcap \- Packet Capture library
 .SH SYNOPSIS
@@ -307,5 +307,16 @@ closes the ``savefile.''
 .PP
 .SH SEE ALSO
 tcpdump(1), tcpslice(1)
+.SH AUTHORS
+Van Jacobson,
+Craig Leres and
+Steven McCanne, all of the
+Lawrence Berkeley National Laboratory, University of California, Berkeley, CA.
+.LP
+The current version is available via anonymous ftp:
+.LP
+.RS
+.I ftp://ftp.ee.lbl.gov/libpcap.tar.Z
+.RE
 .SH BUGS
-.SH HISTORY
+Please send bug reports to libpcap@ee.lbl.gov.
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 741ca7d..8caa830 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -21,8 +21,8 @@
  */
 
 #ifndef lint
-static char rcsid[] =
-    "@(#) $Header: scanner.l,v 1.53 96/07/17 00:11:34 leres Exp $ (LBL)";
+static const char rcsid[] =
+    "@(#) $Header: scanner.l,v 1.55 96/09/27 22:34:45 leres Exp $ (LBL)";
 #endif
 
 #include <sys/types.h>
@@ -46,6 +46,7 @@ static int stoi(char *);
 static inline int xdtoi(int);
 
 #ifdef FLEX_SCANNER
+#define YY_NO_UNPUT
 #undef YY_INPUT
 #define YY_INPUT(buf, result, max)\
  {\