* topology:
* alice <----> bob <-----> dave
*
- * alice queries for www.buddy.bob.gnunet
+ * alice queries for www.buddy.bob.gnu
*
*/
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_disk_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
#include "gnunet_core_service.h"
#include "gnunet_dht_service.h"
#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.gnu"
#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 */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
+#define SETUP_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
/* Global return value (0 for success, anything else for failure) */
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 GNUNET_SCHEDULER_TaskIdentifier setup_task;
-struct GNUNET_CRYPTO_ShortHashCode bob_hash;
+static struct GNUNET_CRYPTO_ShortHashCode dave_hash;
-const struct GNUNET_CONFIGURATION_Handle *alice_cfg;
+static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-struct GNUNET_TESTBED_Peer **cpeers;
+static struct GNUNET_TESTBED_Peer **cpeers;
-struct GNUNET_GNS_Handle *gh;
+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];
+static struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
+static struct GNUNET_TESTBED_Operation *topology_op;
+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;
+static int alice_is_setup;
/**
* Check if the get_handle is being used, if so stop the request. Either
for (c = 0; c < 3; c++)
{
+ if (NULL != nh[c])
+ {
+ GNUNET_NAMESTORE_disconnect(nh[c]);
+ nh[c] = NULL;
+ }
+
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])
+ if (NULL != cfg_handles[c])
{
- GNUNET_TESTBED_operation_cancel(connect_ops[c]);
- connect_ops[c] = NULL;
+ 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);
+ lookup_handle = NULL;
+ }
if (NULL != gh)
{
- GNUNET_GNS_disconnect (gh);
- gh = NULL;
+ GNUNET_GNS_disconnect(gh);
+ gh = NULL;
}
-
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test failed \n");
- GNUNET_break (0);
GNUNET_SCHEDULER_shutdown ();
ok = 1;
}
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finished\n");
+ int c;
if (GNUNET_SCHEDULER_NO_TASK != die_task)
{
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test successful \n");
- GNUNET_break (0);
+ for (c = 0; c < 3; c++)
+ {
+ if (NULL != nh[c])
+ {
+ GNUNET_NAMESTORE_disconnect(nh[c]);
+ nh[c] = NULL;
+ }
+ if (NULL != cfg_handles[c])
+ {
+ GNUNET_CONFIGURATION_destroy (cfg_handles[c]);
+ cfg_handles[c] = NULL;
+ }
+ }
+
+ if (NULL != gh)
+ {
+ GNUNET_GNS_disconnect(gh);
+ gh = NULL;
+ }
+
+ if (0 == ok)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test ended successful\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test failed\n");
GNUNET_SCHEDULER_shutdown ();
- ok = 0;
+}
+
+static void
+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 != topology_op)
+ {
+ GNUNET_TESTBED_operation_done (topology_op);
+ topology_op = NULL;
+ }
+ GNUNET_SCHEDULER_shutdown ();
+ ok = GNUNET_SYSERR;
}
static void
static void
disconnect_ns (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+
GNUNET_NAMESTORE_disconnect (cls);
+ if (cls == nh[0])
+ nh[0] = NULL;
+ if (cls == nh[1])
+ nh[1] = NULL;
+ if (cls == nh[2])
+ nh[2] = NULL;
}
"%s correctly resolved to %s!\n", TEST_DOMAIN, string_val);
ok = 0;
}
+ GNUNET_free (string_val);
}
}
- GNUNET_GNS_disconnect(gh);
- gh = NULL;
end_now ();
}
+
static void
commence_testing(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static int wait = 0;
+
wait++;
- if ((ZONE_PUT_WAIT_TIME.rel_value / 1000) == wait)
+ if ((ZONE_PUT_WAIT_TIME.rel_value_us / 1000LL / 1000LL) == wait)
{
fprintf (stderr, "\n");
wait_task = GNUNET_SCHEDULER_NO_TASK;
- gh = GNUNET_GNS_connect(alice_cfg);
-
- GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+ lookup_handle = GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
}
}
+
void
all_connected ()
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Created all connections! Waiting for PUTs\n");
+ if (GNUNET_SCHEDULER_NO_TASK != setup_task)
+ {
+ GNUNET_SCHEDULER_cancel (setup_task);
+ setup_task = GNUNET_SCHEDULER_NO_TASK;
+ }
wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &commence_testing, NULL);
}
{
static int started;
started ++;
-
if (3 == started)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
- connect_ops[0] = GNUNET_TESTBED_overlay_connect (NULL,
- cpeers[0],
- cpeers[1]);
-
- connect_ops[1] = GNUNET_TESTBED_overlay_connect (NULL,
- cpeers[1],
- cpeers[2]);
-
- connect_ops[2] = GNUNET_TESTBED_overlay_connect (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);
}
}
static int
setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
- struct GNUNET_NAMESTORE_Handle *ns;
char* keyfile;
- struct GNUNET_CRYPTO_RsaPrivateKey *key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
struct in_addr *web;
struct GNUNET_NAMESTORE_RecordData rd;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up dave\n");
- GNUNET_assert (NULL != cfg);
+ cfg_handles[0] = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_assert (NULL != cfg_handles[0]);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
-
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+ nh[0] = GNUNET_NAMESTORE_connect (cfg_handles[0]);
+ if (NULL == nh[0])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_rsa_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (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);
rd.data = web;
- rd.record_type = GNUNET_GNS_RECORD_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
- GNUNET_NAMESTORE_record_create (ns, 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;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
+
- GNUNET_NAMESTORE_record_create (ns, key, "+", &rd, &cont_ns, ns);
+ 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_free(key);
GNUNET_free(keyfile);
GNUNET_free(web);
+ dave_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up dave done\n");
return GNUNET_OK;
}
static int
setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
- struct GNUNET_NAMESTORE_Handle *ns;
char* keyfile;
- struct GNUNET_CRYPTO_RsaPrivateKey *key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
struct GNUNET_NAMESTORE_RecordData rd;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
- GNUNET_assert (NULL != cfg);
+ cfg_handles[1] = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_assert (NULL != cfg_handles[1]);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
return GNUNET_SYSERR;
}
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+ nh[1] = GNUNET_NAMESTORE_connect (cfg_handles[1]);
+ if (NULL == nh[1])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_rsa_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
-
- GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (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;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
- GNUNET_NAMESTORE_record_create (ns, key, "buddy", &rd, &cont_ns, ns);
+ GNUNET_NAMESTORE_record_put_by_authority (nh[1], key, "buddy",
+ 1, &rd,
+ &cont_ns, nh[1]);
- GNUNET_CRYPTO_rsa_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
+ bob_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
return GNUNET_OK;
}
static int
setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
- struct GNUNET_NAMESTORE_Handle *ns;
char* keyfile;
- struct GNUNET_CRYPTO_RsaPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
struct GNUNET_NAMESTORE_RecordData rd;
-
+ cfg_handles[2] = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_assert (NULL != cfg);
- alice_cfg = cfg;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
return GNUNET_SYSERR;
}
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
if (NULL == key)
{
return GNUNET_SYSERR;
}
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+ nh[2] = GNUNET_NAMESTORE_connect (cfg_handles[2]);
+ if (NULL == nh[2])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_rsa_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
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;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
- GNUNET_NAMESTORE_record_create (ns, key, "bob", &rd, &cont_ns, ns);
+ GNUNET_NAMESTORE_record_put_by_authority (nh[2], key, "bob",
+ 1, &rd,
+ &cont_ns, nh[2]);
- GNUNET_CRYPTO_rsa_key_free(key);
- GNUNET_free(keyfile);
+ 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_free (key);
+ GNUNET_free (keyfile);
+ return GNUNET_SYSERR;
+ }
+
+ GNUNET_free (key);
+ GNUNET_free (keyfile);
+ alice_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice done\n");
return GNUNET_OK;
}
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
+
+/**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed; will be NULL if the
+ * operation is successfull
+ */
+static void
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
+ const struct GNUNET_TESTBED_PeerInformation *pinfo,
+ const char *emsg)
+{
+ int res;
+ GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+ if (GNUNET_NO == dave_is_setup)
+ res = setup_dave (pinfo->result.cfg);
+ else if (GNUNET_NO == bob_is_setup)
+ res = setup_bob (pinfo->result.cfg);
+ 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;
+ if (GNUNET_SYSERR == res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup peer \n");
+ end_badly_now();
+ }
+ else
+ connect_peers ();
+ /*if (get_cfg_ops[0] == op)
+ {
+ GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+ res = setup_dave (pinfo->result.cfg);
+ GNUNET_TESTBED_operation_done (get_cfg_ops[0]);
+ get_cfg_ops[0] = NULL;
+ if (GNUNET_SYSERR == res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
+ end_badly_now();
+ }
+ else
+ {
+ connect_peers ();
+ }
+ }
+ else if (get_cfg_ops[1] == op)
+ {
+ GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+ res = setup_bob (pinfo->result.cfg);
+ GNUNET_TESTBED_operation_done (get_cfg_ops[1]);
+ get_cfg_ops[1] = NULL;
+ if (GNUNET_SYSERR == res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
+ end_badly_now();
+ }
+ else
+ {
+ connect_peers ();
+ }
+ }
+ else if (get_cfg_ops[2] == op)
+ {
+ GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+ res = setup_alice (pinfo->result.cfg);
+ GNUNET_TESTBED_operation_done (get_cfg_ops[2]);
+ get_cfg_ops[2] = NULL;
+ if (GNUNET_SYSERR == res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
+ end_badly_now();
+ }
+ else
+ {
+ connect_peers ();
+ }
+ }*/
+}
+
+
void testbed_master (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
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;
+ setup_task = GNUNET_SCHEDULER_add_delayed (SETUP_TIMEOUT, &setup_end_badly, NULL);
+
/* peer 0: dave */
GNUNET_assert (NULL != peers[0]);
- get_cfg_ops[0] = GNUNET_TESTBED_peer_get_information (peers[0], GNUNET_TESTBED_PIT_CONFIGURATION);
+ get_cfg_ops[0] = GNUNET_TESTBED_peer_get_information (peers[0],
+ GNUNET_TESTBED_PIT_CONFIGURATION,
+ &peerinfo_cb, NULL);
/* peer 1: bob */
GNUNET_assert (NULL != peers[1]);
- get_cfg_ops[1] = GNUNET_TESTBED_peer_get_information (peers[1], GNUNET_TESTBED_PIT_CONFIGURATION);
+ get_cfg_ops[1] = GNUNET_TESTBED_peer_get_information (peers[1],
+ GNUNET_TESTBED_PIT_CONFIGURATION,
+ &peerinfo_cb, NULL );
/* peer 2: alice */
GNUNET_assert (NULL != peers[2]);
- get_cfg_ops[2] = GNUNET_TESTBED_peer_get_information (peers[2], GNUNET_TESTBED_PIT_CONFIGURATION);
+ get_cfg_ops[2] = GNUNET_TESTBED_peer_get_information (peers[2],
+ GNUNET_TESTBED_PIT_CONFIGURATION,
+ &peerinfo_cb, NULL);
}
void testbed_controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
{
static int connections = 0;
- int res;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback of type: %u %p \n", event->type, cls);
switch (event->type)
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
- if (get_cfg_ops[0] == event->details.operation_finished.operation)
- {
- res = setup_dave (event->details.operation_finished.op_result.cfg);
- get_cfg_ops[0] = NULL;
- if (GNUNET_SYSERR == res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
- end_badly_now();
- }
- else
- {
- connect_peers ();
- }
- }
- else if (get_cfg_ops[1] == event->details.operation_finished.operation)
- {
- res = setup_bob (event->details.operation_finished.op_result.cfg);
- get_cfg_ops[1] = NULL;
- if (GNUNET_SYSERR == res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
- end_badly_now();
- }
- else
- {
- connect_peers ();
- }
- }
- else if (get_cfg_ops[2] == event->details.operation_finished.operation)
- {
- res = setup_alice (event->details.operation_finished.op_result.cfg);
- get_cfg_ops[2] = NULL;
- if (GNUNET_SYSERR == res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup dave \n");
- end_badly_now();
- }
- else
- {
- connect_peers ();
- }
- }
+ /* This part will still be called when
+ GNUNET_TESTBED_peer_get_information() succeeds. However, the code is
+ now more relevant in operation completion callback */
break;
case GNUNET_TESTBED_ET_CONNECT:
connections ++;
if (connections == 3)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers connected\n");
- connect_ops[0] = NULL;
- connect_ops[1] = NULL;
- connect_ops[2] = NULL;
+ GNUNET_TESTBED_operation_done (topology_op);
+ topology_op = NULL;
all_connected ();
}
break;
main (int argc, char *argv[])
{
uint64_t event_mask;
-
ok = 0;
event_mask = 0;
event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
- GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf",
- 3, event_mask,
- &testbed_controller_cb, NULL,
- &testbed_master, NULL);
+ (void) GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf",
+ 3, event_mask,
+ &testbed_controller_cb, NULL,
+ &testbed_master, NULL);
if (GNUNET_SYSERR == ok)
return 1;
return 0;
}
/* end of test_gns_dht_three_peers.c */
+
projects / oweals / gnunet.git / blobdiff