Show IP address when address has a label

[i3/i3status] / src / print_ip_addr.c

diff --git a/src/print_ip_addr.c b/src/print_ip_addr.c
index 1c2839da4689219761686da149574f227cf80bcc..c955c1cea0cfa84a0671148e10bca046c4d26a65 100644 (file)
--- a/src/print_ip_addr.c
+++ b/src/print_ip_addr.c
@@ -1,7 +1,8 @@
-// vim:ts=8:expandtab
-#include <netinet/in.h>
-#include <sys/socket.h>
+// vim:ts=4:sw=4:expandtab
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -16,53 +17,56 @@
  * interface is up and running but hasn't got an IP address yet
  *
  */
-const char *get_ip_addr(const char *interface) {
-        static char part[512];
-        socklen_t len = sizeof(struct sockaddr_in);
-        memset(part, 0, sizeof(part));
+const char *get_ip_addr(const char *interface, int family) {
+    static char part[512];
+    socklen_t len = 0;
+    if (family == AF_INET)
+        len = sizeof(struct sockaddr_in);
+    else if (family == AF_INET6)
+        len = sizeof(struct sockaddr_in6);
 
-        struct ifaddrs *ifaddr, *addrp;
-        bool found = false;
+    memset(part, 0, sizeof(part));
 
-        getifaddrs(&ifaddr);
+    struct ifaddrs *ifaddr, *addrp;
+    bool found = false;
+    int interface_len = strlen(interface);
 
-        if (ifaddr == NULL)
-                return NULL;
+    getifaddrs(&ifaddr);
 
-        addrp = ifaddr;
+    if (ifaddr == NULL)
+        return NULL;
 
-        /* Skip until we are at the AF_INET address of interface */
-        for (addrp = ifaddr;
+    /* Skip until we are at the input family address of interface */
+    for (addrp = ifaddr;
 
-             (addrp != NULL &&
-              (strcmp(addrp->ifa_name, interface) != 0 ||
-               addrp->ifa_addr == NULL ||
-               addrp->ifa_addr->sa_family != AF_INET));
+         (addrp != NULL &&
+          (strncmp(addrp->ifa_name, interface, interface_len) != 0 ||
+           addrp->ifa_addr == NULL ||
+           addrp->ifa_addr->sa_family != family));
 
-             addrp = addrp->ifa_next) {
-                /* Check if the interface is down */
-                if (strcmp(addrp->ifa_name, interface) != 0)
-                        continue;
-                found = true;
-                if ((addrp->ifa_flags & IFF_RUNNING) == 0) {
-                        freeifaddrs(ifaddr);
-                        return NULL;
-                }
+         addrp = addrp->ifa_next) {
+        /* Check if the interface is down */
+        if (strncmp(addrp->ifa_name, interface, interface_len) != 0)
+            continue;
+        found = true;
+        if ((addrp->ifa_flags & IFF_RUNNING) == 0) {
+            freeifaddrs(ifaddr);
+            return NULL;
         }
+    }
 
-        if (addrp == NULL) {
-                freeifaddrs(ifaddr);
-                return (found ? "no IP" : NULL);
-        }
-
-        int ret;
-        if ((ret = getnameinfo(addrp->ifa_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) {
-                fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
-                freeifaddrs(ifaddr);
-                return "no IP";
-        }
+    if (addrp == NULL) {
+        freeifaddrs(ifaddr);
+        return (found ? "no IP" : NULL);
+    }
 
+    int ret;
+    if ((ret = getnameinfo(addrp->ifa_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) {
+        fprintf(stderr, "i3status: getnameinfo(): %s\n", gai_strerror(ret));
         freeifaddrs(ifaddr);
-        return part;
-}
+        return "no IP";
+    }
 
+    freeifaddrs(ifaddr);
+    return part;
+}