X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgnunet_namestore_service.h;h=8466d613507d7f7d5a32e478e792c496b7f05a1a;hb=27c12911f4f2aba2d90099270d70de846e83854f;hp=30098832c607a28530e0104b8ecd60b9d8fb00d5;hpb=3d670727232e79b7e49a1df7ba9260db4e5798a0;p=oweals%2Fgnunet.git diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 30098832c..8466d6135 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h @@ -94,23 +94,6 @@ typedef void (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls, const char *emsg); -/** - * Store an item in the namestore. If the item is already present, - * it is replaced with the new record. - * - * @param h handle to the namestore - * @param block block to store - * @param cont continuation to call when done - * @param cont_cls closure for @a cont - * @return handle to abort the request - */ -struct GNUNET_NAMESTORE_QueueEntry * -GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h, - const struct GNUNET_NAMESTORE_Block *block, - GNUNET_NAMESTORE_ContinuationWithStatus cont, - void *cont_cls); - - /** * Store an item in the namestore. If the item is already present, * it is replaced with the new record. Use an empty array to @@ -118,7 +101,7 @@ GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h, * * @param h handle to the namestore * @param pkey private key of the zone - * @param label name that is being mapped (at most 255 characters long) + * @param label name that is being mapped * @param rd_count number of records in the 'rd' array * @param rd array of records with data to store * @param cont continuation to call when done @@ -130,53 +113,60 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, const char *label, unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, + const struct GNUNET_GNSRECORD_Data *rd, GNUNET_NAMESTORE_ContinuationWithStatus cont, void *cont_cls); + /** * Process a record that was stored in the namestore. * * @param cls closure - * @param block block that was stored in the namestore + * @param zone private key of the zone; NULL on disconnect + * @param label label of the records; NULL on disconnect + * @param rd_count number of entries in @a rd array, 0 if label was deleted + * @param rd array of records with data to store */ -typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls, - const struct GNUNET_NAMESTORE_Block *block); - +typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const char *label, + unsigned int rd_count, + const struct GNUNET_GNSRECORD_Data *rd); /** - * Get a result for a particular key from the namestore. The processor - * will only be called once. + * Set the desired nick name for a zone * * @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 + * @param pkey private key of the zone + * @param nick the nick name to set + * @param cont continuation to call when done + * @param cont_cls closure for 'cont' + * @return handle to abort the request */ struct GNUNET_NAMESTORE_QueueEntry * -GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, - const struct GNUNET_HashCode *derived_hash, - GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls); - +GNUNET_NAMESTORE_set_nick (struct GNUNET_NAMESTORE_Handle *h, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, + const char *nick, + GNUNET_NAMESTORE_ContinuationWithStatus cont, + void *cont_cls); /** - * Process a record that was stored in the namestore. + * Lookup an item in the namestore. * - * @param cls closure - * @param zone private key of the zone; NULL on disconnect - * @param label label of the records; NULL on disconnect - * @param rd_count number of entries in @a rd array, 0 if label was deleted - * @param rd array of records with data to store + * @param h handle to the namestore + * @param pkey private key of the zone + * @param label name that is being mapped + * @param rm function to call with the result (with 0 records if we don't have that label) + * @param rm_cls closure for @a rm + * @return handle to abort the request */ -typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, - const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, - const char *label, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd); +struct GNUNET_NAMESTORE_QueueEntry * +GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, + const char *label, + GNUNET_NAMESTORE_RecordMonitor rm, + void *rm_cls); /** @@ -223,7 +213,7 @@ GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe); * @param zone zone to access, NULL for all zones * @param proc function to call on each name from the zone; it * will be called repeatedly with a value (if available) - * and always once at the end with a name of NULL. + * and always once at the end with a label of NULL. * @param proc_cls closure for @a proc * @return an iterator handle to use for iteration */ @@ -273,15 +263,20 @@ typedef void (*GNUNET_NAMESTORE_RecordsSynchronizedCallback)(void *cls); /** - * Begin monitoring a zone for changes. Will first call the @a monitor function - * on all existing records in the selected zone(s), then calls @a sync_cb, - * and then calls the @a monitor whenever a record changes. If the namestore - * disconnects, the @a monitor function is called with a disconnect event; if - * the connection is re-established, the process begins from the start (all - * existing records, sync, then updates). + * Begin monitoring a zone for changes. Will first call the @a + * monitor function on all existing records in the selected zone(s) if + * @a iterate_first is #GNUNET_YES. In any case, we will then call @a + * sync_cb, and then afterwards call the @a monitor whenever a record + * changes. If the namestore disconnects, the @a monitor function is + * called with a disconnect event; if the connection is + * re-established, the process begins from the start (depending on @a + * iterate_first, we first do all existing records, then @a sync, then + * updates). * * @param cfg configuration to use to connect to namestore - * @param zone zone to monitor + * @param zone zone to monitor, NULL for all zones + * @param iterate_first #GNUNET_YES to first iterate over all existing records, + * #GNUNET_NO to only return changes that happen from now on * @param monitor function to call on zone changes * @param sync_cb function called when we're in sync with the namestore * @param cls closure for @a monitor and @a sync_cb @@ -290,6 +285,7 @@ typedef void (*GNUNET_NAMESTORE_RecordsSynchronizedCallback)(void *cls); struct GNUNET_NAMESTORE_ZoneMonitor * GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + int iterate_first, GNUNET_NAMESTORE_RecordMonitor monitor, GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb, void *cls);