new DHT API code

diff --git a/src/dht/dht_api_find_peer.c b/src/dht/dht_api_find_peer.c
new file mode 100644 (file)
index 0000000..91713f9
--- /dev/null
+++ b/src/dht/dht_api_find_peer.c
@@ -0,0 +1,154 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+
+/**
+ * @file dht/dht_api_find_peer.c
+ * @brief library to access the DHT to find peers
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+
+
+/**
+ * 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;
+
+  /**
+   * Iterator to call on data receipt
+   */
+  GNUNET_DHT_FindPeerProcessor proc;
+
+  /**
+   * Closure for the iterator callback
+   */
+  void *proc_cls;
+
+};
+
+
+
+/**
+ * Iterator called on each result obtained from a generic route
+ * operation
+ */
+static void
+find_peer_reply_iterator (void *cls, const struct GNUNET_MessageHeader *reply)
+{
+  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];
+
+  if (ntohs(hello->type) != GNUNET_MESSAGE_TYPE_HELLO)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Encapsulated message of type %d, is not a `%s' message!\n", ntohs(hello->type), "HELLO");
+      return;
+    }
+  find_peer_handle->find_peer_context.proc (find_peer_handle->
+                                            find_peer_context.proc_cls,
+                                            (struct GNUNET_HELLO_Message *)hello);
+}
+
+
+
+/**
+ * Perform an asynchronous FIND PEER operation on the DHT.
+ *
+ * @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
+ * @return handle to stop the async get, NULL on error
+ */
+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)
+{
+  struct GNUNET_DHT_FindPeerHandle *find_peer_handle;
+  struct GNUNET_DHT_FindPeerMessage find_peer_msg;
+
+  /* FIXME: remove this limitation */
+  if ((handle->current != NULL) && (handle->retransmit_stage != DHT_RETRANSMITTING)) 
+    {
+      /* Can't send right now, we have a pending message... */
+      return NULL;
+    }
+
+  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.header.size = htons(sizeof(struct GNUNET_DHT_FindPeerMessage));
+  find_peer_msg.header.type = htons(GNUNET_MESSAGE_TYPE_DHT_FIND_PEER);
+  find_peer_handle->route_handle =
+    GNUNET_DHT_route_start (handle, key, 0, options, &find_peer_msg.header,
+                            timeout, 
+                           &find_peer_reply_iterator, find_peer_handle);
+  GNUNET_break (find_peer_handle->route_handle != NULL);
+  return find_peer_handle;
+}
+
+
+/**
+ * Stop async find peer.  Frees associated resources.
+ *
+ * @param find_peer_handle GET operation to stop.
+ */
+void
+GNUNET_DHT_find_peer_stop (struct GNUNET_DHT_FindPeerHandle *find_peer_handle)
+{
+  GNUNET_DHT_route_stop (find_peer_handle->route_handle);
+  GNUNET_free (find_peer_handle);
+}
+
+
+/* end of dht_api_find_peer.c */

diff --git a/src/dht/dht_api_get_put.c b/src/dht/dht_api_get_put.c
new file mode 100644 (file)
index 0000000..3028a05
--- /dev/null
+++ b/src/dht/dht_api_get_put.c
@@ -0,0 +1,223 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+
+/**
+ * @file dht/dht_api_get_put.c
+ * @brief library to perform DHT gets and puts
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+
+#include "platform.h"
+#include "gnunet_constants.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_protocols.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_dht_service.h"
+#include "dht.h"
+
+
+/**
+ * Perform a PUT operation storing data in the DHT.
+ *
+ * @param handle handle to DHT service
+ * @param key the key to store under
+ * @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
+ * @return GNUNET_YES if put message is queued for transmission
+ */
+void
+GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
+                const GNUNET_HashCode * key,
+               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)
+{
+  char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
+  struct GNUNET_DHT_PutMessage *put_msg;
+
+  if (size >= sizeof (buf) - sizeof (struct GNUNET_DHT_PutMessage))
+    {
+      GNUNET_break (0);
+      return;
+    }
+  put_msg = (struct GNUNET_DHT_PutMessage*) buf;
+  put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_PUT);
+  put_msg->header.size = htons (sizeof (struct GNUNET_DHT_PutMessage) + size);
+  put_msg->type = htons (type);
+  put_msg->expiration = GNUNET_TIME_absolute_hton (exp);
+  memcpy (&put_msg[1], data, size);
+
+  GNUNET_break (NULL ==
+               GNUNET_DHT_route_start (handle, 
+                                       key, 
+                                       DEFAULT_PUT_REPLICATION, options,
+                                       &put_msg->header, 
+                                       timeout, 
+                                       NULL, NULL,
+                                       cont, cont_cls));
+}
+
+
+
+/**
+ * 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;
+
+  /**
+   * Iterator to call on data receipt
+   */
+  GNUNET_DHT_GetIterator iter;
+
+  /**
+   * Closure for the iterator callback
+   */
+  void *iter_cls;
+
+};
+
+
+
+/**
+ * Iterator called on each result obtained from a generic route
+ * operation
+ *
+ * @param cls the 'struct GNUNET_DHT_GetHandle'
+ * @param key key that was used
+ * @param reply response
+ */
+static void
+get_reply_iterator (void *cls, 
+                   const GNUNET_HashCode *key,
+                   const struct GNUNET_MessageHeader *reply)
+{
+  struct GNUNET_DHT_GetHandle *get_handle = cls;
+  const struct GNUNET_DHT_GetResultMessage *result;
+  const struct GNUNET_PeerIdentity *const*get_path;
+  const struct GNUNET_PeerIdentity *const*put_path;
+  size_t payload;
+
+  if (ntohs (reply->type) != GNUNET_MESSAGE_TYPE_DHT_GET_RESULT)
+    return;
+
+  GNUNET_assert (ntohs (reply->size) >=
+                 sizeof (struct GNUNET_DHT_GetResultMessage));
+  result = (const struct GNUNET_DHT_GetResultMessage *) reply;
+  payload = ntohs (reply->size) - sizeof(struct GNUNET_DHT_GetResultMessage);
+  get_path = NULL; // FIXME: parse path info!
+  put_path = NULL; // FIXME: parse path info!
+
+  get_handle->iter (get_handle->iter_cls,
+                   GNUNET_TIME_absolute_ntoh (result->expiration),
+                   key,
+                   get_path,
+                   put_path,
+                   ntohs (result->type), 
+                   payload,
+                   &result[1]);
+}
+
+
+
+/**
+ * Perform an asynchronous GET operation on the DHT identified. See
+ * also "GNUNET_BLOCK_evaluate".
+ *
+ * @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 options routing options for this message
+ * @param bf bloom filter associated with query (can be NULL)
+ * @param bf_mutator mutation value for bf
+ * @param xquery extrended query data (can be NULL, depending on type)
+ * @param xquery_size number of bytes in xquery
+ * @param iter function to call on each result
+ * @param iter_cls closure for iter
+ *
+ * @return handle to stop the async get
+ */
+struct GNUNET_DHT_GetHandle *
+GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle,
+                      struct GNUNET_TIME_Relative timeout,
+                      enum GNUNET_BLOCK_Type type,
+                      const GNUNET_HashCode * key,
+                     enum GNUNET_DHT_RouteOption options,
+                     const struct GNUNET_CONTAINER_BloomFilter *bf,
+                     int32_t bf_mutator,
+                     const void *xquery,
+                     size_t xquery_size,
+                      GNUNET_DHT_GetIterator iter,
+                      void *iter_cls)
+{
+  struct GNUNET_DHT_GetHandle *get_handle;
+  struct GNUNET_DHT_GetMessage get_msg;
+
+  get_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetHandle));
+  get_handle->iter = iter;
+  get_handle->iter_cls = iter_cls;
+  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, 
+                           DEFAULT_GET_REPLICATION,
+                           options,
+                           &get_msg.header, 
+                           timeout,
+                            &get_reply_iterator, get_handle,
+                           NULL, NULL);
+  GNUNET_break (NULL != get_handle->route_handle);
+  return get_handle;
+}
+
+
+/**
+ * Stop async DHT-get.
+ *
+ * @param get_handle handle to the GET operation to stop
+ */
+void
+GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle)
+{
+  GNUNET_DHT_route_stop (get_handle->route_handle);
+  GNUNET_free (get_handle);
+}
+
+
+/* end of dht_api_get_put.c */