projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
0a74a19
..
cf67c2b
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-51,6
+51,7
@@
#if HAVE_LIBGCRYPT
# include <gcrypt.h>
#if HAVE_LIBGCRYPT
# include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
/* 1500 - 40 - 8 = Ethernet packet - IPv6 header - UDP header */
#endif
/* 1500 - 40 - 8 = Ethernet packet - IPv6 header - UDP header */
@@
-2768,7
+2769,7
@@
static int network_config_set_cache_flush (const oconfig_item_t *ci) /* {{{ */
tmp = (int) ci->values[0].value.number;
if (tmp > 0)
tmp = (int) ci->values[0].value.number;
if (tmp > 0)
-
network_config_tt
l = tmp;
+
cache_flush_interva
l = tmp;
return (0);
} /* }}} int network_config_set_cache_flush */
return (0);
} /* }}} int network_config_set_cache_flush */
@@
-2937,6
+2938,12
@@
static int network_init (void)
if (cache_flush_last != 0)
return (0);
if (cache_flush_last != 0)
return (0);
+#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);
network_init_buffer ();
plugin_register_shutdown ("network", network_shutdown);
network_init_buffer ();