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.6' into collectd-4.7
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
67a7c3c
..
0e246c2
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-19,6
+19,8
@@
* Florian octo Forster <octo at verplant.org>
**/
* Florian octo Forster <octo at verplant.org>
**/
+#define _BSD_SOURCE /* For struct ip_mreq */
+
#include "collectd.h"
#include "plugin.h"
#include "common.h"
#include "collectd.h"
#include "plugin.h"
#include "common.h"
@@
-2259,9
+2261,6
@@
static void networt_send_buffer_encrypted (sockent_t *se, /* {{{ */
gcry_error_t err;
gcry_cipher_hd_t cypher;
gcry_error_t err;
gcry_cipher_hd_t cypher;
- DEBUG ("network plugin: networt_send_buffer_encrypted: "
- "buffer_size = %zu;", buffer_size);
-
/* Initialize the header fields */
memset (&pea, 0, sizeof (pea));
pea.head.type = htons (TYPE_ENCR_AES256);
/* Initialize the header fields */
memset (&pea, 0, sizeof (pea));
pea.head.type = htons (TYPE_ENCR_AES256);
@@
-2280,6
+2279,8
@@
static void networt_send_buffer_encrypted (sockent_t *se, /* {{{ */
- sizeof (pea.hash);
assert (buffer_size <= sizeof (buffer));
- sizeof (pea.hash);
assert (buffer_size <= sizeof (buffer));
+ DEBUG ("network plugin: networt_send_buffer_encrypted: "
+ "buffer_size = %zu;", buffer_size);
pea.head.length = htons ((uint16_t) (PART_ENCRYPTION_AES256_SIZE
+ username_len + in_buffer_size));
pea.head.length = htons ((uint16_t) (PART_ENCRYPTION_AES256_SIZE
+ username_len + in_buffer_size));
@@
-2767,7
+2768,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 */