option for disabling auto retry

4 files changed, 51 insertions, 12 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index ed7251ed3..e63030fbd 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -908,7 +908,8 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
 
 
 /**
- * Topologies supported for testbeds.
+ * Topologies and topology options supported for testbeds. Options should always
+ * end with GNUNET_TESTBED_TOPOLOGY_OPTION_END
  */
 enum GNUNET_TESTBED_TopologyOption
 {
@@ -940,9 +941,8 @@ enum GNUNET_TESTBED_TopologyOption
   GNUNET_TESTBED_TOPOLOGY_2D_TORUS,
 
   /**
-   * Random graph.  Followed by the link density, that is the
-   * percentage of links present in relation to a clique
-   * (float).
+   * Random graph.  Followed by the number of random links to be established
+   * (unsigned int)
    */
   GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
 
@@ -971,7 +971,23 @@ enum GNUNET_TESTBED_TopologyOption
   /**
    * Read a topology from a given file.  Followed by the name of the file (const char *).
    */
-  GNUNET_TESTBED_TOPOLOGY_FROM_FILE
+  GNUNET_TESTBED_TOPOLOGY_FROM_FILE,
+
+  /**
+   * The options should always end with this
+   */
+  GNUNET_TESTBED_TOPOLOGY_OPTION_END,
+
+  /* The following are not topologies but influence how the topology has to be
+     setup. These options should follow the topology specific options (if
+     required by the chosen topology). Note that these should be given before
+     GNUNET_TESTBED_TOPOLOGY_OPTION_END */
+
+  /**
+   * Disable automatic retrying for failed overlay connections. The default is
+   * to always retry failed overlay connections. This parameter takes no options.
+   */
+  GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY
 };
 
 
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 21faaa74a..b01e992b9 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -334,8 +334,8 @@ peer_churn_cb (void *cls, const char *emsg)
     topology_op =
         GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers,
                                                    GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
-
-                                                   num_links);
+                                                   num_links,
+                                                   GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   }
 }
 
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 8e673d293..af3890ea5 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -136,7 +136,7 @@ test_master (void *cls, unsigned int num_peers,
   overlay_connects = 0;
   op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
                                                   GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
-                                                  NUM_PEERS);
+                                                  NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
   shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                                 (GNUNET_TIME_UNIT_SECONDS, 120),
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index bc766dedb..08d812e5e 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -94,7 +94,12 @@ struct TopologyContext
   /**
    * The size of the link array
    */
-  unsigned int link_array_size;    
+  unsigned int link_array_size;
+
+  /**
+   * should the automatic retry be disabled
+   */
+  int disable_retry;
   
 };
 
@@ -117,10 +122,10 @@ overlay_link_completed (void *cls,
 
   GNUNET_assert (op == link->op);
   GNUNET_TESTBED_operation_done (op);
-  link->op = NULL;  
-  if (NULL != emsg)
+  link->op = NULL;
+  tc = link->tc;
+  if ((NULL != emsg) && (GNUNET_NO == tc->disable_retry))
   {
-    tc = link->tc;
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Error while establishing a link: %s -- Retrying\n", emsg);
     link->op =
@@ -251,6 +256,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
   struct TopologyContext *tc;
   struct GNUNET_TESTBED_Operation *op;
   struct GNUNET_TESTBED_Controller *c;
+  enum GNUNET_TESTBED_TopologyOption secondary_option;
   unsigned int cnt;
 
   if (num_peers < 2)
@@ -296,6 +302,22 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
     GNUNET_break (0);
     return NULL;
   }
+  do
+  {
+    secondary_option = va_arg (va, enum GNUNET_TESTBED_TopologyOption);
+    switch (secondary_option)
+    {
+    case GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY:
+      tc->disable_retry = GNUNET_YES;
+      break;
+    case GNUNET_TESTBED_TOPOLOGY_OPTION_END:
+      break;
+    default:
+      GNUNET_break (0);         /* Should not use any other option apart from
+                                   the ones handled here */
+      return NULL;
+    }
+  } while (GNUNET_TESTBED_TOPOLOGY_OPTION_END != secondary_option);
   op = GNUNET_TESTBED_operation_create_ (tc,
                                          &opstart_overlay_configure_topology,
                                          &oprelease_overlay_configure_topology);
@@ -328,6 +350,7 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls, unsigned int num_peers,
   struct GNUNET_TESTBED_Operation *op;
   va_list vargs;
 
+  GNUNET_assert (topo < GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   va_start (vargs, topo);
   op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers,
                                                      topo, vargs);