X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Fgns_api.c;h=84c4ae189f3ee760450062b39309285fbfc67be4;hb=ab281595eeb270120f89ec954a572f4fcf78fc53;hp=cb418c0a6e8958efac011c399f1328c9f8e5b974;hpb=349d176da232e5fdc6afd9c90ae02bf928365ac0;p=oweals%2Fgnunet.git

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index cb418c0a6..84c4ae189 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009-2013, 2016 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,16 +14,15 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, 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"
@@ -34,118 +33,52 @@
 #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_CLIENT_LOOKUP 23
-#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT 24
-
 /**
- * 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.
+   * DLL
    */
-  struct PendingMessage *next;
+  struct GNUNET_GNS_LookupRequest *next;
 
   /**
-   * Message that is pending, allocated at the end
-   * of this struct.
+   * DLL
    */
-  const struct GNUNET_MessageHeader *msg;
+  struct GNUNET_GNS_LookupRequest *prev;
 
   /**
-   * Handle to the GNS API context.
+   * handle to gns
    */
-  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;
-
-  /**
-   * Timeout task for this message
-   */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
-  /**
-   * Unique ID for this request
-   */
-  uint64_t unique_id;
-
-  /**
-   * 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.
-   */
-
-  int free_on_send;
-  /**
-   * GNUNET_YES if this message is in our pending queue right now.
-   */
-  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
+   * @e lookup_proc closure
    */
-  struct GNUNET_GNS_Handle *gns_handle;
+  void *proc_cls;
 
   /**
-   * Key that this get request is for
+   * Envelope with the message for this queue entry.
    */
-  GNUNET_HashCode key;
+  struct GNUNET_MQ_Envelope *env;
 
   /**
-   * Unique identifier for this request (for key collisions).
+   * request id
    */
-  uint64_t unique_id;
-
-  struct PendingMessage *message;
+  uint32_t r_id;
 
 };
 
-/**
- * A GNS Record.
- */
-struct GNUNET_GNS_Record
-{
-  enum GNUNET_GNS_RecordType type;
-};
 
 /**
  * Connection to the GNS service.
@@ -159,364 +92,206 @@ struct GNUNET_GNS_Handle
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
-   * Socket (if available).
-   */
-  struct GNUNET_CLIENT_Connection *client;
-
-  /**
-   * Currently pending transmission request (or NULL).
+   * Connection to service (if available).
    */
-  struct GNUNET_CLIENT_TransmitHandle *th;
+  struct GNUNET_MQ_Handle *mq;
 
   /**
-   * Head of linked list of messages we would like to transmit.
+   * Head of linked list of active lookup requests.
    */
-  struct PendingMessage *pending_head;
+  struct GNUNET_GNS_LookupRequest *lookup_head;
 
   /**
-   * Tail of linked list of messages we would like to transmit.
+   * Tail of linked list of active lookup requests.
    */
-  struct PendingMessage *pending_tail;
+  struct GNUNET_GNS_LookupRequest *lookup_tail;
 
   /**
-   * Hash map containing the current outstanding unique requests.
+   * Reconnect task
    */
-  struct GNUNET_CONTAINER_MultiHashMap *active_requests;
-
-  GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+  struct GNUNET_SCHEDULER_Task *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.
+ * Reconnect to GNS service.
  *
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @param handle the handle to the GNS service
  */
-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).
- *
- * @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)
- */
-static int
-add_request_to_pending (void *cls, const GNUNET_HashCode * key, void *value)
-{
-  struct GNUNET_GNS_Handle *handle = cls;
-  struct GNUNET_GNS_LookupHandle *rh = value;
+static void
+reconnect (struct GNUNET_GNS_Handle *handle);
 
-  if (GNUNET_NO == rh->message->in_pending_queue)
-  {
-#if DEBUG_DHT
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Retransmitting request related to %s to GNS %p\n", GNUNET_h2s(key),
-         handle);
-#endif
-    GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
-                                 rh->message);
-    rh->message->in_pending_queue = GNUNET_YES;
-  }
-  return GNUNET_YES;
-}
 
 /**
- * Try reconnecting to the GNS service.
+ * Reconnect to GNS
  *
- * @param cls GNUNET_GNS_Handle
- * @param tc scheduler context
+ * @param cls the handle
  */
 static void
