-fixes

[oweals/gnunet.git] / src / fs / fs_test_lib.h

diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h
index b348dfe783fe74a85fdfe18dff57983a2489c627..81125cafc12c0bd6b7c70dd4f021c4abfd427c50 100644 (file)
--- a/src/fs/fs_test_lib.h
+++ b/src/fs/fs_test_lib.h
@@ -55,11 +55,13 @@ struct GNUNET_FS_TestDaemon;
  */
 void
 GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
-                             struct GNUNET_TIME_Relative timeout,
-                             unsigned int total,
-                             struct GNUNET_FS_TestDaemon **daemons,
-                             GNUNET_SCHEDULER_Task cont,
-                             void *cont_cls);
+                              struct GNUNET_TIME_Relative timeout,
+                              unsigned int total,
+                              struct GNUNET_FS_TestDaemon **daemons,
+                              GNUNET_SCHEDULER_Task cont, void *cont_cls);
+
+
+struct GNUNET_FS_TEST_ConnectContext;
 
 
 /**
@@ -72,12 +74,21 @@ GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
  * @param cont function to call when done
  * @param cont_cls closure for cont
  */
-void
+struct GNUNET_FS_TEST_ConnectContext *
 GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
-                               struct GNUNET_FS_TestDaemon *daemon2,
-                               struct GNUNET_TIME_Relative timeout,
-                               GNUNET_SCHEDULER_Task cont,
-                               void *cont_cls);
+                                struct GNUNET_FS_TestDaemon *daemon2,
+                                struct GNUNET_TIME_Relative timeout,
+                                GNUNET_SCHEDULER_Task cont, void *cont_cls);
+
+
+/**
+ * Cancel connect operation.
+ *
+ * @param cc operation to cancel
+ */
+void
+GNUNET_FS_TEST_daemons_connect_cancel (struct GNUNET_FS_TEST_ConnectContext
+                                       *cc);
 
 
 /**
@@ -100,7 +111,7 @@ GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons);
  */
 const struct GNUNET_CONFIGURATION_Handle *
 GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons,
-                                 unsigned int off);
+                                  unsigned int off);
 
 /**
  * Stop daemons used for testing.
@@ -110,7 +121,7 @@ GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons,
  */
 void
 GNUNET_FS_TEST_daemons_stop (unsigned int total,
-                            struct GNUNET_FS_TestDaemon **daemons);
+                             struct GNUNET_FS_TestDaemon **daemons);
 
 
 /**
@@ -119,9 +130,9 @@ GNUNET_FS_TEST_daemons_stop (unsigned int total,
  * @param cls closure (user defined)
  * @param uri a URI, NULL for errors
  */
-typedef void 
-(*GNUNET_FS_TEST_UriContinuation)(void *cls,
-                                 const struct GNUNET_FS_Uri *uri);
+typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls,
+                                                const struct GNUNET_FS_Uri *
+                                                uri);
 
 
 /**
@@ -141,14 +152,10 @@ typedef void
  */
 void
 GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
-                       struct GNUNET_TIME_Relative timeout,
-                       uint32_t anonymity,
-                       int do_index,
-                       uint64_t size,
-                       uint32_t seed,
-                       unsigned int verbose,
-                       GNUNET_FS_TEST_UriContinuation cont,
-                       void *cont_cls);
+                        struct GNUNET_TIME_Relative timeout, uint32_t anonymity,
+                        int do_index, uint64_t size, uint32_t seed,
+                        unsigned int verbose,
+                        GNUNET_FS_TEST_UriContinuation cont, void *cont_cls);
 
 
 /**
@@ -166,13 +173,10 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
  */
 void
 GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
-                        struct GNUNET_TIME_Relative timeout,
-                        uint32_t anonymity,
-                        uint32_t seed,
-                        const struct GNUNET_FS_Uri *uri,
-                        unsigned int verbose,
-                        GNUNET_SCHEDULER_Task cont,
-                        void *cont_cls);
+                         struct GNUNET_TIME_Relative timeout,
+                         uint32_t anonymity, uint32_t seed,
+                         const struct GNUNET_FS_Uri *uri, unsigned int verbose,
+                         GNUNET_SCHEDULER_Task cont, void *cont_cls);