X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_eth_info.c;h=e4bf15ea89d4984194310b33652210dcc4929252;hb=94651257cea4ff419f9cf2143d93193d5a5ccb96;hp=06a1613d62d418092b267786c687c127830c7762;hpb=0b882f36b55a0e45506d33d60e343ec9a492fbb4;p=i3%2Fi3status

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index 06a1613..e4bf15e 100644
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -21,8 +21,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
@@ -53,27 +51,35 @@ static int print_eth_speed(char *outwalk, const char *interface) {
     struct ifmediareq ifm;
     (void)memset(&ifm, 0, sizeof(ifm));
     (void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
-    if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifm) < 0) {
+    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));
@@ -126,7 +132,10 @@ void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, cons
         goto out;
     }
 
-    START_COLOR("color_good");
+    if (BEGINS_WITH(ip_address, "no IP"))
+        START_COLOR("color_degraded");
+    else
+        START_COLOR("color_good");
 
     for (walk = format_up; *walk != '\0'; walk++) {
         if (*walk != '%') {