aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_topology.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_testbed_api_topology.c')
-rw-r--r--src/testbed/test_testbed_api_topology.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index d3ce82895..a63ae1b1a 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -102,7 +102,7 @@ controller_event_cb (void *cls,
102 break; 102 break;
103 default: 103 default:
104 GNUNET_break (0); 104 GNUNET_break (0);
105 if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && 105 if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) &&
106 (NULL != event->details.operation_finished.emsg)) 106 (NULL != event->details.operation_finished.emsg))
107 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 107 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
108 "An operation failed with error: %s\n", 108 "An operation failed with error: %s\n",
@@ -110,7 +110,7 @@ controller_event_cb (void *cls,
110 result = GNUNET_SYSERR; 110 result = GNUNET_SYSERR;
111 GNUNET_SCHEDULER_cancel (shutdown_task); 111 GNUNET_SCHEDULER_cancel (shutdown_task);
112 shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); 112 shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
113 } 113 }
114} 114}
115 115
116 116
@@ -135,12 +135,14 @@ test_master (void *cls, unsigned int num_peers,
135 peers = peers_; 135 peers = peers_;
136 overlay_connects = 0; 136 overlay_connects = 0;
137 op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL, 137 op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL,
138 GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, 138 GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
139 NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END); 139 NUM_PEERS,
140 GNUNET_TESTBED_TOPOLOGY_OPTION_END);
140 GNUNET_assert (NULL != op); 141 GNUNET_assert (NULL != op);
141 shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 142 shutdown_task =
142 (GNUNET_TIME_UNIT_SECONDS, 300), 143 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
143 do_shutdown, NULL); 144 (GNUNET_TIME_UNIT_SECONDS, 300),
145 do_shutdown, NULL);
144} 146}
145 147
146 148
@@ -157,9 +159,8 @@ main (int argc, char **argv)
157 event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); 159 event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
158 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); 160 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
159 (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", 161 (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
160 "test_testbed_api.conf", 162 "test_testbed_api.conf", NUM_PEERS,
161 NUM_PEERS, event_mask, &controller_event_cb, 163 event_mask, &controller_event_cb, NULL,
162 NULL,
163 &test_master, NULL); 164 &test_master, NULL);
164 if (GNUNET_OK != result) 165 if (GNUNET_OK != result)
165 return 1; 166 return 1;