diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-16 17:11:23 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-16 17:11:23 +0000 |
commit | 73a411bdf419bef89c47e1b8faaaa0a78c159ab1 (patch) | |
tree | c2a0c93c8beb9b18e8f70cdb016f05359c677b49 /src/testbed/testbed_api_topology.c | |
parent | bacc609621a2a95bf5b3bea01c7673bb30a1e981 (diff) | |
download | gnunet-73a411bdf419bef89c47e1b8faaaa0a78c159ab1.tar.gz gnunet-73a411bdf419bef89c47e1b8faaaa0a78c159ab1.zip |
- testcase for 2d torus and fixes
Diffstat (limited to 'src/testbed/testbed_api_topology.c')
-rw-r--r-- | src/testbed/testbed_api_topology.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 964f7f6a2..effc428e8 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -267,11 +267,14 @@ gen_topo_2dtorus (struct TopologyContext *tc) | |||
267 | rows_len[rows - 1] = ++x; | 267 | rows_len[rows - 1] = ++x; |
268 | else | 268 | else |
269 | rows_len[y++]++; | 269 | rows_len[y++]++; |
270 | num_peers++; | ||
270 | } | 271 | } |
271 | tc->link_array_size += (x < 2) ? x : 2 * x; | 272 | tc->link_array_size += (x < 2) ? x : 2 * x; |
272 | tc->link_array_size += (y < 2) ? y : 2 * y; | 273 | tc->link_array_size += (y < 2) ? y : 2 * y; |
273 | tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) * | 274 | tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) * |
274 | tc->link_array_size); | 275 | tc->link_array_size); |
276 | if (0 == rows_len[rows - 1]) | ||
277 | rows--; | ||
275 | cnt = 0; | 278 | cnt = 0; |
276 | offset = 0; | 279 | offset = 0; |
277 | for (y = 0; y < rows; y++) | 280 | for (y = 0; y < rows; y++) |