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
cc48215
..
0a74a19
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));
@@
-2545,6
+2546,7
@@
static int network_config_set_ttl (const oconfig_item_t *ci) /* {{{ */
return (0);
} /* }}} int network_config_set_ttl */
return (0);
} /* }}} int network_config_set_ttl */
+#if HAVE_LIBGCRYPT
static int network_config_set_string (const oconfig_item_t *ci, /* {{{ */
char **ret_string)
{
static int network_config_set_string (const oconfig_item_t *ci, /* {{{ */
char **ret_string)
{
@@
-2566,6
+2568,7
@@
static int network_config_set_string (const oconfig_item_t *ci, /* {{{ */
return (0);
} /* }}} int network_config_set_string */
return (0);
} /* }}} int network_config_set_string */
+#endif /* HAVE_LIBGCRYPT */
#if HAVE_LIBGCRYPT
static int network_config_set_security_level (oconfig_item_t *ci, /* {{{ */
#if HAVE_LIBGCRYPT
static int network_config_set_security_level (oconfig_item_t *ci, /* {{{ */
@@
-2642,6
+2645,7
@@
static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */
}
}
}
}
+#if HAVE_LIBGCRYPT
if ((se->data.server.security_level > SECURITY_LEVEL_NONE)
&& (se->data.server.auth_file == NULL))
{
if ((se->data.server.security_level > SECURITY_LEVEL_NONE)
&& (se->data.server.auth_file == NULL))
{
@@
-2651,6
+2655,7
@@
static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */
sockent_destroy (se);
return (-1);
}
sockent_destroy (se);
return (-1);
}
+#endif /* HAVE_LIBGCRYPT */
status = sockent_open (se);
if (status != 0)
status = sockent_open (se);
if (status != 0)
@@
-2718,6
+2723,7
@@
static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */
}
}
}
}
+#if HAVE_LIBGCRYPT
if ((se->data.client.security_level > SECURITY_LEVEL_NONE)
&& ((se->data.client.username == NULL)
|| (se->data.client.password == NULL)))
if ((se->data.client.security_level > SECURITY_LEVEL_NONE)
&& ((se->data.client.username == NULL)
|| (se->data.client.password == NULL)))
@@
-2728,6
+2734,7
@@
static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */
sockent_destroy (se);
return (-1);
}
sockent_destroy (se);
return (-1);
}
+#endif /* HAVE_LIBGCRYPT */
status = sockent_open (se);
if (status != 0)
status = sockent_open (se);
if (status != 0)