X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Fdht_api.c;h=0905486d12cb508ffc3b4e02743b06e1a5f3dfa3;hb=64d3e46cfb99a711e500fa1f114e7c44bdf10040;hp=83736fb7abe45cfb3bc476a4680813ebe45fdad7;hpb=e3cfaa841943326b1527afcc9dacf263fcf77f73;p=oweals%2Fgnunet.git diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 83736fb7a..0905486d1 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009, 2010 Christian Grothoff (and other contributing authors) + (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -23,49 +23,53 @@ * @brief library to access the DHT service * @author Christian Grothoff * @author Nathan Evans - * - * TODO: retransmission of pending requests maybe happens now, at least - * the code is in place to do so. Need to add checks when api calls - * happen to check if retransmission is in progress, and if so set - * the single pending message for transmission once the list of - * retries are done. */ #include "platform.h" -#include "gnunet_bandwidth_lib.h" -#include "gnunet_client_lib.h" +#include "gnunet_util_lib.h" #include "gnunet_constants.h" -#include "gnunet_container_lib.h" #include "gnunet_arm_service.h" #include "gnunet_hello_lib.h" #include "gnunet_protocols.h" -#include "gnunet_server_lib.h" -#include "gnunet_time_lib.h" #include "gnunet_dht_service.h" #include "dht.h" -#define DEBUG_DHT_API GNUNET_NO +#define LOG(kind,...) GNUNET_log_from (kind, "dht-api",__VA_ARGS__) +/** + * Entry in our list of messages to be (re-)transmitted. + */ struct PendingMessage { /** - * Message that is pending + * This is a doubly-linked list. + */ + struct PendingMessage *prev; + + /** + * This is a doubly-linked list. */ - struct GNUNET_MessageHeader *msg; + struct PendingMessage *next; /** - * Timeout for this message + * Message that is pending, allocated at the end + * of this struct. */ - struct GNUNET_TIME_Relative timeout; + const struct GNUNET_MessageHeader *msg; /** - * Continuation to call on message send - * or message receipt confirmation + * Handle to the DHT API context. + */ + struct GNUNET_DHT_Handle *handle; + + /** + * Continuation to call when the request has been + * transmitted (for the first time) to the service; can be NULL. */ GNUNET_SCHEDULER_Task cont; /** - * Continuation closure + * Closure for 'cont'. */ void *cont_cls; @@ -74,69 +78,82 @@ struct PendingMessage */ uint64_t unique_id; -}; - -struct PendingMessageList -{ /** - * This is a singly linked list. + * Free the saved message once sent, set to GNUNET_YES for messages + * that do not receive responses; GNUNET_NO if this pending message + * is aliased from a 'struct GNUNET_DHT_RouteHandle' and will be freed + * from there. */ - struct PendingMessageList *next; + int free_on_send; /** - * The pending message. + * GNUNET_YES if this message is in our pending queue right now. */ - struct PendingMessage *message; + int in_pending_queue; + }; -struct GNUNET_DHT_GetContext + +/** + * Handle to a PUT request. + */ +struct GNUNET_DHT_PutHandle { /** - * Iterator to call on data receipt + * Kept in a DLL. */ - GNUNET_DHT_GetIterator iter; + struct GNUNET_DHT_PutHandle *next; /** - * Closure for the iterator callback + * Kept in a DLL. */ - void *iter_cls; + struct GNUNET_DHT_PutHandle *prev; -}; - -struct GNUNET_DHT_FindPeerContext -{ /** - * Iterator to call on data receipt + * Continuation to call when done. */ - GNUNET_DHT_FindPeerProcessor proc; + GNUNET_DHT_PutContinuation cont; /** - * Closure for the iterator callback + * Pending message associated with this PUT operation, + * NULL after the message has been transmitted to the service. */ - void *proc_cls; + struct PendingMessage *pending; -}; + /** + * Main handle to this DHT api + */ + struct GNUNET_DHT_Handle *dht_handle; -/** - * Handle to a route request - */ -struct GNUNET_DHT_RouteHandle -{ + /** + * Closure for 'cont'. + */ + void *cont_cls; /** - * Unique identifier for this request (for key collisions) + * Timeout task for this operation. */ - uint64_t uid; + GNUNET_SCHEDULER_TaskIdentifier timeout_task; /** - * Key that this get request is for + * Unique ID for the PUT operation. */ - GNUNET_HashCode key; + uint64_t unique_id; + +}; + + + +/** + * Handle to a GET request + */ +struct GNUNET_DHT_GetHandle +{ /** * Iterator to call on data receipt */ - GNUNET_DHT_ReplyProcessor iter; + GNUNET_DHT_GetIterator iter; /** * Closure for the iterator callback @@ -153,62 +170,71 @@ struct GNUNET_DHT_RouteHandle * used for retransmitting requests on service * failure/reconnect. Freed on route_stop. */ - struct GNUNET_DHT_RouteMessage *message; + struct PendingMessage *message; + + /** + * Key that this get request is for + */ + struct GNUNET_HashCode key; + + /** + * Unique identifier for this request (for key collisions). + */ + uint64_t unique_id; + }; /** - * Handle to control a get operation. + * Handle to a monitoring request. */ -struct GNUNET_DHT_GetHandle +struct GNUNET_DHT_MonitorHandle { /** - * Handle to the actual route operation for the get + * DLL. */ - struct GNUNET_DHT_RouteHandle *route_handle; + struct GNUNET_DHT_MonitorHandle *next; /** - * The context of the get request + * DLL. */ - struct GNUNET_DHT_GetContext get_context; -}; + struct GNUNET_DHT_MonitorHandle *prev; + + /** + * Main handle to this DHT api. + */ + struct GNUNET_DHT_Handle *dht_handle; + /** + * Type of block looked for. + */ + enum GNUNET_BLOCK_Type type; -/** - * Handle to control a find peer operation. - */ -struct GNUNET_DHT_FindPeerHandle -{ /** - * Handle to the actual route operation for the request - */ - struct GNUNET_DHT_RouteHandle *route_handle; - - /** - * The context of the find peer request - */ - struct GNUNET_DHT_FindPeerContext find_peer_context; -}; + * Key being looked for, NULL == all. + */ + struct GNUNET_HashCode *key; + /** + * Callback for each received message of type get. + */ + GNUNET_DHT_MonitorGetCB get_cb; -enum DHT_Retransmit_Stage -{ /** - * The API is not retransmitting anything at this time. + * Callback for each received message of type get response. */ - DHT_NOT_RETRANSMITTING, + GNUNET_DHT_MonitorGetRespCB get_resp_cb; /** - * The API is retransmitting, and nothing has been single - * queued for sending. + * Callback for each received message of type put. */ - DHT_RETRANSMITTING, + GNUNET_DHT_MonitorPutCB put_cb; /** - * The API is retransmitting, and a single message has been - * queued for transmission once finished. + * Closure for cb. */ - DHT_RETRANSMITTING_MESSAGE_QUEUED + void *cb_cls; + }; @@ -217,10 +243,6 @@ enum DHT_Retransmit_Stage */ struct GNUNET_DHT_Handle { - /** - * Our scheduler. - */ - struct GNUNET_SCHEDULER_Handle *sched; /** * Configuration to use. @@ -233,411 +255,645 @@ struct GNUNET_DHT_Handle struct GNUNET_CLIENT_Connection *client; /** - * Currently pending transmission request. + * Currently pending transmission request (or NULL). */ struct GNUNET_CLIENT_TransmitHandle *th; /** - * Message we are currently sending, only allow - * a single message to be queued. If not unique - * (typically a put request), await a confirmation - * from the service that the message was received. - * If unique, just fire and forget. + * Head of linked list of messages we would like to transmit. */ - struct PendingMessage *current; + struct PendingMessage *pending_head; /** - * Hash map containing the current outstanding unique requests + * Tail of linked list of messages we would like to transmit. */ - struct GNUNET_CONTAINER_MultiHashMap *outstanding_requests; + struct PendingMessage *pending_tail; /** - * Generator for unique ids. + * Head of linked list of messages we would like to monitor. */ - uint64_t uid_gen; + struct GNUNET_DHT_MonitorHandle *monitor_head; /** - * Are we currently retransmitting requests? If so queue a _single_ - * new request when received. + * Tail of linked list of messages we would like to monitor. */ - enum DHT_Retransmit_Stage retransmit_stage; + struct GNUNET_DHT_MonitorHandle *monitor_tail; /** - * Linked list of retranmissions, to be used in the event - * of a dht service disconnect/reconnect. + * Head of active PUT requests. */ - struct PendingMessageList *retransmissions; + struct GNUNET_DHT_PutHandle *put_head; /** - * A single pending message allowed to be scheduled - * during retransmission phase. + * Tail of active PUT requests. */ - struct PendingMessage *retransmission_buffer; + struct GNUNET_DHT_PutHandle *put_tail; + + /** + * Hash map containing the current outstanding unique GET requests + * (values are of type 'struct GNUNET_DHT_GetHandle'). + */ + struct GNUNET_CONTAINER_MultiHashMap *active_requests; + + /** + * Task for trying to reconnect. + */ + GNUNET_SCHEDULER_TaskIdentifier reconnect_task; + + /** + * How quickly should we retry? Used for exponential back-off on + * connect-errors. + */ + struct GNUNET_TIME_Relative retry_time; + + /** + * Generator for unique ids. + */ + uint64_t uid_gen; + + /** + * Did we start our receive loop yet? + */ + int in_receive; }; /** - * Convert unique ID to hash code. + * Handler for messages received from the DHT service + * a demultiplexer which handles numerous message types * - * @param uid unique ID to convert - * @param hash set to uid (extended with zeros) + * @param cls the 'struct GNUNET_DHT_Handle' + * @param msg the incoming message */ static void -hash_from_uid (uint64_t uid, - GNUNET_HashCode *hash) +service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg); + + +/** + * Try to (re)connect to the DHT service. + * + * @param handle DHT handle to reconnect + * @return GNUNET_YES on success, GNUNET_NO on failure. + */ +static int +try_connect (struct GNUNET_DHT_Handle *handle) { - memset (hash, 0, sizeof(GNUNET_HashCode)); - *((uint64_t*)hash) = uid; + if (NULL != handle->client) + return GNUNET_OK; + handle->in_receive = GNUNET_NO; + handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg); + if (NULL == handle->client) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Failed to connect to the DHT service!\n")); + return GNUNET_NO; + } + return GNUNET_YES; } -#if RETRANSMIT + /** - * Iterator callback to retransmit each outstanding request - * because the connection to the DHT service went down (and - * came back). - * + * Add the request corresponding to the given route handle + * to the pending queue (if it is not already in there). * + * @param cls the 'struct GNUNET_DHT_Handle*' + * @param key key for the request (not used) + * @param value the 'struct GNUNET_DHT_GetHandle*' + * @return GNUNET_YES (always) */ -static int retransmit_iterator (void *cls, - const GNUNET_HashCode * key, - void *value) +static int +add_request_to_pending (void *cls, const struct GNUNET_HashCode * key, void *value) { - struct GNUNET_DHT_RouteHandle *route_handle = value; - struct PendingMessageList *pending_message_list; - - pending_message_list = GNUNET_malloc(sizeof(struct PendingMessageList) + sizeof(struct PendingMessage)); - pending_message_list->message = (struct PendingMessage *)&pending_message_list[1]; - pending_message_list->message->msg = &route_handle->message->header; - pending_message_list->message->timeout = GNUNET_TIME_relative_get_forever(); - pending_message_list->message->cont = NULL; - pending_message_list->message->cont_cls = NULL; - pending_message_list->message->unique_id = route_handle->uid; - /* Add the new pending message to the front of the retransmission list */ - pending_message_list->next = route_handle->dht_handle->retransmissions; - route_handle->dht_handle->retransmissions = pending_message_list; + struct GNUNET_DHT_Handle *handle = cls; + struct GNUNET_DHT_GetHandle *rh = value; - return GNUNET_OK; + if (GNUNET_NO == rh->message->in_pending_queue) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Retransmitting request related to %s to DHT %p\n", GNUNET_h2s (key), + handle); + GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail, + rh->message); + rh->message->in_pending_queue = GNUNET_YES; + } + return GNUNET_YES; } -#endif + /** - * Try to (re)connect to the dht service. + * Try to send messages from list of messages to send * - * @return GNUNET_YES on success, GNUNET_NO on failure. + * @param handle DHT_Handle */ -static int -try_connect (struct GNUNET_DHT_Handle *handle) +static void +process_pending_messages (struct GNUNET_DHT_Handle *handle); + + +/** + * Try reconnecting to the dht service. + * + * @param cls GNUNET_DHT_Handle + * @param tc scheduler context + */ +static void +try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (handle->client != NULL) - return GNUNET_OK; - handle->client = GNUNET_CLIENT_connect (handle->sched, "dht", handle->cfg); - if (handle->client != NULL) - return GNUNET_YES; -#if DEBUG_STATISTICS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Failed to connect to the dht service!\n")); -#endif - return GNUNET_NO; + struct GNUNET_DHT_Handle *handle = cls; + + LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting with DHT %p\n", handle); + handle->retry_time = GNUNET_TIME_STD_BACKOFF (handle->retry_time); + handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK; + if (GNUNET_YES != try_connect (handle)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, "dht reconnect failed(!)\n"); + return; + } + GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests, + &add_request_to_pending, handle); + process_pending_messages (handle); } + /** - * Send complete (or failed), call continuation if we have one. + * Try reconnecting to the DHT service. + * + * @param handle handle to dht to (possibly) disconnect and reconnect */ static void -finish (struct GNUNET_DHT_Handle *handle, int code) +do_disconnect (struct GNUNET_DHT_Handle *handle) { - struct PendingMessage *pos = handle->current; - GNUNET_HashCode uid_hash; - hash_from_uid (pos->unique_id, &uid_hash); -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s': Finish called!\n", "DHT API"); -#endif - GNUNET_assert (pos != NULL); - - if (pos->cont != NULL) + struct GNUNET_DHT_PutHandle *ph; + struct GNUNET_DHT_PutHandle *next; + + if (NULL == handle->client) + return; + GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == handle->reconnect_task); + if (NULL != handle->th) + GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th); + handle->th = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Disconnecting from DHT service, will try to reconnect in %s\n", + GNUNET_STRINGS_relative_time_to_string (handle->retry_time, + GNUNET_YES)); + GNUNET_CLIENT_disconnect (handle->client); + handle->client = NULL; + + /* signal disconnect to all PUT requests that were transmitted but waiting + for the put confirmation */ + next = handle->put_head; + while (NULL != (ph = next)) + { + next = ph->next; + if (NULL == ph->pending) { - if (code == GNUNET_SYSERR) - GNUNET_SCHEDULER_add_continuation (handle->sched, pos->cont, - pos->cont_cls, - GNUNET_SCHEDULER_REASON_TIMEOUT); - else - GNUNET_SCHEDULER_add_continuation (handle->sched, pos->cont, - pos->cont_cls, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + if (NULL != ph->cont) + ph->cont (ph->cont_cls, GNUNET_SYSERR); + GNUNET_DHT_put_cancel (ph); } + } + handle->reconnect_task = + GNUNET_SCHEDULER_add_delayed (handle->retry_time, &try_reconnect, handle); +} + - if (pos->unique_id == 0) - GNUNET_free(pos->msg); - GNUNET_free (pos); - handle->current = NULL; +/** + * Transmit the next pending message, called by notify_transmit_ready + * + * @param cls the DHT handle + * @param size number of bytes available in 'buf' for transmission + * @param buf where to copy messages for the service + * @return number of bytes written to 'buf' + */ +static size_t +transmit_pending (void *cls, size_t size, void *buf); + + +/** + * Try to send messages from list of messages to send + * + * @param handle handle to DHT + */ +static void +process_pending_messages (struct GNUNET_DHT_Handle *handle) +{ + struct PendingMessage *head; + + if (NULL == handle->client) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "process_pending_messages called, but client is NULL, reconnecting\n"); + do_disconnect (handle); + return; + } + if (NULL != handle->th) + return; + if (NULL == (head = handle->pending_head)) + return; + handle->th = + GNUNET_CLIENT_notify_transmit_ready (handle->client, + ntohs (head->msg->size), + GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_YES, &transmit_pending, + handle); + if (NULL != handle->th) + return; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "notify_transmit_ready returned NULL, reconnecting\n"); + do_disconnect (handle); } + /** * Transmit the next pending message, called by notify_transmit_ready + * + * @param cls the DHT handle + * @param size number of bytes available in 'buf' for transmission + * @param buf where to copy messages for the service + * @return number of bytes written to 'buf' */ static size_t transmit_pending (void *cls, size_t size, void *buf) { struct GNUNET_DHT_Handle *handle = cls; + struct PendingMessage *head; size_t tsize; -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': In transmit_pending\n", "DHT API"); -#endif - if (buf == NULL) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': In transmit_pending buf is NULL\n", "DHT API"); -#endif - finish (handle, GNUNET_SYSERR); - return 0; - } - handle->th = NULL; + if (NULL == buf) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Transmission to DHT service failed! Reconnecting!\n"); + do_disconnect (handle); + return 0; + } + if (NULL == (head = handle->pending_head)) + return 0; - if (handle->current != NULL) - { - tsize = ntohs (handle->current->msg->size); - if (size >= tsize) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Sending message size %d\n", "DHT API", tsize); -#endif - memcpy (buf, handle->current->msg, tsize); - finish (handle, GNUNET_OK); - return tsize; - } - else - { - return 0; - } - } - /* Have no pending request */ - return 0; + tsize = ntohs (head->msg->size); + if (size < tsize) + { + process_pending_messages (handle); + return 0; + } + memcpy (buf, head->msg, tsize); + GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail, + head); + head->in_pending_queue = GNUNET_NO; + if (NULL != head->cont) + { + head->cont (head->cont_cls, NULL); + head->cont = NULL; + head->cont_cls = NULL; + } + if (GNUNET_YES == head->free_on_send) + GNUNET_free (head); + process_pending_messages (handle); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Forwarded request of %u bytes to DHT service\n", (unsigned int) tsize); + if (GNUNET_NO == handle->in_receive) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting to process replies from DHT\n"); + handle->in_receive = GNUNET_YES; + GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle, + GNUNET_TIME_UNIT_FOREVER_REL); + } + return tsize; } + /** - * Try to send messages from list of messages to send + * Process a given reply that might match the given + * request. + * + * @param cls the 'struct GNUNET_DHT_ClientResultMessage' + * @param key query of the request + * @param value the 'struct GNUNET_DHT_RouteHandle' of a request matching the same key + * @return GNUNET_YES to continue to iterate over all results, + * GNUNET_NO if the reply is malformed */ -static void -process_pending_message (struct GNUNET_DHT_Handle *handle) +static int +process_reply (void *cls, const struct GNUNET_HashCode * key, void *value) { + const struct GNUNET_DHT_ClientResultMessage *dht_msg = cls; + struct GNUNET_DHT_GetHandle *get_handle = value; + const struct GNUNET_PeerIdentity *put_path; + const struct GNUNET_PeerIdentity *get_path; + uint32_t put_path_length; + uint32_t get_path_length; + size_t data_length; + size_t msize; + size_t meta_length; + const void *data; - if (handle->current == NULL) - return; /* action already pending */ - if (GNUNET_YES != try_connect (handle)) - { - finish (handle, GNUNET_SYSERR); - return; - } - - if (NULL == - (handle->th = GNUNET_CLIENT_notify_transmit_ready (handle->client, - ntohs (handle-> - current->msg-> - size), - handle->current-> - timeout, GNUNET_YES, - &transmit_pending, - handle))) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Failed to transmit request to dht service.\n"); -#endif - finish (handle, GNUNET_SYSERR); - return; - } -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Scheduled sending message of size %d to service\n", - "DHT API", ntohs (handle->current->msg->size)); -#endif + if (dht_msg->unique_id != get_handle->unique_id) + { + /* UID mismatch */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Ignoring reply for %s: UID mismatch: %llu/%llu\n", GNUNET_h2s (key), + dht_msg->unique_id, get_handle->unique_id); + return GNUNET_YES; + } + msize = ntohs (dht_msg->header.size); + put_path_length = ntohl (dht_msg->put_path_length); + get_path_length = ntohl (dht_msg->get_path_length); + meta_length = + sizeof (struct GNUNET_DHT_ClientResultMessage) + + sizeof (struct GNUNET_PeerIdentity) * (get_path_length + put_path_length); + if ((msize < meta_length) || + (get_path_length > + GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) || + (put_path_length > + GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity))) + { + GNUNET_break (0); + return GNUNET_NO; + } + data_length = msize - meta_length; + LOG (GNUNET_ERROR_TYPE_DEBUG, "Giving %u byte reply for %s to application\n", + (unsigned int) data_length, GNUNET_h2s (key)); + put_path = (const struct GNUNET_PeerIdentity *) &dht_msg[1]; + get_path = &put_path[put_path_length]; + data = &get_path[get_path_length]; + get_handle->iter (get_handle->iter_cls, + GNUNET_TIME_absolute_ntoh (dht_msg->expiration), key, + get_path, get_path_length, put_path, put_path_length, + ntohl (dht_msg->type), data_length, data); + return GNUNET_YES; } /** - * Send complete (or failed), call continuation if we have one. - * Forward declaration. + * Process a get monitor message from the service. + * + * @param handle The DHT handle. + * @param msg Monitor get message from the service. + * + * @return GNUNET_OK if everything went fine, + * GNUNET_SYSERR if the message is malformed. */ -static void -finish_retransmission (struct GNUNET_DHT_Handle *handle, int code); +static int +process_monitor_get_message (struct GNUNET_DHT_Handle *handle, + const struct GNUNET_DHT_MonitorGetMessage *msg) +{ + struct GNUNET_DHT_MonitorHandle *h; + + for (h = handle->monitor_head; NULL != h; h = h->next) + { + int type_ok; + int key_ok; + + type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type == ntohl(msg->type)); + key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key, + sizeof (struct GNUNET_HashCode))); + if (type_ok && key_ok && (NULL != h->get_cb)) + h->get_cb (h->cb_cls, + ntohl (msg->options), + (enum GNUNET_BLOCK_Type) ntohl(msg->type), + ntohl (msg->hop_count), + ntohl (msg->desired_replication_level), + ntohl (msg->get_path_length), + (struct GNUNET_PeerIdentity *) &msg[1], + &msg->key); + } + return GNUNET_OK; +} -/* Forward declaration */ -static size_t -transmit_pending_retransmission (void *cls, size_t size, void *buf); /** - * Try to send messages from list of messages to send + * Process a get response monitor message from the service. + * + * @param handle The DHT handle. + * @param msg monitor get response message from the service + * @return GNUNET_OK if everything went fine, + * GNUNET_SYSERR if the message is malformed. */ -static void -process_pending_retransmissions (struct GNUNET_DHT_Handle *handle) +static int +process_monitor_get_resp_message (struct GNUNET_DHT_Handle *handle, + const struct GNUNET_DHT_MonitorGetRespMessage + *msg) { + struct GNUNET_DHT_MonitorHandle *h; + struct GNUNET_PeerIdentity *path; + uint32_t getl; + uint32_t putl; + size_t msize; - if (handle->current == NULL) - return; /* action already pending */ - if (GNUNET_YES != try_connect (handle)) - { - finish_retransmission (handle, GNUNET_SYSERR); - return; - } + msize = ntohs (msg->header.size); + path = (struct GNUNET_PeerIdentity *) &msg[1]; + getl = ntohl (msg->get_path_length); + putl = ntohl (msg->put_path_length); + if ( (getl + putl < getl) || + ( ((msize - sizeof (struct GNUNET_DHT_MonitorGetRespMessage)) / sizeof (struct GNUNET_PeerIdentity)) < getl + putl) ) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + for (h = handle->monitor_head; NULL != h; h = h->next) + { + int type_ok; + int key_ok; + + type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type == ntohl(msg->type)); + key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key, + sizeof (struct GNUNET_HashCode))); + if (type_ok && key_ok && (NULL != h->get_resp_cb)) + h->get_resp_cb (h->cb_cls, + (enum GNUNET_BLOCK_Type) ntohl(msg->type), + path, getl, + &path[getl], putl, + GNUNET_TIME_absolute_ntoh(msg->expiration_time), + &msg->key, + (void *) &path[getl + putl], + msize - + sizeof (struct GNUNET_DHT_MonitorGetRespMessage) - + sizeof (struct GNUNET_PeerIdentity) * (putl + getl)); + } + return GNUNET_OK; +} - if (NULL == - (handle->th = GNUNET_CLIENT_notify_transmit_ready (handle->client, - ntohs (handle-> - current->msg-> - size), - handle->current-> - timeout, GNUNET_YES, - &transmit_pending_retransmission, - handle))) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Failed to transmit request to dht service.\n"); -#endif - finish_retransmission (handle, GNUNET_SYSERR); - return; - } -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Scheduled sending message of size %d to service\n", - "DHT API", ntohs (handle->current->msg->size)); -#endif + +/** + * Process a put monitor message from the service. + * + * @param handle The DHT handle. + * @param msg Monitor put message from the service. + * + * @return GNUNET_OK if everything went fine, + * GNUNET_SYSERR if the message is malformed. + */ +static int +process_monitor_put_message (struct GNUNET_DHT_Handle *handle, + const struct GNUNET_DHT_MonitorPutMessage *msg) +{ + struct GNUNET_DHT_MonitorHandle *h; + size_t msize; + struct GNUNET_PeerIdentity *path; + uint32_t putl; + + msize = ntohs (msg->header.size); + path = (struct GNUNET_PeerIdentity *) &msg[1]; + putl = ntohl (msg->put_path_length); + if (((msize - sizeof (struct GNUNET_DHT_MonitorGetRespMessage)) / sizeof (struct GNUNET_PeerIdentity)) < putl) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + for (h = handle->monitor_head; NULL != h; h = h->next) + { + int type_ok; + int key_ok; + + type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type == ntohl(msg->type)); + key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key, + sizeof (struct GNUNET_HashCode))); + if (type_ok && key_ok && (NULL != h->put_cb)) + h->put_cb (h->cb_cls, + ntohl (msg->options), + (enum GNUNET_BLOCK_Type) ntohl(msg->type), + ntohl (msg->hop_count), + ntohl (msg->desired_replication_level), + putl, path, + GNUNET_TIME_absolute_ntoh(msg->expiration_time), + &msg->key, + (void *) &path[putl], + msize - + sizeof (struct GNUNET_DHT_MonitorPutMessage) - + sizeof (struct GNUNET_PeerIdentity) * putl); + } + return GNUNET_OK; } + /** - * Send complete (or failed), call continuation if we have one. + * Process a put confirmation message from the service. + * + * @param handle The DHT handle. + * @param msg confirmation message from the service. + * @return GNUNET_OK if everything went fine, + * GNUNET_SYSERR if the message is malformed. */ -static void -finish_retransmission (struct GNUNET_DHT_Handle *handle, int code) +static int +process_put_confirmation_message (struct GNUNET_DHT_Handle *handle, + const struct GNUNET_DHT_ClientPutConfirmationMessage *msg) { - struct PendingMessage *pos = handle->current; - struct PendingMessageList *pending_list; -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s': Finish (retransmission) called!\n", "DHT API"); -#endif - GNUNET_assert (pos == handle->retransmissions->message); - pending_list = handle->retransmissions; - handle->retransmissions = handle->retransmissions->next; - GNUNET_free (pending_list); - - if (handle->retransmissions == NULL) - { - handle->retransmit_stage = DHT_NOT_RETRANSMITTING; - } + struct GNUNET_DHT_PutHandle *ph; + GNUNET_DHT_PutContinuation cont; + void *cont_cls; - if (handle->retransmissions != NULL) - { - handle->current = handle->retransmissions->message; - process_pending_retransmissions(handle); - } - else if (handle->retransmission_buffer != NULL) - { - handle->current = handle->retransmission_buffer; - process_pending_message(handle); - } + for (ph = handle->put_head; NULL != ph; ph = ph->next) + if (ph->unique_id == msg->unique_id) + break; + if (NULL == ph) + return GNUNET_OK; + cont = ph->cont; + cont_cls = ph->cont_cls; + GNUNET_DHT_put_cancel (ph); + if (NULL != cont) + cont (cont_cls, GNUNET_OK); + return GNUNET_OK; } + /** * Handler for messages received from the DHT service * a demultiplexer which handles numerous message types * + * @param cls the 'struct GNUNET_DHT_Handle' + * @param msg the incoming message */ -void -service_message_handler (void *cls, - const struct GNUNET_MessageHeader *msg) +static void +service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg) { struct GNUNET_DHT_Handle *handle = cls; - struct GNUNET_DHT_RouteResultMessage *dht_msg; - struct GNUNET_MessageHeader *enc_msg; - struct GNUNET_DHT_RouteHandle *route_handle; - uint64_t uid; - GNUNET_HashCode uid_hash; - size_t enc_size; - - if (msg == NULL) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Received NULL from server, connection down!\n", - "DHT API"); -#endif - GNUNET_CLIENT_disconnect (handle->client, GNUNET_YES); - handle->client = GNUNET_CLIENT_connect (handle->sched, - "dht", - handle->cfg); - if (handle->current != NULL) - { - finish(handle, GNUNET_SYSERR); /* If there was a current message, kill it! */ - } -#if RETRANSMIT - if (GNUNET_CONTAINER_multihashmap_iterate(handle->outstanding_requests, &retransmit_iterator, handle) > 0) - { - handle->retransmit_stage = DHT_RETRANSMITTING; - handle->current = handle->retransmissions->message; - process_pending_retransmissions(handle); - } - return; -#endif - } + const struct GNUNET_DHT_ClientResultMessage *dht_msg; + uint16_t msize; + int ret; + if (NULL == msg) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Error receiving data from DHT service, reconnecting\n"); + do_disconnect (handle); + return; + } + ret = GNUNET_SYSERR; + msize = ntohs (msg->size); switch (ntohs (msg->type)) + { + case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET: + if (msize < sizeof (struct GNUNET_DHT_MonitorGetMessage)) { - case GNUNET_MESSAGE_TYPE_DHT_ROUTE_RESULT: - { - dht_msg = (struct GNUNET_DHT_RouteResultMessage *) msg; - uid = GNUNET_ntohll (dht_msg->unique_id); -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Received response to message (uid %llu)\n", - "DHT API", uid); -#endif - - hash_from_uid (uid, &uid_hash); - route_handle = - GNUNET_CONTAINER_multihashmap_get (handle->outstanding_requests, - &uid_hash); - if (route_handle == NULL) /* We have no recollection of this request */ - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Received response to message (uid %llu), but have no recollection of it!\n", - "DHT API", uid); -#endif - } - else - { - enc_size = - ntohs (dht_msg->header.size) - - sizeof (struct GNUNET_DHT_RouteResultMessage); - GNUNET_assert (enc_size > 0); - enc_msg = (struct GNUNET_MessageHeader *) &dht_msg[1]; - route_handle->iter (route_handle->iter_cls, enc_msg); - } - - break; - } - default: - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`%s': Received unknown message type %d\n", "DHT API", - ntohs (msg->type)); - } + GNUNET_break (0); + break; } - GNUNET_CLIENT_receive (handle->client, - &service_message_handler, - handle, GNUNET_TIME_UNIT_FOREVER_REL); - + ret = process_monitor_get_message(handle, + (const struct GNUNET_DHT_MonitorGetMessage *) msg); + break; + case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP: + if (msize < sizeof (struct GNUNET_DHT_MonitorGetRespMessage)) + { + GNUNET_break (0); + break; + } + ret = process_monitor_get_resp_message(handle, + (const struct GNUNET_DHT_MonitorGetRespMessage *) msg); + break; + case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT: + if (msize < sizeof (struct GNUNET_DHT_MonitorPutMessage)) + { + GNUNET_break (0); + break; + } + ret = process_monitor_put_message(handle, + (const struct GNUNET_DHT_MonitorPutMessage *) msg); + break; + case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT_RESP: + /* Not implemented yet */ + GNUNET_break(0); + break; + case GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT: + if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_ClientResultMessage)) + { + GNUNET_break (0); + break; + } + ret = GNUNET_OK; + dht_msg = (const struct GNUNET_DHT_ClientResultMessage *) msg; + LOG (GNUNET_ERROR_TYPE_DEBUG, "Received reply for `%s' from DHT service %p\n", + GNUNET_h2s (&dht_msg->key), handle); + GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests, + &dht_msg->key, &process_reply, + (void *) dht_msg); + break; + case GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK: + if (ntohs (msg->size) != sizeof (struct GNUNET_DHT_ClientPutConfirmationMessage)) + { + GNUNET_break (0); + break; + } + ret = process_put_confirmation_message (handle, + (const struct GNUNET_DHT_ClientPutConfirmationMessage*) msg); + break; + default: + GNUNET_break(0); + LOG (GNUNET_ERROR_TYPE_WARNING, + "Unknown DHT message type: %hu (%hu) size: %hu\n", + ntohs (msg->type), msg->type, msize); + break; + } + if (GNUNET_OK != ret) + { + GNUNET_break (0); + do_disconnect (handle); + return; + } + GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle, + GNUNET_TIME_UNIT_FOREVER_REL); } /** * Initialize the connection with the DHT service. * - * @param sched scheduler to use * @param cfg configuration to use * @param ht_len size of the internal hash table to use for * processing multiple GET/FIND requests in parallel @@ -645,31 +901,21 @@ service_message_handler (void *cls, * @return handle to the DHT service, or NULL on error */ struct GNUNET_DHT_Handle * -GNUNET_DHT_connect (struct GNUNET_SCHEDULER_Handle *sched, - const struct GNUNET_CONFIGURATION_Handle *cfg, +GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned int ht_len) { struct GNUNET_DHT_Handle *handle; handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_Handle)); handle->cfg = cfg; - handle->sched = sched; - handle->client = GNUNET_CLIENT_connect (sched, "dht", cfg); - handle->uid_gen = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK, -1); - if (handle->client == NULL) - { - GNUNET_free (handle); - return NULL; - } - handle->outstanding_requests = - GNUNET_CONTAINER_multihashmap_create (ht_len); -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Connection to service in progress\n", "DHT API"); -#endif - GNUNET_CLIENT_receive (handle->client, - &service_message_handler, - handle, GNUNET_TIME_UNIT_FOREVER_REL); + handle->uid_gen = + GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX); + handle->active_requests = GNUNET_CONTAINER_multihashmap_create (ht_len, GNUNET_NO); + if (GNUNET_NO == try_connect (handle)) + { + GNUNET_DHT_disconnect (handle); + return NULL; + } return handle; } @@ -682,541 +928,435 @@ GNUNET_DHT_connect (struct GNUNET_SCHEDULER_Handle *sched, void GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle) { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Called GNUNET_DHT_disconnect\n", "DHT API"); -#endif - GNUNET_assert (handle != NULL); - if (handle->th != NULL) /* We have a live transmit request in the Aether */ - { - GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th); - handle->th = NULL; - } - if (handle->current != NULL) /* We are trying to send something now, clean it up */ - GNUNET_free (handle->current); + struct PendingMessage *pm; + struct GNUNET_DHT_PutHandle *ph; - if (handle->client != NULL) /* Finally, disconnect from the service */ - { - GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO); - handle->client = NULL; - } + GNUNET_assert (NULL != handle); + GNUNET_assert (0 == + GNUNET_CONTAINER_multihashmap_size (handle->active_requests)); + if (NULL != handle->th) + { + GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th); + handle->th = NULL; + } + while (NULL != (pm = handle->pending_head)) + { + GNUNET_assert (GNUNET_YES == pm->in_pending_queue); + GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail, + pm); + pm->in_pending_queue = GNUNET_NO; + GNUNET_assert (GNUNET_YES == pm->free_on_send); + if (NULL != pm->cont) + pm->cont (pm->cont_cls, NULL); + GNUNET_free (pm); + } + while (NULL != (ph = handle->put_head)) + { + GNUNET_break (NULL == ph->pending); + if (NULL != ph->cont) + ph->cont (ph->cont_cls, GNUNET_SYSERR); + GNUNET_DHT_put_cancel (ph); + } - GNUNET_assert(GNUNET_CONTAINER_multihashmap_size(handle->outstanding_requests) == 0); - GNUNET_CONTAINER_multihashmap_destroy(handle->outstanding_requests); + if (NULL != handle->client) + { + GNUNET_CLIENT_disconnect (handle->client); + handle->client = NULL; + } + if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task) + GNUNET_SCHEDULER_cancel (handle->reconnect_task); + GNUNET_CONTAINER_multihashmap_destroy (handle->active_requests); GNUNET_free (handle); } /** - * Transmit the next pending message, called by notify_transmit_ready + * Timeout for the transmission of a fire&forget-request. Clean it up. + * + * @param cls the 'struct PendingMessage' + * @param tc scheduler context */ -static size_t -transmit_pending_retransmission (void *cls, size_t size, void *buf) +static void +timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct GNUNET_DHT_Handle *handle = cls; - size_t tsize; - -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': In transmit_pending\n", "DHT API"); -#endif - if (buf == NULL) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': In transmit_pending buf is NULL\n", "DHT API"); -#endif - finish_retransmission (handle, GNUNET_SYSERR); - return 0; - } - - handle->th = NULL; + struct GNUNET_DHT_PutHandle *ph = cls; + struct GNUNET_DHT_Handle *handle = ph->dht_handle; - if (handle->current != NULL) - { - tsize = ntohs (handle->current->msg->size); - if (size >= tsize) - { -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Sending message size %d\n", "DHT API", tsize); -#endif - memcpy (buf, handle->current->msg, tsize); - finish_retransmission (handle, GNUNET_OK); - return tsize; - } - else - { - return 0; - } - } - /* Have no pending request */ - return 0; + ph->timeout_task = GNUNET_SCHEDULER_NO_TASK; + if (NULL != ph->pending) + { + GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail, + ph->pending); + ph->pending->in_pending_queue = GNUNET_NO; + GNUNET_free (ph->pending); + } + if (NULL != ph->cont) + ph->cont (ph->cont_cls, GNUNET_NO); + GNUNET_CONTAINER_DLL_remove (handle->put_head, + handle->put_tail, + ph); + GNUNET_free (ph); } /** - * Iterator called on each result obtained from a generic route - * operation + * Function called whenever the PUT message leaves the queue. Sets + * the message pointer in the put handle to NULL. + * + * @param cls the 'struct GNUNET_DHT_PutHandle' + * @param tc unused */ -void -get_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply) +static void +mark_put_message_gone (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct GNUNET_DHT_GetHandle *get_handle = cls; - struct GNUNET_DHT_GetResultMessage *result; - size_t data_size; - char *result_data; - - if (ntohs (reply->type) != GNUNET_MESSAGE_TYPE_DHT_GET_RESULT) - return; - - GNUNET_assert (ntohs (reply->size) >= - sizeof (struct GNUNET_DHT_GetResultMessage)); - result = (struct GNUNET_DHT_GetResultMessage *) reply; - data_size = ntohs (reply->size) - sizeof(struct GNUNET_DHT_GetResultMessage); + struct GNUNET_DHT_PutHandle *ph = cls; - result_data = (char *) &result[1]; /* Set data pointer to end of message */ - - get_handle->get_context.iter (get_handle->get_context.iter_cls, - result->expiration, &result->key, - ntohs (result->type), data_size, result_data); + ph->pending = NULL; } /** - * Iterator called on each result obtained from a generic route - * operation - */ -void -find_peer_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply) -{ - struct GNUNET_DHT_FindPeerHandle *find_peer_handle = cls; - struct GNUNET_MessageHeader *hello; - size_t hello_size; - - if (ntohs (reply->type) != GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received wrong type of response to a find peer request...\n"); - return; - } - - - GNUNET_assert (ntohs (reply->size) >= - sizeof (struct GNUNET_MessageHeader)); - hello_size = ntohs(reply->size) - sizeof(struct GNUNET_MessageHeader); - hello = (struct GNUNET_MessageHeader *)&reply[1]; - - if (ntohs(hello->type) != GNUNET_MESSAGE_TYPE_HELLO) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encapsulated message of type %d, is not a `%s' message!\n", ntohs(hello->type), "HELLO"); - return; - } - find_peer_handle->find_peer_context.proc (find_peer_handle-> - find_peer_context.proc_cls, - (struct GNUNET_HELLO_Message *)hello); -} - -/** - * Perform an asynchronous FIND_PEER operation on the DHT. + * Perform a PUT operation storing data in the DHT. FIXME: we should + * change the protocol to get a confirmation for the PUT from the DHT + * and call 'cont' only after getting the confirmation; otherwise, the + * client has no good way of telling if the 'PUT' message actually got + * to the DHT service! * - * @param handle 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 request (when necessary) or how long - * to wait for tramission to the service - * @param cont continuation to call when done; - * reason will be TIMEOUT on error, - * reason will be PREREQ_DONE on success + * @param handle handle to DHT service + * @param key the key to store under + * @param desired_replication_level estimate of how many + * nearest peers this request should reach + * @param options routing options for this message + * @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 how long to wait for transmission of this request + * @param cont continuation to call when done (transmitting request to service) + * You must not call GNUNET_DHT_DISCONNECT in this continuation * @param cont_cls closure for cont - * - * @return handle to stop the request, NULL if the request is "fire and forget" */ -struct GNUNET_DHT_RouteHandle * -GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *handle, - 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, - GNUNET_SCHEDULER_Task cont, void *cont_cls) +struct GNUNET_DHT_PutHandle * +GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, const struct GNUNET_HashCode * key, + uint32_t desired_replication_level, + enum GNUNET_DHT_RouteOption options, + enum GNUNET_BLOCK_Type type, size_t size, const char *data, + struct GNUNET_TIME_Absolute exp, + struct GNUNET_TIME_Relative timeout, GNUNET_DHT_PutContinuation cont, + void *cont_cls) { - struct GNUNET_DHT_RouteHandle *route_handle; + struct GNUNET_DHT_ClientPutMessage *put_msg; + size_t msize; struct PendingMessage *pending; - struct GNUNET_DHT_RouteMessage *message; - uint16_t msize; - GNUNET_HashCode uid_key; + struct GNUNET_DHT_PutHandle *ph; - if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) + msize = sizeof (struct GNUNET_DHT_ClientPutMessage) + size; + if ((msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || + (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)) + { + GNUNET_break (0); return NULL; + } + ph = GNUNET_malloc (sizeof (struct GNUNET_DHT_PutHandle)); + ph->dht_handle = handle; + ph->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout, &timeout_put_request, ph); + ph->cont = cont; + ph->cont_cls = cont_cls; + ph->unique_id = ++handle->uid_gen; + pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize); + ph->pending = pending; + put_msg = (struct GNUNET_DHT_ClientPutMessage *) &pending[1]; + pending->msg = &put_msg->header; + pending->handle = handle; + pending->cont = &mark_put_message_gone; + pending->cont_cls = ph; + pending->free_on_send = GNUNET_YES; + put_msg->header.size = htons (msize); + put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT); + put_msg->type = htonl (type); + put_msg->options = htonl ((uint32_t) options); + put_msg->desired_replication_level = htonl (desired_replication_level); + put_msg->unique_id = ph->unique_id; + put_msg->expiration = GNUNET_TIME_absolute_hton (exp); + put_msg->key = *key; + memcpy (&put_msg[1], data, size); + GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail, + pending); + pending->in_pending_queue = GNUNET_YES; + GNUNET_CONTAINER_DLL_insert_tail (handle->put_head, + handle->put_tail, + ph); + process_pending_messages (handle); + return ph; +} - if (sizeof (struct GNUNET_DHT_RouteMessage) + ntohs (enc->size) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) - { - GNUNET_break (0); - return NULL; - } - route_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_RouteHandle)); - memcpy (&route_handle->key, key, sizeof (GNUNET_HashCode)); - route_handle->iter = iter; - route_handle->iter_cls = iter_cls; - route_handle->dht_handle = handle; - if (iter != NULL) - { - route_handle->uid = handle->uid_gen++; - hash_from_uid (route_handle->uid, &uid_key); - GNUNET_CONTAINER_multihashmap_put (handle->outstanding_requests, - &uid_key, route_handle, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); - } - else - { - route_handle->uid = 0; - } +/** + * Cancels a DHT PUT operation. Note that the PUT request may still + * go out over the network (we can't stop that); However, if the PUT + * has not yet been sent to the service, cancelling the PUT will stop + * this from happening (but there is no way for the user of this API + * to tell if that is the case). The only use for this API is to + * prevent a later call to 'cont' from "GNUNET_DHT_put" (i.e. because + * the system is shutting down). + * + * @param ph put operation to cancel ('cont' will no longer be called) + */ +void +GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph) +{ + struct GNUNET_DHT_Handle *handle = ph->dht_handle; -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Unique ID is %llu\n", "DHT API", route_handle->uid); -#endif - - msize = sizeof (struct GNUNET_DHT_RouteMessage) + ntohs (enc->size); - message = GNUNET_malloc (msize); - message->header.size = htons (msize); - message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_ROUTE); - memcpy (&message->key, key, sizeof (GNUNET_HashCode)); - message->options = htonl (options); - message->desired_replication_level = htonl (options); - message->unique_id = GNUNET_htonll (route_handle->uid); - memcpy (&message[1], enc, ntohs (enc->size)); - pending = GNUNET_malloc (sizeof (struct PendingMessage)); - pending->msg = &message->header; - pending->timeout = timeout; - pending->cont = cont; - pending->cont_cls = cont_cls; - pending->unique_id = route_handle->uid; - if (handle->current == NULL) - { - handle->current = pending; - process_pending_message (handle); - } - else if ((handle->current != NULL) && (handle->retransmit_stage == DHT_RETRANSMITTING)) + if (NULL != ph->pending) { - handle->retransmit_stage = DHT_RETRANSMITTING_MESSAGE_QUEUED; - handle->retransmission_buffer = pending; + GNUNET_CONTAINER_DLL_remove (handle->pending_head, + handle->pending_tail, + ph->pending); + GNUNET_free (ph->pending); + ph->pending = NULL; } - - route_handle->message = message; - return route_handle; + if (ph->timeout_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel (ph->timeout_task); + ph->timeout_task = GNUNET_SCHEDULER_NO_TASK; + } + GNUNET_CONTAINER_DLL_remove (handle->put_head, + handle->put_tail, + ph); + GNUNET_free (ph); } /** - * Perform an asynchronous GET operation on the DHT identified. + * Perform an asynchronous GET operation on the DHT identified. See + * also "GNUNET_BLOCK_evaluate". * * @param handle handle to the DHT service - * @param timeout how long to wait for transmission of this request to the service * @param type expected type of the response object * @param key the key to look up + * @param desired_replication_level estimate of how many + nearest peers this request should reach + * @param options routing options for this message + * @param xquery extended query data (can be NULL, depending on type) + * @param xquery_size number of bytes in xquery * @param iter function to call on each result * @param iter_cls closure for iter - * @param cont continuation to call once message sent - * @param cont_cls closure for continuation - * * @return handle to stop the async get */ struct GNUNET_DHT_GetHandle * GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, - struct GNUNET_TIME_Relative timeout, - uint32_t type, - const GNUNET_HashCode * key, - GNUNET_DHT_GetIterator iter, - void *iter_cls, - GNUNET_SCHEDULER_Task cont, void *cont_cls) + enum GNUNET_BLOCK_Type type, const struct GNUNET_HashCode * key, + uint32_t desired_replication_level, + enum GNUNET_DHT_RouteOption options, const void *xquery, + size_t xquery_size, GNUNET_DHT_GetIterator iter, + void *iter_cls) { + struct GNUNET_DHT_ClientGetMessage *get_msg; struct GNUNET_DHT_GetHandle *get_handle; - struct GNUNET_DHT_GetMessage get_msg; + size_t msize; + struct PendingMessage *pending; - if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) /* Can't send right now, we have a pending message... */ + msize = sizeof (struct GNUNET_DHT_ClientGetMessage) + xquery_size; + if ((msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || + (xquery_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)) + { + GNUNET_break (0); return NULL; - + } + LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending query for %s to DHT %p\n", + GNUNET_h2s (key), handle); + pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize); + get_msg = (struct GNUNET_DHT_ClientGetMessage *) &pending[1]; + pending->msg = &get_msg->header; + pending->handle = handle; + pending->free_on_send = GNUNET_NO; + get_msg->header.size = htons (msize); + get_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET); + get_msg->options = htonl ((uint32_t) options); + get_msg->desired_replication_level = htonl (desired_replication_level); + get_msg->type = htonl (type); + get_msg->key = *key; + get_msg->unique_id = ++handle->uid_gen; + memcpy (&get_msg[1], xquery, xquery_size); + GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail, + pending); + pending->in_pending_queue = GNUNET_YES; get_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetHandle)); - get_handle->get_context.iter = iter; - get_handle->get_context.iter_cls = iter_cls; - -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Inserting pending get request with key %s\n", "DHT API", - GNUNET_h2s (key)); -#endif - - get_msg.header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET); - get_msg.header.size = htons (sizeof (struct GNUNET_DHT_GetMessage)); - get_msg.type = htons (type); - - get_handle->route_handle = - GNUNET_DHT_route_start (handle, key, 0, 0, &get_msg.header, timeout, - &get_reply_iterator, get_handle, cont, cont_cls); - + get_handle->iter = iter; + get_handle->iter_cls = iter_cls; + get_handle->message = pending; + get_handle->unique_id = get_msg->unique_id; + GNUNET_CONTAINER_multihashmap_put (handle->active_requests, key, get_handle, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + process_pending_messages (handle); return get_handle; } -/** - * Stop a previously issued routing request - * - * @param route_handle handle to the request to stop - * @param cont continuation to call once this message is sent to the service or times out - * @param cont_cls closure for the continuation - */ -void -GNUNET_DHT_route_stop (struct GNUNET_DHT_RouteHandle *route_handle, - GNUNET_SCHEDULER_Task cont, void *cont_cls) -{ - struct PendingMessage *pending; - struct GNUNET_DHT_StopMessage *message; - size_t msize; - GNUNET_HashCode uid_key; - - msize = sizeof (struct GNUNET_DHT_StopMessage); - message = GNUNET_malloc (msize); - message->header.size = htons (msize); - message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_STOP); -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Remove outstanding request for uid %llu\n", "DHT API", - route_handle->uid); -#endif - message->unique_id = GNUNET_htonll (route_handle->uid); - pending = GNUNET_malloc (sizeof (struct PendingMessage)); - pending->msg = (struct GNUNET_MessageHeader *) message; - pending->timeout = GNUNET_TIME_relative_get_forever(); - pending->cont = cont; - pending->cont_cls = cont_cls; - pending->unique_id = 0; /* When finished is called, free pending->msg */ - - if (route_handle->dht_handle->current == NULL) - { - route_handle->dht_handle->current = pending; - process_pending_message (route_handle->dht_handle); - } - else if ((route_handle->dht_handle->current != NULL) && (route_handle->dht_handle->retransmit_stage == DHT_RETRANSMITTING)) - { - route_handle->dht_handle->retransmit_stage = DHT_RETRANSMITTING_MESSAGE_QUEUED; - route_handle->dht_handle->retransmission_buffer = pending; - } - else - { - GNUNET_break(0); - } - - hash_from_uid (route_handle->uid, &uid_key); - GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove - (route_handle->dht_handle->outstanding_requests, &uid_key, - route_handle) == GNUNET_YES); - - GNUNET_free(route_handle->message); - GNUNET_free(route_handle); -} - - /** * Stop async DHT-get. * * @param get_handle handle to the GET operation to stop - * @param cont continuation to call once this message is sent to the service or times out - * @param cont_cls closure for the continuation */ void -GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle, - GNUNET_SCHEDULER_Task cont, void *cont_cls) +GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle) { - if ((get_handle->route_handle->dht_handle->current != NULL) && - (get_handle->route_handle->dht_handle->retransmit_stage != DHT_RETRANSMITTING)) - { - if (cont != NULL) - { - GNUNET_SCHEDULER_add_continuation (get_handle->route_handle->dht_handle->sched, cont, cont_cls, - GNUNET_SCHEDULER_REASON_TIMEOUT); - } - return; - } + struct GNUNET_DHT_Handle *handle; + const struct GNUNET_DHT_ClientGetMessage *get_msg; + struct GNUNET_DHT_ClientGetStopMessage *stop_msg; + struct PendingMessage *pending; -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Removing pending get request with key %s, uid %llu\n", - "DHT API", GNUNET_h2s (&get_handle->route_handle->key), - get_handle->route_handle->uid); -#endif - GNUNET_DHT_route_stop (get_handle->route_handle, cont, cont_cls); + handle = get_handle->message->handle; + get_msg = + (const struct GNUNET_DHT_ClientGetMessage *) get_handle->message->msg; + LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending STOP for %s to DHT via %p\n", + GNUNET_h2s (&get_msg->key), handle); + /* generate STOP */ + pending = + GNUNET_malloc (sizeof (struct PendingMessage) + + sizeof (struct GNUNET_DHT_ClientGetStopMessage)); + stop_msg = (struct GNUNET_DHT_ClientGetStopMessage *) &pending[1]; + pending->msg = &stop_msg->header; + pending->handle = handle; + pending->free_on_send = GNUNET_YES; + stop_msg->header.size = + htons (sizeof (struct GNUNET_DHT_ClientGetStopMessage)); + stop_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP); + stop_msg->reserved = htonl (0); + stop_msg->unique_id = get_msg->unique_id; + stop_msg->key = get_msg->key; + GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail, + pending); + pending->in_pending_queue = GNUNET_YES; + + /* remove 'GET' from active status */ + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_remove (handle->active_requests, + &get_msg->key, + get_handle)); + if (GNUNET_YES == get_handle->message->in_pending_queue) + { + GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail, + get_handle->message); + get_handle->message->in_pending_queue = GNUNET_NO; + } + GNUNET_free (get_handle->message); GNUNET_free (get_handle); + + process_pending_messages (handle); } /** - * Perform an asynchronous FIND PEER operation on the DHT. + * Start monitoring the local DHT service. * - * @param handle handle to the DHT service - * @param timeout timeout for this request to be sent to the - * service - * @param options routing options for this message - * @param key the key to look up - * @param proc function to call on each result - * @param proc_cls closure for proc - * @param cont continuation to call once message sent - * @param cont_cls closure for continuation + * @param handle Handle to the DHT service. + * @param type Type of blocks that are of interest. + * @param key Key of data of interest, NULL for all. + * @param get_cb Callback to process monitored get messages. + * @param get_resp_cb Callback to process monitored get response messages. + * @param put_cb Callback to process monitored put messages. + * @param cb_cls Closure for cb. * - * @return handle to stop the async get, NULL on error + * @return Handle to stop monitoring. */ -struct GNUNET_DHT_FindPeerHandle * -GNUNET_DHT_find_peer_start (struct GNUNET_DHT_Handle *handle, - struct GNUNET_TIME_Relative timeout, - enum GNUNET_DHT_RouteOption options, - const GNUNET_HashCode * key, - GNUNET_DHT_FindPeerProcessor proc, - void *proc_cls, - GNUNET_SCHEDULER_Task cont, - void *cont_cls) +struct GNUNET_DHT_MonitorHandle * +GNUNET_DHT_monitor_start (struct GNUNET_DHT_Handle *handle, + enum GNUNET_BLOCK_Type type, + const struct GNUNET_HashCode *key, + GNUNET_DHT_MonitorGetCB get_cb, + GNUNET_DHT_MonitorGetRespCB get_resp_cb, + GNUNET_DHT_MonitorPutCB put_cb, + void *cb_cls) { - struct GNUNET_DHT_FindPeerHandle *find_peer_handle; - struct GNUNET_MessageHeader find_peer_msg; - - if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) /* Can't send right now, we have a pending message... */ - return NULL; - - find_peer_handle = - GNUNET_malloc (sizeof (struct GNUNET_DHT_FindPeerHandle)); - find_peer_handle->find_peer_context.proc = proc; - find_peer_handle->find_peer_context.proc_cls = proc_cls; + struct GNUNET_DHT_MonitorHandle *h; + struct GNUNET_DHT_MonitorStartStopMessage *m; + struct PendingMessage *pending; -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Inserting pending `%s' request with key %s\n", "DHT API", - "FIND PEER", GNUNET_h2s (key)); -#endif - - find_peer_msg.size = htons(sizeof(struct GNUNET_MessageHeader)); - find_peer_msg.type = htons(GNUNET_MESSAGE_TYPE_DHT_FIND_PEER); - find_peer_handle->route_handle = - GNUNET_DHT_route_start (handle, key, 0, options, &find_peer_msg, - timeout, &find_peer_reply_iterator, - find_peer_handle, cont, cont_cls); - return find_peer_handle; -} + h = GNUNET_malloc (sizeof (struct GNUNET_DHT_MonitorHandle)); + GNUNET_CONTAINER_DLL_insert(handle->monitor_head, handle->monitor_tail, h); -/** - * Stop async find peer. Frees associated resources. - * - * @param find_peer_handle GET operation to stop. - * @param cont continuation to call once this message is sent to the service or times out - * @param cont_cls closure for the continuation - */ -void -GNUNET_DHT_find_peer_stop (struct GNUNET_DHT_FindPeerHandle *find_peer_handle, - GNUNET_SCHEDULER_Task cont, void *cont_cls) -{ - if ((find_peer_handle->route_handle->dht_handle->current != NULL) && - (find_peer_handle->route_handle->dht_handle->retransmit_stage != DHT_RETRANSMITTING)) - { - if (cont != NULL) - { - GNUNET_SCHEDULER_add_continuation (find_peer_handle->route_handle->dht_handle->sched, cont, cont_cls, - GNUNET_SCHEDULER_REASON_TIMEOUT); - } - return; - } + h->get_cb = get_cb; + h->get_resp_cb = get_resp_cb; + h->put_cb = put_cb; + h->cb_cls = cb_cls; + h->type = type; + h->dht_handle = handle; + if (NULL != key) + { + h->key = GNUNET_malloc (sizeof(struct GNUNET_HashCode)); + memcpy (h->key, key, sizeof(struct GNUNET_HashCode)); + } -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Removing pending `%s' request with key %s, uid %llu\n", - "DHT API", "FIND PEER", - GNUNET_h2s (&find_peer_handle->route_handle->key), - find_peer_handle->route_handle->uid); -#endif - GNUNET_DHT_route_stop (find_peer_handle->route_handle, cont, cont_cls); - GNUNET_free (find_peer_handle); + pending = GNUNET_malloc (sizeof (struct GNUNET_DHT_MonitorStartStopMessage) + + sizeof (struct PendingMessage)); + m = (struct GNUNET_DHT_MonitorStartStopMessage *) &pending[1]; + pending->msg = &m->header; + pending->handle = handle; + pending->free_on_send = GNUNET_YES; + m->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_MONITOR_START); + m->header.size = htons (sizeof (struct GNUNET_DHT_MonitorStartStopMessage)); + m->type = htonl(type); + m->get = htons(NULL != get_cb); + m->get_resp = htons(NULL != get_resp_cb); + m->put = htons(NULL != put_cb); + if (NULL != key) { + m->filter_key = htons(1); + memcpy (&m->key, key, sizeof(struct GNUNET_HashCode)); + } + GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail, + pending); + pending->in_pending_queue = GNUNET_YES; + process_pending_messages (handle); + return h; } /** - * Perform a PUT operation storing data in the DHT. + * Stop monitoring. * - * @param handle 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 how long to wait for transmission of this request - * @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 + * @param handle The handle to the monitor request returned by monitor_start. * - * @return GNUNET_YES if put message is queued for transmission + * On return get_handle will no longer be valid, caller must not use again!!! */ void -GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, - 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) +GNUNET_DHT_monitor_stop (struct GNUNET_DHT_MonitorHandle *handle) { - struct GNUNET_DHT_PutMessage *put_msg; - struct GNUNET_DHT_RouteHandle *put_route; - size_t msize; - - if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) - { - if (cont != NULL) - { - GNUNET_SCHEDULER_add_continuation (handle->sched, cont, cont_cls, - GNUNET_SCHEDULER_REASON_TIMEOUT); - } - return; - } - -#if DEBUG_DHT_API - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Inserting pending put request with key %s\n", "DHT API", - GNUNET_h2s (key)); -#endif + struct GNUNET_DHT_MonitorStartStopMessage *m; + struct PendingMessage *pending; - msize = sizeof (struct GNUNET_DHT_PutMessage) + size; - put_msg = GNUNET_malloc (msize); - put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_PUT); - put_msg->header.size = htons (msize); - put_msg->type = htons (type); - put_msg->data_size = htons (size); - put_msg->expiration = GNUNET_TIME_absolute_hton(exp); - memcpy (&put_msg[1], data, size); + GNUNET_CONTAINER_DLL_remove (handle->dht_handle->monitor_head, + handle->dht_handle->monitor_tail, + handle); + + pending = GNUNET_malloc (sizeof (struct GNUNET_DHT_MonitorStartStopMessage) + + sizeof (struct PendingMessage)); + m = (struct GNUNET_DHT_MonitorStartStopMessage *) &pending[1]; + pending->msg = &m->header; + pending->handle = handle->dht_handle; + pending->free_on_send = GNUNET_YES; + m->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_MONITOR_STOP); + m->header.size = htons (sizeof (struct GNUNET_DHT_MonitorStartStopMessage)); + m->type = htonl(handle->type); + m->get = htons(NULL != handle->get_cb); + m->get_resp = htons(NULL != handle->get_resp_cb); + m->put = htons(NULL != handle->put_cb); + if (NULL != handle->key) { + m->filter_key = htons(1); + memcpy (&m->key, handle->key, sizeof(struct GNUNET_HashCode)); + } + GNUNET_CONTAINER_DLL_insert (handle->dht_handle->pending_head, + handle->dht_handle->pending_tail, + pending); + pending->in_pending_queue = GNUNET_YES; + process_pending_messages (handle->dht_handle); + + GNUNET_free_non_null (handle->key); + GNUNET_free (handle); +} - put_route = GNUNET_DHT_route_start (handle, key, 0, 0, &put_msg->header, timeout, NULL, - NULL, cont, cont_cls); - if (put_route == NULL) /* Route start failed! */ - { - if (cont != NULL) - { - GNUNET_SCHEDULER_add_continuation (handle->sched, cont, cont_cls, - GNUNET_SCHEDULER_REASON_TIMEOUT); - } - } - else - GNUNET_free(put_route); - GNUNET_free (put_msg); -} +/* end of dht_api.c */