From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 16 Mar 2011 12:18:52 +0000 (+0000)
Subject: fix for over-reporting number of necessary connections
X-Git-Tag: initial-import-from-subversion-38251~18960
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=188eadf9c6555fa9649af96fcea25bdc5e06ab4d;p=oweals%2Fgnunet.git

fix for over-reporting number of necessary connections
---

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)
                       "Creating connection between %d and %d\n", pg_iter,
                       iter->index);
           total += add_connections (pg, pg_iter, iter->index, CONNECT,
-                                    GNUNET_NO);
+                                    GNUNET_YES);
           //total += add_actual_connections(pg, pg_iter, iter->index);
           iter = iter->next;
         }
@@ -3960,6 +3960,8 @@ GNUNET_TESTING_create_topology(struct GNUNET_TESTING_PeerGroup *pg,
   if ((restrict_topology != GNUNET_TESTING_TOPOLOGY_NONE) && (restrict_topology
       != GNUNET_TESTING_TOPOLOGY_FROM_FILE))
     create_clique (pg, &add_connections, BLACKLIST, GNUNET_NO);
+  else
+    return num_connections;
 
   unblacklisted_connections = 0;
   /* Un-blacklist connections as per the topology specified */