- verboser log, faster start

[oweals/gnunet.git] / src / testbed / testbed_api.h

diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 7b92ff51bb686a5010fcf471387f02c01600f474..26b0d5843fa5b06cf3def7de74f0c0a42cfc42d6 100644 (file)
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -30,6 +30,13 @@
 #include "gnunet_testbed_service.h"
 #include "testbed.h"
 
+
+/**
+ * Testbed Helper binary name
+ */
+#define HELPER_TESTBED_BINARY "gnunet-helper-testbed"
+
+
 /**
  * Enumeration of operations
  */
@@ -79,44 +86,6 @@ enum OperationType
    * Get slave config operation
    */
   OP_GET_SLAVE_CONFIG
-
-};
-
-
-/**
- * Testbed operation structure
- */
-struct GNUNET_TESTBED_Operation
-{
-  /**
-   * next pointer for DLL
-   */
-  struct GNUNET_TESTBED_Operation *next;
-
-  /**
-   * prev pointer for DLL
-   */
-  struct GNUNET_TESTBED_Operation *prev;
-
-  /**
-   * The controller on which this operation operates
-   */
-  struct GNUNET_TESTBED_Controller *controller;
-
-  /**
-   * The ID for the operation;
-   */
-  uint64_t operation_id;
-
-  /**
-   * The type of operation
-   */
-  enum OperationType type;
-
-  /**
-   * Data specific to OperationType
-   */
-  void *data;
 };
 
 
@@ -219,7 +188,6 @@ struct OperationContext
  */
 struct GNUNET_TESTBED_Controller
 {
-
   /**
    * The host where the controller is running
    */
@@ -301,16 +269,6 @@ struct GNUNET_TESTBED_Controller
    */
   struct OperationQueue *opq_parallel_topology_config_operations;
 
-  /**
-   * Operation queue for simultaneous overlay connect operations
-   */
-  struct OperationQueue *opq_parallel_overlay_connect_operations;
-
-  /**
-   * The operation id counter. use current value and increment
-   */
-  uint32_t operation_counter;
-
   /**
    * The controller event mask
    */
@@ -325,6 +283,12 @@ struct GNUNET_TESTBED_Controller
    * Did we create the host for this?
    */
   int aux_host;
+
+  /**
+   * The operation id counter. use current value and increment
+   */
+  uint32_t operation_counter;
+
 };
 
 
@@ -363,17 +327,20 @@ GNUNET_TESTBED_operation_add_ (struct GNUNET_TESTBED_Operation *op);
 
 
 /**
- * Creates a helper initialization message. Only for testing.
+ * Creates a helper initialization message. This function is here because we
+ * want to use this in testing
  *
- * @param cname the ip address of the controlling host
+ * @param trusted_ip the ip address of the controller which will be set as TRUSTED
+ *          HOST(all connections form this ip are permitted by the testbed) when
+ *          starting testbed controller at host. This can either be a single ip
+ *          address or a network address in CIDR notation.
  * @param hostname the hostname of the destination this message is intended for
  * @param cfg the configuration that has to used to start the testbed service
  *          thru helper
  * @return the initialization message
  */
 struct GNUNET_TESTBED_HelperInit *
-GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
-                                       const char *hostname,
+GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, const char *hostname,
                                         const struct GNUNET_CONFIGURATION_Handle
                                         *cfg);
 
@@ -486,9 +453,9 @@ struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_controller_link_2_ (void *op_cls,
                                    struct GNUNET_TESTBED_Controller *master,
                                    uint32_t delegated_host_id,
-                                   uint32_t slave_host_id,
-                                   const char *sxcfg, size_t sxcfg_size,
-                                   size_t scfg_size, int is_subordinate);
+                                   uint32_t slave_host_id, const char *sxcfg,
+                                   size_t sxcfg_size, size_t scfg_size,
+                                   int is_subordinate);
 
 
 /**
@@ -512,12 +479,14 @@ GNUNET_TESTBED_controller_link_2_ (void *op_cls,
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_controller_link_ (void *op_cls,
-                               struct GNUNET_TESTBED_Controller *master,
-                                uint32_t delegated_host_id,
-                                uint32_t slave_host_id,
-                                const struct GNUNET_CONFIGURATION_Handle
-                                *slave_cfg,
-                                 int is_subordinate);
+                                 struct GNUNET_TESTBED_Controller *master,
+                                 uint32_t delegated_host_id,
+                                 uint32_t slave_host_id,
+                                 const struct GNUNET_CONFIGURATION_Handle
+                                 *slave_cfg, int is_subordinate);
+
+
+
 
 #endif
 /* end of testbed_api.h */