-fixes

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index df964939a93324f9b465360b9027108818e23df2..5950c460bd70378eaee2dd3b9635b9064351ca56 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -28,6 +28,13 @@
 #ifndef GNS_H
 #define GNS_H
 
+#define GNUNET_GNS_TLD "gnunet"
+#define GNUNET_GNS_TLD_ZKEY "zkey"
+#define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600
+
+#define MAX_DNS_LABEL_LENGTH 63
+#define MAX_DNS_NAME_LENGTH 253
+
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
@@ -40,15 +47,10 @@ struct GNUNET_GNS_ClientLookupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /**
-   * A key. TODO some uid
-   */
-  GNUNET_HashCode key;
-
   /**
    * Unique identifier for this request (for key collisions).
    */
-  uint64_t unique_id GNUNET_PACKED;
+  uint32_t id GNUNET_PACKED;
 
   /**
    * the type of record to look up
@@ -73,14 +75,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 +88,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,15 +98,9 @@ struct GNUNET_GNS_ClientShortenMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * A key. TODO some uid
-   */
-  GNUNET_HashCode key;
-
-  /**
-   * Unique identifier for this request (for key collisions).
+   * Unique identifier for this request
    */
-  // FIXME: unaligned
-  uint64_t unique_id GNUNET_PACKED;
+  uint32_t id GNUNET_PACKED;
 
   /* Followed by the name to shorten up */
 };
@@ -130,16 +119,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