fixes and removed slave2 from controller link test

3 files changed, 7 insertions, 28 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index c333d6b64..7398ee19c 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -2155,8 +2155,8 @@ shutdown_task (void *cls,
   for (id = 0; id < slave_list_size; id++)
     if (NULL != slave_list[id])
     {
-      GNUNET_assert (NULL != slave_list[id]->controller);
-      GNUNET_TESTBED_controller_disconnect (slave_list[id]->controller);
+      if (NULL != slave_list[id]->controller)
+        GNUNET_TESTBED_controller_disconnect (slave_list[id]->controller);
       if (NULL != slave_list[id]->controller_proc)
         GNUNET_TESTBED_controller_stop (slave_list[id]->controller_proc);
     }
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 29e5de603..99f0d7fd9 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -63,11 +63,6 @@ enum Stage
     SLAVE1_REGISTERED,
 
     /**
-     * The second slave has been registered at the master controller
-     */
-    SLAVE2_REGISTERED,
-
-    /**
      * Final stage
      */
     SUCCESS
@@ -95,11 +90,6 @@ static struct GNUNET_TESTBED_Controller *mc;
 static struct GNUNET_TESTBED_Host *slave;
 
 /**
- * Another slave host for running another slave controller
- */
-static struct GNUNET_TESTBED_Host *slave2;
-
-/**
  * Slave host registration handle
  */
 static struct GNUNET_TESTBED_HostRegistrationHandle *rh;
@@ -140,8 +130,6 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_TESTBED_controller_disconnect (mc);
   if (NULL != cp)
     GNUNET_TESTBED_controller_stop (cp);
-  if (NULL != slave2)
-    GNUNET_TESTBED_host_destroy (slave2);
   if (NULL != slave)
     GNUNET_TESTBED_host_destroy (slave);
   if (NULL != host)
@@ -197,19 +185,10 @@ registration_cont (void *cls, const char *emsg)
   {
   case MASTER_STARTED:
     GNUNET_assert (NULL == emsg);
-    result = SLAVE1_REGISTERED;
-    slave2 = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
-    GNUNET_assert (NULL != slave2);
-    rh = GNUNET_TESTBED_register_host (mc, slave2, &registration_cont, NULL);
-    GNUNET_assert (NULL != rh);
-    break;
-  case SLAVE1_REGISTERED:
-    GNUNET_assert (NULL == emsg);
     GNUNET_assert (NULL != mc);
-    result = SLAVE2_REGISTERED;
+    result = SLAVE1_REGISTERED;
     GNUNET_assert (NULL != cfg);
     GNUNET_TESTBED_controller_link (mc, slave, NULL, cfg, GNUNET_YES);
-    //GNUNET_TESTBED_controller_link (mc, host, slave
     result = SUCCESS;
     GNUNET_SCHEDULER_add_delayed 
       (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3),
@@ -217,7 +196,7 @@ registration_cont (void *cls, const char *emsg)
     break;
   case INIT:
   case SUCCESS:
-  case SLAVE2_REGISTERED:
+  case SLAVE1_REGISTERED:
     GNUNET_assert (0);
   }
 }
@@ -248,7 +227,7 @@ status_cb (void *cls,
                                             &controller_cb, NULL);
     GNUNET_assert (NULL != mc);
     result = MASTER_STARTED;
-    slave = GNUNET_TESTBED_host_create_with_id (1, "127.0.0.1", NULL, 0);
+    slave = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
     GNUNET_assert (NULL != slave);
     rh = GNUNET_TESTBED_register_host (mc, slave, &registration_cont, NULL);
     GNUNET_assert (NULL != rh);
@@ -271,7 +250,7 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *config)
 {
-  host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
+  host = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0);
   GNUNET_assert (NULL != host);
   cfg = GNUNET_CONFIGURATION_dup (config);
   cp =
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index f4cc6fc6b..817abd8e9 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -238,7 +238,7 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id,
 
   if ((id < host_list_size) && (NULL != host_list[id]))
   {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Host with id: %u already created\n");
+    LOG (GNUNET_ERROR_TYPE_WARNING, "Host with id: %u already created\n", id);
     return NULL;
   }
   host = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host));