From a86d442e62e83ef0a9744ea32ad8e09251096675 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 14 Sep 2011 15:56:39 +0000 Subject: [PATCH] Added check of size of results --- src/dht/test_dht_twopeer_get_put.c | 8 +++++--- src/dht/test_dht_twopeer_put_get.c | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/dht/test_dht_twopeer_get_put.c b/src/dht/test_dht_twopeer_get_put.c index a629cdfd8..4a04027bb 100644 --- a/src/dht/test_dht_twopeer_get_put.c +++ b/src/dht/test_dht_twopeer_get_put.c @@ -44,7 +44,7 @@ #include "gnunet_signatures.h" /* DEFINES */ -#define VERBOSE GNUNET_YES +#define VERBOSE GNUNET_NO /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40) @@ -227,7 +227,8 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, memset (original_data, 43, sizeof (original_data)); #if DNS - if ((0 != memcmp (&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || + if ((sizeof (original_data) != size) || + (0 != memcmp (&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || (0 != memcmp ((char *) &data, result_data, sizeof (original_data)))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -238,7 +239,8 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, return; } #else - if ((0 != memcmp (&original_key, key, sizeof (GNUNET_HashCode))) || + if ((sizeof (original_data) != size) || + (0 != memcmp (&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp (original_data, result_data, sizeof (original_data)))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c index 8e77837b2..82966e944 100644 --- a/src/dht/test_dht_twopeer_put_get.c +++ b/src/dht/test_dht_twopeer_put_get.c @@ -224,7 +224,8 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, memset (original_data, 43, sizeof (original_data)); #if DNS - if ((0 != memcmp (&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || + if ((sizeof (original_data) != size) || + (0 != memcmp (&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || (0 != memcmp ((char *) &data, result_data, sizeof (original_data)))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -235,7 +236,8 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, return; } #else - if ((0 != memcmp (&original_key, key, sizeof (GNUNET_HashCode))) || + if ((sizeof (original_data) != size) || + (0 != memcmp (&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp (original_data, result_data, sizeof (original_data)))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, -- 2.25.1