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 #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
4ce3f5f
..
1458a0a
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-26,6
+26,7
@@
#define _BSD_SOURCE /* For struct ip_mreq */
#include "collectd.h"
#define _BSD_SOURCE /* For struct ip_mreq */
#include "collectd.h"
+
#include "plugin.h"
#include "common.h"
#include "configfile.h"
#include "plugin.h"
#include "common.h"
#include "configfile.h"
@@
-369,9
+370,7
@@
static _Bool check_send_okay (const value_list_t *vl) /* {{{ */
static _Bool check_notify_received (const notification_t *n) /* {{{ */
{
static _Bool check_notify_received (const notification_t *n) /* {{{ */
{
- notification_meta_t *ptr;
-
- for (ptr = n->meta; ptr != NULL; ptr = ptr->next)
+ for (notification_meta_t *ptr = n->meta; ptr != NULL; ptr = ptr->next)
if ((strcmp ("network:received", ptr->name) == 0)
&& (ptr->type == NM_TYPE_BOOLEAN))
return ((_Bool) ptr->nm_value.nm_boolean);
if ((strcmp ("network:received", ptr->name) == 0)
&& (ptr->type == NM_TYPE_BOOLEAN))
return ((_Bool) ptr->nm_value.nm_boolean);
@@
-491,7
+490,7
@@
static int network_dispatch_notification (notification_t *n) /* {{{ */
} /* }}} int network_dispatch_notification */
#if HAVE_LIBGCRYPT
} /* }}} int network_dispatch_notification */
#if HAVE_LIBGCRYPT
-static
void
network_init_gcrypt (void) /* {{{ */
+static
int
network_init_gcrypt (void) /* {{{ */
{
gcry_error_t err;
{
gcry_error_t err;
@@
-499,7
+498,7
@@
static void network_init_gcrypt (void) /* {{{ */
* Because you can't know in a library whether another library has
* already initialized the library */
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
* Because you can't know in a library whether another library has
* already initialized the library */
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
- return;
+ return
(0)
;
/* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
* To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
/* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
* To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
@@
-513,7
+512,7
@@
static void network_init_gcrypt (void) /* {{{ */
if (err)
{
ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
if (err)
{
ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
-
abort (
);
+
return (-1
);
}
# endif
}
# endif
@@
-523,11
+522,12
@@
static void network_init_gcrypt (void) /* {{{ */
if (err)
{
ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
if (err)
{
ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
-
abort (
);
+
return (-1
);
}
gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
}
gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
-} /* }}} void network_init_gcrypt */
+ return (0);
+} /* }}} int network_init_gcrypt */
static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
const void *iv, size_t iv_size, const char *username)
static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
const void *iv, size_t iv_size, const char *username)
@@
-618,7
+618,6
@@
static int write_part_values (char **ret_buffer, size_t *ret_buffer_len,
value_t *pkg_values;
size_t offset;
value_t *pkg_values;
size_t offset;
- int i;
num_values = vl->values_len;
packet_len = sizeof (part_header_t) + sizeof (uint16_t)
num_values = vl->values_len;
packet_len = sizeof (part_header_t) + sizeof (uint16_t)
@@
-648,7
+647,7
@@
static int write_part_values (char **ret_buffer, size_t *ret_buffer_len,
pkg_num_values = htons ((uint16_t) vl->values_len);
pkg_num_values = htons ((uint16_t) vl->values_len);
- for (i = 0; i < num_values; i++)
+ for (i
nt i
= 0; i < num_values; i++)
{
pkg_values_types[i] = (uint8_t) ds->ds[i].type;
switch (ds->ds[i].type)
{
pkg_values_types[i] = (uint8_t) ds->ds[i].type;
switch (ds->ds[i].type)
@@
-786,7
+785,6
@@
static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len,
uint16_t tmp16;
size_t exp_size;
uint16_t tmp16;
size_t exp_size;
- size_t i;
uint16_t pkg_length;
uint16_t pkg_type;
uint16_t pkg_length;
uint16_t pkg_type;
@@
-852,7
+850,7
@@
static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len,
memcpy (pkg_values, buffer, pkg_numval * sizeof (*pkg_values));
buffer += pkg_numval * sizeof (*pkg_values);
memcpy (pkg_values, buffer, pkg_numval * sizeof (*pkg_values));
buffer += pkg_numval * sizeof (*pkg_values);
- for (i = 0; i < pkg_numval; i++)
+ for (
size_t
i = 0; i < pkg_numval; i++)
{
switch (pkg_types[i])
{
{
switch (pkg_types[i])
{
@@
-1151,7
+1149,7
@@
static int parse_part_sign_sha256 (sockent_t *se, /* {{{ */
if (memcmp (pss.hash, hash, sizeof (pss.hash)) != 0)
{
WARNING ("network plugin: Verifying HMAC-SHA-256 signature failed: "
if (memcmp (pss.hash, hash, sizeof (pss.hash)) != 0)
{
WARNING ("network plugin: Verifying HMAC-SHA-256 signature failed: "
- "Hash mismatch.
"
);
+ "Hash mismatch.
Username: %s", pss.username
);
}
else
{
}
else
{
@@
-1286,6
+1284,7
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
pea.username);
if (cypher == NULL)
{
pea.username);
if (cypher == NULL)
{
+ ERROR ("network plugin: Failed to get cypher. Username: %s", pea.username);
sfree (pea.username);
return (-1);
}
sfree (pea.username);
return (-1);
}
@@
-1301,8
+1300,8
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
if (err != 0)
{
sfree (pea.username);
if (err != 0)
{
sfree (pea.username);
- ERROR ("network plugin: gcry_cipher_decrypt returned: %s",
- gcry_strerror (err));
+ ERROR ("network plugin: gcry_cipher_decrypt returned: %s
. Username: %s
",
+ gcry_strerror (err)
, pea.username
);
return (-1);
}
return (-1);
}
@@
-1318,8
+1317,8
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
buffer + buffer_offset, payload_len);
if (memcmp (hash, pea.hash, sizeof (hash)) != 0)
{
buffer + buffer_offset, payload_len);
if (memcmp (hash, pea.hash, sizeof (hash)) != 0)
{
+ ERROR ("network plugin: Checksum mismatch. Username: %s", pea.username);
sfree (pea.username);
sfree (pea.username);
- ERROR ("network plugin: Decryption failed: Checksum mismatch.");
return (-1);
}
return (-1);
}
@@
-1398,7
+1397,7
@@
static int parse_packet (sockent_t *se, /* {{{ */
#if HAVE_LIBGCRYPT
int packet_was_signed = (flags & PP_SIGNED);
#if HAVE_LIBGCRYPT
int packet_was_signed = (flags & PP_SIGNED);
-
int packet_was_encrypted = (flags & PP_ENCRYPTED);
+ int packet_was_encrypted = (flags & PP_ENCRYPTED);
int printed_ignore_warning = 0;
#endif /* HAVE_LIBGCRYPT */
int printed_ignore_warning = 0;
#endif /* HAVE_LIBGCRYPT */
@@
-1650,9
+1649,7
@@
static void free_sockent_client (struct sockent_client *sec) /* {{{ */
static void free_sockent_server (struct sockent_server *ses) /* {{{ */
{
static void free_sockent_server (struct sockent_server *ses) /* {{{ */
{
- size_t i;
-
- for (i = 0; i < ses->fd_num; i++)
+ for (size_t i = 0; i < ses->fd_num; i++)
{
if (ses->fd[i] >= 0)
{
{
if (ses->fd[i] >= 0)
{
@@
-2066,7
+2063,12
@@
static int sockent_init_crypto (sockent_t *se) /* {{{ */
{
if (se->data.client.security_level > SECURITY_LEVEL_NONE)
{
{
if (se->data.client.security_level > SECURITY_LEVEL_NONE)
{
- network_init_gcrypt ();
+ if (network_init_gcrypt () < 0)
+ {
+ ERROR ("network plugin: Cannot configure client socket with "
+ "security: Failed to initialize crypto library.");
+ return (-1);
+ }
if ((se->data.client.username == NULL)
|| (se->data.client.password == NULL))
if ((se->data.client.username == NULL)
|| (se->data.client.password == NULL))
@@
-2086,7
+2088,12
@@
static int sockent_init_crypto (sockent_t *se) /* {{{ */
{
if (se->data.server.security_level > SECURITY_LEVEL_NONE)
{
{
if (se->data.server.security_level > SECURITY_LEVEL_NONE)
{
- network_init_gcrypt ();
+ if (network_init_gcrypt () < 0)
+ {
+ ERROR ("network plugin: Cannot configure server socket with "
+ "security: Failed to initialize crypto library.");
+ return (-1);
+ }
if (se->data.server.auth_file == NULL)
{
if (se->data.server.auth_file == NULL)
{
@@
-2139,7
+2146,7
@@
static int sockent_client_connect (sockent_t *se) /* {{{ */
static c_complain_t complaint = C_COMPLAIN_INIT_STATIC;
struct sockent_client *client;
static c_complain_t complaint = C_COMPLAIN_INIT_STATIC;
struct sockent_client *client;
- struct addrinfo *ai_list
, *ai_ptr
;
+ struct addrinfo *ai_list;
int status;
_Bool reconnect = 0;
cdtime_t now;
int status;
_Bool reconnect = 0;
cdtime_t now;
@@
-2185,7
+2192,7
@@
static int sockent_client_connect (sockent_t *se) /* {{{ */
se->node);
}
se->node);
}
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
if (client->fd >= 0) /* when we reconnect */
sockent_client_disconnect(se);
{
if (client->fd >= 0) /* when we reconnect */
sockent_client_disconnect(se);
@@
-2235,7
+2242,7
@@
static int sockent_client_connect (sockent_t *se) /* {{{ */
/* Open the file descriptors for a initialized sockent structure. */
static int sockent_server_listen (sockent_t *se) /* {{{ */
{
/* Open the file descriptors for a initialized sockent structure. */
static int sockent_server_listen (sockent_t *se) /* {{{ */
{
- struct addrinfo *ai_list
, *ai_ptr
;
+ struct addrinfo *ai_list;
int status;
const char *node;
int status;
const char *node;
@@
-2273,7
+2280,7
@@
static int sockent_server_listen (sockent_t *se) /* {{{ */
return (-1);
}
return (-1);
}
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
int *tmp;
{
int *tmp;
@@
-2328,7
+2335,6
@@
static int sockent_add (sockent_t *se) /* {{{ */
if (se->type == SOCKENT_TYPE_SERVER)
{
struct pollfd *tmp;
if (se->type == SOCKENT_TYPE_SERVER)
{
struct pollfd *tmp;
- size_t i;
tmp = realloc (listen_sockets_pollfd,
sizeof (*tmp) * (listen_sockets_num
tmp = realloc (listen_sockets_pollfd,
sizeof (*tmp) * (listen_sockets_num
@@
-2341,7
+2347,7
@@
static int sockent_add (sockent_t *se) /* {{{ */
listen_sockets_pollfd = tmp;
tmp = listen_sockets_pollfd + listen_sockets_num;
listen_sockets_pollfd = tmp;
tmp = listen_sockets_pollfd + listen_sockets_num;
- for (i = 0; i < se->data.server.fd_num; i++)
+ for (
size_t
i = 0; i < se->data.server.fd_num; i++)
{
memset (tmp + i, 0, sizeof (*tmp));
tmp[i].fd = se->data.server.fd[i];
{
memset (tmp + i, 0, sizeof (*tmp));
tmp[i].fd = se->data.server.fd[i];
@@
-2440,7
+2446,6
@@
static int network_receive (void) /* {{{ */
char buffer[network_config_packet_size];
int buffer_len;
char buffer[network_config_packet_size];
int buffer_len;
- size_t i;
int status = 0;
receive_list_entry_t *private_list_head;
int status = 0;
receive_list_entry_t *private_list_head;
@@
-2466,7
+2471,7
@@
static int network_receive (void) /* {{{ */
break;
}
break;
}
- for (i = 0; (i < listen_sockets_num) && (status > 0); i++)
+ for (
size_t
i = 0; (i < listen_sockets_num) && (status > 0); i++)
{
receive_list_entry_t *ent;
{
receive_list_entry_t *ent;
@@
-2784,11
+2789,9
@@
static void network_send_buffer_encrypted (sockent_t *se, /* {{{ */
static void network_send_buffer (char *buffer, size_t buffer_len) /* {{{ */
{
static void network_send_buffer (char *buffer, size_t buffer_len) /* {{{ */
{
- sockent_t *se;
-
DEBUG ("network plugin: network_send_buffer: buffer_len = %zu", buffer_len);
DEBUG ("network plugin: network_send_buffer: buffer_len = %zu", buffer_len);
- for (se = sending_sockets; se != NULL; se = se->next)
+ for (s
ockent_t *s
e = sending_sockets; se != NULL; se = se->next)
{
#if HAVE_LIBGCRYPT
if (se->data.client.security_level == SECURITY_LEVEL_ENCRYPT)
{
#if HAVE_LIBGCRYPT
if (se->data.client.security_level == SECURITY_LEVEL_ENCRYPT)
@@
-2889,6
+2892,11
@@
static int network_write (const data_set_t *ds, const value_list_t *vl,
{
int status;
{
int status;
+ /* listen_loop is set to non-zero in the shutdown callback, which is
+ * guaranteed to be called *after* all the write threads have been shut
+ * down. */
+ assert (listen_loop == 0);
+
if (!check_send_okay (vl))
{
#if COLLECT_DEBUG
if (!check_send_okay (vl))
{
#if COLLECT_DEBUG
@@
-3035,7
+3043,6
@@
static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */
{
sockent_t *se;
int status;
{
sockent_t *se;
int status;
- int i;
if ((ci->values_num < 1) || (ci->values_num > 2)
|| (ci->values[0].type != OCONFIG_TYPE_STRING)
if ((ci->values_num < 1) || (ci->values_num > 2)
|| (ci->values[0].type != OCONFIG_TYPE_STRING)
@@
-3057,7
+3064,7
@@
static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */
if (ci->values_num >= 2)
se->service = strdup (ci->values[1].value.string);
if (ci->values_num >= 2)
se->service = strdup (ci->values[1].value.string);
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-3121,7
+3128,6
@@
static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */
{
sockent_t *se;
int status;
{
sockent_t *se;
int status;
- int i;
if ((ci->values_num < 1) || (ci->values_num > 2)
|| (ci->values[0].type != OCONFIG_TYPE_STRING)
if ((ci->values_num < 1) || (ci->values_num > 2)
|| (ci->values[0].type != OCONFIG_TYPE_STRING)
@@
-3143,7
+3149,7
@@
static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */
if (ci->values_num >= 2)
se->service = strdup (ci->values[1].value.string);
if (ci->values_num >= 2)
se->service = strdup (ci->values[1].value.string);
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-3205,17
+3211,15
@@
static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */
static int network_config (oconfig_item_t *ci) /* {{{ */
{
static int network_config (oconfig_item_t *ci) /* {{{ */
{
- int i;
-
/* The options need to be applied first */
/* The options need to be applied first */
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
if (strcasecmp ("TimeToLive", child->key) == 0)
network_config_set_ttl (child);
}
{
oconfig_item_t *child = ci->children + i;
if (strcasecmp ("TimeToLive", child->key) == 0)
network_config_set_ttl (child);
}
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-3318,8
+3322,6
@@
static int network_notification (const notification_t *n,
static int network_shutdown (void)
{
static int network_shutdown (void)
{
- sockent_t *se;
-
listen_loop++;
/* Kill the listening thread */
listen_loop++;
/* Kill the listening thread */
@@
-3350,7
+3352,7
@@
static int network_shutdown (void)
sfree (send_buffer);
sfree (send_buffer);
- for (se = sending_sockets; se != NULL; se = se->next)
+ for (s
ockent_t *s
e = sending_sockets; se != NULL; se = se->next)
sockent_client_disconnect (se);
sockent_destroy (sending_sockets);
sockent_client_disconnect (se);
sockent_destroy (sending_sockets);
@@
-3449,7
+3451,11
@@
static int network_init (void)
have_init = 1;
#if HAVE_LIBGCRYPT
have_init = 1;
#if HAVE_LIBGCRYPT
- network_init_gcrypt ();
+ if (network_init_gcrypt () < 0)
+ {
+ ERROR ("network plugin: Failed to initialize crypto library.");
+ return (-1);
+ }
#endif
if (network_config_stats)
#endif
if (network_config_stats)