X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_ip_addr.c;h=c955c1cea0cfa84a0671148e10bca046c4d26a65;hb=6a75ea9;hp=09b0992ac6e0b15175c49c05ab276bd1fd37af7e;hpb=5cdbb3045b4524d12f310c4c040a09489fefb57b;p=i3%2Fi3status

diff --git a/src/print_ip_addr.c b/src/print_ip_addr.c
index 09b0992..c955c1c 100644
--- a/src/print_ip_addr.c
+++ b/src/print_ip_addr.c
@@ -17,30 +17,36 @@
  * interface is up and running but hasn't got an IP address yet
  *
  */
-const char *get_ip_addr(const char *interface) {
+const char *get_ip_addr(const char *interface, int family) {
     static char part[512];
-    socklen_t len = sizeof(struct sockaddr_in);
+    socklen_t len = 0;
+    if (family == AF_INET)
+        len = sizeof(struct sockaddr_in);
+    else if (family == AF_INET6)
+        len = sizeof(struct sockaddr_in6);
+
     memset(part, 0, sizeof(part));
 
     struct ifaddrs *ifaddr, *addrp;
     bool found = false;
+    int interface_len = strlen(interface);
 
     getifaddrs(&ifaddr);
 
     if (ifaddr == NULL)
         return NULL;
 
-    /* Skip until we are at the AF_INET address of interface */
+    /* Skip until we are at the input family address of interface */
     for (addrp = ifaddr;
 
          (addrp != NULL &&
-          (strcmp(addrp->ifa_name, interface) != 0 ||
+          (strncmp(addrp->ifa_name, interface, interface_len) != 0 ||
            addrp->ifa_addr == NULL ||
-           addrp->ifa_addr->sa_family != AF_INET));
+           addrp->ifa_addr->sa_family != family));
 
          addrp = addrp->ifa_next) {
         /* Check if the interface is down */
-        if (strcmp(addrp->ifa_name, interface) != 0)
+        if (strncmp(addrp->ifa_name, interface, interface_len) != 0)
             continue;
         found = true;
         if ((addrp->ifa_flags & IFF_RUNNING) == 0) {