-fix 2447

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index 80ebb128877be554fc4f3f0e3d5f12d68ee62188..49bfd9093143ab200f0c1ec5de0fcfddb081cb4b 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -30,6 +30,7 @@
 
 #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
@@ -53,30 +54,32 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t id GNUNET_PACKED;
 
   /**
-   * Should we look up in the default zone?
+   * Only check cached results
    */
-  uint32_t use_default_zone GNUNET_PACKED;
+  uint32_t only_cached GNUNET_PACKED;
 
   /**
-   * If use_default_zone is empty this zone is used for lookup
+   * Should we look up in the default zone?
    */
-  struct GNUNET_CRYPTO_ShortHashCode zone;
+  uint32_t use_default_zone GNUNET_PACKED;
 
   /**
-   * Should we use a shorten zone?
+   * Is a shorten key attached?
    */
-  uint32_t use_shorten_zone GNUNET_PACKED;
+  uint32_t have_key GNUNET_PACKED;
 
   /**
-   * If use_shorten_zone is set use this zone for shortening
+   * If use_default_zone is empty this zone is used for lookup
    */
-  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
   /**
    * the type of record to look up
    */
   enum GNUNET_GNS_RecordType type;
 
+  /* Followed by the key for shorten (optional) see have_key */
+
   /* Followed by the name to look up */
 };
 
@@ -130,16 +133,16 @@ struct GNUNET_GNS_ClientShortenMessage
    * If use_default_zone is empty this zone is used for lookup
    */
   struct GNUNET_CRYPTO_ShortHashCode zone;
-  
+
   /**
-   * Should we use a shorten zone?
+   * Shorten zone
    */
-  uint32_t use_shorten_zone GNUNET_PACKED;
+  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
 
   /**
-   * If use_shorten_zone is set use this zone for shortening
+   * Private zone
    */
-  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+  struct GNUNET_CRYPTO_ShortHashCode private_zone;
   
   /* Followed by the name to shorten up */
 };