Fixed reconnect
[oweals/gnunet.git] / src / fs / gnunet-service-fs_pr.c
index 047c07587ba5da73560c7356669ccf6b14251fca..f63c088c06053e959e1c74c404910f148de6cb39 100644 (file)
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "gnunet_load_lib.h"
+#include "gnunet-service-fs.h"
+#include "gnunet-service-fs_cp.h"
+#include "gnunet-service-fs_indexing.h"
+#include "gnunet-service-fs_pe.h"
 #include "gnunet-service-fs_pr.h"
 
+/**
+ * Hard limit on the number of results we may get from the datastore per query.
+ */
+#define MAX_RESULTS (100 * 1024)
 
 /**
  * An active request.
@@ -34,7 +43,7 @@ struct GSF_PendingRequest
 {
   /**
    * Public data for the request.
-   */ 
+   */
   struct GSF_PendingRequestData public_data;
 
   /**
@@ -57,6 +66,67 @@ struct GSF_PendingRequest
    */
   struct GNUNET_CONTAINER_BloomFilter *bf;
 
+  /**
+   * Entry for this pending request in the expiration heap, or NULL.
+   */
+  struct GNUNET_CONTAINER_HeapNode *hnode;
+
+  /**
+   * Datastore queue entry for this request (or NULL for none).
+   */
+  struct GNUNET_DATASTORE_QueueEntry *qe;
+
+  /**
+   * DHT request handle for this request (or NULL for none).
+   */
+  struct GNUNET_DHT_GetHandle *gh;
+
+  /**
+   * Function to call upon completion of the local get
+   * request, or NULL for none.
+   */
+  GSF_LocalLookupContinuation llc_cont;
+
+  /**
+   * Closure for llc_cont.
+   */
+  void *llc_cont_cls;
+
+  /**
+   * Last result from the local datastore lookup evaluation.
+   */
+  enum GNUNET_BLOCK_EvaluationResult local_result;
+
+  /**
+   * Identity of the peer that we should use for the 'sender'
+   * (recipient of the response) when forwarding (0 for none).
+   */
+  GNUNET_PEER_Id sender_pid;
+
+  /**
+   * Time we started the last datastore lookup.
+   */
+  struct GNUNET_TIME_Absolute qe_start;
+
+  /**
+   * Task that warns us if the local datastore lookup takes too long.
+   */
+  GNUNET_SCHEDULER_TaskIdentifier warn_task;
+
+  /**
+   * Current offset for querying our local datastore for results.
+   * Starts at a random value, incremented until we get the same
+   * UID again (detected using 'first_uid'), which is then used
+   * to termiante the iteration.
+   */
+  uint64_t local_result_offset;
+
+  /**
+   * Unique ID of the first result from the local datastore;
+   * used to detect wrap-around of the offset.
+   */
+  uint64_t first_uid;
+
   /**
    * Number of valid entries in the 'replies_seen' array.
    */
@@ -70,8 +140,13 @@ struct GSF_PendingRequest
   /**
    * Mingle value we currently use for the bf.
    */
-  int32_t mingle;
-                           
+  uint32_t mingle;
+
+  /**
+   * Do we have a first UID yet?
+   */
+  unsigned int have_first_uid;
+
 };
 
 
@@ -105,6 +180,14 @@ static int active_to_migration;
 static struct GNUNET_CONTAINER_Heap *requests_by_expiration_heap;
 
 
+/**
+ * Maximum number of requests (from other peers, overall) that we're
+ * willing to have pending at any given point in time.  Can be changed
+ * via the configuration file (32k is just the default).
+ */
+static unsigned long long max_pending_requests = (32 * 1024);
+
+
 /**
  * How many bytes should a bloomfilter be if we have already seen
  * entry_count responses?  Note that BLOOMFILTER_K gives us the number
@@ -152,40 +235,39 @@ refresh_bloomfilter (struct GSF_PendingRequest *pr)
   size_t nsize;
   GNUNET_HashCode mhash;
 
-  nsize = compute_bloomfilter_size (pr->replies_seen_off);
-  if ( (bf != NULL) &&
-       (nsize == GNUNET_CONTAINER_bloomfilter_get_size (pr->bf)) )
-    return GNUNET_NO; /* size not changed */
+  nsize = compute_bloomfilter_size (pr->replies_seen_count);
+  if ((pr->bf != NULL) &&
+      (nsize == GNUNET_CONTAINER_bloomfilter_get_size (pr->bf)))
+    return GNUNET_NO;           /* size not changed */
   if (pr->bf != NULL)
     GNUNET_CONTAINER_bloomfilter_free (pr->bf);