-try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls)
 {
   struct GNUNET_GNS_Handle *handle = cls;
 
-#if DEBUG_GNS
-  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))
-  {
-#if DEBUG_GNS
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "GNS reconnect failed(!)\n");
-#endif
-    return;
-  }
-  GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests,
-                                         &add_request_to_pending, handle);
-  process_pending_messages (handle);
+  handle->reconnect_task = NULL;
+  reconnect (handle);
 }
 
 
 /**
- * Try reconnecting to the GNS service.
+ * Disconnect from service and then reconnect.
  *
- * @param handle handle to gns to (possibly) disconnect and reconnect
+ * @param handle our handle
  */
 static void
-do_disconnect (struct GNUNET_GNS_Handle *handle)
+force_reconnect (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);
+  GNUNET_MQ_destroy (handle->mq);
+  handle->mq = NULL;
+  handle->reconnect_backoff
+    = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
+  handle->reconnect_task
+    = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
+				    &reconnect_task,
+				    handle);
 }
 
-/**
- * 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
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
  *
- * @param cls the 'struct GNUNET_GNS_Handle'
- * @param msg the incoming message
- */
-static void
-message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
-
-/**
- * Try to send messages from list of messages to send
+ * @param cls closure with the `struct GNUNET_GNS_Handle *`
+ * @param error error code
  */
 static void
-process_pending_messages (struct GNUNET_GNS_Handle *handle)
-{
-  struct PendingMessage *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;
-  handle->th =
-    GNUNET_CLIENT_notify_transmit_ready (handle->client,
-                                         ntohs (head->msg->size),
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_YES, &transmit_pending,
-                                         handle);
-  if (NULL != handle->th)
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "notify_transmit_ready returned NULL, reconnecting\n");
-  do_disconnect (handle);
-}
-
-
-/**
- * Transmit the next pending message, called by notify_transmit_ready
- */
-static size_t
-transmit_pending (void *cls, size_t size, void *buf)
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
   struct GNUNET_GNS_Handle *handle = cls;
-  struct PendingMessage *head;
-  size_t tsize;
 
-  handle->th = NULL;
-  if (buf == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-         "Transmission to GNS service failed!  Reconnecting!\n");
-    do_disconnect (handle);
-    return 0;
-  }
-  if (NULL == (head = handle->pending_head))
-    return 0;
-
-  tsize = ntohs (head->msg->size);
-  if (size < tsize)
-  {
-    process_pending_messages (handle);
-    return 0;
-  }
-  memcpy (buf, head->msg, tsize);
-  GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
-                               head);
-  head->in_pending_queue = GNUNET_NO;
-  if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (head->timeout_task);
-    head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-  if (GNUNET_YES == head->free_on_send)
-    GNUNET_free (head);
-  process_pending_messages (handle);
-#if DEBUG_GNS
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Forwarded request of %u bytes to GNS service\n", (unsigned int) tsize);
-#endif
-  if (GNUNET_NO == handle->in_receive)
-  {
-#if DEBUG_GNS
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting to process replies from GNS\n");
-#endif
-    handle->in_receive = GNUNET_YES;
-    GNUNET_CLIENT_receive (handle->client, &message_handler, handle,
-                           GNUNET_TIME_UNIT_FOREVER_REL);
-  }
-  return tsize;
+  LOG (GNUNET_ERROR_TYPE_WARNING,
+       "Problem with message queue. error: %i\n",
+       error);
+  force_reconnect (handle);
 }
 
+
 /**
- * Process a given reply that might match the given
- * request.
+ * Check validity of message received from the GNS service
  *
- * @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 cls the `struct GNUNET_GNS_Handle *`
+ * @param loookup_msg the incoming message
  */
 static int
-process_reply (void *cls, const GNUNET_HashCode * key, void *value)
+check_result (void *cls,
+              const struct LookupResultMessage *lookup_msg)
 {
-  const struct GNUNET_GNS_ClientResultMessage *gns_msg = cls;
-  struct GNUNET_GNS_LookupHandle *lookup_handle = value;
-  const char *name = (const char*) &lookup_handle[1];
-  const struct GNUNET_GNS_Record *records;
-  uint32_t num_records;
-  size_t meta_length;
-  size_t msize;
-
-  if (gns_msg->unique_id != lookup_handle->unique_id)
-  {
-    /* UID mismatch */
-#if DEBUG_GNS
-    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);
-#endif
-    return GNUNET_YES;
-  }
-  msize = ntohs (gns_msg->header.size);
-  num_records = ntohl (gns_msg->num_records);
-  meta_length =
-    sizeof (struct GNUNET_GNS_ClientResultMessage) +
-    sizeof (struct GNUNET_GNS_Record) * (num_records);
-  if ((msize < meta_length) ||
-      (num_records >
-       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_GNS_Record)))
+  size_t mlen = ntohs (lookup_msg->header.size) - sizeof (*lookup_msg);
+  uint32_t rd_count = ntohl (lookup_msg->rd_count);
+  struct GNUNET_GNSRECORD_Data rd[rd_count];
+
+  if (GNUNET_SYSERR ==
+      GNUNET_GNSRECORD_records_deserialize (mlen,
+                                            (const char*) &lookup_msg[1],
+                                            rd_count,
+                                            rd))
   {
     GNUNET_break (0);
-    return GNUNET_NO;
+    return GNUNET_SYSERR;
   }
