Imported Upstream version 0.9.5aupstream

1 files changed, 214 insertions, 1101 deletions

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index b170670..04a3e99 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008, 2009 Christian Grothoff (and other contributing authors)
+      (C) 2008, 2009, 2012 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
@@ -20,12 +20,13 @@
 
 /**
  * @file include/gnunet_testing_lib.h
- * @brief convenience API for writing testcases for GNUnet
- *        Many testcases need to start and stop gnunetd,
- *        and this library is supposed to make that easier
- *        for TESTCASES.  Normal programs should always
- *        use functions from gnunet_{util,arm}_lib.h.  This API is
- *        ONLY for writing testcases!
+ * @brief convenience API for writing testcases for GNUnet;
+ *        can start/stop one or more peers on a system;
+ *        testing is responsible for managing private keys,
+ *        ports and paths; it is a low-level library that
+ *        does not support higher-level functions such as
+ *        P2P connection, topology management or distributed
+ *        testbed maintenance (those are in gnunet_testbed_service.h)
  * @author Christian Grothoff
  */
 
@@ -43,1207 +44,319 @@ extern "C"
 #endif
 #endif
 
-#define HOSTKEYFILESIZE 914
+#define GNUNET_TESTING_HOSTKEYFILESIZE 914
 
 /**
- * Handle for a GNUnet daemon (technically a set of
- * daemons; the handle is really for the master ARM
- * daemon) started by the testing library.
+ * Handle for a system on which GNUnet peers are executed;
+ * a system is used for reserving unique paths and ports.
  */
