* @param tc the task context
*/
static void
-do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n");
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
* @param tc the task context
*/
static void
-do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
static void
dht_disconnect_adapter (void *cls, void *op_result)
{
- if (NULL != op_result)
- GNUNET_DHT_disconnect (op_result);
+ GNUNET_assert (NULL != op_result);
+ GNUNET_assert (op_result == dht_handle);
+ GNUNET_DHT_disconnect (dht_handle);
+ dht_handle = NULL;
GNUNET_assert (PEER_SERVICE_CONNECT == sub_test);
GNUNET_assert (NULL != operation);
- operation = GNUNET_TESTBED_peer_stop (peer);
+ operation = GNUNET_TESTBED_peer_stop (peer, NULL, NULL);
GNUNET_assert (NULL != operation);
}
+/**
+ * Callback to be called when a service connect operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param ca_result the service handle returned from GNUNET_TESTBED_ConnectAdapter()
+ * @param emsg error message in case the operation has failed; will be NULL if
+ * operation has executed successfully.
+ */
+static void
+service_connect_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
+ void *ca_result, const char *emsg)
+{
+ switch (sub_test)
+ {
+ case PEER_SERVICE_CONNECT:
+ GNUNET_assert (operation == op);
+ GNUNET_assert (NULL == emsg);
+ GNUNET_assert (NULL == cls);
+ GNUNET_assert (ca_result == dht_handle);
+ GNUNET_TESTBED_operation_done (operation); /* This results in call to
+ * disconnect adapter */
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+}
+
+
+
+/**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed; will be NULL if the
+ * operation is successfull
+ */
+static void
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
+ const struct GNUNET_TESTBED_PeerInformation *pinfo,
+ const char *emsg)
+{
+ switch (sub_test)
+ {
+ case PEER_GETCONFIG:
+ GNUNET_assert (NULL != pinfo);
+ GNUNET_assert (NULL == emsg);
+ GNUNET_assert (NULL == cb_cls);
+ GNUNET_assert (operation == op);
+ GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+ GNUNET_assert (NULL != pinfo->result.cfg);
+ sub_test = PEER_DESTROY;
+ GNUNET_TESTBED_operation_done (operation);
+ operation = GNUNET_TESTBED_peer_destroy (peer);
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+}
+
/**
* Signature of the event handler function called by the
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
switch (sub_test)
{
- case PEER_GETCONFIG:
- GNUNET_assert (event->details.operation_finished.operation == operation);
- GNUNET_assert (NULL == event->details.operation_finished.op_cls);
- GNUNET_assert (NULL == event->details.operation_finished.emsg);
- GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION ==
- event->details.operation_finished.pit);
- GNUNET_assert (NULL != event->details.operation_finished.op_result.cfg);
- sub_test = PEER_DESTROY;
- GNUNET_TESTBED_operation_done (operation);
- operation = GNUNET_TESTBED_peer_destroy (peer);
- break;
case PEER_DESTROY:
GNUNET_assert (event->details.operation_finished.operation == operation);
GNUNET_assert (NULL == event->details.operation_finished.op_cls);
GNUNET_assert (NULL == event->details.operation_finished.emsg);
- GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
- event->details.operation_finished.pit);
- GNUNET_assert (NULL ==
- event->details.operation_finished.op_result.generic);
+ GNUNET_assert (NULL == event->details.operation_finished.generic);
GNUNET_TESTBED_operation_done (operation);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
break;
GNUNET_assert (event->details.operation_finished.operation == operation);
GNUNET_assert (NULL == event->details.operation_finished.op_cls);
GNUNET_assert (NULL == event->details.operation_finished.emsg);
- GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
- event->details.operation_finished.pit);
GNUNET_assert (NULL != dht_handle);
- GNUNET_assert (event->details.operation_finished.op_result.generic ==
- dht_handle);
- GNUNET_TESTBED_operation_done (operation); /* This results in call to
- * disconnect adapter */
+ GNUNET_assert (event->details.operation_finished.generic == dht_handle);
break;
- case OTHER:
+ default:
GNUNET_assert (0);
break;
}
GNUNET_assert (OTHER == sub_test);
GNUNET_TESTBED_operation_done (operation);
operation =
- GNUNET_TESTBED_service_connect (NULL, peer, "dht", &dht_connect_adapter,
- &dht_disconnect_adapter, NULL);
+ GNUNET_TESTBED_service_connect (NULL, peer, "dht",
+ &service_connect_comp_cb, NULL,
+ &dht_connect_adapter,
+ &dht_disconnect_adapter, NULL);
GNUNET_assert (NULL != operation);
break;
case GNUNET_TESTBED_ET_PEER_STOP:
result = GNUNET_YES;
sub_test = PEER_GETCONFIG;
GNUNET_TESTBED_operation_done (operation);
- operation =
- GNUNET_TESTBED_peer_get_information (peer,
- GNUNET_TESTBED_PIT_CONFIGURATION);
+ operation =
+ GNUNET_TESTBED_peer_get_information (peer,
+ GNUNET_TESTBED_PIT_CONFIGURATION,
+ &peerinfo_cb, NULL);
break;
default:
GNUNET_assert (0); /* We should never reach this state */
GNUNET_assert (NULL != peer_ptr);
*peer_ptr = peer;
GNUNET_TESTBED_operation_done (operation);
- operation = GNUNET_TESTBED_peer_start (peer);
+ operation = GNUNET_TESTBED_peer_start (peer, NULL, NULL);
GNUNET_assert (NULL != operation);
}
return 1;
return 0;
}
+
+/* end of test_testbed_api.c */