towards peerstore iterate

6 files changed, 86 insertions, 18 deletions

diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index ad4d68335..be5394ff5 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -80,6 +80,37 @@ handle_client_disconnect (void *cls,
 }
 
 /**
+ * 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
+ */
+int record_iterator(void *cls,
+    const char *sub_system,
+    const struct GNUNET_PeerIdentity *peer,
+    const char *key,
+    const void *value,
+    size_t size,
+    struct GNUNET_TIME_Absolute expiry)
+{
+  struct GNUNET_SERVER_TransmitContext *tc = cls;
+  struct StoreRecordMessage *srm;
+
+  srm = PEERSTORE_create_record_message(sub_system,
+      peer,
+      key,
+      value,
+      size,
+      expiry,
+      GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE);
+  GNUNET_SERVER_transmit_context_append_message(tc, (const struct GNUNET_MessageHeader *)srm);
+  return GNUNET_YES;
+}
+
+/**
  * Handle an iterate request from client
  *
  * @param cls unused
@@ -90,7 +121,32 @@ void handle_iterate (void *cls,
     struct GNUNET_SERVER_Client *client,
     const struct GNUNET_MessageHeader *message)
 {
+  struct GNUNET_PEERSTORE_Record *record;
+  struct GNUNET_SERVER_TransmitContext *tc;
 
+  record = PEERSTORE_parse_record_message(message);
+  if(NULL == record)
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Malformed iterate request from client\n");
+    GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
+    return;
+  }
+  if(NULL == record->sub_system)
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sub system not supplied in client iterate request\n");
+    GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
+    return;
+  }
+  tc = GNUNET_SERVER_transmit_context_create (client);
+  if(GNUNET_OK == db->iterate_records(db->cls,
+      record->sub_system,
+      record->peer,
+      record->key,
+      &record_iterator,
+      tc))
+  {
+
+  }
 }
 
 /**
@@ -134,7 +190,7 @@ void handle_store (void *cls,
       record->key,
       record->value,
       record->value_size,
-      GNUNET_TIME_relative_to_absolute(record->lifetime)))
+      record->expiry))
   {
     response_type = GNUNET_MESSAGE_TYPE_PEERSTORE_STORE_RESULT_OK;
   }
diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 521c5c11b..7c6e6bdbc 100644
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -71,9 +71,9 @@ struct StoreRecordMessage
   size_t value_size;
 
   /**
-   * Lifetime of entry
+   * Expiry time of entry
    */
-  struct GNUNET_TIME_Relative lifetime;
+  struct GNUNET_TIME_Absolute expiry;
 
 };
 
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 68c171d52..aa798e653 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -194,7 +194,7 @@ GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc)
  * @param key entry key
  * @param value entry value BLOB
  * @param size size of 'value'
- * @param lifetime relative time after which the entry is (possibly) deleted
+ * @param expiry absolute time after which the entry is (possibly) deleted
  * @param cont Continuation function after the store request is processed
  * @param cont_cls Closure for 'cont'
  */
@@ -205,7 +205,7 @@ GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
     const char *key,
     const void *value,
     size_t size,
-    struct GNUNET_TIME_Relative lifetime,
+    struct GNUNET_TIME_Absolute expiry,
     GNUNET_PEERSTORE_Continuation cont,
     void *cont_cls)
 {
@@ -224,7 +224,8 @@ GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
       key,
       value,
       size,
-      lifetime);
+      expiry,
+      GNUNET_MESSAGE_TYPE_PEERSTORE_STORE);
   GNUNET_CLIENT_transmit_and_get_response(h->client,
       (const struct GNUNET_MessageHeader *)srm,
       GNUNET_TIME_UNIT_FOREVER_REL,
@@ -235,5 +236,4 @@ GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
 
 }
 
-
 /* end of peerstore_api.c */
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c
index f8c6862de..6b8b80985 100644
--- a/src/peerstore/peerstore_common.c
+++ b/src/peerstore/peerstore_common.c
@@ -33,7 +33,8 @@
  * @param key record key string (can be NULL)
  * @param value record value BLOB (can be NULL)
  * @param value_size record value size in bytes (set to 0 if value is NULL)
