-fix crash on shutdown

2 files changed, 5 insertions, 2 deletions

diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index 425d3579c..f5a3c0e98 100644
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -168,6 +168,7 @@ transmit_monitor_request (void *cls,
   struct GNUNET_MessageHeader *msg;
   int msize;
 
+  mh->th = NULL;
   msize = sizeof (struct GNUNET_MessageHeader);
   if ((size < msize) || (NULL == buf))
   {
diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c
index 25127da66..0f475d08b 100644
--- a/src/core/gnunet-core.c
+++ b/src/core/gnunet-core.c
@@ -119,10 +119,12 @@ monitor_cb (void *cls,
   }
   now_str = GNUNET_STRINGS_absolute_time_to_string (now);
   FPRINTF (stdout,
-           _("%24s: %-17s %4s\n"),
+           _("%24s: %-30s %4s (timeout in %6s)\n"),
            now_str,
            state_str,
-           GNUNET_i2s (peer));
+           GNUNET_i2s (peer),
+           GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (timeout),
+                                                   GNUNET_YES));
 }