*/
/**
+ *
* @file gns/gns_api.c
* @brief library to access the GNS service
* @author Martin Schanzenbach
#include "gnunet_hello_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_dht_service.h"
+#include "gns.h"
+#include "gnunet_gns_service.h"
+
+/* 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
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH 27
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT 28
+
+/**
+ * Handle to a lookup request
+ */
+struct GNUNET_GNS_LookupRequest
+{
+ /**
+ * DLL
+ */
+ struct GNUNET_GNS_LookupRequest *next;
+
+ /**
+ * DLL
+ */
+ struct GNUNET_GNS_LookupRequest *prev;
-#define DEBUG_GNS_API GNUNET_EXTRA_LOGGING
+ /* request id */
+ uint64_t r_id;
+
+ /* handle to gns */
+ struct GNUNET_GNS_Handle *gns_handle;
+
+ /* processor to call on lookup result */
+ GNUNET_GNS_LookupResultProcessor lookup_proc;
+
+ /* processor closure */
+ void *proc_cls;
+
+};
-#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
/**
- * Handle to a Lookup request
+ * Handle to a shorten request
*/
-struct GNUNET_GNS_LookupHandle
+struct GNUNET_GNS_ShortenRequest
{
+ /**
+ * DLL
+ */
+ struct GNUNET_GNS_ShortenRequest *next;
+
+ /**
+ * DLL
+ */
+ struct GNUNET_GNS_ShortenRequest *prev;
+
+ /* request id */
+ uint64_t r_id;
+
+ /* handle to gns */
+ struct GNUNET_GNS_Handle *gns_handle;
+
+ /* processor to call on shorten result */
+ GNUNET_GNS_ShortenResultProcessor shorten_proc;
+
+ /* processor closure */
+ void *proc_cls;
+
+};
+
+/**
+ * Handle to GetAuthorityRequest
+ */
+struct GNUNET_GNS_GetAuthRequest
+{
+ /**
+ * DLL
+ */
+ struct GNUNET_GNS_GetAuthRequest *next;
+
/**
- * Iterator to call on data receipt
+ * DLL
*/
- GNUNET_GNS_LookupIterator iter;
+ struct GNUNET_GNS_GetAuthRequest *prev;
+
+ /* request id */
+ uint32_t r_id;
+
+ /* handle to gns */
+ struct GNUNET_GNS_Handle *gns_handle;
+
+ /* processor to call on authority lookup result */
+ GNUNET_GNS_GetAuthResultProcessor auth_proc;
+
+ /* processor closure */
+ void *proc_cls;
+
+};
+
+/**
+ * Entry in our list of messages to be (re-)transmitted.
+ */
+struct PendingMessage
+{
/**
- * Closure for the iterator callback
+ * This is a doubly-linked list.
*/
- void *iter_cls;
+ struct PendingMessage *prev;
/**
- * Main handle to this GNS api
+ * This is a doubly-linked list.
*/
- struct GNUNET_GNS_Handle *gns_handle;
+ struct PendingMessage *next;
/**
- * Key that this get request is for
+ * request id
*/
- GNUNET_HashCode key;
+ uint64_t r_id;
/**
- * Unique identifier for this request (for key collisions).
+ * Size of the message.
*/
- uint64_t unique_id;
+ size_t size;
};
* Currently pending transmission request (or NULL).
*/
struct GNUNET_CLIENT_TransmitHandle *th;
+
+ uint32_t r_id;
+
+ /**
+ * Head of linked list of shorten messages we would like to transmit.
+ */
+ struct PendingMessage *pending_head;
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ /**
+ * Tail of linked list of shorten messages we would like to transmit.
+ */
+ struct PendingMessage *pending_tail;
+
+ /**
+ * Head of linked list of shorten messages we would like to transmit.
+ */
+ struct GNUNET_GNS_ShortenRequest *shorten_head;
+
+ /**
+ * Tail of linked list of shorten messages we would like to transmit.
+ */
+ struct GNUNET_GNS_ShortenRequest *shorten_tail;
+
+ /**
+ * Head of linked list of lookup messages we would like to transmit.
+ */
+ struct GNUNET_GNS_LookupRequest *lookup_head;
/**
- * How quickly should we retry? Used for exponential back-off on
- * connect-errors.
+ * Tail of linked list of lookup messages we would like to transmit.
*/
- struct GNUNET_TIME_Relative retry_time;
+ struct GNUNET_GNS_LookupRequest *lookup_tail;
+
+ /**
+ * Head of linked list of authority lookup messages we would like to transmit.
+ */
+ struct GNUNET_GNS_GetAuthRequest *get_auth_head;
/**
- * Generator for unique ids.
+ * Tail of linked list of authority lookup messages we would like to transmit.
*/
- uint64_t uid_gen;
+ struct GNUNET_GNS_GetAuthRequest *get_auth_tail;
+
+ /**
+ * Reconnect task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
/**
* Did we start our receive loop yet?
*/
int in_receive;
+
+ /**
+ * Reconnect necessary
+ */
+ int reconnect;
};
+/**
+ * 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.
+ * Reconnect to GNS service.
*
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @param h the handle to the namestore service
*/
-static int
-try_connect (struct GNUNET_GNS_Handle *handle)
+static void
+reconnect (struct GNUNET_GNS_Handle *h)
{
- if (handle->client != NULL)
- return GNUNET_OK;
- handle->in_receive = GNUNET_NO;
- handle->client = GNUNET_CLIENT_connect ("gns", handle->cfg);
+ GNUNET_assert (NULL == h->client);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to connect to GNS...\n");
+ h->client = GNUNET_CLIENT_connect ("gns", h->cfg);
+ GNUNET_assert (NULL != h->client);
+ process_pending_messages (h);
+}
+
+/**
+ * Reconnect to GNS
+ *
+ * @param cls the handle
+ * @param tc task context
+ */
+static void
+reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_GNS_Handle *h = cls;
+
+ h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect (h);
+}
+
+
+/**
+ * Disconnect from service and then reconnect.
+ *
+ * @param h our handle
+ */
+static void
+force_reconnect (struct GNUNET_GNS_Handle *h)
+{
+ h->reconnect = GNUNET_NO;
+ GNUNET_CLIENT_disconnect (h->client);
+ h->client = NULL;
+ h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &reconnect_task,
+ h);
+}
+
+/**
+ * Transmit the next pending message, called by notify_transmit_ready
+ */
+static size_t
+transmit_pending (void *cls, size_t size, void *buf);
+
+/**
+ * Handler for messages received from the GNS service
+ *
+ * @param cls the 'struct GNUNET_GNS_Handle'
+ * @param msg the incoming message
+ */
+static void
+process_message (void *cls, const struct GNUNET_MessageHeader *msg);
+
+/**
+ * Try to send messages from list of messages to send
+ */
+static void
+process_pending_messages (struct GNUNET_GNS_Handle *handle)
+{
+ struct PendingMessage *p;
+
if (handle->client == NULL)
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to connect to the GNS service!\n"));
- return GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "process_pending_messages called, but client is null\n");
+ return;
+ }
+
+ if (handle->th != NULL)
+ return;
+
+ if (NULL == (p = handle->pending_head))
+ return;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to transmit %d bytes...\n", p->size);
+
+ handle->th =
+ GNUNET_CLIENT_notify_transmit_ready (handle->client,
+ p->size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO, &transmit_pending,
+ handle);
+ if (NULL != handle->th)
+ return;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "notify_transmit_ready returned NULL!\n");
+}
+
+
+/**
+ * Transmit the next pending message, called by notify_transmit_ready
+ */
+static size_t
+transmit_pending (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_GNS_Handle *handle = cls;
+ struct PendingMessage *p;
+ size_t tsize;
+ char *cbuf;
+
+ handle->th = NULL;
+
+ if ((size == 0) || (buf == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission to GNS service failed!\n");
+ force_reconnect(handle);
+ return 0;
}
- return GNUNET_YES;
+
+ tsize = 0;
+ cbuf = buf;
+
+ if (NULL == (p = handle->pending_head))
+ return 0;
+
+ while ((NULL != (p = handle->pending_head)) && (p->size <= size))
+ {
+ memcpy (&cbuf[tsize], &p[1], p->size);
+ tsize += p->size;
+ size -= p->size;
+ 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;
+ }
+ GNUNET_free(p);
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending %d bytes\n", tsize);
+
+ process_pending_messages(handle);
+ return tsize;
}
/**
- * Try reconnecting to the GNS service.
+ * Process a given reply that might match the given
+ * request.
*
- * @param cls GNUNET_GNS_Handle
- * @param tc scheduler context
+ * @param qe a queue entry
+ * @param msg the shorten msg received
*/
static void
-try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_shorten_reply (struct GNUNET_GNS_ShortenRequest *qe,
+ const struct GNUNET_GNS_ClientShortenResultMessage *msg)
{
- struct GNUNET_GNS_Handle *handle = cls;
+ struct GNUNET_GNS_Handle *h = qe->gns_handle;
+ const char *short_name;
-#if DEBUG_DHT
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting with GNS %p\n", handle);
-#endif
- 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_CONTAINER_DLL_remove (h->shorten_head, h->shorten_tail, qe);
+ short_name = (char*)(&msg[1]);
+
+ if (ntohs (((struct GNUNET_MessageHeader*)msg)->size) <
+ sizeof (struct GNUNET_GNS_ClientShortenResultMessage))
{
-#if DEBUG_DHT
- LOG (GNUNET_ERROR_TYPE_DEBUG, "GNS reconnect failed(!)\n");
-#endif
+ GNUNET_break (0);
+ force_reconnect (h);
+ GNUNET_free(qe);
return;
}
- GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests,
- &add_request_to_pending, handle);
- process_pending_messages (handle);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received shortened reply `%s' from GNS service\n",
+ short_name);
+
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ qe->shorten_proc (qe->proc_cls, short_name);
+ GNUNET_free (qe);
+
}
/**
- * Try reconnecting to the GNS service.
+ * Process a given reply that might match the given
+ * request.
*
- * @param handle handle to gns to (possibly) disconnect and reconnect
+ * @param qe the handle to the request
+ * @param msg the message to process
*/
static void
-do_disconnect (struct GNUNET_GNS_Handle *handle)
+process_get_auth_reply (struct GNUNET_GNS_GetAuthRequest *qe,
+ const struct GNUNET_GNS_ClientGetAuthResultMessage *msg)
{
- if (handle->client == NULL)
+ struct GNUNET_GNS_Handle *h = qe->gns_handle;
+ const char *auth_name;
+
+ GNUNET_CONTAINER_DLL_remove (h->get_auth_head, h->get_auth_tail, qe);
+ auth_name = (char*)&msg[1];
+
+ if (ntohs (((struct GNUNET_MessageHeader*)msg)->size) <
+ sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage))
+ {
+ GNUNET_free(qe);
+ GNUNET_break (0);
+ force_reconnect (h);
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);
+ "Received GET_AUTH reply `%s' from GNS service\n",
+ auth_name);
+
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ qe->auth_proc (qe->proc_cls, auth_name);
+ GNUNET_free (qe);
+
+}
+/**
+ * Process a given reply to the lookup request
+ *
+ * @param qe a queue entry
+ * @param msg the lookup message received
+ */
+static void
+process_lookup_reply (struct GNUNET_GNS_LookupRequest *qe,
+ const struct GNUNET_GNS_ClientLookupResultMessage *msg)
+{
+ struct GNUNET_GNS_Handle *h = qe->gns_handle;
+ int rd_count = ntohl(msg->rd_count);
+ size_t len = ntohs (((struct GNUNET_MessageHeader*)msg)->size);
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+
+ GNUNET_CONTAINER_DLL_remove (h->lookup_head, h->lookup_tail, qe);
+
+ if (len < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
+ {
+ GNUNET_free(qe);
+ GNUNET_break (0);
+ force_reconnect (h);
+ return;
+ }
+
+ len -= sizeof (struct GNUNET_GNS_ClientLookupResultMessage);
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (len,
+ (char*)&msg[1],
+ rd_count,
+ rd))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to serialize lookup reply from GNS service!\n");
+ qe->lookup_proc (qe->proc_cls, 0, NULL);
+ }
+ else
+ {
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received lookup reply from GNS service (count=%d)\n",
+ ntohl (msg->rd_count));
+ qe->lookup_proc (qe->proc_cls, rd_count, rd);
+ }
+ GNUNET_free (qe);
+}
+
+/**
+ * Handler for messages received from the GNS service
+ *
+ * @param cls the 'struct GNUNET_GNS_Handle'
+ * @param msg the incoming message
+ */
+static void
+process_message (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_GNS_Handle *handle = cls;
+ struct GNUNET_GNS_LookupRequest *lr;
+ struct GNUNET_GNS_ShortenRequest *sr;
+ struct GNUNET_GNS_GetAuthRequest *gar;
+ const struct GNUNET_GNS_ClientLookupResultMessage *lookup_msg;
+ const struct GNUNET_GNS_ClientShortenResultMessage *shorten_msg;
+ const struct GNUNET_GNS_ClientGetAuthResultMessage *get_auth_msg;
+ uint16_t type;
+ uint32_t r_id;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got message\n");
+ if (msg == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error receiving data from GNS service, reconnecting\n");
+ force_reconnect (handle);
+ return;
+ }
+
+ type = ntohs (msg->type);
+
+ if (type == GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got lookup msg\n");
+ lookup_msg = (const struct GNUNET_GNS_ClientLookupResultMessage *) msg;
+ r_id = ntohl (lookup_msg->id);
+
+ if (r_id > handle->r_id)
+ {
+ /** no request found */
+ GNUNET_break_op (0);
+ GNUNET_CLIENT_receive (handle->client, &process_message, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
+ }
+
+ for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
+ {
+ if (lr->r_id == r_id)
+ break;
+ }
+ if (lr)
+ process_lookup_reply(lr, lookup_msg);
+
+ return;
+
+ }
+ else if (type == GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got SHORTEN_RESULT msg\n");
+ shorten_msg = (struct GNUNET_GNS_ClientShortenResultMessage *) msg;
+
+ r_id = ntohl (shorten_msg->id);
+
+ if (r_id > handle->r_id)
+ {
+ /** no request found */
+ GNUNET_break_op (0);
+ GNUNET_CLIENT_receive (handle->client, &process_message, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
+ }
+
+ for (sr = handle->shorten_head; NULL != sr; sr = sr->next)
+ {
+ if (sr->r_id == r_id)
+ break;
+ }
+ if (sr)
+ process_shorten_reply (sr, shorten_msg);
+ return;
+ }
+ else if (type == GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got GET_AUTH_RESULT msg\n");
+ get_auth_msg = (struct GNUNET_GNS_ClientGetAuthResultMessage *) msg;
+
+ r_id = ntohl (get_auth_msg->id);
+
+ if (r_id > handle->r_id)
+ {
+ /** no request found */
+ GNUNET_break_op (0);
+ GNUNET_CLIENT_receive (handle->client, &process_message, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
+ }
+
+ for (gar = handle->get_auth_head; NULL != gar; gar = gar->next)
+ {
+ if (gar->r_id == r_id)
+ break;
+ }
+ if (gar)
+ process_get_auth_reply (gar, get_auth_msg);
+ return;
+ }
+
+
+ if (GNUNET_YES == handle->reconnect)
+ force_reconnect (handle);
}
* @return handle to the GNS service, or NULL on error
*/
struct GNUNET_GNS_Handle *
-GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int ht_len)
+GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_GNS_Handle *handle;
handle = GNUNET_malloc (sizeof (struct GNUNET_GNS_Handle));
+ handle->reconnect = GNUNET_NO;
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);
- if (GNUNET_NO == try_connect (handle))
- {
- GNUNET_GNS_disconnect (handle);
- return NULL;
- }
+ reconnect (handle);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->r_id = 0;
+ handle->in_receive = GNUNET_NO;
return handle;
}
void
GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
{
- /* disco from GNS */
+ GNUNET_CLIENT_disconnect (handle->client);
+ 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_assert (NULL == handle->shorten_head);
+ GNUNET_assert (NULL == handle->get_auth_head);
+
+ GNUNET_free(handle);
+ /* disco from GNS */
+}
+
+/*
+ * Helper function to generate request ids
+ *
+ * @param h handle
+ * @return a new id
+ */
+static uint32_t
+get_request_id (struct GNUNET_GNS_Handle *h)
+{
+ uint32_t r_id = h->r_id;
+ h->r_id++;
+ return r_id;
+}
+
+
+/**
+ * Cancel pending lookup request
+ *
+ * @param lr the lookup request to cancel
+ */
+void
+GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr)
+{
+ struct PendingMessage *tmp;
+ GNUNET_assert (NULL != lr->gns_handle);
+
+ for (tmp = lr->gns_handle->pending_head;
+ NULL != tmp; tmp = tmp->next)
+ {
+ if (tmp->r_id == lr->r_id)
+ break;
+ }
+
+ if (NULL != tmp)
+ {
+ GNUNET_CONTAINER_DLL_remove (lr->gns_handle->pending_head,
+ lr->gns_handle->pending_tail,
+ tmp);
+ GNUNET_free (tmp);
+ }
+
+ GNUNET_CONTAINER_DLL_remove (lr->gns_handle->lookup_head,
+ lr->gns_handle->lookup_tail,
+ lr);
+
+ GNUNET_free (lr);
+}
+
+
+/**
+ * Cancel pending shorten request
+ *
+ * @param sr the lookup request to cancel
+ */
+void
+GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr)
+{
+ struct PendingMessage *tmp;
+ GNUNET_assert (NULL != sr->gns_handle);
+
+ for (tmp = sr->gns_handle->pending_head;
+ NULL != tmp; tmp = tmp->next)
+ {
+ if (tmp->r_id == sr->r_id)
+ break;
+ }
+
+ if (NULL != tmp)
+ {
+ GNUNET_CONTAINER_DLL_remove (sr->gns_handle->pending_head,
+ sr->gns_handle->pending_tail,
+ tmp);
+ GNUNET_free (tmp);
+ }
+
+ GNUNET_CONTAINER_DLL_remove (sr->gns_handle->shorten_head,
+ sr->gns_handle->shorten_tail,
+ sr);
+
+ GNUNET_free (sr);
}
/**
- * Add a new record to the GNS.
+ * Cancel pending get auth request
*
- * @param handle handle to GNS 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)
- * @param cont_cls closure for cont
+ * @param gar the lookup request to cancel
*/
void
-GNUNET_GNS_add_record (struct GNUNET_GNS_Handle *handle, const 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_SCHEDULER_Task cont,
- void *cont_cls)
+GNUNET_GNS_cancel_get_auth_request (struct GNUNET_GNS_GetAuthRequest *gar)
{
- /* add record to local db, dht; sign etc */
+ struct PendingMessage *tmp;
+ GNUNET_assert (NULL != gar->gns_handle);
+
+ for (tmp = gar->gns_handle->pending_head;
+ NULL != tmp; tmp = tmp->next)
+ {
+ if (tmp->r_id == gar->r_id)
+ break;
+ }
+
+ if (NULL != tmp)
+ {
+ GNUNET_CONTAINER_DLL_remove (gar->gns_handle->pending_head,
+ gar->gns_handle->pending_tail,
+ tmp);
+ GNUNET_free (tmp);
+ }
+
+ GNUNET_CONTAINER_DLL_remove (gar->gns_handle->get_auth_head,
+ gar->gns_handle->get_auth_tail,
+ gar);
+
+ GNUNET_free (gar);
}
+/**
+ * Perform an asynchronous Lookup operation on the GNS.
+ *
+ * @param handle handle to the GNS service
+ * @param name the name to look up
+ * @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 DHT for performance
+ * @param shorten_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 get request
+ */
+struct GNUNET_GNS_LookupRequest*
+GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
+ const char * name,
+ struct GNUNET_CRYPTO_ShortHashCode *zone,
+ enum GNUNET_GNS_RecordType type,
+ int only_cached,
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls)
+{
+ /* IPC to shorten gns names, return shorten_handle */
+ struct GNUNET_GNS_ClientLookupMessage *lookup_msg;
+ struct GNUNET_GNS_LookupRequest *lr;
+ size_t msize;
+ struct PendingMessage *pending;
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *pkey_enc=NULL;
+ size_t key_len = 0;
+ char* pkey_tmp;
+
+ if (NULL == name)
+ {
+ return NULL;
+ }
+
+ if (NULL != shorten_key)
+ {
+ pkey_enc = GNUNET_CRYPTO_rsa_encode_key (shorten_key);
+ GNUNET_assert (pkey_enc != NULL);
+ key_len = ntohs (pkey_enc->len);
+ }
+
+ msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
+ + key_len + strlen(name) + 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to lookup %s in GNS\n", name);
+
+ lr = GNUNET_malloc(sizeof (struct GNUNET_GNS_LookupRequest));
+ lr->gns_handle = handle;
+ lr->lookup_proc = proc;
+ lr->proc_cls = proc_cls;
+ lr->r_id = get_request_id (handle);
+ GNUNET_CONTAINER_DLL_insert_tail (handle->lookup_head,
+ handle->lookup_tail, lr);
+
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ memset (pending, 0, (sizeof (struct PendingMessage) + msize));
+
+ pending->size = msize;
+ pending->r_id = lr->r_id;
+
+ 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);
+
+ if (NULL != zone)
+ {
+ lookup_msg->use_default_zone = htonl (0);
+ memcpy (&lookup_msg->zone, zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ }
+ else
+ {
+ lookup_msg->use_default_zone = htonl (1);
+ memset (&lookup_msg->zone, 0, sizeof(struct GNUNET_CRYPTO_ShortHashCode));
+ }
+
+ lookup_msg->type = htonl (type);
+
+ pkey_tmp = (char *) &lookup_msg[1];
+
+ if (pkey_enc != NULL)
+ {
+ lookup_msg->have_key = htonl(1);
+ memcpy (pkey_tmp, pkey_enc, key_len);
+ }
+ else
+ lookup_msg->have_key = htonl (0);
+
+ memcpy (&pkey_tmp[key_len], name, strlen (name));
+
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
+ pending);
+ GNUNET_free_non_null (pkey_enc);
+ process_pending_messages (handle);
+ return lr;
+}
/**
* Perform an asynchronous Lookup operation on the GNS.
*
* @param handle handle to the GNS service
- * @param timeout how long to wait for transmission of this request to the service
- * @param type expected type of the response object
- * @param key the key to look up
- * @param desired_replication_level estimate of how many
- nearest peers this request should reach
- * @param options routing options for this message
- * @param xquery extended query data (can be NULL, depending on type)
- * @param xquery_size number of bytes in xquery
- * @param iter function to call on each result
- * @param iter_cls closure for iter
- * @return handle to stop the async get
+ * @param name the name to look up
+ * @param type the record type to look up
+ * @param only_cached GNUNET_YES to only check locally not DHT for performance
+ * @param shorten_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 lookup request
+ */
+struct GNUNET_GNS_LookupRequest*
+GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
+ const char * name,
+ enum GNUNET_GNS_RecordType type,
+ int only_cached,
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls)
+{
+ return GNUNET_GNS_lookup_zone (handle, name,
+ NULL,
+ type, only_cached,
+ shorten_key,
+ proc, proc_cls);
+}
+
+/**
+ * Perform a name shortening operation on the GNS.
+ *
+ * @param handle handle to the GNS service
+ * @param name the name to look up
+ * @param private_zone the public zone of the private zone
+ * @param shorten_zone the public zone of the shorten zone
+ * @param zone the zone to start the resolution in
+ * @param proc function to call on result
+ * @param proc_cls closure for processor
+ * @return handle to the operation
+ */
+struct GNUNET_GNS_ShortenRequest*
+GNUNET_GNS_shorten_zone (struct GNUNET_GNS_Handle *handle,
+ const char * name,
+ struct GNUNET_CRYPTO_ShortHashCode *private_zone,
+ struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
+ struct GNUNET_CRYPTO_ShortHashCode *zone,
+ GNUNET_GNS_ShortenResultProcessor proc,
+ void *proc_cls)
+{
+ /* IPC to shorten gns names, return shorten_handle */
+ struct GNUNET_GNS_ClientShortenMessage *shorten_msg;
+ struct GNUNET_GNS_ShortenRequest *sr;
+ size_t msize;
+ struct PendingMessage *pending;
+
+ if (NULL == name)
+ {
+ return NULL;
+ }
+
+ msize = sizeof (struct GNUNET_GNS_ClientShortenMessage) + strlen(name) + 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to shorten %s in GNS\n", name);
+
+ sr = GNUNET_malloc(sizeof (struct GNUNET_GNS_ShortenRequest));
+ sr->gns_handle = handle;
+ sr->shorten_proc = proc;
+ sr->proc_cls = proc_cls;
+ sr->r_id = get_request_id (handle);
+ GNUNET_CONTAINER_DLL_insert_tail (handle->shorten_head,
+ handle->shorten_tail, sr);
+
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ memset(pending, 0, (sizeof (struct PendingMessage) + msize));
+
+ pending->size = msize;
+ pending->r_id = sr->r_id;
+
+ shorten_msg = (struct GNUNET_GNS_ClientShortenMessage *) &pending[1];
+ shorten_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_SHORTEN);
+ shorten_msg->header.size = htons (msize);
+ shorten_msg->id = htonl (sr->r_id);
+ shorten_msg->private_zone = *private_zone;
+ shorten_msg->shorten_zone = *shorten_zone;
+
+ if (NULL != zone)
+ {
+ shorten_msg->use_default_zone = htonl (0);
+ memcpy (&shorten_msg->zone, zone,
+ sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ }
+ else
+ {
+ shorten_msg->use_default_zone = htonl (1);
+ memset (&shorten_msg->zone, 0, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ }
+
+ memcpy (&shorten_msg[1], name, strlen (name));
+
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
+ pending);
+
+ process_pending_messages (handle);
+ return sr;
+}
+
+/**
+ * Perform a name shortening operation on the GNS.
+ *
+ * @param handle handle to the GNS service
+ * @param name the name to look up
+ * @param private_zone the public zone of the private zone
+ * @param shorten_zone the public zone of the shorten zone
+ * @param proc function to call on result
+ * @param proc_cls closure for processor
+ * @return handle to the operation
*/
-struct GNUNET_GNS_LookupHandle *
-GNUNET_GNS_lookup_start (struct GNUNET_GNS_Handle *handle,
- struct GNUNET_TIME_Relative timeout,
- enum GNUNET_BLOCK_Type type, const GNUNET_HashCode * key,
- uint32_t desired_replication_level,
- enum GNUNET_DHT_RouteOption options, const void *xquery,
- size_t xquery_size, GNUNET_GNS_LookupIterator iter,
- void *iter_cls)
+struct GNUNET_GNS_ShortenRequest*
+GNUNET_GNS_shorten (struct GNUNET_GNS_Handle *handle,
+ const char * name,
+ struct GNUNET_CRYPTO_ShortHashCode *private_zone,
+ struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
+ GNUNET_GNS_ShortenResultProcessor proc,
+ void *proc_cls)
{
- /* look for local entries, start dht lookup, return lookup_handle */
+ return GNUNET_GNS_shorten_zone (handle, name,
+ private_zone, shorten_zone,
+ NULL, proc, proc_cls);
}
/**
- * Stop async GNS lookup.
+ * Perform an authority lookup for a given name.
*
- * @param lookup_handle handle to the GNS lookup operation to stop
+ * @param handle handle to the GNS service
+ * @param name the name to look up authority for
+ * @param proc function to call on result
+ * @param proc_cls closure for processor
+ * @return handle to the operation
*/
-void
-GNUNET_GNS_lookup_stop (struct GNUNET_GNS_LookupHandle *lookup_handle)
+struct GNUNET_GNS_GetAuthRequest*
+GNUNET_GNS_get_authority (struct GNUNET_GNS_Handle *handle,
+ const char * name,
+ GNUNET_GNS_GetAuthResultProcessor proc,
+ void *proc_cls)
{
- struct GNUNET_DHT_Handle *handle;
- /* TODO Stop dht lookups */
+ struct GNUNET_GNS_ClientGetAuthMessage *get_auth_msg;
+ struct GNUNET_GNS_GetAuthRequest *gar;
+ size_t msize;
+ struct PendingMessage *pending;
+
+ if (NULL == name)
+ {
+ return NULL;
+ }
+
+ msize = sizeof (struct GNUNET_GNS_ClientGetAuthMessage) + strlen(name) + 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to look up authority for %s in GNS\n", name);
+
+ gar = GNUNET_malloc (sizeof (struct GNUNET_GNS_GetAuthRequest));
+ gar->gns_handle = handle;
+ gar->auth_proc = proc;
+ gar->proc_cls = proc_cls;
+ gar->r_id = get_request_id (handle);
+ GNUNET_CONTAINER_DLL_insert_tail (handle->get_auth_head,
+ handle->get_auth_tail, gar);
+
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ memset (pending, 0, (sizeof (struct PendingMessage) + msize));
+
+ pending->size = msize;
+ pending->r_id = gar->r_id;
+
+ get_auth_msg = (struct GNUNET_GNS_ClientGetAuthMessage *) &pending[1];
+ get_auth_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_GET_AUTH);
+ get_auth_msg->header.size = htons (msize);
+ get_auth_msg->id = htonl (gar->r_id);
+
+ memcpy(&get_auth_msg[1], name, strlen(name));
+
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
+ pending);
+
+ process_pending_messages (handle);
+ return gar;
}
projects / oweals / gnunet.git / blobdiff