global reindent, now with uncrustify hook enabled

1 files changed, 394 insertions, 392 deletions

diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index ffcbebf00..55ec184ea 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -45,17 +45,18 @@
 /**
  * Generic logging shortcut
  */
-#define LOG(kind, ...) GNUNET_log(kind, __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
 
 /**
  * Debug logging shorthand
  */
-#define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+#define LOG_DEBUG(...) LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
 
 /**
  * Different stages in testing
  */
-enum Stage {
+enum Stage
+{
   /**
    * Initial stage
    */
@@ -292,17 +293,17 @@ static enum Stage result;
  */
 #define FAIL_TEST(cond)                       \
   do                                          \
-    {                                           \
-      if (!(cond))                             \
-        {                                         \
-          GNUNET_break(0);                       \
-          if (NULL != abort_task)                 \
-          GNUNET_SCHEDULER_cancel (abort_task); \
-          abort_task = NULL;                      \
-          GNUNET_SCHEDULER_shutdown();           \
-          return;                                 \
-        }                                         \
-    } while (0)
+  {                                           \
+    if (! (cond))                             \
+    {                                         \
+      GNUNET_break (0);                       \
+      if (NULL != abort_task)                 \
+        GNUNET_SCHEDULER_cancel (abort_task); \
+      abort_task = NULL;                      \
+      GNUNET_SCHEDULER_shutdown ();           \
+      return;                                 \
+    }                                         \
+  } while (0)
 
 
 /**
@@ -311,40 +312,40 @@ static enum Stage result;
  * @param cls NULL
  */
 static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
 {
   if (NULL != abort_task)
-    GNUNET_SCHEDULER_cancel(abort_task);
+    GNUNET_SCHEDULER_cancel (abort_task);
   if (NULL != delay_task_id)
-    {
-      GNUNET_SCHEDULER_cancel(delay_task_id);
-      delay_task_id = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (delay_task_id);
+    delay_task_id = NULL;
+  }
   if (NULL != hc_handle)
-    GNUNET_TESTBED_is_host_habitable_cancel(hc_handle);
+    GNUNET_TESTBED_is_host_habitable_cancel (hc_handle);
   if (NULL != op)
-    {
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-    }
+  {
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+  }
   if (NULL != mc)
-    GNUNET_TESTBED_controller_disconnect(mc);
+    GNUNET_TESTBED_controller_disconnect (mc);
   if (NULL != cp)
-    GNUNET_TESTBED_controller_stop(cp);
+    GNUNET_TESTBED_controller_stop (cp);
   if (NULL != slave3)
-    GNUNET_TESTBED_host_destroy(slave3);
+    GNUNET_TESTBED_host_destroy (slave3);
   if (NULL != slave2)
-    GNUNET_TESTBED_host_destroy(slave2);
+    GNUNET_TESTBED_host_destroy (slave2);
   if (NULL != slave)
-    GNUNET_TESTBED_host_destroy(slave);
+    GNUNET_TESTBED_host_destroy (slave);
   if (NULL != host)
-    GNUNET_TESTBED_host_destroy(host);
+    GNUNET_TESTBED_host_destroy (host);
   if (NULL != cfg)
-    GNUNET_CONFIGURATION_destroy(cfg);
+    GNUNET_CONFIGURATION_destroy (cfg);
   if (NULL != cfg3)
-    GNUNET_CONFIGURATION_destroy(cfg3);
+    GNUNET_CONFIGURATION_destroy (cfg3);
   if (NULL != rh)
-    GNUNET_TESTBED_cancel_registration(rh);
+    GNUNET_TESTBED_cancel_registration (rh);
 }
 
 
@@ -354,11 +355,11 @@ do_shutdown(void *cls)
  * @param cls NULL
  */
 static void
-do_abort(void *cls)
+do_abort (void *cls)
 {
-  LOG(GNUNET_ERROR_TYPE_WARNING, "Aborting in stage %d\n", result);
+  LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting in stage %d\n", result);
   abort_task = NULL;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -369,11 +370,11 @@ do_abort(void *cls)
  * @return
  */
 static void
-do_abort_now(void *cls)
+do_abort_now (void *cls)
 {
   if (NULL != abort_task)
-    GNUNET_SCHEDULER_cancel(abort_task);
-  abort_task = GNUNET_SCHEDULER_add_now(&do_abort, NULL);
+    GNUNET_SCHEDULER_cancel (abort_task);
+  abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
 }
 
 
@@ -384,7 +385,7 @@ do_abort_now(void *cls)
  * @param emsg the error message; NULL if host registration is successful
  */
 static void
-registration_cont(void *cls, const char *emsg);
+registration_cont (void *cls, const char *emsg);
 
 
 /**
@@ -394,29 +395,29 @@ registration_cont(void *cls, const char *emsg);
  * @return
  */
 static void
-delay_task(void *cls)
+delay_task (void *cls)
 {
   delay_task_id = NULL;
   switch (result)
-    {
-    case SLAVE2_PEER_CREATE_SUCCESS:
-      op = GNUNET_TESTBED_peer_stop(NULL, slave1_peer, NULL, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case MASTER_SLAVE2_PEERS_CONNECTED:
-      slave3 = GNUNET_TESTBED_host_create_with_id(3, "127.0.0.1", NULL, cfg, 0);
-      rh = GNUNET_TESTBED_register_host(mc, slave3, &registration_cont, NULL);
-      break;
-
-    case SLAVE2_SLAVE3_PEERS_CONNECTED:
-      op = GNUNET_TESTBED_peer_stop(NULL, slave2_peer, NULL, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    default:
-      FAIL_TEST(0);
-    }
+  {
+  case SLAVE2_PEER_CREATE_SUCCESS:
+    op = GNUNET_TESTBED_peer_stop (NULL, slave1_peer, NULL, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case MASTER_SLAVE2_PEERS_CONNECTED:
+    slave3 = GNUNET_TESTBED_host_create_with_id (3, "127.0.0.1", NULL, cfg, 0);
+    rh = GNUNET_TESTBED_register_host (mc, slave3, &registration_cont, NULL);
+    break;
+
+  case SLAVE2_SLAVE3_PEERS_CONNECTED:
+    op = GNUNET_TESTBED_peer_stop (NULL, slave2_peer, NULL, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  default:
+    FAIL_TEST (0);
+  }
 }
 
 
@@ -430,48 +431,48 @@ delay_task(void *cls)
  * @param emsg NULL if peer is not NULL; else MAY contain the error description
  */
 static void
-peer_create_cb(void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
+peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
 {
-  FAIL_TEST(NULL != peer);
-  FAIL_TEST(NULL == emsg);
+  FAIL_TEST (NULL != peer);
+  FAIL_TEST (NULL == emsg);
   switch (result)
-    {
-    case MASTER_STARTED:
-      result = MASTER_PEER_CREATE_SUCCESS;
-      master_peer = peer;
-      GNUNET_TESTBED_operation_done(op);
-      op = GNUNET_TESTBED_peer_start(NULL, master_peer, NULL, NULL);
-      break;
-
-    case SLAVE1_LINK_SUCCESS:
-      result = SLAVE1_PEER_CREATE_SUCCESS;
-      slave1_peer = peer;
-      GNUNET_TESTBED_operation_done(op);
-      op = GNUNET_TESTBED_peer_start(NULL, slave1_peer, NULL, NULL);
-      break;
-
-    case SLAVE2_LINK_SUCCESS:
-      result = SLAVE2_PEER_CREATE_SUCCESS;
-      slave2_peer = peer;
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      delay_task_id = GNUNET_SCHEDULER_add_delayed(
-        GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
-        &delay_task,
-        NULL);
-      return;
-
-    case SLAVE3_STARTED:
-      result = SLAVE3_PEER_CREATE_SUCCESS;
-      slave3_peer = peer;
-      GNUNET_TESTBED_operation_done(op);
-      op = GNUNET_TESTBED_peer_start(NULL, slave3_peer, NULL, NULL);
-      break;
-
-    default:
-      FAIL_TEST(0);
-    }
-  FAIL_TEST(NULL != op);
+  {
+  case MASTER_STARTED:
+    result = MASTER_PEER_CREATE_SUCCESS;
+    master_peer = peer;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_start (NULL, master_peer, NULL, NULL);
+    break;
+
+  case SLAVE1_LINK_SUCCESS:
+    result = SLAVE1_PEER_CREATE_SUCCESS;
+    slave1_peer = peer;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_start (NULL, slave1_peer, NULL, NULL);
+    break;
+
+  case SLAVE2_LINK_SUCCESS:
+    result = SLAVE2_PEER_CREATE_SUCCESS;
+    slave2_peer = peer;
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    delay_task_id = GNUNET_SCHEDULER_add_delayed (
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1),
+      &delay_task,
+      NULL);
+    return;
+
+  case SLAVE3_STARTED:
+    result = SLAVE3_PEER_CREATE_SUCCESS;
+    slave3_peer = peer;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_start (NULL, slave3_peer, NULL, NULL);
+    break;
+
+  default:
+    FAIL_TEST (0);
+  }
+  FAIL_TEST (NULL != op);
 }
 
 
@@ -482,14 +483,14 @@ peer_create_cb(void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
  * @param event the event information to check
  */
 static void
-check_operation_success(const struct GNUNET_TESTBED_EventInformation *event)
+check_operation_success (const struct GNUNET_TESTBED_EventInformation *event)
 {
-  FAIL_TEST(NULL != event);
-  FAIL_TEST(GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
-  FAIL_TEST(event->op == op);
-  FAIL_TEST(NULL == event->op_cls);
-  FAIL_TEST(NULL == event->details.operation_finished.emsg);
-  FAIL_TEST(NULL == event->details.operation_finished.generic);
+  FAIL_TEST (NULL != event);
+  FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
+  FAIL_TEST (event->op == op);
+  FAIL_TEST (NULL == event->op_cls);
+  FAIL_TEST (NULL == event->details.operation_finished.emsg);
+  FAIL_TEST (NULL == event->details.operation_finished.generic);
 }
 
 
@@ -501,180 +502,180 @@ check_operation_success(const struct GNUNET_TESTBED_EventInformation *event)
  * @param event information about the event
  */
 static void
-controller_cb(void *cls, const struct GNUNET_TESTBED_EventInformation *event)
+controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
 {
   switch (result)
-    {
-    case SLAVE2_REGISTERED:
-      check_operation_success(event);
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      result = SLAVE1_LINK_SUCCESS;
-      FAIL_TEST(NULL != slave2);
-      FAIL_TEST(NULL != slave);
-      op = GNUNET_TESTBED_peer_create(mc, slave, cfg, peer_create_cb, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE1_PEER_START_SUCCESS:
-      check_operation_success(event);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE2_LINK_SUCCESS;
-      op = GNUNET_TESTBED_peer_create(mc, slave2, cfg, peer_create_cb, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case MASTER_PEER_CREATE_SUCCESS:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_START == event->type);
-      FAIL_TEST(event->details.peer_start.host == host);
-      FAIL_TEST(event->details.peer_start.peer == master_peer);
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      result = MASTER_PEER_START_SUCCESS;
-      slave = GNUNET_TESTBED_host_create_with_id(1, "127.0.0.1", NULL, cfg, 0);
-      FAIL_TEST(NULL != slave);
-      rh = GNUNET_TESTBED_register_host(mc, slave, &registration_cont, NULL);
-      FAIL_TEST(NULL != rh);
-      break;
-
-    case SLAVE1_PEER_CREATE_SUCCESS:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_START == event->type);
-      FAIL_TEST(event->details.peer_start.host == slave);
-      FAIL_TEST(event->details.peer_start.peer == slave1_peer);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE1_PEER_START_SUCCESS;
-      op = GNUNET_TESTBED_controller_link(NULL, mc, slave2, slave, GNUNET_YES);
-      break;
-
-    case SLAVE2_PEER_CREATE_SUCCESS:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_STOP == event->type);
-      FAIL_TEST(event->details.peer_stop.peer == slave1_peer);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE1_PEER_STOP_SUCCESS;
-      op = GNUNET_TESTBED_peer_start(NULL, slave2_peer, NULL, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE3_PEER_CREATE_SUCCESS:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_START == event->type);
-      FAIL_TEST(event->details.peer_start.host == slave3);
-      FAIL_TEST(event->details.peer_start.peer == slave3_peer);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE3_PEER_START_SUCCESS;
-      sleep(1);
-      LOG_DEBUG("**************************************\n");
-      op =
-        GNUNET_TESTBED_overlay_connect(mc, NULL, NULL, slave2_peer, slave3_peer);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE3_PEER_START_SUCCESS:
-      FAIL_TEST(NULL != event);
-      FAIL_TEST(GNUNET_TESTBED_ET_CONNECT == event->type);
-      FAIL_TEST(event->details.peer_connect.peer1 == slave2_peer);
-      FAIL_TEST(event->details.peer_connect.peer2 == slave3_peer);
-      result = SLAVE2_SLAVE3_PEERS_CONNECTED;
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      delay_task_id = GNUNET_SCHEDULER_add_delayed(
-        GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
-        &delay_task,
-        NULL);
-      break;
-
-    case SLAVE1_PEER_STOP_SUCCESS:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_START == event->type);
-      FAIL_TEST(event->details.peer_start.host == slave2);
-      FAIL_TEST(event->details.peer_start.peer == slave2_peer);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE2_PEER_START_SUCCESS;
-      op =
-        GNUNET_TESTBED_overlay_connect(mc, NULL, NULL, master_peer, slave2_peer);
-      break;
-
-    case SLAVE2_PEER_START_SUCCESS:
-      FAIL_TEST(NULL != event);
-      FAIL_TEST(GNUNET_TESTBED_ET_CONNECT == event->type);
-      FAIL_TEST(event->details.peer_connect.peer1 == master_peer);
-      FAIL_TEST(event->details.peer_connect.peer2 == slave2_peer);
-      result = MASTER_SLAVE2_PEERS_CONNECTED;
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      delay_task_id = GNUNET_SCHEDULER_add_delayed(
-        GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
-        &delay_task,
-        NULL);
-      break;
-
-    case SLAVE2_SLAVE3_PEERS_CONNECTED:
-      FAIL_TEST(GNUNET_TESTBED_ET_PEER_STOP == event->type);
-      FAIL_TEST(event->details.peer_stop.peer == slave2_peer);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE2_PEER_STOP_SUCCESS;
-      op = GNUNET_TESTBED_peer_destroy(slave1_peer);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE2_PEER_STOP_SUCCESS:
-      check_operation_success(event);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE1_PEER_DESTROY_SUCCESS;
-      op = GNUNET_TESTBED_peer_destroy(slave2_peer);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE1_PEER_DESTROY_SUCCESS:
-      check_operation_success(event);
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      result = SLAVE2_PEER_DESTROY_SUCCESS;
-      op = GNUNET_TESTBED_get_slave_config(NULL, mc, slave3);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE2_PEER_DESTROY_SUCCESS:
-      FAIL_TEST(NULL != event);
-      FAIL_TEST(GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
-      FAIL_TEST(event->op == op);
-      FAIL_TEST(NULL == event->op_cls);
-      FAIL_TEST(NULL == event->details.operation_finished.emsg);
-      cfg3 = GNUNET_CONFIGURATION_dup(event->details.operation_finished.generic);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE3_GET_CONFIG_SUCCESS;
-      op = GNUNET_TESTBED_controller_link(NULL, mc, slave3, slave, GNUNET_NO);
-      break;
-
-    case SLAVE3_REGISTERED:
-      check_operation_success(event);
-      GNUNET_TESTBED_operation_done(op);
-      result = SLAVE3_STARTED;
-      op = GNUNET_TESTBED_peer_create(mc, slave3, cfg, peer_create_cb, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case SLAVE3_GET_CONFIG_SUCCESS:
-      result = SLAVE3_LINK_SUCCESS;
-      GNUNET_TESTBED_operation_done(op);
-      op = GNUNET_TESTBED_peer_destroy(master_peer);
-      break;
-
-    case SLAVE3_LINK_SUCCESS:
-      check_operation_success(event);
-      result = MASTER_PEER_DESTROY_SUCCESS;
-      GNUNET_TESTBED_operation_done(op);
-      op = GNUNET_TESTBED_peer_destroy(slave3_peer);
-      break;
-
-    case MASTER_PEER_DESTROY_SUCCESS:
-      result = SUCCESS;
-      GNUNET_TESTBED_operation_done(op);
-      op = NULL;
-      GNUNET_SCHEDULER_shutdown();
-      break;
-
-    default:
-      FAIL_TEST(0);
-    }
+  {
+  case SLAVE2_REGISTERED:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    result = SLAVE1_LINK_SUCCESS;
+    FAIL_TEST (NULL != slave2);
+    FAIL_TEST (NULL != slave);
+    op = GNUNET_TESTBED_peer_create (mc, slave, cfg, peer_create_cb, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE1_PEER_START_SUCCESS:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE2_LINK_SUCCESS;
+    op = GNUNET_TESTBED_peer_create (mc, slave2, cfg, peer_create_cb, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case MASTER_PEER_CREATE_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+    FAIL_TEST (event->details.peer_start.host == host);
+    FAIL_TEST (event->details.peer_start.peer == master_peer);
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    result = MASTER_PEER_START_SUCCESS;
+    slave = GNUNET_TESTBED_host_create_with_id (1, "127.0.0.1", NULL, cfg, 0);
+    FAIL_TEST (NULL != slave);
+    rh = GNUNET_TESTBED_register_host (mc, slave, &registration_cont, NULL);
+    FAIL_TEST (NULL != rh);
+    break;
+
+  case SLAVE1_PEER_CREATE_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+    FAIL_TEST (event->details.peer_start.host == slave);
+    FAIL_TEST (event->details.peer_start.peer == slave1_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE1_PEER_START_SUCCESS;
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave2, slave, GNUNET_YES);
+    break;
+
+  case SLAVE2_PEER_CREATE_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
+    FAIL_TEST (event->details.peer_stop.peer == slave1_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE1_PEER_STOP_SUCCESS;
+    op = GNUNET_TESTBED_peer_start (NULL, slave2_peer, NULL, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE3_PEER_CREATE_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+    FAIL_TEST (event->details.peer_start.host == slave3);
+    FAIL_TEST (event->details.peer_start.peer == slave3_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE3_PEER_START_SUCCESS;
+    sleep (1);
+    LOG_DEBUG ("**************************************\n");
+    op =
+      GNUNET_TESTBED_overlay_connect (mc, NULL, NULL, slave2_peer, slave3_peer);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE3_PEER_START_SUCCESS:
+    FAIL_TEST (NULL != event);
+    FAIL_TEST (GNUNET_TESTBED_ET_CONNECT == event->type);
+    FAIL_TEST (event->details.peer_connect.peer1 == slave2_peer);
+    FAIL_TEST (event->details.peer_connect.peer2 == slave3_peer);
+    result = SLAVE2_SLAVE3_PEERS_CONNECTED;
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    delay_task_id = GNUNET_SCHEDULER_add_delayed (
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1),
+      &delay_task,
+      NULL);
+    break;
+
+  case SLAVE1_PEER_STOP_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+    FAIL_TEST (event->details.peer_start.host == slave2);
+    FAIL_TEST (event->details.peer_start.peer == slave2_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE2_PEER_START_SUCCESS;
+    op =
+      GNUNET_TESTBED_overlay_connect (mc, NULL, NULL, master_peer, slave2_peer);
+    break;
+
+  case SLAVE2_PEER_START_SUCCESS:
+    FAIL_TEST (NULL != event);
+    FAIL_TEST (GNUNET_TESTBED_ET_CONNECT == event->type);
+    FAIL_TEST (event->details.peer_connect.peer1 == master_peer);
+    FAIL_TEST (event->details.peer_connect.peer2 == slave2_peer);
+    result = MASTER_SLAVE2_PEERS_CONNECTED;
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    delay_task_id = GNUNET_SCHEDULER_add_delayed (
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1),
+      &delay_task,
+      NULL);
+    break;
+
+  case SLAVE2_SLAVE3_PEERS_CONNECTED:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
+    FAIL_TEST (event->details.peer_stop.peer == slave2_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE2_PEER_STOP_SUCCESS;
+    op = GNUNET_TESTBED_peer_destroy (slave1_peer);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE2_PEER_STOP_SUCCESS:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE1_PEER_DESTROY_SUCCESS;
+    op = GNUNET_TESTBED_peer_destroy (slave2_peer);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE1_PEER_DESTROY_SUCCESS:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    result = SLAVE2_PEER_DESTROY_SUCCESS;
+    op = GNUNET_TESTBED_get_slave_config (NULL, mc, slave3);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE2_PEER_DESTROY_SUCCESS:
+    FAIL_TEST (NULL != event);
+    FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
+    FAIL_TEST (event->op == op);
+    FAIL_TEST (NULL == event->op_cls);
+    FAIL_TEST (NULL == event->details.operation_finished.emsg);
+    cfg3 = GNUNET_CONFIGURATION_dup (event->details.operation_finished.generic);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE3_GET_CONFIG_SUCCESS;
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, GNUNET_NO);
+    break;
+
+  case SLAVE3_REGISTERED:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE3_STARTED;
+    op = GNUNET_TESTBED_peer_create (mc, slave3, cfg, peer_create_cb, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case SLAVE3_GET_CONFIG_SUCCESS:
+    result = SLAVE3_LINK_SUCCESS;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_destroy (master_peer);
+    break;
+
+  case SLAVE3_LINK_SUCCESS:
+    check_operation_success (event);
+    result = MASTER_PEER_DESTROY_SUCCESS;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_destroy (slave3_peer);
+    break;
+
+  case MASTER_PEER_DESTROY_SUCCESS:
+    result = SUCCESS;
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    GNUNET_SCHEDULER_shutdown ();
+    break;
+
+  default:
+    FAIL_TEST (0);
+  }
 }
 
 
@@ -685,43 +686,43 @@ controller_cb(void *cls, const struct GNUNET_TESTBED_EventInformation *event)
  * @param emsg the error message; NULL if host registration is successful
  */
 static void
-registration_cont(void *cls, const char *emsg)
+registration_cont (void *cls, const char *emsg)
 {
   rh = NULL;
   switch (result)
-    {
-    case MASTER_PEER_START_SUCCESS:
-      FAIL_TEST(NULL == emsg);
-      FAIL_TEST(NULL != mc);
-      result = SLAVE1_REGISTERED;
-      slave2 = GNUNET_TESTBED_host_create_with_id(2, "127.0.0.1", NULL, cfg, 0);
-      FAIL_TEST(NULL != slave2);
-      rh = GNUNET_TESTBED_register_host(mc, slave2, &registration_cont, NULL);
-      FAIL_TEST(NULL != rh);
-      break;
-
-    case SLAVE1_REGISTERED:
-      FAIL_TEST(NULL == emsg);
-      FAIL_TEST(NULL != mc);
-      result = SLAVE2_REGISTERED;
-      FAIL_TEST(NULL != cfg);
-      op = GNUNET_TESTBED_controller_link(NULL, mc, slave, NULL, GNUNET_YES);
-      FAIL_TEST(NULL != op);
-      break;
-
-    case MASTER_SLAVE2_PEERS_CONNECTED:
-      FAIL_TEST(NULL == emsg);
-      FAIL_TEST(NULL != mc);
-      FAIL_TEST(NULL == op);
-      result = SLAVE3_REGISTERED;
-      op = GNUNET_TESTBED_controller_link(NULL, mc, slave3, NULL, GNUNET_YES);
-      FAIL_TEST(NULL != op);
-      break;
-
-    default:
-      GNUNET_break(0);
-      do_abort_now(NULL);
-    }
+  {
+  case MASTER_PEER_START_SUCCESS:
+    FAIL_TEST (NULL == emsg);
+    FAIL_TEST (NULL != mc);
+    result = SLAVE1_REGISTERED;
+    slave2 = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, cfg, 0);
+    FAIL_TEST (NULL != slave2);
+    rh = GNUNET_TESTBED_register_host (mc, slave2, &registration_cont, NULL);
+    FAIL_TEST (NULL != rh);
+    break;
+
+  case SLAVE1_REGISTERED:
+    FAIL_TEST (NULL == emsg);
+    FAIL_TEST (NULL != mc);
+    result = SLAVE2_REGISTERED;
+    FAIL_TEST (NULL != cfg);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave, NULL, GNUNET_YES);
+    FAIL_TEST (NULL != op);
+    break;
+
+  case MASTER_SLAVE2_PEERS_CONNECTED:
+    FAIL_TEST (NULL == emsg);
+    FAIL_TEST (NULL != mc);
+    FAIL_TEST (NULL == op);
+    result = SLAVE3_REGISTERED;
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, NULL, GNUNET_YES);
+    FAIL_TEST (NULL != op);
+    break;
+
+  default:
+    GNUNET_break (0);
+    do_abort_now (NULL);
+  }
 }
 
 /**
@@ -734,34 +735,34 @@ registration_cont(void *cls, const char *emsg)
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
-status_cb(void *cls,
-          const struct GNUNET_CONFIGURATION_Handle *config,
-          int status)
+status_cb (void *cls,
+           const struct GNUNET_CONFIGURATION_Handle *config,
+           int status)
 {
   switch (result)
-    {
-    case INIT:
-      FAIL_TEST(GNUNET_OK == status);
-      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);
-      mc = GNUNET_TESTBED_controller_connect(host,
-                                             event_mask,
-                                             &controller_cb,
-                                             NULL);
-      FAIL_TEST(NULL != mc);
-      result = MASTER_STARTED;
-      op = GNUNET_TESTBED_peer_create(mc, host, cfg, peer_create_cb, NULL);
-      FAIL_TEST(NULL != op);
-      break;
-
-    default:
-      GNUNET_break(0);
-      cp = NULL;
-      do_abort_now(NULL);
-    }
+  {
+  case INIT:
+    FAIL_TEST (GNUNET_OK == status);
+    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);
+    mc = GNUNET_TESTBED_controller_connect (host,
+                                            event_mask,
+                                            &controller_cb,
+                                            NULL);
+    FAIL_TEST (NULL != mc);
+    result = MASTER_STARTED;
+    op = GNUNET_TESTBED_peer_create (mc, host, cfg, peer_create_cb, NULL);
+    FAIL_TEST (NULL != op);
+    break;
+
+  default:
+    GNUNET_break (0);
+    cp = NULL;
+    do_abort_now (NULL);
+  }
 }
 
 
@@ -776,24 +777,24 @@ status_cb(void *cls,
  * @param status #GNUNET_YES if it is habitable; #GNUNET_NO if not
  */
 static void
-host_habitable_cb(void *cls,
-                  const struct GNUNET_TESTBED_Host *_host,
-                  int status)
+host_habitable_cb (void *cls,
+                   const struct GNUNET_TESTBED_Host *_host,
+                   int status)
 {
   hc_handle = NULL;
   if (GNUNET_NO == status)
-    {
-      (void)printf("%s",
+  {
+    (void) printf ("%s",
                    "Unable to run the test as this system is not configured "
                    "to use password less SSH logins to localhost.\n"
                    "Skipping test\n");
-      GNUNET_SCHEDULER_cancel(abort_task);
-      abort_task = NULL;
-      GNUNET_SCHEDULER_shutdown();
-      result = SKIP;
-      return;
-    }
-  cp = GNUNET_TESTBED_controller_start("127.0.0.1", host, status_cb, NULL);
+    GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = NULL;
+    GNUNET_SCHEDULER_shutdown ();
+    result = SKIP;
+    return;
+  }
+  cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb, NULL);
 }
 
 
@@ -806,35 +807,35 @@ host_habitable_cb(void *cls,
  * @param cfg the configuration file handle
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *config)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *config)
 {
-  cfg = GNUNET_CONFIGURATION_dup(config);
-  host = GNUNET_TESTBED_host_create(NULL, NULL, cfg, 0);
-  FAIL_TEST(NULL != host);
-  if (NULL == (hc_handle = GNUNET_TESTBED_is_host_habitable(host,
-                                                            config,
-                                                            &host_habitable_cb,
-                                                            NULL)))
-    {
-      GNUNET_TESTBED_host_destroy(host);
-      GNUNET_CONFIGURATION_destroy(cfg);
-      cfg = NULL;
-      host = NULL;
-      (void)printf("%s",
+  cfg = GNUNET_CONFIGURATION_dup (config);
+  host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0);
+  FAIL_TEST (NULL != host);
+  if (NULL == (hc_handle = GNUNET_TESTBED_is_host_habitable (host,
+                                                             config,
+                                                             &host_habitable_cb,
+                                                             NULL)))
+  {
+    GNUNET_TESTBED_host_destroy (host);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    cfg = NULL;
+    host = NULL;
+    (void) printf ("%s",
                    "Unable to run the test as this system is not configured "
                    "to use password less SSH logins to localhost.\n"
                    "Marking test as successful\n");
-      result = SKIP;
-      return;
-    }
-  abort_task = GNUNET_SCHEDULER_add_delayed(
-    GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5),
+    result = SKIP;
+    return;
+  }
+  abort_task = GNUNET_SCHEDULER_add_delayed (
+    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5),
     &do_abort,
     NULL);
-  GNUNET_SCHEDULER_add_shutdown(&do_shutdown, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
 }
 
 
@@ -842,36 +843,37 @@ run(void *cls,
  * Main function
  */
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
   char *const argv2[] = { "test_testbed_api_controllerlink",
                           "-c",
                           "test_testbed_api.conf",
                           NULL };
-  struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END };
+  struct GNUNET_GETOPT_CommandLineOption options[] =
+  { GNUNET_GETOPT_OPTION_END };
   int ret;
 
   result = INIT;
-  ret = GNUNET_PROGRAM_run((sizeof(argv2) / sizeof(char *)) - 1,
-                           argv2,
-                           "test_testbed_api_controllerlink",
-                           "nohelp",
-                           options,
-                           &run,
-                           NULL);
+  ret = GNUNET_PROGRAM_run ((sizeof(argv2) / sizeof(char *)) - 1,
+                            argv2,
+                            "test_testbed_api_controllerlink",
+                            "nohelp",
+                            options,
+                            &run,
+                            NULL);
   if (GNUNET_OK != ret)
     return 1;
   switch (result)
-    {
-    case SUCCESS:
-      return 0;
+  {
+  case SUCCESS:
+    return 0;
 
-    case SKIP:
-      return 77; /* Mark test as skipped */
+  case SKIP:
+    return 77;   /* Mark test as skipped */
 
-    default:
-      return 1;
-    }
+  default:
+    return 1;
+  }
 }
 
 /* end of test_testbed_api_controllerlink.c */