From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 16 Nov 2015 21:41:18 +0000 (+0100)
Subject: first_eth_interface: ignore MAC addresses, look for IPv4/IPv6 addresses
X-Git-Tag: 2.10~5
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3status;a=commitdiff_plain;h=3e14e6e5f3a50f670024e4204f2c0cf15f05b199;hp=5081f2b5b84583f5875a3d9b92303fb35360cde7

first_eth_interface: ignore MAC addresses, look for IPv4/IPv6 addresses
---

diff --git a/src/first_network_device.c b/src/first_network_device.c
index 35cd4ff..16f23e0 100644
--- a/src/first_network_device.c
+++ b/src/first_network_device.c
@@ -23,6 +23,13 @@ const char *first_eth_interface(const net_type_t type) {
          addrp = addrp->ifa_next) {
         if (strncasecmp("lo", addrp->ifa_name, strlen("lo")) == 0)
             continue;
+        if (addrp->ifa_addr == NULL)
+            continue;
+        // Skip PF_PACKET addresses (MAC addresses), as they are present on any
+        // ethernet interface.
+        if (addrp->ifa_addr->sa_family != AF_INET &&
+            addrp->ifa_addr->sa_family != AF_INET6)
+            continue;
         // Skip this interface if it is a wireless interface.
         snprintf(path, sizeof(path), "/sys/class/net/%s/wireless", addrp->ifa_name);
         const bool is_wireless = (stat(path, &stbuf) == 0);