Merge pull request #336 from gokcehan/patch-1

[i3/i3status] / src / print_eth_info.c

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index e4bf15ea89d4984194310b33652210dcc4929252..81e74a798bbadb9467b3f539d4c8cdee069c9d1d 100644 (file)
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -1,7 +1,9 @@
 // vim:ts=4:sw=4:expandtab
+#include <config.h>
 #include <string.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13,7 +15,7 @@
 
 #include "i3status.h"
 
-#if defined(LINUX)
+#if defined(__linux__)
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #define PART_ETHSPEED "E: %s (%d Mbit/s)"
@@ -31,8 +33,7 @@
 #endif
 
 static int print_eth_speed(char *outwalk, const char *interface) {
-#if defined(LINUX)
-    /* This code path requires root privileges */
+#if defined(__linux__)
     int ethspeed = 0;
     struct ifreq ifr;
     struct ethtool_cmd ecmd;
@@ -42,7 +43,7 @@ static int print_eth_speed(char *outwalk, const char *interface) {
     ifr.ifr_data = (caddr_t)&ecmd;
     (void)strcpy(ifr.ifr_name, interface);
     if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) {
-        ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
+        ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ethtool_cmd_speed(&ecmd));
         return sprintf(outwalk, "%d Mbit/s", ethspeed);
     } else
         return sprintf(outwalk, "?");
@@ -118,41 +119,87 @@ static int print_eth_speed(char *outwalk, const char *interface) {
 /*
  * Combines ethernet IP addresses and speed (if requested) for displaying
  *
+ * Table summarizing what is the decision to prefer IPv4 or IPv6
+ * based their values.
+ *
+ * | ipv4_address | ipv6_address | Chosen IP | Color             |
+ * |--------------|--------------|-----------|-------------------|
+ * | NULL         | NULL         | None      | bad (red)         |
+ * | NULL         | no IP        | IPv6      | degraded (orange) |
+ * | NULL         | ::1/128      | IPv6      | ok (green)        |
+ * | no IP        | NULL         | IPv4      | degraded          |
+ * | no IP        | no IP        | IPv4      | degraded          |
+ * | no IP        | ::1/128      | IPv6      | ok                |
+ * | 127.0.0.1    | NULL         | IPv4      | ok                |
+ * | 127.0.0.1    | no IP        | IPv4      | ok                |
+ * | 127.0.0.1    | ::1/128      | IPv4      | ok                |
  */
 void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down) {
+    const char *format = format_down;  // default format
+
     const char *walk;
-    const char *ip_address = get_ip_addr(interface);
     char *outwalk = buffer;
 
     INSTANCE(interface);
 
-    if (ip_address == NULL) {
-        START_COLOR("color_bad");
-        outwalk += sprintf(outwalk, "%s", format_down);
-        goto out;
+    char *ipv4_address = sstrdup(get_ip_addr(interface, AF_INET));
+    char *ipv6_address = sstrdup(get_ip_addr(interface, AF_INET6));
+
+    /*
+     * Removing '%' and following characters from IPv6 since the interface identifier is redundant,
+     * as the output already includes the interface name.
+    */
+    if (ipv6_address != NULL) {
+        char *prct_ptr = strstr(ipv6_address, "%");
+        if (prct_ptr != NULL) {
+            *prct_ptr = '\0';
+        }
+    }
+
+    bool prefer_ipv4 = true;
+    if (ipv4_address == NULL) {
+        if (ipv6_address == NULL) {
+            START_COLOR("color_bad");
+            goto out;
+        } else {
+            prefer_ipv4 = false;
+        }
+    } else if (BEGINS_WITH(ipv4_address, "no IP") && ipv6_address != NULL && !BEGINS_WITH(ipv6_address, "no IP")) {
+        prefer_ipv4 = false;
     }
 
-    if (BEGINS_WITH(ip_address, "no IP"))
+    format = format_up;
+
+    const char *ip_address = (prefer_ipv4) ? ipv4_address : ipv6_address;
+    if (BEGINS_WITH(ip_address, "no IP")) {
         START_COLOR("color_degraded");
-    else
+    } else {
         START_COLOR("color_good");
+    }
 
-    for (walk = format_up; *walk != '\0'; walk++) {
+out:
+    for (walk = format; *walk != '\0'; walk++) {
         if (*walk != '%') {
             *(outwalk++) = *walk;
-            continue;
-        }
 
-        if (BEGINS_WITH(walk + 1, "ip")) {
+        } else if (BEGINS_WITH(walk + 1, "ip")) {
             outwalk += sprintf(outwalk, "%s", ip_address);
             walk += strlen("ip");
+
         } else if (BEGINS_WITH(walk + 1, "speed")) {
             outwalk += print_eth_speed(outwalk, interface);
             walk += strlen("speed");
+
+        } else if (BEGINS_WITH(walk + 1, "interface")) {
+            outwalk += sprintf(outwalk, "%s", interface);
+            walk += strlen("interface");
+
+        } else {
+            *(outwalk++) = '%';
         }
     }
-
-out:
     END_COLOR;
+    free(ipv4_address);
+    free(ipv6_address);
     OUTPUT_FULL_TEXT(buffer);
 }