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];
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);
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;
}
{
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);
}
}
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;
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
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;
GNUNET_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &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;
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");
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
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;
GNUNET_NAMESTORE_record_create (nh[1], key, "buddy", &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");
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);
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
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;
}
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");
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;
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;