Add ifaddrs.h stub header file for systems (such as Solaris 10) which

do not have it, and a getifaddrs substitute for Solaris 10.

compat/Makefile.am

@@ -131,6 +131,12 @@ endif
 endif
 endif
 
+if !HAVE_IFADDRS_H
+if HOST_SOLARIS
+libcompat_la_SOURCES += getifaddrs_solaris.c
+endif
+endif
+
 if !HAVE_ARC4RANDOM_UNIFORM
 libcompat_la_SOURCES += arc4random_uniform.c
 endif

compat/getifaddrs_solaris.c

@@ -0,0 +1,222 @@
+/* The following code was found on the OpenSolaris networking-discuss
+ * mailing list (http://markmail.org/message/t74kvl63savhzrzp) in a post
+ * by James Carlson.
+ */
+
+/*
+ * Copyright (c) 2006 WIDE Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/sockio.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#include "ifaddrs.h"
+
+static int
+get_lifreq(int fd, struct lifreq **ifr_ret)
+{
+	struct lifnum lifn;
+	struct lifconf lifc;
+	struct lifreq *lifrp;
+
+	lifn.lifn_family = AF_UNSPEC;
+	lifn.lifn_flags = 0;
+	if (ioctl(fd, SIOCGLIFNUM, &lifn) == -1)
+		lifn.lifn_count = 16;
+	else
+		lifn.lifn_count += 16;
+
+	for (;;) {
+		lifc.lifc_len = lifn.lifn_count * sizeof (*lifrp);
+		lifrp = malloc(lifc.lifc_len);
+		if (lifrp == NULL)
+			return (-1);
+
+		lifc.lifc_family = AF_UNSPEC;
+		lifc.lifc_flags = 0;
+		lifc.lifc_buf = (char *)lifrp;
+		if (ioctl(fd, SIOCGLIFCONF, &lifc) == -1) {
+			free(lifrp);
+			if (errno == EINVAL) {
+				lifn.lifn_count <<= 1;
+				continue;
+			}
+			(void) close(fd);
+			return (-1);
+		}
+		if (lifc.lifc_len < (lifn.lifn_count - 1) * sizeof (*lifrp))
+			break;
+		free(lifrp);
+		lifn.lifn_count <<= 1;
+	}
+	(void) close(fd);
+
+	*ifr_ret = lifrp;
+
+	return (lifc.lifc_len / sizeof (*lifrp));
+}
+
+static size_t
+nbytes(const struct lifreq *lifrp, int nlif, size_t socklen)
+{
+	size_t len = 0;
+	size_t slen;
+
+	while (nlif > 0) {
+		slen = strlen(lifrp->lifr_name) + 1;
+		len += sizeof (struct ifaddrs) + ((slen + 3) & ~3);
+		len += 3 * socklen;
+		lifrp++;
+		nlif--;
+	}
+	return (len);
+}
+
+static struct sockaddr *
+addrcpy(struct sockaddr_storage *addr, char **bufp)
+{
+	char *buf = *bufp;
+	size_t len;
+
+	len = addr->ss_family == AF_INET ? sizeof (struct sockaddr_in) :
+	    sizeof (struct sockaddr_in6);
+	(void) memcpy(buf, addr, len);
+	*bufp = buf + len;
+	return ((struct sockaddr *)buf);
+}
+
+static int
+populate(struct ifaddrs *ifa, int fd, struct lifreq *lifrp, int nlif, int af,
+    char **bufp)
+{
+	char *buf = *bufp;
+	size_t slen;
+
+	while (nlif > 0) {
+		ifa->ifa_next = (nlif > 1) ? ifa + 1 : NULL;
+		(void) strcpy(ifa->ifa_name = buf, lifrp->lifr_name);
+		slen = strlen(lifrp->lifr_name) + 1;
+		buf += (slen + 3) & ~3;
+		if (ioctl(fd, SIOCGLIFFLAGS, lifrp) == -1)
+			ifa->ifa_flags = 0;
+		else
+			ifa->ifa_flags = lifrp->lifr_flags;
+		if (ioctl(fd, SIOCGLIFADDR, lifrp) == -1)
+			ifa->ifa_addr = NULL;
+		else
+			ifa->ifa_addr = addrcpy(&lifrp->lifr_addr, &buf);
+		if (ioctl(fd, SIOCGLIFNETMASK, lifrp) == -1)
+			ifa->ifa_netmask = NULL;
+		else
+			ifa->ifa_netmask = addrcpy(&lifrp->lifr_addr, &buf);
+		if (ifa->ifa_flags & IFF_POINTOPOINT) {
+			if (ioctl(fd, SIOCGLIFDSTADDR, lifrp) == -1)
+				ifa->ifa_dstaddr = NULL;
+			else
+				ifa->ifa_dstaddr =
+				    addrcpy(&lifrp->lifr_dstaddr, &buf);
+		} else if (ifa->ifa_flags & IFF_BROADCAST) {
+			if (ioctl(fd, SIOCGLIFBRDADDR, lifrp) == -1)
+				ifa->ifa_broadaddr = NULL;
+			else
+				ifa->ifa_broadaddr =
+				    addrcpy(&lifrp->lifr_broadaddr, &buf);
+		} else {
+			ifa->ifa_dstaddr = NULL;
+		}
+
+		ifa++;
+		nlif--;
+		lifrp++;
+	}
+	*bufp = buf;
+	return (0);
+}
+
+int
+getifaddrs(struct ifaddrs **ifap)
+{
+	int fd4, fd6;
+	int nif4, nif6 = 0;
+	struct lifreq *ifr4 = NULL;
+	struct lifreq *ifr6 = NULL;
+	struct ifaddrs *ifa = NULL;
+	char *buf;
+
+	if ((fd4 = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+		return (-1);
+	if ((fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) == -1 &&
+	    errno != EAFNOSUPPORT) {
+		(void) close(fd4);
+		return (-1);
+	}
+
+	if ((nif4 = get_lifreq(fd4, &ifr4)) == -1 ||
+	    (fd6 != -1 && (nif6 = get_lifreq(fd6, &ifr6)) == -1))
+		goto failure;
+
+	if (nif4 == 0 && nif6 == 0) {
+		*ifap = NULL;
+		return (0);
+	}
+
+	ifa = malloc(nbytes(ifr4, nif4, sizeof (struct sockaddr_in)) +
+	    nbytes(ifr6, nif6, sizeof (struct sockaddr_in6)));
+	if (ifa == NULL)
+		goto failure;
+
+	buf = (char *)(ifa + nif4 + nif6);
+
+	if (populate(ifa, fd4, ifr4, nif4, AF_INET, &buf) == -1)
+		goto failure;
+	if (nif4 > 0 && nif6 > 0)
+		ifa[nif4 - 1].ifa_next = ifa + nif4;
+	if (populate(ifa + nif4, fd6, ifr6, nif6, AF_INET6, &buf) == -1)
+		goto failure;
+
+	return (0);
+
+failure:
+	free(ifa);
+	(void) close(fd4);
+	if (fd6 != -1)
+		(void) close(fd6);
+	free(ifr4);
+	free(ifr6);
+	return (-1);
+}
+
+void
+freeifaddrs(struct ifaddrs *ifa)
+{
+	free(ifa);
+}

configure.ac

@@ -130,6 +130,7 @@ AM_CONDITIONAL([HAVE_CLOCK_GETRES], [test "x$ac_cv_func_clock_getres" = xyes])
 AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "x$ac_cv_func_clock_gettime" = xyes])
 AM_CONDITIONAL([HAVE_EXPLICIT_BZERO], [test "x$ac_cv_func_explicit_bzero" = xyes])
 AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = xyes])
+AM_CONDITIONAL([HAVE_IFADDRS_H], [test "x$ac_cv_header_ifaddrs_h" = xyes])
 AM_CONDITIONAL([HAVE_IMSG], [test "x$ac_cv_func_ibuf_open" = xyes])
 AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes])
 AM_CONDITIONAL([HAVE_POLL], [test "x$ac_cv_func_poll" = xyes])
@@ -195,7 +196,7 @@ if test "x$ac_cv_have___va_copy" = "xyes" ; then
 	AC_DEFINE([HAVE___VA_COPY], [1], [Define if __va_copy exists])
 fi
 
-AC_CHECK_HEADERS([sys/sysctl.h err.h md5.h paths.h sha2.h])
+AC_CHECK_HEADERS([sys/sysctl.h err.h ifaddrs.h md5.h paths.h sha2.h])
 AC_CHECK_HEADERS([sys/sensors.h],
 	AM_CONDITIONAL(HAVE_SENSORS, true),
 	AM_CONDITIONAL(HAVE_SENSORS, false)

include/Makefile.am

@@ -6,6 +6,7 @@ noinst_HEADERS += sys/socket.h
 noinst_HEADERS += sys/types.h
 noinst_HEADERS += sys/time.h
 noinst_HEADERS += err.h
+noinst_HEADERS += ifaddrs.h
 noinst_HEADERS += imsg.h
 noinst_HEADERS += string.h
 noinst_HEADERS += md5.h

include/ifaddrs.h

@@ -0,0 +1,66 @@
+/*
+ * ifaddrs.h compatibility shim
+ */
+
+#ifdef HAVE_IFADDRS_H
+
+#include_next <ifaddrs.h>
+
+#else
+
+#ifndef LIBCOMPAT_IFADDRS_H
+#define LIBCOMPAT_IFADDRS_H
+
+/* The following code was found on the OpenSolaris networking-discuss
+ * mailing list (http://markmail.org/message/t74kvl63savhzrzp) in a post
+ * by James Carlson.
+ */
+
+/*
+ * Copyright (c) 2006 WIDE Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#undef ifa_broadaddr
+#undef ifa_dstaddr
+struct ifaddrs {
+	struct ifaddrs	*ifa_next;	/* Pointer to next struct */
+	char		*ifa_name;	/* Interface name */
+	uint64_t	ifa_flags;	/* Interface flags */
+	struct sockaddr	*ifa_addr;	/* Interface address */
+	struct sockaddr	*ifa_netmask;	/* Interface netmask */
+	struct sockaddr	*ifa_dstaddr;	/* P2P interface destination */
+};
+#define	ifa_broadaddr	ifa_dstaddr
+
+extern int getifaddrs(struct ifaddrs **);
+extern void freeifaddrs(struct ifaddrs *);
+
+#endif
+
+#endif