projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectdmon: define PREFIX and LOCALSTATEDIR
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
58ddb22
..
51c0757
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-29,7
+29,6
@@
#include "plugin.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
-#include "configfile.h"
#include "utils_fbhash.h"
#include "utils_cache.h"
#include "utils_complain.h"
#include "utils_fbhash.h"
#include "utils_cache.h"
#include "utils_complain.h"
@@
-1149,7
+1148,7
@@
static int parse_part_sign_sha256 (sockent_t *se, /* {{{ */
if (memcmp (pss.hash, hash, sizeof (pss.hash)) != 0)
{
WARNING ("network plugin: Verifying HMAC-SHA-256 signature failed: "
if (memcmp (pss.hash, hash, sizeof (pss.hash)) != 0)
{
WARNING ("network plugin: Verifying HMAC-SHA-256 signature failed: "
- "Hash mismatch.
"
);
+ "Hash mismatch.
Username: %s", pss.username
);
}
else
{
}
else
{
@@
-1284,6
+1283,7
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
pea.username);
if (cypher == NULL)
{
pea.username);
if (cypher == NULL)
{
+ ERROR ("network plugin: Failed to get cypher. Username: %s", pea.username);
sfree (pea.username);
return (-1);
}
sfree (pea.username);
return (-1);
}
@@
-1299,8
+1299,8
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
if (err != 0)
{
sfree (pea.username);
if (err != 0)
{
sfree (pea.username);
- ERROR ("network plugin: gcry_cipher_decrypt returned: %s",
- gcry_strerror (err));
+ ERROR ("network plugin: gcry_cipher_decrypt returned: %s
. Username: %s
",
+ gcry_strerror (err)
, pea.username
);
return (-1);
}
return (-1);
}
@@
-1316,8
+1316,8
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
buffer + buffer_offset, payload_len);
if (memcmp (hash, pea.hash, sizeof (hash)) != 0)
{
buffer + buffer_offset, payload_len);
if (memcmp (hash, pea.hash, sizeof (hash)) != 0)
{
+ ERROR ("network plugin: Checksum mismatch. Username: %s", pea.username);
sfree (pea.username);
sfree (pea.username);
- ERROR ("network plugin: Decryption failed: Checksum mismatch.");
return (-1);
}
return (-1);
}
@@
-1396,7
+1396,7
@@
static int parse_packet (sockent_t *se, /* {{{ */
#if HAVE_LIBGCRYPT
int packet_was_signed = (flags & PP_SIGNED);
#if HAVE_LIBGCRYPT
int packet_was_signed = (flags & PP_SIGNED);
-
int packet_was_encrypted = (flags & PP_ENCRYPTED);
+ int packet_was_encrypted = (flags & PP_ENCRYPTED);
int printed_ignore_warning = 0;
#endif /* HAVE_LIBGCRYPT */
int printed_ignore_warning = 0;
#endif /* HAVE_LIBGCRYPT */