merge libpcap-1.10.6

Author: zoulasc

external/bsd/libpcap/dist/dlpisubs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dlpisubs.c,v 1.6 2024/09/02 15:33:36 christos Exp $	*/
+/*	$NetBSD: dlpisubs.c,v 1.7 2026/03/18 23:43:20 christos Exp $	*/
 
 /*
  * This code is derived from code formerly in pcap-dlpi.c, originally
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dlpisubs.c,v 1.6 2024/09/02 15:33:36 christos Exp $");
+__RCSID("$NetBSD: dlpisubs.c,v 1.7 2026/03/18 23:43:20 christos Exp $");
 
 #include <config.h>
 
@@ -65,10 +65,20 @@ __RCSID("$NetBSD: dlpisubs.c,v 1.6 2024/09/02 15:33:36 christos Exp $");
 #include <stropts.h>
 #include <unistd.h>
 
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+
+#include <net/if.h>
+
 #ifdef HAVE_LIBDLPI
 #include <libdlpi.h>
 #endif
 
+#ifdef HAVE_ZONE_H
+#include <zone.h>
+#endif
+
 #include "pcap-int.h"
 #include "dlpisubs.h"
 
@@ -418,3 +428,117 @@ pcap_stream_err(const char *func, int err, char *errbuf)
 	pcapint_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, err, "%s", func);
 }
 #endif
+
+int
+handle_nonexistent_dlpi_device(const char *ifname, char *errbuf)
+{
+	int fd;
+	int status;
+#ifdef LIFNAMSIZ
+	struct lifreq lifr;
+#else
+	struct ifreq ifr;
+#endif
+
+#ifdef LIFNAMSIZ
+	if (strlen(ifname) >= sizeof(lifr.lifr_name)) {
+#else
+	if (strlen(ifname) >= sizeof(ifr.ifr_name)) {
+#endif
+		/*
+		 * The name is too long, so it can't possibly exist.
+		 */
+		strlcpy(errbuf, "", PCAP_ERRBUF_SIZE);
+		return (PCAP_ERROR_NO_SUCH_DEVICE);
+	}
+
+	/*
+	 * Try to get a socket on which to do an ioctl to get the
+	 * interface's flags.
+	 */
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
+		/* That failed; report that as the error. */
+		pcapint_fmt_errmsg_for_errno(errbuf,  PCAP_ERRBUF_SIZE,
+		    errno, "Can't open socket to get interface flags");
+		return (PCAP_ERROR);
+	}
+
+#ifdef LIFNAMSIZ
+	pcapint_strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name));
+	status = ioctl(fd, SIOCGLIFFLAGS, (char *)&lifr);
+#else
+	pcapint_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+	status = ioctl(fd, SIOCGIFFLAGS, (char *)&ifr);
+#endif
+
+	if (status < 0) {
+		if (errno == ENXIO || errno == EINVAL) {
+			/*
+			 * macOS, *BSD, and Solaris return one of
+			 * those two errors if the device doesn't exist.
+			 */
+			strlcpy(errbuf, "", PCAP_ERRBUF_SIZE);
+			close(fd);
+			return (PCAP_ERROR_NO_SUCH_DEVICE);
+		}
+
+		/*
+		 * Some other error.
+		 */
+		pcapint_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE, errno,
+		    "Can't get interface flags");
+		close(fd);
+		return (PCAP_ERROR);
+	}
+
+	/*
+	 * The interface exists.
+	 */
+	close(fd);
+
+#ifdef HAVE_ZONE_H
+	/*
+	 * If we're not in a global zone, the problem is probably
+	 * that the zone we're in doesn't happen to have any
+	 * DLPI devices.  Exclusive-IP non-global zones have
+	 * their own interfaces and have DLPI devices for them:
+	 *
+	 *    https://docs.oracle.com/cd/E37838_01/html/E61040/z.config.ov-6.html#VLZCRgekkb
+	 *
+	 *    https://docs.oracle.com/cd/E19044-01/sol.containers/817-1592/geprv/index.html
+	 *
+	 * but shared-IP non-global zones don't:
+	 *
+	 *    https://docs.oracle.com/cd/E37838_01/html/E61040/z.config.ov-6.html#VLZCRgekku
+	 */
+	if (getzoneid() != GLOBAL_ZONEID) {
+		/*
+		 * Not a global zone; note that capturing on network
+		 * interfaces is only supported for interfaces
+		 * in an exclusive-IP zone.
+		 */
+		snprintf(errbuf, PCAP_ERRBUF_SIZE,
+		    "Capturing on interfaces in a non-global zone is supported only for interfaces in exclusive-IP zones");
+		return (PCAP_ERROR_CAPTURE_NOTSUP);
+	}
+#endif /* HAVE_ZONE_H */
+
+	/*
+	 * Some other problem; just report it as not having
+	 * a DLPI device.  We don't report the DLPI device
+	 * name, so people don't get confused and think, for
+	 * example, that if they can't capture on that interface
+	 * on Solaris prior to Solaris 11 the fix is to change
+	 * libpcap (or the application that uses it) to look
+	 * for something other than "/dev/{ifname}", as the fix
+	 * is to use Solaris 11 or some operating system other
+	 * than Solaris - you just *can't* capture on that
+	 * interface on Solaris prior to Solaris 11, the lack
+	 * of a DLPI device for the loopback interface is just
+	 * a symptom of that inability.
+	 */
+	snprintf(errbuf, PCAP_ERRBUF_SIZE,
+	    "Capturing on that interface is not supported - no DLPI device found");
+	return (PCAP_ERROR_CAPTURE_NOTSUP);
+}

