-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 2f4ce3928910beaf267954899d92e6cbd3afcc6a..a7697be1deace8460c00c41f6cba38b348fdf640 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -27,13 +27,21 @@
 
 #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 "+"
-#define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600
 
-#define MAX_DNS_LABEL_LENGTH 63
-#define MAX_DNS_NAME_LENGTH 253
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -43,7 +51,7 @@ 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;
 
@@ -63,9 +71,9 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t only_cached GNUNET_PACKED;
 
   /**
-   * Should we look up in the default zone?
+   * Should we look up in the given zone, instead of the default zone?
    */
-  uint32_t use_default_zone GNUNET_PACKED;
+  uint32_t have_zone GNUNET_PACKED;
 
   /**
    * Is a shorten key attached?
@@ -75,9 +83,12 @@ struct GNUNET_GNS_ClientLookupMessage
   /**
    * the type of record to look up
    */
-  /* enum GNUNET_GNS_RecordType */ uint32_t type;
-
-  /* Followed by the key for shorten (optional) see have_key */
+  /* 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 */
 };
@@ -107,13 +118,14 @@ struct GNUNET_GNS_ClientLookupResultMessage
 
 };
 
+
 /**
  * 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;
 
@@ -152,7 +164,7 @@ 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;
 
@@ -165,13 +177,14 @@ struct GNUNET_GNS_ClientShortenResultMessage
 
 };
 
+
 /**
  * Message from client to GNS service to lookup an authority of a name.
  */
 struct GNUNET_GNS_ClientGetAuthMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH
    */
   struct GNUNET_MessageHeader header;
 
@@ -190,7 +203,7 @@ struct GNUNET_GNS_ClientGetAuthMessage
 struct GNUNET_GNS_ClientGetAuthResultMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH_RESULT
+   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH_RESULT
    */
   struct GNUNET_MessageHeader header;
 
@@ -202,6 +215,7 @@ struct GNUNET_GNS_ClientGetAuthResultMessage
   /* followed by the authority part of the name or '\0' for no result*/
 
 };
+
 GNUNET_NETWORK_STRUCT_END
 
 #endif