-add missing includes for FreeBSD

[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 df31250e7dd84595e034a762ac211cac1fe9f0ce..58edb9cc5402ee48cd1cd081bc51ded68ca18221 100644 (file)
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -71,7 +71,7 @@ static struct GNUNET_GNS_Handle *gh;
 static struct GNUNET_GNS_LookupRequest *lookup_handle;
 
 static struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
-static struct GNUNET_TESTBED_Operation *connect_ops[3];
+static struct GNUNET_TESTBED_Operation *topology_op;
 static struct GNUNET_CONFIGURATION_Handle *cfg_handles[3];
 static struct GNUNET_NAMESTORE_Handle *nh[3];
 
@@ -109,18 +109,17 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_TESTBED_operation_done(get_cfg_ops[c]);
         get_cfg_ops[c] = NULL;
     }
-    if (NULL != connect_ops[c])
-    {
-        GNUNET_TESTBED_operation_done(connect_ops[c]);
-        connect_ops[c] = NULL;
-    }
     if (NULL != cfg_handles[c])
     {
       GNUNET_CONFIGURATION_destroy (cfg_handles[c]);
       cfg_handles[c] = NULL;
     }
   }
-  
+  if (NULL != topology_op)
+  {
+    GNUNET_TESTBED_operation_done (topology_op);
+    topology_op = NULL;
+  }
   if (NULL != lookup_handle)
   {
     GNUNET_GNS_cancel_lookup_request (lookup_handle);
@@ -181,27 +180,11 @@ setup_end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   setup_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout during setup, test failed\n");
 
-  if (NULL != connect_ops[0])
-  {
-    GNUNET_TESTBED_operation_done (connect_ops[0]);
-    connect_ops[0] = NULL;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect peer 0 and 1\n");
-  }
-
-  if (NULL != connect_ops[1])
-  {
-    GNUNET_TESTBED_operation_done (connect_ops[1]);
-    connect_ops[1] = NULL;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect peer 1 and 2\n");
-  }
-
-  if (NULL != connect_ops[2])
+  if (NULL != topology_op)
   {
-    GNUNET_TESTBED_operation_done (connect_ops[2]);
-    connect_ops[2] = NULL;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect peer 0 and 2\n");
+    GNUNET_TESTBED_operation_done (topology_op);
+    topology_op = NULL;
   }
-
   GNUNET_SCHEDULER_shutdown ();
   ok = GNUNET_SYSERR;
 }
@@ -312,17 +295,12 @@ static void connect_peers ()
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
 
-      connect_ops[0] = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL,
-                                                      cpeers[0],
-                                                      cpeers[1]);
-
-      connect_ops[1] = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL,
-                                                      cpeers[1],
-                                                      cpeers[2]);
-
-      connect_ops[2] = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL,
-                                                      cpeers[0],
-                                                      cpeers[2]);
+      topology_op = 
+          GNUNET_TESTBED_overlay_configure_topology  (NULL, 3, cpeers, NULL,
+                                                      NULL,
+                                                      NULL,
+                                                      GNUNET_TESTBED_TOPOLOGY_RING,
+                                                      GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   }
 }
 
@@ -330,8 +308,8 @@ static int
 setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
-  struct GNUNET_CRYPTO_RsaPrivateKey *key;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *key;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
   struct in_addr *web;
   struct GNUNET_NAMESTORE_RecordData rd;
 
@@ -346,7 +324,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
     return GNUNET_SYSERR;
   }
 
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   if (NULL == key)
   {
 
@@ -358,12 +336,12 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[0])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_rsa_key_free (key);
+    GNUNET_CRYPTO_ecc_key_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
 
-  GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash);
 
   rd.expiration_time = UINT64_MAX;
@@ -375,16 +353,21 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.record_type = GNUNET_GNS_RECORD_A;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
-  GNUNET_NAMESTORE_record_create (nh[0], key, "www", &rd, NULL, NULL);
+  GNUNET_NAMESTORE_record_put_by_authority (nh[0], key, "www", 
+                                           1, &rd,
+                                           NULL, NULL);
 
   rd.data_size = strlen(TEST_DAVE_PSEU);
   rd.data = TEST_DAVE_PSEU;
   rd.record_type = GNUNET_GNS_RECORD_PSEU;
 
 
-  GNUNET_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &rd, &cont_ns, nh[0]);
+  GNUNET_NAMESTORE_record_put_by_authority (nh[0], key, 
+                                           GNUNET_GNS_MASTERZONE_STR, 
+                                           1, &rd, 
+                                           &cont_ns, nh[0]);
 
-  GNUNET_CRYPTO_rsa_key_free(key);
+  GNUNET_CRYPTO_ecc_key_free(key);
   GNUNET_free(keyfile);
   GNUNET_free(web);
   dave_is_setup = GNUNET_YES;
@@ -396,8 +379,8 @@ static int
 setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
-  struct GNUNET_CRYPTO_RsaPrivateKey *key;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *key;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
@@ -411,7 +394,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
     return GNUNET_SYSERR;
   }
 
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   if (NULL == key)
   {
 
@@ -424,12 +407,12 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[1])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_rsa_key_free (key);
+    GNUNET_CRYPTO_ecc_key_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
   
-  GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash);
 
   rd.expiration_time = UINT64_MAX;
@@ -438,9 +421,11 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
-  GNUNET_NAMESTORE_record_create (nh[1], key, "buddy", &rd, &cont_ns, nh[1]);
+  GNUNET_NAMESTORE_record_put_by_authority (nh[1], key, "buddy",
+                                           1, &rd,
+                                           &cont_ns, nh[1]);
 
-  GNUNET_CRYPTO_rsa_key_free(key);
+  GNUNET_CRYPTO_ecc_key_free(key);
   GNUNET_free(keyfile);
   bob_is_setup = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
@@ -451,7 +436,7 @@ static int
 setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
-  struct GNUNET_CRYPTO_RsaPrivateKey *key;
+  struct GNUNET_CRYPTO_EccPrivateKey *key;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   cfg_handles[2] = GNUNET_CONFIGURATION_dup (cfg);
@@ -464,7 +449,7 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
     return GNUNET_SYSERR;
   }
 
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   if (NULL == key)
   {
 
@@ -477,7 +462,7 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[2])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_rsa_key_free (key);
+    GNUNET_CRYPTO_ecc_key_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
@@ -488,19 +473,21 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
-  GNUNET_NAMESTORE_record_create (nh[2], key, "bob", &rd, &cont_ns, nh[2]);
+  GNUNET_NAMESTORE_record_put_by_authority (nh[2], key, "bob", 
+                                           1, &rd, 
+                                           &cont_ns, nh[2]);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice gns\n");
   gh = GNUNET_GNS_connect (cfg_handles[2]);
   if (NULL == gh)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to gns\n");
-    GNUNET_CRYPTO_rsa_key_free (key);
+    GNUNET_CRYPTO_ecc_key_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
 
-  GNUNET_CRYPTO_rsa_key_free (key);
+  GNUNET_CRYPTO_ecc_key_free (key);
   GNUNET_free (keyfile);
   alice_is_setup = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice  done\n");
@@ -607,7 +594,9 @@ peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
 
 void testbed_master (void *cls,
                      unsigned int num_peers,
-                     struct GNUNET_TESTBED_Peer **peers)
+                     struct GNUNET_TESTBED_Peer **peers,
+                     unsigned int links_succeeded,
+                     unsigned int links_failed)
 {
   GNUNET_assert (NULL != peers);
   cpeers = peers;
@@ -647,32 +636,11 @@ void testbed_controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformat
       break;
     case GNUNET_TESTBED_ET_CONNECT:
       connections ++;
-      if ((event->details.peer_connect.peer1 == cpeers[0]) &&
-          (event->details.peer_connect.peer2 == cpeers[1]))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 0 and 1 are connected\n");
-        GNUNET_TESTBED_operation_done (connect_ops[0]);
-        connect_ops[0] = NULL;
-      }
-
-      if ((event->details.peer_connect.peer1 == cpeers[1]) &&
-          (event->details.peer_connect.peer2 == cpeers[2]))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 1 and 2 are connected\n");
-        GNUNET_TESTBED_operation_done (connect_ops[1]);
-        connect_ops[1] = NULL;
-      }
-
-      if ((event->details.peer_connect.peer1 == cpeers[0]) &&
-          (event->details.peer_connect.peer2 == cpeers[2]))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 0 and 2 are connected\n");
-        GNUNET_TESTBED_operation_done (connect_ops[2]);
-        connect_ops[2] = NULL;
-      }
       if (connections == 3)
       {
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers connected\n");
+          GNUNET_TESTBED_operation_done (topology_op);
+          topology_op = NULL;
           all_connected ();
       }
       break;