#define GNUNET_NAMESTORE_TYPE_VPN 65539
/**
- * Record type for zone revocation
+ * Record type for delegation to DNS.
*/
-#define GNUNET_NAMESTORE_TYPE_REV 65540
+#define GNUNET_NAMESTORE_TYPE_GNS2DNS 65540
/**
* Record type for a social place.
*/
#define GNUNET_NAMESTORE_TYPE_PLACE 65541
+/**
+ * Record type for a phone (of CONVERSATION).
+ */
+#define GNUNET_NAMESTORE_TYPE_PHONE 65542
+
+
/**
* Entry in the queue.
*/
*/
enum GNUNET_NAMESTORE_RecordFlags
{
-
+
/**
* No special options.
*/
/**
* Signature of the block.
*/
- struct GNUNET_CRYPTO_EccSignature signature;
+ struct GNUNET_CRYPTO_EcdsaSignature signature;
/**
* Derived key used for signing; hash of this is the query.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey derived_key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
/**
* Number of bytes signed; also specifies the number of bytes
* of encrypted data that follow.
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
+
/**
* Expiration time of the block.
*/
/* followed by encrypted data */
};
+
+
GNUNET_NETWORK_STRUCT_END
/**
* Store an item in the namestore. If the item is already present,
- * it is replaced with the new record.
+ * it is replaced with the new record.
*
* @param h handle to the namestore
* @param block block to store
*/
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *pkey,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
const char *label,
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd,
/**
* Get a result for a particular key from the namestore. The processor
- * will only be called once.
+ * will only be called once.
*
* @param h handle to the namestore
* @param derived_hash hash of zone key combined with name to lookup
+ * then at the end once with NULL
* @param proc function to call on the matching block, or with
* NULL if there is no matching block
* @param proc_cls closure for @a proc
* @return a handle that can be used to cancel
*/
struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
+GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
const struct GNUNET_HashCode *derived_hash,
GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls);
* @param rd array of records with data to store
*/
typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
const char *label,
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd);
* cancel
*/
struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
- const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
+GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls);
*/
struct GNUNET_NAMESTORE_ZoneIterator *
GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
GNUNET_NAMESTORE_RecordMonitor proc,
void *proc_cls);
/**
- * Function called once the monitor has caught up with the current
+ * Function called once the monitor has caught up with the current
* state of the database. Will be called AGAIN after each disconnect
* (record monitor called with 'NULL' for zone_key) once we're again
* in sync.
*/
struct GNUNET_NAMESTORE_ZoneMonitor *
GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
GNUNET_NAMESTORE_RecordMonitor monitor,
GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb,
void *cls);
/**
- * Convert the binary value @a data of a record of
+ * Convert the binary value @a data of a record of
* type @a type to a human-readable string.
*
* @param type type of the record
/**
* Convert a type name (i.e. "AAAA") to the corresponding number.
*
- * @param typename name to convert
+ * @param dns_typename name to convert
* @return corresponding number, UINT32_MAX on error
*/
uint32_t
-GNUNET_NAMESTORE_typename_to_number (const char *typename);
+GNUNET_NAMESTORE_typename_to_number (const char *dns_typename);
/**
/**
* Test if a given record is expired.
- *
+ *
* @param rd record to test
* @return #GNUNET_YES if the record is expired,
* #GNUNET_NO if not
* @return string form; will be overwritten by next call to #GNUNET_NAMESTORE_z2s.
*/
const char *
-GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicSignKey *z);
+GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
/**
* Convert public key to the respective absolute domain name in the
- * ".zkey" pTLD.
+ * ".zkey" pTLD.
* This is one of the very few calls in the entire API that is
* NOT reentrant!
- *
- * @param pkey a public key with a point on the eliptic curve
+ *
+ * @param pkey a public key with a point on the eliptic curve
* @return string "X.zkey" where X is the coordinates of the public
* key in an encoding suitable for DNS labels.
*/
const char *
-GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey);
+GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
/**
* Convert an absolute domain name in the ".zkey" pTLD to the
* respective public key.
- *
+ *
* @param zkey string "X.zkey" where X is the public
* key in an encoding suitable for DNS labels.
- * @param pkey set to a public key on the eliptic curve
+ * @param pkey set to a public key on the eliptic curve
* @return #GNUNET_SYSERR if @a zkey has the wrong syntax
*/
int
GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
- struct GNUNET_CRYPTO_EccPublicSignKey *pkey);
+ struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
/**
* Calculate the DHT query for a given @a label in a given @a zone.
- *
+ *
* @param zone private key of the zone
* @param label label of the record
* @param query hash to use for the query
*/
void
-GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
const char *label,
struct GNUNET_HashCode *query);
/**
* Calculate the DHT query for a given @a label in a given @a zone.
- *
+ *
* @param pub public key of the zone
* @param label label of the record
* @param query hash to use for the query
*/
void
-GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pub,
+GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
const char *label,
struct GNUNET_HashCode *query);
* @param rd_count number of records in @a rd
*/
struct GNUNET_NAMESTORE_Block *
-GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
+GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
struct GNUNET_TIME_Absolute expire,
const char *label,
const struct GNUNET_NAMESTORE_RecordData *rd,
* @param label the name for the records
* @param proc function to call with the result
* @param proc_cls closure for @a proc
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was
* not well-formed
*/
int
GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block,
- const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key,
const char *label,
GNUNET_NAMESTORE_RecordCallback proc,
void *proc_cls);
* Compares if two records are equal
*
* @param a a record
- * @param b another record
+ * @param b another record
* @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not.
*/
int
/**
* Returns the expiration time of the given block of records. The block
- * expiration time is the expiration time of the block with smallest
+ * expiration time is the expiration time of the record with smallest
* expiration time.
*
* @param rd_count number of records given in @a rd
- * @param rd array of records
+ * @param rd array of records
* @return absolute expiration time
*/
struct GNUNET_TIME_Absolute
-GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count,
+GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd);
projects / oweals / gnunet.git / blobdiff