[GNUnet-SVN] r16850 - gnunet/src/dht

[gnunet]

Author: bartpolot
Date: 2011-09-14 17:56:39 +0200 (Wed, 14 Sep 2011)
New Revision: 16850

Modified:
   gnunet/src/dht/test_dht_twopeer_get_put.c
   gnunet/src/dht/test_dht_twopeer_put_get.c
Log:
Added check of size of results


Modified: gnunet/src/dht/test_dht_twopeer_get_put.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_get_put.c   2011-09-14 15:55:43 UTC (rev 
16849)
+++ gnunet/src/dht/test_dht_twopeer_get_put.c   2011-09-14 15:56:39 UTC (rev 
16850)
@@ -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 @@
   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 @@
     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,

Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c   2011-09-14 15:55:43 UTC (rev 
16849)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c   2011-09-14 15:56:39 UTC (rev 
16850)
@@ -224,7 +224,8 @@
   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 @@
     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,