/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file dht/gnunet-dht-monitor.c
*/
static int ret;
+/**
+ * Task scheduled to handle timeout.
+ */
+static struct GNUNET_SCHEDULER_Task *tt;
+
/**
- * Function called on shutdown, disconnects from DHT if necessary.
+ * Stop monitoring request and start shutdown
*
* @param cls closure (unused)
- * @param tc Task Context
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls)
{
if (verbose)
- FPRINTF (stderr, "%s", "Shutting down!\n");
- if (dht_handle != NULL)
+ FPRINTF (stderr, "%s", "Cleaning up!\n");
+ if (NULL != monitor_handle)
+ {
+ GNUNET_DHT_monitor_stop (monitor_handle);
+ monitor_handle = NULL;
+ }
+ if (NULL != dht_handle)
{
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
}
+ if (NULL != tt)
+ {
+ GNUNET_SCHEDULER_cancel (tt);
+ tt = NULL;
+ }
}
/**
- * Stop monitoring request and start shutdown
+ * We hit a timeout. Stop monitoring request and start shutdown
*
* @param cls closure (unused)
- * @param tc Task Context
*/
static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_task (void *cls)
{
- if (verbose)
- FPRINTF (stderr, "%s", "Cleaning up!\n");
- if (monitor_handle != NULL)
- {
- GNUNET_DHT_monitor_stop (monitor_handle);
- monitor_handle = NULL;
- }
- GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ tt = NULL;
+ GNUNET_SCHEDULER_shutdown ();
}
+
/**
* Callback called on each GET request going through the DHT.
*
* @param desired_replication_level Desired replication level.
* @param key Key of the requested data.
*/
-void
+static void
get_callback (void *cls,
enum GNUNET_DHT_RouteOption options,
enum GNUNET_BLOCK_Type type,
const struct GNUNET_PeerIdentity *path,
const struct GNUNET_HashCode * key)
{
- FPRINTF (stdout, "Result %d, operation: %s, type %d\n Key: %s\n ",
+ FPRINTF (stdout, "GET #%u: type %d, key `%s'\n",
result_count,
- "GET",
- type,
+ (int) type,
GNUNET_h2s_full(key));
result_count++;
}
+
/**
* Callback called on each GET reply going through the DHT.
*
* @param data Pointer to the result data.
* @param size Number of bytes in data.
*/
-void
+static void
get_resp_callback (void *cls,
enum GNUNET_BLOCK_Type type,
const struct GNUNET_PeerIdentity *get_path,
const void *data,
size_t size)
{
- FPRINTF (stdout, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
+ FPRINTF (stdout,
+ "RESPONSE #%u: type %d, key `%s', data `%.*s'\n",
result_count,
- "GET_RESP",
- type,
- GNUNET_h2s_full(key),
+ (int) type,
+ GNUNET_h2s_full (key),
(unsigned int) size,
(char *) data);
result_count++;
}
+
/**
* Callback called on each PUT request going through the DHT.
*
* @param data Pointer to the data carried.
* @param size Number of bytes in data.
*/
-void
+static void
put_callback (void *cls,
enum GNUNET_DHT_RouteOption options,
enum GNUNET_BLOCK_Type type,
const void *data,
size_t size)
{
- FPRINTF (stdout, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
+ FPRINTF (stdout,
+ "PUT %u: type %d, key `%s', data `%.*s'\n",
result_count,
- "PUT",
- type,
+ (int) type,
GNUNET_h2s_full(key),
(unsigned int) size,
(char *) data);
result_count++;
}
+
/**
* Main function that will be run by the scheduler.
*
const struct GNUNET_CONFIGURATION_Handle *c)
{
struct GNUNET_HashCode *key;
+ struct GNUNET_HashCode hc;
cfg = c;
- dht_handle = GNUNET_DHT_connect (cfg, 1);
-
- if (dht_handle == NULL)
+ if (NULL == (dht_handle = GNUNET_DHT_connect (cfg, 1)))
{
- if (verbose)
- FPRINTF (stderr, "%s", "Couldn't connect to DHT service!\n");
+ FPRINTF (stderr, "%s",
+ _("Failed to connect to DHT service!\n"));
ret = 1;
return;
}
- else if (verbose)
- FPRINTF (stderr, "%s", "Connected to DHT service!\n");
-
- if (block_type == GNUNET_BLOCK_TYPE_ANY) /* Type of data not set */
+ if (GNUNET_BLOCK_TYPE_ANY == block_type) /* Type of data not set */
block_type = GNUNET_BLOCK_TYPE_TEST;
-
- if (query_key != NULL) {
- key = GNUNET_malloc (sizeof(struct GNUNET_HashCode));
- GNUNET_CRYPTO_hash (query_key, strlen (query_key), key);
- }
+ if (NULL != query_key)
+ {
+ key = &hc;
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_hash_from_string (query_key, key))
+ GNUNET_CRYPTO_hash (query_key, strlen (query_key), key);
+ }
else
- key = NULL;
-
- if (verbose)
- {
- if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != timeout_request.rel_value)
- FPRINTF (stderr, "Monitoring for %lus\n", timeout_request.rel_value / 1000);
- else
- FPRINTF (stderr, "%s", "Monitoring indefinitely (close with Ctrl+C)\n");
- }
-
- GNUNET_SCHEDULER_add_delayed (timeout_request, &cleanup_task, NULL);
+ {
+ key = NULL;
+ }
if (verbose)
- FPRINTF (stderr, "Issuing MONITOR request for %s!\n", query_key);
+ FPRINTF (stderr,
+ "Monitoring for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (timeout_request, GNUNET_NO));
+ tt = GNUNET_SCHEDULER_add_delayed (timeout_request,
+ &timeout_task,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+ NULL);
monitor_handle = GNUNET_DHT_monitor_start (dht_handle,
block_type,
key,
&get_resp_callback,
&put_callback,
NULL);
- if (verbose)
- FPRINTF (stderr, "%s", "MONITOR started!\n");
- GNUNET_free_non_null (key);
-
}
-
-/**
- * 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"),
- 1, &GNUNET_GETOPT_set_uint, &block_type},
- {'T', "timeout", "TIMEOUT",
- gettext_noop ("how long to execute? default 60s, use \"forever\" to monitor forever"),
- 1, &GNUNET_GETOPT_set_relative_time, &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-monitor
*
int
main (int argc, char *const *argv)
{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+
+ GNUNET_GETOPT_option_string ('k',
+ "key",
+ "KEY",
+ gettext_noop ("the query key"),
+ &query_key),
+
+ GNUNET_GETOPT_option_uint ('t',
+ "type",
+ "TYPE",
+ gettext_noop ("the type of data to look for"),
+ &block_type),
+
+ GNUNET_GETOPT_option_relative_time ('T',
+ "timeout",
+ "TIMEOUT",
+ gettext_noop ("how long should the monitor command run"),
+ &timeout_request),
+
+ GNUNET_GETOPT_option_flag ('V',
+ "verbose",
+ gettext_noop ("be verbose (print progress information)"),
+ &verbose),
+
+ GNUNET_GETOPT_OPTION_END
+ };
+
+
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-dht-get",
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-dht-monitor",
gettext_noop
("Prints all packets that go through the DHT."),
options, &run, NULL)) ? ret : 1;
projects / oweals / gnunet.git / blobdiff