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);
-};
+}
/**
{
struct OperationContext *opc = cls;
struct GNUNET_TESTBED_PeerStartMessage *msg;
+ struct PeerEventData *data;
struct GNUNET_TESTBED_Peer *peer;
GNUNET_assert (OP_PEER_START == opc->type);
GNUNET_assert (NULL != opc->data);
- peer = opc->data;
+ data = opc->data;
+ GNUNET_assert (NULL != data->peer);
+ peer = data->peer;
GNUNET_assert ((PS_CREATED == peer->state) || (PS_STOPPED == peer->state));
opc->state = OPC_STATE_STARTED;
msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
struct OperationContext *opc = cls;
if (OPC_STATE_FINISHED != opc->state)
+ {
+ GNUNET_free (opc->data);
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ }
GNUNET_free (opc);
}
{
struct OperationContext *opc = cls;
struct GNUNET_TESTBED_PeerStopMessage *msg;
+ struct PeerEventData *data;
struct GNUNET_TESTBED_Peer *peer;
GNUNET_assert (NULL != opc->data);
- peer = opc->data;
+ data = opc->data;
+ GNUNET_assert (NULL != data->peer);
+ peer = data->peer;
GNUNET_assert (PS_STARTED == peer->state);
opc->state = OPC_STATE_STARTED;
msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
struct OperationContext *opc = cls;
if (OPC_STATE_FINISHED != opc->state)
+ {
+ GNUNET_free (opc->data);
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ }
GNUNET_free (opc);
}
* Generate PeerGetConfigurationMessage
*
* @param peer_id the id of the peer whose information we have to get
- * @param operation_id the ip of the operation that should be represented in
- * the message
+ * @param operation_id the ip of the operation that should be represented in the
+ * message
* @return the PeerGetConfigurationMessage
*/
struct GNUNET_TESTBED_PeerGetConfigurationMessage *
oprelease_peer_getinfo (void *cls)
{
struct OperationContext *opc = cls;
- struct PeerInfoData2 *data;
+ struct GNUNET_TESTBED_PeerInformation *data;
if (OPC_STATE_FINISHED != opc->state)
{
switch (data->pit)
{
case GNUNET_TESTBED_PIT_CONFIGURATION:
- GNUNET_CONFIGURATION_destroy (data->details.cfg);
+ GNUNET_CONFIGURATION_destroy (data->result.cfg);
break;
case GNUNET_TESTBED_PIT_IDENTITY:
- GNUNET_free (data->details.peer_identity);
+ GNUNET_free (data->result.id);
break;
default:
GNUNET_assert (0); /* We should never reach here */
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);
}
{
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);
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,
/**
* 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)
{
struct OperationContext *opc;
-
+ struct PeerEventData *data;
+
+ data = GNUNET_malloc (sizeof (struct PeerEventData));
+ data->peer = peer;
+ data->pcc = pcc;
+ data->pcc_cls = pcc_cls;
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = peer->controller;
- opc->data = peer;
- opc->id = opc->c->operation_counter++;
+ opc->data = data;
+ 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,
* state of the peer).
*
* @param peer peer to stop
+ * @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_stop (struct GNUNET_TESTBED_Peer *peer)
+GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
+ GNUNET_TESTBED_PeerChurnCallback pcc,
+ void *pcc_cls)
{
struct OperationContext *opc;
-
+ struct PeerEventData *data;
+
+ data = GNUNET_malloc (sizeof (struct PeerEventData));
+ data->peer = peer;
+ data->pcc = pcc;
+ data->pcc_cls = pcc_cls;
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = peer->controller;
- opc->data = peer;
- opc->id = opc->c->operation_counter++;
+ opc->data = data;
+ 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,
/**
- * Request information about a peer.
+ * 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
+ * @param cb the convenience callback to be called when results for this
+ * operation are available
+ * @param cb_cls the closure for the above callback
* @return handle to the operation
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
- enum GNUNET_TESTBED_PeerInformationType
- pit)
+ enum GNUNET_TESTBED_PeerInformationType
+ pit,
+ GNUNET_TESTBED_PeerInfoCallback cb,
+ void *cb_cls)
{
struct OperationContext *opc;
struct PeerInfoData *data;
data = GNUNET_malloc (sizeof (struct PeerInfoData));
data->peer = peer;
data->pit = pit;
+ data->cb = cb;
+ data->cb_cls = cb_cls;
opc = GNUNET_malloc (sizeof (struct OperationContext));
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);
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,
}
-
/**
* Both peers must have been started before calling this function.
* This function then obtains a HELLO from 'p1', gives it to 'p2'
* and asks 'p2' to connect to 'p1'.
*
* @param op_cls closure argument to give with the operation event
+ * @param cb the callback to call when this operation has finished
+ * @param cb_cls the closure for the above callback
* @param p1 first peer
* @param p2 second peer
* @return handle to the operation, NULL if connecting these two
* not running or underlay disallows)
*/
struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_connect (void *op_cls, struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2)
+GNUNET_TESTBED_overlay_connect (void *op_cls,
+ GNUNET_TESTBED_OperationCompletionCallback cb,
+ void *cb_cls,
+ struct GNUNET_TESTBED_Peer *p1,
+ struct GNUNET_TESTBED_Peer *p2)
{
struct OperationContext *opc;
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;
}