X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fnamestore.h;h=ec7f2870401b8a78acc83b483c03d7d1d4a0a29b;hb=90c803401e6dbe336c6469ff874b0005e7a2f163;hp=17229ab2486483effe332195a879fcc3e487229c;hpb=2bcbb0d6b305eaf3419314a4ea8e23c8ad89902f;p=oweals%2Fgnunet.git diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 17229ab24..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,449 +14,324 @@ 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 - */ -#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_TO_NAME 439 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE 440 - -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START 445 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 446 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 447 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448 -#define GNUNET_MESSAGE_TYPE_NAMESTORE_DISCONNECT 449 - /** - * Sign name and records - * - * @param key the private key - * @param name the name - * @param rd record data - * @param rd_count number of records - * - * @return the signature + * Maximum length of any name, including 0-termination. */ -struct GNUNET_CRYPTO_RsaSignature * -GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int rd_count); - -/** - * Compares if two records are equal - * - * @param a record - * @param b record - * - * @return GNUNET_YES or GNUNET_NO - */ -int -GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a, - const struct GNUNET_NAMESTORE_RecordData *b); +#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. - */ - struct GNUNET_TIME_AbsoluteNBO expiration; - - /** - * Number of bytes in 'data'. - */ - uint32_t data_size; - - /** - * Type of the GNS/DNS record. + * header.type will be GNUNET_MESSAGE_TYPE_NAMESTORE_* + * header.size will be message size */ - uint32_t record_type; + struct GNUNET_MessageHeader header; /** - * Flags for the record. + * Request ID in NBO */ - uint32_t flags; + uint32_t r_id GNUNET_PACKED; }; - /** - * Connect to namestore service. FIXME: UNNECESSARY. + * Store a record to the namestore (as authority). */ -struct StartMessage +struct RecordStoreMessage { - /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_START + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE */ - struct GNUNET_MessageHeader header; - -}; + struct GNUNET_NAMESTORE_Header gns_header; -/** - * Connect to namestore service. FIXME: UNNECESSARY. - */ -struct DisconnectMessage -{ + /** + * Expiration time + */ + struct GNUNET_TIME_AbsoluteNBO expire; /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_DISCONNECT + * Name length */ - struct GNUNET_MessageHeader header; + uint16_t name_len GNUNET_PACKED; /** - * Drop namestore? - * GNUNET_YES or _NO in NBO + * Length of serialized record data */ - uint32_t drop; -}; + uint16_t rd_len GNUNET_PACKED; + /** + * Number of records contained + */ + uint16_t rd_count GNUNET_PACKED; -/** - * Generic namestore message with op id - */ -struct GNUNET_NAMESTORE_Header -{ /** - * header.type will be GNUNET_MESSAGE_TYPE_NAMESTORE_* - * header.size will be message size + * always zero (for alignment) */ - struct GNUNET_MessageHeader header; + uint16_t reserved GNUNET_PACKED; /** - * Request ID in NBO + * The private key of the authority. + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; + + /* followed by: + * name with length name_len + * serialized record data with rd_count records */ - uint32_t r_id; }; /** - * Connect to namestore service + * Response to a record storage request. */ -struct LookupNameMessage +struct RecordStoreResponseMessage { - struct GNUNET_NAMESTORE_Header gns_header; - /** - * The zone + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE */ - GNUNET_HashCode zone; - - /** - * Requested record type - */ - uint32_t record_type; + struct GNUNET_NAMESTORE_Header gns_header; /** - * Length of the name + * #GNUNET_SYSERR on failure, #GNUNET_OK on success */ - uint32_t name_len; - - /* 0-terminated name here */ + int32_t op_result GNUNET_PACKED; }; /** - * Lookup response - * Memory layout: - * [struct LookupNameResponseMessage][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData] + * Lookup a label */ -struct LookupNameResponseMessage +struct LabelLookupMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP */ struct GNUNET_NAMESTORE_Header gns_header; - struct GNUNET_TIME_AbsoluteNBO expire; - - uint16_t name_len; - - uint16_t rd_len; - - uint16_t rd_count; - - int16_t contains_sig; - /** - * All zeros if 'contains_sig' is GNUNET_NO. + * Length of the name */ - struct GNUNET_CRYPTO_RsaSignature signature; + uint32_t label_len GNUNET_PACKED; /** - * + * The private key of the zone to look up in */ - struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - /* 0-terminated name and serialized record data */ + /* followed by: + * name with length name_len + */ }; /** - * Put a record to the namestore - * Memory layout: - * [struct RecordPutMessage][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData] + * Lookup a label */ -struct RecordPutMessage +struct LabelLookupResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_RECORD_PUT + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE */ struct GNUNET_NAMESTORE_Header gns_header; /** - * + * Name length */ - struct GNUNET_TIME_AbsoluteNBO expire; + uint16_t name_len GNUNET_PACKED; /** - * name length + * Length of serialized record data */ - uint16_t name_len; + uint16_t rd_len GNUNET_PACKED; /** - * Length of serialized rd data + * Number of records contained */ - uint16_t rd_len; + uint16_t rd_count GNUNET_PACKED; /** - * Number of records contained + * Was the label found in the database?? + * GNUNET_YES or GNUNET_NO */ - uint16_t rd_count; + uint16_t found GNUNET_PACKED; /** - * always zero (for alignment) + * The private key of the authority. */ - uint16_t reserved; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; - /** - * + /* followed by: + * name with length name_len + * serialized record data with rd_count records */ - struct GNUNET_CRYPTO_RsaSignature signature; - - /** - * - */ - struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key; - - /* name (0-terminated) followed by "rd_count" serialized records */ - }; + /** - * Put a record to the namestore response + * Lookup a name for a zone hash */ -struct RecordPutResponseMessage +struct ZoneToNameMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME */ struct GNUNET_NAMESTORE_Header gns_header; /** - * name length: GNUNET_NO (0) on error, GNUNET_OK (1) on success + * The private key of the zone to look up in */ - int32_t op_result; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; + + /** + * The public key of the target zone + */ + struct GNUNET_CRYPTO_EcdsaPublicKey value_zone; }; /** - * Create a record and put it to the namestore - * Memory layout: - * [struct RecordCreateMessage][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData] + * Respone for zone to name lookup */ -struct RecordCreateMessage +struct ZoneToNameResponseMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE */ struct GNUNET_NAMESTORE_Header gns_header; - struct GNUNET_TIME_AbsoluteNBO expire; - /** - * name length + * Length of the name */ - uint16_t name_len; + uint16_t name_len GNUNET_PACKED; /** - * Record data length + * Length of serialized record data */ - uint16_t rd_len; + uint16_t rd_len GNUNET_PACKED; /** - * Record count + * Number of records contained */ - uint16_t rd_count; + uint16_t rd_count GNUNET_PACKED; /** - * private key length + * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no + * results, #GNUNET_SYSERR on error */ - uint16_t pkey_len; - - /* followed by: name and serialized record data --- PK??? */ -}; - + int16_t res GNUNET_PACKED; -/** - * Create a record to the namestore response - * Memory layout: - */ -struct RecordCreateResponseMessage -{ /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE + * The private key of the zone that contained the name. */ - struct GNUNET_NAMESTORE_Header gns_header; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; - /** - * name length: GNUNET_NO already exists, GNUNET_YES on success, GNUNET_SYSERR error + /* followed by: + * name with length name_len + * serialized record data with rd_count records */ - int32_t op_result; }; /** - * Remove a record from the namestore - * Memory layout: - * [struct RecordRemoveMessage][char *name][struct GNUNET_NAMESTORE_RecordData] + * Record is returned from the namestore (as authority). */ -struct RecordRemoveMessage +struct RecordResultMessage { /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT */ struct GNUNET_NAMESTORE_Header gns_header; /** - * Name length + * Name length */ - uint16_t name_len; + uint16_t name_len GNUNET_PACKED; /** - * Length of serialized rd data + * 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; /** - * Length of pubkey + * always zero (for alignment) */ - uint16_t key_len; -}; + uint16_t reserved GNUNET_PACKED; - -/** - * Remove a record from the namestore response - */ -struct RecordRemoveResponseMessage -{ /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE + * The private key of the authority. */ - struct GNUNET_NAMESTORE_Header gns_header; + struct GNUNET_CRYPTO_EcdsaPrivateKey private_key; - /** - * result: - * 0 : successful - * 1 : no records for entry - * 2 : Could not find record to remove - * 3 : Failed to create new signature - * 4 : Failed to put new set of records in database + /* followed by: + * name with length name_len + * serialized record data with rd_count records */ - int32_t op_result; }; /** - * Connect to namestore service + * Start monitoring a zone. */ -struct ZoneToNameMessage +struct ZoneMonitorStartMessage { - struct GNUNET_NAMESTORE_Header gns_header; - /** - * The hash of public key of the zone to look up in + * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START */ - GNUNET_HashCode zone; + struct GNUNET_MessageHeader header; /** - * The hash of the public key of the target zone + * #GNUNET_YES to first iterate over all records, + * #GNUNET_NO to only monitor changes.o */ - GNUNET_HashCode value_zone; -}; - -/** - * Connect to namestore service - */ -struct ZoneToNameResponseMessage -{ - struct GNUNET_NAMESTORE_Header gns_header; - - struct GNUNET_TIME_AbsoluteNBO expire; - - uint16_t name_len; - - uint16_t rd_len; - - uint16_t rd_count; - - /* result in NBO: GNUNET_OK on success, GNUNET_NO if there were no results, GNUNET_SYSERR on error */ - int16_t res; + uint32_t iterate_first GNUNET_PACKED; /** - * + * Zone key. */ - struct GNUNET_CRYPTO_RsaSignature signature; - - struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key; + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; }; - /** * Start a zone iteration for the given zone */ 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; - GNUNET_HashCode zone; - - uint16_t must_have_flags; - - uint16_t must_not_have_flags; + /** + * Zone key. All zeros for "all zones". + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey zone; }; @@ -467,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; }; @@ -479,53 +354,12 @@ 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; }; -/** - * Next result of zone iteration for the given operation - * // FIXME: use 'struct LookupResponseMessage' instead? (identical except - * for having 'contains_sig' instead of 'reserved', but fully compatible otherwise). - */ -struct ZoneIterationResponseMessage -{ - /** - * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE - */ - struct GNUNET_NAMESTORE_Header gns_header; - struct GNUNET_TIME_AbsoluteNBO expire; - - uint16_t name_len; - - /* Record data length */ - uint16_t rd_len; - - /** - * Number of records contained - */ - uint16_t rd_count; - - /** - * always zero (for alignment) - */ - uint16_t reserved; - - /** - * All zeros if 'contains_sig' is GNUNET_NO. - */ - struct GNUNET_CRYPTO_RsaSignature signature; - - /** - * - */ - struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key; - - - -}; GNUNET_NETWORK_STRUCT_END