- big shorten algorithm rewrite

- API change for lookup
- tests fixed
- introduces 3 zone system: root, private and shortened

1 files changed, 6 insertions, 19 deletions

diff --git a/src/gns/gns.h b/src/gns/gns.h
index 686729dd7..e34d0a086 100644
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -63,25 +63,22 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t use_default_zone GNUNET_PACKED;
 
   /**
-   * If use_default_zone is empty this zone is used for lookup
+   * Is a shorten key attached?
    */
-  struct GNUNET_CRYPTO_ShortHashCode zone;
+  uint32_t have_key GNUNET_PACKED;
 
   /**
-   * Should we use a shorten zone?
-   */
-  uint32_t use_shorten_zone 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 */
 };
 
@@ -136,16 +133,6 @@ struct GNUNET_GNS_ClientShortenMessage
    */
   struct GNUNET_CRYPTO_ShortHashCode zone;
   
-  /**
-   * Should we use a shorten zone?
-   */
-  uint32_t use_shorten_zone GNUNET_PACKED;
-
-  /**
-   * If use_shorten_zone is set use this zone for shortening
-   */
-  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
-  
   /* Followed by the name to shorten up */
 };