-struct GNUNET_TESTING_Daemon;
-
-/**
- * Linked list of hostnames and ports to use for starting daemons.
- */
-struct GNUNET_TESTING_Host
-{
-  /**
-   * Pointer to next item in the list.
-   */
-  struct GNUNET_TESTING_Host *next;
-
-  /**
-   * Hostname to connect to.
-   */
-  char *hostname;
-
-  /**
-   * Username to use when connecting (may be null).
-   */
-  char *username;
-
-  /**
-   * Port to use for SSH connection (used for ssh
-   * connection forwarding, 0 to let ssh decide)
-   */
-  uint16_t port;
-};
-
-/**
- * Prototype of a function that will be called whenever
- * a daemon was started by the testing library.
- *
- * @param cls closure
- * @param id identifier for the daemon, NULL on error
- * @param d handle for the daemon
- * @param emsg error message (NULL on success)
- */
-typedef void (*GNUNET_TESTING_NotifyHostkeyCreated) (void *cls,
-                                                     const struct
-                                                     GNUNET_PeerIdentity * id,
-                                                     struct
-                                                     GNUNET_TESTING_Daemon * d,
-                                                     const char *emsg);
-
-/**
- * Prototype of a function that will be called whenever
- * a daemon was started by the testing library.
- *
- * @param cls closure
- * @param id identifier for the daemon, NULL on error
- * @param cfg configuration used by this daemon
- * @param d handle for the daemon
- * @param emsg error message (NULL on success)
- */
-typedef void (*GNUNET_TESTING_NotifyDaemonRunning) (void *cls,
-                                                    const struct
-                                                    GNUNET_PeerIdentity * id,
-                                                    const struct
-                                                    GNUNET_CONFIGURATION_Handle
-                                                    * cfg,
-                                                    struct GNUNET_TESTING_Daemon
-                                                    * d, const char *emsg);
-
-/**
- * Handle to an entire testbed of GNUnet peers.
- */
-struct GNUNET_TESTING_Testbed;
-
-/**
- * Phases of starting GNUnet on a system.
- */
-enum GNUNET_TESTING_StartPhase
-{
-  /**
-   * Copy the configuration file to the target system.
-   */
-  SP_COPYING,
-
-  /**
-   * Configuration file has been copied, generate hostkey.
-   */
-  SP_COPIED,
-
-  /**
-   * Create the hostkey for the peer.
-   */
-  SP_HOSTKEY_CREATE,
-
-  /**
-   * Hostkey generated, wait for topology to be finished.
-   */
-  SP_HOSTKEY_CREATED,
-
-  /**
-   * Topology has been created, now start ARM.
-   */
-  SP_TOPOLOGY_SETUP,
-
-  /**
-   * ARM has been started, check that it has properly daemonized and
-   * then try to connect to the CORE service (which should be
-   * auto-started by ARM).
-   */
-  SP_START_ARMING,
-
-  /**
-   * We're waiting for CORE to start.
-   */
-  SP_START_CORE,
-
-  /**
-   * CORE is up, now make sure we get the HELLO for this peer.
-   */
-  SP_GET_HELLO,
-
-  /**
-   * Core has notified us that we've established a connection to the service.
-   * The main FSM halts here and waits to be moved to UPDATE or CLEANUP.
-   */
-  SP_START_DONE,
-
-  /**
-   * We've been asked to terminate the instance and are now waiting for
-   * the remote command to stop the gnunet-arm process and delete temporary
-   * files.
-   */
-  SP_SHUTDOWN_START,
-
-  /**
-   * We should shutdown a *single* service via gnunet-arm.  Call the dead_cb
-   * upon notification from gnunet-arm that the service has been stopped.
-   */
-  SP_SERVICE_SHUTDOWN_START,
-
-  /**
-   * We should start a *single* service via gnunet-arm.  Call the daemon cb
-   * upon notification from gnunet-arm that the service has been started.
-   */
-  SP_SERVICE_START,
-
-  /**
-   * We've received a configuration update and are currently waiting for
-   * the copy process for the update to complete.  Once it is, we will
-   * return to "SP_START_DONE" (and rely on ARM to restart all affected
-   * services).
-   */
-  SP_CONFIG_UPDATE
-};
-
-/**
- * Prototype of a function that will be called when a
- * particular operation was completed the testing library.
- *
- * @param cls closure
- * @param emsg NULL on success
- */
-typedef void (*GNUNET_TESTING_NotifyCompletion) (void *cls, const char *emsg);
-
-/**
- * Prototype of a function that will be called with the
- * number of connections created for a particular topology.
- *
- * @param cls closure
- * @param num_connections the number of connections created
- */
-typedef void (*GNUNET_TESTING_NotifyConnections) (void *cls,
-                                                  unsigned int num_connections);
-
-/**
- * Handle for a GNUnet daemon (technically a set of
- * daemons; the handle is really for the master ARM
- * daemon) started by the testing library.
- */
-struct GNUNET_TESTING_Daemon
-{
-  /**
-   * Our configuration.
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * At what time to give up starting the peer
-   */
-  struct GNUNET_TIME_Absolute max_timeout;
-
-  /**
-   * Host to run GNUnet on.
-   */
-  char *hostname;
-
-  /**
-   * Port to use for ssh, NULL to let system choose default.
-   */
-  char *ssh_port_str;
-
-  /**
-   * Result of GNUNET_i2s of this peer,
-   * for printing
-   */
-  char *shortname;
-
-  /**
-   * Username we are using.
-   */
-  char *username;
-
-  /**
-   * Name of the configuration file
-   */
-  char *cfgfile;
-
-  /**
-   * Callback to inform initiator that the peer's
-   * hostkey has been created.
-   */
-  GNUNET_TESTING_NotifyHostkeyCreated hostkey_callback;
-
-  /**
-   * Closure for hostkey creation callback.
-   */
-  void *hostkey_cls;
-
-  /**
-   * Function to call when the peer is running.
-   */
-  GNUNET_TESTING_NotifyDaemonRunning cb;
-
-  /**
-   * Closure for cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Arguments from "daemon_stop" call.
-   */
-  GNUNET_TESTING_NotifyCompletion dead_cb;
-
-  /**
-   * Closure for 'dead_cb'.
-   */
-  void *dead_cb_cls;
-
-  /**
-   * Arguments from "daemon_stop" call.
-   */
-  GNUNET_TESTING_NotifyCompletion update_cb;
-
-  /**
-   * Closure for 'update_cb'.
-   */
-  void *update_cb_cls;
-
-  /**
-   * PID of the process we used to run gnunet-arm or SSH to start the peer.
-   */
-  struct GNUNET_OS_Process *proc_arm_start;
-
-  /**
-   * PID of the process we used to run gnunet-arm or SSH to stop the peer.
-   */
-  struct GNUNET_OS_Process *proc_arm_stop;
-
-  /**
-   * PID of the process we used to run gnunet-arm or SSH to manage services at the peer.
-   */
-  struct GNUNET_OS_Process *proc_arm_srv_start;
-
-  /**
-   * PID of the process we used to run gnunet-arm or SSH to manage services at the peer.
-   */
-  struct GNUNET_OS_Process *proc_arm_srv_stop;
-
-  /**
-   * PID of the process we used to run copy files
-   */
-  struct GNUNET_OS_Process *proc_arm_copying;
-
-  /**
-   * PID of the process we used to run gnunet-peerinfo.
-   */
-  struct GNUNET_OS_Process *proc_arm_peerinfo;
-
-  /**
-   * Handle to the server.
-   */
-  struct GNUNET_CORE_Handle *server;
-
-  /**
-   * Handle to the transport service of this peer
-   */
-  struct GNUNET_TRANSPORT_Handle *th;
-
-  /**
-   * Handle for getting HELLOs from transport
-   */
-  struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
-  /**
-   * HELLO message for this peer
-   */
-  struct GNUNET_HELLO_Message *hello;
-
-  /**
-   * Handle to a pipe for reading the hostkey.
-   */
-  struct GNUNET_DISK_PipeHandle *pipe_stdout;
-
-  /**
-   * Currently, a single char * pointing to a service
-   * that has been churned off.
-   *
-   * FIXME: make this a linked list of services that have been churned off!!!
-   */
-  char *churned_services;
-
-  /**
-   * ID of the current task.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier task;
-
-  /**
-   * Identity of this peer (once started).
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Flag to indicate that we've already been asked
-   * to terminate (but could not because some action
-   * was still pending).
-   */
-  int dead;
-
-  /**
-   * GNUNET_YES if the hostkey has been created
-   * for this peer, GNUNET_NO otherwise.
-   */
-  int have_hostkey;
-
-  /**
-   * In which phase are we during the start of
-   * this process?
-   */
-  enum GNUNET_TESTING_StartPhase phase;
-
-  /**
-   * Current position in 'hostkeybuf' (for reading from gnunet-peerinfo)
-   */
-  unsigned int hostkeybufpos;
-
-  /**
-   * Set to GNUNET_YES once the peer is up.
-   */
-  int running;
-
-  /**
-   * Used to tell shutdown not to remove configuration for the peer
-   * (if it's going to be restarted later)
-   */
-  int churn;
-
-  /**
-   * Output from gnunet-peerinfo is read into this buffer.
-   */
-  char hostkeybuf[105];
-
-};
+struct GNUNET_TESTING_System;
 
 
 /**
- * Handle to a group of GNUnet peers.
+ * Handle for a GNUnet peer controlled by testing.
  */
