-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 49c94571f009bc76a35f9ea1a12eccb5bab468f4..58edb9cc5402ee48cd1cd081bc51ded68ca18221 100644 (file)
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -308,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;
 
@@ -324,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)
   {
 
@@ -336,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;
@@ -353,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;
@@ -374,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");
@@ -389,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)
   {
 
@@ -402,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;
@@ -416,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");
@@ -429,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);
@@ -442,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)
   {
 
@@ -455,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;
   }
@@ -466,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");
@@ -585,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;