major modification to datacache to store route options (and clean up the API)

8 files changed, 63 insertions, 145 deletions

diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h
index a1513fcce..5507dcea0 100644
--- a/src/dht/gnunet-service-dht.h
+++ b/src/dht/gnunet-service-dht.h
@@ -149,7 +149,7 @@ GDS_u_hold (struct GDS_Underlay *u,
  * @return true on success, false on failures
  */
 bool
-GDS_CLIENTS_handle_reply (const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_handle_reply (const struct GNUNET_DATACACHE_Block *bd,
                           const struct GNUNET_HashCode *query_hash,
                           unsigned int get_path_length,
                           const struct GNUNET_DHT_PathElement *get_path);
@@ -186,7 +186,7 @@ GDS_CLIENTS_process_get (enum GNUNET_DHT_RouteOption options,
  * @param get_path_length number of entries in @a get_path.
  */
 void
-GDS_CLIENTS_process_get_resp (const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_process_get_resp (const struct GNUNET_DATACACHE_Block *bd,
                               const struct GNUNET_DHT_PathElement *get_path,
                               unsigned int get_path_length);
 
@@ -196,14 +196,12 @@ GDS_CLIENTS_process_get_resp (const struct GDS_DATACACHE_BlockData *bd,
  * them in that case. The @a path should include our own
  * peer ID (if recorded).
  *
- * @param options routing options to apply
  * @param bd details about the block
  * @param hop_count Hop count so far.
  * @param desired_replication_level Desired replication level.
  */
 void
-GDS_CLIENTS_process_put (enum GNUNET_DHT_RouteOption options,
-                         const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_process_put (const struct GNUNET_DATACACHE_Block *bd,
                          uint32_t hop_count,
                          uint32_t desired_replication_level);
 
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index fd65102b3..631c4f68b 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -490,16 +490,15 @@ handle_dht_local_put (void *cls,
 {
   struct ClientHandle *ch = cls;
   uint16_t size = ntohs (dht_msg->header.size);
-  enum GNUNET_DHT_RouteOption options
-    = (enum GNUNET_DHT_RouteOption) ntohl (dht_msg->options);
   uint32_t replication_level
     = ntohl (dht_msg->desired_replication_level);
-  struct GDS_DATACACHE_BlockData bd = {
+  struct GNUNET_DATACACHE_Block bd = {
     .key = dht_msg->key,
     .expiration_time = GNUNET_TIME_absolute_ntoh (dht_msg->expiration),
     .data = &dht_msg[1],
     .data_size = size - sizeof (*dht_msg),
-    .type = ntohl (dht_msg->type)
+    .type = ntohl (dht_msg->type),
+    .ro = (enum GNUNET_DHT_RouteOption) ntohl (dht_msg->options)
   };
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -536,14 +535,13 @@ handle_dht_local_put (void *cls,
                                            DHT_BLOOM_SIZE,
                                            GNUNET_CONSTANTS_BLOOMFILTER_K);
     /* store locally */
-    if ( (0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
+    if ( (0 != (bd.ro & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
          (GDS_am_closest_peer (&dht_msg->key,
                                peer_bf)))
       GDS_DATACACHE_handle_put (&bd);
     /* route to other peers */
     if (GNUNET_OK !=
         GDS_NEIGHBOURS_handle_put (&bd,
-                                   options,
                                    replication_level,
                                    0 /* hop count */,
                                    peer_bf))
@@ -556,7 +554,6 @@ handle_dht_local_put (void *cls,
     GNUNET_CONTAINER_bloomfilter_free (peer_bf);
   }
   GDS_CLIENTS_process_put (
-    options,
     &bd,
     0,  /* hop count */
     replication_level);
@@ -572,7 +569,7 @@ handle_dht_local_put (void *cls,
  */
 static void
 handle_local_result (void *cls,
-                     const struct GDS_DATACACHE_BlockData *bd)
+                     const struct GNUNET_DATACACHE_Block *bd)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Datacache provided result for query key %s\n",
@@ -877,7 +874,7 @@ struct ForwardReplyContext
   /**
    * Block details.
    */
-  const struct GDS_DATACACHE_BlockData *bd;
+  const struct GNUNET_DATACACHE_Block *bd;
 
   /**
    * GET path taken.
@@ -1034,7 +1031,7 @@ forward_reply (void *cls,
 
 
 bool
-GDS_CLIENTS_handle_reply (const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_handle_reply (const struct GNUNET_DATACACHE_Block *bd,
                           const struct GNUNET_HashCode *query_hash,
                           unsigned int get_path_length,
                           const struct GNUNET_DHT_PathElement *get_path)
@@ -1414,7 +1411,7 @@ GDS_CLIENTS_process_get (enum GNUNET_DHT_RouteOption options,
  */
 struct ResponseActionContext
 {
-  const struct GDS_DATACACHE_BlockData *bd;
+  const struct GNUNET_DATACACHE_Block *bd;
   const struct GNUNET_DHT_PathElement *get_path;
   unsigned int get_path_length;
 };
@@ -1432,7 +1429,7 @@ response_action (void *cls,
                  struct ClientMonitorRecord *m)
 {
   const struct ResponseActionContext *resp_ctx = cls;
-  const struct GDS_DATACACHE_BlockData *bd = resp_ctx->bd;
+  const struct GNUNET_DATACACHE_Block *bd = resp_ctx->bd;
 
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_DHT_MonitorGetRespMessage *mmsg;
@@ -1467,7 +1464,7 @@ response_action (void *cls,
 
 
 void
-GDS_CLIENTS_process_get_resp (const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_process_get_resp (const struct GNUNET_DATACACHE_Block *bd,
                               const struct GNUNET_DHT_PathElement *get_path,
                               unsigned int get_path_length)
 {
@@ -1489,8 +1486,7 @@ GDS_CLIENTS_process_get_resp (const struct GDS_DATACACHE_BlockData *bd,
  */
 struct PutActionContext
 {
-  const struct GDS_DATACACHE_BlockData *bd;
-  enum GNUNET_DHT_RouteOption options;
+  const struct GNUNET_DATACACHE_Block *bd;
   uint32_t hop_count;
   uint32_t desired_replication_level;
 };
@@ -1508,7 +1504,7 @@ put_action (void *cls,
             struct ClientMonitorRecord *m)
 {
   const struct PutActionContext *put_ctx = cls;
-  const struct GDS_DATACACHE_BlockData *bd = put_ctx->bd;
+  const struct GNUNET_DATACACHE_Block *bd = put_ctx->bd;
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_DHT_MonitorPutMessage *mmsg;
   struct GNUNET_DHT_PathElement *msg_path;
@@ -1520,7 +1516,7 @@ put_action (void *cls,
   env = GNUNET_MQ_msg_extra (mmsg,
                              msize,
                              GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT);
-  mmsg->options = htonl (put_ctx->options);
+  mmsg->options = htonl (bd->ro);
   mmsg->type = htonl (bd->type);
   mmsg->hop_count = htonl (put_ctx->hop_count);
   mmsg->desired_replication_level = htonl (put_ctx->desired_replication_level);
@@ -1540,16 +1536,14 @@ put_action (void *cls,
 
 
 void
-GDS_CLIENTS_process_put (enum GNUNET_DHT_RouteOption options,
-                         const struct GDS_DATACACHE_BlockData *bd,
+GDS_CLIENTS_process_put (const struct GNUNET_DATACACHE_Block *bd,
                          uint32_t hop_count,
                          uint32_t desired_replication_level)
 {
   struct PutActionContext put_ctx = {
     .bd = bd,
     .hop_count = hop_count,
-    .desired_replication_level = desired_replication_level,
-    .options = options
+    .desired_replication_level = desired_replication_level
   };
 
   for_matching_monitors (bd->type,
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c
index be0a6db81..dcb6308a9 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -46,7 +46,7 @@ static struct GNUNET_DATACACHE_Handle *datacache;
 
 
 void
-GDS_DATACACHE_handle_put (const struct GDS_DATACACHE_BlockData *bd)
+GDS_DATACACHE_handle_put (const struct GNUNET_DATACACHE_Block *bd)
 {
   struct GNUNET_HashCode xor;
   enum GNUNET_GenericReturnValue r;
@@ -71,14 +71,8 @@ GDS_DATACACHE_handle_put (const struct GDS_DATACACHE_BlockData *bd)
                           &GDS_my_identity_hash,
                           &xor);
   r = GNUNET_DATACACHE_put (datacache,
-                            &bd->key,
                             GNUNET_CRYPTO_hash_count_leading_zeros (&xor),
-                            bd->data_size,
-                            bd->data,
-                            bd->type,
-                            bd->expiration_time,
-                            bd->put_path_length,
-                            bd->put_path);
+                            bd);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "DATACACHE PUT for key %s [%lu] completed (%d) after %u hops\n",
        GNUNET_h2s (&bd->key),
@@ -134,55 +128,34 @@ struct GetRequestContext
  * Iterator for local get request results,
  *
  * @param cls closure for iterator, a `struct GetRequestContext`
- * @param exp when does this value expire?
- * @param key the key this data is stored under
- * @param data_size the size of the data identified by key
- * @param data the actual data
- * @param type the type of the @a data
- * @param put_path_length number of peers in @a put_path
- * @param put_path path the reply took on put
+ * @param bd block data
  * @return #GNUNET_OK to continue iteration, anything else
  * to stop iteration.
  */
 static enum GNUNET_GenericReturnValue
 datacache_get_iterator (void *cls,
-                        const struct GNUNET_HashCode *key,
-                        size_t data_size,
-                        const char *data,
-                        enum GNUNET_BLOCK_Type type,
-                        struct GNUNET_TIME_Absolute exp,
-                        unsigned int put_path_length,
-                        const struct GNUNET_DHT_PathElement *put_path)
+                        const struct GNUNET_DATACACHE_Block *bd)
 {
   struct GetRequestContext *ctx = cls;
   enum GNUNET_BLOCK_ReplyEvaluationResult eval;
-  struct GDS_DATACACHE_BlockData bd = {
-    .key = *key,
-    .expiration_time = exp,
-    .put_path = put_path,
-    .data = data,
-    .data_size = data_size,
-    .put_path_length = put_path_length,
-    .type = type
-  };
 
-  if (GNUNET_TIME_absolute_is_past (exp))
+  if (GNUNET_TIME_absolute_is_past (bd->expiration_time))
   {
     GNUNET_break (0);  /* why does datacache return expired values? */
     return GNUNET_OK;   /* skip expired record */
   }
   eval
     = GNUNET_BLOCK_check_reply (GDS_block_context,
-                                bd.type,
+                                bd->type,
                                 ctx->bg,
-                                &bd.key,
+                                &bd->key,
                                 ctx->xquery,
                                 ctx->xquery_size,
-                                bd.data,
-                                bd.data_size);
+                                bd->data,
+                                bd->data_size);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Evaluated reply for query %s in datacache, result is %d\n",
-       GNUNET_h2s (key),
+       GNUNET_h2s (&bd->key),
        (int) eval);
   ctx->eval = eval;
   switch (eval)
@@ -196,7 +169,7 @@ datacache_get_iterator (void *cls,
                               1,
                               GNUNET_NO);
     ctx->gc (ctx->gc_cls,
-             &bd);
+             bd);
     break;
   case GNUNET_BLOCK_REPLY_OK_DUPLICATE:
     GNUNET_STATISTICS_update (GDS_stats,
@@ -225,7 +198,7 @@ GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
                           void *gc_cls)
 {
   struct GetRequestContext ctx = {
-                                  .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
+    .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
     .key = *key,
     .xquery = xquery,
     .xquery_size = xquery_size,
@@ -265,7 +238,7 @@ GDS_DATACACHE_get_closest (const struct GNUNET_HashCode *key,
                            void *cb_cls)
 {
   struct GetRequestContext ctx = {
-                                  .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
+    .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
     .key = *key,
     .xquery = xquery,
     .xquery_size = xquery_size,
diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h
index d860139f5..b15e5378f 100644
--- a/src/dht/gnunet-service-dht_datacache.h
+++ b/src/dht/gnunet-service-dht_datacache.h
@@ -30,48 +30,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_dht_service.h"
-
-
-/**
- * Information about a block stored in the datacache.
- */
-struct GDS_DATACACHE_BlockData
-{
-  /**
-   * Key of the block.
-   */
-  struct GNUNET_HashCode key;
-
-  /**
-   * When does the block expire?
-   */
-  struct GNUNET_TIME_Absolute expiration_time;
-
-  /**
-   * PUT path taken by the block, array of peer identities.
-   */
-  const struct GNUNET_DHT_PathElement *put_path;
-
-  /**
-   * Actual block data.
-   */
-  const void *data;
-
-  /**
-   * Number of bytes in @a data.
-   */
-  size_t data_size;
-
-  /**
-   * Length of the @e put_path array.
-   */
-  unsigned int put_path_length;
-
-  /**
-   * Type of the block.
-   */
-  enum GNUNET_BLOCK_Type type;
-};
+#include "gnunet_datacache_lib.h"
 
 
 /**
@@ -81,7 +40,7 @@ struct GDS_DATACACHE_BlockData
  * @param bd block data to cache
  */
 void
-GDS_DATACACHE_handle_put (const struct GDS_DATACACHE_BlockData *bd);
+GDS_DATACACHE_handle_put (const struct GNUNET_DATACACHE_Block *bd);
 
 
 /**
@@ -92,7 +51,7 @@ GDS_DATACACHE_handle_put (const struct GDS_DATACACHE_BlockData *bd);
  */
 typedef void
 (*GDS_DATACACHE_GetCallback)(void *cls,
-                             const struct GDS_DATACACHE_BlockData *bd);
+                             const struct GNUNET_DATACACHE_Block *bd);
 
 
 /**
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index fde25936f..2a54f715a 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -1285,7 +1285,7 @@ get_target_peers (const struct GNUNET_HashCode *key,
  * @param bd block data we got
  */
 static void
-hello_check (const struct GDS_DATACACHE_BlockData *bd)
+hello_check (const struct GNUNET_DATACACHE_Block *bd)
 {
   struct GNUNET_PeerIdentity pid;
   struct GNUNET_HELLO_Builder *b;
@@ -1305,8 +1305,7 @@ hello_check (const struct GDS_DATACACHE_BlockData *bd)
 
 
 enum GNUNET_GenericReturnValue
-GDS_NEIGHBOURS_handle_put (const struct GDS_DATACACHE_BlockData *bd,
-                           enum GNUNET_DHT_RouteOption options,
+GDS_NEIGHBOURS_handle_put (const struct GNUNET_DATACACHE_Block *bd,
                            uint16_t desired_replication_level,
                            uint16_t hop_count,
                            struct GNUNET_CONTAINER_BloomFilter *bf)
@@ -1336,8 +1335,8 @@ GDS_NEIGHBOURS_handle_put (const struct GDS_DATACACHE_BlockData *bd,
               "Adding myself (%s) to PUT bloomfilter for %s with RO(%s/%s)\n",
               GNUNET_i2s (&GDS_my_identity),
               GNUNET_h2s (&bd->key),
-              (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE) ? "x" : "-",
-              (options & GNUNET_DHT_RO_RECORD_ROUTE) ? "R" : "-");
+              (bd->ro & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE) ? "x" : "-",
+              (bd->ro & GNUNET_DHT_RO_RECORD_ROUTE) ? "R" : "-");
 
   /* if we got a HELLO, consider it for our own routing table */
   hello_check (bd);
@@ -1394,7 +1393,7 @@ GDS_NEIGHBOURS_handle_put (const struct GDS_DATACACHE_BlockData *bd,
     ppm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_PUT);
     ppm->header.size = htons (sizeof (buf));
     ppm->type = htonl (bd->type);
-    ppm->options = htons (options);
+    ppm->options = htons (bd->ro);
     ppm->hop_count = htons (hop_count + 1);
     ppm->desired_replication_level = htons (desired_replication_level);
     ppm->put_path_length = htons (put_path_length);
@@ -1565,7 +1564,7 @@ GDS_NEIGHBOURS_lookup_peer (const struct GNUNET_PeerIdentity *target)
 
 bool
 GDS_NEIGHBOURS_handle_reply (struct PeerInfo *pi,
-                             const struct GDS_DATACACHE_BlockData *bd,
+                             const struct GNUNET_DATACACHE_Block *bd,
                              const struct GNUNET_HashCode *query_hash,
                              unsigned int get_path_length,
                              const struct GNUNET_DHT_PathElement *get_path)
@@ -1748,16 +1747,15 @@ handle_dht_p2p_put (void *cls,
   struct Target *t = cls;
   struct PeerInfo *peer = t->pi;
   uint16_t msize = ntohs (put->header.size);
-  enum GNUNET_DHT_RouteOption options
-    = (enum GNUNET_DHT_RouteOption) ntohs (put->options);
   const struct GNUNET_DHT_PathElement *put_path
     = (const struct GNUNET_DHT_PathElement *) &put[1];
   uint16_t putlen
     = ntohs (put->put_path_length);
-  struct GDS_DATACACHE_BlockData bd = {
+  struct GNUNET_DATACACHE_Block bd = {
     .key = put->key,
     .expiration_time = GNUNET_TIME_absolute_ntoh (put->expiration_time),
     .type = ntohl (put->type),
+    .ro = (enum GNUNET_DHT_RouteOption) ntohs (put->options),
     .data_size = msize - (sizeof(*put)
                           + putlen * sizeof(struct GNUNET_DHT_PathElement)),
     .data = &put_path[putlen]
@@ -1767,8 +1765,8 @@ handle_dht_p2p_put (void *cls,
               "PUT for `%s' from %s with RO (%s/%s)\n",
               GNUNET_h2s (&put->key),
               GNUNET_i2s (&peer->id),
-              (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE) ? "x" : "-",
-              (options & GNUNET_DHT_RO_RECORD_ROUTE) ? "R" : "-");
+              (bd.ro & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE) ? "x" : "-",
+              (bd.ro & GNUNET_DHT_RO_RECORD_ROUTE) ? "R" : "-");
   if (GNUNET_TIME_absolute_is_past (bd.expiration_time))
   {
     GNUNET_STATISTICS_update (GDS_stats,
@@ -1786,7 +1784,7 @@ handle_dht_p2p_put (void *cls,
     GNUNET_break_op (0);
     return;
   }
-  if (0 == (options & GNUNET_DHT_RO_RECORD_ROUTE))
+  if (0 == (bd.ro & GNUNET_DHT_RO_RECORD_ROUTE))
     putlen = 0;
   GNUNET_STATISTICS_update (GDS_stats,
                             "# P2P PUT requests received",
@@ -1837,7 +1835,7 @@ handle_dht_p2p_put (void *cls,
     /* extend 'put path' by sender */
     bd.put_path = (const struct GNUNET_DHT_PathElement *) pp;
     bd.put_path_length = putlen + 1;
-    if (0 != (options & GNUNET_DHT_RO_RECORD_ROUTE))
+    if (0 != (bd.ro & GNUNET_DHT_RO_RECORD_ROUTE))
     {
       unsigned int failure_offset;
 
@@ -1884,7 +1882,7 @@ handle_dht_p2p_put (void *cls,
                                             0, NULL /* get path */));
 
     /* store locally */
-    if ( (0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
+    if ( (0 != (bd.ro & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
          (GDS_am_closest_peer (&put->key,
                                bf)) )
       GDS_DATACACHE_handle_put (&bd);
@@ -1894,16 +1892,14 @@ handle_dht_p2p_put (void *cls,
       /* route to other peers */
       forwarded
         = GDS_NEIGHBOURS_handle_put (&bd,
-                                     options,
                                      ntohs (put->desired_replication_level),
                                      ntohs (put->hop_count),
                                      bf);
       /* notify monitoring clients */
-      GDS_CLIENTS_process_put (options
-                               | ((GNUNET_OK == forwarded)
-                                ? GNUNET_DHT_RO_LAST_HOP
-                                : 0),
-                               &bd,
+      bd.ro |= ((GNUNET_OK == forwarded)
+                ? GNUNET_DHT_RO_LAST_HOP
+                : 0);
+      GDS_CLIENTS_process_put (&bd,
                                ntohs (put->hop_count),
                                ntohs (put->desired_replication_level));
     }
@@ -1957,7 +1953,7 @@ handle_find_my_hello (struct PeerInfo *pi,
                                        block,
                                        block_size))
     {
-      struct GDS_DATACACHE_BlockData bd = {
+      struct GNUNET_DATACACHE_Block bd = {
         .type = GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
         .expiration_time
           = GNUNET_TIME_relative_to_absolute (
@@ -2014,7 +2010,7 @@ handle_find_local_hello (struct PeerInfo *pi,
           peer->hello,
           peer->hello_size)) )
   {
-    struct GDS_DATACACHE_BlockData bd = {
+    struct GNUNET_DATACACHE_Block bd = {
       .type = GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
       .expiration_time = peer->hello_expiration,
       .key = peer->phash,
@@ -2038,7 +2034,7 @@ handle_find_local_hello (struct PeerInfo *pi,
  */
 static void
 handle_local_result (void *cls,
-                     const struct GDS_DATACACHE_BlockData *bd)
+                     const struct GNUNET_DATACACHE_Block *bd)
 {
   struct PeerInfo *peer = cls;
 
@@ -2242,7 +2238,7 @@ handle_dht_p2p_get (void *cls,
  * @return true on success
  */
 static bool
-process_reply_with_path (const struct GDS_DATACACHE_BlockData *bd,
+process_reply_with_path (const struct GNUNET_DATACACHE_Block *bd,
                          const struct GNUNET_HashCode *query_hash,
                          unsigned int get_path_length,
                          const struct GNUNET_DHT_PathElement *get_path)
@@ -2265,7 +2261,7 @@ process_reply_with_path (const struct GDS_DATACACHE_BlockData *bd,
   {
     struct GNUNET_DHT_PathElement xput_path[GNUNET_NZL (get_path_length
                                                         + bd->put_path_length)];
-    struct GDS_DATACACHE_BlockData bdx = *bd;
+    struct GNUNET_DATACACHE_Block bdx = *bd;
 
     GNUNET_memcpy (xput_path,
                    bd->put_path,
@@ -2332,7 +2328,7 @@ handle_dht_p2p_result (void *cls,
   struct PeerInfo *peer = t->pi;
   uint16_t msize = ntohs (prm->header.size);
   uint16_t get_path_length = ntohs (prm->get_path_length);
-  struct GDS_DATACACHE_BlockData bd = {
+  struct GNUNET_DATACACHE_Block bd = {
     .expiration_time  = GNUNET_TIME_absolute_ntoh (prm->expiration_time),
     .put_path = (const struct GNUNET_DHT_PathElement *) &prm[1],
     .put_path_length = ntohs (prm->put_path_length),
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h
index 4f4172f71..96db21b9b 100644
--- a/src/dht/gnunet-service-dht_neighbours.h
+++ b/src/dht/gnunet-service-dht_neighbours.h
@@ -54,15 +54,13 @@ GDS_NEIGHBOURS_lookup_peer (const struct GNUNET_PeerIdentity *target);
  * network).
  *
  * @param bd data about the block
- * @param options routing options
  * @param desired_replication_level desired replication level
  * @param hop_count how many hops has this message traversed so far
  * @param bf Bloom filter of peers this PUT has already traversed
  * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not
  */
 enum GNUNET_GenericReturnValue
-GDS_NEIGHBOURS_handle_put (const struct GDS_DATACACHE_BlockData *bd,
-                           enum GNUNET_DHT_RouteOption options,
+GDS_NEIGHBOURS_handle_put (const struct GNUNET_DATACACHE_Block *bd,
                            uint16_t desired_replication_level,
                            uint16_t hop_count,
                            struct GNUNET_CONTAINER_BloomFilter *bf);
@@ -112,7 +110,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
  */
 bool
 GDS_NEIGHBOURS_handle_reply (struct PeerInfo *pi,
-                             const struct GDS_DATACACHE_BlockData *bd,
+                             const struct GNUNET_DATACACHE_Block *bd,
                              const struct GNUNET_HashCode *query_hash,
                              unsigned int get_path_length,
                              const struct GNUNET_DHT_PathElement *get_path);
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 6deb5fa16..8f87751bb 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -105,7 +105,7 @@ struct ProcessContext
   /**
    * Block data.
    */
-  const struct GDS_DATACACHE_BlockData *bd;
+  const struct GNUNET_DATACACHE_Block *bd;
 
   /**
    * Path of the reply.
@@ -137,7 +137,7 @@ process (void *cls,
   struct RecentRequest *rr = value;
   enum GNUNET_BLOCK_ReplyEvaluationResult eval;
   unsigned int get_path_length;
-  struct GDS_DATACACHE_BlockData bdx = *pc->bd;
+  struct GNUNET_DATACACHE_Block bdx = *pc->bd;
 
   if ( (rr->type != GNUNET_BLOCK_TYPE_ANY) &&
        (rr->type != pc->bd->type) )
@@ -252,7 +252,7 @@ process (void *cls,
  * @param get_path peers this reply has traversed so far (if tracked)
  */
 void
-GDS_ROUTING_process (const struct GDS_DATACACHE_BlockData *bd,
+GDS_ROUTING_process (const struct GNUNET_DATACACHE_Block *bd,
                      const struct GNUNET_HashCode *query_hash,
                      unsigned int get_path_length,
                      const struct GNUNET_DHT_PathElement *get_path)
diff --git a/src/dht/gnunet-service-dht_routing.h b/src/dht/gnunet-service-dht_routing.h
index 1e35f3dc0..08c7de870 100644
--- a/src/dht/gnunet-service-dht_routing.h
+++ b/src/dht/gnunet-service-dht_routing.h
@@ -44,7 +44,7 @@
  * @param get_path peers this reply has traversed so far (if tracked)
  */
 void
-GDS_ROUTING_process (const struct GDS_DATACACHE_BlockData *bd,
+GDS_ROUTING_process (const struct GNUNET_DATACACHE_Block *bd,
                      const struct GNUNET_HashCode *query_hash,
                      unsigned int get_path_length,
                      const struct GNUNET_DHT_PathElement *get_path);