X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fnetlink.c;h=888b164535f19b2303e1ff1d0c0cda6f2777b853;hp=70c10c9dc88bbc69428b43faa962db6f5532cd43;hb=7b8851b26928b609ce850e78c1eabb50ff319244;hpb=e1fda36ff7e4b5f508b630b614b182e298d91fb7

diff --git a/src/netlink.c b/src/netlink.c
index 70c10c9d..888b1645 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -27,18 +27,18 @@
 
 #include "collectd.h"
 
-#include "plugin.h"
 #include "common.h"
+#include "plugin.h"
 
 #include <asm/types.h>
 
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #if HAVE_LINUX_GEN_STATS_H
-# include <linux/gen_stats.h>
+#include <linux/gen_stats.h>
 #endif
 #if HAVE_LINUX_PKT_SCHED_H
-# include <linux/pkt_sched.h>
+#include <linux/pkt_sched.h>
 #endif
 
 #include <libmnl/libmnl.h>
@@ -78,14 +78,18 @@ union ir_link_stats_u {
 #endif
 };
 
-typedef struct ir_ignorelist_s
-{
+typedef struct ir_ignorelist_s {
   char *device;
   char *type;
   char *inst;
   struct ir_ignorelist_s *next;
 } ir_ignorelist_t;
 
+struct qos_stats {
+  struct gnet_stats_basic *bs;
+  struct gnet_stats_queue *qs;
+};
+
 static int ir_ignorelist_invert = 1;
 static ir_ignorelist_t *ir_ignorelist_head = NULL;
 
@@ -94,369 +98,335 @@ static struct mnl_socket *nl;
 static char **iflist = NULL;
 static size_t iflist_len = 0;
 
-static const char *config_keys[] =
-{
-        "Interface",
-        "VerboseInterface",
-        "QDisc",
-        "Class",
-        "Filter",
-        "IgnoreSelected"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+static const char *config_keys[] = {"Interface", "VerboseInterface",
+                                    "QDisc",     "Class",
+                                    "Filter",    "IgnoreSelected"};
+static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
 
-static int add_ignorelist (const char *dev, const char *type,
-    const char *inst)
-{
+static int add_ignorelist(const char *dev, const char *type, const char *inst) {
   ir_ignorelist_t *entry;
 
-  entry = calloc (1, sizeof (*entry));
+  entry = calloc(1, sizeof(*entry));
   if (entry == NULL)
-    return (-1);
-
-  if (strcasecmp (dev, "All") != 0)
-  {
-    entry->device = strdup (dev);
-    if (entry->device == NULL)
-    {
-      sfree (entry);
-      return (-1);
+    return -1;
+
+  if (strcasecmp(dev, "All") != 0) {
+    entry->device = strdup(dev);
+    if (entry->device == NULL) {
+      sfree(entry);
+      return -1;
     }
   }
 
-  entry->type = strdup (type);
-  if (entry->type == NULL)
-  {
-    sfree (entry->device);
-    sfree (entry);
-    return (-1);
+  entry->type = strdup(type);
+  if (entry->type == NULL) {
+    sfree(entry->device);
+    sfree(entry);
+    return -1;
   }
 
-  if (inst != NULL)
-  {
-    entry->inst = strdup (inst);
-    if (entry->inst == NULL)
-    {
-      sfree (entry->type);
-      sfree (entry->device);
-      sfree (entry);
-      return (-1);
+  if (inst != NULL) {
+    entry->inst = strdup(inst);
+    if (entry->inst == NULL) {
+      sfree(entry->type);
+      sfree(entry->device);
+      sfree(entry);
+      return -1;
     }
   }
 
   entry->next = ir_ignorelist_head;
   ir_ignorelist_head = entry;
 
-  return (0);
+  return 0;
 } /* int add_ignorelist */
 
 /*
  * Checks wether a data set should be ignored. Returns `true' is the value
  * should be ignored, `false' otherwise.
  */
-static int check_ignorelist (const char *dev,
-    const char *type, const char *type_instance)
-{
-  assert ((dev != NULL) && (type != NULL));
+static int check_ignorelist(const char *dev, const char *type,
+                            const char *type_instance) {
+  assert((dev != NULL) && (type != NULL));
 
   if (ir_ignorelist_head == NULL)
-    return (ir_ignorelist_invert ? 0 : 1);
+    return ir_ignorelist_invert ? 0 : 1;
 
-  for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next)
-  {
+  for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) {
     /* i->device == NULL  =>  match all devices */
-    if ((i->device != NULL)
-        && (strcasecmp (i->device, dev) != 0))
+    if ((i->device != NULL) && (strcasecmp(i->device, dev) != 0))
       continue;
 
-    if (strcasecmp (i->type, type) != 0)
+    if (strcasecmp(i->type, type) != 0)
       continue;
 
-    if ((i->inst != NULL) && (type_instance != NULL)
-        && (strcasecmp (i->inst, type_instance) != 0))
+    if ((i->inst != NULL) && (type_instance != NULL) &&
+        (strcasecmp(i->inst, type_instance) != 0))
       continue;
 
-    DEBUG ("netlink plugin: check_ignorelist: "
-        "(dev = %s; type = %s; inst = %s) matched "
-        "(dev = %s; type = %s; inst = %s)",
-        dev, type,
-        type_instance == NULL ? "(nil)" : type_instance,
-        i->device == NULL ? "(nil)" : i->device,
-        i->type,
-        i->inst == NULL ? "(nil)" : i->inst);
+    DEBUG("netlink plugin: check_ignorelist: "
+          "(dev = %s; type = %s; inst = %s) matched "
+          "(dev = %s; type = %s; inst = %s)",
+          dev, type, type_instance == NULL ? "(nil)" : type_instance,
+          i->device == NULL ? "(nil)" : i->device, i->type,
+          i->inst == NULL ? "(nil)" : i->inst);
 
-    return (ir_ignorelist_invert ? 0 : 1);
+    return ir_ignorelist_invert ? 0 : 1;
   } /* for i */
 
-  return (ir_ignorelist_invert);
+  return ir_ignorelist_invert;
 } /* int check_ignorelist */
 
-static void submit_one (const char *dev, const char *type,
-    const char *type_instance, derive_t value)
-{
+static void submit_one(const char *dev, const char *type,
+                       const char *type_instance, derive_t value) {
   value_list_t vl = VALUE_LIST_INIT;
 
-  vl.values = &(value_t) { .derive = value };
+  vl.values = &(value_t){.derive = value};
   vl.values_len = 1;
-  sstrncpy (vl.plugin, "netlink", sizeof (vl.plugin));
-  sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
-  sstrncpy (vl.type, type, sizeof (vl.type));
+  sstrncpy(vl.plugin, "netlink", sizeof(vl.plugin));
+  sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance));
+  sstrncpy(vl.type, type, sizeof(vl.type));
 
   if (type_instance != NULL)
-    sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+    sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
 
-  plugin_dispatch_values (&vl);
+  plugin_dispatch_values(&vl);
 } /* void submit_one */
 
-static void submit_two (const char *dev, const char *type,
-    const char *type_instance,
-    derive_t rx, derive_t tx)
-{
+static void submit_two(const char *dev, const char *type,
+                       const char *type_instance, derive_t rx, derive_t tx) {
   value_list_t vl = VALUE_LIST_INIT;
   value_t values[] = {
-    { .derive = rx },
-    { .derive = tx },
+      {.derive = rx}, {.derive = tx},
   };
 
   vl.values = values;
-  vl.values_len = STATIC_ARRAY_SIZE (values);
-  sstrncpy (vl.plugin, "netlink", sizeof (vl.plugin));
-  sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
-  sstrncpy (vl.type, type, sizeof (vl.type));
+  vl.values_len = STATIC_ARRAY_SIZE(values);
+  sstrncpy(vl.plugin, "netlink", sizeof(vl.plugin));
+  sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance));
+  sstrncpy(vl.type, type, sizeof(vl.type));
 
   if (type_instance != NULL)
-    sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+    sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
 
-  plugin_dispatch_values (&vl);
+  plugin_dispatch_values(&vl);
 } /* void submit_two */
 
-static int update_iflist (struct ifinfomsg *msg, const char *dev)
-{
+static int update_iflist(struct ifinfomsg *msg, const char *dev) {
   /* Update the `iflist'. It's used to know which interfaces exist and query
    * them later for qdiscs and classes. */
-  if ((msg->ifi_index >= 0) && ((size_t) msg->ifi_index >= iflist_len))
-  {
+  if ((msg->ifi_index >= 0) && ((size_t)msg->ifi_index >= iflist_len)) {
     char **temp;
 
-    temp = realloc (iflist, (msg->ifi_index + 1) * sizeof (char *));
-    if (temp == NULL)
-    {
-      ERROR ("netlink plugin: update_iflist: realloc failed.");
-      return (-1);
+    temp = realloc(iflist, (msg->ifi_index + 1) * sizeof(char *));
+    if (temp == NULL) {
+      ERROR("netlink plugin: update_iflist: realloc failed.");
+      return -1;
     }
 
-    memset (temp + iflist_len, '\0',
-        (msg->ifi_index + 1 - iflist_len) * sizeof (char *));
+    memset(temp + iflist_len, '\0',
+           (msg->ifi_index + 1 - iflist_len) * sizeof(char *));
     iflist = temp;
     iflist_len = msg->ifi_index + 1;
   }
-  if ((iflist[msg->ifi_index] == NULL)
-      || (strcmp (iflist[msg->ifi_index], dev) != 0))
-  {
-    sfree (iflist[msg->ifi_index]);
-    iflist[msg->ifi_index] = strdup (dev);
+  if ((iflist[msg->ifi_index] == NULL) ||
+      (strcmp(iflist[msg->ifi_index], dev) != 0)) {
+    sfree(iflist[msg->ifi_index]);
+    iflist[msg->ifi_index] = strdup(dev);
   }
 
-  return (0);
+  return 0;
 } /* int update_iflist */
 
-static void check_ignorelist_and_submit (const char *dev,
-    struct ir_link_stats_storage_s *stats)
-{
+static void check_ignorelist_and_submit(const char *dev,
+                                        struct ir_link_stats_storage_s *stats) {
 
-  if (check_ignorelist (dev, "interface", NULL) == 0)
-  {
-    submit_two (dev, "if_octets", NULL, stats->rx_bytes, stats->tx_bytes);
-    submit_two (dev, "if_packets", NULL, stats->rx_packets, stats->tx_packets);
-    submit_two (dev, "if_errors", NULL, stats->rx_errors, stats->tx_errors);
-  }
-  else
-  {
-    DEBUG ("netlink plugin: Ignoring %s/interface.", dev);
+  if (check_ignorelist(dev, "interface", NULL) == 0) {
+    submit_two(dev, "if_octets", NULL, stats->rx_bytes, stats->tx_bytes);
+    submit_two(dev, "if_packets", NULL, stats->rx_packets, stats->tx_packets);
+    submit_two(dev, "if_errors", NULL, stats->rx_errors, stats->tx_errors);
+  } else {
+    DEBUG("netlink plugin: Ignoring %s/interface.", dev);
   }
 
-  if (check_ignorelist (dev, "if_detail", NULL) == 0)
-  {
-    submit_two (dev, "if_dropped", NULL, stats->rx_dropped, stats->tx_dropped);
-    submit_one (dev, "if_multicast", NULL, stats->multicast);
-    submit_one (dev, "if_collisions", NULL, stats->collisions);
-
-    submit_one (dev, "if_rx_errors", "length", stats->rx_length_errors);
-    submit_one (dev, "if_rx_errors", "over", stats->rx_over_errors);
-    submit_one (dev, "if_rx_errors", "crc", stats->rx_crc_errors);
-    submit_one (dev, "if_rx_errors", "frame", stats->rx_frame_errors);
-    submit_one (dev, "if_rx_errors", "fifo", stats->rx_fifo_errors);
-    submit_one (dev, "if_rx_errors", "missed", stats->rx_missed_errors);
-
-    submit_one (dev, "if_tx_errors", "aborted", stats->tx_aborted_errors);
-    submit_one (dev, "if_tx_errors", "carrier", stats->tx_carrier_errors);
-    submit_one (dev, "if_tx_errors", "fifo", stats->tx_fifo_errors);
-    submit_one (dev, "if_tx_errors", "heartbeat", stats->tx_heartbeat_errors);
-    submit_one (dev, "if_tx_errors", "window", stats->tx_window_errors);
-  }
-  else
-  {
-    DEBUG ("netlink plugin: Ignoring %s/if_detail.", dev);
+  if (check_ignorelist(dev, "if_detail", NULL) == 0) {
+    submit_two(dev, "if_dropped", NULL, stats->rx_dropped, stats->tx_dropped);
+    submit_one(dev, "if_multicast", NULL, stats->multicast);
+    submit_one(dev, "if_collisions", NULL, stats->collisions);
+
+    submit_one(dev, "if_rx_errors", "length", stats->rx_length_errors);
+    submit_one(dev, "if_rx_errors", "over", stats->rx_over_errors);
+    submit_one(dev, "if_rx_errors", "crc", stats->rx_crc_errors);
+    submit_one(dev, "if_rx_errors", "frame", stats->rx_frame_errors);
+    submit_one(dev, "if_rx_errors", "fifo", stats->rx_fifo_errors);
+    submit_one(dev, "if_rx_errors", "missed", stats->rx_missed_errors);
+
+    submit_one(dev, "if_tx_errors", "aborted", stats->tx_aborted_errors);
+    submit_one(dev, "if_tx_errors", "carrier", stats->tx_carrier_errors);
+    submit_one(dev, "if_tx_errors", "fifo", stats->tx_fifo_errors);
+    submit_one(dev, "if_tx_errors", "heartbeat", stats->tx_heartbeat_errors);
+    submit_one(dev, "if_tx_errors", "window", stats->tx_window_errors);
+  } else {
+    DEBUG("netlink plugin: Ignoring %s/if_detail.", dev);
   }
 
 } /* void check_ignorelist_and_submit */
 
-#define COPY_RTNL_LINK_VALUE(dst_stats, src_stats, value_name) \
+#define COPY_RTNL_LINK_VALUE(dst_stats, src_stats, value_name)                 \
   (dst_stats)->value_name = (src_stats)->value_name
 
-#define COPY_RTNL_LINK_STATS(dst_stats, src_stats) \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_packets); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_packets); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_bytes); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_bytes); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_dropped); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_dropped); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, multicast); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, collisions); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_length_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_over_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_crc_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_frame_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_fifo_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, rx_missed_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_aborted_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_carrier_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_fifo_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_heartbeat_errors); \
-  COPY_RTNL_LINK_VALUE (dst_stats, src_stats, tx_window_errors)
+#define COPY_RTNL_LINK_STATS(dst_stats, src_stats)                             \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_packets);                      \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_packets);                      \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_bytes);                        \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_bytes);                        \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_errors);                       \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_errors);                       \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_dropped);                      \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_dropped);                      \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, multicast);                       \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, collisions);                      \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_length_errors);                \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_over_errors);                  \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_crc_errors);                   \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_frame_errors);                 \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_fifo_errors);                  \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, rx_missed_errors);                \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_aborted_errors);               \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_carrier_errors);               \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_fifo_errors);                  \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_heartbeat_errors);             \
+  COPY_RTNL_LINK_VALUE(dst_stats, src_stats, tx_window_errors)
 
 #ifdef HAVE_RTNL_LINK_STATS64
-static void check_ignorelist_and_submit64 (const char *dev,
-    struct rtnl_link_stats64 *stats)
-{
+static void check_ignorelist_and_submit64(const char *dev,
+                                          struct rtnl_link_stats64 *stats) {
   struct ir_link_stats_storage_s s;
 
-  COPY_RTNL_LINK_STATS (&s, stats);
+  COPY_RTNL_LINK_STATS(&s, stats);
 
-  check_ignorelist_and_submit (dev, &s);
+  check_ignorelist_and_submit(dev, &s);
 }
 #endif
 
-static void check_ignorelist_and_submit32 (const char *dev,
-    struct rtnl_link_stats *stats)
-{
+static void check_ignorelist_and_submit32(const char *dev,
+                                          struct rtnl_link_stats *stats) {
   struct ir_link_stats_storage_s s;
 
   COPY_RTNL_LINK_STATS(&s, stats);
 
-  check_ignorelist_and_submit (dev, &s);
+  check_ignorelist_and_submit(dev, &s);
 }
 
-static int link_filter_cb (const struct nlmsghdr *nlh,
-    void *args __attribute__((unused)))
-{
-  struct ifinfomsg *ifm = mnl_nlmsg_get_payload (nlh);
+static int link_filter_cb(const struct nlmsghdr *nlh,
+                          void *args __attribute__((unused))) {
+  struct ifinfomsg *ifm = mnl_nlmsg_get_payload(nlh);
   struct nlattr *attr;
   const char *dev = NULL;
   union ir_link_stats_u stats;
 
-  if (nlh->nlmsg_type != RTM_NEWLINK)
-  {
-    ERROR ("netlink plugin: link_filter_cb: Don't know how to handle type %i.",
-        nlh->nlmsg_type);
+  if (nlh->nlmsg_type != RTM_NEWLINK) {
+    ERROR("netlink plugin: link_filter_cb: Don't know how to handle type %i.",
+          nlh->nlmsg_type);
     return MNL_CB_ERROR;
   }
 
   /* Scan attribute list for device name. */
-  mnl_attr_for_each (attr, nlh, sizeof (*ifm))
-  {
-    if (mnl_attr_get_type (attr) != IFLA_IFNAME)
+  mnl_attr_for_each(attr, nlh, sizeof(*ifm)) {
+    if (mnl_attr_get_type(attr) != IFLA_IFNAME)
       continue;
 
-    if (mnl_attr_validate (attr, MNL_TYPE_STRING) < 0)
-    {
-      ERROR ("netlink plugin: link_filter_cb: IFLA_IFNAME mnl_attr_validate failed.");
+    if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0) {
+      ERROR("netlink plugin: link_filter_cb: IFLA_IFNAME mnl_attr_validate "
+            "failed.");
       return MNL_CB_ERROR;
     }
 
-    dev = mnl_attr_get_str (attr);
-    if (update_iflist (ifm, dev) < 0)
+    dev = mnl_attr_get_str(attr);
+    if (update_iflist(ifm, dev) < 0)
       return MNL_CB_ERROR;
     break;
   }
 
-  if (dev == NULL)
-  {
-    ERROR ("netlink plugin: link_filter_cb: dev == NULL");
+  if (dev == NULL) {
+    ERROR("netlink plugin: link_filter_cb: dev == NULL");
     return MNL_CB_ERROR;
   }
 #ifdef HAVE_RTNL_LINK_STATS64
-  mnl_attr_for_each (attr, nlh, sizeof (*ifm))
-  {
-    if (mnl_attr_get_type (attr) != IFLA_STATS64)
+  mnl_attr_for_each(attr, nlh, sizeof(*ifm)) {
+    if (mnl_attr_get_type(attr) != IFLA_STATS64)
       continue;
 
-    if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (*stats.stats64)) < 0)
-    {
-      ERROR ("netlink plugin: link_filter_cb: IFLA_STATS64 mnl_attr_validate2 failed.");
+    if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats64)) < 0) {
+      ERROR("netlink plugin: link_filter_cb: IFLA_STATS64 mnl_attr_validate2 "
+            "failed.");
       return MNL_CB_ERROR;
     }
-    stats.stats64 = mnl_attr_get_payload (attr);
+    stats.stats64 = mnl_attr_get_payload(attr);
 
-    check_ignorelist_and_submit64 (dev, stats.stats64);
+    check_ignorelist_and_submit64(dev, stats.stats64);
 
     return MNL_CB_OK;
   }
 #endif
-  mnl_attr_for_each (attr, nlh, sizeof (*ifm))
-  {
-    if (mnl_attr_get_type (attr) != IFLA_STATS)
+  mnl_attr_for_each(attr, nlh, sizeof(*ifm)) {
+    if (mnl_attr_get_type(attr) != IFLA_STATS)
       continue;
 
-    if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (*stats.stats32)) < 0)
-    {
-      ERROR ("netlink plugin: link_filter_cb: IFLA_STATS mnl_attr_validate2 failed.");
+    if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats32)) < 0) {
+      ERROR("netlink plugin: link_filter_cb: IFLA_STATS mnl_attr_validate2 "
+            "failed.");
       return MNL_CB_ERROR;
     }
-    stats.stats32 = mnl_attr_get_payload (attr);
+    stats.stats32 = mnl_attr_get_payload(attr);
 
-    check_ignorelist_and_submit32 (dev, stats.stats32);
+    check_ignorelist_and_submit32(dev, stats.stats32);
 
     return MNL_CB_OK;
   }
 
-  DEBUG ("netlink plugin: link_filter: No statistics for interface %s.", dev);
+  DEBUG("netlink plugin: link_filter: No statistics for interface %s.", dev);
   return MNL_CB_OK;
 
 } /* int link_filter_cb */
 
 #if HAVE_TCA_STATS2
-static int qos_attr_cb (const struct nlattr *attr, void *data)
-{
-  struct gnet_stats_basic **bs = (struct gnet_stats_basic **)data;
+static int qos_attr_cb(const struct nlattr *attr, void *data) {
+  struct qos_stats *q_stats = (struct qos_stats *)data;
 
   /* skip unsupported attribute in user-space */
-  if (mnl_attr_type_valid (attr, TCA_STATS_MAX) < 0)
+  if (mnl_attr_type_valid(attr, TCA_STATS_MAX) < 0)
+    return MNL_CB_OK;
+
+  if (mnl_attr_get_type(attr) == TCA_STATS_BASIC) {
+    if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*q_stats->bs)) < 0) {
+      ERROR("netlink plugin: qos_attr_cb: TCA_STATS_BASIC mnl_attr_validate2 "
+            "failed.");
+      return MNL_CB_ERROR;
+    }
+    q_stats->bs = mnl_attr_get_payload(attr);
     return MNL_CB_OK;
+  }
 
-  if (mnl_attr_get_type (attr) == TCA_STATS_BASIC)
-  {
-    if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (**bs)) < 0)
-    {
-      ERROR ("netlink plugin: qos_attr_cb: TCA_STATS_BASIC mnl_attr_validate2 failed.");
+  if (mnl_attr_get_type(attr) == TCA_STATS_QUEUE) {
+    if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*q_stats->qs)) < 0) {
+      ERROR("netlink plugin: qos_attr_cb: TCA_STATS_QUEUE mnl_attr_validate2 "
+            "failed.");
       return MNL_CB_ERROR;
     }
-    *bs = mnl_attr_get_payload (attr);
-    return MNL_CB_STOP;
+    q_stats->qs = mnl_attr_get_payload(attr);
+    return MNL_CB_OK;
   }
 
   return MNL_CB_OK;
 } /* qos_attr_cb */
 #endif
 
-static int qos_filter_cb (const struct nlmsghdr *nlh, void *args)
-{
-  struct tcmsg *tm = mnl_nlmsg_get_payload (nlh);
+static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
+  struct tcmsg *tm = mnl_nlmsg_get_payload(nlh);
   struct nlattr *attr;
 
-  int wanted_ifindex = *((int *) args);
+  int wanted_ifindex = *((int *)args);
 
   const char *dev;
   const char *kind = NULL;
@@ -473,105 +443,99 @@ static int qos_filter_cb (const struct nlmsghdr *nlh, void *args)
     tc_type = "class";
   else if (nlh->nlmsg_type == RTM_NEWTFILTER)
     tc_type = "filter";
-  else
-  {
-    ERROR ("netlink plugin: qos_filter_cb: Don't know how to handle type %i.",
-        nlh->nlmsg_type);
+  else {
+    ERROR("netlink plugin: qos_filter_cb: Don't know how to handle type %i.",
+          nlh->nlmsg_type);
     return MNL_CB_ERROR;
   }
 
-  if (tm->tcm_ifindex != wanted_ifindex)
-  {
-    DEBUG ("netlink plugin: qos_filter_cb: Got %s for interface #%i, "
-        "but expected #%i.",
-        tc_type, tm->tcm_ifindex, wanted_ifindex);
+  if (tm->tcm_ifindex != wanted_ifindex) {
+    DEBUG("netlink plugin: qos_filter_cb: Got %s for interface #%i, "
+          "but expected #%i.",
+          tc_type, tm->tcm_ifindex, wanted_ifindex);
     return MNL_CB_OK;
   }
 
-  if ((tm->tcm_ifindex >= 0)
-      && ((size_t) tm->tcm_ifindex >= iflist_len))
-  {
-    ERROR ("netlink plugin: qos_filter_cb: tm->tcm_ifindex = %i "
-        ">= iflist_len = %zu",
-        tm->tcm_ifindex, iflist_len);
+  if ((tm->tcm_ifindex >= 0) && ((size_t)tm->tcm_ifindex >= iflist_len)) {
+    ERROR("netlink plugin: qos_filter_cb: tm->tcm_ifindex = %i "
+          ">= iflist_len = %" PRIsz,
+          tm->tcm_ifindex, iflist_len);
     return MNL_CB_ERROR;
   }
 
   dev = iflist[tm->tcm_ifindex];
-  if (dev == NULL)
-  {
-    ERROR ("netlink plugin: qos_filter_cb: iflist[%i] == NULL",
-        tm->tcm_ifindex);
+  if (dev == NULL) {
+    ERROR("netlink plugin: qos_filter_cb: iflist[%i] == NULL", tm->tcm_ifindex);
     return MNL_CB_ERROR;
   }
 
-  mnl_attr_for_each (attr, nlh, sizeof (*tm))
-  {
-    if (mnl_attr_get_type (attr) != TCA_KIND)
+  mnl_attr_for_each(attr, nlh, sizeof(*tm)) {
+    if (mnl_attr_get_type(attr) != TCA_KIND)
       continue;
 
-    if (mnl_attr_validate (attr, MNL_TYPE_STRING) < 0)
-    {
-      ERROR ("netlink plugin: qos_filter_cb: TCA_KIND mnl_attr_validate failed.");
+    if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0) {
+      ERROR(
+          "netlink plugin: qos_filter_cb: TCA_KIND mnl_attr_validate failed.");
       return MNL_CB_ERROR;
     }
 
-    kind = mnl_attr_get_str (attr);
+    kind = mnl_attr_get_str(attr);
     break;
   }
 
-  if (kind == NULL)
-  {
-    ERROR ("netlink plugin: qos_filter_cb: kind == NULL");
-    return (-1);
+  if (kind == NULL) {
+    ERROR("netlink plugin: qos_filter_cb: kind == NULL");
+    return -1;
   }
 
   { /* The ID */
     uint32_t numberic_id;
 
     numberic_id = tm->tcm_handle;
-    if (strcmp (tc_type, "filter") == 0)
+    if (strcmp(tc_type, "filter") == 0)
       numberic_id = tm->tcm_parent;
 
-    ssnprintf (tc_inst, sizeof (tc_inst), "%s-%x:%x",
-        kind,
-        numberic_id >> 16,
-        numberic_id & 0x0000FFFF);
+    snprintf(tc_inst, sizeof(tc_inst), "%s-%x:%x", kind, numberic_id >> 16,
+             numberic_id & 0x0000FFFF);
   }
 
-  DEBUG ("netlink plugin: qos_filter_cb: got %s for %s (%i).",
-      tc_type, dev, tm->tcm_ifindex);
+  DEBUG("netlink plugin: qos_filter_cb: got %s for %s (%i).", tc_type, dev,
+        tm->tcm_ifindex);
 
-  if (check_ignorelist (dev, tc_type, tc_inst))
+  if (check_ignorelist(dev, tc_type, tc_inst))
     return MNL_CB_OK;
 
 #if HAVE_TCA_STATS2
-  mnl_attr_for_each (attr, nlh, sizeof (*tm))
-  {
-    struct gnet_stats_basic *bs = NULL;
+  mnl_attr_for_each(attr, nlh, sizeof(*tm)) {
+    struct qos_stats q_stats;
 
-    if (mnl_attr_get_type (attr) != TCA_STATS2)
+    memset(&q_stats, 0x0, sizeof(q_stats));
+
+    if (mnl_attr_get_type(attr) != TCA_STATS2)
       continue;
 
-    if (mnl_attr_validate (attr, MNL_TYPE_NESTED) < 0)
-    {
-      ERROR ("netlink plugin: qos_filter_cb: TCA_STATS2 mnl_attr_validate failed.");
+    if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0) {
+      ERROR("netlink plugin: qos_filter_cb: TCA_STATS2 mnl_attr_validate "
+            "failed.");
       return MNL_CB_ERROR;
     }
 
-    mnl_attr_parse_nested (attr, qos_attr_cb, &bs);
+    mnl_attr_parse_nested(attr, qos_attr_cb, &q_stats);
 
-    if (bs != NULL)
-    {
+    if (q_stats.bs != NULL || q_stats.qs != NULL) {
       char type_instance[DATA_MAX_NAME_LEN];
 
       stats_submitted = 1;
 
-      ssnprintf (type_instance, sizeof (type_instance), "%s-%s",
-          tc_type, tc_inst);
+      snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
 
-      submit_one (dev, "ipt_bytes", type_instance, bs->bytes);
-      submit_one (dev, "ipt_packets", type_instance, bs->packets);
+      if (q_stats.bs != NULL) {
+        submit_one(dev, "ipt_bytes", type_instance, q_stats.bs->bytes);
+        submit_one(dev, "ipt_packets", type_instance, q_stats.bs->packets);
+      }
+      if (q_stats.qs != NULL) {
+        submit_one(dev, "if_tx_dropped", type_instance, q_stats.qs->drops);
+      }
     }
 
     break;
@@ -579,29 +543,26 @@ static int qos_filter_cb (const struct nlmsghdr *nlh, void *args)
 #endif /* TCA_STATS2 */
 
 #if HAVE_TCA_STATS
-  mnl_attr_for_each (attr, nlh, sizeof (*tm))
-  {
+  mnl_attr_for_each(attr, nlh, sizeof(*tm)) {
     struct tc_stats *ts = NULL;
 
-    if (mnl_attr_get_type (attr) != TCA_STATS)
+    if (mnl_attr_get_type(attr) != TCA_STATS)
       continue;
 
-    if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (*ts)) < 0)
-    {
-      ERROR ("netlink plugin: qos_filter_cb: TCA_STATS mnl_attr_validate2 failed.");
+    if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*ts)) < 0) {
+      ERROR("netlink plugin: qos_filter_cb: TCA_STATS mnl_attr_validate2 "
+            "failed.");
       return MNL_CB_ERROR;
     }
-    ts = mnl_attr_get_payload (attr);
+    ts = mnl_attr_get_payload(attr);
 
-    if (!stats_submitted && ts != NULL)
-    {
+    if (!stats_submitted && ts != NULL) {
       char type_instance[DATA_MAX_NAME_LEN];
 
-      ssnprintf (type_instance, sizeof (type_instance), "%s-%s",
-          tc_type, tc_inst);
+      snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
 
-      submit_one (dev, "ipt_bytes", type_instance, ts->bytes);
-      submit_one (dev, "ipt_packets", type_instance, ts->packets);
+      submit_one(dev, "ipt_bytes", type_instance, ts->bytes);
+      submit_one(dev, "ipt_packets", type_instance, ts->packets);
     }
 
     break;
@@ -610,76 +571,62 @@ static int qos_filter_cb (const struct nlmsghdr *nlh, void *args)
 #endif /* TCA_STATS */
 
 #if !(HAVE_TCA_STATS && HAVE_TCA_STATS2)
-  DEBUG ("netlink plugin: qos_filter_cb: Have neither TCA_STATS2 nor "
-      "TCA_STATS.");
+  DEBUG("netlink plugin: qos_filter_cb: Have neither TCA_STATS2 nor "
+        "TCA_STATS.");
 #endif
 
   return MNL_CB_OK;
 } /* int qos_filter_cb */
 
-static int ir_config (const char *key, const char *value)
-{
+static int ir_config(const char *key, const char *value) {
   char *new_val;
   char *fields[8];
   int fields_num;
   int status = 1;
 
-  new_val = strdup (value);
+  new_val = strdup(value);
   if (new_val == NULL)
-    return (-1);
+    return -1;
 
-  fields_num = strsplit (new_val, fields, STATIC_ARRAY_SIZE (fields));
-  if ((fields_num < 1) || (fields_num > 8))
-  {
-    sfree (new_val);
-    return (-1);
+  fields_num = strsplit(new_val, fields, STATIC_ARRAY_SIZE(fields));
+  if ((fields_num < 1) || (fields_num > 8)) {
+    sfree(new_val);
+    return -1;
   }
 
-  if ((strcasecmp (key, "Interface") == 0)
-      || (strcasecmp (key, "VerboseInterface") == 0))
-  {
-    if (fields_num != 1)
-    {
-      ERROR ("netlink plugin: Invalid number of fields for option "
-          "`%s'. Got %i, expected 1.", key, fields_num);
+  if ((strcasecmp(key, "Interface") == 0) ||
+      (strcasecmp(key, "VerboseInterface") == 0)) {
+    if (fields_num != 1) {
+      ERROR("netlink plugin: Invalid number of fields for option "
+            "`%s'. Got %i, expected 1.",
+            key, fields_num);
       status = -1;
-    }
-    else
-    {
-      add_ignorelist (fields[0], "interface", NULL);
-      if (strcasecmp (key, "VerboseInterface") == 0)
-        add_ignorelist (fields[0], "if_detail", NULL);
+    } else {
+      add_ignorelist(fields[0], "interface", NULL);
+      if (strcasecmp(key, "VerboseInterface") == 0)
+        add_ignorelist(fields[0], "if_detail", NULL);
       status = 0;
     }
-  }
-  else if ((strcasecmp (key, "QDisc") == 0)
-      || (strcasecmp (key, "Class") == 0)
-      || (strcasecmp (key, "Filter") == 0))
-  {
-    if ((fields_num < 1) || (fields_num > 2))
-    {
-      ERROR ("netlink plugin: Invalid number of fields for option "
-          "`%s'. Got %i, expected 1 or 2.", key, fields_num);
-      return (-1);
-    }
-    else
-    {
-      add_ignorelist (fields[0], key,
-          (fields_num == 2) ? fields[1] : NULL);
+  } else if ((strcasecmp(key, "QDisc") == 0) ||
+             (strcasecmp(key, "Class") == 0) ||
+             (strcasecmp(key, "Filter") == 0)) {
+    if ((fields_num < 1) || (fields_num > 2)) {
+      ERROR("netlink plugin: Invalid number of fields for option "
+            "`%s'. Got %i, expected 1 or 2.",
+            key, fields_num);
+      return -1;
+    } else {
+      add_ignorelist(fields[0], key, (fields_num == 2) ? fields[1] : NULL);
       status = 0;
     }
-  }
-  else if (strcasecmp (key, "IgnoreSelected") == 0)
-  {
-    if (fields_num != 1)
-    {
-      ERROR ("netlink plugin: Invalid number of fields for option "
-          "`IgnoreSelected'. Got %i, expected 1.", fields_num);
+  } else if (strcasecmp(key, "IgnoreSelected") == 0) {
+    if (fields_num != 1) {
+      ERROR("netlink plugin: Invalid number of fields for option "
+            "`IgnoreSelected'. Got %i, expected 1.",
+            fields_num);
       status = -1;
-    }
-    else
-    {
-      if (IS_TRUE (fields[0]))
+    } else {
+      if (IS_TRUE(fields[0]))
         ir_ignorelist_invert = 0;
       else
         ir_ignorelist_invert = 1;
@@ -687,143 +634,125 @@ static int ir_config (const char *key, const char *value)
     }
   }
 
-  sfree (new_val);
+  sfree(new_val);
 
-  return (status);
+  return status;
 } /* int ir_config */
 
-static int ir_init (void)
-{
-  nl = mnl_socket_open (NETLINK_ROUTE);
-  if (nl == NULL)
-  {
-    ERROR ("netlink plugin: ir_init: mnl_socket_open failed.");
-    return (-1);
+static int ir_init(void) {
+  nl = mnl_socket_open(NETLINK_ROUTE);
+  if (nl == NULL) {
+    ERROR("netlink plugin: ir_init: mnl_socket_open failed.");
+    return -1;
   }
 
-  if (mnl_socket_bind (nl, 0, MNL_SOCKET_AUTOPID) < 0)
-  {
-    ERROR ("netlink plugin: ir_init: mnl_socket_bind failed.");
-    return (-1);
+  if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) {
+    ERROR("netlink plugin: ir_init: mnl_socket_bind failed.");
+    return -1;
   }
 
-  return (0);
+  return 0;
 } /* int ir_init */
 
-static int ir_read (void)
-{
+static int ir_read(void) {
   char buf[MNL_SOCKET_BUFFER_SIZE];
   struct nlmsghdr *nlh;
   struct rtgenmsg *rt;
   int ret;
   unsigned int seq, portid;
 
-  static const int type_id[] = { RTM_GETQDISC, RTM_GETTCLASS, RTM_GETTFILTER };
-  static const char *type_name[] = { "qdisc", "class", "filter" };
+  static const int type_id[] = {RTM_GETQDISC, RTM_GETTCLASS, RTM_GETTFILTER};
+  static const char *type_name[] = {"qdisc", "class", "filter"};
 
-  portid = mnl_socket_get_portid (nl);
+  portid = mnl_socket_get_portid(nl);
 
-  nlh = mnl_nlmsg_put_header (buf);
+  nlh = mnl_nlmsg_put_header(buf);
   nlh->nlmsg_type = RTM_GETLINK;
   nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-  nlh->nlmsg_seq = seq = time (NULL);
-  rt = mnl_nlmsg_put_extra_header (nlh, sizeof (*rt));
+  nlh->nlmsg_seq = seq = time(NULL);
+  rt = mnl_nlmsg_put_extra_header(nlh, sizeof(*rt));
   rt->rtgen_family = AF_PACKET;
 
-  if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) < 0)
-  {
-    ERROR ("netlink plugin: ir_read: rtnl_wilddump_request failed.");
-    return (-1);
+  if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
+    ERROR("netlink plugin: ir_read: rtnl_wilddump_request failed.");
+    return -1;
   }
 
-  ret = mnl_socket_recvfrom (nl, buf, sizeof (buf));
-  while (ret > 0)
-  {
-    ret = mnl_cb_run (buf, ret, seq, portid, link_filter_cb, NULL);
+  ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
+  while (ret > 0) {
+    ret = mnl_cb_run(buf, ret, seq, portid, link_filter_cb, NULL);
     if (ret <= MNL_CB_STOP)
       break;
-    ret = mnl_socket_recvfrom (nl, buf, sizeof (buf));
+    ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
   }
-  if (ret < 0)
-  {
-    ERROR ("netlink plugin: ir_read: mnl_socket_recvfrom failed.");
-    return (-1);
+  if (ret < 0) {
+    ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed.");
+    return -1;
   }
 
   /* `link_filter_cb' will update `iflist' which is used here to iterate
    * over all interfaces. */
-  for (size_t ifindex = 1; ifindex < iflist_len; ifindex++)
-  {
+  for (size_t ifindex = 1; ifindex < iflist_len; ifindex++) {
     struct tcmsg *tm;
 
     if (iflist[ifindex] == NULL)
       continue;
 
-    for (size_t type_index = 0; type_index < STATIC_ARRAY_SIZE (type_id); type_index++)
-    {
-      if (check_ignorelist (iflist[ifindex], type_name[type_index], NULL))
-      {
-        DEBUG ("netlink plugin: ir_read: check_ignorelist (%s, %s, (nil)) "
-            "== TRUE", iflist[ifindex], type_name[type_index]);
+    for (size_t type_index = 0; type_index < STATIC_ARRAY_SIZE(type_id);
+         type_index++) {
+      if (check_ignorelist(iflist[ifindex], type_name[type_index], NULL)) {
+        DEBUG("netlink plugin: ir_read: check_ignorelist (%s, %s, (nil)) "
+              "== TRUE",
+              iflist[ifindex], type_name[type_index]);
         continue;
       }
 
-      DEBUG ("netlink plugin: ir_read: querying %s from %s (%zu).",
-          type_name[type_index], iflist[ifindex], ifindex);
+      DEBUG("netlink plugin: ir_read: querying %s from %s (%" PRIsz ").",
+            type_name[type_index], iflist[ifindex], ifindex);
 
-      nlh = mnl_nlmsg_put_header (buf);
+      nlh = mnl_nlmsg_put_header(buf);
       nlh->nlmsg_type = type_id[type_index];
       nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-      nlh->nlmsg_seq = seq = time (NULL);
-      tm = mnl_nlmsg_put_extra_header (nlh, sizeof (*tm));
+      nlh->nlmsg_seq = seq = time(NULL);
+      tm = mnl_nlmsg_put_extra_header(nlh, sizeof(*tm));
       tm->tcm_family = AF_PACKET;
       tm->tcm_ifindex = ifindex;
 
-      if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) < 0)
-      {
-        ERROR ("netlink plugin: ir_read: mnl_socket_sendto failed.");
+      if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
+        ERROR("netlink plugin: ir_read: mnl_socket_sendto failed.");
         continue;
       }
 
-      ret = mnl_socket_recvfrom (nl, buf, sizeof (buf));
-      while (ret > 0)
-      {
-        ret = mnl_cb_run (buf, ret, seq, portid, qos_filter_cb, &ifindex);
+      ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
+      while (ret > 0) {
+        ret = mnl_cb_run(buf, ret, seq, portid, qos_filter_cb, &ifindex);
         if (ret <= MNL_CB_STOP)
           break;
-        ret = mnl_socket_recvfrom (nl, buf, sizeof (buf));
+        ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
       }
-      if (ret < 0)
-      {
-        ERROR ("netlink plugin: ir_read:mnl_socket_recvfrom failed.");
+      if (ret < 0) {
+        ERROR("netlink plugin: ir_read:mnl_socket_recvfrom failed.");
         continue;
       }
 
     } /* for (type_index) */
-  } /* for (if_index) */
+  }   /* for (if_index) */
 
-  return (0);
+  return 0;
 } /* int ir_read */
 
-static int ir_shutdown (void)
-{
-  if (nl)
-  {
-    mnl_socket_close (nl);
+static int ir_shutdown(void) {
+  if (nl) {
+    mnl_socket_close(nl);
     nl = NULL;
   }
 
-  return (0);
+  return 0;
 } /* int ir_shutdown */
 
-void module_register (void)
-{
-  plugin_register_config ("netlink", ir_config, config_keys, config_keys_num);
-  plugin_register_init ("netlink", ir_init);
-  plugin_register_read ("netlink", ir_read);
-  plugin_register_shutdown ("netlink", ir_shutdown);
+void module_register(void) {
+  plugin_register_config("netlink", ir_config, config_keys, config_keys_num);
+  plugin_register_init("netlink", ir_init);
+  plugin_register_read("netlink", ir_read);
+  plugin_register_shutdown("netlink", ir_shutdown);
 } /* void module_register */
-
-/*
- * vim: set shiftwidth=2 softtabstop=2 tabstop=8 :
- */