/*
This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_dht_service.h"
+#include "gnunet_arm_service.h"
#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
static struct GNUNET_TESTBED_Operation *operation;
/**
- * Handle to peer's DHT service
+ * Handle to peer's ARM service
*/
-static struct GNUNET_DHT_Handle *dht_handle;
+static struct GNUNET_ARM_Handle *arm_handle;
/**
* Abort task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
/**
* The testing result
* @param tc the task context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n");
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
if (NULL != reg_handle)
GNUNET_TESTBED_cancel_registration (reg_handle);
#define FAIL_TEST(cond, ret) do { \
if (!(cond)) { \
GNUNET_break(0); \
- if (GNUNET_SCHEDULER_NO_TASK != abort_task) \
+ if (NULL != abort_task) \
GNUNET_SCHEDULER_cancel (abort_task); \
- abort_task = GNUNET_SCHEDULER_NO_TASK; \
+ abort_task = NULL; \
GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \
ret; \
} \
* @param tc the task context
*/
static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
- do_shutdown (cls, tc);
+ abort_task = NULL;
+ do_shutdown (cls);
}
* @return service handle to return in 'op_result', NULL on error
*/
static void *
-dht_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+arm_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
FAIL_TEST (NULL == cls, return NULL);
FAIL_TEST (OTHER == sub_test, return NULL);
sub_test = PEER_SERVICE_CONNECT;
- dht_handle = GNUNET_DHT_connect (cfg, 10);
- return dht_handle;
+ arm_handle = GNUNET_ARM_connect (cfg, NULL, NULL);
+ return arm_handle;
}
* @param op_result service handle returned from the connect adapter
*/
static void
-dht_disconnect_adapter (void *cls, void *op_result)
+arm_disconnect_adapter (void *cls, void *op_result)
{
FAIL_TEST (NULL != op_result, return);
- FAIL_TEST (op_result == dht_handle, return);
- GNUNET_DHT_disconnect (dht_handle);
- dht_handle = NULL;
+ FAIL_TEST (op_result == arm_handle, return);
+ GNUNET_ARM_disconnect_and_free (arm_handle);
+ arm_handle = NULL;
FAIL_TEST (PEER_SERVICE_CONNECT == sub_test, return);
FAIL_TEST (NULL != operation, return);
- operation = GNUNET_TESTBED_peer_stop (peer, NULL, NULL);
+ operation = GNUNET_TESTBED_peer_stop (NULL, peer, NULL, NULL);
FAIL_TEST (NULL != operation, return);
}
FAIL_TEST (operation == op, return);
FAIL_TEST (NULL == emsg, return);
FAIL_TEST (NULL == cls, return);
- FAIL_TEST (ca_result == dht_handle, return);
+ FAIL_TEST (ca_result == arm_handle, return);
GNUNET_TESTBED_operation_done (operation); /* This results in call to
* disconnect adapter */
break;
switch (sub_test)
{
case PEER_DESTROY:
- FAIL_TEST (event->details.operation_finished.operation == operation, return);
- FAIL_TEST (NULL == event->details.operation_finished.op_cls, return);
+ FAIL_TEST (event->op == operation, return);
+ FAIL_TEST (NULL == event->op_cls, return);
FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
FAIL_TEST (NULL == event->details.operation_finished.generic, return);
GNUNET_TESTBED_operation_done (operation);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
break;
case PEER_SERVICE_CONNECT:
- FAIL_TEST (event->details.operation_finished.operation == operation, return);
- FAIL_TEST (NULL == event->details.operation_finished.op_cls, return);
+ FAIL_TEST (event->op == operation, return);
+ FAIL_TEST (NULL == event->op_cls, return);
FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
- FAIL_TEST (NULL != dht_handle, return);
- FAIL_TEST (event->details.operation_finished.generic == dht_handle, return);
+ FAIL_TEST (NULL != arm_handle, return);
+ FAIL_TEST (event->details.operation_finished.generic == arm_handle, return);
break;
default:
FAIL_TEST (0, return);
operation =
GNUNET_TESTBED_service_connect (NULL, peer, "dht",
&service_connect_comp_cb, NULL,
- &dht_connect_adapter,
- &dht_disconnect_adapter, NULL);
+ &arm_connect_adapter,
+ &arm_disconnect_adapter, NULL);
FAIL_TEST (NULL != operation, return);
break;
case GNUNET_TESTBED_ET_PEER_STOP:
* GNUNET_TESTBED_controller_stop() shouldn't be called in this case
*/
static void
-status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, int status)
+status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int status)
{
uint64_t event_mask;
cp = NULL;
FAIL_TEST (0, return);
return;
- }
+ }
event_mask = 0;
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);
event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED);
controller =
- GNUNET_TESTBED_controller_connect (cfg, host, event_mask, &controller_cb,
+ GNUNET_TESTBED_controller_connect (host, event_mask, &controller_cb,
NULL);
FAIL_TEST (NULL != controller, return);
- neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, 0);
+ neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, cfg, 0);
FAIL_TEST (NULL != neighbour, return);
reg_handle =
GNUNET_TESTBED_register_host (controller, neighbour, ®istration_comp,
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
- host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
- FAIL_TEST (NULL != host, return);
cfg = GNUNET_CONFIGURATION_dup (config);
- cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
+ host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0);
+ FAIL_TEST (NULL != host, return);
+ cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb,
NULL);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply