*/
#include "platform.h"
#include "gnunet_testbed_service.h"
+#include "testbed_api.h"
+#include "testbed_api_peers.h"
+#include "testbed_api_operations.h"
+
+
+/**
+ * Representation of an overlay link
+ */
+struct OverlayLink
+{
+ /**
+ * position of peer A's handle in peers array
+ */
+ uint32_t A;
+
+ /**
+ * position of peer B's handle in peers array
+ */
+ uint32_t B;
+
+};
+
+
+/**
+ * Context information for topology operations
+ */
+struct TopologyContext
+{
+ /**
+ * The array of peers
+ */
+ struct GNUNET_TESTBED_Peer **peers;
+
+ /**
+ * An array of links; this array is of size link_array_size
+ */
+ struct OverlayLink *link_array;
+
+ /**
+ * An array of operations resulting from the links we try to establish; the
+ * number of operations in this array is equal to link_array_size (1 link = 1
+ * operation)
+ */
+ struct GNUNET_TESTBED_Operation **link_ops;
+
+ /**
+ * The size of the link array
+ */
+ unsigned int link_array_size;
+
+};
+
+
+/**
+ * Callback to be called when an overlay_link operation complete
+ *
+ * @param cls element of the link_op array which points to the corresponding operation
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ * operation has executed successfully.
+ */
+static void
+overlay_link_completed (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ const char *emsg)
+{
+ struct GNUNET_TESTBED_Operation **link_op = cls;
+
+ GNUNET_assert (*link_op == op);
+ GNUNET_TESTBED_operation_done (op);
+ *link_op = NULL;
+ if (NULL != emsg)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Error while establishing a link: %s\n", emsg);
+ return;
+ }
+}
+
+
+
+/**
+ * Function called when a overlay connect operation is ready
+ *
+ * @param cls the Topology context
+ */
+static void
+opstart_overlay_configure_topology (void *cls)
+{
+ struct TopologyContext *tc = cls;
+ unsigned int p;
+
+ tc->link_ops = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Operations *)
+ * tc->link_array_size);
+ for (p = 0; p < tc->link_array_size; p++)
+ {
+ tc->link_ops[p] =
+ GNUNET_TESTBED_overlay_connect (NULL, &overlay_link_completed,
+ &tc->link_ops[p],
+ tc->peers[tc->link_array[p].A],
+ tc->peers[tc->link_array[p].B]);
+ }
+}
+
+
+/**
+ * Callback which will be called when overlay connect operation is released
+ *
+ * @param cls the Topology context
+ */
+static void
+oprelease_overlay_configure_topology (void *cls)
+{
+ struct TopologyContext *tc = cls;
+ unsigned int p;
+
+ if (NULL != tc->link_ops)
+ {
+ for (p = 0; p < tc->link_array_size; p++)
+ if (NULL != tc->link_ops[p])
+ GNUNET_TESTBED_operation_cancel (tc->link_ops[p]);
+ GNUNET_free (tc->link_ops);
+ }
+ GNUNET_free_non_null (tc->link_array);
+ GNUNET_free (tc);
+}
/**
* @param va topology-specific options
* @return handle to the operation, NULL if connecting these
* peers is fundamentally not possible at this time (peers
- * not running or underlay disallows)
+ * not running or underlay disallows) or if num_peers is less than 2
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer *peers,
+ struct GNUNET_TESTBED_Peer **peers,
enum GNUNET_TESTBED_TopologyOption
topo, va_list va)
{
- GNUNET_break (0);
- return NULL;
+ struct TopologyContext *tc;
+ struct GNUNET_TESTBED_Operation *op;
+ struct GNUNET_TESTBED_Controller *c;
+ unsigned int p;
+
+ if (num_peers < 2)
+ return NULL;
+ c = peers[0]->controller;
+ tc = GNUNET_malloc (sizeof (struct TopologyContext));
+ tc->peers = peers;
+ switch (topo)
+ {
+ case GNUNET_TESTBED_TOPOLOGY_LINE:
+ tc->link_array_size = num_peers - 1;
+ tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
+ tc->link_array_size);
+ for (p=1; p < num_peers; p++)
+ {
+ tc->link_array[p-1].A = p-1;
+ tc->link_array[p-1].B = p;
+ }
+ break;
+ default:
+ GNUNET_break (0);
+ return NULL;
+ }
+ op = GNUNET_TESTBED_operation_create_ (tc,
+ &opstart_overlay_configure_topology,
+ &oprelease_overlay_configure_topology);
+ GNUNET_TESTBED_operation_queue_insert_
+ (c->opq_parallel_topology_config_operations, op);
+ return op;
}
* @param ... topology-specific options
* @return handle to the operation, NULL if connecting these
* peers is fundamentally not possible at this time (peers
- * not running or underlay disallows)
+ * not running or underlay disallows) or if num_peers is less than 2
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_overlay_configure_topology (void *op_cls, unsigned int num_peers,
- struct GNUNET_TESTBED_Peer *peers,
+ struct GNUNET_TESTBED_Peer **peers,
enum GNUNET_TESTBED_TopologyOption
topo, ...)
{
- GNUNET_break (0);
- return NULL;
+ struct GNUNET_TESTBED_Operation *op;
+ va_list vargs;
+
+ va_start (vargs, topo);
+ op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers,
+ topo, vargs);
+ va_end (vargs);
+ return op;
}
/* end of testbed_api_topology.c */
projects / oweals / gnunet.git / blobdiff