1 files changed, 8 insertions, 0 deletions

diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c
index fbd3aea9a..2756315fb 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -409,6 +409,8 @@ struct GetClosestContext
 {
   struct Value **values;
 
+  enum GNUNET_BLOCK_Type type;
+
   unsigned int num_results;
 
   const struct GNUNET_HashCode *key;
@@ -427,6 +429,9 @@ find_closest (void *cls,
   if (1 != GNUNET_CRYPTO_hash_cmp (key,
                                    gcc->key))
     return GNUNET_OK; /* useless */
+  if ( (val->type != gcc->type) &&
+       (GNUNET_BLOCK_TYPE_ANY != gcc->type) )
+    return GNUNET_OK; /* useless */
   j = gcc->num_results;
   for (unsigned int i = 0; i < gcc->num_results; i++)
   {
@@ -457,6 +462,7 @@ find_closest (void *cls,
  *
  * @param cls closure (internal context for the plugin)
  * @param key area of the keyspace to look into
+ * @param type desired block type for the replies
  * @param num_results number of results that should be returned to @a iter
  * @param iter maybe NULL (to just count)
  * @param iter_cls closure for @a iter
@@ -465,6 +471,7 @@ find_closest (void *cls,
 static unsigned int
 heap_plugin_get_closest (void *cls,
                          const struct GNUNET_HashCode *key,
+                         enum GNUNET_BLOCK_Type type,
                          unsigned int num_results,
                          GNUNET_DATACACHE_Iterator iter,
                          void *iter_cls)
@@ -473,6 +480,7 @@ heap_plugin_get_closest (void *cls,
   struct Value *values[num_results];
   struct GetClosestContext gcc = {
     .values = values,
+    .type = type,
     .num_results = num_results,
     .key = key
   };