From 69c3a52cfa679175da8f06bdcb8e2e4195465e44 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 2 Feb 2015 22:25:48 +0000 Subject: avoid passing both PeerIdentity and Address (which contains PeerIdentity) if address is always present as then this is redundant --- src/transport/test_transport_api_monitor_peers.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/transport/test_transport_api_monitor_peers.c') diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c index 81d2f0478..536507c47 100644 --- a/src/transport/test_transport_api_monitor_peers.c +++ b/src/transport/test_transport_api_monitor_peers.c @@ -386,20 +386,19 @@ start_cb (struct PeerContext *p, void *cls) static void monitor1_cb (void *cls, - const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Address *address, enum GNUNET_TRANSPORT_PeerState state, struct GNUNET_TIME_Absolute state_timeout) { - if ((NULL == peer) || (NULL == p1)) + if ((NULL == address) || (NULL == p1)) return; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Monitor 1: %s %s %s\n", - GNUNET_i2s (peer), + GNUNET_i2s (&address->peer), GNUNET_TRANSPORT_ps2s (state), GNUNET_STRINGS_absolute_time_to_string(state_timeout)); - if ((0 == memcmp (peer, &p2->id, sizeof (p2->id)) && + if ((0 == memcmp (&address->peer, &p2->id, sizeof (p2->id)) && (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) && GNUNET_NO == p1_c) ) { @@ -412,20 +411,19 @@ monitor1_cb (void *cls, static void monitor2_cb (void *cls, - const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Address *address, enum GNUNET_TRANSPORT_PeerState state, struct GNUNET_TIME_Absolute state_timeout) { - if ((NULL == peer) || (NULL == p2)) + if ((NULL == address) || (NULL == p2)) return; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Monitor 2: %s %s %s\n", - GNUNET_i2s (peer), + GNUNET_i2s (&address->peer), GNUNET_TRANSPORT_ps2s (state), GNUNET_STRINGS_absolute_time_to_string(state_timeout)); - if ((0 == memcmp (peer, &p1->id, sizeof (p1->id)) && + if ((0 == memcmp (&address->peer, &p1->id, sizeof (p1->id)) && (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) && GNUNET_NO == p2_c) ) { -- cgit v1.2.3