aboutsummaryrefslogtreecommitdiff
path: root/src/rps
diff options
context:
space:
mode:
authorJulius Bünger <buenger@mytum.de>2014-12-27 12:31:53 +0000
committerJulius Bünger <buenger@mytum.de>2014-12-27 12:31:53 +0000
commit6a6f9ec0c736ff14100f32c29ede9f2fd112b058 (patch)
treec9a99b0e25841ba8c2384ab57c9a43b3c8da17a3 /src/rps
parent12d0ad4a9c2adc3c36cc2fc34c973cc4f5e4c5cf (diff)
downloadgnunet-6a6f9ec0c736ff14100f32c29ede9f2fd112b058.tar.gz
gnunet-6a6f9ec0c736ff14100f32c29ede9f2fd112b058.zip
fixed place of resizing gossip_list
Diffstat (limited to 'src/rps')
-rw-r--r--src/rps/gnunet-service-rps.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 44815f335..6a38699af 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -1090,13 +1090,6 @@ do_round(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1090 // TODO cleanup peer_map 1090 // TODO cleanup peer_map
1091 1091
1092 1092
1093 /* If the NSE has changed adapt the lists accordingly */
1094 if ( sampler_list->size != est_size )
1095 SAMPLER_samplers_resize(sampler_list, est_size, own_identity);
1096
1097 GNUNET_array_grow(gossip_list, gossip_list_size, est_size);
1098
1099
1100 /* Would it make sense to have one shuffeled gossip list and then 1093 /* Would it make sense to have one shuffeled gossip list and then
1101 * to send PUSHes to first alpha peers, PULL requests to next beta peers and 1094 * to send PUSHes to first alpha peers, PULL requests to next beta peers and
1102 * use the rest to update sampler? 1095 * use the rest to update sampler?
@@ -1146,6 +1139,13 @@ do_round(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1146 } 1139 }
1147 1140
1148 1141
1142 /* If the NSE has changed adapt the lists accordingly */
1143 if ( sampler_list->size != est_size )
1144 SAMPLER_samplers_resize(sampler_list, est_size, own_identity);
1145
1146 GNUNET_array_grow(gossip_list, gossip_list_size, est_size);
1147
1148
1149 /* Update gossip list */ 1149 /* Update gossip list */
1150 uint64_t r_index; 1150 uint64_t r_index;
1151 1151
@@ -1351,7 +1351,7 @@ handle_inbound_channel (void *cls,
1351 uint32_t port, 1351 uint32_t port,
1352 enum GNUNET_CADET_ChannelOption options) 1352 enum GNUNET_CADET_ChannelOption options)
1353{ 1353{
1354 LOG(GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us.\n"); 1354 LOG(GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us (Peer %s).\n", GNUNET_i2s(initiator));
1355 1355
1356 GNUNET_assert( NULL != channel ); 1356 GNUNET_assert( NULL != channel );
1357 1357