-introduce #define for + in GADS

[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 243b6ced0aefc65cd715915395563e7e6a445781..59d826cf9a519ea1b87ebbe35eef597849d1a037 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"
@@ -42,14 +42,9 @@
 
 #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
-#define TEST_NUM_CON 3
 
 
 /* Timeout for entire testcase */
@@ -59,22 +54,23 @@
 static int ok;
 
 /* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-GNUNET_SCHEDULER_TaskIdentifier wait_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier wait_task;
 
-struct GNUNET_CRYPTO_ShortHashCode dave_hash;
+static struct GNUNET_CRYPTO_ShortHashCode dave_hash;
 
-struct GNUNET_CRYPTO_ShortHashCode bob_hash;
+static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
 
-struct GNUNET_TESTBED_Peer **cpeers;
+static struct GNUNET_TESTBED_Peer **cpeers;
 
-struct GNUNET_GNS_Handle *gh;
-struct GNUNET_GNS_LookupRequest *lookup_handle;
+static struct GNUNET_GNS_Handle *gh;
+static struct GNUNET_GNS_LookupRequest *lookup_handle;
 
-struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
-struct GNUNET_TESTBED_Operation *connect_ops[3];
-struct GNUNET_CONFIGURATION_Handle *cfg_handles[3];
-struct GNUNET_NAMESTORE_Handle *nh[3];
+static struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
+static struct GNUNET_TESTBED_Operation *connect_ops[3];
+static struct GNUNET_CONFIGURATION_Handle *cfg_handles[3];
+static struct GNUNET_NAMESTORE_Handle *nh[3];
 
 static int dave_is_setup;
 static int bob_is_setup;
@@ -107,12 +103,12 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
     if (NULL != get_cfg_ops[c])
     {
-        GNUNET_TESTBED_operation_cancel(get_cfg_ops[c]);
+        GNUNET_TESTBED_operation_done(get_cfg_ops[c]);
         get_cfg_ops[c] = NULL;
     }
     if (NULL != connect_ops[c])
     {
-        GNUNET_TESTBED_operation_cancel(connect_ops[c]);
+        GNUNET_TESTBED_operation_done(connect_ops[c]);
         connect_ops[c] = NULL;
     }
     if (NULL != cfg_handles[c])
@@ -273,7 +269,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");
@@ -332,6 +327,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);
@@ -345,7 +342,8 @@ 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_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &rd, &cont_ns, nh[0]);
 
   GNUNET_CRYPTO_rsa_key_free(key);
   GNUNET_free(keyfile);
@@ -395,6 +393,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;
@@ -444,6 +443,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;
@@ -492,7 +492,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);
@@ -509,7 +508,6 @@ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
     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");
@@ -517,7 +515,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);