From: Jasper Lievisse Adriaanse Date: Mon, 8 Oct 2012 20:13:47 +0000 (+0200) Subject: Implement %speed for Ethernet on OpenBSD. X-Git-Tag: 2.7~34 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11c4ab9870174505786696b0da0331d53067fe1f;p=i3%2Fi3status Implement %speed for Ethernet on OpenBSD. --- diff --git a/src/print_eth_info.c b/src/print_eth_info.c index 941b465..d09873e 100644 --- a/src/print_eth_info.c +++ b/src/print_eth_info.c @@ -25,7 +25,11 @@ (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t))) #define PART_ETHSPEED "E: %s (%s)" +#endif +#if defined(__OpenBSD__) +#include +#include #endif static int print_eth_speed(char *outwalk, const char *interface) { @@ -65,6 +69,38 @@ static int print_eth_speed(char *outwalk, const char *interface) { } ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?"); return sprintf(outwalk, "%s", ethspeed); +#elif defined(__OpenBSD__) + 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 (strncmp(desc->ifmt_string, "autoselect", strlen("autoselect")) == 0 || + strncmp(desc->ifmt_string, "auto", strlen("auto")) == 0) + 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, "?"); #endif