[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25711 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25711 - gnunet/src/gns |
Date: |
Mon, 7 Jan 2013 17:46:41 +0100 |
Author: harsha
Date: 2013-01-07 17:46:41 +0100 (Mon, 07 Jan 2013)
New Revision: 25711
Modified:
gnunet/src/gns/test_gns_dht_three_peers.c
Log:
- use GNUNET_TESTBED_overlay_configure_topology(); simplifies and also ensures
that overlay connect operations continue when they are done 1 at a time.
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2013-01-07 16:37:24 UTC (rev
25710)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2013-01-07 16:46:41 UTC (rev
25711)
@@ -71,7 +71,7 @@
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 @@
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_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout during setup, test failed\n");
- if (NULL != connect_ops[0])
+ if (NULL != topology_op)
{
- 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");
+ GNUNET_TESTBED_operation_done (topology_op);
+ topology_op = NULL;
}
-
- 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])
- {
- 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_SCHEDULER_shutdown ();
ok = GNUNET_SYSERR;
}
@@ -312,17 +295,11 @@
{
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,
+
GNUNET_TESTBED_TOPOLOGY_RING,
+
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
}
}
@@ -647,32 +624,11 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25711 - gnunet/src/gns,
gnunet <=