-licenses, dce, etc

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index 80ebb128877be554fc4f3f0e3d5f12d68ee62188..2f4ce3928910beaf267954899d92e6cbd3afcc6a 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,8 +25,11 @@
 #ifndef GNS_H
 #define GNS_H
 
-#define GNUNET_GNS_TLD "gnunet"
+#include "gnunet_gns_service.h"
+
+#define GNUNET_GNS_TLD "gads"
 #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
@@ -53,29 +53,31 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t id GNUNET_PACKED;
 
   /**
-   * Should we look up in the default zone?
+   * If use_default_zone is empty this zone is used for lookup
    */
-  uint32_t use_default_zone GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
   /**
-   * If use_default_zone is empty this zone is used for lookup
+   * Only check cached results
    */
-  struct GNUNET_CRYPTO_ShortHashCode zone;
+  uint32_t only_cached GNUNET_PACKED;
 
   /**
-   * Should we use a shorten zone?
+   * Should we look up in the default zone?
    */
-  uint32_t use_shorten_zone GNUNET_PACKED;
+  uint32_t use_default_zone GNUNET_PACKED;
 
   /**
-   * If use_shorten_zone is set use this zone for shortening
+   * Is a shorten key attached?
    */
-  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+  uint32_t have_key GNUNET_PACKED;
 
   /**
    * the type of record to look up
    */
-  enum GNUNET_GNS_RecordType type;
+  /* enum GNUNET_GNS_RecordType */ uint32_t type;
+
+  /* Followed by the key for shorten (optional) see have_key */
 
   /* Followed by the name to look up */
 };
@@ -101,7 +103,6 @@ struct GNUNET_GNS_ClientLookupResultMessage
    */  
   uint32_t rd_count;
 
-  // FIXME: what format has a GNS_Record?
   /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
 
 };
@@ -122,24 +123,24 @@ struct GNUNET_GNS_ClientShortenMessage
   uint32_t id GNUNET_PACKED;
 
   /**
-   * Should we look up in the default zone?
+   * If use_default_zone is empty this zone is used for lookup
    */
-  uint32_t use_default_zone GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
   /**
-   * If use_default_zone is empty this zone is used for lookup
+   * Shorten zone
    */
-  struct GNUNET_CRYPTO_ShortHashCode zone;
-  
+  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+
   /**
-   * Should we use a shorten zone?
+   * Private zone
    */
-  uint32_t use_shorten_zone GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode private_zone;
 
   /**
-   * If use_shorten_zone is set use this zone for shortening
+   * Should we look up in the default zone?
    */
-  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+  uint32_t use_default_zone GNUNET_PACKED;
   
   /* Followed by the name to shorten up */
 };