[GNUnet-SVN] r14665 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2011-03-16 13:18:52 +0100 (Wed, 16 Mar 2011)
New Revision: 14665

Modified:
   gnunet/src/testing/testing_group.c
Log:
fix for over-reporting number of necessary connections

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-03-16 11:20:51 UTC (rev 14664)
+++ gnunet/src/testing/testing_group.c  2011-03-16 12:18:52 UTC (rev 14665)
@@ -3696,7 +3696,7 @@
                       "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 @@
   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 */