aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_topology.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/testbed_api_topology.c')
-rw-r--r--src/testbed/testbed_api_topology.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index d506ee7e3..b1b96ed56 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -89,7 +89,7 @@ struct RetryListEntry
89 * the prev pointer for the DLL 89 * the prev pointer for the DLL
90 */ 90 */
91 struct RetryListEntry *prev; 91 struct RetryListEntry *prev;
92 92
93 /** 93 /**
94 * The link to be retired 94 * The link to be retired
95 */ 95 */
@@ -136,7 +136,7 @@ struct TopologyContext
136 * DLL tail for retry list 136 * DLL tail for retry list
137 */ 137 */
138 struct RetryListEntry *rl_tail; 138 struct RetryListEntry *rl_tail;
139 139
140 /** 140 /**
141 * The number of peers 141 * The number of peers
142 */ 142 */
@@ -292,7 +292,7 @@ overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op,
292 tc->nlinks = 0; 292 tc->nlinks = 0;
293 while (NULL != (retry_entry = tc->rl_head)) 293 while (NULL != (retry_entry = tc->rl_head))
294 { 294 {
295 link = retry_entry->link; 295 link = retry_entry->link;
296 link->op = 296 link->op =
297 GNUNET_TESTBED_overlay_connect (tc->op_cls, &overlay_link_completed, 297 GNUNET_TESTBED_overlay_connect (tc->op_cls, &overlay_link_completed,
298 link, tc->peers[link->A], 298 link, tc->peers[link->A],
@@ -609,7 +609,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
609 unsigned int redo_threshold; 609 unsigned int redo_threshold;
610 610
611 links = 0; 611 links = 0;
612 etaboff = 0; 612 etaboff = 0;
613 tc->link_array_size = tc->num_peers * m; 613 tc->link_array_size = tc->num_peers * m;
614 tc->link_array = GNUNET_malloc_large (sizeof (struct OverlayLink) * 614 tc->link_array = GNUNET_malloc_large (sizeof (struct OverlayLink) *
615 tc->link_array_size); 615 tc->link_array_size);
@@ -657,7 +657,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
657 goto redo; 657 goto redo;
658 make_link (&tc->link_array[links + cnt], random_peer, peer, tc); 658 make_link (&tc->link_array[links + cnt], random_peer, peer, tc);
659 deg[random_peer]++; 659 deg[random_peer]++;
660 deg[peer]++; 660 deg[peer]++;
661 used[cnt] = random_peer; 661 used[cnt] = random_peer;
662 } 662 }
663 for (cnt = 0; cnt < GNUNET_MIN (peer, m); cnt++) 663 for (cnt = 0; cnt < GNUNET_MIN (peer, m); cnt++)
@@ -672,7 +672,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
672 GNUNET_free (deg); 672 GNUNET_free (deg);
673 GNUNET_assert (links <= tc->link_array_size); 673 GNUNET_assert (links <= tc->link_array_size);
674 tc->link_array_size = links; 674 tc->link_array_size = links;
675 tc->link_array = 675 tc->link_array =
676 GNUNET_realloc (tc->link_array, 676 GNUNET_realloc (tc->link_array,
677 sizeof (struct OverlayLink) * tc->link_array_size); 677 sizeof (struct OverlayLink) * tc->link_array_size);
678} 678}
@@ -982,7 +982,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
982 { 982 {
983 uint16_t cap; 983 uint16_t cap;
984 uint8_t m; 984 uint8_t m;
985 985
986 cap = (uint16_t) va_arg (va, unsigned int); 986 cap = (uint16_t) va_arg (va, unsigned int);
987 m = (uint8_t) va_arg (va, unsigned int); 987 m = (uint8_t) va_arg (va, unsigned int);
988 gen_scale_free (tc, cap, m); 988 gen_scale_free (tc, cap, m);
@@ -1074,7 +1074,7 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
1074 GNUNET_assert (topo < GNUNET_TESTBED_TOPOLOGY_OPTION_END); 1074 GNUNET_assert (topo < GNUNET_TESTBED_TOPOLOGY_OPTION_END);
1075 va_start (vargs, topo); 1075 va_start (vargs, topo);
1076 op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers, 1076 op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers,
1077 max_connections, 1077 max_connections,
1078 comp_cb, comp_cb_cls, 1078 comp_cb, comp_cb_cls,
1079 topo, 1079 topo,
1080 vargs); 1080 vargs);