-#if DEBUG_GNS
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Giving %u byte reply for %s to application\n",
-       (unsigned int) (msize - meta_length), GNUNET_h2s (key));
-#endif
-  records = (const struct GNUNET_GNS_Record *) &gns_msg[1];
-  lookup_handle->iter (lookup_handle->iter_cls, name, records, num_records);
-  return GNUNET_YES;
+  return GNUNET_OK;
 }
 
 
 /**
  * Handler for messages received from the GNS service
  *
- * @param cls the 'struct GNUNET_GNS_Handle'
- * @param msg the incoming message
+ * @param cls the `struct GNUNET_GNS_Handle *`
+ * @param loookup_msg the incoming message
  */
 static void
-message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+handle_result (void *cls,
+               const struct LookupResultMessage *lookup_msg)
 {
   struct GNUNET_GNS_Handle *handle = cls;
-  const struct GNUNET_GNS_ClientResultMessage *gns_msg;
+  size_t mlen = ntohs (lookup_msg->header.size) - sizeof (*lookup_msg);
+  uint32_t rd_count = ntohl (lookup_msg->rd_count);
+  struct GNUNET_GNSRECORD_Data rd[rd_count];
+  uint32_t r_id = ntohl (lookup_msg->id);
+  struct GNUNET_GNS_LookupRequest *lr;
+  GNUNET_GNS_LookupResultProcessor proc;
+  void *proc_cls;
 
-  if (msg == NULL)
-  {
-#if DEBUG_GNS
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Error receiving data from GNS service, reconnecting\n");
-#endif
-    do_disconnect (handle);
-    return;
-  }
-  if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT)
-  {
-    GNUNET_break (0);
-    do_disconnect (handle);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received lookup reply from GNS service (%u records)\n",
+       (unsigned int) rd_count);
+  for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
+    if (lr->r_id == r_id)
+      break;
+  if (NULL == lr)
     return;
-  }
-  if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientResultMessage))
-  {
-    GNUNET_break (0);
-    do_disconnect (handle);
+  proc = lr->lookup_proc;
+  proc_cls = lr->proc_cls;
+  
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_GNSRECORD_records_deserialize (mlen,
+                                                       (const char*) &lookup_msg[1],
+                                                       rd_count,
+                                                       rd));
+  proc (proc_cls,
+        rd_count,
+        rd);
+  GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
+                               handle->lookup_tail,
+                               lr);
+  if (NULL != lr->env)
+    GNUNET_MQ_discard (lr->env);
+  GNUNET_free (lr);
+}
+
+
+/**
+ * Reconnect to GNS service.
+ *
+ * @param handle the handle to the GNS service
+ */
+static void
+reconnect (struct GNUNET_GNS_Handle *handle)
+{
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT,
+                           struct LookupResultMessage,
+                           handle),
+    GNUNET_MQ_handler_end ()
+  };
+  struct GNUNET_GNS_LookupRequest *lh;
+
+  GNUNET_assert (NULL == handle->mq);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Trying to connect to GNS\n");
+  handle->mq = GNUNET_CLIENT_connect (handle->cfg,
+                                      "gns",
+                                      handlers,
+                                      &mq_error_handler,
+                                      handle);
+  if (NULL == handle->mq)
     return;