-  pr->mingle = (int32_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 
-                                                  UINT32_MAX);
-  pr->bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 
-                                             nsize,
-                                             BLOOMFILTER_K);
-  for (i=0;i<pr->replies_seen_count;i++)
-    {
-      GNUNET_BLOCK_mingle_hash (&pr->replies_seen[i],
-                               pr->mingle,
-                               &mhash);
-      GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
-    }
+  pr->mingle =
+      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
+  pr->bf = GNUNET_CONTAINER_bloomfilter_init (NULL, nsize, BLOOMFILTER_K);
+  for (i = 0; i < pr->replies_seen_count; i++)
+  {
+    GNUNET_BLOCK_mingle_hash (&pr->replies_seen[i], pr->mingle, &mhash);
+    GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
+  }
   return GNUNET_YES;
 }
 
 
 /**
- * Create a new pending request.  
+ * Create a new pending request.
  *
  * @param options request options
  * @param type type of the block that is being requested
  * @param query key for the lookup
  * @param namespace namespace to lookup, NULL for no namespace
  * @param target preferred target for the request, NULL for none
- * @param bf bloom filter for known replies, can be NULL
+ * @param bf_data raw data for bloom filter for known replies, can be NULL
+ * @param bf_size number of bytes in bf_data
  * @param mingle mingle value for bf
  * @param anonymity_level desired anonymity level
  * @param priority maximum outgoing cummulative request priority to use
+ * @param ttl current time-to-live for the request
+ * @param sender_pid peer ID to use for the sender when forwarding, 0 for none
  * @param replies_seen hash codes of known local replies
  * @param replies_seen_count size of the 'replies_seen' array
  * @param rh handle to call when we get a reply
@@ -194,70 +276,152 @@ refresh_bloomfilter (struct GSF_PendingRequest *pr)
  */
 struct GSF_PendingRequest *
 GSF_pending_request_create_ (enum GSF_PendingRequestOptions options,
-                            enum GNUNET_BLOCK_Type type,
-                            const GNUNET_HashCode *query,
-                            const GNUNET_HashCode *namespace,
-                            const struct GNUNET_PeerIdentity *target,
-                            const struct GNUNET_CONTAINER_BloomFilter *bf,
-                            int32_t mingle,
-                            uint32_t anonymity_level,
-                            uint32_t priority,
-                            const GNUNET_HashCode *replies_seen,
-                            unsigned int replies_seen_count,
-                            GSF_PendingRequestReplyHandler rh,
-                            void *rh_cls)
+                             enum GNUNET_BLOCK_Type type,
+                             const GNUNET_HashCode * query,
+                             const GNUNET_HashCode * namespace,
+                             const struct GNUNET_PeerIdentity *target,
+                             const char *bf_data, size_t bf_size,
+                             uint32_t mingle, uint32_t anonymity_level,
+                             uint32_t priority, int32_t ttl,
+                             GNUNET_PEER_Id sender_pid,
+                             const GNUNET_HashCode * replies_seen,
+                             unsigned int replies_seen_count,
+                             GSF_PendingRequestReplyHandler rh, void *rh_cls)
 {
   struct GSF_PendingRequest *pr;
+  struct GSF_PendingRequest *dpr;
 
-  
+#if DEBUG_FS > 1
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Creating request handle for `%s' of type %d\n",
+              GNUNET_h2s (query), type);
+#endif
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Pending requests created"), 1,
+                            GNUNET_NO);
   pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest));
+  pr->local_result_offset =
+      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
   pr->public_data.query = *query;
-  if (GNUNET_BLOCK_TYPE_SBLOCK == type)
-    {
-      GNUNET_assert (NULL != namespace);
-      pr->public_data.namespace = *namespace;
-    }
+  if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type)
+  {
+    GNUNET_assert (NULL != namespace);
+    pr->public_data.namespace = *namespace;
+  }
   if (NULL != target)
-    {
-      pr->public_data.target = *target;
-      pr->has_target = GNUNET_YES;
-    }
-  pr->public_data.anonymity_level = anonymity_data;
+  {
+    pr->public_data.target = *target;
+    pr->public_data.has_target = GNUNET_YES;
+  }
+  pr->public_data.anonymity_level = anonymity_level;
   pr->public_data.priority = priority;
+  pr->public_data.original_priority = priority;
   pr->public_data.options = options;
-  pr->public_data.type = type;  
+  pr->public_data.type = type;
+  pr->public_data.start_time = GNUNET_TIME_absolute_get ();
+  pr->sender_pid = sender_pid;
   pr->rh = rh;
   pr->rh_cls = rh_cls;
+  GNUNET_assert ((sender_pid != 0) || (0 == (options & GSF_PRO_FORWARD_ONLY)));
+  if (ttl >= 0)
+    pr->public_data.ttl =
+        GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
+                                          (GNUNET_TIME_UNIT_SECONDS,
+                                           (uint32_t) ttl));
+  else
+    pr->public_data.ttl =
+        GNUNET_TIME_absolute_subtract (pr->public_data.start_time,
+                                       GNUNET_TIME_relative_multiply
+                                       (GNUNET_TIME_UNIT_SECONDS,
+                                        (uint32_t) (-ttl)));
   if (replies_seen_count > 0)
+  {
+    pr->replies_seen_size = replies_seen_count;
+    pr->replies_seen =
+        GNUNET_malloc (sizeof (GNUNET_HashCode) * pr->replies_seen_size);
+    memcpy (pr->replies_seen, replies_seen,
+            replies_seen_count * sizeof (GNUNET_HashCode));
+    pr->replies_seen_count = replies_seen_count;
+  }
+  if (NULL != bf_data)
+  {
+    pr->bf =
+        GNUNET_CONTAINER_bloomfilter_init (bf_data, bf_size, BLOOMFILTER_K);
+    pr->mingle = mingle;
+  }
+  else if ((replies_seen_count > 0) &&
+           (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH)))
+  {
+    GNUNET_assert (GNUNET_YES == refresh_bloomfilter (pr));
+  }
+  GNUNET_CONTAINER_multihashmap_put (pr_map, query, pr,
+                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  if (0 != (options & GSF_PRO_REQUEST_EXPIRES))
+  {
+    pr->hnode =
+        GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap, pr,
+                                      pr->public_data.ttl.abs_value);
+    /* make sure we don't track too many requests */
+    while (GNUNET_CONTAINER_heap_get_size (requests_by_expiration_heap) >
+           max_pending_requests)
     {
-      pr->replies_seen_size = replies_seen_count;
-      pr->replies_seen = GNUNET_malloc (sizeof (GNUNET_HashCode) * pr->replies_seen_size);
-      memcpy (pr->replies_seen,
-             replies_seen,
-             replies_seen_count * sizeof (struct GNUNET_HashCode));
-      pr->replies_seen_count = replies_seen_count;
+      dpr = GNUNET_CONTAINER_heap_peek (requests_by_expiration_heap);
+      GNUNET_assert (dpr != NULL);
+      if (pr == dpr)
+        break;                  /* let the request live briefly... */
+      dpr->rh (dpr->rh_cls, GNUNET_BLOCK_EVALUATION_REQUEST_VALID, dpr,
+               UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_BLOCK_TYPE_ANY,
+               NULL, 0);
+      GSF_pending_request_cancel_ (dpr, GNUNET_YES);
     }
-  if (NULL != bf)    
-    {
-      pr->bf = GNUNET_CONTAINER_bloomfilter_copy (bf);
-      pr->mingle = mingle;
-    }
-  else if ( (replies_seen_count > 0) &&
-           (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH)) )
-    {
-      GNUNET_assert (GNUNET_YES == refresh_bloomfilter (pr));
-    }
-  GNUNET_CONTAINER_multihashmap_put (pr_map,
-                                    query,
-                                    pr,
-                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  // FIXME: if not a local query, we also need to track the
-  // total number of external queries we currently have and
-  // bound it => need an additional heap!
+  }
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Pending requests active"), 1,
+                            GNUNET_NO);
   return pr;
 }
 
 
+/**
+ * Obtain the public data associated with a pending request
+ *
+ * @param pr pending request
+ * @return associated public data
+ */
+struct GSF_PendingRequestData *
+GSF_pending_request_get_data_ (struct GSF_PendingRequest *pr)
+{
+  return &pr->public_data;
+}
+
+
+/**
+ * Test if two pending requests are compatible (would generate
+ * the same query modulo filters and should thus be processed
+ * jointly).
+ *
+ * @param pra a pending request
+ * @param prb another pending request
+ * @return GNUNET_OK if the requests are compatible
+ */
+int
+GSF_pending_request_is_compatible_ (struct GSF_PendingRequest *pra,
+                                    struct GSF_PendingRequest *prb)
+{
+  if ((pra->public_data.type != prb->public_data.type) ||
+      (0 !=
+       memcmp (&pra->public_data.query, &prb->public_data.query,
+               sizeof (GNUNET_HashCode))) ||
+      ((pra->public_data.type == GNUNET_BLOCK_TYPE_FS_SBLOCK) &&
+       (0 !=
+        memcmp (&pra->public_data.namespace, &prb->public_data.namespace,
+                sizeof (GNUNET_HashCode)))))
+    return GNUNET_NO;
+  return GNUNET_OK;
+}
+
+
+
 /**
  * Update a given pending request with additional replies
  * that have been seen.
@@ -268,57 +432,53 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options,
  */
 void
 GSF_pending_request_update_ (struct GSF_PendingRequest *pr,
-                            const GNUNET_HashCode *replies_seen,
-                            unsigned int replies_seen_count)
+                             const GNUNET_HashCode * replies_seen,
+                             unsigned int replies_seen_count)
 {
   unsigned int i;
   GNUNET_HashCode mhash;
 
   if (replies_seen_count + pr->replies_seen_count < pr->replies_seen_count)
-    return; /* integer overflow */
-  if (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH))
+    return;                     /* integer overflow */
+  if (0 != (pr->public_data.options & GSF_PRO_BLOOMFILTER_FULL_REFRESH))
+  {
+    /* we're responsible for the BF, full refresh */
+    if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size)
+      GNUNET_array_grow (pr->replies_seen, pr->replies_seen_size,
+                         replies_seen_count + pr->replies_seen_count);
+    memcpy (&pr->replies_seen[pr->replies_seen_count], replies_seen,
+            sizeof (GNUNET_HashCode) * replies_seen_count);
+    pr->replies_seen_count += replies_seen_count;
+    if (GNUNET_NO == refresh_bloomfilter (pr))
     {
-      /* we're responsible for the BF, full refresh */
-      if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size)
-       GNUNET_array_grow (pr->replies_seen,
-                          pr->replies_seen_size,
-                          replies_seen_count + pr->replies_seen_count);
-      memcpy (&pr->replies_seen[pr->replies_seen_count],
-             replies_seen,
-             sizeof (GNUNET_HashCode) * replies_seen_count);
-      pr->replies_seen_count += replies_seen;
-      if (GNUNET_NO == refresh_bloomfilter (pr))
-       {
-         /* bf not recalculated, simply extend it with new bits */
-         for (i=0;i<pr->replies_seen_count;i++)
-           {
-             GNUNET_BLOCK_mingle_hash (&replies_seen[i],
-                                       pr->mingle,
-                                       &mhash);
-             GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
-           }
-       }
+      /* bf not recalculated, simply extend it with new bits */
+      for (i = 0; i < replies_seen_count; i++)
+      {
+        GNUNET_BLOCK_mingle_hash (&replies_seen[i], pr->mingle, &mhash);
+        GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
+      }
     }
+  }
   else
+  {
+    if (NULL == pr->bf)
     {
-      if (NULL == pr->bf)
-       {
-         /* we're not the initiator, but the initiator did not give us
-            any bloom-filter, so we need to create one on-the-fly */
-         pr->mingle = (int32_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 
-                                                          UINT32_MAX);
-         pr->bf = GNUNET_CONTAINER_bloomfilter_init (compute_bloomfilter_size (replies_seen_count),
-                                                     pr->mingle,
-                                                     BLOOMFILTER_K);
-       }
-      for (i=0;i<pr->replies_seen_count;i++)
-       {
-         GNUNET_BLOCK_mingle_hash (&replies_seen[i],
-                                   pr->mingle,
-                                   &mhash);
-         GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
-       }
+      /* we're not the initiator, but the initiator did not give us
+       * any bloom-filter, so we need to create one on-the-fly */
+      pr->mingle =
+          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
+      pr->bf =
+          GNUNET_CONTAINER_bloomfilter_init (NULL,
+                                             compute_bloomfilter_size
+                                             (replies_seen_count),
+                                             BLOOMFILTER_K);
     }
+    for (i = 0; i < pr->replies_seen_count; i++)
+    {
+      GNUNET_BLOCK_mingle_hash (&replies_seen[i], pr->mingle, &mhash);
+      GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
+    }
+  }
 }
 
 
@@ -327,77 +487,92 @@ GSF_pending_request_update_ (struct GSF_PendingRequest *pr,
  * transmission to other peers (or at least determine its size).
  *
  * @param pr request to generate the message for
- * @param do_route are we routing the reply
  * @param buf_size number of bytes available in buf
  * @param buf where to copy the message (can be NULL)
  * @return number of bytes needed (if > buf_size) or used
  */
 size_t
 GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr,
-                                 int do_route,
-                                 size_t buf_size,
-                                 void *buf)
+                                  size_t buf_size, void *buf)
 {
-  struct PendingMessage *pm;
   char lbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
   struct GetMessage *gm;
   GNUNET_HashCode *ext;
   size_t msize;
   unsigned int k;
-  int no_route;
   uint32_t bm;
   uint32_t prio;
   size_t bf_size;
+  struct GNUNET_TIME_Absolute now;
+  int64_t ttl;
+  int do_route;
 
+#if DEBUG_FS
+  if (buf_size > 0)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Building request message for `%s' of type %d\n",
+                GNUNET_h2s (&pr->public_data.query), pr->public_data.type);
+#endif
   k = 0;
   bm = 0;
