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 1ee8eb8e27f3d715ccec489f731eb754b6d1cba3..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"
@@ -58,7 +59,7 @@ struct GNUNET_DATACACHE_Handle;
  */
 struct GNUNET_DATACACHE_Handle *
 GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
-                        struct GNUNET_CONFIGURATION_Handle *cfg,
+                        const struct GNUNET_CONFIGURATION_Handle *cfg,
                         const char *section);
 
 
@@ -74,16 +75,19 @@ 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);
 
 
 /**
@@ -102,7 +106,7 @@ 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);
 
 
@@ -120,7 +124,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
 unsigned int 
 GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
                      const GNUNET_HashCode * key,
-                     unsigned int type, 
+                     enum GNUNET_BLOCK_Type type, 
                      GNUNET_DATACACHE_Iterator iter,
                      void *iter_cls);