[GNUnet-SVN] r16962 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2011-09-19 22:01:22 +0200 (Mon, 19 Sep 2011)
New Revision: 16962

Modified:
   gnunet/src/dht/test_dht_twopeer.c
Log:
print emsg

Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c   2011-09-19 19:37:00 UTC (rev 16961)
+++ gnunet/src/dht/test_dht_twopeer.c   2011-09-19 20:01:22 UTC (rev 16962)
@@ -129,9 +129,15 @@
     GNUNET_SCHEDULER_cancel (curr_get_ctx.retry_task);
 }
 
+
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  const char *emsg = cls;
+
+  fprintf (stderr,
+          "Error: %s\n",
+          emsg);
   if (curr_get_ctx.retry_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (curr_get_ctx.retry_task);
 
@@ -144,6 +150,7 @@
   ok = 1;
 }
 
+
 /* Forward declaration */
 static void
 do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -279,7 +286,7 @@
 }
 
 
-void
+static void
 topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
                    const struct GNUNET_PeerIdentity *second, uint32_t distance,
                    const struct GNUNET_CONFIGURATION_Handle *first_cfg,
@@ -316,7 +323,8 @@
 #endif
     GNUNET_SCHEDULER_cancel (die_task);
     die_task =
-        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, "from test gets");
+        GNUNET_SCHEDULER_add_delayed (TIMEOUT, 
+                                     &end_badly, "Timeout trying to GET");
 
     curr_get_ctx.dht_handle = peer1dht;
     curr_get_ctx.peer = &peer2id;
@@ -333,6 +341,7 @@
   }
 }
 
+
 static void
 connect_topology (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -354,6 +363,7 @@
                                       "from connect topology (timeout)");
 }
 
+
 static void
 peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
                         const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -361,8 +371,9 @@
 {
   if (emsg != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to start daemon with error: `%s'\n", emsg);
+    fprintf (stderr,
+            "Failed to start daemon: `%s'\n", 
+            emsg);
     return;
   }
   GNUNET_assert (id != NULL);
@@ -410,6 +421,7 @@
   }
 }
 
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)