projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sigrok plugin: don't pass status to strerror
[collectd.git]
/
src
/
netlink.c
diff --git
a/src/netlink.c
b/src/netlink.c
index
ff730e1
..
3c4642c
100644
(file)
--- a/
src/netlink.c
+++ b/
src/netlink.c
@@
-1,6
+1,9
@@
/**
* collectd - src/netlink.c
* Copyright (C) 2007-2010 Florian octo Forster
/**
* collectd - src/netlink.c
* Copyright (C) 2007-2010 Florian octo Forster
+ * Copyright (C) 2008-2012 Sebastian Harl
+ * Copyright (C) 2013 Andreas Henriksson
+ * Copyright (C) 2013 Marc Fournier
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-17,6
+20,9
@@
*
* Authors:
* Florian octo Forster <octo at collectd.org>
*
* Authors:
* Florian octo Forster <octo at collectd.org>
+ * Sebastian Harl <sh at tokkee.org>
+ * Andreas Henriksson <andreas at fatal.se>
+ * Marc Fournier <marc.fournier at camptocamp.com>
**/
#include "collectd.h"
**/
#include "collectd.h"
@@
-35,7
+41,6
@@
# include <linux/pkt_sched.h>
#endif
# include <linux/pkt_sched.h>
#endif
-#include <time.h>
#include <libmnl/libmnl.h>
typedef struct ir_ignorelist_s
#include <libmnl/libmnl.h>
typedef struct ir_ignorelist_s
@@
-271,7
+276,7
@@
static void check_ignorelist_and_submit (const char *dev,
} /* void check_ignorelist_and_submit */
static int link_filter_cb (const struct nlmsghdr *nlh,
} /* void check_ignorelist_and_submit */
static int link_filter_cb (const struct nlmsghdr *nlh,
- void
__attribute__((unused)) *args
)
+ void
*args __attribute__((unused))
)
{
struct ifinfomsg *ifm = mnl_nlmsg_get_payload (nlh);
struct nlattr *attr;
{
struct ifinfomsg *ifm = mnl_nlmsg_get_payload (nlh);
struct nlattr *attr;
@@
-337,7
+342,7
@@
static int link_filter_cb (const struct nlmsghdr *nlh,
#if HAVE_TCA_STATS2
static int qos_attr_cb (const struct nlattr *attr, void *data)
{
#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;
+ struct gnet_stats_basic *
*bs =
(struct gnet_stats_basic **)data;
/* skip unsupported attribute in user-space */
if (mnl_attr_type_valid (attr, TCA_STATS_MAX) < 0)
/* skip unsupported attribute in user-space */
if (mnl_attr_type_valid (attr, TCA_STATS_MAX) < 0)
@@
-345,12
+350,12
@@
static int qos_attr_cb (const struct nlattr *attr, void *data)
if (mnl_attr_get_type (attr) == TCA_STATS_BASIC)
{
if (mnl_attr_get_type (attr) == TCA_STATS_BASIC)
{
- if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (*bs)) < 0)
+ if (mnl_attr_validate2 (attr, MNL_TYPE_UNSPEC, sizeof (*
*
bs)) < 0)
{
ERROR ("netlink plugin: qos_attr_cb: TCA_STATS_BASIC mnl_attr_validate2 failed.");
return MNL_CB_ERROR;
}
{
ERROR ("netlink plugin: qos_attr_cb: TCA_STATS_BASIC mnl_attr_validate2 failed.");
return MNL_CB_ERROR;
}
- bs = mnl_attr_get_payload (attr);
+
*
bs = mnl_attr_get_payload (attr);
return MNL_CB_STOP;
}
return MNL_CB_STOP;
}
@@
-372,7
+377,7
@@
static int qos_filter_cb (const struct nlmsghdr *nlh, void *args)
char *tc_type;
char tc_inst[DATA_MAX_NAME_LEN];
char *tc_type;
char tc_inst[DATA_MAX_NAME_LEN];
-
int __attribute__((unused))
stats_submitted = 0;
+
_Bool
stats_submitted = 0;
if (nlh->nlmsg_type == RTM_NEWQDISC)
tc_type = "qdisc";
if (nlh->nlmsg_type == RTM_NEWQDISC)
tc_type = "qdisc";
@@
-678,7
+683,7
@@
static int ir_read (void)
continue;
}
continue;
}
- DEBUG ("netlink plugin: ir_read: querying %s from %s (%
l
u).",
+ DEBUG ("netlink plugin: ir_read: querying %s from %s (%
z
u).",
type_name[type_index], iflist[ifindex], ifindex);
nlh = mnl_nlmsg_put_header (buf);
type_name[type_index], iflist[ifindex], ifindex);
nlh = mnl_nlmsg_put_header (buf);