-avoid 'hu', as it is unsigned short, not uint16_t

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

diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h
index 2d397088c1fa9d39a3edc1dab28b620287e54ead..8eea796bb7857f13e7957af34d147f3d68509fc3 100644 (file)
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -38,21 +38,6 @@ extern "C"
 #endif
 
 
-/**
- * Function called by for each matching record.
- *
- * @param cls closure
- * @param peer peer identity
- * @param sub_system name of the GNUnet sub system responsible
- * @param value stored value
- * @param size size of stored value
- */
-typedef void (*GNUNET_PEERSTORE_RecordIterator) (void *cls,
-    const struct GNUNET_PeerIdentity *peer,
-    const char *sub_system,
-    const void *value,
-    size_t size);
-
 /**
  * @brief struct returned by the initialization function of the plugin
  */
@@ -78,27 +63,43 @@ struct GNUNET_PEERSTORE_PluginFunctions
    */
   int
   (*store_record) (void *cls,
-      const struct GNUNET_PeerIdentity *peer,
       const char *sub_system,
+      const struct GNUNET_PeerIdentity *peer,
+      const char *key,
       const void *value,
-      size_t size);
+      size_t size,
+      struct GNUNET_TIME_Absolute expiry,
+      enum GNUNET_PEERSTORE_StoreOption options);
 
   /**
    * Iterate over the records given an optional peer id
-   * and/or sub system.
+   * and/or key.
    *
    * @param cls closure (internal context for the plugin)
+   * @param sub_system name of sub system
    * @param peer Peer identity (can be NULL)
-   * @param sub_system name of sub system (can be NULL)
+   * @param key entry key string (can be NULL)
    * @param iter function to call with the result
    * @param iter_cls closure for @a iter
-   * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
+   * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
    */
   int
   (*iterate_records) (void *cls,
-      const struct GNUNET_PeerIdentity *peer,
       const char *sub_system,
-      GNUNET_PEERSTORE_RecordIterator iter, void *iter_cls);
+      const struct GNUNET_PeerIdentity *peer,
+      const char *key,
+      GNUNET_PEERSTORE_Processor iter, void *iter_cls);
+
+  /**
+   * Delete expired records (expiry < now)
+   *
+   * @param cls closure (internal context for the plugin)
+   * @param now time to use as reference
+   * @return number of records deleted
+   */
+  int
+  (*expire_records) (void *cls,
+      struct GNUNET_TIME_Absolute now);
 
 };