projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
1b560c4
..
58ddb22
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-490,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;
@@
-498,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
@@
-512,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
@@
-522,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)
@@
-2061,7
+2062,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))
@@
-2081,7
+2087,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)
{
@@
-2880,6
+2891,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
@@
-3434,7
+3450,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)