aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulius Bünger <buenger@mytum.de>2015-02-15 17:19:48 +0000
committerJulius Bünger <buenger@mytum.de>2015-02-15 17:19:48 +0000
commitf921cbd8a9cdc617e6e60256d64459274733d7ce (patch)
tree09016f22066239017b71379393ea6e295ac6d733 /src
parent1987d9e455f2826cbd37fc52b4107cafde819f1d (diff)
downloadgnunet-f921cbd8a9cdc617e6e60256d64459274733d7ce.tar.gz
gnunet-f921cbd8a9cdc617e6e60256d64459274733d7ce.zip
- leave peer in sampler on peer disconnect
Diffstat (limited to 'src')
-rw-r--r--src/rps/gnunet-service-rps.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 4acb95b6a..874a5af0e 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -1743,9 +1743,6 @@ cleanup_channel (void *cls,
1743 LOG (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up channel to peer %s\n", 1743 LOG (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up channel to peer %s\n",
1744 GNUNET_i2s (peer)); 1744 GNUNET_i2s (peer));
1745 1745
1746 RPS_sampler_reinitialise_by_value (prot_sampler, peer);
1747 RPS_sampler_reinitialise_by_value (client_sampler, peer);
1748
1749 if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer)) 1746 if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
1750 { 1747 {
1751 peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer); 1748 peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
@@ -1881,9 +1878,11 @@ run (void *cls,
1881 max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval); 1878 max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval);
1882 1879
1883 prot_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval, 1880 prot_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval,
1884 insertCB, NULL, removeCB, NULL); 1881 //insertCB, NULL, removeCB, NULL);
1882 NULL, NULL, NULL, NULL);
1885 client_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval, 1883 client_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval,
1886 insertCB, NULL, removeCB, NULL); 1884 //nsertCB, NULL, removeCB, NULL);
1885 NULL, NULL, NULL, NULL);
1887 1886
1888 /* Initialise push and pull maps */ 1887 /* Initialise push and pull maps */
1889 push_list = NULL; 1888 push_list = NULL;