- * @param lifetime relative time after which the record expires
+ * @param expiry absolute time after which the record expires
+ * @param msg_type message type to be set in header
  * @return pointer to record message struct
  */
 struct StoreRecordMessage *
@@ -42,7 +43,8 @@ PEERSTORE_create_record_message(const char *sub_system,
     const char *key,
     const void *value,
     size_t value_size,
-    struct GNUNET_TIME_Relative lifetime)
+    struct GNUNET_TIME_Absolute expiry,
+    uint16_t msg_type)
 {
   struct StoreRecordMessage *srm;
   size_t ss_size;
@@ -61,9 +63,9 @@ PEERSTORE_create_record_message(const char *sub_system,
       value_size;
   srm = GNUNET_malloc(request_size);
   srm->header.size = htons(request_size);
-  srm->header.type = htons(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE);
+  srm->header.type = htons(msg_type);
   srm->key_size = htons(key_size);
-  srm->lifetime = lifetime;
+  srm->expiry = expiry;
   if(NULL == peer)
     srm->peer_set = htons(GNUNET_NO);
   else
@@ -116,7 +118,7 @@ PEERSTORE_parse_record_message(const struct GNUNET_MessageHeader *message)
     record->peer = GNUNET_new(struct GNUNET_PeerIdentity);
     memcpy(record->peer, &srm->peer, sizeof(struct GNUNET_PeerIdentity));
   }
-  record->lifetime = srm->lifetime;
+  record->expiry = srm->expiry;
   dummy = (char *)&srm[1];
   if(ss_size > 0)
   {
diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h
index 93fb9931b..4795edbb1 100644
--- a/src/peerstore/peerstore_common.h
+++ b/src/peerstore/peerstore_common.h
@@ -58,9 +58,9 @@ struct GNUNET_PEERSTORE_Record
   size_t value_size;
 
   /**
-   * Lifetime of record
+   * Expiry time of record
    */
-  struct GNUNET_TIME_Relative lifetime;
+  struct GNUNET_TIME_Absolute expiry;
 
 };
 
@@ -72,7 +72,8 @@ struct GNUNET_PEERSTORE_Record
  * @param key record key string (can be NULL)
  * @param value record value BLOB (can be NULL)
  * @param value_size record value size in bytes (set to 0 if value is NULL)
- * @param lifetime relative time after which the record expires
+ * @param expiry time after which the record expires
+ * @param msg_type message type to be set in header
  * @return pointer to record message struct
  */
 struct StoreRecordMessage *
@@ -81,7 +82,8 @@ PEERSTORE_create_record_message(const char *sub_system,
     const char *key,
     const void *value,
     size_t value_size,
-    struct GNUNET_TIME_Relative lifetime);
+    struct GNUNET_TIME_Absolute expiry,
+    uint16_t msg_type);
 
 /**
  * Parses a message carrying a record
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index c44914f43..c5eabac2d 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -116,7 +116,7 @@ peerstore_sqlite_iterate_records (void *cls,
     const char *sub_system,
     const struct GNUNET_PeerIdentity *peer,
     const char *key,
-    GNUNET_PEERSTORE_RecordIterator iter, void *iter_cls)
+    GNUNET_PEERSTORE_Processor iter, void *iter_cls)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
@@ -127,6 +127,7 @@ peerstore_sqlite_iterate_records (void *cls,
   const char *ret_key;
   const void *ret_value;
   size_t ret_value_size;
+  struct GNUNET_TIME_Absolute ret_expiry;
 
   if(NULL == peer && NULL == key)
   {
@@ -170,8 +171,15 @@ peerstore_sqlite_iterate_records (void *cls,
     ret_key = (const char *)sqlite3_column_text(stmt, 2);
     ret_value = sqlite3_column_blob(stmt, 3);
     ret_value_size = sqlite3_column_bytes(stmt, 3);
+    ret_expiry.abs_value_us = (uint64_t)sqlite3_column_int64(stmt, 4);
     if (NULL != iter)
-      iter (iter_cls, ret_sub_system, ret_peer, ret_key, ret_value, ret_value_size);
+      iter (iter_cls,
+          ret_sub_system,
+          ret_peer,
+          ret_key,
+          ret_value,
+          ret_value_size,
+          ret_expiry);
   }
   if (SQLITE_DONE != sret)
   {