-  }
-  gns_msg = (const struct GNUNET_GNS_ClientResultMessage *) msg;
-#if DEBUG_GNS
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Received reply for `%s' from GNS service %p\n",
-       &gns_msg->name, handle);
-#endif
-  /* TODO uniquely identify requests... maybe hash(name) or uid */
-  GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
-                                              &gns_msg->key, &process_reply,
-                                              (void *) gns_msg);
-  GNUNET_CLIENT_receive (handle->client, &message_handler, handle,
-                         GNUNET_TIME_UNIT_FOREVER_REL);
+  for (lh = handle->lookup_head; NULL != lh; lh = lh->next)
+    GNUNET_MQ_send_copy (handle->mq,
+                         lh->env);
 }
 
 
@@ -524,23 +299,19 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
  * 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 *
-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 = GNUNET_new (struct GNUNET_GNS_Handle);
   handle->cfg = cfg;
-  handle->uid_gen =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
-  handle->active_requests = GNUNET_CONTAINER_multihashmap_create (ht_len);
-  if (GNUNET_NO == try_connect (handle))
+  reconnect (handle);
+  if (NULL == handle->mq)
   {
-    GNUNET_GNS_disconnect (handle);
+    GNUNET_free (handle);
     return NULL;
   }
   return handle;
@@ -555,87 +326,101 @@ GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
 {
-  /* disco from GNS */
+  if (NULL != handle->mq)
+  {
+    GNUNET_MQ_destroy (handle->mq);
+    handle->mq = NULL;
+  }
+  if (NULL != handle->reconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+    handle->reconnect_task = NULL;
+  }
+  GNUNET_assert (NULL == handle->lookup_head);
+  GNUNET_free (handle);
 }
 
 
 /**
- * Perform an asynchronous Lookup operation on the GNS.
- * TODO:
- *    - Still not sure what we query for... "names" it is for now
- *    - Do we need such sophisticated message queueing like dht? simplify?
+ * Cancel pending lookup request
  *
- * @param handle handle to the GNS service
- * @param timeout how long to wait for transmission of this request to the 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
+ * @param lr the lookup request to cancel
  */
-struct GNUNET_GNS_LookupHandle *
-GNUNET_GNS_lookup_start (struct GNUNET_GNS_Handle *handle,
-                         struct GNUNET_TIME_Relative timeout,
-                         const char * name,
-                         enum GNUNET_GNS_RecordType type,
-                         GNUNET_GNS_LookupIterator iter,
-                         void *iter_cls)
+void
+GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
 {
-  /* 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;
+  struct GNUNET_GNS_Handle *handle = lr->gns_handle;
 
-  if (NULL == name)
-  {
-    return NULL;
-  }
-
-  GNUNET_CRYPTO_hash (name, strlen(name), &key);
-
-  msize = sizeof (struct GNUNET_GNS_ClientLookupMessage) + strlen(name);
-#if DEBUG_GNS
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting lookup for %s in GNS %p\n",
-       name, handle);
-#endif
-  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_CLIENT_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_requests, &lookup_msg->key,
-                                     lookup_handle,
-                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  process_pending_messages (handle);
-  return lookup_handle;
+  GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
+                               handle->lookup_tail,
+                               lr);
+  GNUNET_MQ_discard (lr->env);
+  GNUNET_free (lr);
 }
 
 
 /**
- * Stop async GNS lookup.
+ * Perform an asynchronous lookup operation on the GNS.
  *
- * @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
+ * @param zone the zone to start the resolution in
+ * @param type the record type to look up
+ * @param options local options for the lookup
+ * @param proc processor to call on result
+ * @param proc_cls closure for @a proc
+ * @return handle to the get request
  */
-void
-GNUNET_GNS_lookup_stop (struct GNUNET_GNS_LookupHandle *lookup_handle)
+struct GNUNET_GNS_LookupRequest*
+GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
+                   const char *name,
+                   const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
+                   uint32_t type,
+                   enum GNUNET_GNS_LocalOptions options,
+                   GNUNET_GNS_LookupResultProcessor proc,
+                   void *proc_cls)
 {
-  /* TODO Stop dht lookups */
-}
+  /* IPC to shorten gns names, return shorten_handle */
+  struct LookupMessage *lookup_msg;
+  struct GNUNET_GNS_LookupRequest *lr;
+  size_t nlen;
 
+  if (NULL == name)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Trying to lookup `%s' in GNS\n",
+       name);
+  nlen = strlen (name) + 1;
+  if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*lr))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  lr = GNUNET_new (struct GNUNET_GNS_LookupRequest);
+  lr->gns_handle = handle;
+  lr->lookup_proc = proc;
+  lr->proc_cls = proc_cls;
+  lr->r_id = handle->r_id_gen++;
+  lr->env = GNUNET_MQ_msg_extra (lookup_msg,
+                                 nlen,
+                                 GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
+  lookup_msg->id = htonl (lr->r_id);
+  lookup_msg->options = htons ((uint16_t) options);
+  lookup_msg->zone = *zone;
+  lookup_msg->type = htonl (type);
+  GNUNET_memcpy (&lookup_msg[1],
+                 name,
+                 nlen);
+  GNUNET_CONTAINER_DLL_insert (handle->lookup_head,
+                               handle->lookup_tail,
+                               lr);
+  if (NULL != handle->mq)
+    GNUNET_MQ_send_copy (handle->mq,
+                         lr->env);
+  return lr;
+}
 
 /* end of gns_api.c */