refactoring datastore API to use MQ API, also fixing misc. bugs in new mysql backend

1 files changed, 27 insertions, 6 deletions

diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index 5767ae6a0..dc3d9d1f2 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -106,12 +106,10 @@ struct ReleaseReserveMessage
  * Message to the datastore service asking about specific
  * content.
  */
-struct GetMessage
+struct GetKeyMessage
 {
   /**
-   * Type is GNUNET_MESSAGE_TYPE_DATASTORE_GET.  Size
-   * can either be "sizeof(struct GetMessage)" or
-   * "sizeof(struct GetMessage) - sizeof(struct GNUNET_HashCode)"!
+   * Type is #GNUNET_MESSAGE_TYPE_DATASTORE_GET_KEY.
    */
   struct GNUNET_MessageHeader header;
 
@@ -126,8 +124,7 @@ struct GetMessage
   uint64_t offset GNUNET_PACKED;
 
   /**
-   * Desired key (optional).  Check the "size" of the
-   * header to see if the key is actually present.
+   * Desired key.
    */
   struct GNUNET_HashCode key;
 
@@ -135,6 +132,30 @@ struct GetMessage
 
 
 /**
+ * Message to the datastore service asking about specific
+ * content.
+ */
+struct GetMessage
+{
+  /**
+   * Type is #GNUNET_MESSAGE_TYPE_DATASTORE_GET.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Desired content type.  (actually an enum GNUNET_BLOCK_Type)
+   */
+  uint32_t type GNUNET_PACKED;
+
+  /**
+   * Offset of the result.
+   */
+  uint64_t offset GNUNET_PACKED;
+
+};
+
+
+/**
  * Message to the datastore service asking about zero
  * anonymity content.
  */