diff options
Diffstat (limited to 'src/dht/gnunet-dht-monitor.c')
| -rw-r--r-- | src/dht/gnunet-dht-monitor.c | 126 |
1 files changed, 49 insertions, 77 deletions
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index 8ca3beb..b03c7c7 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -39,7 +39,7 @@ static char *query_key; /** * User supplied timeout value (in seconds) */ -static unsigned long long timeout_request = 5; +static struct GNUNET_TIME_Relative timeout_request = { 60000 }; /** * Be verbose @@ -73,25 +73,6 @@ static int ret; /** - * Function called on shutdown, disconnects from DHT if necessary. - * - * @param cls closure (unused) - * @param tc Task Context - */ -static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - if (verbose) - FPRINTF (stderr, "%s", "Shutting down!\n"); - if (dht_handle != NULL) - { - GNUNET_DHT_disconnect (dht_handle); - dht_handle = NULL; - } -} - - -/** * Stop monitoring request and start shutdown * * @param cls closure (unused) @@ -102,12 +83,16 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (verbose) FPRINTF (stderr, "%s", "Cleaning up!\n"); - if (monitor_handle != NULL) + if (NULL != monitor_handle) { GNUNET_DHT_monitor_stop (monitor_handle); monitor_handle = NULL; } - GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + if (NULL != dht_handle) + { + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + } } @@ -131,16 +116,16 @@ get_callback (void *cls, uint32_t desired_replication_level, unsigned int path_length, const struct GNUNET_PeerIdentity *path, - const GNUNET_HashCode * key) + const struct GNUNET_HashCode * key) { - FPRINTF (stdout, "Result %d, operation: %s, type %d\n Key: %s", + 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. * @@ -163,20 +148,21 @@ get_resp_callback (void *cls, const struct GNUNET_PeerIdentity *put_path, unsigned int put_path_length, struct GNUNET_TIME_Absolute exp, - const GNUNET_HashCode * key, + const struct GNUNET_HashCode * key, 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. * @@ -201,20 +187,21 @@ put_callback (void *cls, unsigned int path_length, const struct GNUNET_PeerIdentity *path, struct GNUNET_TIME_Absolute exp, - const GNUNET_HashCode * key, + const struct GNUNET_HashCode * key, 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. * @@ -227,50 +214,36 @@ static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { - struct GNUNET_TIME_Relative timeout; - GNUNET_HashCode *key; + 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(GNUNET_HashCode)); - GNUNET_CRYPTO_hash (query_key, strlen (query_key), key); - } - else - key = NULL; - - if (0 != timeout_request) - { - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, - timeout_request); - if (verbose) - FPRINTF (stderr, "Monitoring for %llus\n", timeout_request); - } + 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 - { - timeout = GNUNET_TIME_UNIT_FOREVER_REL; - if (verbose) - FPRINTF (stderr, "%s", "Monitoring indefinitely (close with Ctrl+C)\n"); - } - - GNUNET_SCHEDULER_add_delayed (timeout, &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)); + GNUNET_SCHEDULER_add_delayed (timeout_request, &cleanup_task, NULL); monitor_handle = GNUNET_DHT_monitor_start (dht_handle, block_type, key, @@ -278,15 +251,11 @@ run (void *cls, char *const *args, const char *cfgfile, &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 + * gnunet-dht-monitor command line options */ static struct GNUNET_GETOPT_CommandLineOption options[] = { {'k', "key", "KEY", @@ -296,8 +265,8 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { 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? 0 = forever"), - 1, &GNUNET_GETOPT_set_ulong, &timeout_request}, + gettext_noop ("how long should the monitor command run"), + 1, &GNUNET_GETOPT_set_relative_time, &timeout_request}, {'V', "verbose", NULL, gettext_noop ("be verbose (print progress information)"), 0, &GNUNET_GETOPT_set_one, &verbose}, @@ -315,8 +284,11 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { int main (int argc, char *const *argv) { + 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; |