-  if (GNUNET_YES != do_route)
-    {
-      bm |= GET_MESSAGE_BIT_RETURN_TO;
-      k++;      
-    }
-  if (GNUNET_BLOCK_TYPE_SBLOCK == pr->type)
-    {
-      bm |= GET_MESSAGE_BIT_SKS_NAMESPACE;
-      k++;
-    }
-  if (GNUNET_YES == pr->has_target)
-    {
-      bm |= GET_MESSAGE_BIT_TRANSMIT_TO;
-      k++;
-    }
+  do_route = (0 == (pr->public_data.options & GSF_PRO_FORWARD_ONLY));
+  if ((!do_route) && (pr->sender_pid == 0))
+  {
+    GNUNET_break (0);
+    do_route = GNUNET_YES;
+  }
+  if (!do_route)
+  {
+    bm |= GET_MESSAGE_BIT_RETURN_TO;
+    k++;
+  }
+  if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
+  {
+    bm |= GET_MESSAGE_BIT_SKS_NAMESPACE;
+    k++;
+  }
+  if (GNUNET_YES == pr->public_data.has_target)
+  {
+    bm |= GET_MESSAGE_BIT_TRANSMIT_TO;
+    k++;
+  }
   bf_size = GNUNET_CONTAINER_bloomfilter_get_size (pr->bf);
-  msize = sizeof (struct GetMessage) + bf_size + k * sizeof(GNUNET_HashCode);
+  msize = sizeof (struct GetMessage) + bf_size + k * sizeof (GNUNET_HashCode);
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
   if (buf_size < msize)
-    return msize;  
-  gm = (struct GetMessage*) lbuf;
+    return msize;
+  gm = (struct GetMessage *) lbuf;
   gm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_GET);
   gm->header.size = htons (msize);
-  gm->type = htonl (pr->type);
-  if (GNUNET_YES == do_route)
-    prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                    pr->public_data.priority + 1);
+  gm->type = htonl (pr->public_data.type);
+  if (do_route)
+    prio =
+        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  pr->public_data.priority + 1);
   else
     prio = 0;
   pr->public_data.priority -= prio;
   gm->priority = htonl (prio);
-  gm->ttl = htonl (pr->ttl);
-  gm->filter_mutator = htonl(pr->mingle); 
+  now = GNUNET_TIME_absolute_get ();
+  ttl = (int64_t) (pr->public_data.ttl.abs_value - now.abs_value);
+  gm->ttl = htonl (ttl / 1000);
+  gm->filter_mutator = htonl (pr->mingle);
   gm->hash_bitmap = htonl (bm);
-  gm->query = pr->query;
-  ext = (GNUNET_HashCode*) &gm[1];
+  gm->query = pr->public_data.query;
+  ext = (GNUNET_HashCode *) & gm[1];
   k = 0;
-  if (GNUNET_YES != do_route)
-    GNUNET_PEER_resolve (pr->cp->pid, (struct GNUNET_PeerIdentity*) &ext[k++]);
-  if (GNUNET_BLOCK_TYPE_SBLOCK == pr->type)
-    memcpy (&ext[k++], pr->namespace, sizeof (GNUNET_HashCode));
-  if (GNUNET_YES == pr->has_target)
-    GNUNET_PEER_resolve (pr->target_pid, (struct GNUNET_PeerIdentity*) &ext[k++]);
+  if (!do_route)
+    GNUNET_PEER_resolve (pr->sender_pid,
+                         (struct GNUNET_PeerIdentity *) &ext[k++]);
+  if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
+    memcpy (&ext[k++], &pr->public_data.namespace, sizeof (GNUNET_HashCode));
+  if (GNUNET_YES == pr->public_data.has_target)
+    ext[k++] = pr->public_data.target.hashPubKey;
   if (pr->bf != NULL)
-    GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf,
-                                              (char*) &ext[k],
-                                              bf_size);
+    GNUNET_assert (GNUNET_SYSERR !=
+                   GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf,
+                                                              (char *) &ext[k],
+                                                              bf_size));
   memcpy (buf, gm, msize);
   return msize;
 }
@@ -411,16 +586,57 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr,
  * @param value value in the hash map (pending request)
  * @return GNUNET_YES (we should continue to iterate)
  */
-static int 
-clean_request (void *cls,
-              const GNUNET_HashCode * key,
-              void *value)
+static int
+clean_request (void *cls, const GNUNET_HashCode * key, void *value)
 {
   struct GSF_PendingRequest *pr = value;
-  
+  GSF_LocalLookupContinuation cont;
+
+#if DEBUG_FS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Cleaning up pending request for `%s'.\n", GNUNET_h2s (key));
+#endif
+  if (NULL != (cont = pr->llc_cont))
+  {
+    pr->llc_cont = NULL;
+    cont (pr->llc_cont_cls, pr, pr->local_result);
+  }
+  GSF_plan_notify_request_done_ (pr);
   GNUNET_free_non_null (pr->replies_seen);
   if (NULL != pr->bf)
+  {
     GNUNET_CONTAINER_bloomfilter_free (pr->bf);
+    pr->bf = NULL;
+  }
+  GNUNET_PEER_change_rc (pr->sender_pid, -1);
+  pr->sender_pid = 0;
+  if (NULL != pr->hnode)
+  {
+    GNUNET_CONTAINER_heap_remove_node (pr->hnode);
+    pr->hnode = NULL;
+  }
+  if (NULL != pr->qe)
+  {
+    GNUNET_DATASTORE_cancel (pr->qe);
+    pr->qe = NULL;
+  }
+  if (NULL != pr->gh)
+  {
+    GNUNET_DHT_get_stop (pr->gh);
+    pr->gh = NULL;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
+  {
+    GNUNET_SCHEDULER_cancel (pr->warn_task);
+    pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multihashmap_remove (pr_map,
+                                                       &pr->public_data.query,
+                                                       pr));
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Pending requests active"), -1,
+                            GNUNET_NO);
   GNUNET_free (pr);
   return GNUNET_YES;
 }
