fix pointer indentation
[oweals/gnunet.git] / src / testbed / testbed_api_peers.c
index 3cd89f2f67ec9a3b395ec36268429f0eb0b6ddb0..7bd895871059a15c14da517f855ffad1d2a489c4 100644 (file)
@@ -1,21 +1,21 @@
 /*
       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
-      by the Free Software Foundation; either version 3, or (at your
-      option) any later version.
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
+      Affero General Public License for more details.
 
-      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.
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
  * @brief management of the knowledge about peers in this library
  *        (we know the peer ID, its host, pending operations, etc.)
  * @author Christian Grothoff
+ * @author Sree Harsha Totakura
  */
+
 #include "platform.h"
 #include "testbed_api_peers.h"
 #include "testbed_api.h"
 #include "testbed.h"
 #include "testbed_api_hosts.h"
+#include "testbed_api_operations.h"
 
 
 /**
- * Lookup a peer by ID.
- * 
- * @param id global peer ID assigned to the peer
- * @return handle to the host, NULL on error
+ * Peer list DLL head
  */
-struct GNUNET_TESTBED_Peer *
-GNUNET_TESTBED_peer_lookup_by_id_ (uint32_t id)
+static struct GNUNET_TESTBED_Peer *peer_list_head;
+
+/**
+ * Peer list DLL tail
+ */
+static struct GNUNET_TESTBED_Peer *peer_list_tail;
+
+
+/**
+ * Adds a peer to the peer list
+ *
+ * @param peer the peer to add to the peer list
+ */
+void
+GNUNET_TESTBED_peer_register_ (struct GNUNET_TESTBED_Peer *peer)
 {
-  GNUNET_break (0);
-  return NULL;
+  GNUNET_CONTAINER_DLL_insert_tail (peer_list_head, peer_list_tail, peer);
 }
 
 
 /**
- * Create the given peer at the specified host using the given
- * controller.  If the given controller is not running on the target
- * host, it should find or create a controller at the target host and
- * delegate creating the peer.  Explicit delegation paths can be setup
- * using 'GNUNET_TESTBED_controller_link'.  If no explicit delegation
- * path exists, a direct link with a subordinate controller is setup
- * for the first delegated peer to a particular host; the subordinate
- * controller is then destroyed once the last peer that was delegated
- * to the remote host is stopped.  This function is used in particular
- * if some other controller has already assigned a unique ID to the
- * peer.
+ * Removes a peer from the peer list
  *
- * Creating the peer only creates the handle to manipulate and further
- * configure the peer; use "GNUNET_TESTBED_peer_start" and
- * "GNUNET_TESTBED_peer_stop" to actually start/stop the peer's
- * processes.
- *
- * Note that the given configuration will be adjusted by the
- * controller to avoid port/path conflicts with other peers.
- * The "final" configuration can be obtained using
- * 'GNUNET_TESTBED_peer_get_information'.
- *
- * @param unique_id unique ID for this peer
- * @param controller controller process to use
- * @param host host to run the peer on
- * @param cfg configuration to use for the peer
- * @return handle to the peer (actual startup will happen asynchronously)
+ * @param peer the peer to remove
  */
