-cleaning up message format and code related to recent transport address stringification code

1 files changed, 16 insertions, 12 deletions

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 9097311a6..66f02b104 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -444,7 +444,7 @@ void process_string (void *cls,
 
   if ((address != NULL))
   {
-    fprintf (stdout, _("Peer `%s' : %s\n"), GNUNET_i2s(peer), address);
+    fprintf (stdout, _("Peer `%s': %s\n"), GNUNET_i2s(peer), address);
   }
   else
   {
@@ -463,26 +463,29 @@ void process_string (void *cls,
  * @param addrlen number of bytes in addr
  */
 static void
-process_address (void *cls, const struct GNUNET_HELLO_Address *address)
+process_address (void *cls, 
+                 const struct GNUNET_PeerIdentity *peer,
+                 const struct GNUNET_HELLO_Address *address)
 {
   const struct GNUNET_CONFIGURATION_Handle * cfg = cls;
+  struct GNUNET_PeerIdentity *peercp;
 
-  if (address == NULL)
+  if ( (address == NULL) || (peer == NULL) )
   {
     /* done */
     return;
   }
 
-  struct GNUNET_PeerIdentity * peer = GNUNET_malloc(sizeof (struct GNUNET_PeerIdentity));
-  *peer = address->peer;
+  peercp = GNUNET_malloc(sizeof (struct GNUNET_PeerIdentity));
+  *peercp = *peer;
 
   /* Resolve address to string */
   GNUNET_TRANSPORT_address_to_string (cfg,
-    address,
-    numeric,
-    GNUNET_TIME_UNIT_MINUTES,
-    &process_string,
-    peer);
+                                      address,
+                                      numeric,
+                                      GNUNET_TIME_UNIT_MINUTES,
+                                      &process_string,
+                                      peercp);
 }
 
 
@@ -538,8 +541,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   if (iterate_connections)
   {
-    GNUNET_TRANSPORT_address_iterate (cfg, GNUNET_TIME_UNIT_MINUTES,
-                                      &process_address, (void *)cfg);
+    GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
+                                                GNUNET_TIME_UNIT_MINUTES,
+                                                &process_address, (void *)cfg);
   }
 }