X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_eth_info.c;h=2fc25a180b30f5134b23064049335054fd0ed9e5;hb=52e9f6f63b74db2a6a1d67524851649b18794950;hp=941b46582f74f5790274aaa850bceaf8c151b7f0;hpb=6b447f7f1be3e53129756b51501f469e60820334;p=i3%2Fi3status diff --git a/src/print_eth_info.c b/src/print_eth_info.c index 941b465..2fc25a1 100644 --- a/src/print_eth_info.c +++ b/src/print_eth_info.c @@ -1,7 +1,8 @@ -// vim:ts=8:expandtab +// vim:ts=4:sw=4:expandtab #include #include #include +#include #include #include #include @@ -16,95 +17,181 @@ #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__) +#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__) +#include +#include #endif 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, "?"); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - 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); + 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__) + 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__) + const char *ethspeed; + struct ifmediareq ifmr; + + (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, "?"); + } + + struct ifmedia_description *desc; + struct ifmedia_description ifm_subtype_descriptions[] = + IFM_SUBTYPE_DESCRIPTIONS; + + for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) { + /* + * Skip these non-informative values and go right ahead to the + * actual speeds. + */ + 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); + #else - return sprintf(outwalk, "?"); + return sprintf(outwalk, "?"); #endif } /* * 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 *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; + const char *walk; + char *outwalk = buffer; + + INSTANCE(interface); + + 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"); + outwalk += sprintf(outwalk, "%s", format_down); + 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; + } + + 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"); + } + for (walk = format_up; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + + } 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"); - 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"); - } + } else { + *(outwalk++) = '%'; } + } out: - END_COLOR; - OUTPUT_FULL_TEXT(buffer); + END_COLOR; + free(ipv4_address); + free(ipv6_address); + OUTPUT_FULL_TEXT(buffer); }