diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
commit | 30c5c323f28ade8a1e7c6c593778793e44accb3a (patch) | |
tree | 845955ec895d221338b44f0cadce7932932e78cc /src/testbed/test_testbed_api_topology_clique.c | |
parent | 43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff) | |
download | gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip |
- indent
Diffstat (limited to 'src/testbed/test_testbed_api_topology_clique.c')
-rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 0304fe33e..eb6254b10 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -105,7 +105,7 @@ controller_event_cb (void *cls, | |||
105 | result = GNUNET_SYSERR; | 105 | result = GNUNET_SYSERR; |
106 | GNUNET_SCHEDULER_cancel (shutdown_task); | 106 | GNUNET_SCHEDULER_cancel (shutdown_task); |
107 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 107 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | 111 | ||
@@ -129,16 +129,16 @@ test_master (void *cls, unsigned int num_peers, | |||
129 | GNUNET_assert (NULL != peers_[peer]); | 129 | GNUNET_assert (NULL != peers_[peer]); |
130 | peers = peers_; | 130 | peers = peers_; |
131 | overlay_connects = 0; | 131 | overlay_connects = 0; |
132 | op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, | 132 | op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL, |
133 | NULL, | ||
134 | GNUNET_TESTBED_TOPOLOGY_CLIQUE, | 133 | GNUNET_TESTBED_TOPOLOGY_CLIQUE, |
135 | /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */ | 134 | /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */ |
136 | /* NUM_PEERS, */ | 135 | /* NUM_PEERS, */ |
137 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); | 136 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); |
138 | GNUNET_assert (NULL != op); | 137 | GNUNET_assert (NULL != op); |
139 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 138 | shutdown_task = |
140 | (GNUNET_TIME_UNIT_SECONDS, 300), | 139 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
141 | do_shutdown, NULL); | 140 | (GNUNET_TIME_UNIT_SECONDS, 300), |
141 | do_shutdown, NULL); | ||
142 | } | 142 | } |
143 | 143 | ||
144 | 144 | ||
@@ -155,9 +155,8 @@ main (int argc, char **argv) | |||
155 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 155 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
156 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 156 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
157 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", | 157 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
158 | "test_testbed_api.conf", | 158 | "test_testbed_api.conf", NUM_PEERS, |
159 | NUM_PEERS, event_mask, &controller_event_cb, | 159 | event_mask, &controller_event_cb, NULL, |
160 | NULL, | ||
161 | &test_master, NULL); | 160 | &test_master, NULL); |
162 | if (GNUNET_OK != result) | 161 | if (GNUNET_OK != result) |
163 | return 1; | 162 | return 1; |