opstart_peer_create (void *cls)
{
struct OperationContext *opc = cls;
- struct PeerCreateData *data;
+ struct PeerCreateData *data = opc->data;
struct GNUNET_TESTBED_PeerCreateMessage *msg;
char *config;
char *xconfig;
size_t xc_size;
uint16_t msize;
- GNUNET_assert (OP_PEER_CREATE == opc->type);
- GNUNET_assert (NULL != (data = opc->data));
+ GNUNET_assert (OP_PEER_CREATE == opc->type);
+ GNUNET_assert (NULL != data);
GNUNET_assert (NULL != data->peer);
opc->state = OPC_STATE_STARTED;
config = GNUNET_CONFIGURATION_serialize (data->cfg, &c_size);
msg->operation_id = GNUNET_htonll (opc->id);
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);
+ msg->config_size = htons ((uint16_t) c_size);
GNUNET_TESTBED_insert_opc_ (opc->c, opc);
GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
}
opstart_peer_destroy (void *cls)
{
struct OperationContext *opc = cls;
- struct GNUNET_TESTBED_Peer *peer;
+ struct GNUNET_TESTBED_Peer *peer = opc->data;
struct GNUNET_TESTBED_PeerDestroyMessage *msg;
GNUNET_assert (OP_PEER_DESTROY == opc->type);
- GNUNET_assert (NULL != (peer = opc->data));
+ GNUNET_assert (NULL != peer);
opc->state = OPC_STATE_STARTED;
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
+ msg = GNUNET_new (struct GNUNET_TESTBED_PeerDestroyMessage);
msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER);
msg->peer_id = htonl (peer->unique_id);
GNUNET_assert (OP_PEER_START == opc->type);
GNUNET_assert (NULL != (data = opc->data));
GNUNET_assert (NULL != (peer = data->peer));
- GNUNET_assert ((PS_CREATED == peer->state) || (PS_STOPPED == peer->state));
+ GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED == peer->state));
opc->state = OPC_STATE_STARTED;
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
+ msg = GNUNET_new (struct GNUNET_TESTBED_PeerStartMessage);
msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_START_PEER);
msg->peer_id = htonl (peer->unique_id);
GNUNET_assert (NULL != (data = opc->data));
GNUNET_assert (NULL != (peer = data->peer));
- GNUNET_assert (PS_STARTED == peer->state);
+ GNUNET_assert (TESTBED_PS_STARTED == peer->state);
opc->state = OPC_STATE_STARTED;
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
+ msg = GNUNET_new (struct GNUNET_TESTBED_PeerStopMessage);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER);
msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
msg->peer_id = htonl (peer->unique_id);
(struct GNUNET_TESTBED_PeerGetConfigurationMessage));
msg->header.size =
htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION);
msg->peer_id = htonl (peer_id);
msg->operation_id = GNUNET_htonll (operation_id);
return msg;
opstart_peer_getinfo (void *cls)
{
struct OperationContext *opc = cls;
- struct PeerInfoData *data;
+ struct PeerInfoData *data = opc->data;
struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
- GNUNET_assert (NULL != (data = opc->data));
+ GNUNET_assert (NULL != data);
opc->state = OPC_STATE_STARTED;
msg =
GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id,
GNUNET_free (opc->data);
break;
case OPC_STATE_FINISHED:
- GNUNET_assert (NULL != (data = opc->data));
+ data = opc->data;
+ GNUNET_assert (NULL != data);
switch (data->pit)
{
case GNUNET_TESTBED_PIT_CONFIGURATION:
opc->state = OPC_STATE_STARTED;
data = opc->data;
GNUNET_assert (NULL != data);
- data->tslot_index = GNUNET_TESTBED_get_tslot_ (data->p1->host, data);
- data->tstart = GNUNET_TIME_absolute_get ();
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
+ msg = GNUNET_new (struct GNUNET_TESTBED_OverlayConnectMessage);
msg->header.size =
htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT);
oprelease_overlay_connect (void *cls)
{
struct OperationContext *opc = cls;
- struct GNUNET_TIME_Relative duration;
struct OverlayConnectData *data;
data = opc->data;
case OPC_STATE_INIT:
break;
case OPC_STATE_STARTED:
- (void) GNUNET_TESTBED_release_time_slot_ (data->p1->host, data->tslot_index,
- data);
GNUNET_TESTBED_remove_opc_ (opc->c, opc);
break;
case OPC_STATE_FINISHED:
- duration = GNUNET_TIME_absolute_get_duration (data->tstart);
- GNUNET_TESTBED_update_time_slot_ (data->p1->host, data->tslot_index, data,
- duration, data->failed);
+ break;
}
GNUNET_free (data);
GNUNET_free (opc);
}
+/**
+ * Function called when a peer reconfigure operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_reconfigure (void *cls)
+{
+ struct OperationContext *opc = cls;
+ struct PeerReconfigureData *data = opc->data;
+ struct GNUNET_TESTBED_PeerReconfigureMessage *msg;
+ char *xconfig;
+ size_t xc_size;
+ uint16_t msize;
+
+ opc->state = OPC_STATE_STARTED;
+ GNUNET_assert (NULL != data);
+ xc_size = GNUNET_TESTBED_compress_config_ (data->config, data->cfg_size,
+ &xconfig);
+ GNUNET_free (data->config);
+ data->config = NULL;
+ GNUNET_assert (xc_size <= UINT16_MAX);
+ msize = (uint16_t) xc_size +
+ sizeof (struct GNUNET_TESTBED_PeerReconfigureMessage);
+ msg = GNUNET_realloc (xconfig, msize);
+ (void) memmove (&msg[1], msg, xc_size);
+ msg->header.size = htons (msize);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER);
+ msg->peer_id = htonl (data->peer->unique_id);
+ msg->operation_id = GNUNET_htonll (opc->id);
+ msg->config_size = htons (data->cfg_size);
+ GNUNET_free (data);
+ opc->data = NULL;
+ GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+ GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
+}
+
+
+/**
+ * Callback which will be called when a peer reconfigure operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_reconfigure (void *cls)
+{
+ struct OperationContext *opc = cls;
+ struct PeerReconfigureData *data = opc->data;
+
+ switch (opc->state)
+ {
+ case OPC_STATE_INIT:
+ GNUNET_free (data->config);
+ GNUNET_free (data);
+ break;
+ case OPC_STATE_STARTED:
+ GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+ break;
+ case OPC_STATE_FINISHED:
+ break;
+ }
+ GNUNET_free (opc);
+}
+
+
/**
* Lookup a peer by ID.
*
struct OperationContext *opc;
static uint32_t id_gen;
- peer = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer));
+ peer = GNUNET_new (struct GNUNET_TESTBED_Peer);
peer->controller = controller;
peer->host = host;
peer->unique_id = id_gen++;
- peer->state = PS_INVALID;
- data = GNUNET_malloc (sizeof (struct PeerCreateData));
+ peer->state = TESTBED_PS_INVALID;
+ data = GNUNET_new (struct PeerCreateData);
data->host = host;
data->cfg = cfg;
data->cb = cb;
data->cls = cls;
data->peer = peer;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->c = controller;
opc->data = data;
opc->id = GNUNET_TESTBED_get_next_op_id (controller);
struct OperationContext *opc;
struct PeerEventData *data;
- data = GNUNET_malloc (sizeof (struct PeerEventData));
+ data = GNUNET_new (struct PeerEventData);
data->peer = peer;
data->pcc = pcc;
data->pcc_cls = pcc_cls;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->c = peer->controller;
opc->data = data;
opc->op_cls = op_cls;
struct OperationContext *opc;
struct PeerEventData *data;
- data = GNUNET_malloc (sizeof (struct PeerEventData));
+ data = GNUNET_new (struct PeerEventData);
data->peer = peer;
data->pcc = pcc;
data->pcc_cls = pcc_cls;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->c = peer->controller;
opc->data = data;
opc->op_cls = op_cls;
* with event type GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
* operation is available. Instead, the GNUNET_TESTBED_PeerInfoCallback() will
* be called.
+ * The peer information in the callback is valid until the operation is canceled.
*
* @param peer peer to request information about
* @param pit desired information
GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC != pit);
GNUNET_assert (NULL != cb);
- data = GNUNET_malloc (sizeof (struct PeerInfoData));
+ data = GNUNET_new (struct PeerInfoData);
data->peer = peer;
data->pit = pit;
data->cb = cb;
data->cb_cls = cb_cls;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->c = peer->controller;
opc->data = data;
opc->type = OP_PEER_INFO;
const struct
GNUNET_CONFIGURATION_Handle *cfg)
{
- // FIXME: handle locally or delegate...
- GNUNET_break (0);
- return NULL;
+ struct OperationContext *opc;
+ struct PeerReconfigureData *data;
+ size_t csize;
+
+ data = GNUNET_new (struct PeerReconfigureData);
+ data->peer = peer;
+ data->config = GNUNET_CONFIGURATION_serialize (cfg, &csize);
+ if (NULL == data->config)
+ {
+ GNUNET_free (data);
+ return NULL;
+ }
+ if (csize > UINT16_MAX)
+ {
+ GNUNET_break (0);
+ GNUNET_free (data->config);
+ GNUNET_free (data);
+ return NULL;
+ }
+ data->cfg_size = (uint16_t) csize;
+ opc = GNUNET_new (struct OperationContext);
+ opc->c = peer->controller;
+ opc->data = data;
+ opc->type = OP_PEER_RECONFIGURE;
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+ opc->op =
+ GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_reconfigure,
+ &oprelease_peer_reconfigure);
+ GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+ opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+ return opc->op;
}
{
struct OperationContext *opc;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->data = peer;
opc->c = peer->controller;
opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller);
struct OperationContext *opc;
struct OverlayConnectData *data;
- GNUNET_assert ((PS_STARTED == p1->state) && (PS_STARTED == p2->state));
- data = GNUNET_malloc (sizeof (struct OverlayConnectData));
+ GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED == p2->state));
+ data = GNUNET_new (struct OverlayConnectData);
data->p1 = p1;
data->p2 = p2;
data->cb = cb;
data->cb_cls = cb_cls;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->data = data;
opc->c = p1->controller;
opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opstart_manage_service (void *cls)
{
struct OperationContext *opc = cls;
+ struct ManageServiceData *data = opc->data;
struct GNUNET_TESTBED_ManagePeerServiceMessage *msg;
- struct ManageServiceData *data;
-
- GNUNET_assert (NULL != (data = opc->data));
+
+ GNUNET_assert (NULL != data);
msg = GNUNET_malloc (data->msize);
msg->header.size = htons (data->msize);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_MANAGE_PEER_SERVICE);
msg->peer_id = htonl (data->peer->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
msg->start = (uint8_t) data->start;
- (void) memcpy (&msg[1], data->service_name, data->msize
+ (void) memcpy (&msg[1], data->service_name, data->msize
- sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage));
GNUNET_free (data->service_name);
data->service_name = NULL;
struct OperationContext *opc;
size_t msize;
- GNUNET_assert (PS_STARTED == peer->state); /* peer is not running? */
+ GNUNET_assert (TESTBED_PS_STARTED == peer->state); /* peer is not running? */
msize = strlen (service_name) + 1;
msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage);
if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize)
return NULL;
- data = GNUNET_malloc (sizeof (struct ManageServiceData));
+ data = GNUNET_new (struct ManageServiceData);
data->cb = cb;
data->cb_cls = cb_cls;
data->peer = peer;
data->service_name = GNUNET_strdup (service_name);
data->start = start;
data->msize = (uint16_t) msize;
- opc = GNUNET_malloc (sizeof (struct OperationContext));
+ opc = GNUNET_new (struct OperationContext);
opc->data = data;
opc->c = peer->controller;
opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
projects / oweals / gnunet.git / blobdiff