-struct GNUNET_TESTING_PeerGroup;
+struct GNUNET_TESTING_Peer;
 
 
 /**
- * Prototype of a function that will be called whenever
- * two daemons are connected by the testing library.
+ * Create a system handle.  There must only be one system handle per operating
+ * system.  Uses a default range for allowed ports.  Ports are still tested for
+ * availability.
  *
- * @param cls closure
- * @param first peer id for first daemon
- * @param second peer id for the second daemon
- * @param distance distance between the connected peers
- * @param first_cfg config for the first daemon
- * @param second_cfg config for the second daemon
- * @param first_daemon handle for the first daemon
- * @param second_daemon handle for the second daemon
- * @param emsg error message (NULL on success)
+ * @param testdir only the directory name without any path. This is used for all
+ *          service homes; the directory will be created in a temporary location
+ *          depending on the underlying OS
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ *          service configurations generated to allow control connections from
+ *          this ip. This can either be a single ip address or a network address
+ *          in CIDR notation.
+ * @param hostname the hostname of the system we are using for testing; NULL for
+ *          localhost
+ * @return handle to this system, NULL on error
  */
-typedef void (*GNUNET_TESTING_NotifyConnection) (void *cls,
-                                                 const struct
-                                                 GNUNET_PeerIdentity * first,
-                                                 const struct
-                                                 GNUNET_PeerIdentity * second,
-                                                 uint32_t distance,
-                                                 const struct
-                                                 GNUNET_CONFIGURATION_Handle *
-                                                 first_cfg,
-                                                 const struct
-                                                 GNUNET_CONFIGURATION_Handle *
-                                                 second_cfg,
-                                                 struct GNUNET_TESTING_Daemon *
-                                                 first_daemon,
-                                                 struct GNUNET_TESTING_Daemon *
-                                                 second_daemon,
-                                                 const char *emsg);
+struct GNUNET_TESTING_System *
+GNUNET_TESTING_system_create (const char *testdir,
+			      const char *trusted_ip,
+			      const char *hostname);
 
 
 /**
- * Prototype of a callback function indicating that two peers
- * are currently connected.
+ * Create a system handle.  There must only be one system
+ * handle per operating system.  Use this function directly
+ * if multiple system objects are created for the same host
+ * (only really useful when testing --- or to make the port
+ * range configureable).
  *
- * @param cls closure
- * @param first peer id for first daemon
- * @param second peer id for the second daemon
- * @param distance distance between the connected peers
- * @param emsg error message (NULL on success)
+ * @param testdir only the directory name without any path. This is used for
+ *          all service homes; the directory will be created in a temporary
+ *          location depending on the underlying OS
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ *          service configurations generated to allow control connections from
+ *          this ip. This can either be a single ip address or a network address
+ *          in CIDR notation.
+ * @param hostname the hostname of the system we are using for testing; NULL for
+ *          localhost
+ * @param lowport lowest port number this system is allowed to allocate (inclusive)
+ * @param highport highest port number this system is allowed to allocate (exclusive)
+ * @return handle to this system, NULL on error
  */
