{
struct OperationContext *opc;
struct GNUNET_TESTBED_Peer *peer;
+ struct PeerEventData *data;
+ GNUNET_TESTBED_PeerChurnCallback pcc;
+ void *pcc_cls;
struct GNUNET_TESTBED_EventInformation event;
uint64_t op_id;
return GNUNET_YES;
}
GNUNET_assert ((OP_PEER_START == opc->type) || (OP_PEER_STOP == opc->type));
- peer = opc->data;
+ data = opc->data;
+ GNUNET_assert (NULL != data);
+ peer = data->peer;
GNUNET_assert (NULL != peer);
event.type = (enum GNUNET_TESTBED_EventType) ntohl (msg->event_type);
switch (event.type)
default:
GNUNET_assert (0); /* We should never reach this state */
}
+ pcc = data->pcc;
+ pcc_cls = data->pcc_cls;
+ GNUNET_free (data);
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
opc->state = OPC_STATE_FINISHED;
if (0 !=
if (NULL != c->cc)
c->cc (c->cc_cls, &event);
}
+ if (NULL != pcc)
+ pcc (pcc_cls, NULL);
return GNUNET_YES;
}
{
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);
}
void *pcc_cls)
{
struct OperationContext *opc;
+ struct PeerEventData *data;
- // FIXME: keep and call pcc!
+ 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->data = data;
opc->id = opc->c->operation_counter++;
opc->type = OP_PEER_START;
opc->op =
void *pcc_cls)
{
struct OperationContext *opc;
-
- // FIXME: keep and call pcc!
+ 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->data = data;
opc->id = opc->c->operation_counter++;
opc->type = OP_PEER_STOP;
opc->op =