X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7246dc4381c6c95454672a5c1aff65a02d6d3747..0383146e5e616e81c13b23a127ecfa697feac7db:/components/ip.c?ds=sidebyside

diff --git a/components/ip.c b/components/ip.c
index f98b2ed..fce2b66 100644
--- a/components/ip.c
+++ b/components/ip.c
@@ -1,9 +1,13 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
+#include <errno.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__OpenBSD__)
+	#include <sys/types.h>
+	#include <sys/socket.h>
+#endif
 
 #include "../util.h"
 
@@ -14,19 +18,21 @@ ipv4(const char *iface)
 	int s;
 	char host[NI_MAXHOST];
 
-	if (getifaddrs(&ifaddr) == -1) {
-		warn("Failed to get IPv4 address for interface %s", iface);
+	if (getifaddrs(&ifaddr) < 0) {
+		warn("getifaddrs:");
 		return NULL;
 	}
 
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) {
+		if (!ifa->ifa_addr) {
 			continue;
 		}
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-		if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
+		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
+		                NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+		if (!strcmp(ifa->ifa_name, iface) &&
+		    (ifa->ifa_addr->sa_family == AF_INET)) {
 			if (s != 0) {
-				warnx("Failed to get IPv4 address for interface %s", iface);
+				warn("getnameinfo: %s", gai_strerror(s));
 				return NULL;
 			}
 			return bprintf("%s", host);
@@ -45,19 +51,21 @@ ipv6(const char *iface)
 	int s;
 	char host[NI_MAXHOST];
 
-	if (getifaddrs(&ifaddr) == -1) {
-		warn("Failed to get IPv6 address for interface %s", iface);
+	if (getifaddrs(&ifaddr) < 0) {
+		warn("getifaddrs:");
 		return NULL;
 	}
 
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) {
+		if (!ifa->ifa_addr) {
 			continue;
 		}
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-		if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) {
+		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host,
+		                NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+		if (!strcmp(ifa->ifa_name, iface) &&
+		    (ifa->ifa_addr->sa_family == AF_INET6)) {
 			if (s != 0) {
-				warnx("Failed to get IPv6 address for interface %s", iface);
+				warn("getnameinfo: %s", gai_strerror(s));
 				return NULL;
 			}
 			return bprintf("%s", host);