[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10798 - gnunet/src/dht
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r10798 - gnunet/src/dht |
|
Date: |
Mon, 5 Apr 2010 15:52:41 +0200 |
Author: nevans
Date: 2010-04-05 15:52:41 +0200 (Mon, 05 Apr 2010)
New Revision: 10798
Added:
gnunet/src/dht/gnunet-dht-get.c
gnunet/src/dht/gnunet-dht-put.c
Modified:
gnunet/src/dht/Makefile.am
gnunet/src/dht/dht_api.c
gnunet/src/dht/gnunet-service-dht.c
Log:
add gnunet-dht-get and gnunet-dht-put binaries, changes to service
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2010-04-05 13:48:30 UTC (rev 10797)
+++ gnunet/src/dht/Makefile.am 2010-04-05 13:52:41 UTC (rev 10798)
@@ -22,7 +22,9 @@
bin_PROGRAMS = \
- gnunet-service-dht
+ gnunet-service-dht \
+ gnunet-dht-get \
+ gnunet-dht-put
gnunet_service_dht_SOURCES = \
gnunet-service-dht.c
@@ -32,7 +34,20 @@
$(top_builddir)/src/datacache/libgnunetdatacache.la \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_get_SOURCES = \
+ gnunet-dht-get.c
+gnunet_dht_get_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_put_SOURCES = \
+ gnunet-dht-put.c
+gnunet_dht_put_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
check_PROGRAMS = \
test_dht_api
Modified: gnunet/src/dht/dht_api.c
===================================================================
--- gnunet/src/dht/dht_api.c 2010-04-05 13:48:30 UTC (rev 10797)
+++ gnunet/src/dht/dht_api.c 2010-04-05 13:52:41 UTC (rev 10798)
@@ -39,7 +39,7 @@
#include "gnunet_dht_service.h"
#include "dht.h"
-#define DEBUG_DHT_API GNUNET_YES
+#define DEBUG_DHT_API GNUNET_NO
#define DEFAULT_DHT_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
@@ -1033,6 +1033,7 @@
* @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;
* reason will be TIMEOUT on error,
* reason will be PREREQ_DONE on success
Added: gnunet/src/dht/gnunet-dht-get.c
===================================================================
--- gnunet/src/dht/gnunet-dht-get.c (rev 0)
+++ gnunet/src/dht/gnunet-dht-get.c 2010-04-05 13:52:41 UTC (rev 10798)
@@ -0,0 +1,244 @@
+/*
+ This file is part of GNUnet.
+ (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 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 2, 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-dht-get.c
+ * @brief search for data in DHT
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+#include "platform.h"
+#include "gnunet_dht_service.h"
+
+/**
+ * The type of the query
+ */
+static unsigned int query_type;
+
+/**
+ * The key for the query
+ */
+static char *query_key;
+
+/**
+ * User supplied timeout value (in seconds)
+ */
+static unsigned long long timeout_request = 5;
+
+/**
+ * When this request should really die
+ */
+struct GNUNET_TIME_Absolute absolute_timeout;
+
+/**
+ * Be verbose
+ */
+static int verbose;
+
+/**
+ * Handle to the DHT
+ */
+static struct GNUNET_DHT_Handle *dht_handle;
+
+/**
+ * Global handle of the scheduler
+ */
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+/**
+ * Global handle of the configuration
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Handle for the get request
+ */
+static struct GNUNET_DHT_GetHandle *get_handle;
+
+/**
+ * Count of results found
+ */
+static unsigned int result_count;
+
+/**
+ * Global status value
+ */
+static int ret;
+
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+ if (dht_handle != NULL)
+ GNUNET_DHT_disconnect (dht_handle);
+
+ dht_handle = NULL;
+}
+
+static void
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (get_handle != NULL)
+ GNUNET_DHT_get_stop (get_handle, &shutdown_task, NULL);
+ else
+ GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL);
+}
+
+
+/**
+ * Iterator called on each result obtained for a DHT
+ * operation that expects a reply
+ *
+ * @param cls closure
+ * @param exp when will this value expire
+ * @param key key of the result
+ * @param type type of the result
+ * @param size number of bytes in data
+ * @param data pointer to the result data
+ */
+void
+get_result_iterator (void *cls,
+ struct GNUNET_TIME_Absolute exp,
+ const GNUNET_HashCode * key,
+ uint32_t type, uint32_t size, const void *data)
+{
+ fprintf (stdout, "Result %d, type %d:\n%.*s\n", result_count, type, size,
+ (char *) data);
+ result_count++;
+}
+
+/**
+ * Signature of the main function of a task.
+ *
+ * @param cls closure
+ * @param tc context information (why was this task triggered now)
+ */
+void
+message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+ {
+ if (verbose)
+ fprintf (stderr,
+ "Failed to send GET request to service, quitting.\n");
+ ret = 1;
+ GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL);
+ }
+ else
+ {
+ if (verbose)
+ fprintf (stderr, "GET request sent, awaiting results!\n");
+ GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_TIME_absolute_get_remaining
+ (absolute_timeout), &cleanup_task, NULL);
+ }
+}
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param s the scheduler to use
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be
NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+{
+ struct GNUNET_TIME_Relative timeout;
+ GNUNET_HashCode key;
+ sched = s;
+ cfg = c;
+
+ if (query_key == NULL)
+ {
+ if (verbose)
+ fprintf (stderr, "Must provide key for DHT GET!\n");
+ ret = 1;
+ return;
+ }
+
+ dht_handle = GNUNET_DHT_connect (sched, cfg, 1);
+
+ if (dht_handle == NULL)
+ {
+ if (verbose)
+ fprintf (stderr, "Couldn't connect to DHT service!\n");
+ ret = 1;
+ return;
+ }
+ else if (verbose)
+ fprintf (stderr, "Connected to DHT service!\n");
+
+ GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key);
+
+ timeout =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
+ absolute_timeout = GNUNET_TIME_relative_to_absolute (timeout);
+
+ if (verbose)
+ fprintf (stderr, "Issuing GET request for %s!\n", query_key);
+ GNUNET_DHT_get_start (dht_handle, timeout, query_type, &key,
+ &get_result_iterator, NULL, &message_sent_cont, NULL);
+
+}
+
+
+/**
+ * gnunet-dht-get command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ {'k', "key", "KEY",
+ gettext_noop ("the query key"),
+ 1, &GNUNET_GETOPT_set_string, &query_key},
+ {'t', "type", "TYPE",
+ gettext_noop ("the type of data to look for"),
+ 0, &GNUNET_GETOPT_set_uint, &query_type},
+ {'T', "timeout", "TIMEOUT",
+ gettext_noop ("how long to execute this query before giving up?"),
+ 0, &GNUNET_GETOPT_set_ulong, &timeout_request},
+ {'V', "verbose", NULL,
+ gettext_noop ("be verbose (print progress information)"),
+ 0, &GNUNET_GETOPT_set_one, &verbose},
+ GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * Entry point for gnunet-dht-get
+ *
+ * @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)
+{
+ return (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-dht-get",
+ gettext_noop
+ ("Issue a GET request to the GNUnet DHT, prints
results."),
+ options, &run, NULL)) ? ret : 1;
+}
Added: gnunet/src/dht/gnunet-dht-put.c
===================================================================
--- gnunet/src/dht/gnunet-dht-put.c (rev 0)
+++ gnunet/src/dht/gnunet-dht-put.c 2010-04-05 13:52:41 UTC (rev 10798)
@@ -0,0 +1,217 @@
+/*
+ This file is part of GNUnet.
+ (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 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 2, 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-dht-put.c
+ * @brief search for data in DHT
+ * @author Christian Grothoff
+ * @author Nathan Evans
+ */
+#include "platform.h"
+#include "gnunet_dht_service.h"
+
+/**
+ * The type of the query
+ */
+static unsigned int query_type;
+
+/**
+ * The key for the query
+ */
+static char *query_key;
+
+/**
+ * User supplied timeout value
+ */
+static unsigned long long timeout_request = 5;
+
+/**
+ * User supplied expiration value
+ */
+static unsigned long long expiration_seconds = 3600;
+
+/**
+ * Be verbose
+ */
+static int verbose;
+
+/**
+ * Handle to the DHT
+ */
+static struct GNUNET_DHT_Handle *dht_handle;
+
+/**
+ * Global handle of the scheduler
+ */
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+/**
+ * Global handle of the configuration
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Global status value
+ */
+static int ret;
+
+/**
+ * The data to insert into the dht
+ */
+static char *data;
+
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+ if (dht_handle != NULL)
+ GNUNET_DHT_disconnect (dht_handle);
+
+ dht_handle = NULL;
+}
+
+/**
+ * Signature of the main function of a task.
+ *
+ * @param cls closure
+ * @param tc context information (why was this task triggered now)
+ */
+void
+message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+ {
+ if (verbose)
+ fprintf (stderr,
+ "Failed to send put request to service, quitting.\n");
+ ret = 1;
+ }
+ else
+ {
+ if (verbose)
+ fprintf (stderr, "PUT request sent!\n");
+ }
+
+ GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL);
+}
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param s the scheduler to use
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be
NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+{
+ struct GNUNET_TIME_Relative timeout;
+ struct GNUNET_TIME_Absolute expiration;
+ GNUNET_HashCode key;
+ sched = s;
+ cfg = c;
+
+ if ((query_key == NULL) || (data == NULL))
+ {
+ if (verbose)
+ fprintf (stderr, "Must provide KEY and DATA for DHT put!\n");
+ ret = 1;
+ return;
+ }
+
+ dht_handle = GNUNET_DHT_connect (sched, cfg, 1);
+
+ if (dht_handle == NULL)
+ {
+ if (verbose)
+ fprintf (stderr, "Couldn't connect to DHT service!\n");
+ ret = 1;
+ return;
+ }
+ else if (verbose)
+ fprintf (stderr, "Connected to DHT service!\n");
+
+ GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key);
+
+ timeout =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
+ expiration =
+ GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ expiration_seconds));
+
+ if (verbose)
+ fprintf (stderr, "Issuing put request for `%s' with data `%s'!\n",
+ query_key, data);
+
+ GNUNET_DHT_put (dht_handle, &key, query_type, strlen (data), data,
+ expiration, timeout, &message_sent_cont, NULL);
+
+}
+
+
+/**
+ * gnunet-dht-put command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ {'k', "key", "KEY",
+ gettext_noop ("the query key"),
+ 1, &GNUNET_GETOPT_set_string, &query_key},
+ {'d', "data", "DATA",
+ gettext_noop ("the data to insert under the key"),
+ 1, &GNUNET_GETOPT_set_string, &data},
+ {'t', "type", "TYPE",
+ gettext_noop ("the type to insert data as"),
+ 0, &GNUNET_GETOPT_set_uint, &query_type},
+ {'T', "timeout", "TIMEOUT",
+ gettext_noop ("how long to execute this query before giving up?"),
+ 0, &GNUNET_GETOPT_set_ulong, &timeout_request},
+ {'e', "expiration", "EXPIRATION",
+ gettext_noop ("how long to store this entry in the dht (in seconds)"),
+ 0, &GNUNET_GETOPT_set_ulong, &expiration_seconds},
+ {'V', "verbose", NULL,
+ gettext_noop ("be verbose (print progress information)"),
+ 0, &GNUNET_GETOPT_set_one, &verbose},
+ GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * Entry point for gnunet-dht-put
+ *
+ * @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)
+{
+ return (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-dht-put",
+ gettext_noop
+ ("Issue a PUT request to the GNUnet DHT insert
DATA under KEY."),
+ options, &run, NULL)) ? ret : 1;
+}
Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-04-05 13:48:30 UTC (rev 10797)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-04-05 13:52:41 UTC (rev 10798)
@@ -72,7 +72,55 @@
*/
static GNUNET_SCHEDULER_TaskIdentifier cleanup_task;
+
/**
+ * Linked list of messages to send to clients.
+ */
+struct PendingMessage
+{
+ /**
+ * Pointer to next item in the list
+ */
+ struct PendingMessage *next;
+
+ /**
+ * Actual message to be sent
+ */
+ struct GNUNET_MessageHeader *msg;
+
+};
+
+/**
+ * Struct containing information about a client,
+ * handle to connect to it, and any pending messages
+ * that need to be sent to it.
+ */
+struct ClientList
+{
+ /**
+ * Linked list of active clients
+ */
+ struct ClientList *next;
+
+ /**
+ * The handle to this client
+ */
+ struct GNUNET_SERVER_Client *client_handle;
+
+ /**
+ * Handle to the current transmission request, NULL
+ * if none pending.
+ */
+ struct GNUNET_CONNECTION_TransmitHandle *transmit_handle;
+
+ /**
+ * Linked list of pending messages for this client
+ */
+ struct PendingMessage *pending_head;
+
+};
+
+/**
* Context for handling results from a get request.
*/
struct DatacacheGetContext
@@ -80,7 +128,7 @@
/**
* The client to send the result to.
*/
- struct GNUNET_SERVER_Client *client;
+ struct ClientList *client;
/**
* The unique id of this request
@@ -88,13 +136,15 @@
unsigned long long unique_id;
};
-
+/**
+ * Context containing information about a DHT message received.
+ */
struct DHT_MessageContext
{
/**
* The client this request was received from.
*/
- struct GNUNET_SERVER_Client *client;
+ struct ClientList *client;
/**
* The key this request was about
@@ -118,8 +168,14 @@
};
/**
- * Server handler for handling locally received dht requests
+ * List of active clients.
*/
+static struct ClientList *client_list;
+
+
+/**
+ * Server handlers for handling locally received dht requests
+ */
static void
handle_dht_start_message (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message);
@@ -170,34 +226,157 @@
{NULL, 0, 0}
};
+/**
+ * Forward declaration.
+ */
+static size_t send_generic_reply (void *cls, size_t size, void *buf);
+/**
+ * Task run to check for messages that need to be sent to a client.
+ *
+ * @param cls a ClientList, containing the client and any messages to be sent
to it
+ * @param tc reason this was called
+ */
+static void
+process_pending_messages (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ClientList *client = cls;
+
+ if (client->pending_head == NULL) /* No messages queued */
+ {
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s': Have no pending messages for client.\n", "DHT");
+#endif
+ return;
+ }
+
+ if (client->transmit_handle == NULL) /* No current pending messages, we can
try to send! */
+ client->transmit_handle =
+ GNUNET_SERVER_notify_transmit_ready (client->client_handle,
+ ntohs (client->pending_head->msg->
+ size),
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &send_generic_reply, client);
+ else
+ {
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s': Transmit handle is non-null.\n", "DHT");
+#endif
+ }
+}
+
+/**
+ * Callback called as a result of issuing a GNUNET_SERVER_notify_transmit_ready
+ * request. A ClientList is passed as closure, take the head of the list
+ * and copy it into buf, which has the result of sending the message to the
+ * client.
+ *
+ * @param cls closure to this call
+ * @param size maximum number of bytes available to send
+ * @param buf where to copy the actual message to
+ *
+ * @return the number of bytes actually copied, 0 indicates failure
+ */
static size_t
-send_reply (void *cls, size_t size, void *buf)
+send_generic_reply (void *cls, size_t size, void *buf)
{
- struct GNUNET_DHT_Message *reply = cls;
+ struct ClientList *client = cls;
+ struct PendingMessage *reply = client->pending_head;
+ int ret;
+ client->transmit_handle = NULL;
if (buf == NULL) /* Message timed out, that's crappy... */
{
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s': buffer was NULL\n", "DHT");
+#endif
+ client->pending_head = reply->next;
+ GNUNET_free (reply->msg);
GNUNET_free (reply);
return 0;
}
- if (size >= ntohs (reply->header.size))
+ if (size >= ntohs (reply->msg->size))
{
- memcpy (buf, reply, ntohs (reply->header.size));
- return ntohs (reply->header.size);
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s': Copying reply to buffer, REALLY SENT\n", "DHT");
+#endif
+ memcpy (buf, reply->msg, ntohs (reply->msg->size));
+
+ ret = ntohs (reply->msg->size);
}
else
- return 0;
+ ret = 0;
+
+ client->pending_head = reply->next;
+ GNUNET_free (reply->msg);
+ GNUNET_free (reply);
+
+ GNUNET_SCHEDULER_add_now (sched, &process_pending_messages, client);
+ return ret;
}
+/**
+ * Add a PendingMessage to the clients list of messages to be sent
+ *
+ * @param client the active client to send the message to
+ * @param pending_message the actual message to send
+ */
+static void
+add_pending_message (struct ClientList *client,
+ struct PendingMessage *pending_message)
+{
+ struct PendingMessage *pos;
+ struct PendingMessage *prev;
+ pos = client->pending_head;
+
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s': Adding pending message for client.\n", "DHT");
+#endif
+
+ if (pos == NULL)
+ {
+ client->pending_head = pending_message;
+ }
+ else /* This means another request is already
queued, rely on send_reply to process all pending messages */
+ {
+ while (pos != NULL) /* Find end of list */
+ {
+ prev = pos;
+ pos = pos->next;
+ }
+
+ GNUNET_assert (prev != NULL);
+ prev->next = pending_message;
+ }
+
+ GNUNET_SCHEDULER_add_now (sched, &process_pending_messages, client);
+
+}
+
+/**
+ * Called when a reply needs to be sent to a client, either as
+ * a result it found to a GET or FIND PEER request.
+ *
+ * @param client the client to send the reply to
+ * @param message the encapsulated message to send
+ * @param uid the unique identifier of this request
+ */
static void
-send_reply_to_client (struct GNUNET_SERVER_Client *client,
+send_reply_to_client (struct ClientList *client,
struct GNUNET_MessageHeader *message,
unsigned long long uid)
{
struct GNUNET_DHT_Message *reply;
+ struct PendingMessage *pending_message;
+
size_t msize;
size_t tsize;
#if DEBUG_DHT
@@ -214,18 +393,25 @@
reply->unique_id = GNUNET_htonll (uid);
memcpy (&reply[1], message, msize);
- GNUNET_SERVER_notify_transmit_ready (client,
- tsize,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 5),
- &send_reply, reply);
+ pending_message = GNUNET_malloc (sizeof (struct PendingMessage));
+ pending_message->msg = &reply->header;
+ pending_message->next = NULL; /* We insert at the end of the list */
+ add_pending_message (client, pending_message);
}
/**
- * Iterator for local get request results, return
- * GNUNET_OK to continue iteration, anything else
+ * Iterator for local get request results,
+ *
+ * @param cls closure for iterator, a DatacacheGetContext
+ * @param exp when does this value expire?
+ * @param key the key this data is stored under
+ * @param size the size of the data identified by key
+ * @param data the actual data
+ * @param type the type of the data
+ *
+ * @return GNUNET_OK to continue iteration, anything else
* to stop iteration.
*/
static int
@@ -236,7 +422,10 @@
{
struct DatacacheGetContext *datacache_get_ctx = cls;
struct GNUNET_DHT_GetResultMessage *get_result;
-
+#if DEBUG_DHT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s': Received `%s' response from datacache\n", "DHT", "GET");
+#endif
get_result =
GNUNET_malloc (sizeof (struct GNUNET_DHT_GetResultMessage) + size);
get_result->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET_RESULT);
@@ -257,6 +446,11 @@
/**
* Server handler for initiating local dht get requests
+ *
+ * @param cls closure for service
+ * @param get_msg the actual get message
+ * @param message_context struct containing pertinent information about the
get request
+ *
*/
static void
handle_dht_get (void *cls, struct GNUNET_DHT_GetMessage *get_msg,
@@ -288,7 +482,7 @@
if (datacache != NULL)
results =
GNUNET_DATACACHE_get (datacache, message_context->key, get_type,
- datacache_get_iterator, datacache_get_context);
+ &datacache_get_iterator, datacache_get_context);
#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -302,6 +496,11 @@
/**
* Server handler for initiating local dht find peer requests
+ *
+ * @param cls closure for service
+ * @param find_msg the actual find peer message
+ * @param message_context struct containing pertinent information about the
request
+ *
*/
static void
handle_dht_find_peer (void *cls, struct GNUNET_DHT_FindPeerMessage *find_msg,
@@ -324,6 +523,10 @@
/**
* Server handler for initiating local dht put requests
+ *
+ * @param cls closure for service
+ * @param put_msg the actual put message
+ * @param message_context struct containing pertinent information about the
request
*/
static void
handle_dht_put (void *cls, struct GNUNET_DHT_PutMessage *put_msg,
@@ -365,49 +568,51 @@
}
+
/**
- * Context for sending receipt confirmations. Not used yet.
+ * Find a client if it exists, add it otherwise.
+ *
+ * @param client the server handle to the client
+ *
+ * @return the client if found, a new client otherwise
*/
-struct SendConfirmationContext
+static struct ClientList *
+find_active_client (struct GNUNET_SERVER_Client *client)
{
- /**
- * The message to send.
- */
- struct GNUNET_DHT_StopMessage *message;
+ struct ClientList *pos = client_list;
+ struct ClientList *ret;
- /**
- * Transmit handle.
- */
- struct GNUNET_CONNECTION_TransmitHandle *transmit_handle;
-};
-
-static size_t
-send_confirmation (void *cls, size_t size, void *buf)
-{
- struct GNUNET_DHT_StopMessage *confirmation_message = cls;
-
- if (buf == NULL) /* Message timed out, that's crappy... */
+ while (pos != NULL)
{
- GNUNET_free (confirmation_message);
- return 0;
+ if (pos->client_handle == client)
+ return pos;
+ pos = pos->next;
}
- if (size >= ntohs (confirmation_message->header.size))
- {
- memcpy (buf, confirmation_message,
- ntohs (confirmation_message->header.size));
- return ntohs (confirmation_message->header.size);
- }
- else
- return 0;
+ ret = GNUNET_malloc (sizeof (struct ClientList));
+ ret->client_handle = client;
+ ret->next = client_list;
+ client_list = ret;
+ ret->pending_head = NULL;
+
+ return ret;
}
-
+/**
+ * Construct a message receipt confirmation for a particular uid.
+ * Receipt confirmations are used for any requests that don't expect
+ * a reply otherwise (i.e. put requests, stop requests).
+ *
+ * @param client the handle for the client
+ * @param uid the unique identifier of this message
+ */
static void
send_client_receipt_confirmation (struct GNUNET_SERVER_Client *client,
uint64_t uid)
{
struct GNUNET_DHT_StopMessage *confirm_message;
+ struct ClientList *active_client;
+ struct PendingMessage *pending_message;
#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -420,14 +625,23 @@
htons (sizeof (struct GNUNET_DHT_StopMessage));
confirm_message->unique_id = GNUNET_htonll (uid);
- GNUNET_SERVER_notify_transmit_ready (client,
- sizeof (struct GNUNET_DHT_StopMessage),
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 5),
- &send_confirmation, confirm_message);
+ active_client = find_active_client (client);
+ pending_message = GNUNET_malloc (sizeof (struct PendingMessage));
+ pending_message->msg = &confirm_message->header;
+ add_pending_message (active_client, pending_message);
+
}
+/**
+ * Handler for any generic DHT messages, calls the appropriate handler
+ * depending on message type, sends confirmation if responses aren't otherwise
+ * expected.
+ *
+ * @param cls closure for the service
+ * @param client the client we received this message from
+ * @param message the actual message received
+ */
static void
handle_dht_start_message (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
@@ -435,6 +649,7 @@
struct GNUNET_DHT_Message *dht_msg = (struct GNUNET_DHT_Message *) message;
struct GNUNET_MessageHeader *enc_msg;
struct DHT_MessageContext *message_context;
+
size_t enc_type;
enc_msg = (struct GNUNET_MessageHeader *) &dht_msg[1];
@@ -449,7 +664,7 @@
#endif
message_context = GNUNET_malloc (sizeof (struct DHT_MessageContext));
- message_context->client = client;
+ message_context->client = find_active_client (client);
message_context->key = &dht_msg->key;
message_context->unique_id = GNUNET_ntohll (dht_msg->unique_id);
message_context->replication = ntohs (dht_msg->desired_replication_level);
@@ -482,7 +697,17 @@
}
-
+/**
+ * Handler for any generic DHT stop messages, calls the appropriate handler
+ * depending on message type, sends confirmation by default (stop messages
+ * do not otherwise expect replies)
+ *
+ * @param cls closure for the service
+ * @param client the client we received this message from
+ * @param message the actual message received
+ *
+ * TODO: add demultiplexing for stop message types.
+ */
static void
handle_dht_stop_message (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
@@ -573,6 +798,11 @@
/**
* To be called on core init/fail.
+ *
+ * @param cls service closure
+ * @param server handle to the server for this service
+ * @param identity the public identity of this peer
+ * @param publicKey the public key of this peer
*/
void
core_init (void *cls,
@@ -592,7 +822,9 @@
"%s: Core connection initialized, I am peer: %s\n", "dht",
GNUNET_i2s (identity));
#endif
+ /* Copy our identity so we can use it */
memcpy (&my_identity, identity, sizeof (struct GNUNET_PeerIdentity));
+ /* Set the server to local variable */
coreAPI = server;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10798 - gnunet/src/dht,
gnunet <=