-fix

[oweals/gnunet.git] / src / dht / gnunet-dht-monitor.c

diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index 6f2faa99e245a63acac552f3c0ee4afb571e429f..b16e91108334d42aef1ae31492bd97f947347e0c 100644 (file)
--- 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
@@ -131,12 +131,13 @@ 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",
+  FPRINTF (stdout, "Result %d, operation: %s, type %d\n Key: %s\n ",
            result_count,
            "GET",
-           type);
+           type,
+           GNUNET_h2s_full(key));
   result_count++;
 }
 
@@ -162,14 +163,15 @@ 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%.*s\n",
+  FPRINTF (stdout, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
            result_count,
            "GET_RESP",
            type,
+           GNUNET_h2s_full(key),
            (unsigned int) size,
            (char *) data);
   result_count++;
@@ -199,14 +201,15 @@ 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%.*s\n",
+  FPRINTF (stdout, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
            result_count,
            "PUT",
            type,
+           GNUNET_h2s_full(key),
            (unsigned int) size,
            (char *) data);
   result_count++;
@@ -224,8 +227,7 @@ 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;
 
   cfg = c;
 
@@ -245,27 +247,22 @@ run (void *cls, char *const *args, const char *cfgfile,
     block_type = GNUNET_BLOCK_TYPE_TEST;
 
   if (query_key != NULL) {
-    key = GNUNET_malloc (sizeof(GNUNET_HashCode));
+    key = GNUNET_malloc (sizeof(struct 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);
-  }
-  else
+  if (verbose)
   {
-    timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-    if (verbose)
-      FPRINTF (stderr, "%s", "Monitoring indefinitely (close with Ctrl+C)\n");
+      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != timeout_request.rel_value)
+        FPRINTF (stderr, "Monitoring for %s\n",
+                GNUNET_TIME_relative_to_string (timeout_request));
+      else
+        FPRINTF (stderr, "%s", "Monitoring indefinitely (close with Ctrl+C)\n");
   }
 
-  GNUNET_SCHEDULER_add_delayed (timeout, &cleanup_task, NULL);
+  GNUNET_SCHEDULER_add_delayed (timeout_request, &cleanup_task, NULL);
   if (verbose)
     FPRINTF (stderr, "Issuing MONITOR request for %s!\n", query_key);
   monitor_handle = GNUNET_DHT_monitor_start (dht_handle,
@@ -293,8 +290,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 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},
@@ -312,6 +309,9 @@ 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",
                               gettext_noop