@@ -430,16 +646,46 @@ clean_request (void *cls,
  * Explicitly cancel a pending request.
  *
  * @param pr request to cancel
+ * @param full_cleanup fully purge the request
  */
 void
-GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr)
+GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr, int full_cleanup)
 {
-  GNUNET_assert (GNUNET_OK ==
-                GNUNET_CONTAINER_multihashmap_remove (pr_map,
-                                                      &pr->public_data.query,
-                                                      pr));
+  GSF_LocalLookupContinuation cont;
+
+  if (NULL == pr_map)
+    return;                     /* already cleaned up! */
+  if (GNUNET_YES != full_cleanup)
+  {
+    /* make request inactive (we're no longer interested in more results),
+     * but do NOT remove from our data-structures, we still need it there
+     * to prevent the request from looping */
+    pr->rh = NULL;
+    if (NULL != (cont = pr->llc_cont))
+    {
+      pr->llc_cont = NULL;
+      cont (pr->llc_cont_cls, pr, pr->local_result);
+    }
+    GSF_plan_notify_request_done_ (pr);
+    if (NULL != pr->qe)
+    {
+      GNUNET_DATASTORE_cancel (pr->qe);
+      pr->qe = NULL;
+    }
+    if (NULL != pr->gh)
+    {
+      GNUNET_DHT_get_stop (pr->gh);
+      pr->gh = NULL;
+    }
+    if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
+    {
+      GNUNET_SCHEDULER_cancel (pr->warn_task);
+      pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+    return;
+  }
   GNUNET_assert (GNUNET_YES ==
-                clean_request (NULL, &pr->public_data.query, pr));  
+                 clean_request (NULL, &pr->public_data.query, pr));
 }
 
 
@@ -450,12 +696,11 @@ GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr)
  * @param cls closure for it
  */
 void
-GSF_iterate_pending_pr_map_ (GSF_PendingRequestIterator it,
-                            void *cls)
+GSF_iterate_pending_requests_ (GSF_PendingRequestIterator it, void *cls)
 {
   GNUNET_CONTAINER_multihashmap_iterate (pr_map,
-                                        (GNUNET_CONTAINER_HashMapIterator) it,
-                                        cls);
+                                         (GNUNET_CONTAINER_HashMapIterator) it,
+                                         cls);
 }
 
 
@@ -474,7 +719,7 @@ struct ProcessReplyClosure
   /**
    * Who gave us this reply? NULL for local host (or DHT)
    */
-  struct ConnectedPeer *sender;
+  struct GSF_ConnectedPeer *sender;
 
   /**
    * When the reply expires.
@@ -506,11 +751,6 @@ struct ProcessReplyClosure
    */
   enum GNUNET_BLOCK_EvaluationResult eval;
 
-  /**
-   * Did we finish processing the associated request?
-   */ 
-  int finished;
-
   /**
    * Did we find a matching request?
    */
@@ -527,50 +767,13 @@ struct ProcessReplyClosure
  */
 static void
 update_request_performance_data (struct ProcessReplyClosure *prq,
-                                struct GSF_PendingRequest *pr)
+                                 struct GSF_PendingRequest *pr)
 {
-  unsigned int i;
-  struct GNUNET_TIME_Relative cur_delay;
-
   if (prq->sender == NULL)
-    return;      
-  /* FIXME: adapt code to new API... */
-  for (i=0;i<pr->used_targets_off;i++)
-    if (pr->used_targets[i].pid == prq->sender->pid)
-      break;
-  if (i < pr->used_targets_off)
-    {
-      cur_delay = GNUNET_TIME_absolute_get_duration (pr->used_targets[i].last_request_time);      
-      prq->sender->avg_delay.rel_value
-       = (prq->sender->avg_delay.rel_value * 
-          (RUNAVG_DELAY_N - 1) + cur_delay.rel_value) / RUNAVG_DELAY_N; 
-      prq->sender->avg_priority
-       = (prq->sender->avg_priority * 
-          (RUNAVG_DELAY_N - 1) + pr->priority) / (double) RUNAVG_DELAY_N;
-    }
-  if (pr->cp != NULL)
-    {
-      GNUNET_PEER_change_rc (prq->sender->last_p2p_replies
-                            [prq->sender->last_p2p_replies_woff % P2P_SUCCESS_LIST_SIZE], 
-                            -1);
-      GNUNET_PEER_change_rc (pr->cp->pid, 1);
-      prq->sender->last_p2p_replies
-       [(prq->sender->last_p2p_replies_woff++) % P2P_SUCCESS_LIST_SIZE]
-       = pr->cp->pid;
-    }
-  else
-    {
-      if (NULL != prq->sender->last_client_replies
-         [(prq->sender->last_client_replies_woff) % CS2P_SUCCESS_LIST_SIZE])
-       GNUNET_SERVER_client_drop (prq->sender->last_client_replies
-                                  [(prq->sender->last_client_replies_woff) % CS2P_SUCCESS_LIST_SIZE]);
-      prq->sender->last_client_replies
-       [(prq->sender->last_client_replies_woff++) % CS2P_SUCCESS_LIST_SIZE]
-       = pr->client_request_list->client_list->client;
-      GNUNET_SERVER_client_keep (pr->client_request_list->client_list->client);
-    }
+    return;
+  GSF_peer_update_performance_ (prq->sender, pr->public_data.start_time,
+                                prq->priority);
 }
-                               
 
 
 /**
@@ -582,127 +785,121 @@ update_request_performance_data (struct ProcessReplyClosure *prq,
  * @return GNUNET_YES (we should continue to iterate)
  */
 static int
-process_reply (void *cls,
-              const GNUNET_HashCode * key,
-              void *value)
+process_reply (void *cls, const GNUNET_HashCode * key, void *value)
 {
   struct ProcessReplyClosure *prq = cls;
   struct GSF_PendingRequest *pr = value;
-  struct PendingMessage *reply;
-  struct ClientResponseMessage *creply;
-  struct ClientList *cl;
-  struct PutMessage *pm;
-  struct ConnectedPeer *cp;
-  size_t msize;
+  GNUNET_HashCode chash;
 
+  if (NULL == pr->rh)
+    return GNUNET_YES;
 #if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Matched result (type %u) for query `%s' with pending request\n",
-             (unsigned int) prq->type,
-             GNUNET_h2s (key));
-#endif  
-  GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# replies received and matched"),
-                           1,
-                           GNUNET_NO);
-  prq->eval = GNUNET_BLOCK_evaluate (block_ctx,
-                                    prq->type,
-                                    key,
-                                    &pr->bf,
-                                    pr->mingle,
-                                    pr->namespace, (pr->namespace != NULL) ? sizeof (GNUNET_HashCode) : 0,
-                                    prq->data,
-                                    prq->size);
+              "Matched result (type %u) for query `%s' with pending request\n",
+              (unsigned int) prq->type, GNUNET_h2s (key));
+#endif
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# replies received and matched"), 1,
+                            GNUNET_NO);
+  prq->eval =
+      GNUNET_BLOCK_evaluate (GSF_block_ctx, prq->type, key, &pr->bf, pr->mingle,
+                             &pr->public_data.namespace,
+                             (prq->type ==
+                              GNUNET_BLOCK_TYPE_FS_SBLOCK) ?
+                             sizeof (GNUNET_HashCode) : 0, prq->data,
+                             prq->size);
   switch (prq->eval)
