[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17079 - gnunet/src/dht
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r17079 - gnunet/src/dht |
|
Date: |
Tue, 27 Sep 2011 22:54:53 +0200 |
Author: grothoff
Date: 2011-09-27 22:54:53 +0200 (Tue, 27 Sep 2011)
New Revision: 17079
Added:
gnunet/src/dht/dht.h
gnunet/src/dht/dht_api.c
gnunet/src/dht/gnunet-service-dht.c
Removed:
gnunet/src/dht/dht_api_new.c
gnunet/src/dht/dht_new.h
gnunet/src/dht/gnunet-service-dht-new.c
Modified:
gnunet/src/dht/Makefile.am
gnunet/src/dht/gnunet-dht-get.c
gnunet/src/dht/gnunet-dht-put.c
gnunet/src/dht/gnunet-service-dht_clients.c
gnunet/src/dht/gnunet-service-dht_neighbours.c
gnunet/src/dht/test_dht_api.c
gnunet/src/dht/test_dht_twopeer.c
gnunet/src/dht/test_dht_twopeer_get_put.c
gnunet/src/dht/test_dht_twopeer_put_get.c
Log:
nonews
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/Makefile.am 2011-09-27 20:54:53 UTC (rev 17079)
@@ -15,32 +15,32 @@
endif
lib_LTLIBRARIES = \
- libgnunetdhtnew.la
+ libgnunetdht.la
-libgnunetdhtnew_la_SOURCES = \
- dht_api_new.c dht_new.h
-libgnunetdhtnew_la_LIBADD = \
+libgnunetdht_la_SOURCES = \
+ dht_api.c dht.h
+libgnunetdht_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(XLIB)
-libgnunetdhtnew_la_LDFLAGS = \
+libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
bin_PROGRAMS = \
- gnunet-service-dht-new \
+ gnunet-service-dht \
gnunet-dht-get \
gnunet-dht-put
-gnunet_service_dht_new_SOURCES = \
- gnunet-service-dht-new.c gnunet-service-dht.h \
+gnunet_service_dht_SOURCES = \
+ gnunet-service-dht.c gnunet-service-dht.h \
gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
gnunet-service-dht_routing.c gnunet-service-dht_routing.h
-gnunet_service_dht_new_LDADD = \
+gnunet_service_dht_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/nse/libgnunetnse.la \
@@ -55,7 +55,7 @@
gnunet_dht_get_SOURCES = \
gnunet-dht-get.c
gnunet_dht_get_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhtnew.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
gnunet_dht_get_DEPENDENCIES = \
@@ -64,7 +64,7 @@
gnunet_dht_put_SOURCES = \
gnunet-dht-put.c
gnunet_dht_put_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhtnew.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
gnunet_dht_put_DEPENDENCIES = \
@@ -92,25 +92,16 @@
test_dht_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_api_DEPENDENCIES = \
libgnunetdht.la
-test_dht_multipeer_SOURCES = \
- test_dht_multipeer.c
-test_dht_multipeer_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_multipeer_DEPENDENCIES = \
- libgnunetdht.la
-
test_dht_twopeer_SOURCES = \
test_dht_twopeer.c
test_dht_twopeer_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_DEPENDENCIES = \
libgnunetdht.la
@@ -119,14 +110,14 @@
test_dht_twopeer_put_get_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_get_put_SOURCES = \
test_dht_twopeer_get_put.c
test_dht_twopeer_get_put_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdhtnew.la
+ $(top_builddir)/src/dht/libgnunetdht.la
test_dht_twopeer_path_tracking_SOURCES = \
test_dht_twopeer_path_tracking.c
@@ -135,6 +126,17 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/dht/libgnunetdht.la
+test_dht_multipeer_SOURCES = \
+ test_dht_multipeer.c
+test_dht_multipeer_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_multipeer_DEPENDENCIES = \
+ libgnunetdht.la
+
+
+
EXTRA_DIST = \
$(check_SCRIPTS) \
test_dht_api_data.conf \
Copied: gnunet/src/dht/dht.h (from rev 17064, gnunet/src/dht/dht_new.h)
===================================================================
--- gnunet/src/dht/dht.h (rev 0)
+++ gnunet/src/dht/dht.h 2011-09-27 20:54:53 UTC (rev 17079)
@@ -0,0 +1,190 @@
+/*
+ This file is part of GNUnet.
+ (C) 2001, 2002, 2003, 2004, 2009, 2011 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.
+*/
+
+/**
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ * @file dht/dht.h
+ */
+
+#ifndef DHT_H_
+#define DHT_H_
+
+
+/**
+ * Message which indicates the DHT should cancel outstanding
+ * requests and discard any state.
+ */
+struct GNUNET_DHT_ClientGetStopMessage
+{
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_DHT_GET_STOP
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Always zero.
+ */
+ uint32_t reserved GNUNET_PACKED;
+
+ /**
+ * Unique ID identifying this request
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /**
+ * Key of this request
+ */
+ GNUNET_HashCode key;
+
+};
+
+
+/**
+ * DHT GET message sent from clients to service. Indicates that a GET
+ * request should be issued.
+ */
+struct GNUNET_DHT_ClientGetMessage
+{
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+ */
+ uint32_t options GNUNET_PACKED;
+
+ /**
+ * Replication level for this message
+ */
+ uint32_t desired_replication_level GNUNET_PACKED;
+
+ /**
+ * The type for the data for the GET request; actually an 'enum
+ * GNUNET_BLOCK_Type'.
+ */
+ uint32_t type;
+
+ /**
+ * The key to search for
+ */
+ GNUNET_HashCode key;
+
+ /**
+ * Unique ID identifying this request, if 0 then
+ * the client will not expect a response
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /* Possibly followed by xquery, copied to end of this dealy do */
+
+};
+
+
+/**
+ * Reply to a GET send from the service to a client.
+ */
+struct GNUNET_DHT_ClientResultMessage
+{
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The type for the data.
+ */
+ uint32_t type;
+
+ /**
+ * Number of peers recorded in the outgoing path from source to the
+ * storgage location of this message.
+ */
+ uint32_t put_path_length GNUNET_PACKED;
+
+ /**
+ * The number of peer identities recorded from the storage location
+ * to this peer.
+ */
+ uint32_t get_path_length GNUNET_PACKED;
+
+ /**
+ * Unique ID of the matching GET request.
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /**
+ * When does this entry expire?
+ */
+ struct GNUNET_TIME_AbsoluteNBO expiration;
+
+ /**
+ * The key that was searched for
+ */
+ GNUNET_HashCode key;
+
+ /* put path, get path and actual data are copied to end of this dealy do */
+
+};
+
+
+/**
+ * Message to insert data into the DHT, sent from clients to DHT service.
+ */
+struct GNUNET_DHT_ClientPutMessage
+{
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The type of data to insert.
+ */
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+ */
+ uint32_t options GNUNET_PACKED;
+
+ /**
+ * Replication level for this message
+ */
+ uint32_t desired_replication_level GNUNET_PACKED;
+
+ /**
+ * How long should this data persist?
+ */
+ struct GNUNET_TIME_AbsoluteNBO expiration;
+
+ /**
+ * The key to store the value under.
+ */
+ GNUNET_HashCode key;
+
+ /* DATA copied to end of this message */
+
+};
+
+
+#endif
Copied: gnunet/src/dht/dht_api.c (from rev 17069, gnunet/src/dht/dht_api_new.c)
===================================================================
--- gnunet/src/dht/dht_api.c (rev 0)
+++ gnunet/src/dht/dht_api.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -0,0 +1,784 @@
+/*
+ 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.c
+ * @brief library to access the DHT service
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_constants.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_protocols.h"
+#include "gnunet_dht_service.h"
+#include "dht.h"
+
+#define DEBUG_DHT_API GNUNET_NO
+
+/**
+ * Entry in our list of messages to be (re-)transmitted.
+ */
+struct PendingMessage
+{
+ /**
+ * 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 DHT API context.
+ */
+ struct GNUNET_DHT_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 GET request
+ */
+struct GNUNET_DHT_GetHandle
+{
+
+ /**
+ * Iterator to call on data receipt
+ */
+ GNUNET_DHT_GetIterator iter;
+
+ /**
+ * Closure for the iterator callback
+ */
+ void *iter_cls;
+
+ /**
+ * Main handle to this DHT api
+ */
+ struct GNUNET_DHT_Handle *dht_handle;
+
+ /**
+ * The actual message sent for this request,
+ * used for retransmitting requests on service
+ * failure/reconnect. Freed on route_stop.
+ */
+ struct PendingMessage *message;
+
+ /**
+ * Key that this get request is for
+ */
+ GNUNET_HashCode key;
+
+ /**
+ * Unique identifier for this request (for key collisions).
+ */
+ uint64_t unique_id;
+
+};
+
+
+/**
+ * Connection to the DHT service.
+ */
+struct GNUNET_DHT_Handle
+{
+
+ /**
+ * Configuration to use.
+ */
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * Socket (if available).
+ */
+ struct GNUNET_CLIENT_Connection *client;
+
+ /**
+ * Currently pending transmission request (or NULL).
+ */
+ struct GNUNET_CLIENT_TransmitHandle *th;
+
+ /**
+ * Head of linked list of messages we would like to transmit.
+ */
+ struct PendingMessage *pending_head;
+
+ /**
+ * Tail of linked list of messages we would like to transmit.
+ */
+ struct PendingMessage *pending_tail;
+
+ /**
+ * Hash map containing the current outstanding unique requests
+ * (values are of type 'struct GNUNET_DHT_RouteHandle').
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *active_requests;
+
+ /**
+ * Task for trying to reconnect.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+
+ /**
+ * How quickly should we retry? Used for exponential back-off on
+ * connect-errors.
+ */
+ struct GNUNET_TIME_Relative retry_time;
+
+ /**
+ * Generator for unique ids.
+ */
+ uint64_t uid_gen;
+
+};
+
+
+/**
+ * Handler for messages received from the DHT service
+ * a demultiplexer which handles numerous message types
+ *
+ */
+static void
+service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
+
+
+/**
+ * Try to (re)connect to the DHT service.
+ *
+ * @return GNUNET_YES on success, GNUNET_NO on failure.
+ */
+static int
+try_connect (struct GNUNET_DHT_Handle *handle)
+{
+ if (handle->client != NULL)
+ return GNUNET_OK;
+ handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg);
+ if (handle->client == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to connect to the DHT service!\n"));
+ return GNUNET_NO;
+ }
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting to process replies from DHT\n");
+#endif
+ GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return GNUNET_YES;
+}
+
+
+/**
+ * Add the request corresponding to the given route handle
+ * to the pending queue (if it is not already in there).
+ *
+ * @param cls the 'struct GNUNET_DHT_Handle*'
+ * @param key key for the request (not used)
+ * @param value the 'struct GNUNET_DHT_GetHandle*'
+ * @return GNUNET_YES (always)
+ */
+static int
+add_request_to_pending (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
+ struct GNUNET_DHT_GetHandle *rh = value;
+
+ if (GNUNET_NO == rh->message->in_pending_queue)
+ {
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ rh->message);
+ rh->message->in_pending_queue = GNUNET_YES;
+ }
+ return GNUNET_YES;
+}
+
+
+/**
+ * Try to send messages from list of messages to send
+ * @param handle DHT_Handle
+ */
+static void
+process_pending_messages (struct GNUNET_DHT_Handle *handle);
+
+
+/**
+ * Try reconnecting to the dht service.
+ *
+ * @param cls GNUNET_DHT_Handle
+ * @param tc scheduler context
+ */
+static void
+try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
+
+ 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;
+ handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg);
+ if (handle->client == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dht reconnect failed(!)\n");
+ return;
+ }
+ GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests,
+ &add_request_to_pending, handle);
+ process_pending_messages (handle);
+}
+
+
+/**
+ * Try reconnecting to the DHT service.
+ *
+ * @param handle handle to dht to (possibly) disconnect and reconnect
+ */
+static void
+do_disconnect (struct GNUNET_DHT_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_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
+ */
+static size_t
+transmit_pending (void *cls, size_t size, void *buf);
+
+
+/**
+ * Try to send messages from list of messages to send
+ */
+static void
+process_pending_messages (struct GNUNET_DHT_Handle *handle)
+{
+ struct PendingMessage *head;
+
+ if (handle->client == NULL)
+ {
+ 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;
+ 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)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
+ struct PendingMessage *head;
+ size_t tsize;
+
+ handle->th = NULL;
+ if (buf == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission to DHT 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);
+ if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (head->timeout_task);
+ head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != head->cont)
+ {
+ GNUNET_SCHEDULER_add_continuation (head->cont, head->cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ head->cont = NULL;
+ head->cont_cls = NULL;
+ }
+ head->in_pending_queue = GNUNET_NO;
+ if (GNUNET_YES == head->free_on_send)
+ GNUNET_free (head);
+ process_pending_messages (handle);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Forwarded request of %u bytes to DHT service\n",
+ (unsigned int) tsize);
+ return tsize;
+}
+
+
+/**
+ * Process a given reply that might match the given
+ * request.
+ *
+ * @param cls the 'struct GNUNET_DHT_ClientResultMessage'
+ * @param key query of the request
+ * @param value the 'struct GNUNET_DHT_RouteHandle' 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_reply (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ const struct GNUNET_DHT_ClientResultMessage *dht_msg = cls;
+ struct GNUNET_DHT_GetHandle *get_handle = value;
+ const struct GNUNET_PeerIdentity *put_path;
+ const struct GNUNET_PeerIdentity *get_path;
+ uint32_t put_path_length;
+ uint32_t get_path_length;
+ size_t data_length;
+ size_t msize;
+ size_t meta_length;
+ const void *data;
+
+ if (dht_msg->unique_id != get_handle->unique_id)
+ {
+ /* UID mismatch */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Ignoring reply (UID mismatch: %llu/%llu)\n",
+ dht_msg->unique_id,
+ get_handle->unique_id);
+ return GNUNET_YES;
+ }
+ msize = ntohs (dht_msg->header.size);
+ put_path_length = ntohl (dht_msg->put_path_length);
+ get_path_length = ntohl (dht_msg->get_path_length);
+ meta_length = sizeof (struct GNUNET_DHT_ClientResultMessage) +
+ sizeof (struct GNUNET_PeerIdentity) * (get_path_length + put_path_length);
+ if ( (msize < meta_length) ||
+ (get_path_length > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct
GNUNET_PeerIdentity)) ||
+ (put_path_length > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct
GNUNET_PeerIdentity)) )
+ {
+ GNUNET_break (0);
+ return GNUNET_NO;
+ }
+ data_length = msize - meta_length;
+ put_path = (const struct GNUNET_PeerIdentity *) &dht_msg[1];
+ get_path = &put_path[put_path_length];
+ data = &get_path[get_path_length];
+ get_handle->iter (get_handle->iter_cls,
+ GNUNET_TIME_absolute_ntoh (dht_msg->expiration),
+ key,
+ get_path, get_path_length,
+ put_path, put_path_length,
+ ntohl (dht_msg->type),
+ data_length, data);
+ return GNUNET_YES;
+}
+
+
+/**
+ * Handler for messages received from the DHT service
+ * a demultiplexer which handles numerous message types
+ *
+ * @param cls the 'struct GNUNET_DHT_Handle'
+ * @param msg the incoming message
+ */
+static void
+service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_DHT_Handle *handle = cls;
+ const struct GNUNET_DHT_ClientResultMessage *dht_msg;
+
+ if (msg == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error receiving data from DHT service, reconnecting\n");
+ do_disconnect (handle);
+ return;
+ }
+ if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT)
+ {
+ GNUNET_break (0);
+ do_disconnect (handle);
+ return;
+ }
+ if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_ClientResultMessage))
+ {
+ GNUNET_break (0);
+ do_disconnect (handle);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received reply from DHT service\n");
+ dht_msg = (const struct GNUNET_DHT_ClientResultMessage *) msg;
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
+ &dht_msg->key, &process_reply,
+ (void *) dht_msg);
+ GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+}
+
+
+/**
+ * Initialize the connection with the DHT service.
+ *
+ * @param cfg configuration to use
+ * @param ht_len size of the internal hash table to use for
+ * processing multiple GET/FIND requests in parallel
+ *
+ * @return handle to the DHT service, or NULL on error
+ */
+struct GNUNET_DHT_Handle *
+GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ unsigned int ht_len)
+{
+ struct GNUNET_DHT_Handle *handle;
+
+ handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_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))
+ {
+ GNUNET_DHT_disconnect (handle);
+ return NULL;
+ }
+ return handle;
+}
+
+
+/**
+ * Shutdown connection with the DHT service.
+ *
+ * @param handle handle of the DHT connection to stop
+ */
+void
+GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
+{
+ struct PendingMessage *pm;
+
+ GNUNET_assert (handle != NULL);
+ GNUNET_assert (0 ==
+ GNUNET_CONTAINER_multihashmap_size (handle->active_requests));
+ if (handle->th != NULL)
+ {
+ GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
+ handle->th = NULL;
+ }
+ while (NULL != (pm = handle->pending_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
+ pm);
+ GNUNET_assert (GNUNET_YES == pm->free_on_send);
+ if (GNUNET_SCHEDULER_NO_TASK != pm->timeout_task)
+ GNUNET_SCHEDULER_cancel (pm->timeout_task);
+ if (NULL != pm->cont)
+ GNUNET_SCHEDULER_add_continuation (pm->cont, pm->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ pm->in_pending_queue = GNUNET_NO;
+ GNUNET_free (pm);
+ }
+ if (handle->client != NULL)
+ {
+ GNUNET_CLIENT_disconnect (handle->client, GNUNET_YES);
+ handle->client = NULL;
+ }
+ if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+ GNUNET_CONTAINER_multihashmap_destroy (handle->active_requests);
+ GNUNET_free (handle);
+}
+
+
+/**
+ * Timeout for the transmission of a fire&forget-request. Clean it up.
+ *
+ * @param cls the 'struct PendingMessage'
+ * @param tc scheduler context
+ */
+static void
+timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct PendingMessage *pending = cls;
+ struct GNUNET_DHT_Handle *handle;
+
+ handle = pending->handle;
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
+ pending);
+ if (pending->cont != NULL)
+ pending->cont (pending->cont_cls, tc);
+ GNUNET_free (pending);
+}
+
+
+/**
+ * Perform a PUT operation storing data in the DHT.
+ *
+ * @param handle handle to DHT 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
+ */
+void
+GNUNET_DHT_put (struct GNUNET_DHT_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)
+{
+ struct GNUNET_DHT_ClientPutMessage *put_msg;
+ size_t msize;
+ struct PendingMessage *pending;
+
+ msize = sizeof (struct GNUNET_DHT_ClientPutMessage) + size;
+ if ( (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE) )
+ {
+ GNUNET_break (0);
+ if (NULL != cont)
+ cont (cont_cls, NULL);
+ return;
+ }
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ put_msg = (struct GNUNET_DHT_ClientPutMessage *) &pending[1];
+ pending->msg = &put_msg->header;
+ pending->handle = handle;
+ pending->cont = cont;
+ pending->cont_cls = cont_cls;
+ pending->free_on_send = GNUNET_YES;
+ pending->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (timeout, &timeout_put_request, pending);
+ put_msg->header.size = htons (msize);
+ put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT);
+ put_msg->type = htonl (type);
+ put_msg->options = htonl ((uint32_t) options);
+ put_msg->desired_replication_level = htonl (desired_replication_level);
+ put_msg->expiration = GNUNET_TIME_absolute_hton (exp);
+ put_msg->key = *key;
+ memcpy (&put_msg[1], data, size);
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ pending);
+ pending->in_pending_queue = GNUNET_YES;
+ process_pending_messages (handle);
+}
+
+
+/**
+ * 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 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
+ */
+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,
+ uint32_t desired_replication_level,
+ enum GNUNET_DHT_RouteOption options,
+ const void *xquery, size_t xquery_size,
+ GNUNET_DHT_GetIterator iter, void *iter_cls)
+{
+ struct GNUNET_DHT_ClientGetMessage *get_msg;
+ struct GNUNET_DHT_GetHandle *get_handle;
+ size_t msize;
+ struct PendingMessage *pending;
+
+ msize = sizeof (struct GNUNET_DHT_ClientGetMessage) + xquery_size;
+ if ( (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ (xquery_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE) )
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ get_msg = (struct GNUNET_DHT_ClientGetMessage *) &pending[1];
+ pending->msg = &get_msg->header;
+ pending->handle = handle;
+ pending->free_on_send = GNUNET_NO;
+ get_msg->header.size = htons (msize);
+ get_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET);
+ get_msg->options = htonl ((uint32_t) options);
+ get_msg->desired_replication_level = htonl (desired_replication_level);
+ get_msg->type = htonl (type);
+ get_msg->key = *key;
+ handle->uid_gen++;
+ get_msg->unique_id = handle->uid_gen;
+ memcpy (&get_msg[1], xquery, xquery_size);
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ pending);
+ pending->in_pending_queue = GNUNET_YES;
+ get_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetHandle));
+ get_handle->iter = iter;
+ get_handle->iter_cls = iter_cls;
+ get_handle->message = pending;
+ get_handle->unique_id = get_msg->unique_id;
+ GNUNET_CONTAINER_multihashmap_put (handle->active_requests,
+ key, get_handle,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ process_pending_messages (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)
+{
+ struct GNUNET_DHT_Handle *handle;
+ const struct GNUNET_DHT_ClientGetMessage *get_msg;
+ struct GNUNET_DHT_ClientGetStopMessage *stop_msg;
+ struct PendingMessage *pending;
+
+ handle = get_handle->message->handle;
+ get_msg = (const struct GNUNET_DHT_ClientGetMessage*)
get_handle->message->msg;
+
+ /* generate STOP */
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + sizeof (struct
GNUNET_DHT_ClientGetStopMessage));
+ stop_msg = (struct GNUNET_DHT_ClientGetStopMessage *) &pending[1];
+ pending->msg = &stop_msg->header;
+ pending->handle = handle;
+ pending->free_on_send = GNUNET_YES;
+ stop_msg->header.size = htons (sizeof (struct
GNUNET_DHT_ClientGetStopMessage));
+ stop_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP);
+ stop_msg->reserved = htonl (0);
+ stop_msg->unique_id = get_msg->unique_id;
+ stop_msg->key = get_msg->key;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ pending);
+ pending->in_pending_queue = GNUNET_YES;
+
+ /* remove 'GET' from active status */
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (handle->active_requests,
+ &get_msg->key,
get_handle));
+ if (GNUNET_YES == get_handle->message->in_pending_queue)
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ get_handle->message);
+ get_handle->message->in_pending_queue = GNUNET_NO;
+ }
+ GNUNET_free (get_handle->message);
+ GNUNET_free (get_handle);
+
+ process_pending_messages (handle);
+}
+
+
+/* end of dht_api.c */
Deleted: gnunet/src/dht/dht_api_new.c
===================================================================
--- gnunet/src/dht/dht_api_new.c 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/dht_api_new.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -1,784 +0,0 @@
-/*
- 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.c
- * @brief library to access the DHT service
- * @author Christian Grothoff
- * @author Nathan Evans
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_dht_service_new.h"
-#include "dht_new.h"
-
-#define DEBUG_DHT_API GNUNET_NO
-
-/**
- * Entry in our list of messages to be (re-)transmitted.
- */
-struct PendingMessage
-{
- /**
- * 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 DHT API context.
- */
- struct GNUNET_DHT_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 GET request
- */
-struct GNUNET_DHT_GetHandle
-{
-
- /**
- * Iterator to call on data receipt
- */
- GNUNET_DHT_GetIterator iter;
-
- /**
- * Closure for the iterator callback
- */
- void *iter_cls;
-
- /**
- * Main handle to this DHT api
- */
- struct GNUNET_DHT_Handle *dht_handle;
-
- /**
- * The actual message sent for this request,
- * used for retransmitting requests on service
- * failure/reconnect. Freed on route_stop.
- */
- struct PendingMessage *message;
-
- /**
- * Key that this get request is for
- */
- GNUNET_HashCode key;
-
- /**
- * Unique identifier for this request (for key collisions).
- */
- uint64_t unique_id;
-
-};
-
-
-/**
- * Connection to the DHT service.
- */
-struct GNUNET_DHT_Handle
-{
-
- /**
- * Configuration to use.
- */
- const struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * Socket (if available).
- */
- struct GNUNET_CLIENT_Connection *client;
-
- /**
- * Currently pending transmission request (or NULL).
- */
- struct GNUNET_CLIENT_TransmitHandle *th;
-
- /**
- * Head of linked list of messages we would like to transmit.
- */
- struct PendingMessage *pending_head;
-
- /**
- * Tail of linked list of messages we would like to transmit.
- */
- struct PendingMessage *pending_tail;
-
- /**
- * Hash map containing the current outstanding unique requests
- * (values are of type 'struct GNUNET_DHT_RouteHandle').
- */
- struct GNUNET_CONTAINER_MultiHashMap *active_requests;
-
- /**
- * Task for trying to reconnect.
- */
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
-
- /**
- * How quickly should we retry? Used for exponential back-off on
- * connect-errors.
- */
- struct GNUNET_TIME_Relative retry_time;
-
- /**
- * Generator for unique ids.
- */
- uint64_t uid_gen;
-
-};
-
-
-/**
- * Handler for messages received from the DHT service
- * a demultiplexer which handles numerous message types
- *
- */
-static void
-service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
-
-
-/**
- * Try to (re)connect to the DHT service.
- *
- * @return GNUNET_YES on success, GNUNET_NO on failure.
- */
-static int
-try_connect (struct GNUNET_DHT_Handle *handle)
-{
- if (handle->client != NULL)
- return GNUNET_OK;
- handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg);
- if (handle->client == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to connect to the DHT service!\n"));
- return GNUNET_NO;
- }
-#if DEBUG_DHT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to process replies from DHT\n");
-#endif
- GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return GNUNET_YES;
-}
-
-
-/**
- * Add the request corresponding to the given route handle
- * to the pending queue (if it is not already in there).
- *
- * @param cls the 'struct GNUNET_DHT_Handle*'
- * @param key key for the request (not used)
- * @param value the 'struct GNUNET_DHT_GetHandle*'
- * @return GNUNET_YES (always)
- */
-static int
-add_request_to_pending (void *cls, const GNUNET_HashCode * key, void *value)
-{
- struct GNUNET_DHT_Handle *handle = cls;
- struct GNUNET_DHT_GetHandle *rh = value;
-
- if (GNUNET_NO == rh->message->in_pending_queue)
- {
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- rh->message);
- rh->message->in_pending_queue = GNUNET_YES;
- }
- return GNUNET_YES;
-}
-
-
-/**
- * Try to send messages from list of messages to send
- * @param handle DHT_Handle
- */
-static void
-process_pending_messages (struct GNUNET_DHT_Handle *handle);
-
-
-/**
- * Try reconnecting to the dht service.
- *
- * @param cls GNUNET_DHT_Handle
- * @param tc scheduler context
- */
-static void
-try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_DHT_Handle *handle = cls;
-
- 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;
- handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg);
- if (handle->client == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dht reconnect failed(!)\n");
- return;
- }
- GNUNET_CONTAINER_multihashmap_iterate (handle->active_requests,
- &add_request_to_pending, handle);
- process_pending_messages (handle);
-}
-
-
-/**
- * Try reconnecting to the DHT service.
- *
- * @param handle handle to dht to (possibly) disconnect and reconnect
- */
-static void
-do_disconnect (struct GNUNET_DHT_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_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
- */
-static size_t
-transmit_pending (void *cls, size_t size, void *buf);
-
-
-/**
- * Try to send messages from list of messages to send
- */
-static void
-process_pending_messages (struct GNUNET_DHT_Handle *handle)
-{
- struct PendingMessage *head;
-
- if (handle->client == NULL)
- {
- 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;
- 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)
-{
- struct GNUNET_DHT_Handle *handle = cls;
- struct PendingMessage *head;
- size_t tsize;
-
- handle->th = NULL;
- if (buf == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission to DHT 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);
- if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (head->timeout_task);
- head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != head->cont)
- {
- GNUNET_SCHEDULER_add_continuation (head->cont, head->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- head->cont = NULL;
- head->cont_cls = NULL;
- }
- head->in_pending_queue = GNUNET_NO;
- if (GNUNET_YES == head->free_on_send)
- GNUNET_free (head);
- process_pending_messages (handle);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Forwarded request of %u bytes to DHT service\n",
- (unsigned int) tsize);
- return tsize;
-}
-
-
-/**
- * Process a given reply that might match the given
- * request.
- *
- * @param cls the 'struct GNUNET_DHT_ClientResultMessage'
- * @param key query of the request
- * @param value the 'struct GNUNET_DHT_RouteHandle' 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_reply (void *cls, const GNUNET_HashCode * key, void *value)
-{
- const struct GNUNET_DHT_ClientResultMessage *dht_msg = cls;
- struct GNUNET_DHT_GetHandle *get_handle = value;
- const struct GNUNET_PeerIdentity *put_path;
- const struct GNUNET_PeerIdentity *get_path;
- uint32_t put_path_length;
- uint32_t get_path_length;
- size_t data_length;
- size_t msize;
- size_t meta_length;
- const void *data;
-
- if (dht_msg->unique_id != get_handle->unique_id)
- {
- /* UID mismatch */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Ignoring reply (UID mismatch: %llu/%llu)\n",
- dht_msg->unique_id,
- get_handle->unique_id);
- return GNUNET_YES;
- }
- msize = ntohs (dht_msg->header.size);
- put_path_length = ntohl (dht_msg->put_path_length);
- get_path_length = ntohl (dht_msg->get_path_length);
- meta_length = sizeof (struct GNUNET_DHT_ClientResultMessage) +
- sizeof (struct GNUNET_PeerIdentity) * (get_path_length + put_path_length);
- if ( (msize < meta_length) ||
- (get_path_length > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct
GNUNET_PeerIdentity)) ||
- (put_path_length > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct
GNUNET_PeerIdentity)) )
- {
- GNUNET_break (0);
- return GNUNET_NO;
- }
- data_length = msize - meta_length;
- put_path = (const struct GNUNET_PeerIdentity *) &dht_msg[1];
- get_path = &put_path[put_path_length];
- data = &get_path[get_path_length];
- get_handle->iter (get_handle->iter_cls,
- GNUNET_TIME_absolute_ntoh (dht_msg->expiration),
- key,
- get_path, get_path_length,
- put_path, put_path_length,
- ntohl (dht_msg->type),
- data_length, data);
- return GNUNET_YES;
-}
-
-
-/**
- * Handler for messages received from the DHT service
- * a demultiplexer which handles numerous message types
- *
- * @param cls the 'struct GNUNET_DHT_Handle'
- * @param msg the incoming message
- */
-static void
-service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_DHT_Handle *handle = cls;
- const struct GNUNET_DHT_ClientResultMessage *dht_msg;
-
- if (msg == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error receiving data from DHT service, reconnecting\n");
- do_disconnect (handle);
- return;
- }
- if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT)
- {
- GNUNET_break (0);
- do_disconnect (handle);
- return;
- }
- if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_ClientResultMessage))
- {
- GNUNET_break (0);
- do_disconnect (handle);
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received reply from DHT service\n");
- dht_msg = (const struct GNUNET_DHT_ClientResultMessage *) msg;
- GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
- &dht_msg->key, &process_reply,
- (void *) dht_msg);
- GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
-}
-
-
-/**
- * Initialize the connection with the DHT service.
- *
- * @param cfg configuration to use
- * @param ht_len size of the internal hash table to use for
- * processing multiple GET/FIND requests in parallel
- *
- * @return handle to the DHT service, or NULL on error
- */
-struct GNUNET_DHT_Handle *
-GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int ht_len)
-{
- struct GNUNET_DHT_Handle *handle;
-
- handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_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))
- {
- GNUNET_DHT_disconnect (handle);
- return NULL;
- }
- return handle;
-}
-
-
-/**
- * Shutdown connection with the DHT service.
- *
- * @param handle handle of the DHT connection to stop
- */
-void
-GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
-{
- struct PendingMessage *pm;
-
- GNUNET_assert (handle != NULL);
- GNUNET_assert (0 ==
- GNUNET_CONTAINER_multihashmap_size (handle->active_requests));
- if (handle->th != NULL)
- {
- GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
- handle->th = NULL;
- }
- while (NULL != (pm = handle->pending_head))
- {
- GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
- pm);
- GNUNET_assert (GNUNET_YES == pm->free_on_send);
- if (GNUNET_SCHEDULER_NO_TASK != pm->timeout_task)
- GNUNET_SCHEDULER_cancel (pm->timeout_task);
- if (NULL != pm->cont)
- GNUNET_SCHEDULER_add_continuation (pm->cont, pm->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- pm->in_pending_queue = GNUNET_NO;
- GNUNET_free (pm);
- }
- if (handle->client != NULL)
- {
- GNUNET_CLIENT_disconnect (handle->client, GNUNET_YES);
- handle->client = NULL;
- }
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (handle->reconnect_task);
- GNUNET_CONTAINER_multihashmap_destroy (handle->active_requests);
- GNUNET_free (handle);
-}
-
-
-/**
- * Timeout for the transmission of a fire&forget-request. Clean it up.
- *
- * @param cls the 'struct PendingMessage'
- * @param tc scheduler context
- */
-static void
-timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct PendingMessage *pending = cls;
- struct GNUNET_DHT_Handle *handle;
-
- handle = pending->handle;
- GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
- pending);
- if (pending->cont != NULL)
- pending->cont (pending->cont_cls, tc);
- GNUNET_free (pending);
-}
-
-
-/**
- * Perform a PUT operation storing data in the DHT.
- *
- * @param handle handle to DHT 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
- */
-void
-GNUNET_DHT_put (struct GNUNET_DHT_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)
-{
- struct GNUNET_DHT_ClientPutMessage *put_msg;
- size_t msize;
- struct PendingMessage *pending;
-
- msize = sizeof (struct GNUNET_DHT_ClientPutMessage) + size;
- if ( (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
- (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE) )
- {
- GNUNET_break (0);
- if (NULL != cont)
- cont (cont_cls, NULL);
- return;
- }
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- put_msg = (struct GNUNET_DHT_ClientPutMessage *) &pending[1];
- pending->msg = &put_msg->header;
- pending->handle = handle;
- pending->cont = cont;
- pending->cont_cls = cont_cls;
- pending->free_on_send = GNUNET_YES;
- pending->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout, &timeout_put_request, pending);
- put_msg->header.size = htons (msize);
- put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT);
- put_msg->type = htonl (type);
- put_msg->options = htonl ((uint32_t) options);
- put_msg->desired_replication_level = htonl (desired_replication_level);
- put_msg->expiration = GNUNET_TIME_absolute_hton (exp);
- put_msg->key = *key;
- memcpy (&put_msg[1], data, size);
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_YES;
- process_pending_messages (handle);
-}
-
-
-/**
- * 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 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
- */
-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,
- uint32_t desired_replication_level,
- enum GNUNET_DHT_RouteOption options,
- const void *xquery, size_t xquery_size,
- GNUNET_DHT_GetIterator iter, void *iter_cls)
-{
- struct GNUNET_DHT_ClientGetMessage *get_msg;
- struct GNUNET_DHT_GetHandle *get_handle;
- size_t msize;
- struct PendingMessage *pending;
-
- msize = sizeof (struct GNUNET_DHT_ClientGetMessage) + xquery_size;
- if ( (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
- (xquery_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE) )
- {
- GNUNET_break (0);
- return NULL;
- }
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- get_msg = (struct GNUNET_DHT_ClientGetMessage *) &pending[1];
- pending->msg = &get_msg->header;
- pending->handle = handle;
- pending->free_on_send = GNUNET_NO;
- get_msg->header.size = htons (msize);
- get_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET);
- get_msg->options = htonl ((uint32_t) options);
- get_msg->desired_replication_level = htonl (desired_replication_level);
- get_msg->type = htonl (type);
- get_msg->key = *key;
- handle->uid_gen++;
- get_msg->unique_id = handle->uid_gen;
- memcpy (&get_msg[1], xquery, xquery_size);
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_YES;
- get_handle = GNUNET_malloc (sizeof (struct GNUNET_DHT_GetHandle));
- get_handle->iter = iter;
- get_handle->iter_cls = iter_cls;
- get_handle->message = pending;
- get_handle->unique_id = get_msg->unique_id;
- GNUNET_CONTAINER_multihashmap_put (handle->active_requests,
- key, get_handle,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- process_pending_messages (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)
-{
- struct GNUNET_DHT_Handle *handle;
- const struct GNUNET_DHT_ClientGetMessage *get_msg;
- struct GNUNET_DHT_ClientGetStopMessage *stop_msg;
- struct PendingMessage *pending;
-
- handle = get_handle->message->handle;
- get_msg = (const struct GNUNET_DHT_ClientGetMessage*)
get_handle->message->msg;
-
- /* generate STOP */
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + sizeof (struct
GNUNET_DHT_ClientGetStopMessage));
- stop_msg = (struct GNUNET_DHT_ClientGetStopMessage *) &pending[1];
- pending->msg = &stop_msg->header;
- pending->handle = handle;
- pending->free_on_send = GNUNET_YES;
- stop_msg->header.size = htons (sizeof (struct
GNUNET_DHT_ClientGetStopMessage));
- stop_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP);
- stop_msg->reserved = htonl (0);
- stop_msg->unique_id = get_msg->unique_id;
- stop_msg->key = get_msg->key;
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_YES;
-
- /* remove 'GET' from active status */
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (handle->active_requests,
- &get_msg->key,
get_handle));
- if (GNUNET_YES == get_handle->message->in_pending_queue)
- {
- GNUNET_CONTAINER_DLL_remove (handle->pending_head,
- handle->pending_tail,
- get_handle->message);
- get_handle->message->in_pending_queue = GNUNET_NO;
- }
- GNUNET_free (get_handle->message);
- GNUNET_free (get_handle);
-
- process_pending_messages (handle);
-}
-
-
-/* end of dht_api.c */
Deleted: gnunet/src/dht/dht_new.h
===================================================================
--- gnunet/src/dht/dht_new.h 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/dht_new.h 2011-09-27 20:54:53 UTC (rev 17079)
@@ -1,190 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2009, 2011 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.
-*/
-
-/**
- * @author Christian Grothoff
- * @author Nathan Evans
- * @file dht/dht.h
- */
-
-#ifndef DHT_H_
-#define DHT_H_
-
-
-/**
- * Message which indicates the DHT should cancel outstanding
- * requests and discard any state.
- */
-struct GNUNET_DHT_ClientGetStopMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_GET_STOP
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Always zero.
- */
- uint32_t reserved GNUNET_PACKED;
-
- /**
- * Unique ID identifying this request
- */
- uint64_t unique_id GNUNET_PACKED;
-
- /**
- * Key of this request
- */
- GNUNET_HashCode key;
-
-};
-
-
-/**
- * DHT GET message sent from clients to service. Indicates that a GET
- * request should be issued.
- */
-struct GNUNET_DHT_ClientGetMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
- */
- uint32_t options GNUNET_PACKED;
-
- /**
- * Replication level for this message
- */
- uint32_t desired_replication_level GNUNET_PACKED;
-
- /**
- * The type for the data for the GET request; actually an 'enum
- * GNUNET_BLOCK_Type'.
- */
- uint32_t type;
-
- /**
- * The key to search for
- */
- GNUNET_HashCode key;
-
- /**
- * Unique ID identifying this request, if 0 then
- * the client will not expect a response
- */
- uint64_t unique_id GNUNET_PACKED;
-
- /* Possibly followed by xquery, copied to end of this dealy do */
-
-};
-
-
-/**
- * Reply to a GET send from the service to a client.
- */
-struct GNUNET_DHT_ClientResultMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * The type for the data.
- */
- uint32_t type;
-
- /**
- * Number of peers recorded in the outgoing path from source to the
- * storgage location of this message.
- */
- uint32_t put_path_length GNUNET_PACKED;
-
- /**
- * The number of peer identities recorded from the storage location
- * to this peer.
- */
- uint32_t get_path_length GNUNET_PACKED;
-
- /**
- * Unique ID of the matching GET request.
- */
- uint64_t unique_id GNUNET_PACKED;
-
- /**
- * When does this entry expire?
- */
- struct GNUNET_TIME_AbsoluteNBO expiration;
-
- /**
- * The key that was searched for
- */
- GNUNET_HashCode key;
-
- /* put path, get path and actual data are copied to end of this dealy do */
-
-};
-
-
-/**
- * Message to insert data into the DHT, sent from clients to DHT service.
- */
-struct GNUNET_DHT_ClientPutMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * The type of data to insert.
- */
- uint32_t type GNUNET_PACKED;
-
- /**
- * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
- */
- uint32_t options GNUNET_PACKED;
-
- /**
- * Replication level for this message
- */
- uint32_t desired_replication_level GNUNET_PACKED;
-
- /**
- * How long should this data persist?
- */
- struct GNUNET_TIME_AbsoluteNBO expiration;
-
- /**
- * The key to store the value under.
- */
- GNUNET_HashCode key;
-
- /* DATA copied to end of this message */
-
-};
-
-
-#endif
Modified: gnunet/src/dht/gnunet-dht-get.c
===================================================================
--- gnunet/src/dht/gnunet-dht-get.c 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/gnunet-dht-get.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -24,7 +24,7 @@
* @author Nathan Evans
*/
#include "platform.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
/**
* The type of the query
Modified: gnunet/src/dht/gnunet-dht-put.c
===================================================================
--- gnunet/src/dht/gnunet-dht-put.c 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/gnunet-dht-put.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -24,7 +24,7 @@
* @author Nathan Evans
*/
#include "platform.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
/**
* The type of the query
Deleted: gnunet/src/dht/gnunet-service-dht-new.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht-new.c 2011-09-27 20:54:22 UTC (rev
17078)
+++ gnunet/src/dht/gnunet-service-dht-new.c 2011-09-27 20:54:53 UTC (rev
17079)
@@ -1,194 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2009, 2010, 2011 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/gnunet-service-dht.c
- * @brief GNUnet DHT service
- * @author Christian Grothoff
- * @author Nathan Evans
- */
-#include "platform.h"
-#include "gnunet_block_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_dht_service_new.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet-service-dht.h"
-#include "gnunet-service-dht_clients.h"
-#include "gnunet-service-dht_datacache.h"
-#include "gnunet-service-dht_hello.h"
-#include "gnunet-service-dht_neighbours.h"
-#include "gnunet-service-dht_nse.h"
-#include "gnunet-service-dht_routing.h"
-
-
-
-/**
- * Handle for the statistics service.
- */
-struct GNUNET_STATISTICS_Handle *GDS_stats;
-
-/**
- * Our handle to the BLOCK library.
- */
-struct GNUNET_BLOCK_Context *GDS_block_context;
-
-/**
- * The configuration the DHT service is running with
- */
-const struct GNUNET_CONFIGURATION_Handle *GDS_cfg;
-
-/**
- * Our HELLO
- */
-struct GNUNET_MessageHeader *GDS_my_hello;
-
-/**
- * Handle to the transport service, for getting our hello
- */
-struct GNUNET_TRANSPORT_Handle *GDS_transport_handle;
-
-
-/**
- * Handle to get our current HELLO.
- */
-static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
-
-/**
- * Receive the HELLO from transport service, free current and replace
- * if necessary.
- *
- * @param cls NULL
- * @param message HELLO message of peer
- */
-static void
-process_hello (void *cls,
- const struct GNUNET_MessageHeader *message)
-{
- GNUNET_assert (message != NULL);
- GNUNET_free_non_null (GDS_my_hello);
- GDS_my_hello = GNUNET_malloc (ntohs (message->size));
- memcpy (GDS_my_hello, message, ntohs (message->size));
-}
-
-
-/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
- */
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- if (NULL != ghh)
- {
- GNUNET_TRANSPORT_get_hello_cancel (ghh);
- ghh = NULL;
- }
- if (GDS_transport_handle != NULL)
- {
- GNUNET_TRANSPORT_disconnect (GDS_transport_handle);
- GDS_transport_handle = NULL;
- }
- GDS_NEIGHBOURS_done ();
- GDS_DATACACHE_done ();
- GDS_ROUTING_done ();
- GDS_HELLO_done ();
- GDS_NSE_done ();
- if (GDS_block_context != NULL)
- {
- GNUNET_BLOCK_context_destroy (GDS_block_context);
- GDS_block_context = NULL;
- }
- if (GDS_stats != NULL)
- {
- GNUNET_STATISTICS_destroy (GDS_stats, GNUNET_YES);
- GDS_stats = NULL;
- }
- GNUNET_free_non_null (GDS_my_hello);
- GDS_my_hello = NULL;
-}
-
-
-/**
- * Process dht requests.
- *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
- */
-static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- GDS_cfg = c;
- GDS_block_context = GNUNET_BLOCK_context_create (GDS_cfg);
- GDS_stats = GNUNET_STATISTICS_create ("dht", GDS_cfg);
- GDS_ROUTING_init ();
- GDS_NSE_init ();
- GDS_DATACACHE_init ();
- GDS_HELLO_init ();
- GDS_CLIENTS_init (server);
- if (GNUNET_OK !=
- GDS_NEIGHBOURS_init ())
- {
- shutdown_task (NULL, NULL);
- return;
- }
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
- GDS_transport_handle =
- GNUNET_TRANSPORT_connect (GDS_cfg, NULL, NULL, NULL, NULL, NULL);
- if (GDS_transport_handle == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to connect to transport service!\n"));
- return;
- }
- ghh = GNUNET_TRANSPORT_get_hello (GDS_transport_handle,
- &process_hello, NULL);
-}
-
-
-/**
- * The main function for the dht service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
- int ret;
-
- ret = (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv,
- "dht",
- GNUNET_SERVICE_OPTION_NONE,
- &run, NULL)) ? 0 : 1;
- GDS_CLIENTS_done ();
- return ret;
-}
-
-/* end of gnunet-service-dht.c */
Copied: gnunet/src/dht/gnunet-service-dht.c (from rev 17071,
gnunet/src/dht/gnunet-service-dht-new.c)
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c (rev 0)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -0,0 +1,194 @@
+/*
+ This file is part of GNUnet.
+ (C) 2009, 2010, 2011 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/gnunet-service-dht.c
+ * @brief GNUnet DHT service
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+#include "platform.h"
+#include "gnunet_block_lib.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_transport_service.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_dht_service.h"
+#include "gnunet_statistics_service.h"
+#include "gnunet-service-dht.h"
+#include "gnunet-service-dht_clients.h"
+#include "gnunet-service-dht_datacache.h"
+#include "gnunet-service-dht_hello.h"
+#include "gnunet-service-dht_neighbours.h"
+#include "gnunet-service-dht_nse.h"
+#include "gnunet-service-dht_routing.h"
+
+
+
+/**
+ * Handle for the statistics service.
+ */
+struct GNUNET_STATISTICS_Handle *GDS_stats;
+
+/**
+ * Our handle to the BLOCK library.
+ */
+struct GNUNET_BLOCK_Context *GDS_block_context;
+
+/**
+ * The configuration the DHT service is running with
+ */
+const struct GNUNET_CONFIGURATION_Handle *GDS_cfg;
+
+/**
+ * Our HELLO
+ */
+struct GNUNET_MessageHeader *GDS_my_hello;
+
+/**
+ * Handle to the transport service, for getting our hello
+ */
+struct GNUNET_TRANSPORT_Handle *GDS_transport_handle;
+
+
+/**
+ * Handle to get our current HELLO.
+ */
+static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
+
+
+/**
+ * Receive the HELLO from transport service, free current and replace
+ * if necessary.
+ *
+ * @param cls NULL
+ * @param message HELLO message of peer
+ */
+static void
+process_hello (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ GNUNET_assert (message != NULL);
+ GNUNET_free_non_null (GDS_my_hello);
+ GDS_my_hello = GNUNET_malloc (ntohs (message->size));
+ memcpy (GDS_my_hello, message, ntohs (message->size));
+}
+
+
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (NULL != ghh)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (ghh);
+ ghh = NULL;
+ }
+ if (GDS_transport_handle != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect (GDS_transport_handle);
+ GDS_transport_handle = NULL;
+ }
+ GDS_NEIGHBOURS_done ();
+ GDS_DATACACHE_done ();
+ GDS_ROUTING_done ();
+ GDS_HELLO_done ();
+ GDS_NSE_done ();
+ if (GDS_block_context != NULL)
+ {
+ GNUNET_BLOCK_context_destroy (GDS_block_context);
+ GDS_block_context = NULL;
+ }
+ if (GDS_stats != NULL)
+ {
+ GNUNET_STATISTICS_destroy (GDS_stats, GNUNET_YES);
+ GDS_stats = NULL;
+ }
+ GNUNET_free_non_null (GDS_my_hello);
+ GDS_my_hello = NULL;
+}
+
+
+/**
+ * Process dht requests.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param c configuration to use
+ */
+static void
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+ const struct GNUNET_CONFIGURATION_Handle *c)
+{
+ GDS_cfg = c;
+ GDS_block_context = GNUNET_BLOCK_context_create (GDS_cfg);
+ GDS_stats = GNUNET_STATISTICS_create ("dht", GDS_cfg);
+ GDS_ROUTING_init ();
+ GDS_NSE_init ();
+ GDS_DATACACHE_init ();
+ GDS_HELLO_init ();
+ GDS_CLIENTS_init (server);
+ if (GNUNET_OK !=
+ GDS_NEIGHBOURS_init ())
+ {
+ shutdown_task (NULL, NULL);
+ return;
+ }
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task, NULL);
+ GDS_transport_handle =
+ GNUNET_TRANSPORT_connect (GDS_cfg, NULL, NULL, NULL, NULL, NULL);
+ if (GDS_transport_handle == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to connect to transport service!\n"));
+ return;
+ }
+ ghh = GNUNET_TRANSPORT_get_hello (GDS_transport_handle,
+ &process_hello, NULL);
+}
+
+
+/**
+ * The main function for the dht service.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+ int ret;
+
+ ret = (GNUNET_OK ==
+ GNUNET_SERVICE_run (argc, argv,
+ "dht",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run, NULL)) ? 0 : 1;
+ GDS_CLIENTS_done ();
+ return ret;
+}
+
+/* end of gnunet-service-dht.c */
Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2011-09-27 20:54:22 UTC (rev
17078)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2011-09-27 20:54:53 UTC (rev
17079)
@@ -32,7 +32,7 @@
#include "gnunet-service-dht_clients.h"
#include "gnunet-service-dht_datacache.h"
#include "gnunet-service-dht_neighbours.h"
-#include "dht_new.h"
+#include "dht.h"
/**
Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-09-27 20:54:22 UTC
(rev 17078)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-09-27 20:54:53 UTC
(rev 17079)
@@ -36,7 +36,7 @@
#include "gnunet_datacache_lib.h"
#include "gnunet_transport_service.h"
#include "gnunet_hello_lib.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
#include "gnunet_statistics_service.h"
#include "gnunet-service-dht.h"
#include "gnunet-service-dht_clients.h"
Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/test_dht_api.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -31,7 +31,7 @@
#include "gnunet_os_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
#include "gnunet_hello_lib.h"
#define VERBOSE GNUNET_NO
Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c 2011-09-27 20:54:22 UTC (rev 17078)
+++ gnunet/src/dht/test_dht_twopeer.c 2011-09-27 20:54:53 UTC (rev 17079)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
/* DEFINES */
#define VERBOSE GNUNET_NO
Modified: gnunet/src/dht/test_dht_twopeer_get_put.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_get_put.c 2011-09-27 20:54:22 UTC (rev
17078)
+++ gnunet/src/dht/test_dht_twopeer_get_put.c 2011-09-27 20:54:53 UTC (rev
17079)
@@ -39,7 +39,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c 2011-09-27 20:54:22 UTC (rev
17078)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c 2011-09-27 20:54:53 UTC (rev
17079)
@@ -39,7 +39,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#include "gnunet_dht_service_new.h"
+#include "gnunet_dht_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17079 - gnunet/src/dht,
gnunet <=