fixes for controller_start() API changes

1 files changed, 13 insertions, 6 deletions

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 1fdb7169a..849f5ddd4 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -43,6 +43,11 @@
   GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
 
 /**
+ * The testing system we work with
+ */
+struct GNUNET_TESTING_System *test_system;
+
+/**
  * Our localhost
  */
 static struct GNUNET_TESTBED_Host *host;
@@ -75,7 +80,7 @@ static struct GNUNET_TESTBED_Peer *peer;
 /**
  * Handle to configuration
  */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Handle to operation
@@ -107,10 +112,12 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL != reg_handle)
     GNUNET_TESTBED_cancel_registration (reg_handle);
   GNUNET_TESTBED_controller_disconnect (controller);
+  GNUNET_CONFIGURATION_destroy (cfg);
   if (NULL != cp)
     GNUNET_TESTBED_controller_stop (cp);
   GNUNET_TESTBED_host_destroy (neighbour);
   GNUNET_TESTBED_host_destroy (host);
+  GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
 }
 
 
@@ -182,19 +189,19 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *config)
 {
   uint64_t event_mask;
-  struct GNUNET_CONFIGURATION_Handle *cdup;
 
-  cfg = config;
+  test_system = GNUNET_TESTING_system_create ("test_testbed", 
+                                              "127.0.0.1");
   host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
   GNUNET_assert (NULL != host);
-  cdup = GNUNET_CONFIGURATION_dup (config);
-  cp = GNUNET_TESTBED_controller_start (system, host, cdup, NULL, NULL);
+  cfg = GNUNET_CONFIGURATION_dup (config);
+  cp = GNUNET_TESTBED_controller_start (test_system, host, cfg, NULL, NULL);
   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 (config, host, event_mask,
+  controller = GNUNET_TESTBED_controller_connect (cfg, host, event_mask,
                                                   &controller_cb, NULL);
   GNUNET_assert (NULL != controller);
   neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, 0);