aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_group.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-03-16 12:18:52 +0000
committerNathan S. Evans <evans@in.tum.de>2011-03-16 12:18:52 +0000
commit188eadf9c6555fa9649af96fcea25bdc5e06ab4d (patch)
treee909709da723177b1fc81c66df779e1e814ecabc /src/testing/testing_group.c
parentc1b3e5f6af2f2c4e408988eddfbcb1afbf0ffe81 (diff)
downloadgnunet-188eadf9c6555fa9649af96fcea25bdc5e06ab4d.tar.gz
gnunet-188eadf9c6555fa9649af96fcea25bdc5e06ab4d.zip
fix for over-reporting number of necessary connections
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r--src/testing/testing_group.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index 0f9b9534a..1a7b7cc6e 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -3696,7 +3696,7 @@ copy_allowed_topology(struct GNUNET_TESTING_PeerGroup *pg)
3696 "Creating connection between %d and %d\n", pg_iter, 3696 "Creating connection between %d and %d\n", pg_iter,
3697 iter->index); 3697 iter->index);
3698 total += add_connections (pg, pg_iter, iter->index, CONNECT, 3698 total += add_connections (pg, pg_iter, iter->index, CONNECT,
3699 GNUNET_NO); 3699 GNUNET_YES);
3700 //total += add_actual_connections(pg, pg_iter, iter->index); 3700 //total += add_actual_connections(pg, pg_iter, iter->index);
3701 iter = iter->next; 3701 iter = iter->next;
3702 } 3702 }
@@ -3960,6 +3960,8 @@ GNUNET_TESTING_create_topology(struct GNUNET_TESTING_PeerGroup *pg,
3960 if ((restrict_topology != GNUNET_TESTING_TOPOLOGY_NONE) && (restrict_topology 3960 if ((restrict_topology != GNUNET_TESTING_TOPOLOGY_NONE) && (restrict_topology
3961 != GNUNET_TESTING_TOPOLOGY_FROM_FILE)) 3961 != GNUNET_TESTING_TOPOLOGY_FROM_FILE))
3962 create_clique (pg, &add_connections, BLACKLIST, GNUNET_NO); 3962 create_clique (pg, &add_connections, BLACKLIST, GNUNET_NO);
3963 else
3964 return num_connections;
3963 3965
3964 unblacklisted_connections = 0; 3966 unblacklisted_connections = 0;
3965 /* Un-blacklist connections as per the topology specified */ 3967 /* Un-blacklist connections as per the topology specified */