/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ (C) 2009-2013 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
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
- *
* @file gns/gns_api.c
* @brief library to access the GNS service
* @author Martin Schanzenbach
+ * @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_constants.h"
#include "gns.h"
#include "gnunet_gns_service.h"
-#define DEBUG_GNS_API GNUNET_EXTRA_LOGGING
#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
-/* TODO into gnunet_protocols */
-#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP 23
-#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT 24
-#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN 25
-#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT 26
-
/**
- * Entry in our list of messages to be (re-)transmitted.
+ * Handle to a lookup request
*/
-struct PendingMessage
+struct GNUNET_GNS_LookupRequest
{
- /**
- * This is a doubly-linked list.
- */
- struct PendingMessage *prev;
-
- /**
- * This is a doubly-linked list.
- */
- struct PendingMessage *next;
-
- /**
- * Message that is pending, allocated at the end
- * of this struct.
- */
- const struct GNUNET_MessageHeader *msg;
-
- /**
- * Handle to the GNS API context.
- */
- struct GNUNET_GNS_Handle *handle;
-
- /**
- * Continuation to call when the request has been
- * transmitted (for the first time) to the service; can be NULL.
- */
- GNUNET_SCHEDULER_Task cont;
-
- /**
- * Closure for 'cont'.
- */
- void *cont_cls;
/**
- * Unique ID for this request
+ * DLL
*/
- uint64_t unique_id;
+ struct GNUNET_GNS_LookupRequest *next;
/**
- * 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.
+ * DLL
*/
+ struct GNUNET_GNS_LookupRequest *prev;
- int free_on_send;
/**
- * GNUNET_YES if this message is in our pending queue right now.
+ * handle to gns
*/
- int in_pending_queue;
-
-};
-
-/**
- * Handle to a Lookup request
- */
-struct GNUNET_GNS_LookupHandle
-{
-
- /**
- * Iterator to call on data receipt
- */
- GNUNET_GNS_LookupIterator iter;
+ struct GNUNET_GNS_Handle *gns_handle;
/**
- * Closure for the iterator callback
+ * processor to call on lookup result
*/
- void *iter_cls;
+ GNUNET_GNS_LookupResultProcessor lookup_proc;
/**
- * Main handle to this GNS api
+ * processor closure
*/
- struct GNUNET_GNS_Handle *gns_handle;
-
- /**
- * Key that this get request is for
- */
- GNUNET_HashCode key;
+ void *proc_cls;
/**
- * Unique identifier for this request (for key collisions).
+ * request id
*/
- uint64_t unique_id;
-
- struct PendingMessage *message;
+ uint32_t r_id;
};
/**
- * Handle to a shorten request
+ * Entry in our list of messages to be (re-)transmitted.
*/
-struct GNUNET_GNS_ShortenHandle
+struct PendingMessage
{
-
/**
- * Processor to call on data receipt
+ * This is a doubly-linked list.
*/
- GNUNET_GNS_ShortenResultProcessor proc;
+ struct PendingMessage *prev;
/**
- * Closure for the processor
+ * This is a doubly-linked list.
*/
- void *proc_cls;
+ struct PendingMessage *next;
/**
- * Main handle to this GNS api
+ * Size of the message.
*/
- struct GNUNET_GNS_Handle *gns_handle;
+ size_t size;
/**
- * Key that this get request is for
+ * request id
*/
- GNUNET_HashCode key;
+ uint32_t r_id;
/**
- * Unique identifier for this request (for key collisions).
+ * This message has been transmitted. GNUNET_NO if the message is
+ * in the "pending" DLL, GNUNET_YES if it has been transmitted to
+ * the service via the current client connection.
*/
- uint64_t unique_id;
-
- struct PendingMessage *message;
+ int transmitted;
};
struct GNUNET_CLIENT_TransmitHandle *th;
/**
- * Head of linked list of messages we would like to transmit.
+ * Head of linked list of shorten messages we would like to transmit.
*/
struct PendingMessage *pending_head;
/**
- * Tail of linked list of messages we would like to transmit.
+ * Tail of linked list of shorten messages we would like to transmit.
*/
struct PendingMessage *pending_tail;
/**
- * Hash maps containing the current outstanding unique requests.
+ * Head of linked list of lookup messages we would like to transmit.
+ */
+ struct GNUNET_GNS_LookupRequest *lookup_head;
+
+ /**
+ * Tail of linked list of lookup messages we would like to transmit.
*/
- struct GNUNET_CONTAINER_MultiHashMap *active_lookup_requests;
- struct GNUNET_CONTAINER_MultiHashMap *active_shorten_requests;
+ struct GNUNET_GNS_LookupRequest *lookup_tail;
+ /**
+ * Reconnect task
+ */
GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
/**
- * How quickly should we retry? Used for exponential back-off on
- * connect-errors.
+ * How long do we wait until we try to reconnect?
*/
- struct GNUNET_TIME_Relative retry_time;
+ struct GNUNET_TIME_Relative reconnect_backoff;
/**
- * Generator for unique ids.
+ * Request Id generator. Incremented by one for each request.
*/
- uint64_t uid_gen;
+ uint32_t r_id_gen;
/**
* Did we start our receive loop yet?
*/
int in_receive;
+
};
+
/**
* Try to send messages from list of messages to send
* @param handle GNS_Handle
static void
process_pending_messages (struct GNUNET_GNS_Handle *handle);
-/**
- * Try to (re)connect to the GNS service.
- *
- * @return GNUNET_YES on success, GNUNET_NO on failure.
- */
-static int
-try_connect (struct GNUNET_GNS_Handle *handle)
-{
- if (handle->client != NULL)
- return GNUNET_OK;
- handle->in_receive = GNUNET_NO;
- handle->client = GNUNET_CLIENT_connect ("gns", handle->cfg);
- if (handle->client == NULL)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to connect to the GNS service!\n"));
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
/**
- * Add the request corresponding to the given handle
- * to the pending queue (if it is not already in there).
+ * Reconnect to GNS service.
*
- * @param cls the 'struct GNUNET_GNS_Handle*'
- * @param key key for the request (not used)
- * @param value the 'struct GNUNET_GNS_LookupHandle*'
- * @return GNUNET_YES (always)
+ * @param handle the handle to the GNS service
*/
-static int
-add_lookup_request_to_pending (void *cls, const GNUNET_HashCode * key,
- void *value)
+static void
+reconnect (struct GNUNET_GNS_Handle *handle)
{
- struct GNUNET_GNS_Handle *handle = cls;
- struct GNUNET_GNS_LookupHandle *lh = value;
-
- if (GNUNET_NO == lh->message->in_pending_queue)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Retransmitting request related to %s to GNS %p\n", GNUNET_h2s(key),
- handle);
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- lh->message);
- lh->message->in_pending_queue = GNUNET_YES;
- }
- return GNUNET_YES;
+ GNUNET_assert (NULL == handle->client);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to connect to GNS\n");
+ handle->client = GNUNET_CLIENT_connect ("gns", handle->cfg);
+ GNUNET_assert (NULL != handle->client);
+ process_pending_messages (handle);
}
/**
- * Add the request corresponding to the given handle
- * to the pending queue (if it is not already in there).
+ * Reconnect to GNS
*
- * @param cls the 'struct GNUNET_GNS_Handle*'
- * @param key key for the request (not used)
- * @param value the 'struct GNUNET_GNS_ShortenHandle*'
- * @return GNUNET_YES (always)
+ * @param cls the handle
+ * @param tc task context
*/
-static int
-add_shorten_request_to_pending (void *cls, const GNUNET_HashCode * key,
- void *value)
+static void
+reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_GNS_Handle *handle = cls;
- struct GNUNET_GNS_ShortenHandle *sh = value;
- if (GNUNET_NO == sh->message->in_pending_queue)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Retransmitting shorten request related to %s to GNS %p\n",
- GNUNET_h2s(key),
- handle);
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- sh->message);
- sh->message->in_pending_queue = GNUNET_YES;
- }
- return GNUNET_YES;
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect (handle);
}
/**
- * Try reconnecting to the GNS service.
+ * Disconnect from service and then reconnect.
*
- * @param cls GNUNET_GNS_Handle
- * @param tc scheduler context
+ * @param handle our handle
*/
static void
-try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+force_reconnect (struct GNUNET_GNS_Handle *handle)
{
- struct GNUNET_GNS_Handle *handle = cls;
+ struct GNUNET_GNS_LookupRequest *lh;
+ struct PendingMessage *p;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting with GNS %p\n", handle);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- if (handle->retry_time.rel_value < GNUNET_CONSTANTS_SERVICE_RETRY.rel_value)
- handle->retry_time = GNUNET_CONSTANTS_SERVICE_RETRY;
- else
- handle->retry_time = GNUNET_TIME_relative_multiply (handle->retry_time, 2);
- if (handle->retry_time.rel_value > GNUNET_CONSTANTS_SERVICE_TIMEOUT.rel_value)
- handle->retry_time = GNUNET_CONSTANTS_SERVICE_TIMEOUT;
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_YES != try_connect (handle))
+ GNUNET_CLIENT_disconnect (handle->client);
+ handle->client = NULL;
+ handle->in_receive = GNUNET_NO;
+ for (lh = handle->lookup_head; NULL != lh; lh = lh->next)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS reconnect failed(!)\n");
- return;
+ p = (struct PendingMessage *) &lh[1];
+ if (GNUNET_NO == p->transmitted)
+ continue;
+ p->transmitted = GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ p);
}
- GNUNET_CONTAINER_multihashmap_iterate (handle->active_lookup_requests,
- &add_lookup_request_to_pending, handle);
- GNUNET_CONTAINER_multihashmap_iterate (handle->active_shorten_requests,
- &add_shorten_request_to_pending, handle);
- process_pending_messages (handle);
+ handle->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
+ handle->reconnect_task = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
+ &reconnect_task,
+ handle);
}
-/**
- * Try reconnecting to the GNS service.
- *
- * @param handle handle to gns to (possibly) disconnect and reconnect
- */
-static void
-do_disconnect (struct GNUNET_GNS_Handle *handle)
-{
- if (handle->client == NULL)
- return;
- GNUNET_assert (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
- if (NULL != handle->th)
- GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
- handle->th = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from GNS service, will try to reconnect in %llu ms\n",
- (unsigned long long) handle->retry_time.rel_value);
- GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
- handle->client = NULL;
- handle->reconnect_task =
- GNUNET_SCHEDULER_add_delayed (handle->retry_time, &try_reconnect, handle);
-}
-
/**
* Transmit the next pending message, called by notify_transmit_ready
+ *
+ * @param cls the closure
+ * @param size size of pending data
+ * @param buf buffer with pending data
+ * @return size data transmitted
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf);
+
/**
* Handler for messages received from the GNS service
*
* @param msg the incoming message
*/
static void
-message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
+process_message (void *cls, const struct GNUNET_MessageHeader *msg);
+
/**
* Try to send messages from list of messages to send
+ *
+ * @param handle the GNS handle
*/
static void
process_pending_messages (struct GNUNET_GNS_Handle *handle)
{
- struct PendingMessage *head;
+ struct PendingMessage *p = handle->pending_head;
- if (handle->client == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "process_pending_messages called, but client is null, reconnecting\n");
- do_disconnect (handle);
- return;
- }
-
- if (handle->th != NULL)
- return;
-
- if (NULL == (head = handle->pending_head))
- return;
-
+ if (NULL == handle->client)
+ return; /* wait for reconnect */
+ if (NULL != handle->th)
+ return; /* transmission request already pending */
+
+ while ((NULL != p) && (p->transmitted == GNUNET_YES))
+ p = p->next;
+ if (NULL == p)
+ return; /* no messages pending */
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to transmit %u bytes\n",
+ (unsigned int) p->size);
handle->th =
GNUNET_CLIENT_notify_transmit_ready (handle->client,
- ntohs (head->msg->size),
+ p->size,
GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_YES, &transmit_pending,
+ GNUNET_NO, &transmit_pending,
handle);
- if (NULL != handle->th)
- return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "notify_transmit_ready returned NULL, reconnecting\n");
- do_disconnect (handle);
+ GNUNET_break (NULL != handle->th);
}
/**
* Transmit the next pending message, called by notify_transmit_ready
+ *
+ * @param cls the closure
+ * @param size size of pending data
+ * @param buf buffer with pending data
+ * @return size data transmitted
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf)
{
struct GNUNET_GNS_Handle *handle = cls;
- struct PendingMessage *head;
+ char *cbuf = buf;
+ struct PendingMessage *p;
size_t tsize;
handle->th = NULL;
-
- if (buf == NULL)
+ if ((0 == size) || (NULL == buf))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission to GNS service failed! Reconnecting!\n");
- do_disconnect (handle);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission to GNS service failed!\n");
+ force_reconnect (handle);
return 0;
}
-
- if (NULL == (head = handle->pending_head))
+ if (NULL == (p = handle->pending_head))
return 0;
- tsize = ntohs (head->msg->size);
-
- if (size < tsize)
+ tsize = 0;
+ while ((NULL != (p = handle->pending_head)) && (p->size <= size))
{
- process_pending_messages (handle);
- return 0;
+ memcpy (&cbuf[tsize], &p[1], p->size);
+ tsize += p->size;
+ size -= p->size;
+ p->transmitted = GNUNET_YES;
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ p);
+ if (GNUNET_YES != handle->in_receive)
+ {
+ GNUNET_CLIENT_receive (handle->client, &process_message, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ handle->in_receive = GNUNET_YES;
+ }
}
-
- memcpy (buf, head->msg, tsize);
-
- GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
- head);
-
- head->in_pending_queue = GNUNET_NO;
-
- if (GNUNET_YES == head->free_on_send)
- GNUNET_free (head);
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending %u bytes\n",
+ (unsigned int) tsize);
process_pending_messages (handle);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Forwarded request of %u bytes to GNS service\n", (unsigned int) tsize);
-
- if (GNUNET_NO == handle->in_receive)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to process replies from GNS\n");
- handle->in_receive = GNUNET_YES;
- GNUNET_CLIENT_receive (handle->client, &message_handler, handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
- }
return tsize;
}
+
/**
- * Process a given reply that might match the given
- * request.
+ * Process a given reply to the lookup request
*
- * @param cls the 'struct GNUNET_GNS_ClientResultMessage'
- * @param key query of the request
- * @param value the 'struct GNUNET_GNS_LookupHandle' of a request matching the same key
- * @return GNUNET_YES to continue to iterate over all results,
- * GNUNET_NO if the reply is malformed
+ * @param qe a queue entry
+ * @param msg the lookup message received
*/
-static int
-process_shorten_reply (void *cls, const GNUNET_HashCode * key, void *value)
+static void
+process_lookup_reply (struct GNUNET_GNS_LookupRequest *qe,
+ const struct GNUNET_GNS_ClientLookupResultMessage *msg)
{
- const struct GNUNET_GNS_ClientShortenResultMessage *gns_msg = cls;
- struct GNUNET_GNS_ShortenHandle *shorten_handle = value;
- const char *name = (const char*)&((struct GNUNET_GNS_ClientShortenMessage *) &((shorten_handle->message)[1]))[1]; //FIXME
- const char *short_name;
+ struct GNUNET_GNS_Handle *handle = qe->gns_handle;
+ struct PendingMessage *p = (struct PendingMessage *) &qe[1];
+ uint32_t rd_count = ntohl (msg->rd_count);
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ size_t mlen;
- if (ntohs (((struct GNUNET_MessageHeader*)gns_msg)->size) <
- sizeof (struct GNUNET_GNS_ClientShortenResultMessage))
+ if (GNUNET_YES != p->transmitted)
{
+ /* service send reply to query we never managed to send!? */
GNUNET_break (0);
- do_disconnect (shorten_handle->gns_handle);
- return GNUNET_NO;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received reply for `%s' from GNS service\n",
- name);
-
- if (gns_msg->unique_id != shorten_handle->unique_id)
- {
- /* UID mismatch */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Ignoring reply for %s: UID mismatch: %llu/%llu\n", GNUNET_h2s (key),
- gns_msg->unique_id, shorten_handle->unique_id);
- return GNUNET_YES;
+ force_reconnect (handle);
+ return;
}
- short_name = (char*)&gns_msg[1];
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Giving shorten reply %s for %s to application\n",
- short_name, name);
-
- shorten_handle->proc (shorten_handle->proc_cls, name, short_name);
-
- GNUNET_CLIENT_receive (shorten_handle->gns_handle->client,
- &message_handler, shorten_handle->gns_handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return GNUNET_YES;
-}
-
-
-/**
- * Process a given reply to the lookup request
- *
- * @param cls the 'struct GNUNET_GNS_ClientResultMessage'
- * @param key query of the request
- * @param value the 'struct GNUNET_GNS_LookupHandle' 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
-process_lookup_reply (void *cls, const GNUNET_HashCode * key, void *value)
-{
- const struct GNUNET_GNS_ClientLookupResultMessage *gns_msg = cls;
- struct GNUNET_GNS_LookupHandle *lookup_handle = value;
- const char *name = (const char*) &lookup_handle[1];
- struct GNUNET_NAMESTORE_RecordData *rd;
- uint32_t rd_count;
-
- if (ntohs (((struct GNUNET_MessageHeader*)gns_msg)->size) <
- sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
+ mlen = ntohs (msg->header.size);
+ mlen -= sizeof (struct GNUNET_GNS_ClientLookupResultMessage);
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (mlen,
+ (const char*) &msg[1],
+ rd_count,
+ rd))
{
- GNUNET_break (0);
- do_disconnect (lookup_handle->gns_handle);
- return GNUNET_NO;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to serialize lookup reply from GNS service!\n"));
+ qe->lookup_proc (qe->proc_cls, 0, NULL);
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received lookup reply for `%s' from GNS service %p\n",
- name, lookup_handle->gns_handle);
-
- if (gns_msg->unique_id != lookup_handle->unique_id)
+ else
{
- /* UID mismatch */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Ignoring reply for %s: UID mismatch: %llu/%llu\n", GNUNET_h2s (key),
- gns_msg->unique_id, lookup_handle->unique_id);
- return GNUNET_YES;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received lookup reply from GNS service (%u records)\n",
+ (unsigned int) rd_count);
+ qe->lookup_proc (qe->proc_cls, rd_count, rd);
}
-
- rd_count = ntohl(gns_msg->rd_count);
- rd = (struct GNUNET_NAMESTORE_RecordData*)&gns_msg[1];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Giving lookup reply for %s to application\n",
- name);
-
- lookup_handle->iter (lookup_handle->iter_cls, name, rd_count, rd);
-
- GNUNET_CLIENT_receive (lookup_handle->gns_handle->client, &message_handler,
- lookup_handle->gns_handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return GNUNET_YES;
+ GNUNET_CONTAINER_DLL_remove (handle->lookup_head, handle->lookup_tail, qe);
+ GNUNET_free (qe);
}
+
/**
* Handler for messages received from the GNS service
*
* @param msg the incoming message
*/
static void
-message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+process_message (void *cls, const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_GNS_Handle *handle = cls;
+ struct GNUNET_GNS_LookupRequest *lr;
const struct GNUNET_GNS_ClientLookupResultMessage *lookup_msg;
- const struct GNUNET_GNS_ClientShortenResultMessage *shorten_msg;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got message\n");
- if (msg == NULL)
+ uint32_t r_id;
+
+ if (NULL == msg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error receiving data from GNS service, reconnecting\n");
- do_disconnect (handle);
+ force_reconnect (handle);
return;
}
-
- if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT)
+ switch (ntohs (msg->type))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got lookup msg\n");
+ case GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT:
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got LOOKUP_RESULT msg\n");
+ if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
+ {
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
lookup_msg = (const struct GNUNET_GNS_ClientLookupResultMessage *) msg;
- GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_lookup_requests,
- &lookup_msg->key,
- &process_lookup_reply,
- (void *) lookup_msg);
- }
- else if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got shorten msg\n");
- shorten_msg = (const struct GNUNET_GNS_ClientShortenResultMessage *) msg;
- GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_shorten_requests,
- &shorten_msg->key,
- &process_shorten_reply,
- (void *) shorten_msg);
- }
- else
- {
+ r_id = ntohl (lookup_msg->id);
+ for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
+ if (lr->r_id == r_id)
+ {
+ process_lookup_reply(lr, lookup_msg);
+ break;
+ }
+ break;
+ default:
GNUNET_break (0);
- do_disconnect (handle);
+ force_reconnect (handle);
return;
}
-
+ GNUNET_CLIENT_receive (handle->client, &process_message, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
}
* Initialize the connection with the GNS service.
*
* @param cfg configuration to use
- * @param ht_len size of the internal hash table to use for parallel requests
* @return handle to the GNS service, or NULL on error
*/
struct GNUNET_GNS_Handle *
{
struct GNUNET_GNS_Handle *handle;
- handle = GNUNET_malloc (sizeof (struct GNUNET_GNS_Handle));
+ handle = GNUNET_new (struct GNUNET_GNS_Handle);
handle->cfg = cfg;
- handle->uid_gen =
- GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
- handle->active_lookup_requests =
- GNUNET_CONTAINER_multihashmap_create (5);
- handle->active_shorten_requests =
- GNUNET_CONTAINER_multihashmap_create (5);
- if (GNUNET_NO == try_connect (handle))
- {
- GNUNET_GNS_disconnect (handle);
- return NULL;
- }
+ reconnect (handle);
return handle;
}
void
GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
{
- /* disco from GNS */
-}
-
-
-/**
- * Perform an asynchronous Lookup operation on the GNS.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param iter function to call on each result
- * @param iter_cls closure for iter
- * @return handle to stop the async get
- */
-struct GNUNET_GNS_LookupHandle *
-GNUNET_GNS_lookup_start (struct GNUNET_GNS_Handle *handle,
- const char * name,
- enum GNUNET_GNS_RecordType type,
- GNUNET_GNS_LookupIterator iter,
- void *iter_cls)
-{
- /* IPC to look for local entries, start dht lookup, return lookup_handle */
- struct GNUNET_GNS_ClientLookupMessage *lookup_msg;
- struct GNUNET_GNS_LookupHandle *lookup_handle;
- GNUNET_HashCode key;
- size_t msize;
- struct PendingMessage *pending;
-
- if (NULL == name)
+ if (NULL != handle->client)
{
- return NULL;
+ GNUNET_CLIENT_disconnect (handle->client);
+ handle->client = NULL;
}
-
- GNUNET_CRYPTO_hash (name, strlen(name), &key);
-
- msize = sizeof (struct GNUNET_GNS_ClientLookupMessage) + strlen(name);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting lookup for %s in GNS %p\n",
- name, handle);
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- lookup_msg = (struct GNUNET_GNS_ClientLookupMessage *) &pending[1];
- pending->msg = &lookup_msg->header;
- pending->handle = handle;
- pending->free_on_send = GNUNET_NO;
- lookup_msg->header.size = htons (msize);
- lookup_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
- lookup_msg->key = key;
- memcpy(&lookup_msg[1], name, strlen(name));
- handle->uid_gen++;
- lookup_msg->unique_id = handle->uid_gen;
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_YES;
- lookup_handle = GNUNET_malloc (sizeof (struct GNUNET_GNS_LookupHandle));
- lookup_handle->iter = iter;
- lookup_handle->iter_cls = iter_cls;
- lookup_handle->message = pending;
- lookup_handle->unique_id = lookup_msg->unique_id;
- GNUNET_CONTAINER_multihashmap_put (handle->active_lookup_requests,
- &lookup_msg->key,
- lookup_handle,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- process_pending_messages (handle);
- return lookup_handle;
+ if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_assert (NULL == handle->lookup_head);
+ GNUNET_free (handle);
}
/**
- * Stop async GNS lookup.
+ * Cancel pending lookup request
*
- * @param lookup_handle handle to the GNS lookup operation to stop
+ * @param lr the lookup request to cancel
*/
void
-GNUNET_GNS_lookup_stop (struct GNUNET_GNS_LookupHandle *lookup_handle)
+GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
{
- /* TODO Stop gns lookups */
+ struct PendingMessage *p = (struct PendingMessage*) &lr[1];
+
+ GNUNET_assert (NULL != lr->gns_handle);
+ if (GNUNET_NO == p->transmitted)
+ GNUNET_CONTAINER_DLL_remove (lr->gns_handle->pending_head,
+ lr->gns_handle->pending_tail,
+ p);
+ GNUNET_CONTAINER_DLL_remove (lr->gns_handle->lookup_head,
+ lr->gns_handle->lookup_tail,
+ lr);
+ GNUNET_free (lr);
}
/**
- * Perform a name shortening operation on the GNS.
+ * Perform an asynchronous lookup operation on the GNS.
*
* @param handle handle to the GNS service
* @param name the name to look up
- * @param proc function to call on result
+ * @param zone the zone to start the resolution in
+ * @param type the record type to look up
+ * @param only_cached #GNUNET_YES to only check locally (not in the DHT)
+ * @param shorten_zone_key the private key of the shorten zone (can be NULL)
+ * @param proc processor to call on result
* @param proc_cls closure for processor
- * @return handle to the operation
+ * @return handle to the get request
*/
-struct GNUNET_GNS_ShortenHandle *
-GNUNET_GNS_shorten (struct GNUNET_GNS_Handle *handle,
- const char * name,
- GNUNET_GNS_ShortenResultProcessor proc,
- void *proc_cls)
+struct GNUNET_GNS_LookupRequest*
+GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
+ const char *name,
+ const struct GNUNET_CRYPTO_EccPublicSignKey *zone,
+ int type,
+ int only_cached,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls)
{
/* IPC to shorten gns names, return shorten_handle */
- struct GNUNET_GNS_ClientShortenMessage *shorten_msg;
- struct GNUNET_GNS_ShortenHandle *shorten_handle;
+ struct GNUNET_GNS_ClientLookupMessage *lookup_msg;
+ struct GNUNET_GNS_LookupRequest *lr;
size_t msize;
struct PendingMessage *pending;
if (NULL == name)
{
+ GNUNET_break (0);
+ return NULL;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to lookup `%s' in GNS\n",
+ name);
+ msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
+ + strlen (name) + 1;
+ if (msize > UINT16_MAX)
+ {
+ GNUNET_break (0);
return NULL;
}
+ lr = GNUNET_malloc (sizeof (struct GNUNET_GNS_LookupRequest) +
+ sizeof (struct PendingMessage) + msize);
+ lr->gns_handle = handle;
+ lr->lookup_proc = proc;
+ lr->proc_cls = proc_cls;
+ lr->r_id = handle->r_id_gen++;
+ pending = (struct PendingMessage *)&lr[1];
+ pending->size = msize;
+ pending->r_id = lr->r_id;
+ GNUNET_CONTAINER_DLL_insert_tail (handle->lookup_head,
+ handle->lookup_tail, lr);
- msize = sizeof (struct GNUNET_GNS_ClientShortenMessage) + strlen(name) +1;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to shorten %s in GNS\n", name);
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- memset(pending, 0, (sizeof (struct PendingMessage) + msize));
- shorten_msg = (struct GNUNET_GNS_ClientShortenMessage *) &pending[1];
- pending->msg = &shorten_msg->header;
- pending->handle = handle;
- pending->free_on_send = GNUNET_NO;
- shorten_msg->header.size = htons (msize);
- shorten_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_SHORTEN);
- memcpy(&shorten_msg[1], name, strlen(name));
- handle->uid_gen++;
- shorten_msg->unique_id = handle->uid_gen;
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_YES;
- shorten_handle = GNUNET_malloc (sizeof (struct GNUNET_GNS_ShortenHandle));
- shorten_handle->proc = proc;
- shorten_handle->proc_cls = proc_cls;
- shorten_handle->message = pending;
- shorten_handle->unique_id = shorten_msg->unique_id;
- GNUNET_CONTAINER_multihashmap_put (handle->active_shorten_requests,
- &shorten_msg->key,
- shorten_handle,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ lookup_msg = (struct GNUNET_GNS_ClientLookupMessage *) &pending[1];
+ lookup_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
+ lookup_msg->header.size = htons (msize);
+ lookup_msg->id = htonl (lr->r_id);
+ lookup_msg->only_cached = htonl (only_cached);
+ lookup_msg->zone = *zone;
+ lookup_msg->type = htonl (type);
+ if (NULL != shorten_zone_key)
+ {
+ lookup_msg->have_key = htons (GNUNET_YES);
+ lookup_msg->shorten_key = *shorten_zone_key;
+ }
+ memcpy (&lookup_msg[1], name, strlen (name) + 1);
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head,
+ handle->pending_tail,
+ pending);
process_pending_messages (handle);
- return shorten_handle;
+ return lr;
}
-
/* end of gns_api.c */
projects / oweals / gnunet.git / blobdiff