-typedef void (*GNUNET_TESTING_NotifyTopology) (void *cls,
-                                               const struct GNUNET_PeerIdentity
-                                               * first,
-                                               const struct GNUNET_PeerIdentity
-                                               * second, const char *emsg);
-
+struct GNUNET_TESTING_System *
+GNUNET_TESTING_system_create_with_portrange (const char *testdir,
+					     const char *trusted_ip,
+					     const char *hostname,
+					     uint16_t lowport,
+					     uint16_t highport);
 
-/**
- * Starts a GNUnet daemon.  GNUnet must be installed on the target
- * system and available in the PATH.  The machine must furthermore be
- * reachable via "ssh" (unless the hostname is "NULL") without the
- * need to enter a password.
- *
- * @param cfg configuration to use
- * @param timeout how long to wait starting up peers
- * @param pretend GNUNET_YES to set up files but not start peer GNUNET_NO
- *                to really start the peer (default)
- * @param hostname name of the machine where to run GNUnet
- *        (use NULL for localhost).
- * @param ssh_username ssh username to use when connecting to hostname
- * @param sshport port to pass to ssh process when connecting to hostname
- * @param hostkey pointer to a hostkey to be written to disk (instead of being generated)
- * @param hostkey_callback function to call once the hostkey has been
- *        generated for this peer, but it hasn't yet been started
- *        (NULL to start immediately, otherwise waits on GNUNET_TESTING_daemon_continue_start)
- * @param hostkey_cls closure for hostkey callback
- * @param cb function to call once peer is up, or failed to start
- * @param cb_cls closure for cb
- * @return handle to the daemon (actual start will be completed asynchronously)
- */
-struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                             struct GNUNET_TIME_Relative timeout, int pretend,
-                             const char *hostname, const char *ssh_username,
-                             uint16_t sshport, const char *hostkey,
-                             GNUNET_TESTING_NotifyHostkeyCreated
-                             hostkey_callback, void *hostkey_cls,
-                             GNUNET_TESTING_NotifyDaemonRunning cb,
-                             void *cb_cls);
 
 /**
- * Continues GNUnet daemon startup when user wanted to be notified
- * once a hostkey was generated (for creating friends files, blacklists,
- * etc.).
+ * Free system resources.
  *
- * @param daemon the daemon to finish starting
+ * @param system system to be freed
+ * @param remove_paths should the 'testdir' and all subdirectories
+ *        be removed (clean up on shutdown)?
  */
 void
