From 2700c5079ab27189edb42bb195e9511efc5658d1 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Mon, 5 Apr 2010 20:06:26 +0000 Subject: [PATCH] dht find peer binary --- src/dht/Makefile.am | 9 ++ src/dht/gnunet-dht-get-peer.c | 234 ++++++++++++++++++++++++++++++++++ src/dht/gnunet-dht-get.c | 2 +- 3 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 src/dht/gnunet-dht-get-peer.c diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index f941b0dfb..1a50800b6 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -24,6 +24,7 @@ libgnunetdht_la_LDFLAGS = \ bin_PROGRAMS = \ gnunet-service-dht \ gnunet-dht-get \ + gnunet-dht-get-peer \ gnunet-dht-put gnunet_service_dht_SOURCES = \ @@ -42,6 +43,14 @@ gnunet_dht_get_LDADD = \ $(top_builddir)/src/dht/libgnunetdht.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la + +gnunet_dht_get_peer_SOURCES = \ + gnunet-dht-get-peer.c +gnunet_dht_get_peer_LDADD = \ + $(top_builddir)/src/dht/libgnunetdht.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/core/libgnunetcore.la \ + $(top_builddir)/src/util/libgnunetutil.la gnunet_dht_put_SOURCES = \ gnunet-dht-put.c diff --git a/src/dht/gnunet-dht-get-peer.c b/src/dht/gnunet-dht-get-peer.c new file mode 100644 index 000000000..7949ea899 --- /dev/null +++ b/src/dht/gnunet-dht-get-peer.c @@ -0,0 +1,234 @@ +/* + 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-peer.c + * @brief search for peers close to key using the DHT + * @author Christian Grothoff + * @author Nathan Evans + */ +#include "platform.h" +#include "gnunet_dht_service.h" +#include "gnunet_hello_lib.h" + +/** + * 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 request + */ +static struct GNUNET_DHT_FindPeerHandle *find_peer_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 (find_peer_handle != NULL) + GNUNET_DHT_find_peer_stop (find_peer_handle, &shutdown_task, NULL); + else + GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL); +} + +/** + * Iterator called on each result obtained from a find peer + * operation + * + * @param cls closure (NULL) + * @param peer the peer we learned about + * @param reply the response message, should be a HELLO + */ +void find_peer_processor (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_MessageHeader *reply) +{ + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "test_find_peer_processor called (peer `%s'), stopping find peer request!\n", GNUNET_i2s(peer)); + +} + + +/** + * 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 FIND PEER request to service, quitting.\n"); + ret = 1; + GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL); + } + else + { + if (verbose) + fprintf (stderr, "FIND PEER 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 FIND PEER request for %s!\n", query_key); + + find_peer_handle = GNUNET_DHT_find_peer_start (dht_handle, timeout, 0, NULL, &key, + &find_peer_processor, 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', "timeout", "TIMEOUT", + gettext_noop ("how long to execute this query before giving up?"), + 1, &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-peer + * + * @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; +} diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 684f7c308..1a84ab0c2 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -198,7 +198,7 @@ run (void *cls, if (verbose) fprintf (stderr, "Issuing GET request for %s!\n", query_key); - GNUNET_DHT_get_start (dht_handle, timeout, query_type, &key, + get_handle = GNUNET_DHT_get_start (dht_handle, timeout, query_type, &key, &get_result_iterator, NULL, &message_sent_cont, NULL); } -- 2.25.1