typos

1 files changed, 63 insertions, 35 deletions

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 5bedc406c..42ee990c9 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -114,7 +114,6 @@ typedef void (*GNUNET_TESTING_NotifyDaemonRunning) (void *cls,
                                                     struct GNUNET_TESTING_Daemon
                                                     * d, const char *emsg);
 
-
 /**
  * Handle to an entire testbed of GNUnet peers.
  */
@@ -305,63 +304,66 @@ struct GNUNET_TESTING_Daemon
   void *update_cb_cls;
 
   /**
-   * Identity of this peer (once started).
+   * PID of the process that we started last.
    */
-  struct GNUNET_PeerIdentity id;
+  struct GNUNET_OS_Process *proc;
 
   /**
-   * Flag to indicate that we've already been asked
-   * to terminate (but could not because some action
-   * was still pending).
+   * Handle to the server.
    */
-  int dead;
+  struct GNUNET_CORE_Handle *server;
 
   /**
-   * GNUNET_YES if the hostkey has been created
-   * for this peer, GNUNET_NO otherwise.
+   * Handle to the transport service of this peer
    */
-  int have_hostkey;
+  struct GNUNET_TRANSPORT_Handle *th;
 
   /**
-   * PID of the process that we started last.
+   * HELLO message for this peer
    */
-  struct GNUNET_OS_Process *proc;
+  struct GNUNET_HELLO_Message *hello;
 
   /**
-   * In which phase are we during the start of
-   * this process?
+   * Handle to a pipe for reading the hostkey.
    */
-  enum GNUNET_TESTING_StartPhase phase;
+  struct GNUNET_DISK_PipeHandle *pipe_stdout;
 
   /**
-   * ID of the current task.
+   * 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!!!
    */
-  GNUNET_SCHEDULER_TaskIdentifier task;
+  char *churned_services;
 
   /**
-   * Handle to the server.
+   * ID of the current task.
    */
-  struct GNUNET_CORE_Handle *server;
+  GNUNET_SCHEDULER_TaskIdentifier task;
 
   /**
-   * Handle to the transport service of this peer
+   * Identity of this peer (once started).
    */
-  struct GNUNET_TRANSPORT_Handle *th;
+  struct GNUNET_PeerIdentity id;
 
   /**
-   * HELLO message for this peer
+   * Flag to indicate that we've already been asked
+   * to terminate (but could not because some action
+   * was still pending).
    */
-  struct GNUNET_HELLO_Message *hello;
+  int dead;
 
   /**
-   * Handle to a pipe for reading the hostkey.
+   * GNUNET_YES if the hostkey has been created
+   * for this peer, GNUNET_NO otherwise.
    */
-  struct GNUNET_DISK_PipeHandle *pipe_stdout;
+  int have_hostkey;
 
   /**
-   * Output from gnunet-peerinfo is read into this buffer.
+   * In which phase are we during the start of
+   * this process?
    */
-  char hostkeybuf[105];
+  enum GNUNET_TESTING_StartPhase phase;
 
   /**
    * Current position in 'hostkeybuf' (for reading from gnunet-peerinfo)
@@ -380,12 +382,10 @@ struct GNUNET_TESTING_Daemon
   int churn;
 
   /**
-   * 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!!!
+   * Output from gnunet-peerinfo is read into this buffer.
    */
-  char *churned_services;
+  char hostkeybuf[105];
+
 };
 
 
@@ -567,7 +567,8 @@ 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.
  *
@@ -580,6 +581,7 @@ struct GNUNET_TESTING_Daemon *
 GNUNET_TESTING_daemon_get_by_id (struct GNUNET_TESTING_PeerGroup *pg,
                                  struct GNUNET_PeerIdentity *peer_id);
 
+
 /**
  * Stops a GNUnet daemon.
  *
@@ -614,6 +616,7 @@ GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
                                    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
@@ -633,6 +636,7 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d,
                                     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
@@ -687,6 +691,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               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.
@@ -711,7 +716,7 @@ GNUNET_TESTING_daemons_continue_startup (struct GNUNET_TESTING_PeerGroup *pg);
  * @param cb function to call at the end
  * @param cb_cls closure for cb
  */
