projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ce6bf7
)
netlink plugin: Fix the submitted values.
author
Florian Forster
<octo@huhu.verplant.org>
Thu, 30 Aug 2007 21:35:39 +0000
(23:35 +0200)
committer
Florian Forster
<octo@huhu.verplant.org>
Thu, 30 Aug 2007 21:35:39 +0000
(23:35 +0200)
src/netlink.c
patch
|
blob
|
history
diff --git
a/src/netlink.c
b/src/netlink.c
index
043f023
..
3c8a1fc
100644
(file)
--- a/
src/netlink.c
+++ b/
src/netlink.c
@@
-223,8
+223,8
@@
static int link_filter (const struct sockaddr_nl *sa, struct nlmsghdr *nmh,
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);
- submit_two (dev, "if_packets", NULL, stats->rx_
bytes, stats->tx_byte
s);
- submit_two (dev, "if_errors", NULL, stats->rx_
bytes, stats->tx_byte
s);
+ submit_two (dev, "if_packets", NULL, stats->rx_
packets, stats->tx_packet
s);
+ submit_two (dev, "if_errors", NULL, stats->rx_
errors, stats->tx_error
s);
}
else
{
}
else
{
@@
-271,8
+271,6
@@
static int qos_filter (const struct sockaddr_nl *sa, struct nlmsghdr *nmh,
char *tc_type;
char tc_inst[DATA_MAX_NAME_LEN];
char *tc_type;
char tc_inst[DATA_MAX_NAME_LEN];
- printf ("=== qos_filter ===\n");
-
if (nmh->nlmsg_type == RTM_NEWQDISC)
tc_type = "qdisc";
else if (nmh->nlmsg_type == RTM_NEWTCLASS)
if (nmh->nlmsg_type == RTM_NEWQDISC)
tc_type = "qdisc";
else if (nmh->nlmsg_type == RTM_NEWTCLASS)
@@
-353,7
+351,7
@@
static int qos_filter (const struct sockaddr_nl *sa, struct nlmsghdr *nmh,
memcpy (&bs, RTA_DATA (attrs_stats[TCA_STATS_BASIC]),
MIN (RTA_PAYLOAD (attrs_stats[TCA_STATS_BASIC]), sizeof(bs)));
memcpy (&bs, RTA_DATA (attrs_stats[TCA_STATS_BASIC]),
MIN (RTA_PAYLOAD (attrs_stats[TCA_STATS_BASIC]), sizeof(bs)));
- submit_one (dev, "ipt_
octet
s", type_instance, bs.bytes);
+ submit_one (dev, "ipt_
byte
s", type_instance, bs.bytes);
submit_one (dev, "ipt_packets", type_instance, bs.packets);
}
}
submit_one (dev, "ipt_packets", type_instance, bs.packets);
}
}