Add an error for "you don't have permission to open that device", as

[libpcap] / pcap-libdlpi.c

diff --git a/pcap-libdlpi.c b/pcap-libdlpi.c
index d1df5ba223e32c75f507fd6731f8ed01b67f1b07..9002984767b5345deb9d31f7d2f02014c84b5b3a 100644 (file)
--- a/pcap-libdlpi.c
+++ b/pcap-libdlpi.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-       "@(#) $Header: /tcpdump/master/libpcap/pcap-libdlpi.c,v 1.4 2008-04-04 19:37:45 guy Exp $ (LBL)";
+       "@(#) $Header: /tcpdump/master/libpcap/pcap-libdlpi.c,v 1.5 2008-04-09 19:58:02 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -102,13 +102,7 @@ pcap_activate_libdlpi(pcap_t *p)
        int retv;
        dlpi_handle_t dh;
        dlpi_info_t dlinfo;
-
-       if (p->opt.rfmon) {
-               /*
-                * No monitor mode on any platforms that support DLPI.
-                */
-               return (PCAP_ERROR_RFMON_NOTSUP);
-       }
+       int err = PCAP_ERROR;
 
        p->fd = -1;     /* indicate that it hasn't been opened yet */
 
@@ -119,11 +113,25 @@ pcap_activate_libdlpi(pcap_t *p)
         */
        retv = dlpi_open(p->opt.source, &dh, DLPI_RAW|DLPI_PASSIVE);
        if (retv != DLPI_SUCCESS) {
-               pcap_libdlpi_err(p->opt.source, "dlpi_open", retv, p->errbuf);
-               goto bad;
+               if (retv == DLPI_ELINKNAMEINVAL || retv == DLPI_ENOLINK)
+                       err = PCAP_ERROR_NO_SUCH_DEVICE;
+               else if (retv == DLPI_SYSERR && errno == EACCES)
+                       err = PCAP_ERROR_PERM_DENIED;
+               pcap_libdlpi_err(p->opt.source, "dlpi_open", retv,
+                   p->errbuf);
+               return (err);
        }
        p->dlpi_hd = dh;
 
+       if (p->opt.rfmon) {
+               /*
+                * This device exists, but we don't support monitor mode
+                * any platforms that support DLPI.
+                */
+               err = PCAP_ERROR_RFMON_NOTSUP;
+               goto bad;
+       }
+
        /* Bind with DLPI_ANY_SAP. */
        if ((retv = dlpi_bind(p->dlpi_hd, DLPI_ANY_SAP, 0)) != DLPI_SUCCESS) {
                pcap_libdlpi_err(p->opt.source, "dlpi_bind", retv, p->errbuf);
@@ -211,7 +219,7 @@ bad:
        if (p->dlt_list != NULL)
                free(p->dlt_list);
        dlpi_close(p->dlpi_hd);
-       return (PCAP_ERROR);
+       return (err);
 }
 
 /*