From 93e31ff7e29d8a569b81e81133407c61ec1c839c Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 22 Dec 2011 14:15:31 +0000 Subject: [PATCH] include plugin in gnunet-transport output --- src/transport/gnunet-transport.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index c069bfb24..02a5ee492 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -440,16 +440,16 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, void process_string (void *cls, const char *address) { - struct GNUNET_PeerIdentity *peer = cls; + struct GNUNET_HELLO_Address *addrcp = cls; if ((address != NULL)) { - fprintf (stdout, _("Peer `%s': %s\n"), GNUNET_i2s (peer), address); + fprintf (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name, address); } else { /* done */ - GNUNET_free (peer); + GNUNET_free (addrcp); } } @@ -467,7 +467,6 @@ 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) || (peer == NULL)) { @@ -475,13 +474,10 @@ process_address (void *cls, const struct GNUNET_PeerIdentity *peer, return; } - 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, - peercp); + GNUNET_HELLO_address_copy(address)); } -- 2.25.1