-GNUNET_TESTING_daemon_continue_startup (struct GNUNET_TESTING_Daemon *daemon);
+GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
+			       int remove_paths);
 
 
 /**
- * Check whether the given daemon is running.
+ * Testing includes a number of pre-created hostkeys for
+ * faster peer startup.  This function can be used to
+ * access the n-th key of those pre-created hostkeys; note
+ * that these keys are ONLY useful for testing and not
+ * secure as the private keys are part of the public 
+ * GNUnet source code.
  *
- * @param daemon the daemon to check
- * @return GNUNET_YES if the daemon is up, GNUNET_NO if the
- *         daemon is down, GNUNET_SYSERR on error.
- */
-int
-GNUNET_TESTING_test_daemon_running (struct GNUNET_TESTING_Daemon *daemon);
-
-
-/**
- * Obtain the peer identity of the peer with the given configuration
- * handle.  This function reads the private key of the peer, obtains
- * the public key and hashes it.
- *
- * @param cfg configuration of the peer
- * @param pid where to store the peer identity
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-GNUNET_TESTING_get_peer_identity (const struct GNUNET_CONFIGURATION_Handle *cfg,
-				  struct GNUNET_PeerIdentity *pid);
-
-
-/**
- * Restart (stop and start) a GNUnet daemon.
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
  *
- * @param d the daemon that should be restarted
- * @param cb function called once the daemon is (re)started
- * @param cb_cls closure for cb
+ * @param system the testing system handle
+ * @param key_number desired pre-created hostkey to obtain
+ * @param id set to the peer's identity (hash of the public
+ *        key; if NULL, GNUNET_SYSERR is returned immediately
+ * @return NULL on error (not enough keys)
  */
-void
-GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
-                               GNUNET_TESTING_NotifyDaemonRunning cb,
-                               void *cb_cls);
+struct GNUNET_CRYPTO_RsaPrivateKey *
+GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
+			    uint32_t key_number,
+			    struct GNUNET_PeerIdentity *id);
 
 
 /**
- * Start a peer that has previously been stopped using the daemon_stop
- * call (and files weren't deleted and the allow restart flag)
+ * Reserve a TCP or UDP port for a peer.
  *
- * @param daemon the daemon to start (has been previously stopped)
- * @param timeout how long to wait for restart
- * @param cb the callback for notification when the peer is running
- * @param cb_cls closure for the callback
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @return 0 if no free port was available
  */
-void
-GNUNET_TESTING_daemon_start_stopped (struct GNUNET_TESTING_Daemon *daemon,
-                                     struct GNUNET_TIME_Relative timeout,
-                                     GNUNET_TESTING_NotifyDaemonRunning cb,
-                                     void *cb_cls);
+uint16_t 
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp);
 
 
 /**
- * Starts a GNUnet daemon's service.
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during GNUNET_TESTING_peer_destroy).
  *
- * @param d the daemon for which the service should be started
- * @param service the name of the service to start
- * @param timeout how long to wait for process for startup
- * @param cb function called once gnunet-arm returns
- * @param cb_cls closure for cb
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @param port reserved port to release
  */
 void
-GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d,
-                                     const char *service,
-                                     struct GNUNET_TIME_Relative timeout,
-                                     GNUNET_TESTING_NotifyDaemonRunning cb,
-                                     void *cb_cls);
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp,
+			     uint16_t port);
 
 
 /**
- * Starts a GNUnet daemon's service which has been previously turned off.
+ * Create a new configuration using the given configuration as a template;
+ * ports and paths will be modified to select available ports on the local
+ * system. The default configuration will be available in PATHS section under
+ * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
+ * section to the temporary directory specific to this configuration. If we run
+ * out of "*port" numbers, return SYSERR.
  *
- * @param d the daemon for which the service should be started
- * @param service the name of the service to start
- * @param timeout how long to wait for process for startup
- * @param cb function called once gnunet-arm returns
- * @param cb_cls closure for cb
- */
-void
-GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d,
-                                             char *service,
-                                             struct GNUNET_TIME_Relative
-                                             timeout,
-                                             GNUNET_TESTING_NotifyDaemonRunning
-                                             cb, void *cb_cls);
-
-
-/**
- * Get a certain testing daemon handle.
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
  *
- * @param pg handle to the set of running peers
- * @param position the number of the peer to return
+ * @param system system to use to coordinate resource usage
+ * @param cfg template configuration to update
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will
+ *           be incomplete and should not be used there upon
  */
-struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg,
-                           unsigned int position);
-
-
-/**
- * Get a daemon by peer identity, so callers can
- * retrieve the daemon without knowing it's offset.
- *
- * @param pg the peer group to retrieve the daemon from
- * @param peer_id the peer identity of the daemon to retrieve
- *
- * @return the daemon on success, or NULL if no such peer identity is found
- */
-struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_get_by_id (struct GNUNET_TESTING_PeerGroup *pg,
-                                 const struct GNUNET_PeerIdentity *peer_id);
-
-
-/**
- * Stops a GNUnet daemon.
- *
- * @param d the daemon that should be stopped
- * @param timeout how long to wait for process for shutdown to complete
- * @param cb function called once the daemon was stopped
- * @param cb_cls closure for cb
- * @param delete_files GNUNET_YES to remove files, GNUNET_NO
- *        to leave them (i.e. for restarting at a later time,
- *        or logfile inspection once finished)
- * @param allow_restart GNUNET_YES to restart peer later (using this API)
- *        GNUNET_NO to kill off and clean up for good
- */
-void
-GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
-                            struct GNUNET_TIME_Relative timeout,
-                            GNUNET_TESTING_NotifyCompletion cb, void *cb_cls,
-                            int delete_files, int allow_restart);
-
-
-
-/**
- * Create a new configuration using the given configuration
- * as a template; however, each PORT in the existing cfg
- * must be renumbered by incrementing "*port".  If we run
- * out of "*port" numbers, return NULL.
- *
- * @param cfg template configuration
- * @param off the current peer offset
- * @param port port numbers to use, update to reflect
- *             port numbers that were used
- * @param upnum number to make unix domain socket names unique
- * @param hostname hostname of the controlling host, to allow control connections from
- * @param fdnum number used to offset the unix domain socket for grouped processes
- *              (such as statistics or peerinfo, which can be shared among others)
- *
- * @return new configuration, NULL on error
- */
-struct GNUNET_CONFIGURATION_Handle *
-GNUNET_TESTING_create_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg, uint32_t off,
-             uint16_t * port, uint32_t * upnum, const char *hostname,
-             uint32_t * fdnum);
-
-/**
- * Changes the configuration of a GNUnet daemon.
- *
- * @param d the daemon that should be modified
- * @param cfg the new configuration for the daemon
- * @param cb function called once the configuration was changed
- * @param cb_cls closure for cb
- */
-void
-GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
-                                   struct GNUNET_CONFIGURATION_Handle *cfg,
-                                   GNUNET_TESTING_NotifyCompletion cb,
-                                   void *cb_cls);
-
-
-/**
- * Stops a single service of a GNUnet daemon.  Used like daemon_stop,
- * only doesn't stop the entire peer in any case.  If the service
- * is not currently running, this call is likely to fail after
- * timeout!
- *
- * @param d the daemon that should be stopped
- * @param service the name of the service to stop
- * @param timeout how long to wait for process for shutdown to complete
- * @param cb function called once the service was stopped
- * @param cb_cls closure for cb
- */
-void
-GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d,
-                                    const char *service,
-                                    struct GNUNET_TIME_Relative timeout,
-                                    GNUNET_TESTING_NotifyCompletion cb,
-                                    void *cb_cls);
-
-
-/**
- * Read a testing hosts file based on a configuration.
- * Returns a DLL of hosts (caller must free!) on success
- * or NULL on failure.
- *
- * @param cfg a configuration with a testing section
- *
- * @return DLL of hosts on success, NULL on failure
- */
-struct GNUNET_TESTING_Host *
-GNUNET_TESTING_hosts_load (const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Start count gnunet instances with the same set of transports and
- * applications.  The port numbers (any option called "PORT") will be
- * adjusted to ensure that no two peers running on the same system
- * have the same port(s) in their respective configurations.
- *
- * @param cfg configuration template to use
- * @param total number of daemons to start
- * @param max_concurrent_connections for testing, how many peers can
-*                                   we connect to simultaneously
- * @param max_concurrent_ssh when starting with ssh, how many ssh
- *        connections will we allow at once (based on remote hosts allowed!)
- * @param timeout total time allowed for peers to start
- * @param hostkey_callback function to call on each peers hostkey generation
- *        if NULL, peers will be started by this call, if non-null,
- *        GNUNET_TESTING_daemons_continue_startup must be called after
- *        successful hostkey generation
- * @param hostkey_cls closure for hostkey callback
- * @param cb function to call on each daemon that was started
- * @param cb_cls closure for cb
- * @param connect_callback function to call each time two hosts are connected
- * @param connect_callback_cls closure for connect_callback
- * @param hostnames linked list of host structs to use to start peers on
- *                  (NULL to run on localhost only)
- *
- * @return NULL on error, otherwise handle to control peer group
- */
-struct GNUNET_TESTING_PeerGroup *
-GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              unsigned int total,
-                              unsigned int max_concurrent_connections,
-                              unsigned int max_concurrent_ssh,
-                              struct GNUNET_TIME_Relative timeout,
-                              GNUNET_TESTING_NotifyHostkeyCreated
-                              hostkey_callback, void *hostkey_cls,
-                              GNUNET_TESTING_NotifyDaemonRunning cb,
-                              void *cb_cls,
-                              GNUNET_TESTING_NotifyConnection connect_callback,
-                              void *connect_callback_cls,
-                              const struct GNUNET_TESTING_Host *hostnames);
-
-
-/**
- * Function which continues a peer group starting up
- * after successfully generating hostkeys for each peer.
- *
- * @param pg the peer group to continue starting
- */
-void
-GNUNET_TESTING_daemons_continue_startup (struct GNUNET_TESTING_PeerGroup *pg);
-
-
-/**
- * Handle for an active request to connect two peers.
- */
-struct GNUNET_TESTING_ConnectContext;
-
-
-/**
- * Establish a connection between two GNUnet daemons.  The daemons
- * must both be running and not be stopped until either the
- * 'cb' callback is called OR the connection request has been
- * explicitly cancelled.
- *
- * @param d1 handle for the first daemon
- * @param d2 handle for the second daemon
- * @param timeout how long is the connection attempt
- *        allowed to take?
- * @param max_connect_attempts how many times should we try to reconnect
- *        (within timeout)
- * @param send_hello GNUNET_YES to send the HELLO, GNUNET_NO to assume
- *                   the HELLO has already been exchanged
- * @param cb function to call at the end
- * @param cb_cls closure for cb
- * @return handle to cancel the request, NULL on error
- */
-struct GNUNET_TESTING_ConnectContext *
-GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
-                                struct GNUNET_TESTING_Daemon *d2,
-                                struct GNUNET_TIME_Relative timeout,
-                                unsigned int max_connect_attempts,
-                                int send_hello,
-                                GNUNET_TESTING_NotifyConnection cb,
-                                void *cb_cls);
-
-
-
-/**
- * Cancel an attempt to connect two daemons.
- *
- * @param cc connect context
- */
-void
-GNUNET_TESTING_daemons_connect_cancel (struct GNUNET_TESTING_ConnectContext
-                                       *cc);
-
+int
+GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
+				     struct GNUNET_CONFIGURATION_Handle *cfg);
+// FIXME: add dual to 'release' ports again...
 
 
 /**
- * Restart all peers in the given group.
+ * Configure a GNUnet peer.  GNUnet must be installed on the local
+ * system and available in the PATH. 
  *
- * @param pg the handle to the peer group
- * @param callback function to call on completion (or failure)
- * @param callback_cls closure for the callback function
+ * @param system system to use to coordinate resource usage
+ * @param cfg configuration to use; will be UPDATED (to reflect needed
+ *            changes in port numbers and paths)
+ * @param key_number number of the hostkey to use for the peer
+ * @param id identifier for the daemon, will be set, can be NULL
+ * @param emsg set to freshly allocated error message (set to NULL on success), 
+ *          can be NULL
+ * @return handle to the peer, NULL on error
  */
