WiP

[oweals/gnunet.git] / src / dht / test_dht_twopeer_put_get.c

diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c
index 1d0af082b87bd9de38e8901cafeb45517fd36c84..40a1652362469365c6ab5cde32ca929e07d290c4 100644 (file)
--- a/src/dht/test_dht_twopeer_put_get.c
+++ b/src/dht/test_dht_twopeer_put_get.c
@@ -215,20 +215,30 @@ void get_result_iterator (void *cls,
                          const struct GNUNET_PeerIdentity * const *put_path,
                          enum GNUNET_BLOCK_Type type,
                           size_t size,
-                          const void *data)
+                          const void *result_data)
 {
   GNUNET_HashCode original_key; /* Key data was stored data under */
   char original_data[4]; /* Made up data that was stored */
   memset(&original_key, 42, sizeof(GNUNET_HashCode)); /* Set the key to what it was set to previously */
   memset(original_data, 43, sizeof(original_data));
 
-  if ((0 != memcmp(&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp(original_data, data, sizeof(original_data))))
+#if DNS
+  if ((0 != memcmp(&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || (0 != memcmp((char *)&data, result_data, sizeof(original_data))))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Key or data is not the same as was inserted!\n");
+      GNUNET_SCHEDULER_cancel(die_task);
+      GNUNET_SCHEDULER_add_now(&end_badly, "key or data mismatch in get response!\n");
+      return;
+    }
+#else
+  if ((0 != memcmp(&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp(original_data, result_data, sizeof(original_data))))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Key or data is not the same as was inserted!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Key or data is not the same as was inserted!\n");
     GNUNET_SCHEDULER_cancel(die_task);
     GNUNET_SCHEDULER_add_now(&end_badly, "key or data mismatch in get response!\n");
     return;
   }
+#endif
 
   GNUNET_SCHEDULER_cancel(die_task);
   GNUNET_DHT_get_stop(global_get_handle);
@@ -478,7 +488,13 @@ peers_started_callback (void *cls,
       if ((pg != NULL)) /* Sanity check */
         {
           /* Connect peers in a "straight line" topology, return the number of expected connections */
-          expected_connections = GNUNET_TESTING_connect_topology (pg, GNUNET_TESTING_TOPOLOGY_LINE, GNUNET_TESTING_TOPOLOGY_OPTION_ALL, 0.0, NULL, NULL);
+          expected_connections = GNUNET_TESTING_connect_topology (pg,
+                                                                  GNUNET_TESTING_TOPOLOGY_LINE,
+                                                                  GNUNET_TESTING_TOPOLOGY_OPTION_ALL,
+                                                                  0.0,
+                                                                  TIMEOUT,
+                                                                  12,
+                                                                  NULL, NULL);
         }
 
       /* Cancel current timeout fail task */
@@ -522,8 +538,17 @@ run (void *cls,
   /* Start num_peers peers, call peers_started_callback on peer start, topology_callback on peer connect */
   /* Read the API documentation for other parameters! */
   pg = GNUNET_TESTING_daemons_start (cfg,
-                                     num_peers, TIMEOUT, NULL, NULL, &peers_started_callback, NULL,
-                                     &topology_callback, NULL, NULL);
+                                     num_peers,
+                                     2,
+                                     2,
+                                     TIMEOUT,
+                                     NULL,
+                                     NULL,
+                                     &peers_started_callback,
+                                     NULL,
+                                     &topology_callback,
+                                     NULL,
+                                     NULL);
 
 }