projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl_json plugin: fix indentation
[collectd.git]
/
src
/
snmp.c
diff --git
a/src/snmp.c
b/src/snmp.c
index
ae41d03
..
6a5bb8b
100644
(file)
--- a/
src/snmp.c
+++ b/
src/snmp.c
@@
-29,8
+29,6
@@
#include "plugin.h"
#include "utils_complain.h"
#include "plugin.h"
#include "utils_complain.h"
-#include <pthread.h>
-
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
@@
-61,7
+59,7
@@
struct data_definition_s
instance_t instance;
char *instance_prefix;
oid_t *values;
instance_t instance;
char *instance_prefix;
oid_t *values;
-
in
t values_len;
+
size_
t values_len;
double scale;
double shift;
struct data_definition_s *next;
double scale;
double shift;
struct data_definition_s *next;
@@
-310,10
+308,10
@@
static int csnmp_config_add_data_values (data_definition_t *dd, oconfig_item_t *
sfree (dd->values);
dd->values_len = 0;
sfree (dd->values);
dd->values_len = 0;
- dd->values =
(oid_t *) malloc (sizeof (oid_t
) * ci->values_num);
+ dd->values =
malloc (sizeof (*dd->values
) * ci->values_num);
if (dd->values == NULL)
return (-1);
if (dd->values == NULL)
return (-1);
- dd->values_len = ci->values_num;
+ dd->values_len =
(size_t)
ci->values_num;
for (i = 0; i < ci->values_num; i++)
{
for (i = 0; i < ci->values_num; i++)
{
@@
-384,10
+382,9
@@
static int csnmp_config_add_data (oconfig_item_t *ci)
int status = 0;
int i;
int status = 0;
int i;
- dd =
(data_definition_t *) malloc (sizeof (data_definition_t
));
+ dd =
calloc (1, sizeof (*dd
));
if (dd == NULL)
return (-1);
if (dd == NULL)
return (-1);
- memset (dd, '\0', sizeof (data_definition_t));
status = cf_util_get_string(ci, &dd->name);
if (status != 0)
status = cf_util_get_string(ci, &dd->name);
if (status != 0)
@@
-459,7
+456,7
@@
static int csnmp_config_add_data (oconfig_item_t *ci)
return (-1);
}
return (-1);
}
- DEBUG ("snmp plugin: dd = { name = %s, type = %s, is_table = %s, values_len = %
i
}",
+ 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);
if (data_head == NULL)
dd->name, dd->type, (dd->is_table != 0) ? "true" : "false", dd->values_len);
if (data_head == NULL)
@@
-521,7
+518,7
@@
static int csnmp_config_add_host_collect (host_definition_t *host,
}
data_list_len = host->data_list_len + ci->values_num;
}
data_list_len = host->data_list_len + ci->values_num;
- data_list =
(data_definition_t **)
realloc (host->data_list,
+ data_list = realloc (host->data_list,
sizeof (data_definition_t *) * data_list_len);
if (data_list == NULL)
return (-1);
sizeof (data_definition_t *) * data_list_len);
if (data_list == NULL)
return (-1);
@@
-645,12
+642,10
@@
static int csnmp_config_add_host (oconfig_item_t *ci)
/* Registration stuff. */
char cb_name[DATA_MAX_NAME_LEN];
user_data_t cb_data;
/* Registration stuff. */
char cb_name[DATA_MAX_NAME_LEN];
user_data_t cb_data;
- struct timespec cb_interval;
- hd =
(host_definition_t *) malloc (sizeof (host_definition_t
));
+ hd =
calloc (1, sizeof (*hd
));
if (hd == NULL)
return (-1);
if (hd == NULL)
return (-1);
- memset (hd, '\0', sizeof (host_definition_t));
hd->version = 2;
C_COMPLAIN_INIT (&hd->complaint);
hd->version = 2;
C_COMPLAIN_INIT (&hd->complaint);
@@
-781,11
+776,8
@@
static int csnmp_config_add_host (oconfig_item_t *ci)
cb_data.data = hd;
cb_data.free_func = csnmp_host_definition_destroy;
cb_data.data = hd;
cb_data.free_func = csnmp_host_definition_destroy;
- CDTIME_T_TO_TIMESPEC (hd->interval, &cb_interval);
-
status = plugin_register_complex_read (/* group = */ NULL, cb_name,
status = plugin_register_complex_read (/* group = */ NULL, cb_name,
- csnmp_read_host, /* interval = */ &cb_interval,
- /* user_data = */ &cb_data);
+ csnmp_read_host, hd->interval, /* user_data = */ &cb_data);
if (status != 0)
{
ERROR ("snmp plugin: Registering complex read function failed.");
if (status != 0)
{
ERROR ("snmp plugin: Registering complex read function failed.");
@@
-1055,6
+1047,10
@@
static value_t csnmp_value_list_to_value (struct variable_list *vl, int type,
return (ret);
} /* value_t csnmp_value_list_to_value */
return (ret);
} /* value_t csnmp_value_list_to_value */
+/* csnmp_strvbcopy_hexstring converts the bit string contained in "vb" to a hex
+ * representation and writes it to dst. Returns zero on success and ENOMEM if
+ * dst is not large enough to hold the string. dst is guaranteed to be
+ * nul-terminated. */
static int csnmp_strvbcopy_hexstring (char *dst, /* {{{ */
const struct variable_list *vb, size_t dst_size)
{
static int csnmp_strvbcopy_hexstring (char *dst, /* {{{ */
const struct variable_list *vb, size_t dst_size)
{
@@
-1062,6
+1058,8
@@
static int csnmp_strvbcopy_hexstring (char *dst, /* {{{ */
size_t buffer_free;
size_t i;
size_t buffer_free;
size_t i;
+ dst[0] = 0;
+
buffer_ptr = dst;
buffer_free = dst_size;
buffer_ptr = dst;
buffer_free = dst_size;
@@
-1071,23
+1069,28
@@
static int csnmp_strvbcopy_hexstring (char *dst, /* {{{ */
status = snprintf (buffer_ptr, buffer_free,
(i == 0) ? "%02x" : ":%02x", (unsigned int) vb->val.bitstring[i]);
status = snprintf (buffer_ptr, buffer_free,
(i == 0) ? "%02x" : ":%02x", (unsigned int) vb->val.bitstring[i]);
+ assert (status >= 0);
- if (
status >= buffer_free)
+ if (
((size_t) status) >= buffer_free) /* truncated */
{
{
- buffer_ptr += (buffer_free - 1);
- *buffer_ptr = 0;
- return (dst_size + (buffer_free - status));
+ dst[dst_size - 1] = 0;
+ return ENOMEM;
}
else /* if (status < buffer_free) */
{
}
else /* if (status < buffer_free) */
{
- buffer_ptr
+=
status;
- buffer_free -= status;
+ buffer_ptr
+= (size_t)
status;
+ buffer_free -=
(size_t)
status;
}
}
}
}
- return
((int) (dst_size - buffer_free))
;
+ return
0
;
} /* }}} int csnmp_strvbcopy_hexstring */
} /* }}} int csnmp_strvbcopy_hexstring */
+/* csnmp_strvbcopy copies the octet string or bit string contained in vb to
+ * dst. If non-printable characters are detected, it will switch to a hex
+ * representation of the string. Returns zero on success, EINVAL if vb does not
+ * contain a string and ENOMEM if dst is not large enough to contain the
+ * string. */
static int csnmp_strvbcopy (char *dst, /* {{{ */
const struct variable_list *vb, size_t dst_size)
{
static int csnmp_strvbcopy (char *dst, /* {{{ */
const struct variable_list *vb, size_t dst_size)
{
@@
-1099,6
+1102,14
@@
static int csnmp_strvbcopy (char *dst, /* {{{ */
src = (char *) vb->val.string;
else if (vb->type == ASN_BIT_STR)
src = (char *) vb->val.bitstring;
src = (char *) vb->val.string;
else if (vb->type == ASN_BIT_STR)
src = (char *) vb->val.bitstring;
+ else if (vb->type == ASN_IPADDRESS)
+ {
+ return ssnprintf (dst, dst_size, "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8"",
+ (uint8_t) vb->val.string[0],
+ (uint8_t) vb->val.string[1],
+ (uint8_t) vb->val.string[2],
+ (uint8_t) vb->val.string[3]);
+ }
else
{
dst[0] = 0;
else
{
dst[0] = 0;
@@
-1117,8
+1128,12
@@
static int csnmp_strvbcopy (char *dst, /* {{{ */
dst[i] = src[i];
}
dst[num_chars] = 0;
dst[i] = src[i];
}
dst[num_chars] = 0;
+ dst[dst_size - 1] = 0;
+
+ if (dst_size <= vb->val_len)
+ return ENOMEM;
- return
((int) vb->val_len)
;
+ return
0
;
} /* }}} int csnmp_strvbcopy */
static int csnmp_instance_list_add (csnmp_list_instances_t **head,
} /* }}} int csnmp_strvbcopy */
static int csnmp_instance_list_add (csnmp_list_instances_t **head,
@@
-1143,13
+1158,12
@@
static int csnmp_instance_list_add (csnmp_list_instances_t **head,
csnmp_oid_init (&vb_name, vb->name, vb->name_length);
csnmp_oid_init (&vb_name, vb->name, vb->name_length);
- il =
malloc (
sizeof (*il));
+ il =
calloc (1,
sizeof (*il));
if (il == NULL)
{
if (il == NULL)
{
- ERROR ("snmp plugin:
m
alloc failed.");
+ ERROR ("snmp plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (il, 0, sizeof (*il));
il->next = NULL;
status = csnmp_oid_suffix (&il->suffix, &vb_name, &dd->instance.oid);
il->next = NULL;
status = csnmp_oid_suffix (&il->suffix, &vb_name, &dd->instance.oid);
@@
-1160,7
+1174,7
@@
static int csnmp_instance_list_add (csnmp_list_instances_t **head,
}
/* Get instance name */
}
/* Get instance name */
- if ((vb->type == ASN_OCTET_STR) || (vb->type == ASN_BIT_STR))
+ if ((vb->type == ASN_OCTET_STR) || (vb->type == ASN_BIT_STR)
|| (vb->type == ASN_IPADDRESS)
)
{
char *ptr;
{
char *ptr;
@@
-1226,7
+1240,7
@@
static int csnmp_dispatch_table (host_definition_t *host, data_definition_t *dat
csnmp_list_instances_t *instance_list_ptr;
csnmp_table_values_t **value_table_ptr;
csnmp_list_instances_t *instance_list_ptr;
csnmp_table_values_t **value_table_ptr;
-
in
t i;
+
size_
t i;
_Bool have_more;
oid_t current_suffix;
_Bool have_more;
oid_t current_suffix;
@@
-1241,7
+1255,7
@@
static int csnmp_dispatch_table (host_definition_t *host, data_definition_t *dat
instance_list_ptr = instance_list;
instance_list_ptr = instance_list;
- value_table_ptr = calloc (
(size_t)
data->values_len, sizeof (*value_table_ptr));
+ value_table_ptr = calloc (data->values_len, sizeof (*value_table_ptr));
if (value_table_ptr == NULL)
return (-1);
for (i = 0; i < data->values_len; i++)
if (value_table_ptr == NULL)
return (-1);
for (i = 0; i < data->values_len; i++)
@@
-1384,7
+1398,7
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
const data_set_t *ds;
const data_set_t *ds;
-
uint32_t oid_list_len = (uint32_t) (data->values_len + 1)
;
+
size_t oid_list_len = data->values_len + 1
;
/* Holds the last OID returned by the device. We use this in the GETNEXT
* request to proceed. */
oid_t oid_list[oid_list_len];
/* Holds the last OID returned by the device. We use this in the GETNEXT
* request to proceed. */
oid_t oid_list[oid_list_len];
@@
-1393,8
+1407,7
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
_Bool oid_list_todo[oid_list_len];
int status;
_Bool oid_list_todo[oid_list_len];
int status;
- int i;
- uint32_t j;
+ size_t i;
/* `value_list_head' and `value_list_tail' implement a linked list for each
* value. `instance_list_head' and `instance_list_tail' implement a linked list of
/* `value_list_head' and `value_list_tail' implement a linked list for each
* value. `instance_list_head' and `instance_list_tail' implement a linked list of
@@
-1422,7
+1435,7
@@
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 %
i values, but config talks about %i
",
+ ERROR ("snmp plugin: DataSet `%s' requires %
zu values, but config talks about %zu
",
data->type, ds->ds_num, data->values_len);
return (-1);
}
data->type, ds->ds_num, data->values_len);
return (-1);
}
@@
-1435,8
+1448,8
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
else /* no InstanceFrom option specified. */
oid_list_len--;
else /* no InstanceFrom option specified. */
oid_list_len--;
- for (
j = 0; j < oid_list_len; j
++)
- oid_list_todo[
j
] = 1;
+ for (
i = 0; i < oid_list_len; i
++)
+ oid_list_todo[
i
] = 1;
/* We're going to construct n linked lists, one for each "value".
* value_list_head will contain pointers to the heads of these linked lists,
/* We're going to construct n linked lists, one for each "value".
* value_list_head will contain pointers to the heads of these linked lists,
@@
-1468,13
+1481,13
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
}
oid_list_todo_num = 0;
}
oid_list_todo_num = 0;
- for (
j = 0; j < oid_list_len; j
++)
+ for (
i = 0; i < oid_list_len; i
++)
{
/* Do not rerequest already finished OIDs */
{
/* Do not rerequest already finished OIDs */
- if (!oid_list_todo[
j
])
+ if (!oid_list_todo[
i
])
continue;
oid_list_todo_num++;
continue;
oid_list_todo_num++;
- snmp_add_null_var (req, oid_list[
j].oid, oid_list[j
].oid_len);
+ snmp_add_null_var (req, oid_list[
i].oid, oid_list[i
].oid_len);
}
if (oid_list_todo_num == 0)
}
if (oid_list_todo_num == 0)
@@
-1570,7
+1583,7
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
ret = csnmp_oid_suffix (&suffix, &vb_name, data->values + i);
if (ret != 0)
{
ret = csnmp_oid_suffix (&suffix, &vb_name, data->values + i);
if (ret != 0)
{
- DEBUG ("snmp plugin: host = %s; data = %s; i = %
i
; "
+ DEBUG ("snmp plugin: host = %s; data = %s; i = %
zu
; "
"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;
@@
-1582,21
+1595,20
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
if ((value_list_tail[i] != NULL)
&& (csnmp_oid_compare (&suffix, &value_list_tail[i]->suffix) <= 0))
{
if ((value_list_tail[i] != NULL)
&& (csnmp_oid_compare (&suffix, &value_list_tail[i]->suffix) <= 0))
{
- DEBUG ("snmp plugin: host = %s; data = %s; i = %
i
; "
+ DEBUG ("snmp plugin: host = %s; data = %s; i = %
zu
; "
"Suffix is not increasing.",
host->name, data->name, i);
oid_list_todo[i] = 0;
continue;
}
"Suffix is not increasing.",
host->name, data->name, i);
oid_list_todo[i] = 0;
continue;
}
- vt =
malloc (
sizeof (*vt));
+ vt =
calloc (1,
sizeof (*vt));
if (vt == NULL)
{
if (vt == NULL)
{
- ERROR ("snmp plugin:
m
alloc failed.");
+ ERROR ("snmp plugin:
c
alloc failed.");
status = -1;
break;
}
status = -1;
break;
}
- memset (vt, 0, sizeof (*vt));
vt->value = csnmp_value_list_to_value (vb, ds->ds[i].type,
data->scale, data->shift, host->name, data->name);
vt->value = csnmp_value_list_to_value (vb, ds->ds[i].type,
data->scale, data->shift, host->name, data->name);
@@
-1659,14
+1671,14
@@
static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
{
struct snmp_pdu *req;
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
{
struct snmp_pdu *req;
- struct snmp_pdu *res;
+ struct snmp_pdu *res
= NULL
;
struct variable_list *vb;
const data_set_t *ds;
value_list_t vl = VALUE_LIST_INIT;
int status;
struct variable_list *vb;
const data_set_t *ds;
value_list_t vl = VALUE_LIST_INIT;
int status;
-
in
t i;
+
size_
t i;
DEBUG ("snmp plugin: csnmp_read_value (host = %s, data = %s)",
host->name, data->name);
DEBUG ("snmp plugin: csnmp_read_value (host = %s, data = %s)",
host->name, data->name);
@@
-1686,13
+1698,13
@@
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 %
i values, but config talks about %i
",
+ ERROR ("snmp plugin: DataSet `%s' requires %
zu values, but config talks about %zu
",
data->type, ds->ds_num, data->values_len);
return (-1);
}
vl.values_len = ds->ds_num;
data->type, ds->ds_num, data->values_len);
return (-1);
}
vl.values_len = ds->ds_num;
- vl.values =
(value_t *) malloc (sizeof (value_t
) * vl.values_len);
+ vl.values =
malloc (sizeof (*vl.values
) * vl.values_len);
if (vl.values == NULL)
return (-1);
for (i = 0; i < vl.values_len; i++)
if (vl.values == NULL)
return (-1);
for (i = 0; i < vl.values_len; i++)
@@
-1721,7
+1733,6
@@
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
for (i = 0; i < data->values_len; i++)
snmp_add_null_var (req, data->values[i].oid, data->values[i].oid_len);
for (i = 0; i < data->values_len; i++)
snmp_add_null_var (req, data->values[i].oid, data->values[i].oid_len);
- res = NULL;
status = snmp_sess_synch_response (host->sess_handle, req, &res);
if ((status != STAT_SUCCESS) || (res == NULL))
status = snmp_sess_synch_response (host->sess_handle, req, &res);
if ((status != STAT_SUCCESS) || (res == NULL))
@@
-1734,7
+1745,6
@@
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
if (res != NULL)
snmp_free_pdu (res);
if (res != NULL)
snmp_free_pdu (res);
- res = NULL;
sfree (errstr);
sfree (vl.values);
sfree (errstr);
sfree (vl.values);
@@
-1760,9
+1770,7
@@
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
data->scale, data->shift, host->name, data->name);
} /* for (res->variables) */
data->scale, data->shift, host->name, data->name);
} /* for (res->variables) */
- if (res != NULL)
- snmp_free_pdu (res);
- res = NULL;
+ snmp_free_pdu (res);
DEBUG ("snmp plugin: -> plugin_dispatch_values (&vl);");
plugin_dispatch_values (&vl);
DEBUG ("snmp plugin: -> plugin_dispatch_values (&vl);");
plugin_dispatch_values (&vl);
@@
-1774,8
+1782,6
@@
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
static int csnmp_read_host (user_data_t *ud)
{
host_definition_t *host;
static int csnmp_read_host (user_data_t *ud)
{
host_definition_t *host;
- cdtime_t time_start;
- cdtime_t time_end;
int status;
int success;
int i;
int status;
int success;
int i;
@@
-1785,8
+1791,6
@@
static int csnmp_read_host (user_data_t *ud)
if (host->interval == 0)
host->interval = plugin_get_interval ();
if (host->interval == 0)
host->interval = plugin_get_interval ();
- time_start = cdtime ();
-
if (host->sess_handle == NULL)
csnmp_host_open_session (host);
if (host->sess_handle == NULL)
csnmp_host_open_session (host);
@@
-1807,16
+1811,6
@@
static int csnmp_read_host (user_data_t *ud)
success++;
}
success++;
}
- time_end = cdtime ();
- if ((time_end - time_start) > host->interval)
- {
- WARNING ("snmp plugin: Host `%s' should be queried every %.3f "
- "seconds, but reading all values takes %.3f seconds.",
- host->name,
- CDTIME_T_TO_DOUBLE (host->interval),
- CDTIME_T_TO_DOUBLE (time_end - time_start));
- }
-
if (success == 0)
return (-1);
if (success == 0)
return (-1);