Attachment 159773 Details for Bug 202247 – i3status_eth.patch

[patch] i3status_eth.patch

i3status_eth.patch (text/plain), 2.49 KB, created by John Baldwin on 2015-08-11 17:28:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Baldwin

Created: 2015-08-11 17:28:03 UTC

Size: 2.49 KB

patch

obsolete

>Index: files/patch-print_eth_info.c
>===================================================================
>--- files/patch-print_eth_info.c	(revision 0)
>+++ files/patch-print_eth_info.c	(working copy)
>@@ -0,0 +1,45 @@
>+--- src/print_eth_info.c.orig	2015-08-11 09:37:31.470359000 -0700
>++++ src/print_eth_info.c	2015-08-11 10:12:38.744033000 -0700
>+@@ -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
>+@@ -52,19 +50,29 @@
>+         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);
>++        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 : "?");
>
>Property changes on: files/patch-print_eth_info.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 202247: 159773