[src/trunk]: src/lib/libpcap Use /dev/bpf.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce0700c6079b
branches:  trunk
changeset: 571588:ce0700c6079b
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 02 00:05:02 2004 +0000

description:
Use /dev/bpf.

diffstat:

 lib/libpcap/pcap-bpf.c |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r b05f9b50bfa4 -r ce0700c6079b lib/libpcap/pcap-bpf.c
--- a/lib/libpcap/pcap-bpf.c    Thu Dec 02 00:00:41 2004 +0000
+++ b/lib/libpcap/pcap-bpf.c    Thu Dec 02 00:05:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcap-bpf.c,v 1.12 2004/09/27 23:02:53 dyoung Exp $     */
+/*     $NetBSD: pcap-bpf.c,v 1.13 2004/12/02 00:05:02 christos Exp $   */
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996, 1998
@@ -26,7 +26,7 @@
 static const char rcsid[] =
     "@(#) Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.67.2.4 2003/11/22 00:06:28 guy Exp  (LBL)";
 #else
-__RCSID("$NetBSD: pcap-bpf.c,v 1.12 2004/09/27 23:02:53 dyoung Exp $");
+__RCSID("$NetBSD: pcap-bpf.c,v 1.13 2004/12/02 00:05:02 christos Exp $");
 #endif
 #endif
 
@@ -41,6 +41,7 @@
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
+#include <paths.h>
 
 #include <net/if.h>
 
@@ -458,8 +459,12 @@
 bpf_open(pcap_t *p, char *errbuf)
 {
        int fd;
+#ifndef _PATH_BPF
        int n = 0;
        char device[sizeof "/dev/bpf0000000000"];
+#else
+       const char *device = _PATH_BPF;
+#endif
 
 #ifdef _AIX
        /*
@@ -471,6 +476,7 @@
                return (-1);
 #endif
 
+#ifndef _PATH_BPF
        /*
         * Go through all the minors and find one that isn't in use.
         */
@@ -485,6 +491,12 @@
        if (fd < 0)
                (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
                    "(no devices found) %s: %s", device, pcap_strerror(errno));
+#else
+       if ((fd = open(device, O_RDWR)) == -1)
+               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                   "(cannot open device) %s: %s", device, pcap_strerror(errno));
+#endif
+
 
        return (fd);
 }