X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fnamestore.h;h=ec7f2870401b8a78acc83b483c03d7d1d4a0a29b;hb=90c803401e6dbe336c6469ff874b0005e7a2f163;hp=14a13801a6d8f6f62c08598efc34db201bbe3121;hpb=88c500a043b51a228bd1c513948115dfb0e182d9;p=oweals%2Fgnunet.git diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 14a13801a..ec7f28704 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 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,422 +14,352 @@ 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 namestore/namestore.h * @brief common internal definitions for namestore service * @author Matthias Wachs + * @author Christian Grothoff */ #ifndef NAMESTORE_H #define NAMESTORE_H -/* - * Collect message types here, move to protocols later +/** + * Maximum length of any name, including 0-termination. */ -#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME 431 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE 432 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT 433 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE 434 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE 435 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE 436 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE 437 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE 438 - -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START 439 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 440 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 441 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 442 - -size_t -GNUNET_NAMESTORE_records_serialize (char ** dest, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd); - -int -GNUNET_NAMESTORE_records_deserialize ( struct GNUNET_NAMESTORE_RecordData **dest, char *src, size_t len); - -void -GNUNET_NAMESTORE_records_free (unsigned int rd_count, struct GNUNET_NAMESTORE_RecordData *rd); +#define MAX_NAME_LEN 256 + +GNUNET_NETWORK_STRUCT_BEGIN /** - * A GNS record serialized for network transmission. - * layout is [struct GNUNET_NAMESTORE_NetworkRecord][char[data_size] data] + * Generic namestore message with op id */ -struct GNUNET_NAMESTORE_NetworkRecord +struct GNUNET_NAMESTORE_Header { /** - * Expiration time for the DNS record. + * header.type will be GNUNET_MESSAGE_TYPE_NAMESTORE_* + * header.size will be message size */ - struct GNUNET_TIME_AbsoluteNBO expiration; + struct GNUNET_MessageHeader header; /** - * Number of bytes in 'data'. + * Request ID in NBO */ - uint32_t data_size; + uint32_t r_id GNUNET_PACKED; +}; + +/** + * Store a record to the namestore (as authority). + */ +struct RecordStoreMessage +{ /** - * Type of the GNS/DNS record. + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE */ - uint32_t record_type; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Flags for the record. + * Expiration time */ - uint32_t flags; -}; + struct GNUNET_TIME_AbsoluteNBO expire; + /** + * Name length + */ + uint16_t name_len GNUNET_PACKED; + + /** + * Length of serialized record data + */ + uint16_t rd_len GNUNET_PACKED; + /** + * Number of records contained + */ + uint16_t rd_count GNUNET_PACKED; -GNUNET_NETWORK_STRUCT_BEGIN -/** - * Connect to namestore service - */ -struct StartMessage -{ + /** + * always zero (for alignment) + */ + uint16_t reserved GNUNET_PACKED; /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_START + * The private key of the authority. */ - struct GNUNET_MessageHeader header; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; + /* followed by: + * name with length name_len + * serialized record data with rd_count records + */ }; -GNUNET_NETWORK_STRUCT_END -GNUNET_NETWORK_STRUCT_BEGIN /** - * Generic namestore message with op id + * Response to a record storage request. */ -struct GenericMessage +struct RecordStoreResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_* + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * #GNUNET_SYSERR on failure, #GNUNET_OK on success */ - uint32_t op_id; + int32_t op_result GNUNET_PACKED; }; -GNUNET_NETWORK_STRUCT_END /** - * Connect to namestore service + * Lookup a label */ -GNUNET_NETWORK_STRUCT_BEGIN -struct LookupNameMessage +struct LabelLookupMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * Length of the name */ - uint32_t op_id; - - /* The zone */ - GNUNET_HashCode zone; + uint32_t label_len GNUNET_PACKED; - /* Requested record type */ - uint32_t record_type; + /** + * The private key of the zone to look up in + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - /* Requested record type */ - uint32_t name_len; + /* followed by: + * name with length name_len + */ }; -GNUNET_NETWORK_STRUCT_END /** - * Lookup response - * Memory layout: - * [struct LookupNameResponseMessage][struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData][struct GNUNET_CRYPTO_RsaSignature] + * Lookup a label */ -GNUNET_NETWORK_STRUCT_BEGIN -struct LookupNameResponseMessage +struct LabelLookupResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * Name length */ - uint32_t op_id; + uint16_t name_len GNUNET_PACKED; - struct GNUNET_TIME_AbsoluteNBO expire; + /** + * Length of serialized record data + */ + uint16_t rd_len GNUNET_PACKED; + + /** + * Number of records contained + */ + uint16_t rd_count GNUNET_PACKED; - uint16_t name_len; + /** + * Was the label found in the database?? + * GNUNET_YES or GNUNET_NO + */ + uint16_t found GNUNET_PACKED; - uint16_t contains_sig; + /** + * The private key of the authority. + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; - /* Requested record type */ - uint32_t rd_len; + /* followed by: + * name with length name_len + * serialized record data with rd_count records + */ }; -GNUNET_NETWORK_STRUCT_END + /** - * Put a record to the namestore - * Memory layout: - * [struct RecordPutMessage][struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData] + * Lookup a name for a zone hash */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordPutMessage +struct ZoneToNameMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_RECORD_PUT + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * The private key of the zone to look up in */ - uint32_t op_id; - - /* Contenct starts here */ - - /* name length */ - uint16_t name_len; - - /* Length of serialized rd data */ - uint16_t rd_len; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - struct GNUNET_TIME_AbsoluteNBO expire; - - struct GNUNET_CRYPTO_RsaSignature signature; + /** + * The public key of the target zone + */ + struct GNUNET_CRYPTO_EcdsaPublicKey value_zone; }; -GNUNET_NETWORK_STRUCT_END + /** - * Put a record to the namestore response + * Respone for zone to name lookup */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordPutResponseMessage +struct ZoneToNameResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * Length of the name */ - uint32_t op_id; - - /* Contenct starts here */ + uint16_t name_len GNUNET_PACKED; /** - * name length: GNUNET_NO (0) on error, GNUNET_OK (1) on success + * Length of serialized record data */ - uint16_t op_result; -}; -GNUNET_NETWORK_STRUCT_END + uint16_t rd_len GNUNET_PACKED; - -/** - * Put a record to the namestore - * Memory layout: - * [struct RecordPutMessage][struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData] - */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordCreateMessage -{ /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE + * Number of records contained */ - struct GNUNET_MessageHeader header; + uint16_t rd_count GNUNET_PACKED; /** - * Operation ID in NBO + * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no + * results, #GNUNET_SYSERR on error */ - uint32_t op_id; + int16_t res GNUNET_PACKED; - /* Contenct starts here */ + /** + * The private key of the zone that contained the name. + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - /* name length */ - uint16_t name_len; + /* followed by: + * name with length name_len + * serialized record data with rd_count records + */ - struct GNUNET_CRYPTO_RsaSignature signature; }; -GNUNET_NETWORK_STRUCT_END /** - * Create a record to the namestore response - * Memory layout: + * Record is returned from the namestore (as authority). */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordCreateResponseMessage +struct RecordResultMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * Name length */ - uint32_t op_id; - - /* Contenct starts here */ + uint16_t name_len GNUNET_PACKED; /** - * name length: GNUNET_NO (0) on error, GNUNET_OK (1) on success + * Length of serialized record data */ - uint16_t op_result; -}; -GNUNET_NETWORK_STRUCT_END + uint16_t rd_len GNUNET_PACKED; -/** - * Remove a record from the namestore - * Memory layout: - * [struct RecordRemoveMessage][char *name][struct GNUNET_NAMESTORE_RecordData] - */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordRemoveMessage -{ /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE + * Number of records contained */ - struct GNUNET_MessageHeader header; + uint16_t rd_count GNUNET_PACKED; /** - * Operation ID in NBO + * always zero (for alignment) */ - uint32_t op_id; - - /* Contenct starts here */ + uint16_t reserved GNUNET_PACKED; - /* name length */ - uint16_t name_len; + /** + * The private key of the authority. + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; - struct GNUNET_CRYPTO_RsaSignature signature; + /* followed by: + * name with length name_len + * serialized record data with rd_count records + */ }; -GNUNET_NETWORK_STRUCT_END /** - * Remove a record from the namestore response + * Start monitoring a zone. */ -GNUNET_NETWORK_STRUCT_BEGIN -struct RecordRemoveResponseMessage +struct ZoneMonitorStartMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START */ struct GNUNET_MessageHeader header; /** - * Operation ID in NBO + * #GNUNET_YES to first iterate over all records, + * #GNUNET_NO to only monitor changes.o */ - uint32_t op_id; - - /* Contenct starts here */ + uint32_t iterate_first GNUNET_PACKED; /** - * name length: GNUNET_NO (0) on error, GNUNET_OK (1) on success + * Zone key. */ - uint16_t op_result; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; + }; -GNUNET_NETWORK_STRUCT_END /** * Start a zone iteration for the given zone */ -GNUNET_NETWORK_STRUCT_BEGIN struct ZoneIterationStartMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START */ - struct GNUNET_MessageHeader header; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Operation ID in NBO + * Zone key. All zeros for "all zones". */ - uint32_t op_id; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - /* Contenct starts here */ - - uint16_t must_have_flags; - uint16_t must_not_have_flags; - - GNUNET_HashCode zone; }; -GNUNET_NETWORK_STRUCT_END + /** * Ask for next result of zone iteration for the given operation */ -GNUNET_NETWORK_STRUCT_BEGIN struct ZoneIterationNextMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT - */ - struct GNUNET_MessageHeader header; - - /** - * Operation ID in NBO + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT */ - uint32_t op_id; + struct GNUNET_NAMESTORE_Header gns_header; }; -GNUNET_NETWORK_STRUCT_END /** * Stop zone iteration for the given operation */ -GNUNET_NETWORK_STRUCT_BEGIN struct ZoneIterationStopMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP - */ - struct GNUNET_MessageHeader header; - - /** - * Operation ID in NBO + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP */ - uint32_t op_id; + struct GNUNET_NAMESTORE_Header gns_header; }; -GNUNET_NETWORK_STRUCT_END -/** - * Ask for next result of zone iteration for the given operation - */ -GNUNET_NETWORK_STRUCT_BEGIN -struct ZoneIterationResponseMessage -{ - /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE - */ - struct GNUNET_MessageHeader header; - - /** - * Operation ID in NBO - */ - uint32_t op_id; - - struct GNUNET_TIME_AbsoluteNBO expire; - uint16_t name_len; - - uint16_t contains_sig; - - /* Record data length */ - uint16_t rd_len; - -}; GNUNET_NETWORK_STRUCT_END