DHT PUT integration into FS

4 files changed, 48 insertions, 10 deletions

diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 15119f445..d05cab2b6 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -58,7 +58,8 @@ enum GNUNET_BLOCK_Type
     GNUNET_BLOCK_TYPE_FS_IBLOCK = 2,
 
     /**
-     * Type of a block representing a keyword search result.
+     * Type of a block representing a keyword search result.  Note that
+     * the values for KBLOCK, SBLOCK and NBLOCK must be consecutive.
      */
     GNUNET_BLOCK_TYPE_FS_KBLOCK = 3,
 
@@ -68,15 +69,15 @@ enum GNUNET_BLOCK_Type
     GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,
 
     /**
-     * Type of a block representing a block to be encoded on demand from disk.
-     * Should never appear on the network directly.
+     * Type of a block that is used to advertise a namespace.  
      */
-    GNUNET_BLOCK_TYPE_FS_ONDEMAND = 5,
+    GNUNET_BLOCK_TYPE_FS_NBLOCK = 5,
 
     /**
-     * Type of a block that is used to advertise a namespace.  
+     * Type of a block representing a block to be encoded on demand from disk.
+     * Should never appear on the network directly.
      */
-    GNUNET_BLOCK_TYPE_FS_NBLOCK = 6,
+    GNUNET_BLOCK_TYPE_FS_ONDEMAND = 6,
 
     /**
      * Type of a block that contains a HELLO for a peer (for
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index c41d21058..8d35f7900 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -355,6 +355,33 @@ GNUNET_DATASTORE_get_random (struct GNUNET_DATASTORE_Handle *h,
 
 
 /**
+ * Get a zero-anonymity value from the datastore.
+ *
+ * @param h handle to the datastore
+ * @param queue_priority ranking of this request in the priority queue
+ * @param max_queue_size at what queue size should this request be dropped
+ *        (if other requests of higher priority are in the queue)
+ * @param timeout how long to wait at most for a response
+ * @param type allowed type for the operation
+ * @param iter function to call on a random value; it
+ *        will be called once with a value (if available)
+ *        and always once with a value of NULL.
+ * @param iter_cls closure for iter
+ * @return NULL if the entry was not queued, otherwise a handle that can be used to
+ *         cancel; note that even if NULL is returned, the callback will be invoked
+ *         (or rather, will already have been invoked)
+ */
+struct GNUNET_DATASTORE_QueueEntry *
+GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
+                                     unsigned int queue_priority,
+                                     unsigned int max_queue_size,
+                                     struct GNUNET_TIME_Relative timeout,
+                                     enum GNUNET_BLOCK_Type type,
+                                     GNUNET_DATASTORE_Iterator iter, 
+                                     void *iter_cls);
+
+
+/**
  * Cancel a datastore operation.  The final callback from the
  * operation must not have been done yet.
  * 
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 9ad4cc809..b3bf2b84b 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -41,6 +41,11 @@ extern "C"
 
 
 /**
+ * FIXME: document.
+ */
+#define GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
+
+/**
  * K-value that must be used for the bloom filter 'GET'
  * queries.
  */
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 3de18f8d1..bf696c743 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -434,27 +434,32 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DATASTORE_GET_RANDOM 98
 
 /**
+ * Message sent by datastore client to get random data.
+ */
+#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_ZERO_ANONYMITY 99
+
+/**
  * Message sent by datastore to client providing requested data
  * (in response to GET or GET_RANDOM request).
  */
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 99
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 100
 
 /**
  * Message sent by datastore to client signaling end of matching data.
  * This message will also be sent for "GET_RANDOM", even though
  * "GET_RANDOM" returns at most one data item.
  */
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 100
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 101
 
 /**
  * Message sent by datastore client to remove data.
  */
-#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 101
+#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 102
 
 /**
  * Message sent by datastore client to drop the database.
  */
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 102
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 103
 
 
 /**