/*
This file is part of GNUnet
- (C) 2012 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
- 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
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
#include "gnunet_gns_service.h"
/**
- * Name of the GADS TLD.
+ * Name of the GNS TLD.
*/
-#define GNUNET_GNS_TLD "gads"
+#define GNUNET_GNS_TLD "gnu"
/**
* Name of the zone key TLD.
/**
* 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;
uint32_t id GNUNET_PACKED;
/**
- * If use_default_zone is empty this zone is used for lookup
+ * Zone that is to be used for lookup
*/
- struct GNUNET_CRYPTO_ShortHashCode 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).
*/
- uint32_t only_cached GNUNET_PACKED;
-
- /**
- * Should we look up in the default zone?
- */
- uint32_t use_default_zone GNUNET_PACKED;
+ int16_t options GNUNET_PACKED;
/**
* Is a shorten key attached?
*/
- uint32_t have_key GNUNET_PACKED;
+ int16_t have_key GNUNET_PACKED;
/**
* the type of record to look up
*/
- /* enum GNUNET_GNS_RecordType */ uint32_t type;
-
- /* Followed by the key for shorten (optional) see have_key */
-
- /* Followed by the name to look up */
-};
-
+ int32_t type GNUNET_PACKED;
-/**
- * Message from GNS service to client: new results.
- */
-struct GNUNET_GNS_ClientLookupResultMessage
-{
/**
- * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT
+ * The key for shorten, if @e have_key is set
*/
- struct GNUNET_MessageHeader header;
-
- /**
- * Unique identifier for this request (for key collisions).
- */
- uint32_t id GNUNET_PACKED;
-
- /**
- * The number of records contained in response
- */
- uint32_t rd_count;
-
- /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
+ struct GNUNET_CRYPTO_EcdsaPrivateKey shorten_key;
+ /* Followed by the zero-terminated name to look up */
};
/**
- * Message from client to GNS service to shorten names.
+ * Message from client to GNS service to lookup records.
*/
-struct GNUNET_GNS_ClientShortenMessage
+struct ReverseLookupMessage
{
/**
- * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN
+ * Header of type #GNUNET_MESSAGE_TYPE_GNS_REVERSE_LOOKUP
*/
struct GNUNET_MessageHeader header;
/**
- * Unique identifier for this request
+ * Unique identifier for this request (for key collisions).
*/
uint32_t id GNUNET_PACKED;
/**
- * If use_default_zone is empty this zone is used for lookup
- */
- struct GNUNET_CRYPTO_ShortHashCode zone;
-
- /**
- * Shorten zone
- */
- struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
-
- /**
- * Private zone
+ * Zone that is target for reverse lookup
*/
- struct GNUNET_CRYPTO_ShortHashCode private_zone;
-
+ struct GNUNET_CRYPTO_EcdsaPublicKey zone_pkey;
+
/**
- * Should we look up in the default zone?
+ * Root zone
*/
- uint32_t use_default_zone GNUNET_PACKED;
-
- /* Followed by the name to shorten up */
+ struct GNUNET_CRYPTO_EcdsaPublicKey root_pkey;
};
-
/**
- * Message from GNS service to client: shorten result.
+ * Message from GNS service to client: new results.
*/
-struct GNUNET_GNS_ClientShortenResultMessage
+struct LookupResultMessage
{
/**
- * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_SHORTEN_RESULT
+ * Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT
*/
struct GNUNET_MessageHeader header;
*/
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
+ * The number of records contained in response
*/
- struct GNUNET_MessageHeader header;
+ uint32_t rd_count GNUNET_PACKED;
- /**
- * Unique identifier for this request
- */
- uint32_t id GNUNET_PACKED;
+ /* followed by rd_count GNUNET_GNSRECORD_Data structs*/
- /* Followed by the name to get authority for */
};
-
/**
- * Message from GNS service to client: authority result.
+ * Message from GNS service to client: new results.
*/
-struct GNUNET_GNS_ClientGetAuthResultMessage
+struct ReverseLookupResultMessage
{
/**
- * Header of type GNUNET_MESSAGE_TYPE_GNS_CLIENT_GET_AUTH_RESULT
+ * Header of type #GNUNET_MESSAGE_TYPE_GNS_REVERSE_LOOKUP_RESULT
*/
struct GNUNET_MessageHeader header;
*/
uint32_t id GNUNET_PACKED;
- /* followed by the authority part of the name or '\0' for no result*/
-
+ /* followed by the resulting name of the reverse lookup */
};
+
GNUNET_NETWORK_STRUCT_END
#endif