-struct GNUNET_TESTBED_Peer *
-GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
-                                    struct GNUNET_TESTBED_Controller *controller,
-                                    struct GNUNET_TESTBED_Host *host,
-                                    const struct GNUNET_CONFIGURATION_Handle *cfg)
+void
+GNUNET_TESTBED_peer_deregister_ (struct GNUNET_TESTBED_Peer *peer)
+{
+  GNUNET_CONTAINER_DLL_remove (peer_list_head, peer_list_tail, peer);
+}
+
+
+/**
+ * Frees all peers
+ */
+void
+GNUNET_TESTBED_cleanup_peers_ (void)
 {
   struct GNUNET_TESTBED_Peer *peer;
+
+  while (NULL != (peer = peer_list_head))
+  {
+    GNUNET_TESTBED_peer_deregister_ (peer);
+    GNUNET_free (peer);
+  }
+}
+
+
+/**
+ * Function to call to start a peer_create type operation once all
+ * queues the operation is part of declare that the
+ * operation can be activated.
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_create (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct PeerCreateData *data = opc->data;
   struct GNUNET_TESTBED_PeerCreateMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
   char *config;
   char *xconfig;
   size_t c_size;
   size_t xc_size;
-  uint16_t msize;
 
-  peer = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer));
-  peer->controller = controller;
-  peer->host = host;
-  peer->unique_id = unique_id;
-  config = GNUNET_CONFIGURATION_serialize (cfg, &c_size);
-  xc_size = GNUNET_TESTBED_compress_config (config, c_size, &xconfig);
+  GNUNET_assert (OP_PEER_CREATE == opc->type);
+  GNUNET_assert (NULL != data);
+  GNUNET_assert (NULL != data->peer);
+  opc->state = OPC_STATE_STARTED;
+  config = GNUNET_CONFIGURATION_serialize (data->cfg,
+                                           &c_size);
+  xc_size = GNUNET_TESTBED_compress_config_ (config,
+                                             c_size,
+                                             &xconfig);
   GNUNET_free (config);
-  msize = xc_size + sizeof (struct GNUNET_TESTBED_PeerCreateMessage);
-  msg = GNUNET_realloc (xconfig, msize);
-  memmove (&msg[1], msg, sizeof (struct GNUNET_TESTBED_PeerCreateMessage));
-  msg->header.size = htons (msize);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER);
-  msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (peer->host));
+  env = GNUNET_MQ_msg_extra (msg,
+                             xc_size,
+                             GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->peer->host));
+  msg->peer_id = htonl (data->peer->unique_id);
+  msg->config_size = htons ((uint16_t) c_size);
+  GNUNET_memcpy (&msg[1],
+                 xconfig,
+                 xc_size);
+  GNUNET_MQ_send (opc->c->mq,
+                  env);
+  GNUNET_free (xconfig);
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+}
+
+
+/**
+ * Callback which will be called when peer_create type operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_create (void *cls)
+{
+  struct OperationContext *opc = cls;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+
+  /* No break we continue flow */
+  case OPC_STATE_INIT:
+    GNUNET_free (((struct PeerCreateData *) opc->data)->peer);
+    GNUNET_free (opc->data);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Function called when a peer destroy operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_destroy (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct GNUNET_TESTBED_Peer *peer = opc->data;
+  struct GNUNET_TESTBED_PeerDestroyMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
+
+  GNUNET_assert (OP_PEER_DESTROY == opc->type);
+  GNUNET_assert (NULL != peer);
+  opc->state = OPC_STATE_STARTED;
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER);
   msg->peer_id = htonl (peer->unique_id);
