-fixes

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index b7f0f306a5a1f0b9b28aca4ba1e8a3e8f32ac532..5950c460bd70378eaee2dd3b9635b9064351ca56 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -18,6 +18,8 @@
       Boston, MA 02111-1307, USA.
  */
 
+#include "gnunet_gns_service.h"
+
 /**
  * @file gns/gns.h
  * @brief IPC messages between GNS API and GNS service
@@ -26,8 +28,14 @@
 #ifndef GNS_H
 #define GNS_H
 
-GNUNET_NETWORK_STRUCT_BEGIN
+#define GNUNET_GNS_TLD "gnunet"
+#define GNUNET_GNS_TLD_ZKEY "zkey"
+#define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600
 
+#define MAX_DNS_LABEL_LENGTH 63
+#define MAX_DNS_NAME_LENGTH 253
+
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Message from client to GNS service to lookup records.
@@ -40,65 +48,120 @@ struct GNUNET_GNS_ClientLookupMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * A key. TODO some uid
+   * Unique identifier for this request (for key collisions).
+   */
+  uint32_t id GNUNET_PACKED;
+
+  /**
+   * the type of record to look up
+   */
+  // FIXME: bad type - should be of GNUNET_GNS_RecordType
+  enum GNUNET_GNS_RecordType type;
+
+  /* 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
    */
-  GNUNET_HashCode key;
+  struct GNUNET_MessageHeader header;
 
   /**
    * Unique identifier for this request (for key collisions).
    */
-  // FIXME: unaligned
-  uint64_t unique_id;
+  uint32_t id GNUNET_PACKED;
 
   /**
-   * the type of record to look up
+   * 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
    */
-  // FIXME: bad type
-  int type;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * Length of name to lookup
-   * // FIXME: redundant
+   * Unique identifier for this request
    */
-  uint32_t namelen;
+  uint32_t id GNUNET_PACKED;
 
-  /* Followed by the name to look up */
+  /* Followed by the name to shorten up */
 };
 
 
 /**
- * Message from GNS service to client: new results.
+ * Message from GNS service to client: shorten result.
  */
-struct GNUNET_GNS_ClientResultMessage
+struct GNUNET_GNS_ClientShortenResultMessage
 {
   /**
-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT
+    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN_RESULT
    */
   struct GNUNET_MessageHeader header;
 
   /**
    * Unique identifier for this request (for key collisions).
    */
-  // FIXME: unaligned
-  uint64_t unique_id;
+  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
+{
   /**
-   * A key. TODO some uid
-   * // FIXME: why hash?
+    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH
    */
-  GNUNET_HashCode key;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * The number of records contained in response
-   */  
-  uint32_t num_records;
-
-  // FIXME: what format has a GNS_Record?
-  /* followed by num_records GNUNET_GNS_Records*/
+   * Unique identifier for this request
+   */
+  uint32_t id GNUNET_PACKED;
 
+  /* 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