-    {
-    case GNUNET_BLOCK_EVALUATION_OK_MORE:
-      update_request_performance_data (prq, pr);
-      break;
-    case GNUNET_BLOCK_EVALUATION_OK_LAST:
-      update_request_performance_data (prq, pr);
-      /* FIXME: adapt code to new API! */
-      while (NULL != pr->pending_head)
-       destroy_pending_message_list_entry (pr->pending_head);
-      if (pr->qe != NULL)
-       {
-         if (pr->client_request_list != NULL)
-           GNUNET_SERVER_receive_done (pr->client_request_list->client_list->client, 
-                                       GNUNET_YES);
-         GNUNET_DATASTORE_cancel (pr->qe);
-         pr->qe = NULL;
-       }
-      pr->do_remove = GNUNET_YES;
-      if (pr->task != GNUNET_SCHEDULER_NO_TASK)
-       {
-         GNUNET_SCHEDULER_cancel (pr->task);
-         pr->task = GNUNET_SCHEDULER_NO_TASK;
-       }
-      GNUNET_break (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap_remove (query_request_map,
-                                                         key,
-                                                         pr));
-      GNUNET_LOAD_update (rt_entry_lifetime,
-                         GNUNET_TIME_absolute_get_duration (pr->start_time).rel_value);
-      break;
-    case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop ("# duplicate replies discarded (bloomfilter)"),
-                               1,
-                               GNUNET_NO);
+  {
+  case GNUNET_BLOCK_EVALUATION_OK_MORE:
+    update_request_performance_data (prq, pr);
+    break;
+  case GNUNET_BLOCK_EVALUATION_OK_LAST:
+    /* short cut: stop processing early, no BF-update, etc. */
+    update_request_performance_data (prq, pr);
+    GNUNET_LOAD_update (GSF_rt_entry_lifetime,
+                        GNUNET_TIME_absolute_get_duration (pr->
+                                                           public_data.start_time).rel_value);
+    /* pass on to other peers / local clients */
+    pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration,
+            prq->type, prq->data, prq->size);
+    return GNUNET_YES;
+  case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# duplicate replies discarded (bloomfilter)"),
+                              1, GNUNET_NO);
 #if DEBUG_FS && 0
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Duplicate response `%s', discarding.\n",
-                 GNUNET_h2s (&mhash));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Duplicate response `%s', discarding.\n", GNUNET_h2s (&mhash));
 #endif
-      return GNUNET_YES; /* duplicate */
-    case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
-      return GNUNET_YES; /* wrong namespace */ 
-    case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
-      GNUNET_break (0);
-      return GNUNET_YES;
-    case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
-      GNUNET_break (0);
-      return GNUNET_YES;
-    case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Unsupported block type %u\n"),
-                 prq->type);
-      return GNUNET_NO;
-    }
-  /* FIXME: adapt code to new API! */
-  if (pr->client_request_list != NULL)
-    {
-      if (pr->replies_seen_size == pr->replies_seen_off)
-       GNUNET_array_grow (pr->replies_seen,
-                          pr->replies_seen_size,
-                          pr->replies_seen_size * 2 + 4);      
-      GNUNET_CRYPTO_hash (prq->data,
-                         prq->size,
-                         &pr->replies_seen[pr->replies_seen_off++]);         
-      refresh_bloomfilter (pr);
-    }
+    return GNUNET_YES;          /* duplicate */
+  case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
+    return GNUNET_YES;          /* wrong namespace */
+  case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
+    GNUNET_break (0);
+    return GNUNET_YES;
+  case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
+    GNUNET_break (0);
+    return GNUNET_YES;
+  case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Unsupported block type %u\n"),
+                prq->type);
+    return GNUNET_NO;
+  }
+  /* update bloomfilter */
+  GNUNET_CRYPTO_hash (prq->data, prq->size, &chash);
+  GSF_pending_request_update_ (pr, &chash, 1);
   if (NULL == prq->sender)
-    {
+  {
 #if DEBUG_FS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Found result for query `%s' in local datastore\n",
-                 GNUNET_h2s (key));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Found result for query `%s' in local datastore\n",
+                GNUNET_h2s (key));
 #endif
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop ("# results found locally"),
-                               1,
-                               GNUNET_NO);      
-    }
-  prq->priority += pr->remaining_priority;
-  pr->remaining_priority = 0;
-  pr->results_found++;
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop ("# results found locally"), 1,
+                              GNUNET_NO);
+  }
+  else
+  {
+    GSF_dht_lookup_ (pr);
+  }
+  prq->priority += pr->public_data.original_priority;
+  pr->public_data.priority = 0;
+  pr->public_data.original_priority = 0;
+  pr->public_data.results_found++;
   prq->request_found = GNUNET_YES;
-  /* finally, pass on to other peers / local clients */
-  pr->rh (pr->rh_cls, pr, prq->data, prq->size);
+  /* finally, pass on to other peer / local client */
+  pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration,
+          prq->type, prq->data, prq->size);
   return GNUNET_YES;
 }
 
 
+/**
+ * Context for the 'put_migration_continuation'.
+ */
+struct PutMigrationContext
+{
+
+  /**
+   * Start time for the operation.
+   */
+  struct GNUNET_TIME_Absolute start;
+
+  /**
+   * Request origin.
+   */
+  struct GNUNET_PeerIdentity origin;
+
+  /**
+   * GNUNET_YES if we had a matching request for this block,
+   * GNUNET_NO if not.
+   */
+  int requested;
+};
+
+
 /**
  * Continuation called to notify client about result of the
  * operation.
@@ -711,33 +908,57 @@ process_reply (void *cls,
  * @param success GNUNET_SYSERR on failure
  * @param msg NULL on success, otherwise an error message
  */
-static void 
-put_migration_continuation (void *cls,
-                           int success,
-                           const char *msg)
+static void
+put_migration_continuation (void *cls, int success, const char *msg)
 {
-  struct GNUNET_TIME_Absolute *start = cls;
+  struct PutMigrationContext *pmc = cls;
   struct GNUNET_TIME_Relative delay;
-  
-  delay = GNUNET_TIME_absolute_get_duration (*start);
-  GNUNET_free (start);
+  struct GNUNET_TIME_Relative block_time;
+  struct GSF_ConnectedPeer *cp;
+  struct GSF_PeerPerformanceData *ppd;
+
+  delay = GNUNET_TIME_absolute_get_duration (pmc->start);
+  cp = GSF_peer_get_ (&pmc->origin);
+  if ((GNUNET_OK != success) && (GNUNET_NO == pmc->requested))
+  {
+    /* block migration for a bit... */
+    if (NULL != cp)
+    {
+      ppd = GSF_get_peer_performance_data_ (cp);
+      ppd->migration_duplication++;
+      block_time =
+          GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+                                         5 * ppd->migration_duplication +
+                                         GNUNET_CRYPTO_random_u32
+                                         (GNUNET_CRYPTO_QUALITY_WEAK, 5));
+      GSF_block_peer_migration_ (cp, block_time);
+    }
+  }
+  else
+  {
+    if (NULL != cp)
+    {
+      ppd = GSF_get_peer_performance_data_ (cp);
+      ppd->migration_duplication = 0;   /* reset counter */
+    }
+  }
+  GNUNET_free (pmc);
   /* FIXME: should we really update the load value on failure? */
-  GNUNET_LOAD_update (datastore_put_load,
-                     delay.rel_value);
+  if (NULL != datastore_put_load)
+    GNUNET_LOAD_update (datastore_put_load, delay.rel_value);
   if (GNUNET_OK == success)
     return;
-  GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# datastore 'put' failures"),
-                           1,
-                           GNUNET_NO);
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Datastore `PUT' failures"), 1,
+                            GNUNET_NO);
 }
 
 
 /**
  * Test if the DATABASE (PUT) load on this peer is too high
  * to even consider processing the query at
- * all.  
- * 
+ * all.
+ *
  * @return GNUNET_YES if the load is too high to do anything (load high)
  *         GNUNET_NO to process normally (load normal or low)
  */