-  msg->config_size = htonl (c_size);
-  GNUNET_TESTBED_queue_message (controller,
-                                (struct GNUNET_MessageHeader *) msg);
-  return peer;
+  msg->operation_id = GNUNET_htonll (opc->id);
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_MQ_send (peer->controller->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when peer_create type operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_destroy (void *cls)
+{
+  struct OperationContext *opc = cls;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+
+  /* no break; continue */
+  case OPC_STATE_INIT:
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Function called when a peer start operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_start (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct GNUNET_TESTBED_PeerStartMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
+  struct PeerEventData *data;
+  struct GNUNET_TESTBED_Peer *peer;
+
+  GNUNET_assert (OP_PEER_START == opc->type);
+  GNUNET_assert (NULL != (data = opc->data));
+  GNUNET_assert (NULL != (peer = data->peer));
+  GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED ==
+                                                         peer->state));
+  opc->state = OPC_STATE_STARTED;
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_TESTBED_START_PEER);
+  msg->peer_id = htonl (peer->unique_id);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_MQ_send (peer->controller->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when peer start type operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_start (void *cls)
+{
+  struct OperationContext *opc = cls;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+
+  /* no break; continue */
+  case OPC_STATE_INIT:
+    GNUNET_free (opc->data);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Function called when a peer stop operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_stop (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct GNUNET_TESTBED_PeerStopMessage *msg;
+  struct PeerEventData *data;
+  struct GNUNET_TESTBED_Peer *peer;
+  struct GNUNET_MQ_Envelope *env;
+
+  GNUNET_assert (NULL != (data = opc->data));
+  GNUNET_assert (NULL != (peer = data->peer));
+  GNUNET_assert (TESTBED_PS_STARTED == peer->state);
+  opc->state = OPC_STATE_STARTED;
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER);
+  msg->peer_id = htonl (peer->unique_id);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_MQ_send (peer->controller->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when peer stop type operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_stop (void *cls)
+{
+  struct OperationContext *opc = cls;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+
+  /* no break; continue */
+  case OPC_STATE_INIT:
+    GNUNET_free (opc->data);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Generate PeerGetConfigurationMessage
+ *
+ * @param peer_id the id of the peer whose information we have to get
+ * @param operation_id the ip of the operation that should be represented in the
+ *          message
+ * @return the PeerGetConfigurationMessage
+ */
+struct GNUNET_TESTBED_PeerGetConfigurationMessage *
+GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id,
+                                            uint64_t operation_id)
+{
+  struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
+
+  msg =
+    GNUNET_malloc (sizeof
+                   (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
+  msg->header.size =
+    htons (sizeof(struct GNUNET_TESTBED_PeerGetConfigurationMessage));
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION);
+  msg->peer_id = htonl (peer_id);
+  msg->operation_id = GNUNET_htonll (operation_id);
+  return msg;
+}
+
+
+/**
+ * Function called when a peer get information operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_getinfo (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct PeerInfoData *data = opc->data;
+  struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
+
+  GNUNET_assert (NULL != data);
+  opc->state = OPC_STATE_STARTED;
+  msg =
+    GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id,
+                                                opc->id);
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
+}
+
+
+/**
+ * Callback which will be called when peer stop type operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_getinfo (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct GNUNET_TESTBED_PeerInformation *data;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+
+  /* no break; continue */
+  case OPC_STATE_INIT:
+    GNUNET_free (opc->data);
+    break;
+
+  case OPC_STATE_FINISHED:
+    data = opc->data;
+    GNUNET_assert (NULL != data);
+    switch (data->pit)
+    {
+    case GNUNET_TESTBED_PIT_CONFIGURATION:
+      if (NULL != data->result.cfg)
+        GNUNET_CONFIGURATION_destroy (data->result.cfg);
+      break;
+
+    case GNUNET_TESTBED_PIT_IDENTITY:
+      GNUNET_free (data->result.id);
+      break;
+
+    default:
+      GNUNET_assert (0);        /* We should never reach here */
+    }
+    GNUNET_free (data);
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Function called when a overlay connect operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_overlay_connect (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_TESTBED_OverlayConnectMessage *msg;
+  struct OverlayConnectData *data;
+
+  opc->state = OPC_STATE_STARTED;
+  data = opc->data;
+  GNUNET_assert (NULL != data);
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT);
+  msg->peer1 = htonl (data->p1->unique_id);
+  msg->peer2 = htonl (data->p2->unique_id);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  msg->peer2_host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->p2->host));
+  GNUNET_TESTBED_insert_opc_ (opc->c,
+                              opc);
+  GNUNET_MQ_send (opc->c->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when overlay connect operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_overlay_connect (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct OverlayConnectData *data;
+
+  data = opc->data;
+  switch (opc->state)
+  {
+  case OPC_STATE_INIT:
+    break;
+
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (data);
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Function called when a peer reconfigure operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_peer_reconfigure (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct PeerReconfigureData *data = opc->data;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_TESTBED_PeerReconfigureMessage *msg;
+  char *xconfig;
+  size_t xc_size;
+
+  opc->state = OPC_STATE_STARTED;
+  GNUNET_assert (NULL != data);
+  xc_size = GNUNET_TESTBED_compress_config_ (data->config,
+                                             data->cfg_size,
+                                             &xconfig);
+  GNUNET_free (data->config);
+  data->config = NULL;
+  GNUNET_assert (xc_size < UINT16_MAX - sizeof(*msg));
+  env = GNUNET_MQ_msg_extra (msg,
+                             xc_size,
+                             GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER);
+  msg->peer_id = htonl (data->peer->unique_id);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  msg->config_size = htons (data->cfg_size);
+  GNUNET_memcpy (&msg[1],
+                 xconfig,
+                 xc_size);
+  GNUNET_free (xconfig);
+  GNUNET_free (data);
+  opc->data = NULL;
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_MQ_send (opc->c->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when a peer reconfigure operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_peer_reconfigure (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct PeerReconfigureData *data = opc->data;
+
+  switch (opc->state)
+  {
+  case OPC_STATE_INIT:
+    GNUNET_free (data->config);
+    GNUNET_free (data);
+    break;
+
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free (opc);
+}
+
+
+/**
+ * Lookup a peer by ID.
+ *
+ * @param id global peer ID assigned to the peer
+ * @return handle to the host, NULL on error
+ */
+struct GNUNET_TESTBED_Peer *
+GNUNET_TESTBED_peer_lookup_by_id_ (uint32_t id)
+{
+  GNUNET_break (0);
+  return NULL;
 }
 
 
@@ -131,70 +580,169 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
  * 'GNUNET_TESTBED_peer_get_information'.
  *
  * @param controller controller process to use
- * @param host host to run the peer on
- * @param cfg configuration to use for the peer
- * @return handle to the peer (actual startup will happen asynchronously)
+ * @param host host to run the peer on; cannot be NULL
+ * @param cfg Template configuration to use for the peer. Should exist until
+ *          operation is cancelled or GNUNET_TESTBED_operation_done() is called
+ * @param cb the callback to call when the peer has been created
+ * @param cls the closure to the above callback
+ * @return the operation handle
  */
-struct GNUNET_TESTBED_Peer *
+struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
-                           struct GNUNET_TESTBED_Host *host,
-                           const struct GNUNET_CONFIGURATION_Handle *cfg)
+                            struct GNUNET_TESTBED_Host *host,
+                            const struct GNUNET_CONFIGURATION_Handle *cfg,
+                            GNUNET_TESTBED_PeerCreateCallback cb, void *cls)
 {
+  struct GNUNET_TESTBED_Peer *peer;
+  struct PeerCreateData *data;
+  struct OperationContext *opc;
   static uint32_t id_gen;
 
-  return GNUNET_TESTBED_peer_create_with_id_ (++id_gen,
-                                             controller,
-                                             host,
-                                             cfg);
+  peer = GNUNET_new (struct GNUNET_TESTBED_Peer);
+  peer->controller = controller;
+  peer->host = host;
+  peer->unique_id = id_gen++;
+  peer->state = TESTBED_PS_INVALID;
+  data = GNUNET_new (struct PeerCreateData);
+  data->host = host;
+  data->cfg = cfg;
+  data->cb = cb;
+  data->cls = cls;
+  data->peer = peer;
+  opc = GNUNET_new (struct OperationContext);
+  opc->c = controller;
+  opc->data = data;
+  opc->id = GNUNET_TESTBED_get_next_op_id (controller);
+  opc->type = OP_PEER_CREATE;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_create,
+                                      &oprelease_peer_create);
+  GNUNET_TESTBED_operation_queue_insert_ (controller->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
 /**
  * Start the given peer.
  *
+ * @param op_cls the closure for this operation; will be set in
+ *          event->details.operation_finished.op_cls when this operation fails.
  * @param peer peer to start
+ * @param pcc function to call upon completion
+ * @param pcc_cls closure for 'pcc'
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer)
+GNUNET_TESTBED_peer_start (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
+                           GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
 {
-  // FIXME: start locally or delegate...
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct PeerEventData *data;
+
+  data = GNUNET_new (struct PeerEventData);
+  data->peer = peer;
+  data->pcc = pcc;
+  data->pcc_cls = pcc_cls;
+  opc = GNUNET_new (struct OperationContext);
+  opc->c = peer->controller;
+  opc->data = data;
+  opc->op_cls = op_cls;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->type = OP_PEER_START;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_start,
+                                      &oprelease_peer_start);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
 /**
  * Stop the given peer.  The handle remains valid (use
- * "GNUNET_TESTBED_peer_destroy" to fully clean up the 
+ * "GNUNET_TESTBED_peer_destroy" to fully clean up the
  * state of the peer).
  *
+ * @param op_cls the closure for this operation; will be set in the event
+ *          information
  * @param peer peer to stop
+ * @param pcc function to call upon completion
+ * @param pcc_cls closure for 'pcc'
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer)
+GNUNET_TESTBED_peer_stop (void *op_cls,
+                          struct GNUNET_TESTBED_Peer *peer,
+                          GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
 {
-  // FIXME: stop locally or delegate...
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct PeerEventData *data;
+
+  data = GNUNET_new (struct PeerEventData);
+  data->peer = peer;
+  data->pcc = pcc;
+  data->pcc_cls = pcc_cls;
+  opc = GNUNET_new (struct OperationContext);
+  opc->c = peer->controller;
+  opc->data = data;
+  opc->op_cls = op_cls;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->type = OP_PEER_STOP;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_stop,
+                                      &oprelease_peer_stop);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
 /**
- * Request information about a peer.
+ * Request information about a peer. The controller callback will not be called
+ * with event type GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
+ * operation is available. Instead, the GNUNET_TESTBED_PeerInfoCallback() will
+ * be called.
+ * The peer information in the callback is valid until the operation is canceled.
  *
  * @param peer peer to request information about
  * @param pit desired information
+ * @param cb the convenience callback to be called when results for this
+ *          operation are available
+ * @param cb_cls the closure for the above callback
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
-                                    enum GNUNET_TESTBED_PeerInformationType pit)
+                                     enum GNUNET_TESTBED_PeerInformationType
+                                     pit, GNUNET_TESTBED_PeerInfoCallback cb,
+                                     void *cb_cls)
 {
-  // FIXME: handle locally or delegate...
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct PeerInfoData *data;
+
+  GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC != pit);
+  GNUNET_assert (NULL != cb);
+  data = GNUNET_new (struct PeerInfoData);
+  data->peer = peer;
+  data->pit = pit;
+  data->cb = cb;
+  data->cb_cls = cb_cls;
+  opc = GNUNET_new (struct OperationContext);
+  opc->c = peer->controller;
+  opc->data = data;
+  opc->type = OP_PEER_INFO;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
+                                      &oprelease_peer_getinfo);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
@@ -210,11 +758,41 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
-                                         const struct GNUNET_CONFIGURATION_Handle *cfg)
+                                          const struct
+                                          GNUNET_CONFIGURATION_Handle *cfg)
 {
-  // FIXME: handle locally or delegate...
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct PeerReconfigureData *data;
+  size_t csize;
+
+  data = GNUNET_new (struct PeerReconfigureData);
+  data->peer = peer;
+  data->config = GNUNET_CONFIGURATION_serialize (cfg, &csize);
+  if (NULL == data->config)
+  {
+    GNUNET_free (data);
+    return NULL;
+  }
+  if (csize > UINT16_MAX)
+  {
+    GNUNET_break (0);
+    GNUNET_free (data->config);
+    GNUNET_free (data);
+    return NULL;
+  }
+  data->cfg_size = (uint16_t) csize;
+  opc = GNUNET_new (struct OperationContext);
+  opc->c = peer->controller;
+  opc->data = data;
+  opc->type = OP_PEER_RECONFIGURE;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_reconfigure,
+                                      &oprelease_peer_reconfigure);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
@@ -228,31 +806,26 @@ GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer)
 {
-  struct GNUNET_TESTBED_Operation *op;
-  struct PeerDestroyData *data;
-  struct GNUNET_TESTBED_PeerDestroyMessage *msg;
-  
-  data = GNUNET_malloc (sizeof (struct PeerDestroyData));
-  data->peer = peer;
-  op = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Operation));
-  op->operation_id = GNUNET_TESTBED_operation_id++;
-  op->type = OP_PEER_DESTROY;
-  op->data = data;
-  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
-  msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER);
-  msg->peer_id = htonl (peer->unique_id);
-  msg->operation_id = GNUNET_htonll (op->operation_id);
-  GNUNET_TESTBED_operation_add (op);
-  GNUNET_TESTBED_queue_message (peer->controller, 
-                                (struct GNUNET_MessageHeader *) msg);
-  return op;
+  struct OperationContext *opc;
+
+  opc = GNUNET_new (struct OperationContext);
+  opc->data = peer;
+  opc->c = peer->controller;
+  opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller);
+  opc->type = OP_PEER_DESTROY;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_destroy,
+                                      &oprelease_peer_destroy);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
 }
 
 
 /**
  * Manipulate the P2P underlay topology by configuring a link
- * between two peers.  
+ * between two peers.
  *
  * @param op_cls closure argument to give with the operation event
  * @param p1 first peer
@@ -264,22 +837,24 @@ GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer)
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_underlay_configure_link (void *op_cls,
-                                       struct GNUNET_TESTBED_Peer *p1,
-                                       struct GNUNET_TESTBED_Peer *p2,
-                                       enum GNUNET_TESTBED_ConnectOption co, ...)
+                                        struct GNUNET_TESTBED_Peer *p1,
+                                        struct GNUNET_TESTBED_Peer *p2,
+                                        enum GNUNET_TESTBED_ConnectOption co,
+                                        ...)
 {
   GNUNET_break (0);
   return NULL;
 }
 
 
-
 /**
  * Both peers must have been started before calling this function.
  * This function then obtains a HELLO from 'p1', gives it to 'p2'
  * and asks 'p2' to connect to 'p1'.
  *
  * @param op_cls closure argument to give with the operation event
+ * @param cb the callback to call when this operation has finished
+ * @param cb_cls the closure for the above callback
  * @param p1 first peer
  * @param p2 second peer
  * @return handle to the operation, NULL if connecting these two
@@ -288,13 +863,154 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_overlay_connect (void *op_cls,
-                               struct GNUNET_TESTBED_Peer *p1,
-                               struct GNUNET_TESTBED_Peer *p2)
+                                GNUNET_TESTBED_OperationCompletionCallback cb,
+                                void *cb_cls, struct GNUNET_TESTBED_Peer *p1,
+                                struct GNUNET_TESTBED_Peer *p2)
 {
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct OverlayConnectData *data;
+
+  GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED ==
+                                                       p2->state));
+  data = GNUNET_new (struct OverlayConnectData);
+  data->p1 = p1;
+  data->p2 = p2;
+  data->cb = cb;
+  data->cb_cls = cb_cls;
+  opc = GNUNET_new (struct OperationContext);
+  opc->data = data;
+  opc->c = p1->controller;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->type = OP_OVERLAY_CONNECT;
+  opc->op_cls = op_cls;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
+                                      &oprelease_overlay_connect);
+  GNUNET_TESTBED_host_queue_oc_ (p1->host, opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
+}
+
+
+/**
+ * Function called when a peer manage service operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+opstart_manage_service (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct ManageServiceData *data = opc->data;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_TESTBED_ManagePeerServiceMessage *msg;
+  size_t xlen;
+
+  GNUNET_assert (NULL != data);
+  xlen = data->msize - sizeof(struct GNUNET_TESTBED_ManagePeerServiceMessage);
+  env = GNUNET_MQ_msg_extra (msg,
+                             xlen,
+                             GNUNET_MESSAGE_TYPE_TESTBED_MANAGE_PEER_SERVICE);
+  msg->peer_id = htonl (data->peer->unique_id);
+  msg->operation_id = GNUNET_htonll (opc->id);
+  msg->start = (uint8_t) data->start;
+  GNUNET_memcpy (&msg[1],
+                 data->service_name,
+                 xlen);
+  GNUNET_free (data->service_name);
+  data->service_name = NULL;
+  opc->state = OPC_STATE_STARTED;
+  GNUNET_TESTBED_insert_opc_ (opc->c, opc);
+  GNUNET_MQ_send (opc->c->mq,
+                  env);
+}
+
+
+/**
+ * Callback which will be called when peer manage server operation is released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void
+oprelease_manage_service (void *cls)
+{
+  struct OperationContext *opc = cls;
+  struct ManageServiceData *data;
+
+  data = opc->data;
+  switch (opc->state)
+  {
+  case OPC_STATE_STARTED:
+    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
+    break;
+
+  case OPC_STATE_INIT:
+    GNUNET_assert (NULL != data);
+    GNUNET_free (data->service_name);
+    break;
+
+  case OPC_STATE_FINISHED:
+    break;
+  }
+  GNUNET_free_non_null (data);
+  GNUNET_free (opc);
 }
 
 
+/**
+ * Start or stop given service at a peer.  This should not be called to
+ * start/stop the peer's ARM service.  Use GNUNET_TESTBED_peer_start(),
+ * GNUNET_TESTBED_peer_stop() for starting/stopping peer's ARM service.  Success
+ * or failure of the generated operation is signalled through the controller
+ * event callback and/or operation completion callback.
+ *
+ * @param op_cls the closure for the operation
+ * @param peer the peer whose service is to be started/stopped
+ * @param service_name the name of the service
+ * @param cb the operation completion callback
+ * @param cb_cls the closure for the operation completion callback
+ * @param start 1 to start the service; 0 to stop the service
+ * @return an operation handle; NULL upon error (peer not running)
+ */
+struct GNUNET_TESTBED_Operation *
+GNUNET_TESTBED_peer_manage_service (void *op_cls,
+                                    struct GNUNET_TESTBED_Peer *peer,
+                                    const char *service_name,
+                                    GNUNET_TESTBED_OperationCompletionCallback
+                                    cb,
+                                    void *cb_cls,
+                                    unsigned int start)
+{
+  struct ManageServiceData *data;
+  struct OperationContext *opc;
+  size_t msize;
+
+  GNUNET_assert (TESTBED_PS_STARTED == peer->state);  /* peer is not running? */
+  msize = strlen (service_name) + 1;
+  msize += sizeof(struct GNUNET_TESTBED_ManagePeerServiceMessage);
+  if (GNUNET_MAX_MESSAGE_SIZE < msize)
+    return NULL;
+  data = GNUNET_new (struct ManageServiceData);
+  data->cb = cb;
+  data->cb_cls = cb_cls;
+  data->peer = peer;
+  data->service_name = GNUNET_strdup (service_name);
+  data->start = start;
+  data->msize = (uint16_t) msize;
+  opc = GNUNET_new (struct OperationContext);
+  opc->data = data;
+  opc->c = peer->controller;
+  opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
+  opc->type = OP_MANAGE_SERVICE;
+  opc->op_cls = op_cls;
+  opc->op =
+    GNUNET_TESTBED_operation_create_ (opc, &opstart_manage_service,
+                                      &oprelease_manage_service);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  GNUNET_TESTBED_operation_begin_wait_ (opc->op);
+  return opc->op;
+}
+
 
 /* end of testbed_api_peers.c */