1 files changed, 16 insertions, 19 deletions

diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 24570be72..e144e155e 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -31,6 +34,7 @@
 #ifndef PLUGIN_DATACACHE_H
 #define PLUGIN_DATACACHE_H
 
+
 #include "gnunet_datacache_lib.h"
 
 #ifdef __cplusplus
@@ -105,26 +109,14 @@ struct GNUNET_DATACACHE_PluginFunctions
    * Store an item in the datastore.
    *
    * @param cls closure (internal context for the plugin)
-   * @param key key to store the value under
    * @param xor_distance how close is @a key to our PID?
-   * @param size number of bytes in @a data
-   * @param data data to store
-   * @param type type of the value
-   * @param discard_time when to discard the value in any case
-   * @param path_info_len number of entries in @a path_info
-   * @param path_info a path through the network
+   * @param block data to store
    * @return 0 if duplicate, -1 on error, number of bytes used otherwise
    */
   ssize_t
   (*put) (void *cls,
-          const struct GNUNET_HashCode *key,
           uint32_t xor_distance,
-          size_t size,
-          const char *data,
-          enum GNUNET_BLOCK_Type type,
-          struct GNUNET_TIME_Absolute discard_time,
-          unsigned int path_info_len,
-          const struct GNUNET_DHT_PathElement *path_info);
+          const struct GNUNET_DATACACHE_Block *block);
 
 
   /**
@@ -158,14 +150,16 @@ struct GNUNET_DATACACHE_PluginFunctions
 
 
   /**
-   * Iterate over the results that are "close" to a particular key in
-   * the datacache.  "close" is defined as numerically larger than @a
-   * key (when interpreted as a circular address space), with small
-   * distance.
+   * Iterate over the results that are "close" to a particular key in the
+   * datacache.  "close" is defined as returning the @a num_results that are
+   * numerically closest and larger than @a key and also @a num_results that
+   * are numerically lower than @a key. Thus, the maximum number of results
+   * returned is actually twice @a num_results.
    *
    * @param cls closure (internal context for the plugin)
    * @param key area of the keyspace to look into
-   * @param num_results number of results that should be returned to @a iter
+   * @param type desired block type for the replies
+   * @param num_results half the number of results that should be returned to @a iter
    * @param iter maybe NULL (to just count)
    * @param iter_cls closure for @a iter
    * @return the number of results found
@@ -173,6 +167,7 @@ struct GNUNET_DATACACHE_PluginFunctions
   unsigned int
   (*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);
@@ -189,3 +184,5 @@ struct GNUNET_DATACACHE_PluginFunctions
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */