1 Index: collectd-4.10.7/src/netlink.c
2 ===================================================================
3 --- collectd-4.10.7.orig/src/netlink.c 2012-04-01 16:20:24.000000000 +0200
4 +++ collectd-4.10.7/src/netlink.c 2012-06-07 17:22:16.212616882 +0200
7 msg = NLMSG_DATA (nmh);
9 - msg_len = nmh->nlmsg_len - sizeof (struct ifinfomsg);
10 + msg_len = nmh->nlmsg_len - NLMSG_LENGTH(sizeof (struct ifinfomsg));
13 ERROR ("netlink plugin: link_filter: msg_len = %i < 0;", msg_len);
16 static int ir_read (void)
18 - struct ifinfomsg im;
22 static const int type_id[] = { RTM_GETQDISC, RTM_GETTCLASS, RTM_GETTFILTER };
23 static const char *type_name[] = { "qdisc", "class", "filter" };
25 - memset (&im, '\0', sizeof (im));
26 - im.ifi_type = AF_UNSPEC;
28 - if (rtnl_dump_request (&rth, RTM_GETLINK, &im, sizeof (im)) < 0)
29 + if (rtnl_wilddump_request (&rth, AF_UNSPEC, RTM_GETLINK) < 0)
31 ERROR ("netlink plugin: ir_read: rtnl_dump_request failed.");
35 - if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
37 + if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
39 ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
45 - if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
47 + if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
49 ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");