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-4.7' into collectd-4.8
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
92271b7
..
6240788
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-52,6
+52,7
@@
#if HAVE_LIBGCRYPT
# include <gcrypt.h>
#if HAVE_LIBGCRYPT
# include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
#ifndef IPV6_ADD_MEMBERSHIP
#endif
#ifndef IPV6_ADD_MEMBERSHIP
@@
-2934,6
+2935,12
@@
static int network_init (void)
return (0);
have_init = true;
return (0);
have_init = true;
+#if HAVE_LIBGCRYPT
+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+ gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0);
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
+
plugin_register_shutdown ("network", network_shutdown);
send_buffer = malloc (network_config_packet_size);
plugin_register_shutdown ("network", network_shutdown);
send_buffer = malloc (network_config_packet_size);