/*
This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
+ (C) 2008--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
enum State
{
- /**
- * Initial state
- */
+ /**
+ * Initial state
+ */
INIT,
- /**
- * The configuration request has been sent
- */
+ /**
+ * The configuration request has been sent
+ */
CFG_REQUEST_QUEUED,
- /**
- * connected to service
- */
- SERVICE_CONNECTED,
-
- /**
- *
- */
+ /**
+ * connected to service
+ */
+ SERVICE_CONNECTED
};
*/
void *op_result;
+ /**
+ * The operation completion callback
+ */
+ GNUNET_TESTBED_ServiceConnectCompletionCallback cb;
+
+ /**
+ * The closure for operation completion callback
+ */
+ void *cb_cls;
+
/**
* State information
*/
configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
{
struct ServiceConnectData *data = cls;
- const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *imsg;
struct GNUNET_TESTBED_Controller *c;
+ const char *emsg;
struct GNUNET_TESTBED_EventInformation info;
+ uint16_t mtype;
- imsg =
- (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg;
- data->cfg = GNUNET_TESTBED_get_config_from_peerinfo_msg_ (imsg);
- data->op_result = data->ca (data->cada_cls, data->cfg);
+ c = data->peer->controller;
+ mtype = ntohs (msg->type);
+ emsg = NULL;
info.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
- info.details.operation_finished.operation = data->operation;
- info.details.operation_finished.op_cls = data->op_cls;
+ info.op = data->operation;
+ info.op_cls = data->op_cls;
+ if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT == mtype)
+ {
+ emsg =
+ GNUNET_TESTBED_parse_error_string_ ((const struct
+ GNUNET_TESTBED_OperationFailureEventMessage
+ *) msg);
+ if (NULL == emsg)
+ emsg = "Unknown error";
+ info.details.operation_finished.emsg = emsg;
+ info.details.operation_finished.generic = NULL;
+ goto call_cb;
+ }
+ data->cfg = GNUNET_TESTBED_extract_config_ (msg);
+ GNUNET_assert (NULL == data->op_result);
+ data->op_result = data->ca (data->cada_cls, data->cfg);
info.details.operation_finished.emsg = NULL;
- info.details.operation_finished.pit = GNUNET_TESTBED_PIT_GENERIC;
- info.details.operation_finished.op_result.generic = data->op_result;
- c = data->peer->controller;
+ info.details.operation_finished.generic = data->op_result;
data->state = SERVICE_CONNECTED;
+
+call_cb:
if ((0 != (GNUNET_TESTBED_ET_OPERATION_FINISHED & c->event_mask)) &&
(NULL != c->cc))
c->cc (c->cc_cls, &info);
+ if (NULL != data->cb)
+ data->cb (data->cb_cls, data->operation, data->op_result, emsg);
}
GNUNET_assert (NULL != data);
GNUNET_assert (NULL != data->peer);
c = data->peer->controller;
- op_id = c->operation_counter++;
+ op_id = GNUNET_TESTBED_get_next_op_id (c);
msg =
GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id, op_id);
data->opc =
* callback. The 'ca' callback is used to create the connection
* when the time is right; the 'da' callback will be used to
* destroy the connection (upon 'GNUNET_TESTBED_operation_done').
- * 'GNUNET_TESTBED_operation_cancel' can be used to abort this
+ * 'GNUNET_TESTBED_operation_done' can be used to abort this
* operation until the event callback has been called.
*
* @param op_cls closure to pass in operation event
* @param peer peer that runs the service
* @param service_name name of the service to connect to
+ * @param cb the callback to call when this operation finishes
+ * @param cb_cls closure for the above callback
* @param ca helper function to establish the connection
* @param da helper function to close the connection
* @param cada_cls closure for ca and da
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
const char *service_name,
+ GNUNET_TESTBED_ServiceConnectCompletionCallback
+ cb, void *cb_cls,
GNUNET_TESTBED_ConnectAdapter ca,
GNUNET_TESTBED_DisconnectAdapter da,
void *cada_cls)
{
struct ServiceConnectData *data;
- data = GNUNET_malloc (sizeof (struct ServiceConnectData));
+ data = GNUNET_new (struct ServiceConnectData);
data->ca = ca;
data->da = da;
data->cada_cls = cada_cls;
data->op_cls = op_cls;
data->peer = peer;
data->state = INIT;
+ data->cb = cb;
+ data->cb_cls = cb_cls;
data->operation =
GNUNET_TESTBED_operation_create_ (data, &opstart_service_connect,
&oprelease_service_connect);
GNUNET_TESTBED_operation_queue_insert_ (peer->
controller->opq_parallel_operations,
data->operation);
+ GNUNET_TESTBED_operation_begin_wait_ (data->operation);
return data->operation;
}