#include "gnunet_testbed_service.h"
#include "testbed.h"
+
+/**
+ * Testbed Helper binary name
+ */
+#define HELPER_TESTBED_BINARY "gnunet-helper-testbed"
+
+
/**
* Enumeration of operations
*/
* 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;
};
*/
struct GNUNET_TESTBED_Controller
{
-
/**
* The host where the controller is running
*/
*/
struct OperationQueue *opq_parallel_topology_config_operations;
- /**
- * The operation id counter. use current value and increment
- */
- uint32_t operation_counter;
-
/**
* The controller event mask
*/
* Did we create the host for this?
*/
int aux_host;
+
+ /**
+ * The operation id counter. use current value and increment
+ */
+ uint32_t operation_counter;
+
};
/**
- * 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);
*
* @param op_cls the closure for the operation
* @param master the handle to master controller
- * @param slave_host the host where the slave controller is running; the handle
- * to the slave_host should remain valid until this operation is
- * cancelled or marked as finished
+ * @param slave_host_id id of the host where the slave controller is running to
+ * the slave_host should remain valid until this operation is cancelled
+ * or marked as finished
* @return the operation handle;
*/
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);
/**
* @param op_cls the operation closure for the event which is generated to
* signal success or failure of this operation
* @param master handle to the master controller who creates the association
- * @param delegated_host requests to which host should be delegated; cannot be NULL
- * @param slave_host which host is used to run the slave controller; use NULL to
- * make the master controller connect to the delegated host
+ * @param delegated_host_id id of the host to which requests should be
+ * delegated; cannot be NULL
+ * @param slave_host_id id of the host which should connect to controller
+ * running on delegated host ; use NULL to make the master controller
+ * connect to the delegated host
* @param slave_cfg configuration to use for the slave controller
* @param is_subordinate GNUNET_YES if the controller at delegated_host should
* be started by the slave controller; GNUNET_NO if the slave
*/
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 */