const-ing of config-handles

18 files changed, 71 insertions, 52 deletions

diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 5a929a37e..bbb8cb0f6 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -71,7 +71,7 @@ typedef void (*GNUNET_ARM_Callback) (void *cls, int success);
  */
 void
 GNUNET_ARM_start_service (const char *service_name,
-                          struct GNUNET_CONFIGURATION_Handle *cfg,
+                          const struct GNUNET_CONFIGURATION_Handle *cfg,
                           struct GNUNET_SCHEDULER_Handle *sched,
                           struct GNUNET_TIME_Relative timeout,
                           GNUNET_ARM_Callback cb, void *cb_cls);
@@ -91,7 +91,7 @@ GNUNET_ARM_start_service (const char *service_name,
  */
 void
 GNUNET_ARM_stop_service (const char *service_name,
-                         struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const struct GNUNET_CONFIGURATION_Handle *cfg,
                          struct GNUNET_SCHEDULER_Handle *sched,
                          struct GNUNET_TIME_Relative timeout,
                          GNUNET_ARM_Callback cb, void *cb_cls);
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 6a77aa391..eb8e1d127 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -59,7 +59,7 @@ struct GNUNET_CLIENT_Connection *GNUNET_CLIENT_connect (struct
                                                         *sched,
                                                         const char
                                                         *service_name,
-                                                        struct
+                                                        const struct
                                                         GNUNET_CONFIGURATION_Handle
                                                         *cfg);
 
@@ -143,7 +143,7 @@ void GNUNET_CLIENT_service_shutdown (struct GNUNET_CLIENT_Connection *sock);
  */
 void GNUNET_CLIENT_service_test (struct GNUNET_SCHEDULER_Handle *sched,
                                  const char *service,
-                                 struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 const struct GNUNET_CONFIGURATION_Handle *cfg,
                                  struct GNUNET_TIME_Relative timeout,
                                  GNUNET_SCHEDULER_Task task, void *task_cls);
 
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 3f7d099ce..abbfe2eec 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -88,13 +88,13 @@ int GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg,
  * changed since the last save.
  * @return GNUNET_NO if clean, GNUNET_YES if dirty, GNUNET_SYSERR on error (i.e. last save failed)
  */
-int GNUNET_CONFIGURATION_is_dirty (struct GNUNET_CONFIGURATION_Handle *cfg);
+int GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 /**
  * Get a configuration value that should be a number.
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
+int GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle
                                            *cfg, const char *section,
                                            const char *option,
                                            unsigned long long *number);
@@ -105,7 +105,7 @@ int GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
  * @param time set to the time value stored in the configuration
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
+int GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle
                                          *cfg, const char *section,
                                          const char *option,
                                          struct GNUNET_TIME_Relative *time);
@@ -114,7 +114,7 @@ int GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
  * Test if we have a value for a particular option
  * @return GNUNET_YES if so, GNUNET_NO if not.
  */
-int GNUNET_CONFIGURATION_have_value (struct GNUNET_CONFIGURATION_Handle *cfg,
+int GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                      const char *section, const char *option);
 
 /**
@@ -123,7 +123,7 @@ int GNUNET_CONFIGURATION_have_value (struct GNUNET_CONFIGURATION_Handle *cfg,
  *        value, or NULL if option is not specified
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_CONFIGURATION_get_value_string (struct GNUNET_CONFIGURATION_Handle
+int GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle
                                            *cfg, const char *section,
                                            const char *option, char **value);
 
@@ -135,7 +135,7 @@ int GNUNET_CONFIGURATION_get_value_string (struct GNUNET_CONFIGURATION_Handle
  *        value, or NULL if option is not specified
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_CONFIGURATION_get_value_filename (struct
+int GNUNET_CONFIGURATION_get_value_filename (const struct
                                              GNUNET_CONFIGURATION_Handle *cfg,
                                              const char *section,
                                              const char *option,
@@ -146,7 +146,7 @@ int GNUNET_CONFIGURATION_get_value_filename (struct
  *
  * @return number of filenames iterated over, -1 on error
  */
-int GNUNET_CONFIGURATION_iterate_value_filenames (struct
+int GNUNET_CONFIGURATION_iterate_value_filenames (const struct
                                                   GNUNET_CONFIGURATION_Handle
                                                   *cfg,
                                                   const char *section,
@@ -163,7 +163,7 @@ int GNUNET_CONFIGURATION_iterate_value_filenames (struct
  *        or NULL if option is not specified and no default given
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_CONFIGURATION_get_value_choice (struct GNUNET_CONFIGURATION_Handle
+int GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle
                                            *cfg, const char *section,
                                            const char *option,
                                            const char **choices,
@@ -175,7 +175,7 @@ int GNUNET_CONFIGURATION_get_value_choice (struct GNUNET_CONFIGURATION_Handle
  *
  * @return GNUNET_YES, GNUNET_NO or if option has no valid value, GNUNET_SYSERR
  */
-int GNUNET_CONFIGURATION_get_value_yesno (struct GNUNET_CONFIGURATION_Handle
+int GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle
                                           *cfg, const char *section,
                                           const char *option);
 
@@ -187,7 +187,7 @@ int GNUNET_CONFIGURATION_get_value_yesno (struct GNUNET_CONFIGURATION_Handle
  * @param old string to $-expand (will be freed!)
  * @return $-expanded string
  */
-char *GNUNET_CONFIGURATION_expand_dollar (struct GNUNET_CONFIGURATION_Handle
+char *GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle
                                           *cfg, char *old);
 
 /**
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index a096569ef..a77281336 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -171,7 +171,7 @@ typedef void
  */
 void
 GNUNET_CORE_connect (struct GNUNET_SCHEDULER_Handle *sched,
-                     struct GNUNET_CONFIGURATION_Handle *cfg,
+                     const struct GNUNET_CONFIGURATION_Handle *cfg,
                      struct GNUNET_TIME_Relative timeout,
                      void *cls,
                      GNUNET_CORE_StartupCallback init,
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index c913a6462..8eb724bfa 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -58,7 +58,7 @@ struct GNUNET_DATACACHE_Handle;
  */
 struct GNUNET_DATACACHE_Handle *
 GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
-                         struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const struct GNUNET_CONFIGURATION_Handle *cfg,
                          const char *section);
 
 
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index ccbe4e076..28419126f 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -55,7 +55,7 @@ struct GNUNET_DATASTORE_Handle;
  * @param sched scheduler to use
  * @return handle to use to access the service
  */
-struct GNUNET_DATASTORE_Handle *GNUNET_DATASTORE_connect (struct
+struct GNUNET_DATASTORE_Handle *GNUNET_DATASTORE_connect (const struct
                                                           GNUNET_CONFIGURATION_Handle
                                                           *cfg,
                                                           struct
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index a8a51ab78..7f463b83e 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -359,7 +359,7 @@ int GNUNET_DISK_file_change_owner (const char *filename, const char *user);
  *                private directory name.
  * @return the constructed filename
  */
-char *GNUNET_DISK_get_home_filename (struct GNUNET_CONFIGURATION_Handle *cfg,
+char *GNUNET_DISK_get_home_filename (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                      const char *serviceName, ...);
 
 
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 0f61bc764..e45a46ef4 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -1368,7 +1368,7 @@ struct GNUNET_FS_Handle;
  */
 struct GNUNET_FS_Handle *
 GNUNET_FS_start (struct GNUNET_SCHEDULER_Handle *sched,
-                 struct GNUNET_CONFIGURATION_Handle *cfg,
+                 const struct GNUNET_CONFIGURATION_Handle *cfg,
                  const char *client_name,
                  GNUNET_FS_ProgressCallback upcb,
                  void *upcb_cls);
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 722155568..e7063d3d0 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -60,11 +60,6 @@ struct GNUNET_GETOPT_CommandLineProcessorContext
   const struct GNUNET_GETOPT_CommandLineOption *allOptions;
 
   /**
-   * For configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
    * Original command line
    */
   char *const *argv;
@@ -192,7 +187,6 @@ struct GNUNET_GETOPT_CommandLineOption
  * Parse the command line.
  *
  * @param binaryName name of the binary / application with options
- * @param cfg for storing/accessing configuration data
  * @param allOptions defined options and handlers
  * @param argc number of arguments
  * @param argv actual arguments
@@ -200,7 +194,6 @@ struct GNUNET_GETOPT_CommandLineOption
  *   argument, or GNUNET_SYSERR on error
  */
 int GNUNET_GETOPT_run (const char *binaryName,
-                       struct GNUNET_CONFIGURATION_Handle *cfg,
                        const struct GNUNET_GETOPT_CommandLineOption
                        *allOptions, unsigned int argc, char *const *argv);
 
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 1d4d47441..cce805ba0 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -115,7 +115,8 @@ void GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor
  * @return -1 on error, otherwise load value (between 0 and 100,
  *        (100 is equivalent to full load for one CPU)
  */
-int GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg);
+int GNUNET_OS_load_cpu_get (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
 
 /**
  * Get the current IO load.
@@ -125,7 +126,7 @@ int GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg);
  *       100 means that we spend all of our cycles waiting for
  *       the disk)
  */
-int GNUNET_OS_load_disk_get (struct GNUNET_CONFIGURATION_Handle *cfg);
+int GNUNET_OS_load_disk_get (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 45c52c447..54fc68033 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -51,7 +51,7 @@ extern "C"
  * @param hello the verified (!) HELLO message
  */
 void
-GNUNET_PEERINFO_add_peer (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PEERINFO_add_peer (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           struct GNUNET_SCHEDULER_Handle *sched,
                           const struct GNUNET_PeerIdentity *peer,
                           const struct GNUNET_HELLO_Message *hello);
@@ -90,7 +90,7 @@ typedef void
  * @param callback_cls closure for callback
  */
 void
-GNUNET_PEERINFO_for_all (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PEERINFO_for_all (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          struct GNUNET_SCHEDULER_Handle *sched,
                          const struct GNUNET_PeerIdentity *peer,
                          int trust_delta,
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index fcd00b8ef..a44f4f11e 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -52,7 +52,7 @@ typedef void (*GNUNET_PROGRAM_Main) (void *cls,
                                      struct GNUNET_SCHEDULER_Handle * sched,
                                      char *const *args,
                                      const char *cfgfile,
-                                     struct GNUNET_CONFIGURATION_Handle *
+                                     const struct GNUNET_CONFIGURATION_Handle *
                                      cfg);
 
 
diff --git a/src/include/gnunet_pseudonym_lib.h b/src/include/gnunet_pseudonym_lib.h
index 0ee9ce7ac..ced9bf387 100644
--- a/src/include/gnunet_pseudonym_lib.h
+++ b/src/include/gnunet_pseudonym_lib.h
@@ -59,7 +59,7 @@ typedef int (*GNUNET_PSEUDONYM_Iterator) (void *cls,
  * @param delta by how much should the rating be changed?
  * @return new rating of the namespace
  */
-int GNUNET_PSEUDONYM_rank (struct GNUNET_CONFIGURATION_Handle *cfg,
+int GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg,
                            const GNUNET_HashCode * pseudonym, int delta);
 
 /**
@@ -67,7 +67,7 @@ int GNUNET_PSEUDONYM_rank (struct GNUNET_CONFIGURATION_Handle *cfg,
  *
  * @param pseudonym the pseudonym's identifier
  */
-void GNUNET_PSEUDONYM_add (struct GNUNET_CONFIGURATION_Handle *cfg,
+void GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
                            const GNUNET_HashCode * pseudo,
                            const struct GNUNET_CONTAINER_MetaData *meta);
 
@@ -75,7 +75,7 @@ void GNUNET_PSEUDONYM_add (struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * List all known pseudonyms.
  */
-int GNUNET_PSEUDONYM_list_all (struct GNUNET_CONFIGURATION_Handle *cfg,
+int GNUNET_PSEUDONYM_list_all (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                GNUNET_PSEUDONYM_Iterator iterator,
                                void *closure);
 
@@ -83,7 +83,7 @@ int GNUNET_PSEUDONYM_list_all (struct GNUNET_CONFIGURATION_Handle *cfg,
  * Register callback to be invoked whenever we discover
  * a new pseudonym.
  */
-int GNUNET_PSEUDONYM_discovery_callback_register (struct
+int GNUNET_PSEUDONYM_discovery_callback_register (const struct
                                                   GNUNET_CONFIGURATION_Handle
                                                   *cfg,
                                                   GNUNET_PSEUDONYM_Iterator
@@ -101,7 +101,7 @@ GNUNET_PSEUDONYM_discovery_callback_unregister (GNUNET_PSEUDONYM_Iterator
  *
  * @return NULL on failure (should never happen)
  */
-char *GNUNET_PSEUDONYM_id_to_name (struct GNUNET_CONFIGURATION_Handle *cfg,
+char *GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                    const GNUNET_HashCode * pseudo);
 
 /**
@@ -109,7 +109,7 @@ char *GNUNET_PSEUDONYM_id_to_name (struct GNUNET_CONFIGURATION_Handle *cfg,
  *
  * @return GNUNET_OK on success
  */
-int GNUNET_PSEUDONYM_name_to_id (struct GNUNET_CONFIGURATION_Handle *cfg,
+int GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                  const char *hname, GNUNET_HashCode * psid);
 
 
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index ac7aebcc7..6d96cc56f 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -65,7 +65,7 @@ typedef void (*GNUNET_RESOLVER_AddressCallback) (void *cls,
  */
 void
 GNUNET_RESOLVER_ip_get (struct GNUNET_SCHEDULER_Handle *sched,
-                        struct GNUNET_CONFIGURATION_Handle *cfg,
+                        const struct GNUNET_CONFIGURATION_Handle *cfg,
                         const char *hostname,
                         int domain,
                         struct GNUNET_TIME_Relative timeout,
@@ -84,7 +84,7 @@ GNUNET_RESOLVER_ip_get (struct GNUNET_SCHEDULER_Handle *sched,
  */
 void
 GNUNET_RESOLVER_hostname_resolve (struct GNUNET_SCHEDULER_Handle *sched,
-                                  struct GNUNET_CONFIGURATION_Handle *cfg,
+                                  const struct GNUNET_CONFIGURATION_Handle *cfg,
                                   int domain,
                                   struct GNUNET_TIME_Relative timeout,
                                   GNUNET_RESOLVER_AddressCallback callback,
@@ -115,7 +115,7 @@ typedef void (*GNUNET_RESOLVER_HostnameCallback) (void *cls,
  * @param cls closure for callback
  */
 void GNUNET_RESOLVER_hostname_get (struct GNUNET_SCHEDULER_Handle *sched,
-                                   struct GNUNET_CONFIGURATION_Handle *cfg,
+                                   const struct GNUNET_CONFIGURATION_Handle *cfg,
                                    const struct sockaddr *sa,
                                    socklen_t salen,
                                    int do_resolve,
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index dbfb2588b..4d0eefb98 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -50,7 +50,7 @@ extern "C"
 typedef void (*GNUNET_SERVICE_Main) (void *cls,
                                      struct GNUNET_SCHEDULER_Handle * sched,
                                      struct GNUNET_SERVER_Handle * server,
-                                     struct GNUNET_CONFIGURATION_Handle *
+                                     const struct GNUNET_CONFIGURATION_Handle *
                                      cfg);
 
 
@@ -62,7 +62,7 @@ typedef void (*GNUNET_SERVICE_Main) (void *cls,
  * @param cfg configuration to use
  */
 typedef void (*GNUNET_SERVICE_Term) (void *cls,
-                                     struct GNUNET_CONFIGURATION_Handle *
+                                     const struct GNUNET_CONFIGURATION_Handle *
                                      cfg);
 
 
@@ -103,7 +103,7 @@ struct GNUNET_SERVICE_Context *GNUNET_SERVICE_start (const char *serviceName,
                                                      struct
                                                      GNUNET_SCHEDULER_Handle
                                                      *sched,
-                                                     struct
+                                                     const struct
                                                      GNUNET_CONFIGURATION_Handle
                                                      *cfg);
 
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index 8dd11094c..2496f4091 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -78,7 +78,7 @@ typedef int (*GNUNET_STATISTICS_Iterator) (void *cls,
 struct GNUNET_STATISTICS_Handle
   *GNUNET_STATISTICS_create (struct GNUNET_SCHEDULER_Handle *sched,
                              const char *subsystem,
-                             struct GNUNET_CONFIGURATION_Handle *cfg);
+                             const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 41dc21f75..3a18a17c3 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -58,16 +58,21 @@ struct GNUNET_TESTING_Daemon;
  *
  * @param cls closure
  * @param id identifier for the daemon, NULL on error
- * @param d handle to the daemon, NULL if starting the daemon failed
+ * @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,
-                                                   struct GNUNET_TESTING_Daemon *d);
+                                                   const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                                   struct GNUNET_TESTING_Daemon *d,
+                                                   const char *emsg);
 
 
 /**
  * Starts a GNUnet daemon.
  *
+ * @param sched scheduler to use 
+ * @param cfg configuration to use
  * @param service_home directory to use as the service home directory
  * @param transports transport services that should be loaded
  * @param applications application services and daemons that should be started
@@ -76,8 +81,9 @@ typedef void (*GNUNET_TESTING_NotifyDaemonRunning)(void *cls,
  *        (use NULL for localhost).
  * @param cb function to call with the result
  * @param cb_cls closure for cb
+ * @return handle to the daemon (actual start will be completed asynchronously)
  */
-void
+struct GNUNET_TESTING_Daemon *
 GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched,
                              struct GNUNET_CONFIGURATION_Handle *cfg,
                              const char *service_home,
@@ -94,10 +100,10 @@ GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched,
  * particular operation was completed the testing library.
  *
  * @param cls closure
- * @param success GNUNET_YES on success
+ * @param emsg NULL on success
  */
 typedef void (*GNUNET_TESTING_NotifyCompletion)(void *cls,
-                                                int success);
+                                                const char *emsg);
 
 
 /**
@@ -112,17 +118,34 @@ void GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
                                  void * cb_cls);
 
 
+/**
+ * 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);
+
+
 
 /**
  * Establish a connection between two GNUnet daemons.
  *
  * @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 cb function to call at the end
  * @param cb_cls closure for cb
  */
 void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
                                      struct GNUNET_TESTING_Daemon *d2,
+                                     struct GNUNET_TIME_Relative timeout,
                                      GNUNET_TESTING_NotifyCompletion cb,
                                      void *cb_cls);
 
@@ -134,11 +157,13 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
  * be computed by adding delta each time (zero
  * times for the first peer).
  *
+ * @param sched scheduler to use 
+ * @param cfg configuration to use
  * @param total number of daemons to start
- * @param service_home_prefix path to use as the prefix for the home of the services
+ * @param service_home_prefix path to use as the prefix for the home of the services;
+ *        a number will be added for the different peers
  * @param transports which transports should all peers use
  * @param applications which applications should be used?
- * @param timeout how long is this allowed to take?
  * @param cb function to call on each daemon that was started
  * @param cb_cls closure for cb
  * @param cbe function to call at the end
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 391a87e9d..037a247a2 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -111,7 +111,7 @@ typedef void
 struct GNUNET_TRANSPORT_Handle *GNUNET_TRANSPORT_connect (struct
                                                           GNUNET_SCHEDULER_Handle
                                                           *sched,
-                                                          struct
+                                                          const struct
                                                           GNUNET_CONFIGURATION_Handle
                                                           *cfg, void *cls,
                                                           GNUNET_TRANSPORT_ReceiveCallback