* @brief management of the knowledge about peers in this library
* (we know the peer ID, its host, pending operations, etc.)
* @author Christian Grothoff
+ * @author Sree Harsha Totakura
*/
+
#include "platform.h"
#include "testbed_api_peers.h"
#include "testbed_api.h"
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
opstart_peer_create (void *cls)
{
struct OperationContext *opc = cls;
size_t xc_size;
uint16_t msize;
- GNUNET_assert (OP_PEER_CREATE == opc->type);
+ GNUNET_assert (OP_PEER_CREATE == opc->type);
data = opc->data;
GNUNET_assert (NULL != data);
GNUNET_assert (NULL != data->peer);
msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->peer->host));
msg->peer_id = htonl (data->peer->unique_id);
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,
- (struct GNUNET_MessageHeader *) msg);
-};
+ GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
+}
/**
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
oprelease_peer_create (void *cls)
{
- struct OperationContext *opc = cls;
+ struct OperationContext *opc = cls;
if (OPC_STATE_FINISHED != opc->state)
{
/**
- * Function to called when a peer destroy operation is ready
+ * Function called when a peer destroy operation is ready
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
opstart_peer_destroy (void *cls)
{
struct OperationContext *opc = cls;
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER);
msg->peer_id = htonl (peer->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
- GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head,
- opc->c->ocq_tail, opc);
+ GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
GNUNET_TESTBED_queue_message_ (peer->controller, &msg->header);
}
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
oprelease_peer_destroy (void *cls)
{
struct OperationContext *opc = cls;
-
+
if (OPC_STATE_FINISHED != opc->state)
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
GNUNET_free (opc);
/**
- * Function to called when a peer start operation is ready
+ * Function called when a peer start operation is ready
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
opstart_peer_start (void *cls)
{
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));
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
oprelease_peer_start (void *cls)
{
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);
}
/**
- * Function to called when a peer stop operation is ready
+ * Function called when a peer stop operation is ready
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
opstart_peer_stop (void *cls)
{
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;
- GNUNET_assert (PS_STARTED == peer->state);
- opc->state = OPC_STATE_STARTED;
+ 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));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER);
msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
oprelease_peer_stop (void *cls)
{
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);
}
/**
- * Function to called when a peer get information operation is ready
+ * 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
+ * @return the PeerGetConfigurationMessage
+ */
+struct GNUNET_TESTBED_PeerGetConfigurationMessage *
+GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id,
+ uint64_t operation_id)
+{
+ struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
+
+ msg =
+ GNUNET_malloc (sizeof
+ (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
+ msg->header.size =
+ htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
+ msg->peer_id = htonl (peer_id);
+ msg->operation_id = GNUNET_htonll (operation_id);
+ return msg;
+}
+
+
+/**
+ * Function called when a peer get information operation is ready
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
opstart_peer_getinfo (void *cls)
{
struct OperationContext *opc = cls;
- struct PeerInfoData *data;
+ struct PeerInfoData *data;
struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
data = opc->data;
GNUNET_assert (NULL != data);
opc->state = OPC_STATE_STARTED;
- msg = GNUNET_malloc (sizeof (struct
- GNUNET_TESTBED_PeerGetConfigurationMessage));
- msg->header.size = htons
- (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
- msg->peer_id = htonl (data->peer->unique_id);
- msg->operation_id = GNUNET_htonll (opc->id);
+ msg =
+ GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id,
+ opc->id);
GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
}
*
* @param cls the closure from GNUNET_TESTBED_operation_create_()
*/
-static void
+static void
oprelease_peer_getinfo (void *cls)
{
struct OperationContext *opc = cls;
- struct PeerInfoData2 *data;
-
+ struct GNUNET_TESTBED_PeerInformation *data;
+
if (OPC_STATE_FINISHED != opc->state)
{
GNUNET_free_non_null (opc->data);
- GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
}
else
{
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 */
}
+/**
+ * Function called when a overlay connect operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_overlay_connect (void *cls)
+{
+ struct OperationContext *opc = cls;
+ struct GNUNET_TESTBED_OverlayConnectMessage *msg;
+ struct OverlayConnectData *data;
+
+ opc->state = OPC_STATE_STARTED;
+ data = opc->data;
+ GNUNET_assert (NULL != data);
+ msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
+ msg->header.size =
+ htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT);
+ 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);
+}
+
+
+/**
+ * Callback which will be called when overlay connect operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_overlay_connect (void *cls)
+{
+ struct OperationContext *opc = cls;
+
+ if (OPC_STATE_STARTED == opc->state)
+ {
+ GNUNET_free (opc->data);
+ GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ }
+ GNUNET_free (opc);
+}
+
/**
* Lookup a peer by ID.
- *
+ *
* @param id global peer ID assigned to the peer
* @return handle to the host, NULL on error
*/
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
- struct GNUNET_TESTBED_Controller *controller,
- struct GNUNET_TESTBED_Host *host,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_TESTBED_PeerCreateCallback cb,
- void *cls)
+ struct GNUNET_TESTBED_Controller
+ *controller,
+ struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_CONFIGURATION_Handle
+ *cfg, GNUNET_TESTBED_PeerCreateCallback cb,
+ void *cls)
{
struct GNUNET_TESTBED_Peer *peer;
struct PeerCreateData *data;
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,
- &oprelease_peer_create);
- GNUNET_TESTBED_operation_queue_insert_ (controller->opq_peer_create, opc->op);
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_create,
+ &oprelease_peer_create);
+ GNUNET_TESTBED_operation_queue_insert_ (controller->opq_parallel_operations,
+ opc->op);
return opc->op;
}
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
- struct GNUNET_TESTBED_Host *host,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_TESTBED_PeerCreateCallback cb,
- void *cls)
+ struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ GNUNET_TESTBED_PeerCreateCallback cb, void *cls)
{
static uint32_t id_gen;
- return GNUNET_TESTBED_peer_create_with_id_ (++id_gen,
- controller,
- host,
- cfg,
- cb, cls);
+ return GNUNET_TESTBED_peer_create_with_id_ (id_gen++, controller, host, cfg,
+ cb, cls);
}
/**
* 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,
- &oprelease_peer_start);
- GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
- return opc->op;
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_start,
+ &oprelease_peer_start);
+ GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+ opc->op);
+ return opc->op;
}
/**
* Stop the given peer. The handle remains valid (use
- * "GNUNET_TESTBED_peer_destroy" to fully clean up the
+ * "GNUNET_TESTBED_peer_destroy" to fully clean up the
* 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,
- &oprelease_peer_stop);
- GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_stop,
+ &oprelease_peer_stop);
+ GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+ opc->op);
return opc->op;
}
/**
- * 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->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
- &oprelease_peer_getinfo);
- GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
+ &oprelease_peer_getinfo);
+ GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+ opc->op);
return opc->op;
}
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct
+ GNUNET_CONFIGURATION_Handle *cfg)
{
// FIXME: handle locally or delegate...
GNUNET_break (0);
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,
- &oprelease_peer_destroy);
- GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create,
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_destroy,
+ &oprelease_peer_destroy);
+ GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
opc->op);
return opc->op;
}
/**
* Manipulate the P2P underlay topology by configuring a link
- * between two peers.
+ * between two peers.
*
* @param op_cls closure argument to give with the operation event
* @param p1 first peer
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_underlay_configure_link (void *op_cls,
- struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2,
- enum GNUNET_TESTBED_ConnectOption co, ...)
+ struct GNUNET_TESTBED_Peer *p1,
+ struct GNUNET_TESTBED_Peer *p2,
+ enum GNUNET_TESTBED_ConnectOption co,
+ ...)
{
GNUNET_break (0);
return NULL;
}
-
/**
* 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
*/
struct GNUNET_TESTBED_Operation *
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 GNUNET_TESTBED_Operation *op;
+ struct OperationContext *opc;
struct OverlayConnectData *data;
- struct GNUNET_TESTBED_OverlayConnectMessage *msg;
-
+
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;
- op = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Operation));
- op->controller = p1->controller;
- op->operation_id = op->controller->operation_counter++;
- op->type = OP_OVERLAY_CONNECT;
- op->data = data;
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
- msg->header.size = htons (sizeof (struct
- GNUNET_TESTBED_OverlayConnectMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT);
- msg->peer1 = htonl (p1->unique_id);
- msg->peer2 = htonl (p2->unique_id);
- msg->operation_id = GNUNET_htonll (op->operation_id);
- GNUNET_CONTAINER_DLL_insert_tail (op->controller->op_head,
- op->controller->op_tail, op);
- GNUNET_TESTBED_queue_message_ (op->controller,
- (struct GNUNET_MessageHeader *) msg);
- return NULL;
+ 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 = 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_overlay_connect_operations, opc->op);
+ return opc->op;
}