diff options
| author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-09-16 14:06:32 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-09-16 14:06:32 +0200 |
| commit | 43fc5791f51ba93ef98a2c0ae89724f3711e3c64 (patch) | |
| tree | 99a1baa886cd58a9f70f434f8b3cc9a27a07c6dc | |
| parent | 452399d84aac42b538e63d17187ee8918cdb3486 (diff) | |
| parent | dee6d5272072f4c91902fafa784a9f31a65bcc25 (diff) | |
Merge pull request #58 from bsdjhb/freebsd_ethernet_media
Fix some issues with displaying Ethernet media status on recent FreeBSD kernels.
| -rw-r--r-- | src/print_eth_info.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/print_eth_info.c b/src/print_eth_info.c index e2326b5..34ffa36 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,21 +51,29 @@ 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 : "?"); |