X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_eth_info.c;h=34ffa363e4f483e59ab1b53723f06e0ca8898b8d;hb=dee6d5272072f4c91902fafa784a9f31a65bcc25;hp=45a44a4b9a8aaea6c38126dede1b26f619965853;hpb=cf2fb619110bd3f3d161b081e4b18c346a75eb94;p=i3%2Fi3status diff --git a/src/print_eth_info.c b/src/print_eth_info.c index 45a44a4..34ffa36 100644 --- a/src/print_eth_info.c +++ b/src/print_eth_info.c @@ -1,4 +1,4 @@ -// vim:ts=8:expandtab +// vim:ts=4:sw=4:expandtab #include #include #include @@ -16,15 +16,13 @@ #if defined(LINUX) #include #include -#define PART_ETHSPEED "E: %s (%d Mbit/s)" +#define PART_ETHSPEED "E: %s (%d Mbit/s)" #endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include -#define IFM_TYPE_MATCH(dt, t) \ - (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t))) -#define PART_ETHSPEED "E: %s (%s)" +#define PART_ETHSPEED "E: %s (%s)" #endif #if defined(__OpenBSD__) || defined(__NetBSD__) @@ -34,75 +32,86 @@ 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; - - ecmd.cmd = ETHTOOL_GSET; - (void)memset(&ifr, 0, sizeof(ifr)); - 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); - return sprintf(outwalk, "%d Mbit/s", ethspeed); - } else return sprintf(outwalk, "?"); + /* This code path requires root privileges */ + int ethspeed = 0; + struct ifreq ifr; + struct ethtool_cmd ecmd; + + ecmd.cmd = ETHTOOL_GSET; + (void)memset(&ifr, 0, sizeof(ifr)); + 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); + return sprintf(outwalk, "%d Mbit/s", ethspeed); + } else + return sprintf(outwalk, "?"); #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - 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); - - /* Get the description of the media type, partially taken from - * FreeBSD's ifconfig */ - const struct ifmedia_description *desc; - struct ifmedia_description ifm_subtype_descriptions[] = - IFM_SUBTYPE_ETHERNET_DESCRIPTIONS; - - 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)) - break; - } - ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?"); - return sprintf(outwalk, "%s", 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; +#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; + 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 (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; - struct ifmediareq ifmr; + char *ethspeed; + struct ifmediareq ifmr; - (void) memset(&ifmr, 0, sizeof(ifmr)); - (void) strlcpy(ifmr.ifm_name, interface, sizeof(ifmr.ifm_name)); + (void)memset(&ifmr, 0, sizeof(ifmr)); + (void)strlcpy(ifmr.ifm_name, interface, sizeof(ifmr.ifm_name)); - if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { - if (errno != E2BIG) - return sprintf(outwalk, "?"); - } + if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + if (errno != E2BIG) + return sprintf(outwalk, "?"); + } - struct ifmedia_description *desc; - struct ifmedia_description ifm_subtype_descriptions[] = - IFM_SUBTYPE_DESCRIPTIONS; + struct ifmedia_description *desc; + struct ifmedia_description ifm_subtype_descriptions[] = + IFM_SUBTYPE_DESCRIPTIONS; - for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) { - /* + for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) { + /* * Skip these non-informative values and go right ahead to the * actual speeds. */ - if (strncmp(desc->ifmt_string, "autoselect", strlen("autoselect")) == 0 || - strncmp(desc->ifmt_string, "auto", strlen("auto")) == 0) - continue; + if (BEGINS_WITH(desc->ifmt_string, "autoselect") || + BEGINS_WITH(desc->ifmt_string, "auto")) + continue; - if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) && - IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmr.ifm_active)) - break; - } - ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?"); - return sprintf(outwalk, "%s", ethspeed); + if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) && + IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmr.ifm_active)) + break; + } + ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?"); + return sprintf(outwalk, "%s", ethspeed); #else - return sprintf(outwalk, "?"); + return sprintf(outwalk, "?"); #endif } @@ -111,36 +120,39 @@ static int print_eth_speed(char *outwalk, const char *interface) { * */ void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down) { - const char *walk; - const char *ip_address = get_ip_addr(interface); - char *outwalk = buffer; + const char *walk; + const char *ip_address = get_ip_addr(interface); + char *outwalk = buffer; - INSTANCE(interface); + INSTANCE(interface); - if (ip_address == NULL) { - START_COLOR("color_bad"); - outwalk += sprintf(outwalk, "%s", format_down); - goto out; - } + if (ip_address == NULL) { + START_COLOR("color_bad"); + outwalk += sprintf(outwalk, "%s", format_down); + goto out; + } + 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 != '%') { - *(outwalk++) = *walk; - continue; - } - - if (strncmp(walk+1, "ip", strlen("ip")) == 0) { - outwalk += sprintf(outwalk, "%s", ip_address); - walk += strlen("ip"); - } else if (strncmp(walk+1, "speed", strlen("speed")) == 0) { - outwalk += print_eth_speed(outwalk, interface); - walk += strlen("speed"); - } + for (walk = format_up; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + continue; + } + + 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"); } + } out: - END_COLOR; - OUTPUT_FULL_TEXT(buffer); + END_COLOR; + OUTPUT_FULL_TEXT(buffer); }