From: Michael Stapelberg <michael+x200@stapelberg.de>
Date: Thu, 30 Apr 2009 17:46:12 +0000 (+0200)
Subject: Fix display of IP addresses (display "no IP" correctly)
X-Git-Tag: 1.0~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6b0c635ce896fb81f4b3138d8c22b879c7a9988f;p=i3%2Fi3status

Fix display of IP addresses (display "no IP" correctly)
---

diff --git a/i3status.c b/i3status.c
index cb56373..a0415d3 100644
--- a/i3status.c
+++ b/i3status.c
@@ -360,10 +360,17 @@ static const char *get_ip_address(const char *interface) {
 	socklen_t len = sizeof(struct sockaddr_in);
 	memset(part, 0, sizeof(part));
 
+	/* First check if the interface is running */
+	(void)strcpy(ifr.ifr_name, interface);
+	if (ioctl(general_socket, SIOCGIFFLAGS, &ifr) < 0 ||
+	    !(ifr.ifr_flags & IFF_RUNNING))
+		return NULL;
+
+	/* Interface is up, get the IP address */
 	(void)strcpy(ifr.ifr_name, interface);
 	ifr.ifr_addr.sa_family = AF_INET;
 	if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0)
-		return NULL;
+		return "no IP";
 
 	memcpy(&addr, &ifr.ifr_addr, len);
 	(void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, len);