-void
+struct GNUNET_TESTING_ConnectContext *
 GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
                                 struct GNUNET_TESTING_Daemon *d2,
                                 struct GNUNET_TIME_Relative timeout,
@@ -722,6 +727,15 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
 
 
 /**
+ * Cancel an attempt to connect two daemons.
+ *
+ * @param cc connect context
+ */
+void
+GNUNET_TESTING_daemons_connect_cancel (struct GNUNET_TESTING_ConnectContext *cc);
+
+
+/**
  * Restart all peers in the given group.
  *
  * @param pg the handle to the peer group
@@ -758,6 +772,7 @@ GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
 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
@@ -787,7 +802,9 @@ GNUNET_TESTING_daemons_churn (struct GNUNET_TESTING_PeerGroup *pg,
                               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
@@ -805,6 +822,7 @@ GNUNET_TESTING_daemons_start_service (struct GNUNET_TESTING_PeerGroup *pg,
                                       GNUNET_TESTING_NotifyCompletion cb,
                                       void *cb_cls);
 
+
 /**
  * Callback function to process statistic values.
  *
@@ -824,6 +842,7 @@ typedef int (*GNUNET_TESTING_STATISTICS_Iterator) (void *cls,
                                                    uint64_t value,
                                                    int is_persistent);
 
+
 /**
  * Iterate over all (running) peers in the peer group, retrieve
  * all statistics from each.
@@ -839,6 +858,7 @@ GNUNET_TESTING_get_statistics (struct GNUNET_TESTING_PeerGroup *pg,
                                GNUNET_TESTING_STATISTICS_Iterator proc,
                                void *cls);
 
+
 /**
  * Topologies supported for testbeds.
  */
@@ -956,6 +976,7 @@ int
 GNUNET_TESTING_topology_get (enum GNUNET_TESTING_Topology *topology,
                              const char *topology_string);
 
+
 /**
  * Get connect topology option from string input.
  *
@@ -1013,6 +1034,7 @@ GNUNET_TESTING_create_topology (struct GNUNET_TESTING_PeerGroup *pg,
                                 enum GNUNET_TESTING_Topology restrict_topology,
                                 const char *restrict_transports);
 
+
 /**
  * Iterate over all (running) peers in the peer group, retrieve
  * all connections that each currently has.
@@ -1025,6 +1047,7 @@ void
 GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg,
                              GNUNET_TESTING_NotifyTopology cb, void *cls);
 
+
 /**
  * Stop the connection process temporarily.
  *
@@ -1033,6 +1056,7 @@ GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg,
 void
 GNUNET_TESTING_stop_connections (struct GNUNET_TESTING_PeerGroup *pg);
 
+
 /**
  * Resume the connection process.
  *
@@ -1041,6 +1065,7 @@ GNUNET_TESTING_stop_connections (struct GNUNET_TESTING_PeerGroup *pg);
 void
 GNUNET_TESTING_resume_connections (struct GNUNET_TESTING_PeerGroup *pg);
 
+
 /**
  * There are many ways to connect peers that are supported by this function.
  * To connect peers in the same topology that was created via the
@@ -1073,6 +1098,7 @@ GNUNET_TESTING_connect_topology (struct GNUNET_TESTING_PeerGroup *pg,
                                  GNUNET_TESTING_NotifyCompletion
                                  notify_callback, void *notify_cls);
 
+
 /**
  * Start or stop an individual peer from the given group.
  *
@@ -1089,6 +1115,7 @@ GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
                              struct GNUNET_TIME_Relative timeout,
                              GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
 
+
 /**
  * Start a peer group with a given number of peers.  Notify
  * on completion of peer startup and connection based on given
@@ -1115,6 +1142,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                 void *peergroup_cls,
                                 const struct GNUNET_TESTING_Host *hostnames);
 
+
 /**
  * Print current topology to a graphviz readable file.
  *