aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rps/gnunet-service-rps.c19
-rw-r--r--src/rps/gnunet-service-rps_sampler.c2
-rw-r--r--src/rps/test_rps.c5
3 files changed, 15 insertions, 11 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 46f3fdacb..eb0fb3d82 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -2048,27 +2048,28 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
2048 GNUNET_array_grow (gossip_list, gossip_list_size, second_border); 2048 GNUNET_array_grow (gossip_list, gossip_list_size, second_border);
2049 2049
2050 for (i = 0 ; i < first_border ; i++) 2050 for (i = 0 ; i < first_border ; i++)
2051 { // TODO use RPS_sampler_get_n_rand_peers 2051 {/* Update gossip list with peers received through PUSHes */
2052 /* Update gossip list with peers received through PUSHes */
2053 r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, 2052 r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
2054 push_list_size); 2053 push_list_size);
2055 gossip_list[i] = push_list[r_index]; 2054 gossip_list[i] = push_list[r_index];
2056 // TODO change the peer_flags accordingly 2055 // TODO change the peer_flags accordingly
2057 } 2056 }
2058 2057
2059 for (i = first_border ; i < second_border ; i++) 2058 for (i = first_border ; i < second_border ; i++)
2060 { 2059 {/* Update gossip list with peers received through PULLs */
2061 /* Update gossip list with peers received through PULLs */
2062 r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, 2060 r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
2063 pull_list_size); 2061 pull_list_size);
2064 gossip_list[i] = pull_list[r_index]; 2062 gossip_list[i] = pull_list[r_index];
2065 // TODO change the peer_flags accordingly 2063 // TODO change the peer_flags accordingly
2066 } 2064 }
2067 2065
2068 for (i = second_border ; i < sampler_size_est_need ; i++) 2066 for (i = second_border ; i < sampler_size_est_need ; i++)
2069 { 2067 {/* Update gossip list with peers from history */
2070 /* Update gossip list with peers from history */ 2068 RPS_sampler_get_n_rand_peers (prot_sampler,
2071 RPS_sampler_get_n_rand_peers (prot_sampler, hist_update, NULL, 1, GNUNET_NO); 2069 hist_update,
2070 NULL,
2071 1,
2072 GNUNET_NO);
2072 num_hist_update_tasks++; 2073 num_hist_update_tasks++;
2073 // TODO change the peer_flags accordingly 2074 // TODO change the peer_flags accordingly
2074 } 2075 }
diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c
index f851ac965..f960bd6c7 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/rps/gnunet-service-rps_sampler.c
@@ -644,7 +644,7 @@ sampler_empty (struct RPS_Sampler *sampler)
644 */ 644 */
645struct RPS_Sampler * 645struct RPS_Sampler *
646RPS_sampler_init (size_t init_size, 646RPS_sampler_init (size_t init_size,
647 struct GNUNET_TIME_Relative max_round_interval) 647 struct GNUNET_TIME_Relative max_round_interval)
648{ 648{
649 struct RPS_Sampler *sampler; 649 struct RPS_Sampler *sampler;
650 //uint32_t i; 650 //uint32_t i;
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index eb2d9d264..87b0620ee 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -318,7 +318,10 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
318{ 318{
319 unsigned int i; 319 unsigned int i;
320 320
321 for (i=0;i<NUM_PEERS;i++) 321 if (NULL != churn_task)
322 GNUNET_SCHEDULER_cancel (churn_task);
323
324 for (i = 0 ; i < num_peers ; i++)
322 GNUNET_TESTBED_operation_done (rps_peers[i].op); 325 GNUNET_TESTBED_operation_done (rps_peers[i].op);
323 GNUNET_SCHEDULER_shutdown (); 326 GNUNET_SCHEDULER_shutdown ();
324} 327}