[GNUnet-SVN] r33035 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2014-04-11 14:27:42 +0200 (Fri, 11 Apr 2014)
New Revision: 33035

Modified:
   gnunet/src/core/core_api_iterate_peers.c
   gnunet/src/core/gnunet-core.c
Log:
-fix crash on shutdown

Modified: gnunet/src/core/core_api_iterate_peers.c
===================================================================
--- gnunet/src/core/core_api_iterate_peers.c    2014-04-11 12:17:29 UTC (rev 
33034)
+++ gnunet/src/core/core_api_iterate_peers.c    2014-04-11 12:27:42 UTC (rev 
33035)
@@ -168,6 +168,7 @@
   struct GNUNET_MessageHeader *msg;
   int msize;
 
+  mh->th = NULL;
   msize = sizeof (struct GNUNET_MessageHeader);
   if ((size < msize) || (NULL == buf))
   {

Modified: gnunet/src/core/gnunet-core.c
===================================================================
--- gnunet/src/core/gnunet-core.c       2014-04-11 12:17:29 UTC (rev 33034)
+++ gnunet/src/core/gnunet-core.c       2014-04-11 12:27:42 UTC (rev 33035)
@@ -119,10 +119,12 @@
   }
   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));
 }