diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-04 07:16:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-04 07:16:28 +0000 |
commit | 3cbee1d6d6d396b45e88f7f0e6f1b5a21e9f2f77 (patch) | |
tree | 721877881cd285fe98d9de856fb04b6bcb0804d4 /src/fs/fs_search.c | |
parent | 7eb4b4b3ab14ef6433b08cca8c673d00f8405062 (diff) | |
download | gnunet-3cbee1d6d6d396b45e88f7f0e6f1b5a21e9f2f77.tar.gz gnunet-3cbee1d6d6d396b45e88f7f0e6f1b5a21e9f2f77.zip |
deserialize search link to download
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 00909ce97..9ab024eeb 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -301,7 +301,12 @@ GNUNET_FS_search_probe_progress_ (void *cls, | |||
301 | sr); | 301 | sr); |
302 | break; | 302 | break; |
303 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: | 303 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: |
304 | /* FIXME: clean up? schedule next probe? or already done? */ | 304 | if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK) |
305 | { | ||
306 | GNUNET_SCHEDULER_cancel (sr->sc->h->sched, | ||
307 | sr->probe_cancel_task); | ||
308 | sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK; | ||
309 | } | ||
305 | sr = NULL; | 310 | sr = NULL; |
306 | break; | 311 | break; |
307 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: | 312 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: |
@@ -344,6 +349,8 @@ GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr) | |||
344 | 349 | ||
345 | if (sr->probe_ctx != NULL) | 350 | if (sr->probe_ctx != NULL) |
346 | return; | 351 | return; |
352 | if (sr->download != NULL) | ||
353 | return; | ||
347 | if (0 == (sr->sc->h->flags & GNUNET_FS_FLAGS_DO_PROBES)) | 354 | if (0 == (sr->sc->h->flags & GNUNET_FS_FLAGS_DO_PROBES)) |
348 | return; | 355 | return; |
349 | if (sr->availability_trials > AVAILABILITY_TRIALS_MAX) | 356 | if (sr->availability_trials > AVAILABILITY_TRIALS_MAX) |