Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / fs / fs_search.c

diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 7874bb6e075342d5497095237f033c48c908f26a..3cbf2afefdcc0ec3f5f388735af00bec9d39d2c2 100644 (file)
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -458,8 +458,8 @@ GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr)
              (unsigned long long) off,
              sr);
   sr->remaining_probe_time =
-      GNUNET_TIME_relative_multiply (sr->h->avg_block_latency,
-                                     2 * (1 + sr->availability_trials));
+      GNUNET_TIME_relative_saturating_multiply (sr->h->avg_block_latency,
+                                                2 * (1 + sr->availability_trials));
   sr->probe_ctx =
       GNUNET_FS_download_start (sr->h, sr->uri, sr->meta, NULL, NULL, off,
                                 len, sr->anonymity,
@@ -1145,7 +1145,7 @@ schedule_transmit_search_request (struct GNUNET_FS_SearchContext *sc)
                                              &build_result_set,
                                              &mbc);
       search_request_map_offset += todo;
-      GNUNET_assert (0 == mbc.put_cnt);
+      GNUNET_assert (0 == mbc.put_cnt); /* #4608 reports this fails? */
       GNUNET_assert (total_seen_results >= search_request_map_offset);
       if (total_seen_results != search_request_map_offset)
       {
@@ -1244,7 +1244,7 @@ do_reconnect (void *cls)
   };
 
   sc->task = NULL;
-  sc->mq = GNUNET_CLIENT_connecT (sc->h->cfg,
+  sc->mq = GNUNET_CLIENT_connect (sc->h->cfg,
                                   "fs",
                                   handlers,
                                   &search_mq_error_handler,