-consistently use struct GNUNET_HashCode

[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..d8f25e58b8d25534b92b1de2072922ff6029d8ce 100644 (file)
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -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",
            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++;
@@ -225,7 +228,7 @@ 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,7 +248,7 @@ 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
@@ -312,6 +315,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