external/bsd/libpcap/dist/dlpisubs.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: dlpisubs.h,v 1.2 2014/11/19 19:33:30 christos Exp $	*/
+/*	$NetBSD: dlpisubs.h,v 1.3 2026/03/18 23:43:20 christos Exp $	*/
 
 #ifndef dlpisubs_h
 #define	dlpisubs_h
@@ -32,6 +32,7 @@ int pcap_conf_bufmod(pcap_t *, int);
 #endif
 int pcap_alloc_databuf(pcap_t *);
 int strioctl(int, int, int, char *);
+int handle_nonexistent_dlpi_device(const char *ifname, char *errbuf);
 
 #ifdef __cplusplus
 }

external/bsd/libpcap/dist/fad-getad.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: fad-getad.c,v 1.6 2024/09/02 15:33:36 christos Exp $	*/
+/*	$NetBSD: fad-getad.c,v 1.7 2026/03/18 23:43:20 christos Exp $	*/
 
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fad-getad.c,v 1.6 2024/09/02 15:33:36 christos Exp $");
+__RCSID("$NetBSD: fad-getad.c,v 1.7 2026/03/18 23:43:20 christos Exp $");
 
 #include <config.h>
 
@@ -167,7 +167,7 @@ pcapint_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
 {
 	struct ifaddrs *ifap, *ifa;
 	struct sockaddr *addr, *netmask, *broadaddr, *dstaddr;
-	size_t addr_size, broadaddr_size, dstaddr_size;
+	size_t addr_size, netmask_size, broadaddr_size, dstaddr_size;
 	int ret = 0;
 	char *p, *q;
 
@@ -240,11 +240,18 @@ pcapint_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
 		if (ifa->ifa_addr != NULL) {
 			addr = ifa->ifa_addr;
 			addr_size = SA_LEN(addr);
-			netmask = ifa->ifa_netmask;
+			if (ifa->ifa_netmask != NULL) {
+				netmask = ifa->ifa_netmask;
+				netmask_size = SA_LEN(ifa->ifa_netmask);
+			} else {
+				netmask = NULL;
+				netmask_size = 0;
+			}
 		} else {
 			addr = NULL;
 			addr_size = 0;
 			netmask = NULL;
+			netmask_size = 0;
 		}
 
 		/*
@@ -284,7 +291,7 @@ pcapint_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
 		 */
 		if (pcapint_add_addr_to_if(devlistp, ifa->ifa_name, ifa->ifa_flags,
 		    get_flags_func,
-		    addr, addr_size, netmask, addr_size,
+		    addr, addr_size, netmask, netmask_size,
 		    broadaddr, broadaddr_size, dstaddr, dstaddr_size,
 		    errbuf) < 0) {
 			ret = -1;