reduce config variables

[oweals/gnunet.git] / src / testing / testing_group.c

diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index 9c0dbd8fab17ae7f764115e9c3c65ef3f50007c5..9deca4ac8b79d0fa68754b6d1eaea110e928f1c4 100644 (file)
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -59,9 +59,9 @@
 
 #define MAX_CONCURRENT_SHUTDOWN 10
 
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 200)
 
-#define CONNECT_ATTEMPTS 8
+#define CONNECT_ATTEMPTS 21
 
 /**
  * Prototype of a function called whenever two peers would be connected
@@ -1489,14 +1489,14 @@ create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg,
   nat_percentage = 0.6;         /* FIXME: default percentage? */
   if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
                                                           "TESTING",
-                                                          "NATPERCENTAGE",
+                                                          "PERCENTAGE",
                                                           &p_string))
     {
       if (sscanf (p_string, "%lf", &nat_percentage) != 1)
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     _
                     ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
-                    p_string, "NATPERCENTAGE", "TESTING");
+                    p_string, "PERCENTAGE", "TESTING");
       GNUNET_free (p_string);
     }
 
@@ -2574,12 +2574,13 @@ connect_topology (struct GNUNET_TESTING_PeerGroup *pg,
  * by the topology.  This will only have an effect once peers
  * are started if the FRIENDS_ONLY option is set in the base
  * config.  Also takes an optional restrict topology which
- * disallows connections based on a particular transport
+ * disallows connections based on particular transports
  * UNLESS they are specified in the restricted topology.
  *
  * @param pg the peer group struct representing the running peers
  * @param topology which topology to connect the peers in
- * @param restrict_topology allow only direct TCP connections in this topology
+ * @param restrict_topology disallow restrict_transports transport
+ *                          connections to peers NOT in this topology
  *                          use GNUNET_TESTING_TOPOLOGY_NONE for no restrictions
  * @param restrict_transports space delimited list of transports to blacklist
  *                            to create restricted topology
@@ -3421,12 +3422,15 @@ schedule_get_topology (void *cls,
                   outstanding_connects);
 #endif
       topology_context->connected++;
+
       if (GNUNET_OK !=
-          GNUNET_CORE_iterate_peers (core_context->daemon->server,
+          GNUNET_CORE_iterate_peers (core_context->daemon->cfg,
                                      &internal_topology_callback,
                                      core_context))
-        internal_topology_callback (core_context, NULL, NULL);
-
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Topology iteration failed.\n");
+          internal_topology_callback (core_context, NULL, NULL);
+        }
     }
 }