aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_group.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r--src/testing/testing_group.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index d5a43fd37..a243a7d7c 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -3104,7 +3104,7 @@ perform_dfs (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
3104static void 3104static void
3105internal_topology_callback(void *cls, 3105internal_topology_callback(void *cls,
3106 const struct GNUNET_PeerIdentity *peer, 3106 const struct GNUNET_PeerIdentity *peer,
3107 struct GNUNET_TIME_Relative latency, uint32_t distance) 3107 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
3108{ 3108{
3109 struct CoreContext *core_ctx = cls; 3109 struct CoreContext *core_ctx = cls;
3110 struct TopologyIterateContext *iter_ctx = core_ctx->iter_context; 3110 struct TopologyIterateContext *iter_ctx = core_ctx->iter_context;
@@ -3118,12 +3118,14 @@ internal_topology_callback(void *cls,
3118 } 3118 }
3119 else 3119 else
3120 { 3120 {
3121 iter_ctx->topology_cb(iter_ctx->cls, &core_ctx->daemon->id, peer, latency, distance, NULL); 3121 iter_ctx->topology_cb(iter_ctx->cls, &core_ctx->daemon->id,
3122 peer, NULL);
3122 } 3123 }
3123 3124
3124 if (iter_ctx->completed == iter_ctx->total) 3125 if (iter_ctx->completed == iter_ctx->total)
3125 { 3126 {
3126 iter_ctx->topology_cb(iter_ctx->cls, NULL, NULL, GNUNET_TIME_relative_get_zero(), 0, NULL); 3127 iter_ctx->topology_cb(iter_ctx->cls, NULL, NULL,
3128 NULL);
3127 /* Once all are done, free the iteration context */ 3129 /* Once all are done, free the iteration context */
3128 GNUNET_free(iter_ctx); 3130 GNUNET_free(iter_ctx);
3129 } 3131 }
@@ -3157,8 +3159,8 @@ schedule_get_topology(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
3157 _("Creating connection, outstanding_connections is %d\n"), outstanding_connects); 3159 _("Creating connection, outstanding_connections is %d\n"), outstanding_connects);
3158#endif 3160#endif
3159 topology_context->connected++; 3161 topology_context->connected++;
3160 if (GNUNET_OK != GNUNET_CORE_iterate_peers (core_context->daemon->cfg, &internal_topology_callback, core_context)) 3162 if (GNUNET_OK != GNUNET_CORE_iterate_peers (core_context->daemon->server, &internal_topology_callback, core_context))
3161 internal_topology_callback(core_context, NULL, GNUNET_TIME_relative_get_zero(), 0); 3163 internal_topology_callback(core_context, NULL, NULL);
3162 3164
3163 } 3165 }
3164} 3166}
@@ -3195,7 +3197,7 @@ GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING
3195 } 3197 }
3196 if (total_count == 0) 3198 if (total_count == 0)
3197 { 3199 {
3198 cb(cls, NULL, NULL, GNUNET_TIME_relative_get_zero(), 0, "Cannot iterate over topology, no running peers!"); 3200 cb(cls, NULL, NULL, "Cannot iterate over topology, no running peers!");
3199 GNUNET_free(topology_context); 3201 GNUNET_free(topology_context);
3200 } 3202 }
3201 else 3203 else