Breaks configfiles! Major refactoring of i3status, see below

We finally switched to libconfuse for a configuration file format
which does not require much work for the programmer nor for the user.
Plus, it avoids the Not-Invented-Here syndrome of yet another config
file format.

Furthermore, as a consequence of providing format strings for every
"module" (ipv6, wireless, …), we directly print the output and thus
we needed to drop support for wmii. This allowed us to get rid of
quite some complexity.

Documentation about the new configuration file and options will
follow. This commit is the beginning of what will be i3status v2.0.

1 files changed, 95 insertions, 0 deletions

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
new file mode 100644
index 0000000..7624383
--- /dev/null
+++ b/src/print_eth_info.c
@@ -0,0 +1,95 @@
+// vim:ts=8:expandtab
+#include <string.h>
+#include <limits.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "i3status.h"
+
+#if defined(LINUX)
+#include <linux/ethtool.h>
+#include <linux/sockios.h>
+#define PART_ETHSPEED  "E: %s (%d Mbit/s)"
+#endif
+
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#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;
+#endif
+
+#if defined(LINUX)
+        /* This code path requires root privileges */
+        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);
+                printf("%d Mbit/s", ethspeed);
+        } else printf("?");
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+        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 : "?");
+        printf("%s", ethspeed);
+#endif
+}
+
+/*
+ * Combines ethernet IP addresses and speed (if requested) for displaying
+ *
+ */
+void print_eth_info(const char *interface, const char *format) {
+        const char *walk;
+        const char *ip_address = get_ip_addr(interface);
+
+        for (walk = format; *walk != '\0'; walk++) {
+                if (*walk != '%') {
+                        putchar(*walk);
+                        continue;
+                }
+
+                if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
+                        printf("%s", ip_address);
+                        walk += strlen("ip");
+                } else if (strncmp(walk+1, "speed", strlen("speed")) == 0) {
+                        print_eth_speed(interface);
+                        walk += strlen("speed");
+                }
+        }
+}