projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_riemann plugin: fix warning
[collectd.git]
/
src
/
snmp.c
diff --git
a/src/snmp.c
b/src/snmp.c
index
0a20e34
..
433f5f8
100644
(file)
--- a/
src/snmp.c
+++ b/
src/snmp.c
@@
-53,7
+53,7
@@
typedef union instance_u instance_t;
struct data_definition_s {
char *name; /* used to reference this from the `Collect' option */
char *type; /* used to find the data_set */
struct data_definition_s {
char *name; /* used to reference this from the `Collect' option */
char *type; /* used to find the data_set */
-
_B
ool is_table;
+
b
ool is_table;
instance_t instance;
char *instance_prefix;
oid_t *values;
instance_t instance;
char *instance_prefix;
oid_t *values;
@@
-63,7
+63,7
@@
struct data_definition_s {
struct data_definition_s *next;
char **ignores;
size_t ignores_len;
struct data_definition_s *next;
char **ignores;
size_t ignores_len;
-
_B
ool invert_match;
+
b
ool invert_match;
};
typedef struct data_definition_s data_definition_t;
};
typedef struct data_definition_s data_definition_t;
@@
-115,7
+115,7
@@
typedef struct csnmp_table_values_s csnmp_table_values_t;
/*
* Private variables
*/
/*
* Private variables
*/
-static data_definition_t *data_head
= NULL
;
+static data_definition_t *data_head;
/*
* Prototypes
/*
* Prototypes
@@
-219,7
+219,7
@@
static void csnmp_host_definition_destroy(void *arg) /* {{{ */
* +-> csnmp_config_add_host_security_level
*/
static void call_snmp_init_once(void) {
* +-> csnmp_config_add_host_security_level
*/
static void call_snmp_init_once(void) {
- static int have_init
= 0
;
+ static int have_init;
if (have_init == 0)
init_snmp(PACKAGE_NAME);
if (have_init == 0)
init_snmp(PACKAGE_NAME);
@@
-398,9
+398,8
@@
static int csnmp_config_add_data(oconfig_item_t *ci) {
}
DEBUG("snmp plugin: dd = { name = %s, type = %s, is_table = %s, values_len = "
}
DEBUG("snmp plugin: dd = { name = %s, type = %s, is_table = %s, values_len = "
- "%zu }",
- dd->name, dd->type, (dd->is_table != 0) ? "true" : "false",
- dd->values_len);
+ "%" PRIsz " }",
+ dd->name, dd->type, (dd->is_table) ? "true" : "false", dd->values_len);
if (data_head == NULL)
data_head = dd;
if (data_head == NULL)
data_head = dd;
@@
-830,9
+829,9
@@
static value_t csnmp_value_list_to_value(struct variable_list *vl, int type,
value_t ret;
uint64_t tmp_unsigned = 0;
int64_t tmp_signed = 0;
value_t ret;
uint64_t tmp_unsigned = 0;
int64_t tmp_signed = 0;
-
_B
ool defined = 1;
+
b
ool defined = 1;
/* Set to true when the original SNMP type appears to have been signed. */
/* Set to true when the original SNMP type appears to have been signed. */
-
_B
ool prefer_signed = 0;
+
b
ool prefer_signed = 0;
if ((vl->type == ASN_INTEGER) || (vl->type == ASN_UINTEGER) ||
(vl->type == ASN_COUNTER)
if ((vl->type == ASN_INTEGER) || (vl->type == ASN_UINTEGER) ||
(vl->type == ASN_COUNTER)
@@
-1065,7
+1064,7
@@
static int csnmp_instance_list_add(csnmp_list_instances_t **head,
char *ptr;
csnmp_strvbcopy(il->instance, vb, sizeof(il->instance));
char *ptr;
csnmp_strvbcopy(il->instance, vb, sizeof(il->instance));
-
_B
ool is_matched = 0;
+
b
ool is_matched = 0;
for (uint32_t i = 0; i < dd->ignores_len; i++) {
status = fnmatch(dd->ignores[i], il->instance, 0);
if (status == 0) {
for (uint32_t i = 0; i < dd->ignores_len; i++) {
status = fnmatch(dd->ignores[i], il->instance, 0);
if (status == 0) {
@@
-1093,7
+1092,8
@@
static int csnmp_instance_list_add(csnmp_list_instances_t **head,
value_t val = csnmp_value_list_to_value(
vb, DS_TYPE_COUNTER,
/* scale = */ 1.0, /* shift = */ 0.0, hd->name, dd->name);
value_t val = csnmp_value_list_to_value(
vb, DS_TYPE_COUNTER,
/* scale = */ 1.0, /* shift = */ 0.0, hd->name, dd->name);
- snprintf(il->instance, sizeof(il->instance), "%llu", val.counter);
+ snprintf(il->instance, sizeof(il->instance), "%" PRIu64,
+ (uint64_t)val.counter);
}
/* TODO: Debugging output */
}
/* TODO: Debugging output */
@@
-1118,7
+1118,7
@@
static int csnmp_dispatch_table(host_definition_t *host,
csnmp_table_values_t *value_table_ptr[data->values_len];
size_t i;
csnmp_table_values_t *value_table_ptr[data->values_len];
size_t i;
-
_B
ool have_more;
+
b
ool have_more;
oid_t current_suffix;
ds = plugin_get_ds(data->type);
oid_t current_suffix;
ds = plugin_get_ds(data->type);
@@
-1141,7
+1141,7
@@
static int csnmp_dispatch_table(host_definition_t *host,
have_more = 1;
while (have_more) {
have_more = 1;
while (have_more) {
-
_B
ool suffix_skipped = 0;
+
b
ool suffix_skipped = 0;
/* Determine next suffix to handle. */
if (instance_list != NULL) {
/* Determine next suffix to handle. */
if (instance_list != NULL) {
@@
-1267,7
+1267,7
@@
static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
oid_t oid_list[oid_list_len];
/* Set to false when an OID has left its subtree so we don't re-request it
* again. */
oid_t oid_list[oid_list_len];
/* Set to false when an OID has left its subtree so we don't re-request it
* again. */
-
_B
ool oid_list_todo[oid_list_len];
+
b
ool oid_list_todo[oid_list_len];
int status;
size_t i;
int status;
size_t i;
@@
-1296,8
+1296,9
@@
static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
}
if (ds->ds_num != data->values_len) {
}
if (ds->ds_num != data->values_len) {
- ERROR("snmp plugin: DataSet `%s' requires %zu values, but config talks "
- "about %zu",
+ ERROR("snmp plugin: DataSet `%s' requires %" PRIsz
+ " values, but config talks "
+ "about %" PRIsz,
data->type, ds->ds_num, data->values_len);
return -1;
}
data->type, ds->ds_num, data->values_len);
return -1;
}
@@
-1432,8
+1433,12
@@
static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
for (vb = res->variables, i = 0; (vb != NULL);
vb = vb->next_variable, i++) {
/* Calculate value index from todo list */
for (vb = res->variables, i = 0; (vb != NULL);
vb = vb->next_variable, i++) {
/* Calculate value index from todo list */
- while ((i < oid_list_len) && !oid_list_todo[i])
+ while ((i < oid_list_len) && !oid_list_todo[i])
{
i++;
i++;
+ }
+ if (i >= oid_list_len) {
+ break;
+ }
/* An instance is configured and the res variable we process is the
* instance value (last index) */
/* An instance is configured and the res variable we process is the
* instance value (last index) */
@@
-1470,7
+1475,7
@@
static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
* suffix is increasing. This also checks if we left the subtree */
ret = csnmp_oid_suffix(&suffix, &vb_name, data->values + i);
if (ret != 0) {
* suffix is increasing. This also checks if we left the subtree */
ret = csnmp_oid_suffix(&suffix, &vb_name, data->values + i);
if (ret != 0) {
- DEBUG("snmp plugin: host = %s; data = %s; i = %
zu
; "
+ DEBUG("snmp plugin: host = %s; data = %s; i = %
" PRIsz "
; "
"Value probably left its subtree.",
host->name, data->name, i);
oid_list_todo[i] = 0;
"Value probably left its subtree.",
host->name, data->name, i);
oid_list_todo[i] = 0;
@@
-1482,7
+1487,7
@@
static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
* table matching algorithm will get confused. */
if ((value_list_tail[i] != NULL) &&
(csnmp_oid_compare(&suffix, &value_list_tail[i]->suffix) <= 0)) {
* table matching algorithm will get confused. */
if ((value_list_tail[i] != NULL) &&
(csnmp_oid_compare(&suffix, &value_list_tail[i]->suffix) <= 0)) {
- DEBUG("snmp plugin: host = %s; data = %s; i = %
zu
; "
+ DEBUG("snmp plugin: host = %s; data = %s; i = %
" PRIsz "
; "
"Suffix is not increasing.",
host->name, data->name, i);
oid_list_todo[i] = 0;
"Suffix is not increasing.",
host->name, data->name, i);
oid_list_todo[i] = 0;
@@
-1574,8
+1579,9
@@
static int csnmp_read_value(host_definition_t *host, data_definition_t *data) {
}
if (ds->ds_num != data->values_len) {
}
if (ds->ds_num != data->values_len) {
- ERROR("snmp plugin: DataSet `%s' requires %zu values, but config talks "
- "about %zu",
+ ERROR("snmp plugin: DataSet `%s' requires %" PRIsz
+ " values, but config talks "
+ "about %" PRIsz,
data->type, ds->ds_num, data->values_len);
return -1;
}
data->type, ds->ds_num, data->values_len);
return -1;
}