From b571e5a4ed7fb2ef6f203c540e82675cf38bfcf8 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 17 Mar 2010 15:41:07 +0000 Subject: [PATCH] crazy work --- src/include/gnunet_dht_service.h | 135 ++++++++++++++++++++----------- 1 file changed, 90 insertions(+), 45 deletions(-) diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index dfb880b4a..cf09fd649 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h @@ -49,11 +49,14 @@ struct GNUNET_DHT_Handle; * * @param cfg configuration to use * @param sched scheduler to use + * @param ht_len size of the internal hash table to use for + * processing multiple GET/FIND requests in parallel * @return NULL on error */ struct GNUNET_DHT_Handle * GNUNET_DHT_connect (struct GNUNET_SCHEDULER_Handle *sched, - const struct GNUNET_CONFIGURATION_Handle *cfg); + const struct GNUNET_CONFIGURATION_Handle *cfg, + unsigned int ht_len); /** @@ -65,6 +68,36 @@ void GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *h); +/** + * Perform a PUT operation on the DHT identified by 'table' storing + * a binding of 'key' to 'value'. The peer does not have to be part + * of the table (if so, we will attempt to locate a peer that is!) + * + * @param h handle to DHT service + * @param key the key to store under + * @param type type of the value + * @param size number of bytes in data; must be less than 64k + * @param data the data to store + * @param exp desired expiration time for the value + * @param timeout when to abort with an error if we fail to get + * a confirmation for the PUT from the local DHT service + * @param cont continuation to call when done; + * reason will be TIMEOUT on error, + * reason will be PREREQ_DONE on success + * @param cont_cls closure for cont + */ +void +GNUNET_DHT_put (struct GNUNET_DHT_Handle *h, + const GNUNET_HashCode * key, + uint32_t type, + uint32_t size, + const char *data, + struct GNUNET_TIME_Absolute exp, + struct GNUNET_TIME_Relative timeout, + GNUNET_SCHEDULER_Task cont, + void *cont_cls); + + /** * Handle to control a GET operation. */ @@ -99,7 +132,7 @@ typedef void (*GNUNET_DHT_Iterator)(void *cls, * @param key the key to look up * @param iter function to call on each result * @param iter_cls closure for iter - * @return handle to stop the async get + * @return handle to stop the async get, NULL on error */ struct GNUNET_DHT_GetHandle * GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *h, @@ -108,69 +141,81 @@ GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *h, GNUNET_DHT_Iterator iter, void *iter_cls); +/** + * Stop async DHT-get. Frees associated resources. + * + * @param get_handle GET operation to stop. + */ +void +GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle); + /** * Iterator called on each result obtained from a FIND_PEER * operation * * @param cls closure - * @param key the key that was searched - * @param data the HELLO of the peer that was returned + * @param peer a peer that was located + * @param reply response generated by the peer (for example, a HELLO); or NULL */ -typedef void (*GNUNET_DHT_PeerIterator)(void *cls, - const GNUNET_HashCode * key, - const void *data); +typedef void (*GNUNET_DHT_ReplyProcessor)(void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_MessageHeader *reply); -/** - * Perform an asynchronous FIND_PEER operation on the DHT. - * - * @param h handle to the DHT service - * @param key the key to look up - * @param iter function to call on each result - * @param iter_cls closure for iter - * - * @return handle to stop the request - */ -struct GNUNET_DHT_GetHandle * -GNUNET_DHT_find_peer_start (struct GNUNET_DHT_Handle *h, - const GNUNET_HashCode * key, - GNUNET_DHT_PeerIterator iter, - void *iter_cls); /** - * Stop async DHT-get. Frees associated resources. - * - * @param record GET operation to stop. + * Options for routing. */ -void -GNUNET_DHT_get_stop (struct GNUNET_DHT_Handle *handle, struct GNUNET_DHT_GetHandle *get_handle); +enum GNUNET_DHT_RouteOption + { + /** + * Default. Do nothing special. + */ + GNUNET_DHT_RO_NONE = 0, + + /** + * Each peer along the way should look at 'enc' (otherwise + * only the k-peers closest to the key should look at it). + */ + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE = 1 + }; /** - * Perform a PUT operation on the DHT identified by 'table' storing - * a binding of 'key' to 'value'. The peer does not have to be part - * of the table (if so, we will attempt to locate a peer that is!) + * Perform an asynchronous FIND_PEER operation on the DHT. * - * @param h handle to DHT service - * @param key the key to store under - * @param type type of the value - * @param size number of bytes in data; must be less than 64k - * @param data the data to store - * @param exp desired expiration time for the value + * @param h handle to the DHT service + * @param key the key to look up + * @param desired_replication_level how many peers should ultimately receive + * this message (advisory only, target may be too high for the + * given DHT or not hit exactly). + * @param options options for routing + * @param enc send the encapsulated message to a peer close to the key + * @param iter function to call on each result, NULL if no replies are expected + * @param iter_cls closure for iter + * @param timeout when to abort with an error if we fail to get + * a confirmation for the PUT from the local DHT service * @param cont continuation to call when done; * reason will be TIMEOUT on error, * reason will be PREREQ_DONE on success * @param cont_cls closure for cont - * + * @return handle to stop the request */ -int GNUNET_DHT_put (struct GNUNET_DHT_Handle *h, - const GNUNET_HashCode * key, - uint32_t type, - uint32_t size, - const char *data, - struct GNUNET_TIME_Relative exp, - GNUNET_SCHEDULER_Task cont, - void *cont_cls); +struct GNUNET_DHT_FindPeerHandle * +GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *h, + const GNUNET_HashCode *key, + unsigned int desired_replication_level, + enum GNUNET_DHT_RouteOption options, + const struct GNUNET_MessageHeader *enc, + struct GNUNET_TIME_Relative timeout, + GNUNET_DHT_ReplyProcessor iter, + void *iter_cls, + struct GNUNET_TIME_Relative timeout, + GNUNET_SCHEDULER_Task cont, + void *cont_cls); + +void +GNUNET_DHT_route_stop (struct GNUNET_DHT_FindPeerHandle *fph); #if 0 /* keep Emacsens' auto-indent happy */ -- 2.25.1