clique topology

[oweals/gnunet.git] / src / testbed / testbed_api_peers.c

diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index fef701f919c08e9bc7c6b570da1fd8e46a32402e..07103ca89055714e1033b79f99a0a4c8f517b317 100644 (file)
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -71,7 +71,7 @@ opstart_peer_create (void *cls)
   msg->config_size = htonl (c_size);
   GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
-};
+}
 
 
 /**
@@ -341,6 +341,7 @@ opstart_overlay_connect (void *cls)
   msg->peer1 = htonl (data->p1->unique_id);
   msg->peer2 = htonl (data->p2->unique_id);
   msg->operation_id = GNUNET_htonll (opc->id);
+  msg->peer2_host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->p2->host));
   GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
 }
@@ -356,7 +357,7 @@ oprelease_overlay_connect (void *cls)
 {
   struct OperationContext *opc = cls;
 
-  if (OPC_STATE_FINISHED != opc->state)
+  if (OPC_STATE_STARTED == opc->state)
   {
     GNUNET_free (opc->data);
     GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
@@ -438,7 +439,7 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->c = controller;
   opc->data = data;
-  opc->id = controller->operation_counter++;
+  opc->id = GNUNET_TESTBED_get_next_op_id (controller);
   opc->type = OP_PEER_CREATE;
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_create,
@@ -494,13 +495,16 @@ GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
 /**
  * Start the given peer.
  *
+ * @param op_cls the closure for this operation; will be set in
+ *          event->details.operation_finished.op_cls when this operation fails.
  * @param peer peer to start
  * @param pcc function to call upon completion
  * @param pcc_cls closure for 'pcc'
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer,
+GNUNET_TESTBED_peer_start (void *op_cls,
+                           struct GNUNET_TESTBED_Peer *peer,
                           GNUNET_TESTBED_PeerChurnCallback pcc,
                           void *pcc_cls)
 {
@@ -514,7 +518,8 @@ GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer,
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->c = peer->controller;
   opc->data = data;
-  opc->id = opc->c->operation_counter++;
+  opc->op_cls = op_cls;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
   opc->type = OP_PEER_START;
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_start,
@@ -550,7 +555,7 @@ GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->c = peer->controller;
   opc->data = data;
-  opc->id = opc->c->operation_counter++;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
   opc->type = OP_PEER_STOP;
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_stop,
@@ -562,9 +567,10 @@ GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
 
 
 /**
- * Request information about a peer. The controller callback will be called with
- * event type GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
- * operation is available
+ * Request information about a peer. The controller callback will not be called
+ * with event type GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
+ * operation is available. Instead, the GNUNET_TESTBED_PeerInfoCallback() will
+ * be called.
  *
  * @param peer peer to request information about
  * @param pit desired information
@@ -593,7 +599,7 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
   opc->c = peer->controller;
   opc->data = data;
   opc->type = OP_PEER_INFO;
-  opc->id = opc->c->operation_counter++;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
                                         &oprelease_peer_getinfo);
@@ -639,7 +645,7 @@ GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer)
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->data = peer;
   opc->c = peer->controller;
-  opc->id = peer->controller->operation_counter++;
+  opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller);
   opc->type = OP_PEER_DESTROY;
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_destroy,
@@ -699,22 +705,25 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
   struct OverlayConnectData *data;
 
   GNUNET_assert ((PS_STARTED == p1->state) && (PS_STARTED == p2->state));
-  GNUNET_assert (p1->controller == p2->controller);
   data = GNUNET_malloc (sizeof (struct OverlayConnectData));
   data->p1 = p1;
   data->p2 = p2;
   data->cb = cb;
   data->cb_cls = cb_cls;
+  data->state = OCD_INIT;
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->data = data;
   opc->c = p1->controller;
-  opc->id = opc->c->operation_counter++;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
   opc->type = OP_OVERLAY_CONNECT;
+  opc->op_cls = op_cls;
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
                                         &oprelease_overlay_connect);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
-                                          opc->op);
+  /* GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations, */
+  /*                                         opc->op); */
+  GNUNET_TESTBED_operation_queue_insert_
+      (opc->c->opq_parallel_overlay_connect_operations, opc->op);
   return opc->op;
 }