@@ -746,15 +967,17 @@ test_put_load_too_high (uint32_t priority)
 {
   double ld;
 
+  if (NULL == datastore_put_load)
+    return GNUNET_NO;
   if (GNUNET_LOAD_get_average (datastore_put_load) < 50)
-    return GNUNET_NO; /* very fast */
+    return GNUNET_NO;           /* very fast */
   ld = GNUNET_LOAD_get_load (datastore_put_load);
   if (ld < 2.0 * (1 + priority))
     return GNUNET_NO;
-  GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# storage requests dropped due to high load"),
-                           1,
-                           GNUNET_NO);
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop
+                            ("# storage requests dropped due to high load"), 1,
+                            GNUNET_NO);
   return GNUNET_YES;
 }
 
@@ -774,48 +997,446 @@ test_put_load_too_high (uint32_t priority)
  * @param size number of bytes in data
  * @param data pointer to the result data
  */
-void
-GSF_handle_dht_reply_ (void *cls,
-                      struct GNUNET_TIME_Absolute exp,
-                      const GNUNET_HashCode * key,
-                      const struct GNUNET_PeerIdentity * const *get_path,
-                      const struct GNUNET_PeerIdentity * const *put_path,
-                      enum GNUNET_BLOCK_Type type,
-                      size_t size,
-                      const void *data)
+static void
+handle_dht_reply (void *cls, struct GNUNET_TIME_Absolute exp,
+                  const GNUNET_HashCode * key,
+                  const struct GNUNET_PeerIdentity *const *get_path,
+                  const struct GNUNET_PeerIdentity *const *put_path,
+                  enum GNUNET_BLOCK_Type type, size_t size, const void *data)
 {
   struct GSF_PendingRequest *pr = cls;
   struct ProcessReplyClosure prq;
+  struct PutMigrationContext *pmc;
 
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Replies received from DHT"), 1,
+                            GNUNET_NO);
   memset (&prq, 0, sizeof (prq));
   prq.data = data;
   prq.expiration = exp;
-  prq.size = size;  
+  prq.size = size;
   prq.type = type;
   process_reply (&prq, key, pr);
