diff options
Diffstat (limited to 'src/fs/fs_test_lib.h')
-rw-r--r-- | src/fs/fs_test_lib.h | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index b348dfe78..2017b21ea 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h | |||
@@ -55,11 +55,10 @@ struct GNUNET_FS_TestDaemon; | |||
55 | */ | 55 | */ |
56 | void | 56 | void |
57 | GNUNET_FS_TEST_daemons_start (const char *template_cfg_file, | 57 | GNUNET_FS_TEST_daemons_start (const char *template_cfg_file, |
58 | struct GNUNET_TIME_Relative timeout, | 58 | struct GNUNET_TIME_Relative timeout, |
59 | unsigned int total, | 59 | unsigned int total, |
60 | struct GNUNET_FS_TestDaemon **daemons, | 60 | struct GNUNET_FS_TestDaemon **daemons, |
61 | GNUNET_SCHEDULER_Task cont, | 61 | GNUNET_SCHEDULER_Task cont, void *cont_cls); |
62 | void *cont_cls); | ||
63 | 62 | ||
64 | 63 | ||
65 | /** | 64 | /** |
@@ -74,10 +73,9 @@ GNUNET_FS_TEST_daemons_start (const char *template_cfg_file, | |||
74 | */ | 73 | */ |
75 | void | 74 | void |
76 | GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1, | 75 | GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1, |
77 | struct GNUNET_FS_TestDaemon *daemon2, | 76 | struct GNUNET_FS_TestDaemon *daemon2, |
78 | struct GNUNET_TIME_Relative timeout, | 77 | struct GNUNET_TIME_Relative timeout, |
79 | GNUNET_SCHEDULER_Task cont, | 78 | GNUNET_SCHEDULER_Task cont, void *cont_cls); |
80 | void *cont_cls); | ||
81 | 79 | ||
82 | 80 | ||
83 | /** | 81 | /** |
@@ -86,8 +84,9 @@ GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1, | |||
86 | * @param daemons array with the daemons (must contain at least one) | 84 | * @param daemons array with the daemons (must contain at least one) |
87 | * @return peer group | 85 | * @return peer group |
88 | */ | 86 | */ |
89 | struct GNUNET_TESTING_PeerGroup * | 87 | struct GNUNET_TESTING_PeerGroup *GNUNET_FS_TEST_get_group (struct |
90 | GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons); | 88 | GNUNET_FS_TestDaemon |
89 | **daemons); | ||
91 | 90 | ||
92 | 91 | ||
93 | 92 | ||
@@ -98,9 +97,9 @@ GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons); | |||
98 | * @param off which configuration to get | 97 | * @param off which configuration to get |
99 | * @return peer configuration | 98 | * @return peer configuration |
100 | */ | 99 | */ |
101 | const struct GNUNET_CONFIGURATION_Handle * | 100 | const struct GNUNET_CONFIGURATION_Handle |
102 | GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons, | 101 | *GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons, |
103 | unsigned int off); | 102 | unsigned int off); |
104 | 103 | ||
105 | /** | 104 | /** |
106 | * Stop daemons used for testing. | 105 | * Stop daemons used for testing. |
@@ -110,7 +109,7 @@ GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons, | |||
110 | */ | 109 | */ |
111 | void | 110 | void |
112 | GNUNET_FS_TEST_daemons_stop (unsigned int total, | 111 | GNUNET_FS_TEST_daemons_stop (unsigned int total, |
113 | struct GNUNET_FS_TestDaemon **daemons); | 112 | struct GNUNET_FS_TestDaemon **daemons); |
114 | 113 | ||
115 | 114 | ||
116 | /** | 115 | /** |
@@ -119,9 +118,9 @@ GNUNET_FS_TEST_daemons_stop (unsigned int total, | |||
119 | * @param cls closure (user defined) | 118 | * @param cls closure (user defined) |
120 | * @param uri a URI, NULL for errors | 119 | * @param uri a URI, NULL for errors |
121 | */ | 120 | */ |
122 | typedef void | 121 | typedef void |
123 | (*GNUNET_FS_TEST_UriContinuation)(void *cls, | 122 | (*GNUNET_FS_TEST_UriContinuation) (void *cls, |
124 | const struct GNUNET_FS_Uri *uri); | 123 | const struct GNUNET_FS_Uri * uri); |
125 | 124 | ||
126 | 125 | ||
127 | /** | 126 | /** |
@@ -141,14 +140,13 @@ typedef void | |||
141 | */ | 140 | */ |
142 | void | 141 | void |
143 | GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, | 142 | GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, |
144 | struct GNUNET_TIME_Relative timeout, | 143 | struct GNUNET_TIME_Relative timeout, |
145 | uint32_t anonymity, | 144 | uint32_t anonymity, |
146 | int do_index, | 145 | int do_index, |
147 | uint64_t size, | 146 | uint64_t size, |
148 | uint32_t seed, | 147 | uint32_t seed, |
149 | unsigned int verbose, | 148 | unsigned int verbose, |
150 | GNUNET_FS_TEST_UriContinuation cont, | 149 | GNUNET_FS_TEST_UriContinuation cont, void *cont_cls); |
151 | void *cont_cls); | ||
152 | 150 | ||
153 | 151 | ||
154 | /** | 152 | /** |
@@ -166,13 +164,12 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, | |||
166 | */ | 164 | */ |
167 | void | 165 | void |
168 | GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon, | 166 | GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon, |
169 | struct GNUNET_TIME_Relative timeout, | 167 | struct GNUNET_TIME_Relative timeout, |
170 | uint32_t anonymity, | 168 | uint32_t anonymity, |
171 | uint32_t seed, | 169 | uint32_t seed, |
172 | const struct GNUNET_FS_Uri *uri, | 170 | const struct GNUNET_FS_Uri *uri, |
173 | unsigned int verbose, | 171 | unsigned int verbose, |
174 | GNUNET_SCHEDULER_Task cont, | 172 | GNUNET_SCHEDULER_Task cont, void *cont_cls); |
175 | void *cont_cls); | ||
176 | 173 | ||
177 | 174 | ||
178 | 175 | ||