diff options
author | Julius Bünger <buenger@mytum.de> | 2018-04-04 08:45:17 +0200 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2018-04-04 08:47:00 +0200 |
commit | ea51d048c44b83c679ba22978a3a4b0ff1bf12b5 (patch) | |
tree | 26240905b7827cc5abe3af475f4aa4d4abe8e766 /src/rps/test_rps.c | |
parent | 2b07d8d5faadac239fee2207b0947a8a8997a124 (diff) | |
download | gnunet-ea51d048c44b83c679ba22978a3a4b0ff1bf12b5.tar.gz gnunet-ea51d048c44b83c679ba22978a3a4b0ff1bf12b5.zip |
rps tests: connect to all services
Diffstat (limited to 'src/rps/test_rps.c')
-rw-r--r-- | src/rps/test_rps.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index 05902f037..660ac541a 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c | |||
@@ -2311,7 +2311,6 @@ run (void *cls, | |||
2311 | { | 2311 | { |
2312 | unsigned int i; | 2312 | unsigned int i; |
2313 | struct OpListEntry *entry; | 2313 | struct OpListEntry *entry; |
2314 | uint32_t num_mal_peers; | ||
2315 | 2314 | ||
2316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "RUN was called\n"); | 2315 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "RUN was called\n"); |
2317 | 2316 | ||
@@ -2352,24 +2351,19 @@ run (void *cls, | |||
2352 | } | 2351 | } |
2353 | 2352 | ||
2354 | /* Bring peers up */ | 2353 | /* Bring peers up */ |
2355 | num_mal_peers = round (portion * num_peers); | ||
2356 | GNUNET_assert (num_peers == n_peers); | 2354 | GNUNET_assert (num_peers == n_peers); |
2357 | for (i = 0; i < n_peers; i++) | 2355 | for (i = 0; i < n_peers; i++) |
2358 | { | 2356 | { |
2359 | rps_peers[i].index = i; | 2357 | rps_peers[i].index = i; |
2360 | if ( (rps_peers[i].num_recv_ids < rps_peers[i].num_ids_to_request) || | 2358 | rps_peers[i].op = |
2361 | (i < num_mal_peers) ) | 2359 | GNUNET_TESTBED_service_connect (&rps_peers[i], |
2362 | { | 2360 | peers[i], |
2363 | rps_peers[i].op = | 2361 | "rps", |
2364 | GNUNET_TESTBED_service_connect (&rps_peers[i], | 2362 | &rps_connect_complete_cb, |
2365 | peers[i], | 2363 | &rps_peers[i], |
2366 | "rps", | 2364 | &rps_connect_adapter, |
2367 | &rps_connect_complete_cb, | 2365 | &rps_disconnect_adapter, |
2368 | &rps_peers[i], | 2366 | &rps_peers[i]); |
2369 | &rps_connect_adapter, | ||
2370 | &rps_disconnect_adapter, | ||
2371 | &rps_peers[i]); | ||
2372 | } | ||
2373 | /* Connect all peers to statistics service */ | 2367 | /* Connect all peers to statistics service */ |
2374 | if (COLLECT_STATISTICS == cur_test_run.have_collect_statistics) | 2368 | if (COLLECT_STATISTICS == cur_test_run.have_collect_statistics) |
2375 | { | 2369 | { |