-  if ( (GNUNET_YES == active_to_migration) &&
-       (GNUNET_NO == test_put_load_too_high (prq.priority)) )
-    {      
+  if ((GNUNET_YES == active_to_migration) &&
+      (GNUNET_NO == test_put_load_too_high (prq.priority)))
+  {
 #if DEBUG_FS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Replicating result for query `%s' with priority %u\n",
-                 GNUNET_h2s (&query),
-                 prq.priority);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Replicating result for query `%s' with priority %u\n",
+                GNUNET_h2s (key), prq.priority);
 #endif
-      start = GNUNET_malloc (sizeof (struct GNUNET_TIME_Absolute));
-      *start = GNUNET_TIME_absolute_get ();
-      GNUNET_DATASTORE_put (dsh,
-                           0, &query, dsize, &put[1],
-                           type, prq.priority, 1 /* anonymity */, 
-                           expiration, 
-                           1 + prq.priority, MAX_DATASTORE_QUEUE,
-                           GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                           &put_migration_continuation, 
-                           start);
+    pmc = GNUNET_malloc (sizeof (struct PutMigrationContext));
+    pmc->start = GNUNET_TIME_absolute_get ();
+    pmc->requested = GNUNET_YES;
+    if (NULL ==
+        GNUNET_DATASTORE_put (GSF_dsh, 0, key, size, data, type, prq.priority,
+                              1 /* anonymity */ ,
+                              0 /* replication */ ,
+                              exp, 1 + prq.priority, MAX_DATASTORE_QUEUE,
+                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                              &put_migration_continuation, pmc))
+    {
+      put_migration_continuation (pmc, GNUNET_NO, NULL);
     }
+  }
+}
+
+
+/**
+ * Consider looking up the data in the DHT (anonymity-level permitting).
+ *
+ * @param pr the pending request to process
+ */
+void
+GSF_dht_lookup_ (struct GSF_PendingRequest *pr)
+{
+  const void *xquery;
+  size_t xquery_size;
+  struct GNUNET_PeerIdentity pi;
+  char buf[sizeof (GNUNET_HashCode) * 2];
+
+  if (0 != pr->public_data.anonymity_level)
+    return;
+  if (NULL != pr->gh)
+  {
+    GNUNET_DHT_get_stop (pr->gh);
+    pr->gh = NULL;
+  }
+  xquery = NULL;
+  xquery_size = 0;
+  if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
+  {
+    xquery = buf;
+    memcpy (buf, &pr->public_data.namespace, sizeof (GNUNET_HashCode));
+    xquery_size = sizeof (GNUNET_HashCode);
+  }
+  if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY))
+  {
+    GNUNET_assert (0 != pr->sender_pid);
+    GNUNET_PEER_resolve (pr->sender_pid, &pi);
+    memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity));
+    xquery_size += sizeof (struct GNUNET_PeerIdentity);
+  }
+  pr->gh =
+      GNUNET_DHT_get_start (GSF_dht, GNUNET_TIME_UNIT_FOREVER_REL,
+                            pr->public_data.type, &pr->public_data.query,
+                            DEFAULT_GET_REPLICATION,
+                            GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, pr->bf,
+                            pr->mingle, xquery, xquery_size, &handle_dht_reply,
+                            pr);
 }
 
 
+/**
+ * Task that issues a warning if the datastore lookup takes too long.
+ *
+ * @param cls the 'struct GSF_PendingRequest'
+ * @param tc task context
+ */
+static void
+warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GSF_PendingRequest *pr = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              _("Datastore lookup already took %llu ms!\n"),
+              (unsigned long long)
+              GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
+  pr->warn_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task,
+                                    pr);
+}
+
+
+/**
+ * Task that issues a warning if the datastore lookup takes too long.
+ *
+ * @param cls the 'struct GSF_PendingRequest'
+ * @param tc task context
+ */
+static void
+odc_warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GSF_PendingRequest *pr = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              _("On-demand lookup already took %llu ms!\n"),
+              (unsigned long long)
+              GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
+  pr->warn_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+                                    &odc_warn_delay_task, pr);
+}
+
+
+/**
+ * We're processing (local) results for a search request
+ * from another peer.  Pass applicable results to the
+ * peer and if we are done either clean up (operation
+ * complete) or forward to other peers (more results possible).
+ *
+ * @param cls our closure (struct PendingRequest)
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param type type of the content
+ * @param priority priority of the content
+ * @param anonymity anonymity-level for the content
+ * @param expiration expiration time for the content
+ * @param uid unique identifier for the datum;
+ *        maybe 0 if no unique identifier is available
+ */
+static void
+process_local_reply (void *cls, const GNUNET_HashCode * key, size_t size,
+                     const void *data, enum GNUNET_BLOCK_Type type,
+                     uint32_t priority, uint32_t anonymity,
+                     struct GNUNET_TIME_Absolute expiration, uint64_t uid)
+{
+  struct GSF_PendingRequest *pr = cls;
+  GSF_LocalLookupContinuation cont;
+  struct ProcessReplyClosure prq;
+  GNUNET_HashCode query;
+  unsigned int old_rf;
+
+  GNUNET_SCHEDULER_cancel (pr->warn_task);
+  pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != pr->qe)
+  {
+    pr->qe = NULL;
+    if (NULL == key)
+    {
+      GNUNET_STATISTICS_update (GSF_stats,
+                                gettext_noop
+                                ("# Datastore lookups concluded (no results)"),
+                                1, GNUNET_NO);
+    }
+    if (GNUNET_NO == pr->have_first_uid)
+    {
+      pr->first_uid = uid;
+      pr->have_first_uid = 1;
+    }
+    else
+    {
+      if ((uid == pr->first_uid) && (key != NULL))
+      {
+        GNUNET_STATISTICS_update (GSF_stats,
+                                  gettext_noop
+                                  ("# Datastore lookups concluded (seen all)"),
+                                  1, GNUNET_NO);
+        key = NULL;             /* all replies seen! */
+      }
+      pr->have_first_uid++;
+      if ((pr->have_first_uid > MAX_RESULTS) && (key != NULL))
+      {
+        GNUNET_STATISTICS_update (GSF_stats,
+                                  gettext_noop
+                                  ("# Datastore lookups aborted (more than MAX_RESULTS)"),
+                                  1, GNUNET_NO);
+        key = NULL;             /* all replies seen! */
+      }
+    }
+  }
+  if (NULL == key)
+  {
+#if DEBUG_FS > 1
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "No further local responses available.\n");
+#endif
+    if ((pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK) ||
+        (pr->public_data.type == GNUNET_BLOCK_TYPE_FS_IBLOCK))
+      GNUNET_STATISTICS_update (GSF_stats,
+                                gettext_noop
+                                ("# requested DBLOCK or IBLOCK not found"), 1,
+                                GNUNET_NO);
+    goto check_error_and_continue;
+  }
+#if DEBUG_FS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received reply for `%s' of type %d with UID %llu from datastore.\n",
+              GNUNET_h2s (key), type, (unsigned long long) uid);
+#endif
+  if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
+  {
+#if DEBUG_FS > 1
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Found ONDEMAND block, performing on-demand encoding\n");
+#endif
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# on-demand blocks matched requests"), 1,
+                              GNUNET_NO);
+    pr->qe_start = GNUNET_TIME_absolute_get ();
+    pr->warn_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+                                      &odc_warn_delay_task, pr);
+    if (GNUNET_OK ==
+        GNUNET_FS_handle_on_demand_block (key, size, data, type, priority,
+                                          anonymity, expiration, uid,
+                                          &process_local_reply, pr))
+    {
+      GNUNET_STATISTICS_update (GSF_stats,
+                                gettext_noop
+                                ("# on-demand lookups performed successfully"),
+                                1, GNUNET_NO);
+      return;                   /* we're done */
+    }
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop ("# on-demand lookups failed"), 1,
+                              GNUNET_NO);
+    GNUNET_SCHEDULER_cancel (pr->warn_task);
+    pr->warn_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+                                      &warn_delay_task, pr);
+    pr->qe =
+        GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset - 1,
+                                  &pr->public_data.query,
+                                  pr->public_data.type ==
+                                  GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+                                  GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+                                  (0 !=
+                                   (GSF_PRO_PRIORITY_UNLIMITED &
+                                    pr->public_data.options)) ? UINT_MAX : 1
+                                  /* queue priority */ ,
+                                  (0 !=
+                                   (GSF_PRO_PRIORITY_UNLIMITED &
+                                    pr->public_data.options)) ? UINT_MAX : 1
+                                  /* max queue size */ ,
+                                  GNUNET_TIME_UNIT_FOREVER_REL,
+                                  &process_local_reply, pr);
+    if (NULL != pr->qe)
+    {
+      GNUNET_STATISTICS_update (GSF_stats,
+                                gettext_noop
+                                ("# Datastore lookups concluded (error queueing)"),
+                                1, GNUNET_NO);
+      return;                   /* we're done */
+    }
+    goto check_error_and_continue;
+  }
+  old_rf = pr->public_data.results_found;
+  memset (&prq, 0, sizeof (prq));
+  prq.data = data;
+  prq.expiration = expiration;
+  prq.size = size;
+  if (GNUNET_OK !=
+      GNUNET_BLOCK_get_key (GSF_block_ctx, type, data, size, &query))
+  {
+    GNUNET_break (0);
+    GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1,
+                             GNUNET_TIME_UNIT_FOREVER_REL, NULL, NULL);
+    pr->qe_start = GNUNET_TIME_absolute_get ();
+    pr->warn_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+                                      &warn_delay_task, pr);
+    pr->qe =
+        GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset - 1,
+                                  &pr->public_data.query,
+                                  pr->public_data.type ==
+                                  GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+                                  GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+                                  (0 !=
+                                   (GSF_PRO_PRIORITY_UNLIMITED &
+                                    pr->public_data.options)) ? UINT_MAX : 1
+                                  /* queue priority */ ,
+                                  (0 !=
+                                   (GSF_PRO_PRIORITY_UNLIMITED &
+                                    pr->public_data.options)) ? UINT_MAX : 1
+                                  /* max queue size */ ,
+                                  GNUNET_TIME_UNIT_FOREVER_REL,
+                                  &process_local_reply, pr);
+    if (pr->qe == NULL)
+    {
+      GNUNET_STATISTICS_update (GSF_stats,
+                                gettext_noop
+                                ("# Datastore lookups concluded (error queueing)"),
+                                1, GNUNET_NO);
+      goto check_error_and_continue;
+    }
+    return;
+  }
+  prq.type = type;
+  prq.priority = priority;
+  prq.request_found = GNUNET_NO;
+  prq.anonymity_level = anonymity;
+  if ((old_rf == 0) && (pr->public_data.results_found == 0))
+    GSF_update_datastore_delay_ (pr->public_data.start_time);
+  process_reply (&prq, key, pr);
+  pr->local_result = prq.eval;
+  if (prq.eval == GNUNET_BLOCK_EVALUATION_OK_LAST)
+  {
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# Datastore lookups concluded (found ultimate result)"),
+                              1, GNUNET_NO);
+    goto check_error_and_continue;
+  }
+  if ((0 == (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options)) &&
+      ((GNUNET_YES == GSF_test_get_load_too_high_ (0)) ||
+       (pr->public_data.results_found > 5 + 2 * pr->public_data.priority)))
+  {
+#if DEBUG_FS > 2
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Load too high, done with request\n");
+#endif
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# Datastore lookups concluded (load too high)"),
+                              1, GNUNET_NO);
+    goto check_error_and_continue;
+  }
+  pr->qe_start = GNUNET_TIME_absolute_get ();
+  pr->warn_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task,
+                                    pr);
+  pr->qe =
+      GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset++,
+                                &pr->public_data.query,
+                                pr->public_data.type ==
+                                GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+                                GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+                                (0 !=
+                                 (GSF_PRO_PRIORITY_UNLIMITED & pr->
+                                  public_data.options)) ? UINT_MAX : 1
+                                /* queue priority */ ,
+                                (0 !=
+                                 (GSF_PRO_PRIORITY_UNLIMITED & pr->
+                                  public_data.options)) ? UINT_MAX : 1
+                                /* max queue size */ ,
+                                GNUNET_TIME_UNIT_FOREVER_REL,
+                                &process_local_reply, pr);
+  /* check if we successfully queued another datastore request;
+   * if so, return, otherwise call our continuation (if we have
+   * any) */
+check_error_and_continue:
+  if (NULL != pr->qe)
+    return;
+  if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
+  {
+    GNUNET_SCHEDULER_cancel (pr->warn_task);
+    pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (NULL == (cont = pr->llc_cont))
+    return;                     /* no continuation */
+  pr->llc_cont = NULL;
+  cont (pr->llc_cont_cls, pr, pr->local_result);
+}
+
+
+/**
+ * Look up the request in the local datastore.
+ *
+ * @param pr the pending request to process
+ * @param cont function to call at the end
+ * @param cont_cls closure for cont
+ */
+void
+GSF_local_lookup_ (struct GSF_PendingRequest *pr,
+                   GSF_LocalLookupContinuation cont, void *cont_cls)
+{
+  GNUNET_assert (NULL == pr->gh);
+  GNUNET_assert (NULL == pr->llc_cont);
+  pr->llc_cont = cont;
+  pr->llc_cont_cls = cont_cls;
+  pr->qe_start = GNUNET_TIME_absolute_get ();
+  pr->warn_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &warn_delay_task,
+                                    pr);
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# Datastore lookups initiated"), 1,
+                            GNUNET_NO);
+  pr->qe =
+      GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset++,
+                                &pr->public_data.query,
+                                pr->public_data.type ==
+                                GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+                                GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+                                (0 !=
+                                 (GSF_PRO_PRIORITY_UNLIMITED & pr->
+                                  public_data.options)) ? UINT_MAX : 1
+                                /* queue priority */ ,
+                                (0 !=
+                                 (GSF_PRO_PRIORITY_UNLIMITED & pr->
+                                  public_data.options)) ? UINT_MAX : 1
+                                /* max queue size */ ,
+                                GNUNET_TIME_UNIT_FOREVER_REL,
+                                &process_local_reply, pr);
+  if (NULL != pr->qe)
+  {
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# Datastore lookups concluded (error queueing)"),
+                              1, GNUNET_NO);
+
+    return;
+  }
+  GNUNET_SCHEDULER_cancel (pr->warn_task);
+  pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+  pr->llc_cont = NULL;
+  if (NULL != cont)
+    cont (cont_cls, pr, pr->local_result);
+}
+
+
+
 /**
  * Handle P2P "CONTENT" message.  Checks that the message is
  * well-formed and then checks if there are any pending requests for
@@ -831,7 +1452,7 @@ GSF_handle_dht_reply_ (void *cls,
  */
 int
 GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