-void
-GNUNET_TESTING_daemons_restart (struct GNUNET_TESTING_PeerGroup *pg,
-                                GNUNET_TESTING_NotifyCompletion callback,
-                                void *callback_cls);
+struct GNUNET_TESTING_Peer *
+GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
+			       struct GNUNET_CONFIGURATION_Handle *cfg,
+			       uint32_t key_number,
+			       struct GNUNET_PeerIdentity *id,
+			       char **emsg);
 
 
 /**
- * Shutdown all peers started in the given group.
+ * Obtain the peer identity from a peer handle.
  *
- * @param pg handle to the peer group
- * @param timeout how long to wait for shutdown
- * @param cb callback to notify upon success or failure
- * @param cb_cls closure for cb
+ * @param peer peer handle for which we want the peer's identity
+ * @param id identifier for the daemon, will be set
  */
 void
-GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
-                             struct GNUNET_TIME_Relative timeout,
-                             GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
+GNUNET_TESTING_peer_get_identity (const struct GNUNET_TESTING_Peer *peer,
+				  struct GNUNET_PeerIdentity *id);
 
 
 /**
- * Count the number of running peers.
- *
- * @param pg handle for the peer group
+ * Start the peer. 
  *
- * @return the number of currently running peers in the peer group
+ * @param peer peer to start
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running)
  */
-unsigned int
-GNUNET_TESTING_daemons_running (struct GNUNET_TESTING_PeerGroup *pg);
-
-
-/**
- * Simulate churn by stopping some peers (and possibly
- * re-starting others if churn is called multiple times).  This
- * function can only be used to create leave-join churn (peers "never"
- * leave for good).  First "voff" random peers that are currently
- * online will be taken offline; then "von" random peers that are then
- * offline will be put back online.  No notifications will be
- * generated for any of these operations except for the callback upon
- * completion.  Note that the implementation is at liberty to keep
- * the ARM service itself (but none of the other services or daemons)
- * running even though the "peer" is being varied offline.
- *
- * @param pg handle for the peer group
- * @param service the service to churn on/off, NULL for all
- * @param voff number of peers that should go offline
- * @param von number of peers that should come back online;
- *            must be zero on first call (since "testbed_start"
- *            always starts all of the peers)
- * @param timeout how long to wait for operations to finish before
- *        giving up
- * @param cb function to call at the end
- * @param cb_cls closure for cb
- */
-void
-GNUNET_TESTING_daemons_churn (struct GNUNET_TESTING_PeerGroup *pg,
-                              char *service, unsigned int voff,
-                              unsigned int von,
-                              struct GNUNET_TIME_Relative timeout,
-                              GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
-
-
-/**
- * Start a given service for each of the peers in the peer group.
- *
- * @param pg handle for the peer group
- * @param service the service to start
- * @param timeout how long to wait for operations to finish before
- *        giving up
- * @param cb function to call once finished
- * @param cb_cls closure for cb
- *
- */
-void
-GNUNET_TESTING_daemons_start_service