avoid passing both PeerIdentity and Address (which contains PeerIdentity) if address...

[oweals/gnunet.git] / src / transport / test_transport_api_monitor_validation.c

diff --git a/src/transport/test_transport_api_monitor_validation.c b/src/transport/test_transport_api_monitor_validation.c
index 261f1a7d07a5010c5850d9d567bbc82f4f945917..12be8584ea00e36cf0f6b0b4ea17792776e88ec3 100644 (file)
--- a/src/transport/test_transport_api_monitor_validation.c
+++ b/src/transport/test_transport_api_monitor_validation.c
@@ -392,43 +392,50 @@ start_cb (struct PeerContext *p, void *cls)
 
 static void
 monitor1_cb (void *cls,
-    const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_HELLO_Address *address,
-    struct GNUNET_TIME_Absolute last_validation,
-    struct GNUNET_TIME_Absolute valid_until,
-    struct GNUNET_TIME_Absolute next_validation,
-    enum GNUNET_TRANSPORT_ValidationState state)
+            const struct GNUNET_HELLO_Address *address,
+            struct GNUNET_TIME_Absolute last_validation,
+            struct GNUNET_TIME_Absolute valid_until,
+            struct GNUNET_TIME_Absolute next_validation,
+            enum GNUNET_TRANSPORT_ValidationState state)
 {
-  if ((NULL == peer) || (NULL == p1))
+  if ((NULL == address) || (NULL == p1))
     return;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Monitor 1: %s %s %s\n",
-      GNUNET_i2s (peer), GNUNET_TRANSPORT_vs2s(state), GNUNET_STRINGS_absolute_time_to_string(valid_until));
-  if (0 == memcmp (peer, &p2->id, sizeof (p2->id)))
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Monitor 1: %s %s %s\n",
+             GNUNET_i2s (&address->peer), 
+             GNUNET_TRANSPORT_vs2s (state),
+             GNUNET_STRINGS_absolute_time_to_string(valid_until));
+  if (0 == memcmp (&address->peer,
+                  &p2->id,
+                  sizeof (p2->id)))
     p1_c++;
 }
 
 
 static void
 monitor2_cb (void *cls,
-    const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_HELLO_Address *address,
-    struct GNUNET_TIME_Absolute last_validation,
-    struct GNUNET_TIME_Absolute valid_until,
-    struct GNUNET_TIME_Absolute next_validation,
-    enum GNUNET_TRANSPORT_ValidationState state)
+            const struct GNUNET_HELLO_Address *address,
+            struct GNUNET_TIME_Absolute last_validation,
+            struct GNUNET_TIME_Absolute valid_until,
+            struct GNUNET_TIME_Absolute next_validation,
+            enum GNUNET_TRANSPORT_ValidationState state)
 {
-  if ((NULL == peer) || (NULL == p2))
+  if ((NULL == address) || (NULL == p2))
     return;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Monitor 2: %s %s %s\n",
-      GNUNET_i2s (peer), GNUNET_TRANSPORT_vs2s(state), GNUNET_STRINGS_absolute_time_to_string(valid_until));
-  if (0 == memcmp (peer, &p1->id, sizeof (p1->id)))
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Monitor 2: %s %s %s\n",
+             GNUNET_i2s (&address->peer),
+             GNUNET_TRANSPORT_vs2s(state), 
+             GNUNET_STRINGS_absolute_time_to_string(valid_until));
+  if (0 == memcmp (&address->peer,
+                  &p1->id,
+                  sizeof (p1->id)))
     p2_c++;
 }
 
 
-
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)