-                        const struct GNUNET_MessageHeader *message)
+                         const struct GNUNET_MessageHeader *message)
 {
   const struct PutMessage *put;
   uint16_t msize;
@@ -840,34 +1461,33 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
   struct GNUNET_TIME_Absolute expiration;
   GNUNET_HashCode query;
   struct ProcessReplyClosure prq;
-  struct GNUNET_TIME_Relative block_time;  
+  struct GNUNET_TIME_Relative block_time;
   double putl;
-  struct GNUNET_TIME_Absolute *start;
+  struct PutMigrationContext *pmc;
 
   msize = ntohs (message->size);
   if (msize < sizeof (struct PutMessage))
-    {
-      GNUNET_break_op(0);
-      return GNUNET_SYSERR;
-    }
-  put = (const struct PutMessage*) message;
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  put = (const struct PutMessage *) message;
   dsize = msize - sizeof (struct PutMessage);
   type = ntohl (put->type);
   expiration = GNUNET_TIME_absolute_ntoh (put->expiration);
   if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
     return GNUNET_SYSERR;
   if (GNUNET_OK !=
-      GNUNET_BLOCK_get_key (block_ctx,
-                           type,
-                           &put[1],
-                           dsize,
-                           &query))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+      GNUNET_BLOCK_get_key (GSF_block_ctx, type, &put[1], dsize, &query))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# GAP PUT messages received"), 1,
+                            GNUNET_NO);
   /* now, lookup 'query' */
-  prq.data = (const void*) &put[1];
+  prq.data = (const void *) &put[1];
   if (NULL != cp)
     prq.sender = cp;
   else
@@ -876,51 +1496,66 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
   prq.type = type;
   prq.expiration = expiration;
   prq.priority = 0;
-  prq.anonymity_level = 1;
-  prq.finished = GNUNET_NO;
+  prq.anonymity_level = UINT32_MAX;
   prq.request_found = GNUNET_NO;
-  GNUNET_CONTAINER_multihashmap_get_multiple (query_request_map,
-                                             &query,
-                                             &process_reply,
-                                             &prq);
+  GNUNET_CONTAINER_multihashmap_get_multiple (pr_map, &query, &process_reply,
+                                              &prq);
   if (NULL != cp)
+  {
+    GSF_connected_peer_change_preference_ (cp,
+                                           CONTENT_BANDWIDTH_VALUE +
+                                           1000 * prq.priority);
+    GSF_get_peer_performance_data_ (cp)->trust += prq.priority;
+  }
+  if ((GNUNET_YES == active_to_migration) &&
+      (GNUNET_NO == test_put_load_too_high (prq.priority)))
+  {
+#if DEBUG_FS
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Replicating result for query `%s' with priority %u\n",
+                GNUNET_h2s (&query), prq.priority);
+#endif
+    pmc = GNUNET_malloc (sizeof (struct PutMigrationContext));
+    pmc->start = GNUNET_TIME_absolute_get ();
+    pmc->requested = prq.request_found;
+    GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid);
+    GNUNET_PEER_resolve (GSF_get_peer_performance_data_ (cp)->pid,
+                         &pmc->origin);
+    if (NULL ==
+        GNUNET_DATASTORE_put (GSF_dsh, 0, &query, dsize, &put[1], type,
+                              prq.priority, 1 /* anonymity */ ,
+                              0 /* replication */ ,
+                              expiration, 1 + prq.priority, MAX_DATASTORE_QUEUE,
+                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                              &put_migration_continuation, pmc))
     {
-      GSF_connected_peer_change_preference (cp, CONTENT_BANDWIDTH_VALUE + 1000 * prq.priority);
-      GSF_get_peer_performance_data (cp)->trust += prq.priority;
+      put_migration_continuation (pmc, GNUNET_NO, NULL);
     }
-  if ( (GNUNET_YES == active_to_migration) &&
-       (GNUNET_NO == test_put_load_too_high (prq.priority)) )
-    {      
+  }
+  else
+  {
 #if DEBUG_FS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Replicating result for query `%s' with priority %u\n",
-                 GNUNET_h2s (&query),
-                 prq.priority);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Choosing not to keep content `%s' (%d/%d)\n",
+                GNUNET_h2s (&query), active_to_migration,
+                test_put_load_too_high (prq.priority));
 #endif
-      start = GNUNET_malloc (sizeof (struct GNUNET_TIME_Absolute));
-      *start = GNUNET_TIME_absolute_get ();
-      GNUNET_DATASTORE_put (dsh,
-                           0, &query, dsize, &put[1],
-                           type, prq.priority, 1 /* anonymity */, 
-                           expiration, 
-                           1 + prq.priority, MAX_DATASTORE_QUEUE,
-                           GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                           &put_migration_continuation, 
-                           start);
-    }
+  }
   putl = GNUNET_LOAD_get_load (datastore_put_load);
-  if ( (NULL != (cp = prq.sender)) &&
-       (GNUNET_NO == prq.request_found) &&
-       ( (GNUNET_YES != active_to_migration) ||
-        (putl > 2.5 * (1 + prq.priority)) ) ) 
-    {
-      if (GNUNET_YES != active_to_migration) 
-       putl = 1.0 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5);
-      block_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                 5000 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                                                                  (unsigned int) (60000 * putl * putl)));
-      GSF_block_peer_migration (cp, block_time);
-    }
+  if ((NULL != (cp = prq.sender)) && (GNUNET_NO == prq.request_found) &&
+      ((GNUNET_YES != active_to_migration) ||
+       (putl > 2.5 * (1 + prq.priority))))
+  {
+    if (GNUNET_YES != active_to_migration)
+      putl = 1.0 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5);
+    block_time =
+        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+                                       5000 +
+                                       GNUNET_CRYPTO_random_u32
+                                       (GNUNET_CRYPTO_QUALITY_WEAK,
+                                        (unsigned int) (60000 * putl * putl)));
+    GSF_block_peer_migration_ (cp, block_time);
+  }
   return GNUNET_OK;
 }
 
@@ -931,7 +1566,22 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
 void
 GSF_pending_request_init_ ()
 {
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (GSF_cfg, "fs",
+                                             "MAX_PENDING_REQUESTS",
+                                             &max_pending_requests))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _
+                ("Configuration fails to specify `%s', assuming default value."),
+                "MAX_PENDING_REQUESTS");
+  }
+  active_to_migration =
+      GNUNET_CONFIGURATION_get_value_yesno (GSF_cfg, "FS", "CONTENT_CACHING");
+  datastore_put_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
   pr_map = GNUNET_CONTAINER_multihashmap_create (32 * 1024);
+  requests_by_expiration_heap =
+      GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
 }
 
 
@@ -941,11 +1591,13 @@ GSF_pending_request_init_ ()
 void
 GSF_pending_request_done_ ()
 {
-  GNUNET_CONTAINER_multihashmap_iterate (pr_map,
-                                        &clean_request,
-                                        NULL);
+  GNUNET_CONTAINER_multihashmap_iterate (pr_map, &clean_request, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (pr_map);
   pr_map = NULL;
+  GNUNET_CONTAINER_heap_destroy (requests_by_expiration_heap);
+  requests_by_expiration_heap = NULL;
+  GNUNET_LOAD_value_free (datastore_put_load);
+  datastore_put_load = NULL;
 }