-not sure I see how this test can work, disabling for now

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index b2f4cc98dad2229790ac5533903ff4ce551f4ae6..9e7a155753ba838f13de3200a2f70373ffa98f5e 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -1,10 +1,10 @@
 /*
       This file is part of GNUnet
-      (C) 2012 Christian Grothoff (and other contributing authors)
+      (C) 2012-2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2, or (at your
+      by the Free Software Foundation; either version 3, or (at your
       option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
@@ -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,23 @@
 #ifndef GNS_H
 #define GNS_H
 
-#define GNUNET_GNS_TLD "gnunet"
-#define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600
+#include "gnunet_gns_service.h"
+
+/**
+ * Name of the GNS TLD.
+ */
+#define GNUNET_GNS_TLD "gnu"
+
+/**
+ * Name of the zone key TLD.
+ */
+#define GNUNET_GNS_TLD_ZKEY "zkey"
+
+/**
+ * TLD name used to indicate relative names.
+ */
+#define GNUNET_GNS_TLD_PLUS "+"
+
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -39,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;
 
@@ -49,66 +61,41 @@ struct GNUNET_GNS_ClientLookupMessage
   uint32_t id GNUNET_PACKED;
 
   /**
-   * the type of record to look up
+   * Zone that is to be used for lookup
    */
-  // FIXME: bad type - should be of GNUNET_GNS_RecordType
-  enum GNUNET_GNS_RecordType type;
+  struct GNUNET_CRYPTO_EccPublicSignKey zone;
 
-  /* Followed by the name to look up */
-};
-
-
-/**
- * Message from GNS service to client: new results.
- */
-struct GNUNET_GNS_ClientLookupResultMessage
-{
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT
+   * Only check cached results
    */
-  struct GNUNET_MessageHeader header;
+  int16_t only_cached GNUNET_PACKED;
 
   /**
-   * Unique identifier for this request (for key collisions).
+   * Is a shorten key attached?
    */
-  uint32_t id GNUNET_PACKED;
+  int16_t have_key GNUNET_PACKED;
 
   /**
-   * The number of records contained in response
-   */  
-  uint32_t rd_count;
-
-  // FIXME: what format has a GNS_Record?
-  /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
-
-};
-
-/**
- * Message from client to GNS service to shorten names.
- */
-struct GNUNET_GNS_ClientShortenMessage
-{
-  /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN
+   * the type of record to look up
    */
-  struct GNUNET_MessageHeader header;
-
+  int32_t type;
+  
   /**
-   * Unique identifier for this request
+   * The key for shorten, if 'have_key' is set 
    */
-  uint32_t id GNUNET_PACKED;
+  struct GNUNET_CRYPTO_EccPrivateKey shorten_key;
 
-  /* Followed by the name to shorten up */
+  /* Followed by the name to look up */
 };
 
 
 /**
- * Message from GNS service to client: shorten result.
+ * Message from GNS service to client: new results.
  */
-struct GNUNET_GNS_ClientShortenResultMessage
+struct GNUNET_GNS_ClientLookupResultMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN_RESULT
+    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT
    */
   struct GNUNET_MessageHeader header;
 
@@ -117,47 +104,16 @@ struct GNUNET_GNS_ClientShortenResultMessage
    */
   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
-{
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH
-   */
-  struct GNUNET_MessageHeader header;
+   * The number of records contained in response
+   */  
+  uint32_t rd_count;
 
-  /**
-   * Unique identifier for this request
-   */
-  uint32_t id GNUNET_PACKED;
+  /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
 
-  /* 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
 
 #endif