[GNUnet-SVN] r32818 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2014-03-28 09:41:34 +0100 (Fri, 28 Mar 2014)
New Revision: 32818

Modified:
   gnunet/src/transport/gnunet-transport.c
Log:
improved printing


Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2014-03-28 08:30:30 UTC (rev 
32817)
+++ gnunet/src/transport/gnunet-transport.c     2014-03-28 08:41:34 UTC (rev 
32818)
@@ -950,7 +950,9 @@
     const char *addr, enum GNUNET_TRANSPORT_PeerState state,
     struct GNUNET_TIME_Absolute state_timeout)
 {
-  if ((GNUNET_YES == iterate_all) || (GNUNET_YES == monitor_connections) )
+
+  if ( ((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) ||
+       (GNUNET_YES == monitor_connections) )
   {
     FPRINTF (stdout, _("Peer `%s': %s %s in state `%s' until %s\n"),
         GNUNET_i2s (id),
@@ -959,12 +961,12 @@
         GNUNET_TRANSPORT_ps2s (state),
         GNUNET_STRINGS_absolute_time_to_string (state_timeout));
   }
-  else
+  else if ( (GNUNET_YES == iterate_connections) &&
+             (GNUNET_TRANSPORT_is_connected(state)) )
   {
     /* Only connected peers, skip state */
     FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (id), transport, 
addr);
   }
-
 }
 
 static void