Merge remote-tracking branch 'origin/master' into credentials

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

diff --git a/src/gns/gns.h b/src/gns/gns.h
index c8d27b673767ecb609cecbb0d24bcd1b93b50a5c..d77bf53c6aed09e31e73034859826f4145e5d96c 100644 (file)
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -1,10 +1,10 @@
 /*
       This file is part of GNUnet
 /*
       This file is part of GNUnet

-      (C) 2012-2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2012-2013 GNUnet e.V.

 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
 
       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
       option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but


@@ -14,8 +14,8 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the

-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.

  */
 /**
  * @file gns/gns.h
  */
 /**
  * @file gns/gns.h


@@ -48,10 +48,10 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Message from client to GNS service to lookup records.
  */
 /**
  * Message from client to GNS service to lookup records.
  */

-struct GNUNET_GNS_ClientLookupMessage
+struct LookupMessage

 {
   /**
 {
   /**

-   * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP
+   * Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP

    */
   struct GNUNET_MessageHeader header;
 
    */
   struct GNUNET_MessageHeader header;
 


@@ -63,39 +63,35 @@ struct GNUNET_GNS_ClientLookupMessage
   /**
    * Zone that is to be used for lookup
    */
   /**
    * Zone that is to be used for lookup
    */

-  struct GNUNET_CRYPTO_EccPublicKey zone;
+  struct GNUNET_CRYPTO_EcdsaPublicKey zone;

 
   /**
 
   /**

-   * Only check cached results
+   * Local options for where to look for results
+   * (an `enum GNUNET_GNS_LocalOptions` in NBO).

    */
    */

-  int16_t only_cached GNUNET_PACKED;
+  int16_t options GNUNET_PACKED;

 
   /**
 
   /**

-   * Is a shorten key attached?
+   * Always 0.

    */
    */

-  int16_t have_key GNUNET_PACKED;
+  int16_t reserved GNUNET_PACKED;

 
   /**
    * the type of record to look up
    */
 
   /**
    * the type of record to look up
    */

-  int32_t type;
-  
-  /**
-   * The key for shorten, if 'have_key' is set 
-   */
-  struct GNUNET_CRYPTO_EccPrivateKey shorten_key;
+  int32_t type GNUNET_PACKED;

 
 

-  /* Followed by the name to look up */
+  /* Followed by the zero-terminated name to look up */

 };
 
 
 /**
  * Message from GNS service to client: new results.
  */
 };
 
 
 /**
  * Message from GNS service to client: new results.
  */

-struct GNUNET_GNS_ClientLookupResultMessage
+struct LookupResultMessage

 {
   /**
 {
   /**

-    * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT
+    * Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT

    */
   struct GNUNET_MessageHeader header;
 
    */
   struct GNUNET_MessageHeader header;
 


@@ -106,10 +102,10 @@ struct GNUNET_GNS_ClientLookupResultMessage
 
   /**
    * The number of records contained in response
 
   /**
    * The number of records contained in response

-   */  
-  uint32_t rd_count;
+   */
+  uint32_t rd_count GNUNET_PACKED;

 
 

-  /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
+  /* followed by rd_count GNUNET_GNSRECORD_Data structs*/

 
 };
 
 
 };