-fix 2447

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index df964939a93324f9b465360b9027108818e23df2..49bfd9093143ab200f0c1ec5de0fcfddb081cb4b 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -28,6 +28,14 @@
 #ifndef GNS_H
 #define GNS_H
 
+#define GNUNET_GNS_TLD "gnunet"
+#define GNUNET_GNS_TLD_ZKEY "zkey"
+#define GNUNET_GNS_TLD_PLUS "+"
+#define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600
+
+#define MAX_DNS_LABEL_LENGTH 63
+#define MAX_DNS_NAME_LENGTH 253
+
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
@@ -41,21 +49,37 @@ struct GNUNET_GNS_ClientLookupMessage
   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).
+   * Only check cached results
+   */
+  uint32_t only_cached GNUNET_PACKED;
+
+  /**
+   * Should we look up in the default zone?
    */
-  uint64_t unique_id GNUNET_PACKED;
+  uint32_t use_default_zone GNUNET_PACKED;
+
+  /**
+   * Is a shorten key attached?
+   */
+  uint32_t have_key GNUNET_PACKED;
+
+  /**
+   * If use_default_zone is empty this zone is used for lookup
+   */
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
   /**
    * the type of record to look up
    */
-  // FIXME: bad type - should be of GNUNET_GNS_RecordType
   enum GNUNET_GNS_RecordType type;
 
+  /* Followed by the key for shorten (optional) see have_key */
+
   /* Followed by the name to look up */
 };
 
@@ -73,14 +97,7 @@ 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
@@ -93,7 +110,7 @@ struct GNUNET_GNS_ClientLookupResultMessage
 };
 
 /**
- * Message from client to GNS service to lookup records.
+ * Message from client to GNS service to shorten names.
  */
 struct GNUNET_GNS_ClientShortenMessage
 {
@@ -103,16 +120,30 @@ struct GNUNET_GNS_ClientShortenMessage
   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).
+   * Should we look up in the default zone?
    */
-  // FIXME: unaligned
-  uint64_t unique_id GNUNET_PACKED;
+  uint32_t use_default_zone GNUNET_PACKED;
 
+  /**
+   * 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
+   */
+  struct GNUNET_CRYPTO_ShortHashCode private_zone;
+  
   /* Followed by the name to shorten up */
 };
 
@@ -130,16 +161,47 @@ struct GNUNET_GNS_ClientShortenResultMessage
   /**
    * 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