/*
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
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @brief library to access the DHT service
* @author Christian Grothoff
* @author Nathan Evans
- *
*/
#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_YES
-
-#define DEFAULT_DHT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#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 GNUNET_MessageHeader *msg;
+ struct PendingMessage *prev;
/**
- * Timeout for this message
+ * This is a doubly-linked list.
*/
- struct GNUNET_TIME_Relative timeout;
+ struct PendingMessage *next;
/**
- * Continuation to call on message send
- * or message receipt confirmation
+ * Message that is pending, allocated at the end
+ * of this struct.
*/
- GNUNET_SCHEDULER_Task cont;
+ const struct GNUNET_MessageHeader *msg;
/**
- * Continuation closure
+ * Handle to the DHT API context.
*/
- void *cont_cls;
+ struct GNUNET_DHT_Handle *handle;
/**
- * Whether or not to await verification the message
- * was received by the service
+ * Continuation to call when the request has been
+ * transmitted (for the first time) to the service; can be NULL.
*/
- size_t is_unique;
+ GNUNET_SCHEDULER_Task cont;
+
+ /**
+ * Closure for 'cont'.
+ */
+ void *cont_cls;
/**
* Unique ID for this request
*/
uint64_t unique_id;
-};
-
-struct GNUNET_DHT_GetContext
-{
/**
- * Iterator to call on data receipt
+ * 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.
*/
- GNUNET_DHT_GetIterator iter;
+ int free_on_send;
/**
- * Closure for the iterator callback
+ * GNUNET_YES if this message is in our pending queue right now.
*/
- void *iter_cls;
+ int in_pending_queue;
};
-struct GNUNET_DHT_FindPeerContext
+
+/**
+ * Handle to a PUT request.
+ */
+struct GNUNET_DHT_PutHandle
{
/**
- * Iterator to call on data receipt
+ * Kept in a DLL.
*/
- GNUNET_DHT_FindPeerProcessor proc;
+ struct GNUNET_DHT_PutHandle *next;
/**
- * Closure for the iterator callback
+ * Kept in a DLL.
*/
- void *proc_cls;
+ struct GNUNET_DHT_PutHandle *prev;
-};
+ /**
+ * Continuation to call when done.
+ */
+ GNUNET_DHT_PutContinuation cont;
-/**
- * Handle to control a unique operation (one that is
- * expected to return results)
- */
-struct GNUNET_DHT_RouteHandle
-{
+ /**
+ * Pending message associated with this PUT operation,
+ * NULL after the message has been transmitted to the service.
+ */
+ struct PendingMessage *pending;
/**
- * Unique identifier for this request (for key collisions)
+ * Main handle to this DHT api
*/
- uint64_t uid;
+ struct GNUNET_DHT_Handle *dht_handle;
/**
- * Key that this get request is for
+ * Closure for 'cont'.
*/
- GNUNET_HashCode key;
+ void *cont_cls;
+
+ /**
+ * Timeout task for this operation.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * Unique ID for the PUT operation.
+ */
+ 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
* Main handle to this DHT api
*/
struct GNUNET_DHT_Handle *dht_handle;
+
+ /**
+ * The actual message sent for this request,
+ * used for retransmitting requests on service
+ * failure/reconnect. Freed on route_stop.
+ */
+ 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 for a non unique request, holds callback
- * which needs to be called before we allow other
- * messages to be processed and sent to the DHT service
+ * Handle to a monitoring request.
*/
-struct GNUNET_DHT_NonUniqueHandle
+struct GNUNET_DHT_MonitorHandle
{
/**
- * Key that this get request is for
+ * DLL.
*/
- GNUNET_HashCode key;
+ struct GNUNET_DHT_MonitorHandle *next;
/**
- * Type of data get request was for
+ * DLL.
+ */
+ struct GNUNET_DHT_MonitorHandle *prev;
+
+ /**
+ * Main handle to this DHT api.
*/
- uint32_t type;
+ struct GNUNET_DHT_Handle *dht_handle;
/**
- * Continuation to call on service
- * confirmation of message receipt.
+ * Type of block looked for.
*/
- GNUNET_SCHEDULER_Task cont;
+ enum GNUNET_BLOCK_Type type;
/**
- * Send continuation cls
+ * Key being looked for, NULL == all.
*/
- void *cont_cls;
-};
+ struct GNUNET_HashCode *key;
-/**
- * Handle to control a get operation.
- */
-struct GNUNET_DHT_GetHandle
-{
/**
- * Handle to the actual route operation for the get
+ * Callback for each received message of type get.
*/
- struct GNUNET_DHT_RouteHandle *route_handle;
+ GNUNET_DHT_MonitorGetCB get_cb;
/**
- * The context of the get request
+ * Callback for each received message of type get response.
*/
- struct GNUNET_DHT_GetContext get_context;
-};
+ GNUNET_DHT_MonitorGetRespCB get_resp_cb;
-/**
- * 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 get request
- */
- struct GNUNET_DHT_FindPeerContext find_peer_context;
+ * Callback for each received message of type put.
+ */
+ GNUNET_DHT_MonitorPutCB put_cb;
+
+ /**
+ * Closure for cb.
+ */
+ void *cb_cls;
+
};
*/
struct GNUNET_DHT_Handle
{
- /**
- * Our scheduler.
- */
- struct GNUNET_SCHEDULER_Handle *sched;
/**
* Configuration to use.
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;
/**
- * Non unique handle. If set don't schedule another non
- * unique request.
+ * Head of linked list of messages we would like to monitor.
*/
- struct GNUNET_DHT_NonUniqueHandle *non_unique_request;
+ struct GNUNET_DHT_MonitorHandle *monitor_head;
/**
- * Kill off the connection and any pending messages.
+ * Tail of linked list of messages we would like to monitor.
*/
- int do_destroy;
+ struct GNUNET_DHT_MonitorHandle *monitor_tail;
-};
+ /**
+ * Head of active PUT requests.
+ */
+ struct GNUNET_DHT_PutHandle *put_head;
-static struct GNUNET_TIME_Relative default_request_timeout;
+ /**
+ * Tail of active PUT requests.
+ */
+ struct GNUNET_DHT_PutHandle *put_tail;
-/* Forward declaration */
-static void process_pending_message (struct GNUNET_DHT_Handle *handle);
+ /**
+ * Hash map containing the current outstanding unique GET requests
+ * (values are of type 'struct GNUNET_DHT_GetHandle').
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *active_requests;
-static GNUNET_HashCode *
-hash_from_uid (uint64_t uid)
-{
- int count;
- int remaining;
- GNUNET_HashCode *hash;
- hash = GNUNET_malloc (sizeof (GNUNET_HashCode));
- count = 0;
+ /**
+ * Task for trying to reconnect.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
- while (count < sizeof (GNUNET_HashCode))
- {
- remaining = sizeof (GNUNET_HashCode) - count;
- if (remaining > sizeof (uid))
- remaining = sizeof (uid);
+ /**
+ * How quickly should we retry? Used for exponential back-off on
+ * connect-errors.
+ */
+ struct GNUNET_TIME_Relative retry_time;
- memcpy (hash, &uid, remaining);
- count += remaining;
- }
+ /**
+ * Generator for unique ids.
+ */
+ uint64_t uid_gen;
+
+ /**
+ * Did we start our receive loop yet?
+ */
+ int in_receive;
+};
- return hash;
-}
/**
* 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)
-{
- struct GNUNET_DHT_Handle *handle = cls;
- struct GNUNET_DHT_Message *dht_msg;
- struct GNUNET_DHT_StopMessage *stop_msg;
- struct GNUNET_MessageHeader *enc_msg;
- struct GNUNET_DHT_RouteHandle *route_handle;
- uint64_t uid;
- GNUNET_HashCode *uid_hash;
- size_t enc_size;
- /* TODO: find out message type, handle callbacks for different types of messages.
- * Should be a non unique acknowledgment, or unique result. */
-
- if (msg == NULL)
- {
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Received NULL from server, connection down?\n",
- "DHT API");
-#endif
- return;
- }
+static void
+service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
- switch (ntohs (msg->type))
- {
- case GNUNET_MESSAGE_TYPE_DHT:
- {
- dht_msg = (struct GNUNET_DHT_Message *) 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
- if (ntohs (dht_msg->unique))
- {
- uid_hash = hash_from_uid (uid);
- route_handle =
- GNUNET_CONTAINER_multihashmap_get (handle->outstanding_requests,
- uid_hash);
- GNUNET_free (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_Message);
- GNUNET_assert (enc_size > 0);
- enc_msg = (struct GNUNET_MessageHeader *) &dht_msg[1];
- route_handle->iter (route_handle->iter_cls, enc_msg);
-
- }
- }
- break;
- }
- case GNUNET_MESSAGE_TYPE_DHT_STOP:
- {
- stop_msg = (struct GNUNET_DHT_StopMessage *) msg;
- uid = GNUNET_ntohll (stop_msg->unique_id);
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Received response to message (uid %llu), current uid %llu\n",
- "DHT API", uid, handle->current->unique_id);
-#endif
- if (handle->current->unique_id == uid)
- {
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Have pending confirmation for this message!\n",
- "DHT API", uid);
-#endif
- if (handle->current->cont != NULL)
- GNUNET_SCHEDULER_add_continuation (handle->sched,
- handle->current->cont,
- handle->current->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-
- GNUNET_free (handle->current->msg);
- GNUNET_free (handle->current);
- handle->current = NULL;
- }
- break;
- }
- default:
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "`%s': Received unknown message type %d\n", "DHT API",
- ntohs (msg->type));
- }
- }
- GNUNET_CLIENT_receive (handle->client,
- &service_message_handler,
- handle, GNUNET_TIME_UNIT_FOREVER_REL);
+/**
+ * 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)
+{
+ 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;
}
/**
- * 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
+ * Add the request corresponding to the given route handle
+ * to the pending queue (if it is not already in there).
*
- * @return handle to the DHT service, or NULL on error
+ * @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)
*/
-struct GNUNET_DHT_Handle *
-GNUNET_DHT_connect (struct GNUNET_SCHEDULER_Handle *sched,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int ht_len)
+static int
+add_request_to_pending (void *cls, const struct GNUNET_HashCode * key, void *value)
{
- struct GNUNET_DHT_Handle *handle;
-
- handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_Handle));
+ struct GNUNET_DHT_Handle *handle = cls;
+ struct GNUNET_DHT_GetHandle *rh = value;
+
+ 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;
+}
- default_request_timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5);
- handle->cfg = cfg;
- handle->sched = sched;
- handle->current = NULL;
- handle->do_destroy = GNUNET_NO;
- handle->th = NULL;
+/**
+ * Try to send messages from list of messages to send
+ *
+ * @param handle DHT_Handle
+ */
+static void
+process_pending_messages (struct GNUNET_DHT_Handle *handle);
- handle->client = GNUNET_CLIENT_connect (sched, "dht", cfg);
- handle->outstanding_requests =
- GNUNET_CONTAINER_multihashmap_create (ht_len);
- if (handle->client == NULL)
- {
- GNUNET_free (handle);
- return NULL;
- }
-#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);
+/**
+ * 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)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
- return handle;
+ 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);
}
/**
- * Shutdown connection with the DHT service.
+ * Try reconnecting to the DHT service.
*
- * @param handle handle of the DHT connection to stop
+ * @param handle handle to dht to (possibly) disconnect and reconnect
*/
-void
-GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
+static void
+do_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);
+ struct GNUNET_DHT_PutHandle *ph;
+ struct GNUNET_DHT_PutHandle *next;
- if (handle->th != NULL) /* We have a live transmit request in the Aether */
+ 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)
{
- GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
- handle->th = NULL;
+ if (NULL != ph->cont)
+ ph->cont (ph->cont_cls, GNUNET_SYSERR);
+ GNUNET_DHT_put_cancel (ph);
}
- if (handle->current != NULL) /* We are trying to send something now, clean it up */
- GNUNET_free (handle->current);
+ }
+ handle->reconnect_task =
+ GNUNET_SCHEDULER_add_delayed (handle->retry_time, &try_reconnect, handle);
+}
- if (handle->client != NULL) /* Finally, disconnect from the service */
- {
- GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
- handle->client = NULL;
- }
- GNUNET_free (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);
/**
- * Send complete (or failed), schedule next (or don't)
+ * Try to send messages from list of messages to send
+ *
+ * @param handle handle to DHT
*/
static void
-finish (struct GNUNET_DHT_Handle *handle, int code)
+process_pending_messages (struct GNUNET_DHT_Handle *handle)
{
- /* TODO: if code is not GNUNET_OK, do something! */
- struct PendingMessage *pos = handle->current;
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s': Finish called!\n", "DHT API");
-#endif
- GNUNET_assert (pos != NULL);
-
- if (pos->is_unique)
- {
- if (pos->cont != NULL)
- {
- 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);
- }
-
- GNUNET_free (pos->msg);
- handle->current = NULL;
- GNUNET_free (pos);
- }
- /* Otherwise we need to wait for a response to this message! */
+ 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
- /* FIXME: free associated resources or summat */
- finish (handle, GNUNET_SYSERR);
- return 0;
- }
-
handle->th = NULL;
-
- 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;
+ 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;
+
+ 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 (re)connect to the dht service.
+ * Process a given reply that might match the given
+ * request.
*
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @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 int
-try_connect (struct GNUNET_DHT_Handle *handle)
+process_reply (void *cls, const struct GNUNET_HashCode * key, void *value)
{
- if (handle->client != NULL)
- return GNUNET_OK;
- handle->client = GNUNET_CLIENT_connect (handle->sched, "dht", handle->cfg);
- if (handle->client != NULL)
+ 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 (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;
-#if DEBUG_STATISTICS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Failed to connect to the dht service!\n"));
-#endif
- return GNUNET_NO;
+ }
+ 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;
}
-
/**
- * Try to send messages from list of messages to send
+ * 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
-process_pending_message (struct GNUNET_DHT_Handle *handle)
+static int
+process_monitor_get_message (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_DHT_MonitorGetMessage *msg)
{
-
- if (handle->current == NULL)
- return; /* action already pending */
- if (GNUNET_YES != try_connect (handle))
- {
- finish (handle, GNUNET_SYSERR);
- return;
- }
-
- /* TODO: set do_destroy somewhere's, see what needs to happen in that case! */
- if (handle->do_destroy)
- {
- //GNUNET_DHT_disconnect (handle); /* FIXME: replace with proper disconnect stuffs */
- }
-
-
- 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);
- }
-#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
+ 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;
}
+
/**
- * Iterator called on each result obtained from a generic route
- * operation
+ * 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.
*/
-void
-get_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply)
+static int
+process_monitor_get_resp_message (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_DHT_MonitorGetRespMessage
+ *msg)
{
- 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;
+ struct GNUNET_DHT_MonitorHandle *h;
+ struct GNUNET_PeerIdentity *path;
+ uint32_t getl;
+ uint32_t putl;
+ size_t msize;
- GNUNET_assert (ntohs (reply->size) >=
- sizeof (struct GNUNET_DHT_GetResultMessage));
- result = (struct GNUNET_DHT_GetResultMessage *) reply;
- data_size = ntohs (result->data_size);
- GNUNET_assert (ntohs (reply->size) ==
- sizeof (struct GNUNET_DHT_GetResultMessage) + data_size);
- 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);
+ 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;
}
/**
- * Iterator called on each result obtained from a generic route
- * operation
+ * 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.
*/
-void
-find_peer_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply)
+static int
+process_monitor_put_message (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_DHT_MonitorPutMessage *msg)
{
- struct GNUNET_DHT_FindPeerHandle *find_peer_handle = cls;
- struct GNUNET_DHT_FindPeerResultMessage *result;
- size_t data_size;
- struct GNUNET_MessageHeader *result_data;
-
- if (ntohs (reply->type) != GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT)
- return;
-
- GNUNET_assert (ntohs (reply->size) >=
- sizeof (struct GNUNET_DHT_FindPeerResultMessage));
- result = (struct GNUNET_DHT_FindPeerResultMessage *) reply;
- data_size = ntohs (result->data_size);
- GNUNET_assert (ntohs (reply->size) ==
- sizeof (struct GNUNET_DHT_GetResultMessage) + data_size);
-
- if (data_size > 0)
- result_data = (struct GNUNET_MessageHeader *) &result[1]; /* Set data pointer to end of message */
- else
- result_data = NULL;
-
- find_peer_handle->find_peer_context.proc (find_peer_handle->
- find_peer_context.proc_cls,
- &result->peer, result_data);
+ 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;
}
+
/**
- * Perform an asynchronous FIND_PEER operation on the DHT.
+ * Process a put confirmation message from the 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 cont_cls closure for cont
- *
- * @return handle to stop the request, NULL if the request is "fire and forget"
+ * @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.
*/
-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)
+static int
+process_put_confirmation_message (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_DHT_ClientPutConfirmationMessage *msg)
{
- struct GNUNET_DHT_RouteHandle *route_handle;
- struct PendingMessage *pending;
- struct GNUNET_DHT_Message *message;
- size_t is_unique;
- size_t msize;
- GNUNET_HashCode *uid_key;
- uint64_t uid;
+ struct GNUNET_DHT_PutHandle *ph;
+ GNUNET_DHT_PutContinuation cont;
+ void *cont_cls;
- is_unique = GNUNET_YES;
- if (iter == NULL)
- is_unique = GNUNET_NO;
+ 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;
+}
- route_handle = NULL;
- uid_key = NULL;
- do
+/**
+ * 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
+ */
+static void
+service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
+ 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))
{
- GNUNET_free_non_null (uid_key);
- uid = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, -1);
- uid_key = hash_from_uid (uid);
+ GNUNET_break (0);
+ break;
}
- while (GNUNET_CONTAINER_multihashmap_contains
- (handle->outstanding_requests, uid_key) == GNUNET_YES);
-
- if (is_unique)
+ 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))
{
- 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;
- route_handle->uid = uid;
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Unique ID is %llu\n", "DHT API", uid);
-#endif
- /**
- * Store based on random identifier!
- */
- GNUNET_CONTAINER_multihashmap_put (handle->outstanding_requests,
- uid_key, route_handle,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- msize = sizeof (struct GNUNET_DHT_Message) + ntohs (enc->size);
-
+ GNUNET_break (0);
+ break;
}
- else
+ 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))
{
- msize = sizeof (struct GNUNET_DHT_Message) + ntohs (enc->size);
+ GNUNET_break (0);
+ break;
}
-
- GNUNET_free (uid_key);
- message = GNUNET_malloc (msize);
- message->header.size = htons (msize);
- message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT);
- memcpy (&message->key, key, sizeof (GNUNET_HashCode));
- message->options = htons (options);
- message->desired_replication_level = htons (options);
- message->unique = htons (is_unique);
- message->unique_id = GNUNET_htonll (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->is_unique = is_unique;
- pending->unique_id = uid;
-
- GNUNET_assert (handle->current == NULL);
-
- handle->current = pending;
-
- process_pending_message (handle);
-
- return route_handle;
+ 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);
}
-void
-GNUNET_DHT_route_stop (struct GNUNET_DHT_RouteHandle *route_handle,
- GNUNET_SCHEDULER_Task cont, void *cont_cls);
/**
- * Perform an asynchronous GET operation on the DHT identified.
+ * Initialize the connection with the DHT service.
*
- * @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 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
+ * @param cfg configuration to use
+ * @param ht_len size of the internal hash table to use for
+ * processing multiple GET/FIND requests in parallel
*
- * @return handle to stop the async get
+ * @return handle to the DHT service, or NULL on error
*/
-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)
+struct GNUNET_DHT_Handle *
+GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ unsigned int ht_len)
{
- struct GNUNET_DHT_GetHandle *get_handle;
- struct GNUNET_DHT_GetMessage *get_msg;
+ struct GNUNET_DHT_Handle *handle;
- if (handle->current != NULL) /* Can't send right now, we have a pending message... */
+ handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_Handle));
+ handle->cfg = cfg;
+ 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;
-
- 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 = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetMessage));
- get_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET);
- get_msg->header.size = htons (sizeof (struct GNUNET_DHT_GetMessage));
- get_msg->type = htonl (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);
- return get_handle;
+ }
+ return 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
+ * Shutdown connection with the DHT service.
*
+ * @param handle handle of the DHT connection to stop
*/
void
-GNUNET_DHT_route_stop (struct GNUNET_DHT_RouteHandle *route_handle,
- GNUNET_SCHEDULER_Task cont, void *cont_cls)
+GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
{
- struct PendingMessage *pending;
- struct GNUNET_DHT_StopMessage *message;
- size_t msize;
- GNUNET_HashCode *uid_key;
-
- msize = sizeof (struct GNUNET_DHT_StopMessage);
+ struct PendingMessage *pm;
+ struct GNUNET_DHT_PutHandle *ph;
+
+ 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);
+ }
+
+ 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);
+}
- 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);
- GNUNET_assert (route_handle->dht_handle->current == NULL);
+/**
+ * Timeout for the transmission of a fire&forget-request. Clean it up.
+ *
+ * @param cls the 'struct PendingMessage'
+ * @param tc scheduler context
+ */
+static void
+timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_DHT_PutHandle *ph = cls;
+ struct GNUNET_DHT_Handle *handle = ph->dht_handle;
+
+ 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);
+}
- pending = GNUNET_malloc (sizeof (struct PendingMessage));
- pending->msg = (struct GNUNET_MessageHeader *) message;
- pending->timeout = DEFAULT_DHT_TIMEOUT;
- pending->cont = cont;
- pending->cont_cls = cont_cls;
- pending->is_unique = GNUNET_NO;
- pending->unique_id = route_handle->uid;
- GNUNET_assert (route_handle->dht_handle->current == NULL);
+/**
+ * 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
+ */
+static void
+mark_put_message_gone (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_DHT_PutHandle *ph = cls;
- route_handle->dht_handle->current = pending;
+ ph->pending = NULL;
+}
- process_pending_message (route_handle->dht_handle);
- uid_key = hash_from_uid (route_handle->uid);
+/**
+ * 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 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
+ */
+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_ClientPutMessage *put_msg;
+ size_t msize;
+ struct PendingMessage *pending;
+ struct GNUNET_DHT_PutHandle *ph;
- if (GNUNET_CONTAINER_multihashmap_remove
- (route_handle->dht_handle->outstanding_requests, uid_key,
- route_handle) != GNUNET_YES)
- {
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Remove outstanding request from hashmap failed for key %s, uid %llu\n",
- "DHT API", GNUNET_h2s (uid_key), route_handle->uid);
-#endif
- }
- GNUNET_free (uid_key);
- return;
+ 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;
}
/**
- * Stop async DHT-get.
+ * 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 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
+ * @param ph put operation to cancel ('cont' will no longer be called)
*/
void
-GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle,
- GNUNET_SCHEDULER_Task cont, void *cont_cls)
+GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph)
{
-#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);
- GNUNET_free (get_handle);
-
+ struct GNUNET_DHT_Handle *handle = ph->dht_handle;
+
+ if (NULL != ph->pending)
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ ph->pending);
+ GNUNET_free (ph->pending);
+ ph->pending = NULL;
+ }
+ 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 FIND PEER operation on the DHT.
+ * Perform an asynchronous GET operation on the DHT identified. See
+ * also "GNUNET_BLOCK_evaluate".
*
* @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 message a message to inject at found peers (may be null)
+ * @param type expected type of the response object
* @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
- *
- * @return handle to stop the async get, NULL on error
+ * @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
+ * @return handle to stop the async get
*/
-struct GNUNET_DHT_FindPeerHandle *
-GNUNET_DHT_find_peer_start (struct GNUNET_DHT_Handle *handle,
- struct GNUNET_TIME_Relative timeout,
- enum GNUNET_DHT_RouteOption options,
- struct GNUNET_MessageHeader *message,
- const GNUNET_HashCode * key,
- GNUNET_DHT_FindPeerProcessor proc,
- void *proc_cls,
- GNUNET_SCHEDULER_Task cont, void *cont_cls)
+struct GNUNET_DHT_GetHandle *
+GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle,
+ 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_FindPeerHandle *find_peer_handle;
- struct GNUNET_DHT_FindPeerMessage *find_peer_msg;
+ struct GNUNET_DHT_ClientGetMessage *get_msg;
+ struct GNUNET_DHT_GetHandle *get_handle;
size_t msize;
+ struct PendingMessage *pending;
- if (handle->current != NULL) /* 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->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;
+}
- if (message != NULL)
- msize = ntohs (message->size);
- else
- msize = 0;
- 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;
+/**
+ * Stop async DHT-get.
+ *
+ * @param get_handle handle to the GET operation to stop
+ */
+void
+GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle)
+{
+ 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': Inserting pending `%s' request with key %s\n", "DHT API",
- "FIND PEER", GNUNET_h2s (key));
-#endif
-
- find_peer_msg =
- GNUNET_malloc (sizeof (struct GNUNET_DHT_FindPeerMessage) + msize);
- find_peer_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_FIND_PEER);
- find_peer_msg->header.size =
- htons (sizeof (struct GNUNET_DHT_FindPeerMessage));
- find_peer_msg->msg_len = msize;
-
- if (message != NULL)
- {
- memcpy (&find_peer_msg[1], message, msize);
- }
+ 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);
- find_peer_handle->route_handle =
- GNUNET_DHT_route_start (handle, key, 0, options, &find_peer_msg->header,
- timeout, &find_peer_reply_iterator,
- find_peer_handle, cont, cont_cls);
- return find_peer_handle;
+ process_pending_messages (handle);
}
+
/**
- * Stop async find peer. Frees associated resources.
+ * Start monitoring the local DHT service.
+ *
+ * @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.
*
- * @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
+ * @return Handle to stop monitoring.
*/
-void
-GNUNET_DHT_find_peer_stop (struct GNUNET_DHT_FindPeerHandle *find_peer_handle,
- 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)
{
-#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);
+ struct GNUNET_DHT_MonitorHandle *h;
+ struct GNUNET_DHT_MonitorStartStopMessage *m;
+ struct PendingMessage *pending;
+ h = GNUNET_malloc (sizeof (struct GNUNET_DHT_MonitorHandle));
+ GNUNET_CONTAINER_DLL_insert(handle->monitor_head, handle->monitor_tail, h);
+
+ 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));
+ }
+
+ 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 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 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;
- size_t msize;
-
- if (handle->current != NULL)
- {
- GNUNET_SCHEDULER_add_continuation (handle->sched, cont, cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- return;
- }
+ struct GNUNET_DHT_MonitorStartStopMessage *m;
+ struct PendingMessage *pending;
-#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
+ 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);
+}
- 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 = htonl (type);
- put_msg->data_size = htons (size);
- put_msg->expiration = exp;
- memcpy (&put_msg[1], data, size);
- GNUNET_DHT_route_start (handle, key, 0, 0, &put_msg->header, timeout, NULL,
- NULL, cont, cont_cls);
- GNUNET_free (put_msg);
-}
+/* end of dht_api.c */
projects / oweals / gnunet.git / blobdiff