#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
#include "i3status.h"
#define PART_ETHSPEED "E: %s (%d Mbit/s)"
#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#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
-static void print_eth_speed(const char *interface) {
-#if defined(LINUX)
- int ethspeed = 0;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- char *ethspeed;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <errno.h>
+#include <net/if_media.h>
#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;
(void)strcpy(ifr.ifr_name, interface);
if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) {
ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
- printf("%d Mbit/s", ethspeed);
- } else printf("?");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ 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));
break;
}
ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
- printf("%s", ethspeed);
+ return sprintf(outwalk, "%s", ethspeed);
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ 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
}
* Combines ethernet IP addresses and speed (if requested) for displaying
*
*/
-void print_eth_info(const char *interface, const char *format_up, const char *format_down) {
+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) {
- printf("%s", format_down);
- return;
+ START_COLOR("color_bad");
+ outwalk += sprintf(outwalk, "%s", format_down);
+ goto out;
}
+ START_COLOR("color_good");
+
for (walk = format_up; *walk != '\0'; walk++) {
if (*walk != '%') {
- putchar(*walk);
+ *(outwalk++) = *walk;
continue;
}
if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
- printf("%s", ip_address);
+ outwalk += sprintf(outwalk, "%s", ip_address);
walk += strlen("ip");
} else if (strncmp(walk+1, "speed", strlen("speed")) == 0) {
- print_eth_speed(interface);
+ outwalk += print_eth_speed(outwalk, interface);
walk += strlen("speed");
}
}
+
+out:
+ END_COLOR;
+ OUTPUT_FULL_TEXT(buffer);
}