HKDF (does not work yet)

[oweals/gnunet.git] / src / include / gnunet_datacache_lib.h

diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 64d1d48834a9330ac3c96b962b5984a4187b9890..e0866416d6ccfdd1bcc98b96e349d53bbf120e45 100644 (file)
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -32,6 +32,7 @@
 #define GNUNET_DATACACHE_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_block_lib.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -51,12 +52,14 @@ struct GNUNET_DATACACHE_Handle;
 /**
  * Create a data cache.
  *
+ * @param sched scheduler to use
  * @param cfg configuration to use
  * @param section section in the configuration that contains our options
  * @return handle to use to access the service
  */
 struct GNUNET_DATACACHE_Handle *
-GNUNET_DATACACHE_create (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
+                        const struct GNUNET_CONFIGURATION_Handle *cfg,
                         const char *section);
 
 
@@ -72,21 +75,25 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h);
  * An iterator over a set of items stored in the datacache.
  *
  * @param cls closure
+ * @param exp when will the content expire?
  * @param key key for the content
  * @param size number of bytes in data
  * @param data content stored
  * @param type type of the content
+ * @return GNUNET_OK to continue iterating, GNUNET_SYSERR to abort
  */
-typedef void (*GNUNET_DATACACHE_Iterator) (void *cls,
-                                          const GNUNET_HashCode * key,
-                                          uint32_t size,
-                                          const char *data,
-                                          uint32_t type);
+typedef int (*GNUNET_DATACACHE_Iterator) (void *cls,
+                                         struct GNUNET_TIME_Absolute exp,
+                                         const GNUNET_HashCode * key,
+                                         uint32_t size,
+                                         const char *data,
+                                         enum GNUNET_BLOCK_Type type);
 
 
 /**
- * Store an item in the datastore.
+ * Store an item in the datacache.
  *
+ * @param h handle to the datacache
  * @param key key to store data under
  * @param size number of bytes in data
  * @param data data to store
@@ -95,17 +102,19 @@ typedef void (*GNUNET_DATACACHE_Iterator) (void *cls,
  * @return GNUNET_OK on success, GNUNET_SYSERR on error (full, etc.)
  */
 int 
-GNUNET_DATACACHE_put (const GNUNET_HashCode * key,
+GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
+                     const GNUNET_HashCode * key,
                      uint32_t size,
                      const char *data,
-                     unsigned int type,
+                     enum GNUNET_BLOCK_Type type,
                      struct GNUNET_TIME_Absolute discard_time);
 
 
 /**
  * Iterate over the results for a particular key
- * in the datastore.
+ * in the datacache.
  *
+ * @param h handle to the datacache
  * @param key what to look up
  * @param type entries of which type are relevant?
  * @param iter maybe NULL (to just count)
@@ -113,8 +122,9 @@ GNUNET_DATACACHE_put (const GNUNET_HashCode * key,
  * @return the number of results found
  */
 unsigned int 
-GNUNET_DATACACHE_get (const GNUNET_HashCode * key,
-                     unsigned int type, 
+GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
+                     const GNUNET_HashCode * key,
+                     enum GNUNET_BLOCK_Type type, 
                      GNUNET_DATACACHE_Iterator iter,
                      void *iter_cls);