X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fnamestore.h;h=ec7f2870401b8a78acc83b483c03d7d1d4a0a29b;hb=90c803401e6dbe336c6469ff874b0005e7a2f163;hp=ca712e136b89e8f0eab6b87cd4a3fc8e64a1b02b;hpb=5e05019536c0d38bf20f965613636f21ae7c2be6;p=oweals%2Fgnunet.git diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index ca712e136..ec7f28704 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2011-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2011-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 @@ -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 - 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. */ /** @@ -48,142 +48,135 @@ struct GNUNET_NAMESTORE_Header /** * Request ID in NBO */ - uint32_t r_id; + uint32_t r_id GNUNET_PACKED; }; /** - * Lookup a block in the namestore + * Store a record to the namestore (as authority). */ -struct LookupBlockMessage +struct RecordStoreMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE */ struct GNUNET_NAMESTORE_Header gns_header; /** - * The query. + * Expiration time */ - struct GNUNET_HashCode query; - -}; + struct GNUNET_TIME_AbsoluteNBO expire; + /** + * Name length + */ + uint16_t name_len GNUNET_PACKED; -/** - * Lookup response - */ -struct LookupBlockResponseMessage -{ /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE + * Length of serialized record data */ - struct GNUNET_NAMESTORE_Header gns_header; + uint16_t rd_len GNUNET_PACKED; /** - * Expiration time + * Number of records contained */ - struct GNUNET_TIME_AbsoluteNBO expire; + uint16_t rd_count GNUNET_PACKED; /** - * Signature. + * always zero (for alignment) */ - struct GNUNET_CRYPTO_EccSignature signature; + uint16_t reserved GNUNET_PACKED; /** - * Derived public key. + * The private key of the authority. */ - struct GNUNET_CRYPTO_EccPublicKey derived_key; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; - /* follwed by encrypted block data */ + /* followed by: + * name with length name_len + * serialized record data with rd_count records + */ }; /** - * Cache a record in the namestore. + * Response to a record storage request. */ -struct BlockCacheMessage +struct RecordStoreResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE */ struct GNUNET_NAMESTORE_Header gns_header; /** - * Expiration time - */ - struct GNUNET_TIME_AbsoluteNBO expire; - - /** - * Signature. + * #GNUNET_SYSERR on failure, #GNUNET_OK on success */ - struct GNUNET_CRYPTO_EccSignature signature; - - /** - * Derived public key. - */ - struct GNUNET_CRYPTO_EccPublicKey derived_key; - - /* follwed by encrypted block data */ + int32_t op_result GNUNET_PACKED; }; /** - * Response to a request to cache a block. + * Lookup a label */ -struct BlockCacheResponseMessage +struct LabelLookupMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP */ struct GNUNET_NAMESTORE_Header gns_header; /** - * name length: GNUNET_NO already exists, GNUNET_YES on success, GNUNET_SYSERR error + * Length of the name + */ + uint32_t label_len GNUNET_PACKED; + + /** + * The private key of the zone to look up in + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; + + /* followed by: + * name with length name_len */ - int32_t op_result; }; /** - * Store a record to the namestore (as authority). + * Lookup a label */ -struct RecordStoreMessage +struct LabelLookupResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_RECORD_STORE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE */ struct GNUNET_NAMESTORE_Header gns_header; - /** - * Expiration time - */ - struct GNUNET_TIME_AbsoluteNBO expire; - /** * Name length */ - uint16_t name_len; + uint16_t name_len GNUNET_PACKED; /** * Length of serialized record data */ - uint16_t rd_len; + uint16_t rd_len GNUNET_PACKED; /** - * Number of records contained + * Number of records contained */ - uint16_t rd_count; + uint16_t rd_count GNUNET_PACKED; /** - * always zero (for alignment) + * Was the label found in the database?? + * GNUNET_YES or GNUNET_NO */ - uint16_t reserved; + uint16_t found GNUNET_PACKED; /** * The private key of the authority. */ - struct GNUNET_CRYPTO_EccPrivateKey private_key; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; /* followed by: * name with length name_len @@ -192,25 +185,6 @@ struct RecordStoreMessage }; -/** - * Response to a record storage request. - */ -struct RecordStoreResponseMessage -{ - /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE - */ - struct GNUNET_NAMESTORE_Header gns_header; - - /** - * result: - * GNUNET_SYSERR on failure - * GNUNET_OK on success - */ - int32_t op_result; -}; - - /** * Lookup a name for a zone hash @@ -218,19 +192,19 @@ struct RecordStoreResponseMessage struct ZoneToNameMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME */ struct GNUNET_NAMESTORE_Header gns_header; /** - * The private key of the zone to look up in + * The private key of the zone to look up in */ - struct GNUNET_CRYPTO_EccPrivateKey zone; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; /** - * The public key of the target zone + * The public key of the target zone */ - struct GNUNET_CRYPTO_EccPublicKey value_zone; + struct GNUNET_CRYPTO_EcdsaPublicKey value_zone; }; @@ -240,35 +214,35 @@ struct ZoneToNameMessage struct ZoneToNameResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE */ struct GNUNET_NAMESTORE_Header gns_header; /** * Length of the name */ - uint16_t name_len; + uint16_t name_len GNUNET_PACKED; /** * Length of serialized record data */ - uint16_t rd_len; + uint16_t rd_len GNUNET_PACKED; /** * Number of records contained */ - uint16_t rd_count; + uint16_t rd_count GNUNET_PACKED; /** - * result in NBO: GNUNET_OK on success, GNUNET_NO if there were no - * results, GNUNET_SYSERR on error + * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no + * results, #GNUNET_SYSERR on error */ - int16_t res; + int16_t res GNUNET_PACKED; /** * The private key of the zone that contained the name. */ - struct GNUNET_CRYPTO_EccPrivateKey zone; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; /* followed by: * name with length name_len @@ -284,34 +258,34 @@ struct ZoneToNameResponseMessage struct RecordResultMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT */ struct GNUNET_NAMESTORE_Header gns_header; /** * Name length */ - uint16_t name_len; + uint16_t name_len GNUNET_PACKED; /** * Length of serialized record data */ - uint16_t rd_len; + uint16_t rd_len GNUNET_PACKED; /** - * Number of records contained + * Number of records contained */ - uint16_t rd_count; + uint16_t rd_count GNUNET_PACKED; /** * always zero (for alignment) */ - uint16_t reserved; + uint16_t reserved GNUNET_PACKED; /** * The private key of the authority. */ - struct GNUNET_CRYPTO_EccPrivateKey private_key; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; /* followed by: * name with length name_len @@ -326,14 +300,20 @@ struct RecordResultMessage struct ZoneMonitorStartMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START */ - struct GNUNET_NAMESTORE_Header gns_header; + struct GNUNET_MessageHeader header; + + /** + * #GNUNET_YES to first iterate over all records, + * #GNUNET_NO to only monitor changes.o + */ + uint32_t iterate_first GNUNET_PACKED; /** * Zone key. */ - struct GNUNET_CRYPTO_EccPrivateKey zone; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; }; @@ -344,14 +324,14 @@ struct ZoneMonitorStartMessage struct ZoneIterationStartMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START */ struct GNUNET_NAMESTORE_Header gns_header; /** - * Zone key. + * Zone key. All zeros for "all zones". */ - struct GNUNET_CRYPTO_EccPrivateKey zone; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; }; @@ -362,7 +342,7 @@ struct ZoneIterationStartMessage struct ZoneIterationNextMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT */ struct GNUNET_NAMESTORE_Header gns_header; }; @@ -374,7 +354,7 @@ struct ZoneIterationNextMessage struct ZoneIterationStopMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP */ struct GNUNET_NAMESTORE_Header gns_header; };