aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2020-03-02 22:40:01 +0100
committerxrs <xrs@mail36.net>2020-05-21 22:46:48 +0200
commitc461011e4425301e9392c46d2d791ea6b54890e0 (patch)
tree7a7b1c67911f2104710b8c99e5344d829e720758 /src
parent9114113f5ebe7661078bfb1bf670b7923079af89 (diff)
downloadgnunet-c461011e4425301e9392c46d2d791ea6b54890e0.tar.gz
gnunet-c461011e4425301e9392c46d2d791ea6b54890e0.zip
fix names
Diffstat (limited to 'src')
-rw-r--r--src/cadet/test_cadeT.c2
-rw-r--r--src/cadet/test_cadeT_util.c18
-rw-r--r--src/cadet/test_cadeT_util.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/cadet/test_cadeT.c b/src/cadet/test_cadeT.c
index 014c64ebd..70f141514 100644
--- a/src/cadet/test_cadeT.c
+++ b/src/cadet/test_cadeT.c
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
78 GNUNET_TESTBED_test_run (TESTPROGAM_NAME, 78 GNUNET_TESTBED_test_run (TESTPROGAM_NAME,
79 CONFIG, 79 CONFIG,
80 REQUESTED_PEERS, 0LL, NULL, NULL, 80 REQUESTED_PEERS, 0LL, NULL, NULL,
81 connect_to_peers, NULL); 81 prepare_test, NULL);
82 return test_result; 82 return test_result;
83} 83}
84 84
diff --git a/src/cadet/test_cadeT_util.c b/src/cadet/test_cadeT_util.c
index 2db619a38..f087e624c 100644
--- a/src/cadet/test_cadeT_util.c
+++ b/src/cadet/test_cadeT_util.c
@@ -189,7 +189,6 @@ setup_listening_peer (void *cls,
189 return cadet; 189 return cadet;
190} 190}
191 191
192
193static void 192static void
194check_test_readyness (void *cls, 193check_test_readyness (void *cls,
195 struct GNUNET_TESTBED_Operation *op, 194 struct GNUNET_TESTBED_Operation *op,
@@ -204,7 +203,6 @@ check_test_readyness (void *cls,
204 run_test(); 203 run_test();
205} 204}
206 205
207
208static int 206static int
209peerinfo_complete () 207peerinfo_complete ()
210{ 208{
@@ -240,18 +238,19 @@ connect_to_service (void *cb_cls,
240} 238}
241 239
242void 240void
243connect_to_peers (void *cls, 241prepare_test (void *cls,
244 struct GNUNET_TESTBED_RunHandle *h, 242 struct GNUNET_TESTBED_RunHandle *h,
245 unsigned int num_peers, 243 unsigned int num_peers,
246 struct GNUNET_TESTBED_Peer **peers, 244 struct GNUNET_TESTBED_Peer **peers,
247 unsigned int links_succeeded, 245 unsigned int links_succeeded,
248 unsigned int links_failed) 246 unsigned int links_failed)
249{ 247{
250 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__); 248 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__);
251 249
252 GNUNET_assert (GNUNET_NO == links_failed); 250 GNUNET_assert (GNUNET_NO == links_failed);
251 GNUNET_assert (REQUESTED_PEERS == num_peers);
253 252
254 for (int i=0; i<num_peers; i++) 253 for (int i=0; i<REQUESTED_PEERS; i++)
255 { 254 {
256 test_peers[i].ready = GNUNET_NO; 255 test_peers[i].ready = GNUNET_NO;
257 test_peers[i].idx = i; 256 test_peers[i].idx = i;
@@ -268,6 +267,7 @@ connect_to_peers (void *cls,
268 &test_peers[1]); 267 &test_peers[1]);
269 268
270 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); 269 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
270
271 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, TIMEOUT_IN_SEC), 271 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, TIMEOUT_IN_SEC),
272 &timeout, NULL); 272 &timeout, NULL);
273} 273}
diff --git a/src/cadet/test_cadeT_util.h b/src/cadet/test_cadeT_util.h
index 361c10a26..b2afa34a1 100644
--- a/src/cadet/test_cadeT_util.h
+++ b/src/cadet/test_cadeT_util.h
@@ -33,6 +33,6 @@
33 33
34int test_result; 34int test_result;
35 35
36void connect_to_peers (); 36void prepare_test ();
37 37
38void run_test (); 38void run_test ();