-getting rid of duplication of record type values / enum GNUNET_GNS_RecordType

[oweals/gnunet.git] / src / gns / gns.h

diff --git a/src/gns/gns.h b/src/gns/gns.h
index df964939a93324f9b465360b9027108818e23df2..a7697be1deace8460c00c41f6cba38b348fdf640 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -17,9 +17,6 @@
       Free Software Foundation, Inc., 59 Temple Place - Suite 330,
       Boston, MA 02111-1307, USA.
  */
-
-#include "gnunet_gns_service.h"
-
 /**
  * @file gns/gns.h
  * @brief IPC messages between GNS API and GNS service
@@ -28,6 +25,24 @@
 #ifndef GNS_H
 #define GNS_H
 
+#include "gnunet_gns_service.h"
+
+/**
+ * Name of the GADS TLD.
+ */
+#define GNUNET_GNS_TLD "gads"
+
+/**
+ * Name of the zone key TLD.
+ */
+#define GNUNET_GNS_TLD_ZKEY "zkey"
+
+/**
+ * TLD name used to indicate relative names.
+ */
+#define GNUNET_GNS_TLD_PLUS "+"
+
+
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
@@ -36,25 +51,44 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct GNUNET_GNS_ClientLookupMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * A key. TODO some uid
+   * Unique identifier for this request (for key collisions).
    */
-  GNUNET_HashCode key;
+  uint32_t id GNUNET_PACKED;
 
   /**
-   * Unique identifier for this request (for key collisions).
+   * If use_default_zone is empty this zone is used for lookup
    */
-  uint64_t unique_id GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
+
+  /**
+   * Only check cached results
+   */
+  uint32_t only_cached GNUNET_PACKED;
+
+  /**
+   * Should we look up in the given zone, instead of the default zone?
+   */
+  uint32_t have_zone GNUNET_PACKED;
+
+  /**
+   * Is a shorten key attached?
+   */
+  uint32_t have_key GNUNET_PACKED;
 
   /**
    * the type of record to look up
    */
-  // FIXME: bad type - should be of GNUNET_GNS_RecordType
-  enum GNUNET_GNS_RecordType type;
+  /* int */ uint32_t type;
+  
+  /**
+   * The key for shorten, if 'have_key' is set 
+   */
+  struct GNUNET_CRYPTO_EccPrivateKey shorten_key;
 
   /* Followed by the name to look up */
 };
@@ -73,46 +107,53 @@ struct GNUNET_GNS_ClientLookupResultMessage
   /**
    * Unique identifier for this request (for key collisions).
    */
-  // FIXME: unaligned
-  uint64_t unique_id;
-
-  /**
-   * A key. TODO some uid
-   * // FIXME: why hash?
-   */
-  GNUNET_HashCode key;
+  uint32_t id GNUNET_PACKED;
 
   /**
    * The number of records contained in response
    */  
   uint32_t rd_count;
 
-  // FIXME: what format has a GNS_Record?
   /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
 
 };
 
+
 /**
- * Message from client to GNS service to lookup records.
+ * Message from client to GNS service to shorten names.
  */
 struct GNUNET_GNS_ClientShortenMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * A key. TODO some uid
+   * Unique identifier for this request
    */
-  GNUNET_HashCode key;
+  uint32_t id GNUNET_PACKED;
 
   /**
-   * Unique identifier for this request (for key collisions).
+   * If use_default_zone is empty this zone is used for lookup
+   */
+  struct GNUNET_CRYPTO_ShortHashCode zone;
+
+  /**
+   * Shorten zone
+   */
+  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+
+  /**
+   * Private zone
    */
-  // FIXME: unaligned
-  uint64_t unique_id GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode private_zone;
 
+  /**
+   * Should we look up in the default zone?
+   */
+  uint32_t use_default_zone GNUNET_PACKED;
+  
   /* Followed by the name to shorten up */
 };
 
@@ -123,25 +164,58 @@ struct GNUNET_GNS_ClientShortenMessage
 struct GNUNET_GNS_ClientShortenResultMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN_RESULT
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN_RESULT
    */
   struct GNUNET_MessageHeader header;
 
   /**
    * Unique identifier for this request (for key collisions).
    */
-  // FIXME: unaligned
-  uint64_t unique_id GNUNET_PACKED;
+  uint32_t id GNUNET_PACKED;
+
+  /* followed by the shortened name or '\0' for no result*/
 
+};
+
+
+/**
+ * Message from client to GNS service to lookup an authority of a name.
+ */
+struct GNUNET_GNS_ClientGetAuthMessage
+{
   /**
-   * A key. TODO some uid
-   * // FIXME: why hash?
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH
    */
-  GNUNET_HashCode key;
+  struct GNUNET_MessageHeader header;
 
-  /* followed by the shortened name or '\0' for no result*/
+  /**
+   * Unique identifier for this request
+   */
+  uint32_t id GNUNET_PACKED;
 
+  /* Followed by the name to get authority for */
 };
+
+
+/**
+ * Message from GNS service to client: authority result.
+ */
+struct GNUNET_GNS_ClientGetAuthResultMessage
+{
+  /**
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH_RESULT
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Unique identifier for this request (for key collisions).
+   */
+  uint32_t id GNUNET_PACKED;
+
+  /* followed by the authority part of the name or '\0' for no result*/
+
+};
+
 GNUNET_NETWORK_STRUCT_END
 
 #endif