X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftest_testbed_api.c;h=97ca15c5f9ab9a78b6f1c0ee79de3ae399ddf20d;hb=5e1efe185cf484018f53dd33d64e546ac042fdee;hp=75e11211f1f1da0c5411c78c3c07372fc5cefe32;hpb=d0d39def77f1f81dd83823e0fe2cfe84a5393a74;p=oweals%2Fgnunet.git

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 75e11211f..97ca15c5f 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -1,6 +1,6 @@
 /*
       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
@@ -26,7 +26,7 @@
 
 #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"
 
@@ -83,9 +83,9 @@ static struct GNUNET_CONFIGURATION_Handle *cfg;
 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
@@ -197,13 +197,13 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @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;
 }
 
 
@@ -215,12 +215,12 @@ dht_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @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 (NULL, peer, NULL, NULL);
@@ -247,7 +247,7 @@ service_connect_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
     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;
@@ -318,8 +318,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
       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);
@@ -334,8 +334,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     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:
@@ -423,7 +423,7 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int status
   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, cfg, 0);
@@ -451,7 +451,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   cfg = GNUNET_CONFIGURATION_dup (config);
   host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0);
   FAIL_TEST (NULL != host, return);
-  cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
+  cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb,
                                         NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply