-fix

[oweals/gnunet.git] / src / gns / test_gns_dht_three_peers.c

diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 204cbc29e76b2fefbc2a788689d85b8639802e5c..7f501231142173e7b4acbe538124acca9bfd03bd 100644 (file)
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -24,7 +24,7 @@
  * topology:
  * alice <----> bob <-----> dave
  *
- * alice queries for www.buddy.bob.gnunet
+ * alice queries for www.buddy.bob.gads
  *
  */
 #include "platform.h"
@@ -40,12 +40,12 @@
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
 
-#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
 
 /* If number of peers not in config file, use this number */
 #define DEFAULT_NUM_PEERS 2
 
-#define TEST_DOMAIN "www.buddy.bob.gnunet"
+#define TEST_DOMAIN "www.buddy.bob.gads"
 #define TEST_IP "1.1.1.1"
 #define TEST_DAVE_PSEU "hagbard"
 #define TEST_NUM_PEERS 3
@@ -134,7 +134,6 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test failed \n");
-  GNUNET_break (0);
   GNUNET_SCHEDULER_shutdown ();
   ok = 1;
 }
@@ -274,7 +273,6 @@ static void connect_peers ()
 {
   static int started;
   started ++;
-GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "C \n");
   if (3 == started)
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
@@ -333,6 +331,8 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash);
 
+  rd.expiration_time = UINT64_MAX;
+
   web = GNUNET_malloc(sizeof(struct in_addr));
   GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP, web));
   rd.data_size = sizeof(struct in_addr);
@@ -346,6 +346,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.data = TEST_DAVE_PSEU;
   rd.record_type = GNUNET_GNS_RECORD_PSEU;
 
+
   GNUNET_NAMESTORE_record_create (nh[0], key, "+", &rd, &cont_ns, nh[0]);
 
   GNUNET_CRYPTO_rsa_key_free(key);
@@ -396,6 +397,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
   GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash);
 
+  rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &dave_hash;
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
@@ -445,6 +447,7 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
     return GNUNET_SYSERR;
   }
 
+  rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
@@ -493,7 +496,6 @@ peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
             const char *emsg)
 {
   int res;
-GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
   GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
   if (GNUNET_NO == dave_is_setup)
     res = setup_dave (pinfo->result.cfg);
@@ -502,9 +504,14 @@ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
   else
     res = setup_alice (pinfo->result.cfg);
   
+  if (get_cfg_ops[0] == op)
+    get_cfg_ops[0] = NULL;
+  else if (get_cfg_ops[1] == op)
+    get_cfg_ops[1] = NULL;
+  else
+    get_cfg_ops[2] = NULL;
   GNUNET_TESTBED_operation_done (op);
   op = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "A \n");
   if (GNUNET_SYSERR == res)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup peer \n");
@@ -512,7 +519,6 @@ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
   }
   else
     connect_peers ();
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "B \n");
   /*if (get_cfg_ops[0] == op)
   {
     GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);