- update fs

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

diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 52bc4aca0797e94aea0b91bf03227d37c925a3ec..57c3816b7c8980b2a0645365296768458f7273e0 100644 (file)
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -341,12 +341,6 @@ GNUNET_FS_search_probe_progress_ (void *cls,
         GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
                                       &probe_failure_handler, sr);
     }
-    else
-    {
-      /* should only happen if the cancel task was already
-        created on 'DOWNLOAD_INACTIVE' as we were out of time */
-      GNUNET_break (0 == sr->remaining_probe_time.rel_value_us);
-    }
     break;
   case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
     if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
@@ -1077,7 +1071,7 @@ transmit_search_request (void *cls, size_t size, void *buf)
     sm->header.size = htons (msize);
     sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
     sm->anonymity_level = htonl (sc->anonymity);
-    memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
+    memset (&sm->target, 0, sizeof (struct GNUNET_PeerIdentity));
     sm->query = sc->requests[sc->keyword_offset].uquery;
     GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
                                            &build_result_set, &mbc);
@@ -1105,7 +1099,7 @@ transmit_search_request (void *cls, size_t size, void *buf)
     GNUNET_assert (size >= msize);
     sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
     sm->anonymity_level = htonl (sc->anonymity);
-    memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
+    memset (&sm->target, 0, sizeof (struct GNUNET_PeerIdentity));
     GNUNET_CRYPTO_ecdsa_public_key_derive (&sc->uri->data.sks.ns,
                                         sc->uri->data.sks.identifier,
                                         "fs-ublock",