]> The Tcpdump Group git mirrors - libpcap/blobdiff - inet.c
Have routines to set various internal debugging flags.
[libpcap] / inet.c
diff --git a/inet.c b/inet.c
index 898cb3ed302f0ab552a15b164fee50980be850fa..bd59a525dfd790500dffe39ff86b7b6f7be0f24f 100644 (file)
--- a/inet.c
+++ b/inet.c
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.79 2008-04-20 18:19:02 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <pcap-stdinc.h>
-#else /* WIN32 */
+#else /* _WIN32 */
 
 #include <sys/param.h>
 #ifndef MSDOS
@@ -59,7 +54,7 @@ struct mbuf;          /* Squelch compiler warnings on some platforms for */
 struct rtentry;                /* declarations in <net/if.h> */
 #include <net/if.h>
 #include <netinet/in.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #include <ctype.h>
 #include <errno.h>
@@ -67,9 +62,9 @@ struct rtentry;               /* declarations in <net/if.h> */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(WIN32) && !defined(__BORLANDC__)
+#if !defined(_WIN32) && !defined(__BORLANDC__)
 #include <unistd.h>
-#endif /* !WIN32 && !__BORLANDC__ */
+#endif /* !_WIN32 && !__BORLANDC__ */
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #else
@@ -90,6 +85,18 @@ struct rtentry;              /* declarations in <net/if.h> */
     (isdigit((unsigned char)((name)[2])) || (name)[2] == '\0'))
 #endif
 
+#ifdef IFF_UP
+#define ISUP(flags) ((flags) & IFF_UP)
+#else
+#define ISUP(flags) 0
+#endif
+
+#ifdef IFF_RUNNING
+#define ISRUNNING(flags) ((flags) & IFF_RUNNING)
+#else
+#define ISRUNNING(flags) 0
+#endif
+
 struct sockaddr *
 dup_sockaddr(struct sockaddr *sa, size_t sa_length)
 {
@@ -100,39 +107,85 @@ dup_sockaddr(struct sockaddr *sa, size_t sa_length)
        return (memcpy(newsa, sa, sa_length));
 }
 
