X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_eth_info.c;h=f3cab7e56be2fd4005af82f2eb12b86ab3c101aa;hb=ddadc8e4d728923cf5bc7c8a894b103cf061c47d;hp=af5a75788f7cf17d4d0f3b9154781e83abc0e5d6;hpb=d74e904bf4bdd7f1d767a8db09987b90de809579;p=i3%2Fi3status

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index af5a757..f3cab7e 100644
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -21,8 +22,6 @@
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <net/if_media.h>
-#define IFM_TYPE_MATCH(dt, t) \
-    (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
 
 #define PART_ETHSPEED "E: %s (%s)"
 #endif
@@ -34,7 +33,6 @@
 
 static int print_eth_speed(char *outwalk, const char *interface) {
 #if defined(LINUX)
-    /* This code path requires root privileges */
     int ethspeed = 0;
     struct ifreq ifr;
     struct ethtool_cmd ecmd;
@@ -49,29 +47,39 @@ static int print_eth_speed(char *outwalk, const char *interface) {
     } else
         return sprintf(outwalk, "?");
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-    char *ethspeed;
+    const char *ethspeed;
     struct ifmediareq ifm;
     (void)memset(&ifm, 0, sizeof(ifm));
     (void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
-    int ret = ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifm);
+    int ret;
+#ifdef SIOCGIFXMEDIA
+    ret = ioctl(general_socket, SIOCGIFXMEDIA, (caddr_t)&ifm);
+    if (ret < 0)
+#endif
+        ret = ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifm);
+    if (ret < 0)
+        return sprintf(outwalk, "?");
 
     /* Get the description of the media type, partially taken from
      * FreeBSD's ifconfig */
     const struct ifmedia_description *desc;
-    struct ifmedia_description ifm_subtype_descriptions[] =
+    static struct ifmedia_description ifm_subtype_descriptions[] =
         IFM_SUBTYPE_ETHERNET_DESCRIPTIONS;
 
+    if (IFM_TYPE(ifm.ifm_active) != IFM_ETHER)
+        return sprintf(outwalk, "?");
+    if (ifm.ifm_status & IFM_AVALID && !(ifm.ifm_status & IFM_ACTIVE))
+        return sprintf(outwalk, "no carrier");
     for (desc = ifm_subtype_descriptions;
          desc->ifmt_string != NULL;
          desc++) {
-        if (IFM_TYPE_MATCH(desc->ifmt_word, ifm.ifm_active) &&
-            IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifm.ifm_active))
+        if (desc->ifmt_word == IFM_SUBTYPE(ifm.ifm_active))
             break;
     }
     ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
     return sprintf(outwalk, "%s", ethspeed);
 #elif defined(__OpenBSD__) || defined(__NetBSD__)
-    char *ethspeed;
+    const char *ethspeed;
     struct ifmediareq ifmr;
 
     (void)memset(&ifmr, 0, sizeof(ifmr));
@@ -110,38 +118,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;
     }
 
-    START_COLOR("color_good");
+    format = format_up;
 
-    for (walk = format_up; *walk != '\0'; walk++) {
+    const char *ip_address = (prefer_ipv4) ? ipv4_address : ipv6_address;
+    if (BEGINS_WITH(ip_address, "no IP")) {
+        START_COLOR("color_degraded");
+    } else {
+        START_COLOR("color_good");
+    }
+
+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);
 }