projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/php-collection: Add a PHP frontend for graph generation.
[collectd.git]
/
src
/
netlink.c
diff --git
a/src/netlink.c
b/src/netlink.c
index
8c883f6
..
d6288e9
100644
(file)
--- a/
src/netlink.c
+++ b/
src/netlink.c
@@
-171,8
+171,8
@@
static void submit_one (const char *dev, const char *type,
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "netlink"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "netlink", sizeof (vl.plugin)
);
strncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
if (type_instance != NULL)
strncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
if (type_instance != NULL)
@@
-194,8
+194,8
@@
static void submit_two (const char *dev, const char *type,
vl.values = values;
vl.values_len = 2;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 2;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "netlink"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "netlink", sizeof (vl.plugin)
);
strncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
if (type_instance != NULL)
strncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
if (type_instance != NULL)
@@
-237,10
+237,6
@@
static int link_filter (const struct sockaddr_nl *sa,
return (-1);
}
return (-1);
}
- if (attrs[IFLA_STATS] == NULL)
- return (-1);
- stats = RTA_DATA (attrs[IFLA_STATS]);
-
if (attrs[IFLA_IFNAME] == NULL)
{
ERROR ("netlink plugin: link_filter: attrs[IFLA_IFNAME] == NULL");
if (attrs[IFLA_IFNAME] == NULL)
{
ERROR ("netlink plugin: link_filter: attrs[IFLA_IFNAME] == NULL");
@@
-273,6
+269,13
@@
static int link_filter (const struct sockaddr_nl *sa,
iflist[msg->ifi_index] = strdup (dev);
}
iflist[msg->ifi_index] = strdup (dev);
}
+ if (attrs[IFLA_STATS] == NULL)
+ {
+ DEBUG ("netlink plugin: link_filter: No statistics for interface %s.", dev);
+ return (0);
+ }
+ stats = RTA_DATA (attrs[IFLA_STATS]);
+
if (check_ignorelist (dev, "interface", NULL) == 0)
{
submit_two (dev, "if_octets", NULL, stats->rx_bytes, stats->tx_bytes);
if (check_ignorelist (dev, "interface", NULL) == 0)
{
submit_two (dev, "if_octets", NULL, stats->rx_bytes, stats->tx_bytes);
@@
-359,7
+362,7
@@
static int qos_filter (const struct sockaddr_nl *sa,
if (msg->tcm_ifindex >= iflist_len)
{
ERROR ("netlink plugin: qos_filter: msg->tcm_ifindex = %i "
if (msg->tcm_ifindex >= iflist_len)
{
ERROR ("netlink plugin: qos_filter: msg->tcm_ifindex = %i "
- ">= iflist_len = %
i
",
+ ">= iflist_len = %
zu
",
msg->tcm_ifindex, iflist_len);
return (-1);
}
msg->tcm_ifindex, iflist_len);
return (-1);
}