diff options
Diffstat (limited to 'src/fs/test_fs_download.c')
-rw-r--r-- | src/fs/test_fs_download.c | 434 |
1 files changed, 218 insertions, 216 deletions
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index f7c35a680..422c41523 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c | |||
@@ -38,12 +38,12 @@ | |||
38 | /** | 38 | /** |
39 | * How long until we give up on transmitting the message? | 39 | * How long until we give up on transmitting the message? |
40 | */ | 40 | */ |
41 | #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120) | 41 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * How long should our test-content live? | 44 | * How long should our test-content live? |
45 | */ | 45 | */ |
46 | #define LIFETIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 15) | 46 | #define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15) |
47 | 47 | ||
48 | static unsigned int anonymity_level; | 48 | static unsigned int anonymity_level; |
49 | 49 | ||
@@ -57,7 +57,7 @@ static struct GNUNET_FS_DownloadContext *download; | |||
57 | 57 | ||
58 | static struct GNUNET_FS_PublishContext *publish; | 58 | static struct GNUNET_FS_PublishContext *publish; |
59 | 59 | ||
60 | static struct GNUNET_SCHEDULER_Task * timeout_kill; | 60 | static struct GNUNET_SCHEDULER_Task *timeout_kill; |
61 | 61 | ||
62 | static char *fn; | 62 | static char *fn; |
63 | 63 | ||
@@ -67,198 +67,199 @@ static int err; | |||
67 | 67 | ||
68 | 68 | ||
69 | static void | 69 | static void |
70 | timeout_kill_task(void *cls) | 70 | timeout_kill_task (void *cls) |
71 | { | 71 | { |
72 | if (NULL != download) | 72 | if (NULL != download) |
73 | { | 73 | { |
74 | GNUNET_FS_download_stop(download, GNUNET_YES); | 74 | GNUNET_FS_download_stop (download, GNUNET_YES); |
75 | download = NULL; | 75 | download = NULL; |
76 | } | 76 | } |
77 | else if (NULL != publish) | 77 | else if (NULL != publish) |
78 | { | 78 | { |
79 | GNUNET_FS_publish_stop(publish); | 79 | GNUNET_FS_publish_stop (publish); |
80 | publish = NULL; | 80 | publish = NULL; |
81 | } | 81 | } |
82 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n"); | 82 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n"); |
83 | timeout_kill = NULL; | 83 | timeout_kill = NULL; |
84 | err = 1; | 84 | err = 1; |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
88 | static void | 88 | static void |
89 | abort_publish_task(void *cls) | 89 | abort_publish_task (void *cls) |
90 | { | 90 | { |
91 | if (NULL != publish) | 91 | if (NULL != publish) |
92 | { | 92 | { |
93 | GNUNET_FS_publish_stop(publish); | 93 | GNUNET_FS_publish_stop (publish); |
94 | publish = NULL; | 94 | publish = NULL; |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
99 | static void | 99 | static void |
100 | stop_fs_task(void *cls) | 100 | stop_fs_task (void *cls) |
101 | { | 101 | { |
102 | GNUNET_FS_stop(fs); | 102 | GNUNET_FS_stop (fs); |
103 | fs = NULL; | 103 | fs = NULL; |
104 | } | 104 | } |
105 | 105 | ||
106 | 106 | ||
107 | static void | 107 | static void |
108 | abort_download_task(void *cls) | 108 | abort_download_task (void *cls) |
109 | { | 109 | { |
110 | uint64_t size; | 110 | uint64_t size; |
111 | 111 | ||
112 | if (NULL != download) | 112 | if (NULL != download) |
113 | { | 113 | { |
114 | GNUNET_FS_download_stop(download, GNUNET_YES); | 114 | GNUNET_FS_download_stop (download, GNUNET_YES); |
115 | download = NULL; | 115 | download = NULL; |
116 | } | 116 | } |
117 | GNUNET_assert(GNUNET_OK == GNUNET_DISK_file_size(fn, &size, GNUNET_YES, GNUNET_NO)); | 117 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_size (fn, &size, GNUNET_YES, |
118 | GNUNET_assert(size == FILESIZE); | 118 | GNUNET_NO)); |
119 | GNUNET_DISK_directory_remove(fn); | 119 | GNUNET_assert (size == FILESIZE); |
120 | GNUNET_free(fn); | 120 | GNUNET_DISK_directory_remove (fn); |
121 | GNUNET_free (fn); | ||
121 | fn = NULL; | 122 | fn = NULL; |
122 | GNUNET_SCHEDULER_cancel(timeout_kill); | 123 | GNUNET_SCHEDULER_cancel (timeout_kill); |
123 | timeout_kill = NULL; | 124 | timeout_kill = NULL; |
124 | } | 125 | } |
125 | 126 | ||
126 | 127 | ||
127 | static void * | 128 | static void * |
128 | progress_cb(void *cls, const struct GNUNET_FS_ProgressInfo *event) | 129 | progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) |
129 | { | 130 | { |
130 | switch (event->status) | 131 | switch (event->status) |
131 | { | 132 | { |
132 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 133 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
133 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 134 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
134 | "Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 135 | "Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
135 | (unsigned long long)event->value.publish.completed, | 136 | (unsigned long long) event->value.publish.completed, |
136 | (unsigned long long)event->value.publish.size, | 137 | (unsigned long long) event->value.publish.size, |
137 | event->value.publish.specifics.progress.depth, | 138 | event->value.publish.specifics.progress.depth, |
138 | (unsigned long long)event->value.publish.specifics. | 139 | (unsigned long long) event->value.publish.specifics. |
139 | progress.offset); | 140 | progress.offset); |
140 | break; | 141 | break; |
141 | 142 | ||
142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY: | 143 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY: |
143 | break; | 144 | break; |
144 | 145 | ||
145 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 146 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
146 | fprintf(stdout, | 147 | fprintf (stdout, |
147 | "Publishing complete, %llu kb/s.\n", | 148 | "Publishing complete, %llu kb/s.\n", |
148 | (unsigned long long)(FILESIZE * 1000000LL / | 149 | (unsigned long long) (FILESIZE * 1000000LL |
149 | (1 + | 150 | / (1 |
150 | GNUNET_TIME_absolute_get_duration | 151 | + GNUNET_TIME_absolute_get_duration |
151 | (start).rel_value_us) / 1024LL)); | 152 | (start).rel_value_us) / 1024LL)); |
152 | GAUGER("FS", | 153 | GAUGER ("FS", |
153 | (GNUNET_YES == indexed) | 154 | (GNUNET_YES == indexed) |
154 | ? "Publishing speed (indexing)" | 155 | ? "Publishing speed (indexing)" |
155 | : "Publishing speed (insertion)", | 156 | : "Publishing speed (insertion)", |
156 | (unsigned long long)(FILESIZE * 1000000LL / | 157 | (unsigned long long) (FILESIZE * 1000000LL |
157 | (1 + | 158 | / (1 |
158 | GNUNET_TIME_absolute_get_duration | 159 | + GNUNET_TIME_absolute_get_duration |
159 | (start).rel_value_us) / 1024LL), "kb/s"); | 160 | (start).rel_value_us) / 1024LL), "kb/s"); |
160 | fn = GNUNET_DISK_mktemp("gnunet-download-test-dst"); | 161 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); |
161 | start = GNUNET_TIME_absolute_get(); | 162 | start = GNUNET_TIME_absolute_get (); |
162 | download = | 163 | download = |
163 | GNUNET_FS_download_start(fs, | 164 | GNUNET_FS_download_start (fs, |
164 | event->value.publish.specifics. | 165 | event->value.publish.specifics. |
165 | completed.chk_uri, NULL, fn, NULL, 0, | 166 | completed.chk_uri, NULL, fn, NULL, 0, |
166 | FILESIZE, anonymity_level, | 167 | FILESIZE, anonymity_level, |
167 | GNUNET_FS_DOWNLOAD_OPTION_NONE, | 168 | GNUNET_FS_DOWNLOAD_OPTION_NONE, |
168 | "download", NULL); | 169 | "download", NULL); |
169 | GNUNET_assert(download != NULL); | 170 | GNUNET_assert (download != NULL); |
170 | break; | 171 | break; |
171 | 172 | ||
172 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: | 173 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: |
173 | fprintf(stdout, | 174 | fprintf (stdout, |
174 | "Download complete, %llu kb/s.\n", | 175 | "Download complete, %llu kb/s.\n", |
175 | (unsigned long long)(FILESIZE * 1000000LL / | 176 | (unsigned long long) (FILESIZE * 1000000LL |
176 | (1 + | 177 | / (1 |
177 | GNUNET_TIME_absolute_get_duration | 178 | + GNUNET_TIME_absolute_get_duration |
178 | (start).rel_value_us) / 1024LL)); | 179 | (start).rel_value_us) / 1024LL)); |
179 | GAUGER("FS", | 180 | GAUGER ("FS", |
180 | (GNUNET_YES == indexed) | 181 | (GNUNET_YES == indexed) |
181 | ? "Local download speed (indexed)" | 182 | ? "Local download speed (indexed)" |
182 | : "Local download speed (inserted)", | 183 | : "Local download speed (inserted)", |
183 | (unsigned long long)(FILESIZE * 1000000LL / | 184 | (unsigned long long) (FILESIZE * 1000000LL |
184 | (1 + | 185 | / (1 |
185 | GNUNET_TIME_absolute_get_duration | 186 | + GNUNET_TIME_absolute_get_duration |
186 | (start).rel_value_us) / 1024LL), "kb/s"); | 187 | (start).rel_value_us) / 1024LL), "kb/s"); |
187 | GNUNET_SCHEDULER_add_now(&abort_download_task, NULL); | 188 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); |
188 | break; | 189 | break; |
189 | 190 | ||
190 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: | 191 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: |
191 | GNUNET_assert(download == event->value.download.dc); | 192 | GNUNET_assert (download == event->value.download.dc); |
192 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 193 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
193 | "Download is progressing (%llu/%llu at level %u off %llu)...\n", | 194 | "Download is progressing (%llu/%llu at level %u off %llu)...\n", |
194 | (unsigned long long)event->value.download.completed, | 195 | (unsigned long long) event->value.download.completed, |
195 | (unsigned long long)event->value.download.size, | 196 | (unsigned long long) event->value.download.size, |
196 | event->value.download.specifics.progress.depth, | 197 | event->value.download.specifics.progress.depth, |
197 | (unsigned long long)event->value.download.specifics. | 198 | (unsigned long long) event->value.download.specifics. |
198 | progress.offset); | 199 | progress.offset); |
199 | break; | 200 | break; |
200 | 201 | ||
201 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 202 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
202 | fprintf(stderr, "Error publishing file: %s\n", | 203 | fprintf (stderr, "Error publishing file: %s\n", |
203 | event->value.publish.specifics.error.message); | 204 | event->value.publish.specifics.error.message); |
204 | GNUNET_break(0); | 205 | GNUNET_break (0); |
205 | GNUNET_SCHEDULER_add_now(&abort_publish_task, NULL); | 206 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); |
206 | GNUNET_SCHEDULER_shutdown(); | 207 | GNUNET_SCHEDULER_shutdown (); |
207 | break; | 208 | break; |
208 | 209 | ||
209 | case GNUNET_FS_STATUS_DOWNLOAD_ERROR: | 210 | case GNUNET_FS_STATUS_DOWNLOAD_ERROR: |
210 | fprintf(stderr, "Error downloading file: %s\n", | 211 | fprintf (stderr, "Error downloading file: %s\n", |
211 | event->value.download.specifics.error.message); | 212 | event->value.download.specifics.error.message); |
212 | GNUNET_SCHEDULER_add_now(&abort_download_task, NULL); | 213 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); |
213 | GNUNET_SCHEDULER_shutdown(); | 214 | GNUNET_SCHEDULER_shutdown (); |
214 | break; | 215 | break; |
215 | 216 | ||
216 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: | 217 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: |
217 | case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE: | 218 | case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE: |
218 | break; | 219 | break; |
219 | 220 | ||
220 | case GNUNET_FS_STATUS_PUBLISH_START: | 221 | case GNUNET_FS_STATUS_PUBLISH_START: |
221 | GNUNET_assert(0 == strcmp("publish-context", event->value.publish.cctx)); | 222 | GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx)); |
222 | GNUNET_assert(NULL == event->value.publish.pctx); | 223 | GNUNET_assert (NULL == event->value.publish.pctx); |
223 | GNUNET_assert(FILESIZE == event->value.publish.size); | 224 | GNUNET_assert (FILESIZE == event->value.publish.size); |
224 | GNUNET_assert(0 == event->value.publish.completed); | 225 | GNUNET_assert (0 == event->value.publish.completed); |
225 | GNUNET_assert(1 == event->value.publish.anonymity); | 226 | GNUNET_assert (1 == event->value.publish.anonymity); |
226 | break; | 227 | break; |
227 | 228 | ||
228 | case GNUNET_FS_STATUS_PUBLISH_STOPPED: | 229 | case GNUNET_FS_STATUS_PUBLISH_STOPPED: |
229 | GNUNET_assert(publish == event->value.publish.pc); | 230 | GNUNET_assert (publish == event->value.publish.pc); |
230 | GNUNET_assert(FILESIZE == event->value.publish.size); | 231 | GNUNET_assert (FILESIZE == event->value.publish.size); |
231 | GNUNET_assert(1 == event->value.publish.anonymity); | 232 | GNUNET_assert (1 == event->value.publish.anonymity); |
232 | GNUNET_SCHEDULER_add_now(&stop_fs_task, NULL); | 233 | GNUNET_SCHEDULER_add_now (&stop_fs_task, NULL); |
233 | break; | 234 | break; |
234 | 235 | ||
235 | case GNUNET_FS_STATUS_DOWNLOAD_START: | 236 | case GNUNET_FS_STATUS_DOWNLOAD_START: |
236 | GNUNET_assert(0 == strcmp("download", event->value.download.cctx)); | 237 | GNUNET_assert (0 == strcmp ("download", event->value.download.cctx)); |
237 | GNUNET_assert(NULL == event->value.download.pctx); | 238 | GNUNET_assert (NULL == event->value.download.pctx); |
238 | GNUNET_assert(NULL != event->value.download.uri); | 239 | GNUNET_assert (NULL != event->value.download.uri); |
239 | GNUNET_assert(0 == strcmp(fn, event->value.download.filename)); | 240 | GNUNET_assert (0 == strcmp (fn, event->value.download.filename)); |
240 | GNUNET_assert(FILESIZE == event->value.download.size); | 241 | GNUNET_assert (FILESIZE == event->value.download.size); |
241 | GNUNET_assert(0 == event->value.download.completed); | 242 | GNUNET_assert (0 == event->value.download.completed); |
242 | GNUNET_assert(1 == event->value.download.anonymity); | 243 | GNUNET_assert (1 == event->value.download.anonymity); |
243 | break; | 244 | break; |
244 | 245 | ||
245 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: | 246 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: |
246 | GNUNET_assert(download == event->value.download.dc); | 247 | GNUNET_assert (download == event->value.download.dc); |
247 | GNUNET_SCHEDULER_add_now(&abort_publish_task, NULL); | 248 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); |
248 | break; | 249 | break; |
249 | 250 | ||
250 | default: | 251 | default: |
251 | printf("Unexpected event: %d\n", event->status); | 252 | printf ("Unexpected event: %d\n", event->status); |
252 | break; | 253 | break; |
253 | } | 254 | } |
254 | return NULL; | 255 | return NULL; |
255 | } | 256 | } |
256 | 257 | ||
257 | 258 | ||
258 | static void | 259 | static void |
259 | run(void *cls, | 260 | run (void *cls, |
260 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 261 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
261 | struct GNUNET_TESTING_Peer *peer) | 262 | struct GNUNET_TESTING_Peer *peer) |
262 | { | 263 | { |
263 | const char *binary_name = cls; | 264 | const char *binary_name = cls; |
264 | const char *keywords[] = { | 265 | const char *keywords[] = { |
@@ -273,89 +274,90 @@ run(void *cls, | |||
273 | struct GNUNET_FS_BlockOptions bo; | 274 | struct GNUNET_FS_BlockOptions bo; |
274 | 275 | ||
275 | if (GNUNET_YES == | 276 | if (GNUNET_YES == |
276 | GNUNET_CONFIGURATION_get_value_yesno(cfg, | 277 | GNUNET_CONFIGURATION_get_value_yesno (cfg, |
277 | "download-test", | 278 | "download-test", |
278 | "USE_STREAM")) | 279 | "USE_STREAM")) |
279 | anonymity_level = 0; | 280 | anonymity_level = 0; |
280 | else | 281 | else |
281 | anonymity_level = 1; | 282 | anonymity_level = 1; |
282 | fs = GNUNET_FS_start(cfg, binary_name, &progress_cb, NULL, | 283 | fs = GNUNET_FS_start (cfg, binary_name, &progress_cb, NULL, |
283 | GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); | 284 | GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); |
284 | GNUNET_assert(NULL != fs); | 285 | GNUNET_assert (NULL != fs); |
285 | buf = GNUNET_malloc(FILESIZE); | 286 | buf = GNUNET_malloc (FILESIZE); |
286 | for (i = 0; i < FILESIZE; i++) | 287 | for (i = 0; i < FILESIZE; i++) |
287 | buf[i] = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 256); | 288 | buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); |
288 | meta = GNUNET_CONTAINER_meta_data_create(); | 289 | meta = GNUNET_CONTAINER_meta_data_create (); |
289 | kuri = GNUNET_FS_uri_ksk_create_from_args(2, keywords); | 290 | kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords); |
290 | bo.content_priority = 42; | 291 | bo.content_priority = 42; |
291 | bo.anonymity_level = anonymity_level; | 292 | bo.anonymity_level = anonymity_level; |
292 | bo.replication_level = 0; | 293 | bo.replication_level = 0; |
293 | bo.expiration_time = GNUNET_TIME_relative_to_absolute(LIFETIME); | 294 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); |
294 | 295 | ||
295 | if (GNUNET_YES == | 296 | if (GNUNET_YES == |
296 | GNUNET_CONFIGURATION_get_value_yesno(cfg, | 297 | GNUNET_CONFIGURATION_get_value_yesno (cfg, |
297 | "download-test", | 298 | "download-test", |
298 | "USE_INDEX")) | 299 | "USE_INDEX")) |
299 | { | 300 | { |
300 | fn1 = GNUNET_DISK_mktemp("gnunet-download-indexed-test"); | 301 | fn1 = GNUNET_DISK_mktemp ("gnunet-download-indexed-test"); |
301 | GNUNET_assert(FILESIZE == | 302 | GNUNET_assert (FILESIZE == |
302 | GNUNET_DISK_fn_write(fn1, buf, FILESIZE, | 303 | GNUNET_DISK_fn_write (fn1, buf, FILESIZE, |
303 | GNUNET_DISK_PERM_USER_READ | | 304 | GNUNET_DISK_PERM_USER_READ |
304 | GNUNET_DISK_PERM_USER_WRITE)); | 305 | | GNUNET_DISK_PERM_USER_WRITE)); |
305 | GNUNET_free(buf); | 306 | GNUNET_free (buf); |
306 | fi = GNUNET_FS_file_information_create_from_file(fs, "publish-context", fn1, | 307 | fi = GNUNET_FS_file_information_create_from_file (fs, "publish-context", |
307 | kuri, meta, GNUNET_YES, | 308 | fn1, |
308 | &bo); | 309 | kuri, meta, GNUNET_YES, |
309 | indexed = GNUNET_YES; | 310 | &bo); |
310 | } | 311 | indexed = GNUNET_YES; |
312 | } | ||
311 | else | 313 | else |
312 | { | 314 | { |
313 | fi = GNUNET_FS_file_information_create_from_data(fs, "publish-context", | 315 | fi = GNUNET_FS_file_information_create_from_data (fs, "publish-context", |
314 | FILESIZE, buf, kuri, meta, | 316 | FILESIZE, buf, kuri, meta, |
315 | GNUNET_NO, &bo); | 317 | GNUNET_NO, &bo); |
316 | /* note: buf will be free'd as part of 'fi' now */ | 318 | /* note: buf will be free'd as part of 'fi' now */ |
317 | indexed = GNUNET_NO; | 319 | indexed = GNUNET_NO; |
318 | } | 320 | } |
319 | GNUNET_FS_uri_destroy(kuri); | 321 | GNUNET_FS_uri_destroy (kuri); |
320 | GNUNET_CONTAINER_meta_data_destroy(meta); | 322 | GNUNET_CONTAINER_meta_data_destroy (meta); |
321 | GNUNET_assert(NULL != fi); | 323 | GNUNET_assert (NULL != fi); |
322 | timeout_kill = | 324 | timeout_kill = |
323 | GNUNET_SCHEDULER_add_delayed(TIMEOUT, &timeout_kill_task, NULL); | 325 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL); |
324 | start = GNUNET_TIME_absolute_get(); | 326 | start = GNUNET_TIME_absolute_get (); |
325 | publish = | 327 | publish = |
326 | GNUNET_FS_publish_start(fs, fi, NULL, NULL, NULL, | 328 | GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL, |
327 | GNUNET_FS_PUBLISH_OPTION_NONE); | 329 | GNUNET_FS_PUBLISH_OPTION_NONE); |
328 | GNUNET_assert(publish != NULL); | 330 | GNUNET_assert (publish != NULL); |
329 | } | 331 | } |
330 | 332 | ||
331 | 333 | ||
332 | int | 334 | int |
333 | main(int argc, char *argv[]) | 335 | main (int argc, char *argv[]) |
334 | { | 336 | { |
335 | const char *binary_name; | 337 | const char *binary_name; |
336 | const char *config_name; | 338 | const char *config_name; |
337 | 339 | ||
338 | binary_name = "test-fs-download"; | 340 | binary_name = "test-fs-download"; |
339 | config_name = "test_fs_download_data.conf"; | 341 | config_name = "test_fs_download_data.conf"; |
340 | if (NULL != strstr(argv[0], "indexed")) | 342 | if (NULL != strstr (argv[0], "indexed")) |
341 | { | 343 | { |
342 | binary_name = "test-fs-download-indexed"; | 344 | binary_name = "test-fs-download-indexed"; |
343 | config_name = "test_fs_download_indexed.conf"; | 345 | config_name = "test_fs_download_indexed.conf"; |
344 | } | 346 | } |
345 | if (NULL != strstr(argv[0], "cadet")) | 347 | if (NULL != strstr (argv[0], "cadet")) |
346 | { | 348 | { |
347 | binary_name = "test-fs-download-cadet"; | 349 | binary_name = "test-fs-download-cadet"; |
348 | config_name = "test_fs_download_cadet.conf"; | 350 | config_name = "test_fs_download_cadet.conf"; |
349 | } | 351 | } |
350 | if (0 != GNUNET_TESTING_peer_run(binary_name, | 352 | if (0 != GNUNET_TESTING_peer_run (binary_name, |
351 | config_name, | 353 | config_name, |
352 | &run, (void *)binary_name)) | 354 | &run, (void *) binary_name)) |
353 | return 1; | 355 | return 1; |
354 | if (NULL != fn1) | 356 | if (NULL != fn1) |
355 | { | 357 | { |
356 | unlink(fn1); | 358 | unlink (fn1); |
357 | GNUNET_free(fn1); | 359 | GNUNET_free (fn1); |
358 | } | 360 | } |
359 | return err; | 361 | return err; |
360 | } | 362 | } |
361 | 363 | ||