projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2755 from dehotot/debug-option-rpms
[collectd.git]
/
src
/
netlink.c
diff --git
a/src/netlink.c
b/src/netlink.c
index
3cc1084
..
1978eb4
100644
(file)
--- a/
src/netlink.c
+++ b/
src/netlink.c
@@
-359,7
+359,8
@@
static int link_filter_cb(const struct nlmsghdr *nlh,
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats64)) < 0) {
ERROR("netlink plugin: link_filter_cb: IFLA_STATS64 mnl_attr_validate2 "
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats64)) < 0) {
ERROR("netlink plugin: link_filter_cb: IFLA_STATS64 mnl_attr_validate2 "
- "failed.");
+ "failed: %s",
+ STRERRNO);
return MNL_CB_ERROR;
}
stats.stats64 = mnl_attr_get_payload(attr);
return MNL_CB_ERROR;
}
stats.stats64 = mnl_attr_get_payload(attr);
@@
-375,7
+376,8
@@
static int link_filter_cb(const struct nlmsghdr *nlh,
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats32)) < 0) {
ERROR("netlink plugin: link_filter_cb: IFLA_STATS mnl_attr_validate2 "
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats32)) < 0) {
ERROR("netlink plugin: link_filter_cb: IFLA_STATS mnl_attr_validate2 "
- "failed.");
+ "failed: %s",
+ STRERRNO);
return MNL_CB_ERROR;
}
stats.stats32 = mnl_attr_get_payload(attr);
return MNL_CB_ERROR;
}
stats.stats32 = mnl_attr_get_payload(attr);
@@
-401,7
+403,8
@@
static int qos_attr_cb(const struct nlattr *attr, void *data) {
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 "
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.");
+ "failed: %s",
+ STRERRNO);
return MNL_CB_ERROR;
}
q_stats->bs = mnl_attr_get_payload(attr);
return MNL_CB_ERROR;
}
q_stats->bs = mnl_attr_get_payload(attr);
@@
-458,7
+461,7
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
if ((tm->tcm_ifindex >= 0) && ((size_t)tm->tcm_ifindex >= iflist_len)) {
ERROR("netlink plugin: qos_filter_cb: tm->tcm_ifindex = %i "
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"
,
+ ">= iflist_len = %
" PRIsz
,
tm->tcm_ifindex, iflist_len);
return MNL_CB_ERROR;
}
tm->tcm_ifindex, iflist_len);
return MNL_CB_ERROR;
}
@@
-495,8
+498,8
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
if (strcmp(tc_type, "filter") == 0)
numberic_id = tm->tcm_parent;
if (strcmp(tc_type, "filter") == 0)
numberic_id = tm->tcm_parent;
- s
s
nprintf(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,
}
DEBUG("netlink plugin: qos_filter_cb: got %s for %s (%i).", tc_type, dev,
@@
-527,8
+530,7
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
stats_submitted = 1;
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);
if (q_stats.bs != NULL) {
submit_one(dev, "ipt_bytes", type_instance, q_stats.bs->bytes);
if (q_stats.bs != NULL) {
submit_one(dev, "ipt_bytes", type_instance, q_stats.bs->bytes);
@@
-552,7
+554,8
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*ts)) < 0) {
ERROR("netlink plugin: qos_filter_cb: TCA_STATS mnl_attr_validate2 "
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*ts)) < 0) {
ERROR("netlink plugin: qos_filter_cb: TCA_STATS mnl_attr_validate2 "
- "failed.");
+ "failed: %s",
+ STRERRNO);
return MNL_CB_ERROR;
}
ts = mnl_attr_get_payload(attr);
return MNL_CB_ERROR;
}
ts = mnl_attr_get_payload(attr);
@@
-560,8
+563,7
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
if (!stats_submitted && ts != NULL) {
char type_instance[DATA_MAX_NAME_LEN];
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);
@@
-688,8
+690,8
@@
static int ir_read(void) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
- ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed
."
);
- return
-1
;
+ ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed
: %s", STRERRNO
);
+ return
(-1)
;
}
/* `link_filter_cb' will update `iflist' which is used here to iterate
}
/* `link_filter_cb' will update `iflist' which is used here to iterate
@@
-709,7
+711,7
@@
static int ir_read(void) {
continue;
}
continue;
}
- DEBUG("netlink plugin: ir_read: querying %s from %s (%
zu
).",
+ DEBUG("netlink plugin: ir_read: querying %s from %s (%
" PRIsz "
).",
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);
@@
-733,10
+735,10
@@
static int ir_read(void) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
- ERROR("netlink plugin: ir_read:mnl_socket_recvfrom failed.");
+ ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s",
+ STRERRNO);
continue;
}
continue;
}
-
} /* for (type_index) */
} /* for (if_index) */
} /* for (type_index) */
} /* for (if_index) */