-static int
-get_instance(const char *name)
+/*
+ * Construct a "figure of merit" for an interface, for use when sorting
+ * the list of interfaces, in which interfaces that are up are superior
+ * to interfaces that aren't up, interfaces that are up and running are
+ * superior to interfaces that are up but not running, and non-loopback
+ * interfaces that are up and running are superior to loopback interfaces,
+ * and interfaces with the same flags have a figure of merit that's higher
+ * the lower the instance number.
+ *
+ * The goal is to try to put the interfaces most likely to be useful for
+ * capture at the beginning of the list.
+ *
+ * The figure of merit, which is lower the "better" the interface is,
+ * has the uppermost bit set if the interface isn't running, the bit
+ * below that set if the interface isn't up, the bit below that set
+ * if the interface is a loopback interface, and the interface index
+ * in the 29 bits below that.  (Yes, we assume u_int is 32 bits.)
+ */
+static u_int
+get_figure_of_merit(pcap_if_t *dev)
 {
-       const char *cp, *endcp;
-       int n;
+       const char *cp;
+       u_int n;
 
-       if (strcmp(name, "any") == 0) {
+       if (strcmp(dev->name, "any") == 0) {
                /*
                 * Give the "any" device an artificially high instance
                 * number, so it shows up after all other non-loopback
                 * interfaces.
                 */
-               return INT_MAX;
+               n = 0x1FFFFFFF; /* 29 all-1 bits */
+       } else {
+               /*
+                * A number at the end of the device name string is
+                * assumed to be a unit number.
+                */
+               cp = dev->name + strlen(dev->name) - 1;
+               while (cp-1 >= dev->name && *(cp-1) >= '0' && *(cp-1) <= '9')
+                       cp--;
+               if (*cp >= '0' && *cp <= '9')
+                       n = atoi(cp);
+               else
+                       n = 0;
        }
-
-       endcp = name + strlen(name);
-       for (cp = name; cp < endcp && !isdigit((unsigned char)*cp); ++cp)
-               continue;
-
-       if (isdigit((unsigned char)*cp))
-               n = atoi(cp);
-       else
-               n = 0;
+       if (!(dev->flags & PCAP_IF_RUNNING))
+               n |= 0x80000000;
+       if (!(dev->flags & PCAP_IF_UP))
+               n |= 0x40000000;
+       if (dev->flags & PCAP_IF_LOOPBACK)
+               n |= 0x20000000;
        return (n);
 }
 
+/*
+ * Look for a given device in the specified list of devices.
+ *
+ * If we find it, return 0 and set *curdev_ret to point to it.
+ *
+ * If we don't find it, check whether we can open it:
+ *
+ *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
+ *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
+ *     it, as that probably means it exists but doesn't support
+ *     packet capture.
+ *
+ *     Otherwise, attempt to add an entry for it, with the specified
+ *     ifnet flags and description, and, if that succeeds, return 0
+ *     and set *curdev_ret to point to the new entry, otherwise
+ *     return PCAP_ERROR and set errbuf to an error message.
+ */
 int
 add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
     u_int flags, const char *description, char *errbuf)
 {
        pcap_t *p;
        pcap_if_t *curdev, *prevdev, *nextdev;
-       int this_instance;
+       u_int this_figure_of_merit, nextdev_figure_of_merit;
+       char open_errbuf[PCAP_ERRBUF_SIZE];
+       int ret;
 
        /*
         * Is there already an entry in the list for this interface?
@@ -186,34 +239,83 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
                        en_name_len = strlen(name) - 1;
                        en_name = malloc(en_name_len + 1);
                        if (en_name == NULL) {
-                               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                               (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                                    "malloc: %s", pcap_strerror(errno));
                                return (-1);
                        }
                        strcpy(en_name, "en");
                        strcat(en_name, name + 3);
-                       p = pcap_open_live(en_name, 68, 0, 0, errbuf);
+                       p = pcap_create(en_name, open_errbuf);
                        free(en_name);
                } else
 #endif /* __APPLE */
-               p = pcap_open_live(name, 68, 0, 0, errbuf);
+               p = pcap_create(name, open_errbuf);
                if (p == NULL) {
                        /*
-                        * No.  Don't bother including it.
-                        * Don't treat this as an error, though.
+                        * The attempt to create the pcap_t failed;
+                        * that's probably an indication that we're
+                        * out of memory.
+                        *
+                        * Don't bother including this interface,
+                        * but don't treat it as an error.
                         */
                        *curdev_ret = NULL;
                        return (0);
                }
+               /* Small snaplen, so we don't try to allocate much memory. */
+               pcap_set_snaplen(p, 68);
+               ret = pcap_activate(p);
                pcap_close(p);
+               switch (ret) {
+
+               case PCAP_ERROR_NO_SUCH_DEVICE:
+               case PCAP_ERROR_IFACE_NOT_UP:
+                       /*
+                        * We expect these two errors - they're the
+                        * reason we try to open the device.
+                        *
+                        * PCAP_ERROR_NO_SUCH_DEVICE typically means
+                        * "there's no such device *known to the
+                        * OS's capture mechanism*", so, even though
+                        * it might be a valid network interface, you
+                        * can't capture on it (e.g., the loopback
+                        * device in Solaris up to Solaris 10, or
+                        * the vmnet devices in OS X with VMware
+                        * Fusion).  We don't include those devices
+                        * in our list of devices, as there's no
+                        * point in doing so - they're not available
+                        * for capture.
+                        *
+                        * PCAP_ERROR_IFACE_NOT_UP means that the
+                        * OS's capture mechanism doesn't work on
+                        * interfaces not marked as up; some capture
+                        * mechanisms *do* support that, so we no
+                        * longer reject those interfaces out of hand,
+                        * but we *do* want to reject them if they
+                        * can't be opened for capture.
+                        */
+                       *curdev_ret = NULL;
+                       return (0);
+               }
 
                /*
-                * Yes, we can open it.
+                * Yes, we can open it, or we can't, for some other
+                * reason.
+                *
+                * If we can open it, we want to offer it for
+                * capture, as you can capture on it.  If we can't,
+                * we want to offer it for capture, so that, if
+                * the user tries to capture on it, they'll get
+                * an error and they'll know why they can't
+                * capture on it (e.g., insufficient permissions)
+                * or they'll report it as a problem (and then
+                * have the error message to provide as information).
+                *
                 * Allocate a new entry.
                 */
                curdev = malloc(sizeof(pcap_if_t));
                if (curdev == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        return (-1);
                }
@@ -224,7 +326,7 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
                curdev->next = NULL;
                curdev->name = strdup(name);
                if (curdev->name == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        free(curdev);
                        return (-1);
@@ -235,7 +337,7 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
                         */
                        curdev->description = strdup(description);
                        if (curdev->description == NULL) {
-                               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                               (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                                    "malloc: %s", pcap_strerror(errno));
                                free(curdev->name);
                                free(curdev);
@@ -251,20 +353,22 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
                curdev->flags = 0;
                if (ISLOOPBACK(name, flags))
                        curdev->flags |= PCAP_IF_LOOPBACK;
+               if (ISUP(flags))
+                       curdev->flags |= PCAP_IF_UP;
+               if (ISRUNNING(flags))
+                       curdev->flags |= PCAP_IF_RUNNING;
 
                /*
                 * Add it to the list, in the appropriate location.
-                * First, get the instance number of this interface.
+                * First, get the "figure of merit" for this
+                * interface.
                 */
-               this_instance = get_instance(name);
+               this_figure_of_merit = get_figure_of_merit(curdev);
 
                /*
-                * Now look for the last interface with an instance number
-                * less than or equal to the new interface's instance
-                * number - except that non-loopback interfaces are
-                * arbitrarily treated as having interface numbers less
-                * than those of loopback interfaces, so the loopback
-                * interfaces are put at the end of the list.
+                * Now look for the last interface with an figure of merit
+                * less than or equal to the new interface's figure of
+                * merit.
                 *
                 * We start with "prevdev" being NULL, meaning we're before
                 * the first element in the list.
@@ -294,34 +398,13 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
                        }
 
                        /*
-                        * Is the new interface a non-loopback interface
-                        * and the next interface a loopback interface?
+                        * Is the new interface's figure of merit less
+                        * than the next interface's figure of merit,
+                        * meaning that the new interface is better
+                        * than the next interface?
                         */
-                       if (!(curdev->flags & PCAP_IF_LOOPBACK) &&
-                           (nextdev->flags & PCAP_IF_LOOPBACK)) {
-                               /*
-                                * Yes, we should put the new entry
-                                * before "nextdev", i.e. after "prevdev".
-                                */
-                               break;
-                       }
-
-                       /*
-                        * Is the new interface's instance number less
-                        * than the next interface's instance number,
-                        * and is it the case that the new interface is a
-                        * non-loopback interface or the next interface is
-                        * a loopback interface?
-                        *
-                        * (The goal of both loopback tests is to make
-                        * sure that we never put a loopback interface
-                        * before any non-loopback interface and that we
-                        * always put a non-loopback interface before all
-                        * loopback interfaces.)
-                        */
-                       if (this_instance < get_instance(nextdev->name) &&
-                           (!(curdev->flags & PCAP_IF_LOOPBACK) ||
-                              (nextdev->flags & PCAP_IF_LOOPBACK))) {
+                       nextdev_figure_of_merit = get_figure_of_merit(nextdev);
+                       if (this_figure_of_merit < nextdev_figure_of_merit) {
                                /*
                                 * Yes - we should put the new entry
                                 * before "nextdev", i.e. after "prevdev".
@@ -357,6 +440,9 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
 }
 
 /*
+ * Try to get a description for a given device.
+ * Returns a mallocated description if it could and NULL if it couldn't.
+ *
  * XXX - on FreeBSDs that support it, should it get the sysctl named
  * "dev.{adapter family name}.{adapter unit}.%desc" to get a description
  * of the adapter?  Note that "dev.an.0.%desc" is "Aironet PC4500/PC4800"
@@ -402,18 +488,11 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, const char *name,
  * Do any other UN*Xes, or desktop environments support getting a
  * description?
  */
-int
-add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
-    struct sockaddr *addr, size_t addr_size,
-    struct sockaddr *netmask, size_t netmask_size,
-    struct sockaddr *broadaddr, size_t broadaddr_size,
-    struct sockaddr *dstaddr, size_t dstaddr_size,
-    char *errbuf)
+static char *
+get_if_description(const char *name)
 {
-       pcap_if_t *curdev;
-       char *description = NULL;
-       pcap_addr_t *curaddr, *prevaddr, *nextaddr;
 #ifdef SIOCGIFDESCR
+       char *description = NULL;
        int s;
        struct ifreq ifrdesc;
 #ifndef IFDESCRSIZE
@@ -421,9 +500,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
 #else
        size_t descrlen = IFDESCRSIZE;
 #endif /* IFDESCRSIZE */
-#endif /* SIOCGIFDESCR */
 
-#ifdef SIOCGIFDESCR
        /*
         * Get the description for the interface.
         */
@@ -484,8 +561,53 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
                        description = NULL;
                }
        }
+
+       return (description);
+#else /* SIOCGIFDESCR */
+       return (NULL);
 #endif /* SIOCGIFDESCR */
+}
 
+/*
+ * Try to get a description for a given device, and then look for that
+ * device in the specified list of devices.
+ *
+ * If we find it, then, if the specified address isn't null, add it to
+ * the list of addresses for the device and return 0.
+ *
+ * If we don't find it, check whether we can open it:
+ *
+ *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
+ *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
+ *     it, as that probably means it exists but doesn't support
+ *     packet capture.
+ *
+ *     Otherwise, attempt to add an entry for it, with the specified
+ *     ifnet flags and description, and, if that succeeds, add the
+ *     specified address to its list of addresses if that address is
+ *     non-null, set *curdev_ret to point to the new entry, and
+ *     return 0, otherwise return PCAP_ERROR and set errbuf to an
+ *     error message.
+ *
+ * (We can get called with a null address because we might get a list
+ * of interface name/address combinations from the underlying OS, with
+ * the address being absent in some cases, rather than a list of
+ * interfaces with each interface having a list of addresses, so this
+ * call may be the only call made to add to the list, and we want to
+ * add interfaces even if they have no addresses.)
+ */
+int
+add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
+    struct sockaddr *addr, size_t addr_size,
+    struct sockaddr *netmask, size_t netmask_size,
+    struct sockaddr *broadaddr, size_t broadaddr_size,
+    struct sockaddr *dstaddr, size_t dstaddr_size,
+    char *errbuf)
+{
+       char *description;
+       pcap_if_t *curdev;
+
+       description = get_if_description(name);
        if (add_or_find_if(&curdev, alldevs, name, flags, description,
            errbuf) == -1) {
                free(description);
@@ -503,15 +625,45 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
                return (0);
        }
 
+       if (addr == NULL) {
+               /*
+                * There's no address to add; this entry just meant
+                * "here's a new interface".
+                */
+               return (0);
+       }
+
        /*
-        * "curdev" is an entry for this interface; add an entry for this
-        * address to its list of addresses.
+        * "curdev" is an entry for this interface, and we have an
+        * address for it; add an entry for that address to the
+        * interface's list of addresses.
         *
         * Allocate the new entry and fill it in.
         */
+       return (add_addr_to_dev(curdev, addr, addr_size, netmask,
+           netmask_size, broadaddr, broadaddr_size, dstaddr,
+           dstaddr_size, errbuf));
+}
+
+/*
+ * Add an entry to the list of addresses for an interface.
+ * "curdev" is the entry for that interface.
+ * If this is the first IP address added to the interface, move it
+ * in the list as appropriate.
+ */
+int
+add_addr_to_dev(pcap_if_t *curdev,
+    struct sockaddr *addr, size_t addr_size,
+    struct sockaddr *netmask, size_t netmask_size,
+    struct sockaddr *broadaddr, size_t broadaddr_size,
+    struct sockaddr *dstaddr, size_t dstaddr_size,
+    char *errbuf)
+{
+       pcap_addr_t *curaddr, *prevaddr, *nextaddr;
+
        curaddr = malloc(sizeof(pcap_addr_t));
        if (curaddr == NULL) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+               (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                    "malloc: %s", pcap_strerror(errno));
                return (-1);
        }
@@ -520,7 +672,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
        if (addr != NULL) {
                curaddr->addr = dup_sockaddr(addr, addr_size);
                if (curaddr->addr == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        free(curaddr);
                        return (-1);
@@ -531,7 +683,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
        if (netmask != NULL) {
                curaddr->netmask = dup_sockaddr(netmask, netmask_size);
                if (curaddr->netmask == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        if (curaddr->addr != NULL)
                                free(curaddr->addr);
@@ -544,7 +696,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
        if (broadaddr != NULL) {
                curaddr->broadaddr = dup_sockaddr(broadaddr, broadaddr_size);
                if (curaddr->broadaddr == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        if (curaddr->netmask != NULL)
                                free(curaddr->netmask);
@@ -559,7 +711,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
        if (dstaddr != NULL) {
                curaddr->dstaddr = dup_sockaddr(dstaddr, dstaddr_size);
                if (curaddr->dstaddr == NULL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "malloc: %s", pcap_strerror(errno));
                        if (curaddr->broadaddr != NULL)
                                free(curaddr->broadaddr);
@@ -602,6 +754,23 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
        return (0);
 }
 
+/*
+ * Look for a given device in the specified list of devices.
+ *
+ * If we find it, return 0.
+ *
+ * If we don't find it, check whether we can open it:
+ *
+ *     If that fails with PCAP_ERROR_NO_SUCH_DEVICE or
+ *     PCAP_ERROR_IFACE_NOT_UP, don't attempt to add an entry for
+ *     it, as that probably means it exists but doesn't support
+ *     packet capture.
+ *
+ *     Otherwise, attempt to add an entry for it, with the specified
+ *     ifnet flags and description, and, if that succeeds, return 0
+ *     and set *curdev_ret to point to the new entry, otherwise
+ *     return PCAP_ERROR and set errbuf to an error message.
+ */
 int
 pcap_add_if(pcap_if_t **devlist, const char *name, u_int flags,
     const char *description, char *errbuf)
@@ -659,7 +828,7 @@ pcap_freealldevs(pcap_if_t *alldevs)
        }
 }
 
-#if !defined(WIN32) && !defined(MSDOS)
+#if !defined(_WIN32) && !defined(MSDOS)
 
 /*
  * Return the name of a network interface attached to the system, or NULL
@@ -746,7 +915,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
 
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        if (fd < 0) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
+               (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
                    pcap_strerror(errno));
                return (-1);
        }
@@ -755,13 +924,13 @@ pcap_lookupnet(device, netp, maskp, errbuf)
        /* XXX Work around Linux kernel bug */
        ifr.ifr_addr.sa_family = AF_INET;
 #endif
-       (void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+       (void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
        if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
                if (errno == EADDRNOTAVAIL) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "%s: no IPv4 address assigned", device);
                } else {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "SIOCGIFADDR: %s: %s",
                            device, pcap_strerror(errno));
                }
@@ -775,9 +944,9 @@ pcap_lookupnet(device, netp, maskp, errbuf)
        /* XXX Work around Linux kernel bug */
        ifr.ifr_addr.sa_family = AF_INET;
 #endif
-       (void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+       (void)strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
        if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+               (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                    "SIOCGIFNETMASK: %s: %s", device, pcap_strerror(errno));
                (void)close(fd);
                return (-1);
@@ -792,7 +961,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
                else if (IN_CLASSC(*netp))
                        *maskp = IN_CLASSC_NET;
                else {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "inet class for 0x%x unknown", *netp);
                        return (-1);
                }
@@ -801,12 +970,16 @@ pcap_lookupnet(device, netp, maskp, errbuf)
        return (0);
 }
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 
 /*
  * Return the name of a network interface attached to the system, or NULL
  * if none can be found.  The interface must be configured up; the
  * lowest unit number is preferred; loopback is ignored.
+ *
+ * In the best of all possible worlds, this would be the same as on
+ * UN*X, but there may be software that expects this to return a
+ * full list of devices after the first device.
  */
 char *
 pcap_lookupdev(errbuf)
@@ -814,16 +987,18 @@ pcap_lookupdev(errbuf)
 {
        DWORD dwVersion;
        DWORD dwWindowsMajorVersion;
+       char our_errbuf[PCAP_ERRBUF_SIZE+1];
+
        dwVersion = GetVersion();       /* get the OS version */
        dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
-       
+
        if (dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4) {
                /*
                 * Windows 95, 98, ME.
                 */
                ULONG NameLength = 8192;
                static char AdaptersName[8192];
-               
+
                if (PacketGetAdapterNames(AdaptersName,&NameLength) )
                        return (AdaptersName);
                else
@@ -841,15 +1016,15 @@ pcap_lookupdev(errbuf)
 
                if(TAdaptersName == NULL)
                {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "memory allocation failure");
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "memory allocation failure");
                        return NULL;
                }
 
                if ( !PacketGetAdapterNames((PTSTR)TAdaptersName,&NameLength) )
                {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                               "PacketGetAdapterNames: %s",
-                               pcap_win32strerror());
+                       pcap_win32_err_to_str(GetLastError(), our_errbuf);
+                       (void)pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                               "PacketGetAdapterNames: %s", our_errbuf);
                        free(TAdaptersName);
                        return NULL;
                }
@@ -886,7 +1061,7 @@ pcap_lookupdev(errbuf)
 
                free(TAdaptersName);
                return (char *)(AdaptersName);
-       }       
+       }
 }
 
 
@@ -896,7 +1071,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
        register bpf_u_int32 *netp, *maskp;
        register char *errbuf;
 {
-       /* 
+       /*
         * We need only the first IPv4 address, so we must scan the array returned by PacketGetNetInfo()
         * in order to skip non IPv4 (i.e. IPv6 addresses)
         */
@@ -922,11 +1097,11 @@ pcap_lookupnet(device, netp, maskp, errbuf)
                        *netp &= *maskp;
                        return (0);
                }
-                               
+
        }
 
        *netp = *maskp = 0;
        return (0);
 }
 
-#endif /* !WIN32 && !MSDOS */
+#endif /* !_WIN32 && !MSDOS */