* @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"
#define DEBUG_DHT_API GNUNET_NO
+/**
+ * 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;
-
- /**
- * Unique ID for this request
- */
- uint64_t unique_id;
-
-};
-
-struct PendingMessageList
-{
+ struct GNUNET_DHT_Handle *handle;
+
/**
- * This is a singly linked list.
+ * Continuation to call when the request has been
+ * transmitted (for the first time) to the service; can be NULL.
*/
- struct PendingMessageList *next;
+ GNUNET_SCHEDULER_Task cont;
/**
- * The pending message.
+ * Closure for 'cont'.
*/
- struct PendingMessage *message;
-};
+ void *cont_cls;
-struct GNUNET_DHT_GetContext
-{
/**
- * Iterator to call on data receipt
+ * Timeout task for this message
*/
- GNUNET_DHT_GetIterator iter;
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
/**
- * Closure for the iterator callback
+ * Unique ID for this request
*/
- void *iter_cls;
-
-};
+ uint64_t unique_id;
-struct GNUNET_DHT_FindPeerContext
-{
/**
- * 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_FindPeerProcessor proc;
+ int free_on_send;
/**
- * Closure for the iterator callback
+ * GNUNET_YES if this message is in our pending queue right now.
*/
- void *proc_cls;
+ int in_pending_queue;
};
+
/**
* Handle to a route request
*/
struct GNUNET_DHT_RouteHandle
{
- /**
- * Unique identifier for this request (for key collisions)
- */
- uint64_t uid;
-
- /**
- * Key that this get request is for
- */
- GNUNET_HashCode key;
-
/**
* Iterator to call on data receipt
*/
* used for retransmitting requests on service
* failure/reconnect. Freed on route_stop.
*/
- struct GNUNET_DHT_RouteMessage *message;
-};
-
-
-/**
- * Handle to control a get operation.
- */
-struct GNUNET_DHT_GetHandle
-{
- /**
- * Handle to the actual route operation for the get
- */
- struct GNUNET_DHT_RouteHandle *route_handle;
-
- /**
- * The context of the get request
- */
- struct GNUNET_DHT_GetContext get_context;
-};
-
-
-/**
- * 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;
-};
-
+ struct PendingMessage *message;
-enum DHT_Retransmit_Stage
-{
/**
- * The API is not retransmitting anything at this time.
+ * Key that this get request is for
*/
- DHT_NOT_RETRANSMITTING,
+ GNUNET_HashCode key;
/**
- * The API is retransmitting, and nothing has been single
- * queued for sending.
+ * Unique identifier for this request (for key collisions). FIXME: redundant!?
*/
- DHT_RETRANSMITTING,
+ uint64_t uid;
- /**
- * The API is retransmitting, and a single message has been
- * queued for transmission once finished.
- */
- DHT_RETRANSMITTING_MESSAGE_QUEUED
};
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.
- */
- struct PendingMessage *current;
-
- /**
- * Hash map containing the current outstanding unique requests
+ * Head of linked list of messages we would like to transmit.
*/
- struct GNUNET_CONTAINER_MultiHashMap *outstanding_requests;
+ struct PendingMessage *pending_head;
/**
- * Generator for unique ids.
+ * Tail of linked list of messages we would like to transmit.
*/
- uint64_t uid_gen;
+ struct PendingMessage *pending_tail;
/**
- * Are we currently retransmitting requests? If so queue a _single_
- * new request when received.
+ * Hash map containing the current outstanding unique requests
+ * (values are of type 'struct GNUNET_DHT_RouteHandle').
*/
- enum DHT_Retransmit_Stage retransmit_stage;
+ struct GNUNET_CONTAINER_MultiHashMap *active_requests;
/**
- * Linked list of retranmissions, to be used in the event
- * of a dht service disconnect/reconnect.
+ * Generator for unique ids.
*/
- struct PendingMessageList *retransmissions;
+ uint64_t uid_gen;
- /**
- * A single pending message allowed to be scheduled
- * during retransmission phase.
- */
- struct PendingMessage *retransmission_buffer;
};
/**
- * Convert unique ID to hash code.
- *
- * @param uid unique ID to convert
- * @param hash set to uid (extended with zeros)
+ * Transmit the next pending message, called by notify_transmit_ready
*/
-static void
-hash_from_uid (uint64_t uid,
- GNUNET_HashCode *hash)
-{
- memset (hash, 0, sizeof(GNUNET_HashCode));
- *((uint64_t*)hash) = uid;
-}
+static size_t
+transmit_pending (void *cls,
+ size_t size,
+ void *buf);
+
-#if RETRANSMIT
/**
- * Iterator callback to retransmit each outstanding request
- * because the connection to the DHT service went down (and
- * came back).
- *
+ * Handler for messages received from the DHT service
+ * a demultiplexer which handles numerous message types
*
*/
-static int retransmit_iterator (void *cls,
- const 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;
-
- return GNUNET_OK;
-}
-#endif
+static void
+service_message_handler (void *cls,
+ const struct GNUNET_MessageHeader *msg);
+
+
+
/**
- * Try to (re)connect to the dht service.
+ * Try to (re)connect to the DHT service.
*
* @return GNUNET_YES on success, GNUNET_NO on failure.
*/
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
+ if (handle->client == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to connect to the DHT service!\n"));
+ return GNUNET_NO;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Failed to connect to the dht service!\n"));
-#endif
- return GNUNET_NO;
+ "Starting to process replies from DHT\n");
+ GNUNET_CLIENT_receive (handle->client,
+ &service_message_handler,
+ handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return GNUNET_YES;
}
-/**
- * Send complete (or failed), call continuation if we have one.
- */
-static void
-finish (struct GNUNET_DHT_Handle *handle, int code)
-{
- struct PendingMessage *pos = handle->current;
- GNUNET_HashCode uid_hash;
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s': Finish called!\n", "DHT API");
-#endif
- GNUNET_assert (pos != NULL);
- hash_from_uid (pos->unique_id, &uid_hash);
- 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);
- }
-
- 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
+ * 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_RouteHandle*'
+ * @return GNUNET_YES (always)
*/
-static size_t
-transmit_pending (void *cls, size_t size, void *buf)
+static int
+add_request_to_pending (void *cls,
+ const GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_DHT_Handle *handle = cls;
- size_t tsize;
+ struct GNUNET_DHT_RouteHandle *rh = value;
-#if DEBUG_DHT_API
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': In transmit_pending\n", "DHT API");
-#endif
- if (buf == NULL)
+ if (GNUNET_NO == rh->message->in_pending_queue)
{
-#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;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ rh->message);
+ rh->message->in_pending_queue = GNUNET_YES;
}
+ return GNUNET_YES;
+}
- handle->th = NULL;
- if (handle->current != NULL)
+/**
+ * Re-connect to the DHT, re-issue all pending requests if needed.
+ */
+static void
+reconnect (struct GNUNET_DHT_Handle *handle)
+{
+ if (handle->client != 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;
- }
+ GNUNET_CLIENT_disconnect (handle->client,
+ GNUNET_NO);
+ handle->client = NULL;
}
- /* Have no pending request */
- return 0;
+ if (GNUNET_YES != try_connect (handle))
+ return;
+ GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests,
+ &add_request_to_pending,
+ handle);
+ if (handle->pending_head == NULL)
+ return;
+ GNUNET_CLIENT_notify_transmit_ready (handle->client,
+ ntohs(handle->pending_head->msg->size),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO,
+ &transmit_pending,
+ handle);
+
}
+
/**
* Try to send messages from list of messages to send
*/
static void
-process_pending_message (struct GNUNET_DHT_Handle *handle)
+process_pending_messages (struct GNUNET_DHT_Handle *handle)
{
+ struct PendingMessage *head;
- if (handle->current == NULL)
- return; /* action already pending */
if (GNUNET_YES != try_connect (handle))
+ return;
+ if (handle->th != NULL)
+ 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)
{
- finish (handle, GNUNET_SYSERR);
+ reconnect (handle);
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
}
-/**
- * Send complete (or failed), call continuation if we have one.
- * Forward declaration.
- */
-static void
-finish_retransmission (struct GNUNET_DHT_Handle *handle, int code);
-
-/* 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
+ * Transmit the next pending message, called by notify_transmit_ready
*/
-static void
-process_pending_retransmissions (struct GNUNET_DHT_Handle *handle)
+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 (handle->current == NULL)
- return; /* action already pending */
- if (GNUNET_YES != try_connect (handle))
+ handle->th = NULL;
+ if (buf == NULL)
{
- finish_retransmission (handle, GNUNET_SYSERR);
- return;
+ reconnect (handle);
+ return 0;
}
-
- 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 (NULL == (head = handle->pending_head))
+ return 0;
+
+ tsize = ntohs (head->msg->size);
+ if (size < tsize)
{
-#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;
+ process_pending_messages (handle);
+ return 0;
+ }
+ memcpy (buf, head->msg, tsize);
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ head);
+ if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (handle->sched,
+ head->timeout_task);
+ head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
-#if DEBUG_DHT_API
+ if (NULL != head->cont)
+ {
+ GNUNET_SCHEDULER_add_continuation (handle->sched,
+ head->cont,
+ head->cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ head->cont = NULL;
+ head->cont_cls = NULL;
+ }
+ head->in_pending_queue = GNUNET_NO;
+ if (GNUNET_YES == head->free_on_send)
+ GNUNET_free (head);
+ process_pending_messages (handle);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s': Scheduled sending message of size %d to service\n",
- "DHT API", ntohs (handle->current->msg->size));
-#endif
+ "Forwarded request of %u bytes to DHT service\n",
+ (unsigned int) tsize);
+ return tsize;
}
+
+
+
/**
- * Send complete (or failed), call continuation if we have one.
+ * Process a given reply that might match the given
+ * request.
*/
-static void
-finish_retransmission (struct GNUNET_DHT_Handle *handle, int code)
+static int
+process_reply (void *cls,
+ const GNUNET_HashCode *key,
+ void *value)
{
- 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)
+ const struct GNUNET_DHT_RouteResultMessage *dht_msg = cls;
+ struct GNUNET_DHT_RouteHandle *rh = value;
+ const struct GNUNET_MessageHeader *enc_msg;
+ size_t enc_size;
+ uint64_t uid;
+ const struct GNUNET_PeerIdentity **get_path;
+ const struct GNUNET_PeerIdentity **put_path;
+ const struct GNUNET_PeerIdentity *pos;
+ uint16_t gpl;
+ uint16_t ppl;
+ unsigned int i;
+
+ uid = GNUNET_ntohll (dht_msg->unique_id);
+ if (uid != rh->uid)
{
- handle->retransmit_stage = DHT_NOT_RETRANSMITTING;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reply UID did not match request UID\n");
+ return GNUNET_YES;
}
-
- if (handle->retransmissions != NULL)
+ enc_size = ntohs (dht_msg->header.size) - sizeof (struct GNUNET_DHT_RouteResultMessage);
+ if (enc_size < sizeof (struct GNUNET_MessageHeader))
+ {
+ GNUNET_break (0);
+ return GNUNET_NO;
+ }
+ pos = (const struct GNUNET_PeerIdentity *) &dht_msg[1];
+ ppl = ntohs (dht_msg->put_path_length);
+ gpl = ntohs (dht_msg->get_path_length);
+ if ( (ppl + gpl) * sizeof (struct GNUNET_PeerIdentity) > enc_size)
+ {
+ GNUNET_break (0);
+ return GNUNET_NO;
+ }
+ if (ppl > 0)
{
- handle->current = handle->retransmissions->message;
- process_pending_retransmissions(handle);
+ put_path = GNUNET_malloc ((ppl+1) * sizeof (struct GNUNET_PeerIdentity*));
+ for (i=0;i<ppl;i++)
+ {
+ put_path[i] = pos;
+ pos++;
+ }
+ put_path[ppl] = NULL;
}
- else if (handle->retransmission_buffer != NULL)
+ else
+ put_path = NULL;
+ if (gpl > 0)
{
- handle->current = handle->retransmission_buffer;
- process_pending_message(handle);
+ get_path = GNUNET_malloc ((gpl+1) * sizeof (struct GNUNET_PeerIdentity*));
+ for (i=0;i<gpl;i++)
+ {
+ get_path[i] = pos;
+ pos++;
+ }
+ get_path[gpl] = NULL;
}
+ else
+ get_path = NULL;
+ enc_size -= (ppl + gpl) * sizeof (struct GNUNET_PeerIdentity);
+ enc_msg = (const struct GNUNET_MessageHeader *) pos;
+ if (enc_size != ntohs (enc_msg->size))
+ {
+ GNUNET_break (0);
+ GNUNET_free_non_null (get_path);
+ GNUNET_free_non_null (put_path);
+ return GNUNET_NO;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing reply.\n");
+ rh->iter (rh->iter_cls,
+ &rh->key,
+ get_path,
+ put_path,
+ enc_msg);
+ GNUNET_free_non_null (get_path);
+ GNUNET_free_non_null (put_path);
+ return GNUNET_YES;
}
+
/**
* 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
+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;
+ const struct GNUNET_DHT_RouteResultMessage *dht_msg;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s called\n",
+ __FUNCTION__);
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 ((handle->retransmit_stage != DHT_RETRANSMITTING) && (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);
- }
-#endif
+ "Error receiving data from DHT service, reconnecting\n");
+ reconnect (handle);
return;
}
-
- switch (ntohs (msg->type))
+ if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT)
{
- 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);
+ reconnect (handle);
+ return;
+ }
+ if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_RouteResultMessage))
+ {
+ GNUNET_break (0);
+ reconnect (handle);
+ return;
}
+ dht_msg = (const struct GNUNET_DHT_RouteResultMessage *) msg;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Comparing reply `%s' against %u pending requests.\n",
+ GNUNET_h2s (&dht_msg->key),
+ GNUNET_CONTAINER_multihashmap_size (handle->active_requests));
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
+ &dht_msg->key,
+ &process_reply,
+ (void*) dht_msg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Continuing to process replies from DHT\n");
GNUNET_CLIENT_receive (handle->client,
&service_message_handler,
handle, GNUNET_TIME_UNIT_FOREVER_REL);
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)
+ handle->uid_gen = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
+ handle->active_requests = GNUNET_CONTAINER_multihashmap_create (ht_len);
+ if (GNUNET_NO == try_connect (handle))
{
- GNUNET_free (handle);
+ GNUNET_DHT_disconnect (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);
return handle;
}
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 */
+ struct PendingMessage *pm;
+
+ GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size(handle->active_requests));
+ if (handle->th != NULL)
{
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);
-
- if (handle->client != NULL) /* Finally, disconnect from the service */
+ while (NULL != (pm = handle->pending_head))
{
- GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
- handle->client = NULL;
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ pm);
+ GNUNET_assert (GNUNET_YES == pm->free_on_send);
+ if (GNUNET_SCHEDULER_NO_TASK != pm->timeout_task)
+ GNUNET_SCHEDULER_cancel (handle->sched,
+ pm->timeout_task);
+ if (NULL != pm->cont)
+ GNUNET_SCHEDULER_add_continuation (handle->sched,
+ pm->cont,
+ pm->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ pm->in_pending_queue = GNUNET_NO;
+ GNUNET_free (pm);
}
-
- GNUNET_assert(GNUNET_CONTAINER_multihashmap_size(handle->outstanding_requests) == 0);
- GNUNET_CONTAINER_multihashmap_destroy(handle->outstanding_requests);
- GNUNET_free (handle);
-}
-
-
-/**
- * Transmit the next pending message, called by notify_transmit_ready
- */
-static size_t
-transmit_pending_retransmission (void *cls, size_t size, void *buf)
-{
- 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;
-
- if (handle->current != NULL)
+ if (handle->client != 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;
+ GNUNET_CLIENT_disconnect (handle->client, GNUNET_YES);
+ handle->client = NULL;
+ }
+ GNUNET_CONTAINER_multihashmap_destroy(handle->active_requests);
+ GNUNET_free (handle);
}
-/**
- * Iterator called on each result obtained from a generic route
- * operation
- */
-void
-get_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply)
-{
- 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);
- 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);
-}
+/* ***** Special low-level API providing generic routing abstraction ***** */
/**
- * Iterator called on each result obtained from a generic route
- * operation
+ * Timeout for the transmission of a fire&forget-request. Clean it up.
+ *
+ * @param cls the 'struct PendingMessage'
+ * @param tc scheduler context
*/
-void
-find_peer_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply)
+static void
+timeout_route_request (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_DHT_FindPeerHandle *find_peer_handle = cls;
- struct GNUNET_MessageHeader *hello;
-
- 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 = (struct GNUNET_MessageHeader *)&reply[1];
+ struct PendingMessage *pending = cls;
+ struct GNUNET_DHT_Handle *handle;
- if (ntohs(hello->type) != GNUNET_MESSAGE_TYPE_HELLO)
+ if (pending->free_on_send != GNUNET_YES)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Encapsulated message of type %d, is not a `%s' message!\n", ntohs(hello->type), "HELLO");
+ /* timeouts should only apply to fire & forget requests! */
+ GNUNET_break (0);
return;
}
- find_peer_handle->find_peer_context.proc (find_peer_handle->
- find_peer_context.proc_cls,
- (struct GNUNET_HELLO_Message *)hello);
+ handle = pending->handle;
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ pending);
+ if (pending->cont != NULL)
+ pending->cont (pending->cont_cls,
+ tc);
+ GNUNET_free (pending);
}
+
/**
- * Perform an asynchronous FIND_PEER operation on the DHT.
+ * Initiate a generic DHT route operation.
*
* @param handle handle to the DHT service
* @param key the key to look up
* @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
+ * to wait for tramission to the service; only applies
+ * if 'iter' is NULL
+ * @param cont continuation to call when the request has been transmitted
+ * the first time to the service
* @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,
+ const GNUNET_HashCode *key,
+ uint32_t 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)
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
{
- struct GNUNET_DHT_RouteHandle *route_handle;
struct PendingMessage *pending;
struct GNUNET_DHT_RouteMessage *message;
+ struct GNUNET_DHT_RouteHandle *route_handle;
uint16_t msize;
- GNUNET_HashCode uid_key;
-
- if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING))
- return NULL;
+ uint16_t esize;
- if (sizeof (struct GNUNET_DHT_RouteMessage) + ntohs (enc->size) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ esize = ntohs (enc->size);
+ if (sizeof (struct GNUNET_DHT_RouteMessage) + esize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return NULL;
}
+ msize = sizeof (struct GNUNET_DHT_RouteMessage) + esize;
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ message = (struct GNUNET_DHT_RouteMessage*) &pending[1];
+ pending->msg = &message->header;
+ pending->handle = handle;
+ pending->cont = cont;
+ pending->cont_cls = cont_cls;
+
+ message->header.size = htons (msize);
+ message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE);
+ message->key = *key;
+ message->options = htonl ((uint32_t) options);
+ message->desired_replication_level = htonl (desired_replication_level);
+ handle->uid_gen++;
+ message->unique_id = GNUNET_htonll (handle->uid_gen);
+ memcpy (&message[1], enc, esize);
- 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,
+ route_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_RouteHandle));
+ route_handle->key = *key;
+ route_handle->iter = iter;
+ route_handle->iter_cls = iter_cls;
+ route_handle->dht_handle = handle;
+ route_handle->uid = handle->uid_gen;
+ route_handle->message = pending;
+ GNUNET_CONTAINER_multihashmap_put (handle->active_requests,
+ key,
+ route_handle,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
-
-#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)
+ else
{
- handle->current = pending;
- process_pending_message (handle);
+ route_handle = NULL;
+ pending->free_on_send = GNUNET_YES;
+ pending->timeout_task = GNUNET_SCHEDULER_add_delayed (handle->sched,
+ timeout,
+ &timeout_route_request,
+ pending);
}
- else if (handle->retransmit_stage == DHT_RETRANSMITTING)
- {
- handle->retransmit_stage = DHT_RETRANSMITTING_MESSAGE_QUEUED;
- handle->retransmission_buffer = pending;
- }
-
- route_handle->message = message;
- return route_handle;
-}
-
-
-/**
- * Perform an asynchronous GET operation on the DHT identified.
- *
- * @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
- *
- * @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)
-{
- struct GNUNET_DHT_GetHandle *get_handle;
- struct GNUNET_DHT_GetMessage get_msg;
-
- if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) /* Can't send right now, we have a pending message... */
- 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_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ pending);
+ pending->in_pending_queue = GNUNET_YES;
+ process_pending_messages (handle);
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);
-
- return get_handle;
+ "DHT route start request processed, returning %p\n",
+ route_handle);
+ return route_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)
+GNUNET_DHT_route_stop (struct GNUNET_DHT_RouteHandle *route_handle)
{
+ 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);
- 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->retransmit_stage == DHT_RETRANSMITTING)
+ handle = route_handle->dht_handle;
+ if (GNUNET_NO == route_handle->message->in_pending_queue)
{
- route_handle->dht_handle->retransmit_stage = DHT_RETRANSMITTING_MESSAGE_QUEUED;
- route_handle->dht_handle->retransmission_buffer = pending;
+ /* need to send stop message */
+ msize = sizeof (struct GNUNET_DHT_StopMessage);
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) +
+ msize);
+ message = (struct GNUNET_DHT_StopMessage*) &pending[1];
+ pending->msg = &message->header;
+ message->header.size = htons (msize);
+ message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP);
+ message->unique_id = GNUNET_htonll (route_handle->uid);
+ message->key = route_handle->key;
+ pending->handle = handle;
+ pending->free_on_send = GNUNET_YES;
+ pending->in_pending_queue = GNUNET_YES;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ pending);
+ process_pending_messages (handle);
}
else
{
- GNUNET_break(0);
+ /* simply remove pending request from message queue before
+ transmission, no need to transmit STOP request! */
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ route_handle->message);
}
-
- 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_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (route_handle->dht_handle->active_requests,
+ &route_handle->key,
+ route_handle));
GNUNET_free(route_handle->message);
GNUNET_free(route_handle);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "DHT route stop request processed\n");
}
+
+/* ***** Special API for controlling DHT routing maintenance ******* */
+
+
/**
- * Stop async DHT-get.
+ * Send a control message to the DHT.
*
- * @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 handle handle to the DHT service
+ * @param command command
+ * @param variable variable to the command
+ * @param cont continuation to call when done (transmitting request to service)
+ * @param cont_cls closure for cont
*/
-void
-GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle,
- GNUNET_SCHEDULER_Task cont, void *cont_cls)
+static void
+send_control_message (struct GNUNET_DHT_Handle *handle,
+ uint16_t command,
+ uint16_t variable,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
{
- 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_ControlMessage *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);
- GNUNET_free (get_handle);
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) +
+ sizeof(struct GNUNET_DHT_ControlMessage));
+ msg = (struct GNUNET_DHT_ControlMessage*) &pending[1];
+ pending->msg = &msg->header;
+ msg->header.size = htons (sizeof(struct GNUNET_DHT_ControlMessage));
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CONTROL);
+ msg->command = htons (command);
+ msg->variable = htons (variable);
+ pending->free_on_send = GNUNET_YES;
+ pending->cont = cont;
+ pending->cont_cls = cont_cls;
+ pending->in_pending_queue = GNUNET_YES;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ pending);
+ process_pending_messages (handle);
}
/**
- * Perform an asynchronous FIND PEER operation on the DHT.
+ * Send a message to the DHT telling it to issue a single find
+ * peer request using the peers unique identifier as key. This
+ * is used to fill the routing table, and is normally controlled
+ * by the DHT itself. However, for testing and perhaps more
+ * close control over the DHT, this can be explicitly managed.
*
* @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
- *
- * @return handle to stop the async get, NULL on error
+ * @param cont continuation to call when done (transmitting request to service)
+ * @param cont_cls closure for cont
*/
-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)
+void
+GNUNET_DHT_find_peers (struct GNUNET_DHT_Handle *handle,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_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;
+ send_control_message (handle,
+ GNUNET_MESSAGE_TYPE_DHT_FIND_PEER, 0,
+ cont, cont_cls);
+}
- 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;
-#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;
-}
+#if HAVE_MALICIOUS
/**
- * Stop async find peer. Frees associated resources.
+ * Send a message to the DHT telling it to start issuing random GET
+ * requests every 'frequency' milliseconds.
*
- * @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
+ * @param handle handle to the DHT service
+ * @param frequency delay between sending malicious messages
*/
void
-GNUNET_DHT_find_peer_stop (struct GNUNET_DHT_FindPeerHandle *find_peer_handle,
- GNUNET_SCHEDULER_Task cont, void *cont_cls)
+GNUNET_DHT_set_malicious_getter (struct GNUNET_DHT_Handle *handle,
+ struct GNUNET_TIME_Relative frequency)
{
- if ((find_peer_handle->route_handle->dht_handle->current != NULL) &&
- (find_peer_handle->route_handle->dht_handle->retransmit_stage != DHT_RETRANSMITTING))
+ if (frequency.value > UINT16_MAX)
{
- if (cont != NULL)
- {
- GNUNET_SCHEDULER_add_continuation (find_peer_handle->route_handle->dht_handle->sched, cont, cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- }
+ GNUNET_break (0);
return;
}
-
-#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);
-
+ send_control_message (handle,
+ GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET, frequency.value,
+ NULL, NULL);
}
-
/**
- * Perform a PUT operation storing data in the DHT.
- *
- * @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
+ * Send a message to the DHT telling it to start issuing random PUT
+ * requests every 'frequency' milliseconds.
*
- * @return GNUNET_YES if put message is queued for transmission
+ * @param handle handle to the DHT service
+ * @param frequency delay between sending malicious messages
*/
-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)
+void
+GNUNET_DHT_set_malicious_putter (struct GNUNET_DHT_Handle *handle,
+ struct GNUNET_TIME_Relative frequency)
{
- 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 (frequency.value > UINT16_MAX)
{
- if (cont != NULL)
- {
- GNUNET_SCHEDULER_add_continuation (handle->sched, cont, cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- }
+ GNUNET_break (0);
return;
}
+ send_control_message (handle,
+ GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT, frequency.value,
+ NULL, NULL);
+}
-#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
-
- 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);
- put_route = GNUNET_DHT_route_start (handle, key, 0, 0, &put_msg->header, timeout, NULL,
- NULL, cont, cont_cls);
+/**
+ * Send a message to the DHT telling it to start dropping
+ * all requests received.
+ *
+ * @param handle handle to the DHT service
+ */
+void
+GNUNET_DHT_set_malicious_dropper (struct GNUNET_DHT_Handle *handle)
+{
+ send_control_message (handle,
+ GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP, 0,
+ NULL, NULL);
+}
- 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);
+#endif
- GNUNET_free (put_msg);
-}
+/* end of dht_api.c */
projects / oweals / gnunet.git / blobdiff