add changelog
[oweals/gnunet.git] / src / transport / gnunet-service-transport_validation.c
index abf15debf85e7a33f77554439604e5814d5d5018..631b0a8f891b1f55c84ae397b68e39b246d9e078 100644 (file)
@@ -1,22 +1,22 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010-2015 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
 
 /**
  * @file transport/gnunet-service-transport_validation.c
@@ -25,8 +25,6 @@
  */
 #include "platform.h"
 #include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_blacklist.h"
-#include "gnunet-service-transport_clients.h"
 #include "gnunet-service-transport_hello.h"
 #include "gnunet-service-transport_neighbours.h"
 #include "gnunet-service-transport_plugins.h"
 #include "gnunet_peerinfo_service.h"
 #include "gnunet_signatures.h"
 
+/**
+ * Current state of a validation process.
+ *
+ * FIXME: what state is used to indicate that a validation
+ * was successful? If that is clarified/determined, "UGH" in
+ * ~gnunetpeerinfogtk.c:1103 should be resolved.
+ */
+enum GNUNET_TRANSPORT_ValidationState
+{
+  /**
+   * Undefined state
+   *
+   * Used for final callback indicating operation done
+   */
+  GNUNET_TRANSPORT_VS_NONE,
+
+  /**
+   * Fresh validation entry
+   *
+   * Entry was just created, no validation process was executed
+   */
+  GNUNET_TRANSPORT_VS_NEW,
+
+  /**
+   * Updated validation entry
+   *
+   * This is an update for an existing validation entry
+   */
+  GNUNET_TRANSPORT_VS_UPDATE,
+
+  /**
+   * Timeout for validation entry
+   *
+   * A timeout occured during the validation process
+   */
+  GNUNET_TRANSPORT_VS_TIMEOUT,
+
+  /**
+   * Validation entry is removed
+   *
+   * The validation entry is getting removed due to a failed validation
+   */
+  GNUNET_TRANSPORT_VS_REMOVE
+};
+
 
 /**
  * How long is a PONG signature valid?  We'll recycle a signature until
  * OTOH, we don't want to spend too much time generating PONG signatures,
  * so they must have some lifetime to reduce our CPU usage.
  */
-#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
+#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_HOURS, 1)
 
 /**
  * After how long do we expire an address in a HELLO that we just
  * validated?  This value is also used for our own addresses when we
  * create a HELLO.
  */
-#define HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
+#define HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_HOURS, 12)
 
 /**
  * How often do we allow PINGing an address that we have not yet
  * we cannot validate (because after this time we can destroy the
  * validation record).
  */
-#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MINUTES, 5)
 
 /**
  * How often do we PING an address that we have successfully validated
  * in the past but are not actively using?  Should be (significantly)
  * smaller than HELLO_ADDRESS_EXPIRATION.
  */
-#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MINUTES, 15)
 
 /**
  * How often do we PING an address that we are currently using?
  */
-#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MINUTES, 2)
 
 /**
  * How much delay is acceptable for sending the PING or PONG?
  */
-#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_SECONDS, 1)
 
 /**
  * Size of the validation map hashmap.
@@ -105,7 +154,6 @@ GNUNET_NETWORK_STRUCT_BEGIN
  */
 struct TransportPingMessage
 {
-
   /**
    * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_PING
    */
@@ -120,7 +168,6 @@ struct TransportPingMessage
    * Who is the intended recipient?
    */
   struct GNUNET_PeerIdentity target;
-
 };
 
 
@@ -136,7 +183,6 @@ struct TransportPingMessage
  */
 struct TransportPongMessage
 {
-
   /**
    * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_PONG
    */
@@ -169,7 +215,6 @@ struct TransportPongMessage
    * being signed, hence not redundant).
    */
   uint32_t addrlen GNUNET_PACKED;
-
 };
 GNUNET_NETWORK_STRUCT_END
 
@@ -178,7 +223,6 @@ GNUNET_NETWORK_STRUCT_END
  */
 struct ValidationEntry
 {
-
   /**
    * The address.
    */
@@ -274,7 +318,7 @@ struct ValidationEntry
   /**
    * Which network type does our address belong to?
    */
-  enum GNUNET_ATS_Network_Type network;
+  enum GNUNET_NetworkType network;
 };
 
 
@@ -327,7 +371,6 @@ struct ValidationEntryMatchContext
    * Address we're interested in.
    */
   const struct GNUNET_HELLO_Address *address;
-
 };
 
 
@@ -340,9 +383,9 @@ static void
 publish_ve_stat_update ()
 {
   GNUNET_STATISTICS_set (GST_stats,
-                        gettext_noop ("# Addresses in validation map"),
-                        GNUNET_CONTAINER_multipeermap_size (validation_map),
-                        GNUNET_NO);
+                         gettext_noop ("# Addresses in validation map"),
+                         GNUNET_CONTAINER_multipeermap_size (validation_map),
+                         GNUNET_NO);
 }
 
 
@@ -364,7 +407,7 @@ validation_entry_match (void *cls,
   struct ValidationEntry *ve = value;
 
   if (0 == GNUNET_HELLO_address_cmp (ve->address,
-                                    vemc->address))
+                                     vemc->address))
   {
     vemc->ve = ve;
     return GNUNET_NO;
@@ -385,12 +428,6 @@ validation_entry_changed (struct ValidationEntry *ve,
                           enum GNUNET_TRANSPORT_ValidationState state)
 {
   ve->state = state;
-  GST_clients_broadcast_validation_notification (&ve->address->peer,
-                                                 ve->address,
-                                                 ve->send_time,
-                                                 ve->valid_until,
-                                                 ve->next_validation,
-                                                 state);
 }
 
 
@@ -413,7 +450,8 @@ cleanup_validation_entry (void *cls,
   ve->valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
 
   /* Notify about deleted entry */
-  validation_entry_changed (ve, GNUNET_TRANSPORT_VS_REMOVE);
+  validation_entry_changed (ve,
+                            GNUNET_TRANSPORT_VS_REMOVE);
 
   if (NULL != ve->bc)
   {
@@ -423,11 +461,13 @@ cleanup_validation_entry (void *cls,
   GNUNET_break (GNUNET_OK ==
                 GNUNET_CONTAINER_multipeermap_remove (validation_map,
                                                       &ve->address->peer,
-                                                     ve));
+                                                      ve));
   publish_ve_stat_update ();
   if (GNUNET_YES == ve->known_to_ats)
   {
     GST_ats_expire_address (ve->address);
+    GNUNET_assert (GNUNET_NO ==
+                   GST_ats_is_known_no_session (ve->address));
     ve->known_to_ats = GNUNET_NO;
   }
   GNUNET_HELLO_address_free (ve->address);
@@ -441,17 +481,14 @@ cleanup_validation_entry (void *cls,
     GNUNET_SCHEDULER_cancel (ve->revalidation_task);
     ve->revalidation_task = NULL;
   }
-  if ( (GNUNET_YES == ve->expecting_pong) &&
-       (validations_running > 0) )
+  if ((GNUNET_YES == ve->expecting_pong) &&
+      (validations_running > 0))
   {
     validations_running--;
     GNUNET_STATISTICS_set (GST_stats,
                            gettext_noop ("# validations running"),
                            validations_running,
                            GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation aborted, %u validation processes running\n",
-                validations_running);
   }
   GNUNET_free (ve);
   return GNUNET_OK;
@@ -463,31 +500,40 @@ cleanup_validation_entry (void *cls,
  * longer valid and then possibly triggers its removal.
  *
  * @param cls the `struct ValidationEntry`
- * @param tc scheduler context (unused)
  */
 static void
-timeout_hello_validation (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_hello_validation (void *cls)
 {
   struct ValidationEntry *ve = cls;
   struct GNUNET_TIME_Absolute max;
   struct GNUNET_TIME_Relative left;
 
   ve->timeout_task = NULL;
+  /* For valid addresses, we want to wait until the expire;
+     for addresses under PING validation, we want to wait
+     until we give up on the PING */
   max = GNUNET_TIME_absolute_max (ve->valid_until,
                                   ve->revalidation_block);
   left = GNUNET_TIME_absolute_get_remaining (max);
   if (left.rel_value_us > 0)
   {
-    /* should wait a bit longer */
+    /* We should wait a bit longer. This happens when
+       address lifetimes are extended due to successful
+       validations. */
     ve->timeout_task =
-        GNUNET_SCHEDULER_add_delayed (left, &timeout_hello_validation, ve);
+      GNUNET_SCHEDULER_add_delayed (left,
+                                    &timeout_hello_validation,
+                                    ve);
     return;
   }
   GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# address records discarded"), 1,
+                            gettext_noop (
+                              "# address records discarded (timeout)"),
+                            1,
                             GNUNET_NO);
-  cleanup_validation_entry (NULL, &ve->address->peer, ve);
+  cleanup_validation_entry (NULL,
+                            &ve->address->peer,
+                            ve);
 }
 
 
@@ -497,11 +543,17 @@ timeout_hello_validation (void *cls,
  *
  * @param cls our `struct ValidationEntry`
  * @param pid identity of the other peer
- * @param result #GNUNET_OK if the connection is allowed, #GNUNET_NO if not
+ * @param address_null address associated with the request, always NULL
+ * @param session_null session associated with the request, always NULL
+ * @param result #GNUNET_OK if the connection is allowed,
+ *               #GNUNET_NO if not,
+ *               #GNUNET_SYSERR if operation was aborted
  */
 static void
 transmit_ping_if_allowed (void *cls,
                           const struct GNUNET_PeerIdentity *pid,
+                          const struct GNUNET_HELLO_Address *address_null,
+                          struct GNUNET_ATS_Session *session_null,
                           int result)
 {
   struct ValidationEntry *ve = cls;
@@ -509,112 +561,115 @@ transmit_ping_if_allowed (void *cls,
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
   struct GNUNET_TIME_Absolute next;
   const struct GNUNET_MessageHeader *hello;
-  enum GNUNET_ATS_Network_Type network;
   ssize_t ret;
   size_t tsize;
   size_t slen;
   uint16_t hsize;
+  struct GNUNET_ATS_Session *session;
 
   ve->bc = NULL;
-  if (GNUNET_NO == result)
+  if (GNUNET_OK != result)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Blacklist denies to send PING to `%s' `%s' `%s'\n",
+                "Blacklist denies sending PING to `%s' `%s' `%s'\n",
                 GNUNET_i2s (pid),
                 GST_plugins_a2s (ve->address),
                 ve->address->transport_name);
-    cleanup_validation_entry (NULL, pid, ve);
+    GNUNET_STATISTICS_update (GST_stats,
+                              gettext_noop (
+                                "# address records discarded (blacklist)"),
+                              1,
+                              GNUNET_NO);
+    cleanup_validation_entry (NULL,
+                              pid,
+                              ve);
     return;
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting plain PING to `%s' `%s' `%s'\n",
-              GNUNET_i2s (pid),
-              GST_plugins_a2s (ve->address),
-              ve->address->transport_name);
-
-  slen = strlen (ve->address->transport_name) + 1;
   hello = GST_hello_get ();
+  GNUNET_assert (NULL != hello);
+  slen = strlen (ve->address->transport_name) + 1;
   hsize = ntohs (hello->size);
-  tsize =
-      sizeof (struct TransportPingMessage) + ve->address->address_length +
-      slen + hsize;
+  tsize = sizeof(struct TransportPingMessage)
+          + ve->address->address_length + slen + hsize;
 
   ping.header.size =
-      htons (sizeof (struct TransportPingMessage) +
-             ve->address->address_length + slen);
+    htons (sizeof(struct TransportPingMessage)
+           + ve->address->address_length + slen);
   ping.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PING);
   ping.challenge = htonl (ve->challenge);
   ping.target = *pid;
 
-  if (tsize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  if (tsize >= GNUNET_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
     hsize = 0;
     tsize =
-        sizeof (struct TransportPingMessage) + ve->address->address_length +
-        slen + hsize;
+      sizeof(struct TransportPingMessage) + ve->address->address_length
+      + slen + hsize;
   }
   {
-    char message_buf[tsize];
-
-    /* build message with structure:
-     *  [HELLO][TransportPingMessage][Transport name][Address] */
-    memcpy (message_buf, hello, hsize);
-    memcpy (&message_buf[hsize],
-           &ping,
-           sizeof (struct TransportPingMessage));
-    memcpy (&message_buf[sizeof (struct TransportPingMessage) + hsize],
-            ve->address->transport_name,
-           slen);
-    memcpy (&message_buf[sizeof (struct TransportPingMessage) + slen + hsize],
-            ve->address->address,
-           ve->address->address_length);
+    char message_buf[tsize] GNUNET_ALIGN;
+
+    GNUNET_memcpy (message_buf,
+                   hello,
+                   hsize);
+    GNUNET_memcpy (&message_buf[hsize],
+                   &ping,
+                   sizeof(struct TransportPingMessage));
+    GNUNET_memcpy (&message_buf[sizeof(struct TransportPingMessage) + hsize],
+                   ve->address->transport_name,
+                   slen);
+    GNUNET_memcpy (&message_buf[sizeof(struct TransportPingMessage) + slen
+                                + hsize],
+                   ve->address->address,
+                   ve->address->address_length);
     papi = GST_plugins_find (ve->address->transport_name);
     GNUNET_assert (NULL != papi);
-    GNUNET_assert (NULL != papi->send);
-    struct Session *session = papi->get_session (papi->cls,
-                                                 ve->address);
-
-    if (NULL != session)
-    {
-      ret = papi->send (papi->cls, session,
-                        message_buf, tsize,
-                        PING_PRIORITY,
-                        ACCEPTABLE_PING_DELAY,
-                        NULL, NULL);
-      network = papi->get_network (papi->cls, session);
-      if (GNUNET_ATS_NET_UNSPECIFIED == network)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Could not obtain a valid network for `%s' `%s'\n",
-                    GNUNET_i2s (pid),
-                    GST_plugins_a2s (ve->address));
-        GNUNET_break(0);
-      }
-      GST_neighbours_notify_data_sent (ve->address, session, tsize);
-    }
-    else
+    session = papi->get_session (papi->cls,
+                                 ve->address);
+    if (NULL == session)
     {
       /* Could not get a valid session */
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Could not get a valid session for `%s' `%s'\n",
+                  "Failed to get session to send PING to `%s' at `%s'\n",
                   GNUNET_i2s (pid),
                   GST_plugins_a2s (ve->address));
-      ret = -1;
+      return;
     }
-  }
-  if (-1 != ret)
-  {
+
+    ret = papi->send (papi->cls, session,
+                      message_buf, tsize,
+                      PING_PRIORITY,
+                      ACCEPTABLE_PING_DELAY,
+                      NULL, NULL);
+    if (-1 == ret)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Failed to send PING to `%s' at `%s'\n",
+                  GNUNET_i2s (pid),
+                  GST_plugins_a2s (ve->address));
+      return;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Transmitted plain PING to `%s' `%s' `%s'\n",
+                GNUNET_i2s (pid),
+                GST_plugins_a2s (ve->address),
+                ve->address->transport_name);
+    ve->network = papi->get_network (papi->cls,
+                                     session);
+    GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
+    GST_neighbours_notify_data_sent (ve->address,
+                                     session,
+                                     tsize);
     next = GNUNET_TIME_relative_to_absolute (validation_delay);
     validation_next = GNUNET_TIME_absolute_max (next,
                                                 validation_next);
     ve->send_time = GNUNET_TIME_absolute_get ();
     GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# PINGs for address validation sent"),
+                              gettext_noop (
+                                "# PINGs for address validation sent"),
                               1,
                               GNUNET_NO);
-    ve->network = network;
     ve->expecting_pong = GNUNET_YES;
     validations_running++;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -625,7 +680,8 @@ transmit_ping_if_allowed (void *cls,
                            validations_running,
                            GNUNET_NO);
     /*  Notify about PING sent */
-    validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
+    validation_entry_changed (ve,
+                              GNUNET_TRANSPORT_VS_UPDATE);
   }
 }
 
@@ -634,11 +690,9 @@ transmit_ping_if_allowed (void *cls,
  * Do address validation again to keep address valid.
  *
  * @param cls the `struct ValidationEntry`
- * @param tc scheduler context (unused)
  */
 static void
-revalidate_address (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext *tc)
+revalidate_address (void *cls)
 {
   struct ValidationEntry *ve = cls;
   struct GNUNET_TIME_Relative canonical_delay;
@@ -653,7 +707,8 @@ revalidate_address (void *cls,
      block period permitted? */
   if (GNUNET_YES == ve->in_use)
     canonical_delay = CONNECTED_PING_FREQUENCY;
-  else if (GNUNET_TIME_absolute_get_remaining (ve->valid_until).rel_value_us > 0)
+  else if (GNUNET_TIME_absolute_get_remaining (ve->valid_until).rel_value_us >
+           0)
     canonical_delay = VALIDATED_PING_FREQUENCY;
   else
     canonical_delay = UNVALIDATED_PING_KEEPALIVE;
@@ -662,28 +717,29 @@ revalidate_address (void *cls,
      is originally randomized between "canonical_delay" and "2 * canonical_delay",
      so continue to permit that window for the operation. */
   delay = GNUNET_TIME_relative_min (delay,
-                                    GNUNET_TIME_relative_multiply (canonical_delay,
-                                                                   2));
+                                    GNUNET_TIME_relative_multiply (
+                                      canonical_delay,
+                                      2));
   ve->revalidation_block = GNUNET_TIME_relative_to_absolute (delay);
   if (delay.rel_value_us > 0)
   {
     /* should wait a bit longer */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Waiting for %s longer before validating address `%s'\n",
+                "Waiting for %s longer before (re)validating address `%s'\n",
                 GNUNET_STRINGS_relative_time_to_string (delay,
                                                         GNUNET_YES),
                 GST_plugins_a2s (ve->address));
     ve->revalidation_task =
-        GNUNET_SCHEDULER_add_delayed (delay,
-                                      &revalidate_address, ve);
+      GNUNET_SCHEDULER_add_delayed (delay,
+                                    &revalidate_address, ve);
     ve->next_validation = GNUNET_TIME_relative_to_absolute (delay);
     return;
   }
   /* check if globally we have too many active validations at a
      too high rate, if so, delay ours */
   blocked_for = GNUNET_TIME_absolute_get_remaining (validation_next);
-  if ( (validations_running > validations_fast_start_threshold) &&
-       (blocked_for.rel_value_us > 0) )
+  if ((validations_running > validations_fast_start_threshold) &&
+      (blocked_for.rel_value_us > 0))
   {
     /* Validations are blocked, have to wait for blocked_for time */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -692,11 +748,14 @@ revalidate_address (void *cls,
                                                         GNUNET_YES),
                 GST_plugins_a2s (ve->address));
     GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# validations delayed by global throttle"),
+                              gettext_noop (
+                                "# validations delayed by global throttle"),
                               1,
                               GNUNET_NO);
     ve->revalidation_task =
-      GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve);
+      GNUNET_SCHEDULER_add_delayed (blocked_for,
+                                    &revalidate_address,
+                                    ve);
     ve->next_validation = GNUNET_TIME_relative_to_absolute (blocked_for);
     return;
   }
@@ -706,12 +765,13 @@ revalidate_address (void *cls,
   ve->revalidation_block = GNUNET_TIME_relative_to_absolute (canonical_delay);
   /* schedule next PINGing with some extra random delay to avoid synchronous re-validations */
   rdelay =
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                canonical_delay.rel_value_us);
+    GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                              canonical_delay.rel_value_us);
 
   delay = GNUNET_TIME_relative_add (canonical_delay,
                                     GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_MICROSECONDS, rdelay));
+                                      (GNUNET_TIME_UNIT_MICROSECONDS,
+                                      rdelay));
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Validating now, next scheduled for %s, now validating address `%s'\n",
@@ -719,19 +779,33 @@ revalidate_address (void *cls,
                                                       GNUNET_YES),
               GST_plugins_a2s (ve->address));
   ve->revalidation_task =
-      GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve);
+    GNUNET_SCHEDULER_add_delayed (delay,
+                                  &revalidate_address,
+                                  ve);
   ve->next_validation = GNUNET_TIME_relative_to_absolute (delay);
 
   /* start PINGing by checking blacklist */
   GNUNET_STATISTICS_update (GST_stats,
                             gettext_noop ("# address revalidations started"), 1,
                             GNUNET_NO);
+  if (NULL != ve->bc)
+  {
+    GST_blacklist_test_cancel (ve->bc);
+    ve->bc = NULL;
+  }
   bc = GST_blacklist_test_allowed (&ve->address->peer,
-                                  ve->address->transport_name,
-                                   &transmit_ping_if_allowed, ve);
+                                   ve->address->transport_name,
+                                   &transmit_ping_if_allowed,
+                                   ve,
+                                   NULL,
+                                   NULL);
   if (NULL != bc)
-    ve->bc = bc;                /* only set 'bc' if 'transmit_ping_if_allowed' was not already
-                                 * called... */
+  {
+    /* If transmit_ping_if_allowed was already called it may have freed ve,
+     * so only set ve->bc if it has not been called.
+     */
+    ve->bc = bc;
+  }
 }
 
 
@@ -757,22 +831,29 @@ find_validation_entry (const struct GNUNET_HELLO_Address *address)
                                               &validation_entry_match, &vemc);
   if (NULL != (ve = vemc.ve))
     return ve;
+  GNUNET_assert (GNUNET_NO ==
+                 GST_ats_is_known_no_session (address));
   ve = GNUNET_new (struct ValidationEntry);
   ve->in_use = GNUNET_SYSERR; /* not defined */
   ve->address = GNUNET_HELLO_address_copy (address);
   ve->pong_sig_valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
-  memset (&ve->pong_sig_cache, '\0', sizeof (struct GNUNET_CRYPTO_EddsaSignature));
+  memset (&ve->pong_sig_cache,
+          '\0',
+          sizeof(struct GNUNET_CRYPTO_EddsaSignature));
   ve->latency = GNUNET_TIME_UNIT_FOREVER_REL;
   ve->challenge =
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
+    GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
   ve->timeout_task =
-      GNUNET_SCHEDULER_add_delayed (UNVALIDATED_PING_KEEPALIVE,
-                                    &timeout_hello_validation, ve);
-  GNUNET_CONTAINER_multipeermap_put (validation_map, &address->peer,
+    GNUNET_SCHEDULER_add_delayed (UNVALIDATED_PING_KEEPALIVE,
+                                  &timeout_hello_validation,
+                                  ve);
+  GNUNET_CONTAINER_multipeermap_put (validation_map,
+                                     &address->peer,
                                      ve,
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   publish_ve_stat_update ();
-  validation_entry_changed (ve, GNUNET_TRANSPORT_VS_NEW);
+  validation_entry_changed (ve,
+                            GNUNET_TRANSPORT_VS_NEW);
   return ve;
 }
 
@@ -796,7 +877,8 @@ add_valid_address (void *cls,
   const struct GNUNET_HELLO_Message *hello = cls;
   struct ValidationEntry *ve;
   struct GNUNET_PeerIdentity pid;
-  struct GNUNET_ATS_Information ats;
+  struct GNUNET_ATS_Properties prop;
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
 
   if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
     return GNUNET_OK;           /* expired */
@@ -805,14 +887,31 @@ add_valid_address (void *cls,
     GNUNET_break (0);
     return GNUNET_OK;           /* invalid HELLO !? */
   }
-  if (NULL == GST_plugins_find (address->transport_name))
+  if (NULL == (papi = GST_plugins_find (address->transport_name)))
   {
     /* might have been valid in the past, but we don't have that
        plugin loaded right now */
     return GNUNET_OK;
   }
+  if (NULL ==
+      papi->address_to_string (papi->cls,
+                               address->address,
+                               address->address_length))
+  {
+    /* Why do we try to add an ill-formed address? */
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Address with %u bytes for plugin %s and peer %s is malformed\n",
+                (unsigned int) address->address_length,
+                address->transport_name,
+                GNUNET_i2s (&pid));
+    return GNUNET_OK;
+  }
 
   ve = find_validation_entry (address);
+  ve->network = papi->get_network_for_address (papi->cls,
+                                               address);
+  GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
   ve->valid_until = GNUNET_TIME_absolute_max (ve->valid_until,
                                               expiration);
   if (NULL == ve->revalidation_task)
@@ -820,17 +919,20 @@ add_valid_address (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Starting revalidations for valid address `%s'\n",
                 GST_plugins_a2s (ve->address));
-    ve->next_validation = GNUNET_TIME_absolute_get();
+    ve->next_validation = GNUNET_TIME_absolute_get ();
     ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
   }
-  validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
-
-  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats.value = htonl (ve->network);
+  validation_entry_changed (ve,
+                            GNUNET_TRANSPORT_VS_UPDATE);
+  memset (&prop, 0, sizeof(prop));
+  prop.scope = ve->network;
+  prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
   if (GNUNET_YES != ve->known_to_ats)
   {
     ve->known_to_ats = GNUNET_YES;
-    GST_ats_add_address (address, &ats, 1);
+    GST_ats_add_address (address, &prop);
+    GNUNET_assert (GNUNET_YES ==
+                   GST_ats_is_known_no_session (ve->address));
   }
   return GNUNET_OK;
 }
@@ -856,7 +958,7 @@ process_peerinfo_hello (void *cls,
     return;
   if (0 == memcmp (&GST_my_identity,
                    peer,
-                   sizeof (struct GNUNET_PeerIdentity)))
+                   sizeof(struct GNUNET_PeerIdentity)))
   {
     /* Peerinfo returned own identity, skip validation */
     return;
@@ -889,10 +991,9 @@ GST_validation_start (unsigned int max_fds)
    * - "fast start": run validation immediately
    * - have delay of (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2)
    *   (300 sec / ~150 == ~2 sec.) between two validations
-   */
-
-  validation_next = GNUNET_TIME_absolute_get();
-  validation_delay.rel_value_us = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2);
+   */validation_next = GNUNET_TIME_absolute_get ();
+  validation_delay.rel_value_us =
+    (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2);
   validations_fast_start_threshold = (max_fds / 2);
   validations_running = 0;
   GNUNET_STATISTICS_set (GST_stats,
@@ -900,12 +1001,12 @@ GST_validation_start (unsigned int max_fds)
                          validations_running,
                          GNUNET_NO);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Validation uses a fast start threshold of %u connections and a delay between of %s\n ",
+              "Validation uses a fast start threshold of %u connections and a delay of %s\n",
               validations_fast_start_threshold,
               GNUNET_STRINGS_relative_time_to_string (validation_delay,
                                                       GNUNET_YES));
   validation_map = GNUNET_CONTAINER_multipeermap_create (VALIDATION_MAP_SIZE,
-                                                        GNUNET_NO);
+                                                         GNUNET_NO);
   pnc = GNUNET_PEERINFO_notify (GST_cfg, GNUNET_YES,
                                 &process_peerinfo_hello, NULL);
 }
@@ -939,13 +1040,13 @@ GST_validation_stop ()
  */
 static void
 multicast_pong (void *cls,
-               struct GNUNET_TIME_Absolute valid_until,
+                struct GNUNET_TIME_Absolute valid_until,
                 struct GNUNET_TIME_Absolute validation_block,
                 const struct GNUNET_HELLO_Address *address)
 {
   struct TransportPongMessage *pong = cls;
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct Session *session;
+  struct GNUNET_ATS_Session *session;
 
   papi = GST_plugins_find (address->transport_name);
   if (NULL == papi)
@@ -957,11 +1058,11 @@ multicast_pong (void *cls,
   }
   GNUNET_assert (NULL != papi->send);
   GNUNET_assert (NULL != papi->get_session);
-  session = papi->get_session(papi->cls, address);
+  session = papi->get_session (papi->cls, address);
   if (NULL == session)
   {
-     GNUNET_break (0);
-     return;
+    GNUNET_break (0);
+    return;
   }
   GST_ats_new_session (address, session);
   papi->send (papi->cls, session,
@@ -989,7 +1090,7 @@ int
 GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
                             const struct GNUNET_MessageHeader *hdr,
                             const struct GNUNET_HELLO_Address *sender_address,
-                            struct Session *session)
+                            struct GNUNET_ATS_Session *session)
 {
   const struct TransportPingMessage *ping;
   struct TransportPongMessage *pong;
@@ -1005,19 +1106,26 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   ssize_t ret;
   struct GNUNET_HELLO_Address address;
 
-  if (ntohs (hdr->size) < sizeof (struct TransportPingMessage))
+  if (0 ==
+      memcmp (&GST_my_identity,
+              sender,
+              sizeof(struct GNUNET_PeerIdentity)))
+    return GNUNET_OK; /* our own, ignore! */
+  if (ntohs (hdr->size) < sizeof(struct TransportPingMessage))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
   ping = (const struct TransportPingMessage *) hdr;
   if (0 !=
-      memcmp (&ping->target, &GST_my_identity,
-              sizeof (struct GNUNET_PeerIdentity)))
+      memcmp (&ping->target,
+              &GST_my_identity,
+              sizeof(struct GNUNET_PeerIdentity)))
   {
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
-                              ("# PING message for different peer received"), 1,
+                                ("# PING message for different peer received"),
+                              1,
                               GNUNET_NO);
     return GNUNET_SYSERR;
   }
@@ -1025,7 +1133,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
                             gettext_noop ("# PING messages received"), 1,
                             GNUNET_NO);
   addr = (const char *) &ping[1];
-  len_address = ntohs (hdr->size) - sizeof (struct TransportPingMessage);
+  len_address = ntohs (hdr->size) - sizeof(struct TransportPingMessage);
   /* peer wants to confirm that this is one of our addresses, this is what is
    * used for address validation */
 
@@ -1068,7 +1176,8 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     {
       /* we don't have the plugin for this address */
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Plugin `%s' not available, cannot confirm having this address\n"),
+                  _ (
+                    "Plugin `%s' not available, cannot confirm having this address\n"),
                   plugin_name);
       GNUNET_free (plugin_name);
       return GNUNET_SYSERR;
@@ -1081,10 +1190,12 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     {
       GNUNET_STATISTICS_update (GST_stats,
                                 gettext_noop
-                                ("# failed address checks during validation"), 1,
+                                  ("# failed address checks during validation"),
+                                1,
                                 GNUNET_NO);
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Address `%s' is not one of my addresses, not confirming PING\n"),
+                  _ (
+                    "Address `%s' is not one of my addresses, not confirming PING\n"),
                   GST_plugins_a2s (&address));
       return GNUNET_SYSERR;
     }
@@ -1092,7 +1203,9 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     {
       GNUNET_STATISTICS_update (GST_stats,
                                 gettext_noop
-                                ("# successful address checks during validation"), 1,
+                                (
+                                  "# successful address checks during validation"),
+                                1,
                                 GNUNET_NO);
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Address `%s' is one of my addresses, confirming PING\n",
@@ -1105,7 +1218,8 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
                                 &sig_cache_exp))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n"),
+                  _ (
+                    "Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n"),
                   GNUNET_i2s (sender),
                   GST_plugins_a2s (&address));
       return GNUNET_SYSERR;
@@ -1124,43 +1238,45 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "I am `%s', sending PONG to peer `%s'\n",
-             GNUNET_i2s_full (&GST_my_identity),
+              GNUNET_i2s_full (&GST_my_identity),
               GNUNET_i2s (sender));
 
   /* message with structure:
    * [TransportPongMessage][Transport name][Address] */
 
-  pong = GNUNET_malloc (sizeof (struct TransportPongMessage) + len_address + len_plugin);
+  pong = GNUNET_malloc (sizeof(struct TransportPongMessage) + len_address
+                        + len_plugin);
   pong->header.size =
-      htons (sizeof (struct TransportPongMessage) + len_address + len_plugin);
+    htons (sizeof(struct TransportPongMessage) + len_address + len_plugin);
   pong->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PONG);
   pong->purpose.size =
-      htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-             sizeof (uint32_t) + sizeof (struct GNUNET_TIME_AbsoluteNBO) +
-             len_address + len_plugin);
+    htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
+           + sizeof(uint32_t) + sizeof(struct GNUNET_TIME_AbsoluteNBO)
+           + len_address + len_plugin);
   pong->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN);
-  memcpy (&pong->challenge, &ping->challenge, sizeof (ping->challenge));
+  GNUNET_memcpy (&pong->challenge, &ping->challenge, sizeof(ping->challenge));
   pong->addrlen = htonl (len_address + len_plugin);
-  memcpy (&pong[1], addr, len_plugin);   /* Copy transport plugin */
+  GNUNET_memcpy (&pong[1], addr, len_plugin);    /* Copy transport plugin */
   if (len_address > 0)
   {
     GNUNET_assert (NULL != addrend);
-    memcpy (&((char *) &pong[1])[len_plugin], addrend, len_address);
+    GNUNET_memcpy (&((char *) &pong[1])[len_plugin], addrend, len_address);
   }
   if (GNUNET_TIME_absolute_get_remaining (*sig_cache_exp).rel_value_us <
       PONG_SIGNATURE_LIFETIME.rel_value_us / 4)
   {
     /* create / update cached sig */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "Creating PONG signature to indicate ownership.\n");
+                "Creating PONG signature to indicate ownership.\n");
     *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME);
     pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
     if (GNUNET_OK !=
-                  GNUNET_CRYPTO_eddsa_sign (GST_my_private_key, &pong->purpose,
-                                          sig_cache))
+        GNUNET_CRYPTO_eddsa_sign (GST_my_private_key, &pong->purpose,
+                                  sig_cache))
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               _("Failed to create PONG signature for peer `%s'\n"), GNUNET_i2s (sender));
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _ ("Failed to create PONG signature for peer `%s'\n"),
+                  GNUNET_i2s (sender));
     }
   }
   else
@@ -1194,12 +1310,12 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     {
       ret = papi->send (papi->cls, session,
                         (const char *) pong,
-                       ntohs (pong->header.size),
+                        ntohs (pong->header.size),
                         PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
                         NULL, NULL);
       if (-1 != ret)
         GST_neighbours_notify_data_sent (sender_address,
-                                        session,
+                                         session,
                                          pong->header.size);
     }
   }
@@ -1211,7 +1327,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
     /* done! */
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
-                              ("# PONGs unicast via reliable transport"), 1,
+                                ("# PONGs unicast via reliable transport"), 1,
                               GNUNET_NO);
     GNUNET_free (pong);
     return GNUNET_OK;
@@ -1220,7 +1336,8 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   /* no reliable method found, try transmission via all known addresses */
   GNUNET_STATISTICS_update (GST_stats,
                             gettext_noop
-                            ("# PONGs multicast to all available addresses"), 1,
+                              ("# PONGs multicast to all available addresses"),
+                            1,
                             GNUNET_NO);
   GST_validation_get_addresses (sender,
                                 &multicast_pong, pong);
@@ -1244,6 +1361,9 @@ GST_validation_handle_address (const struct GNUNET_HELLO_Address *address)
   if (NULL == papi)
   {
     /* This plugin is currently unvailable ... ignore */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "No plugin available for %s\n",
+                address->transport_name);
     return;
   }
   ve = find_validation_entry (address);
@@ -1255,6 +1375,13 @@ GST_validation_handle_address (const struct GNUNET_HELLO_Address *address)
                 GNUNET_i2s (&ve->address->peer));
     ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Validation already running for address `%s' of %s\n",
+                GST_plugins_a2s (ve->address),
+                GNUNET_i2s (&ve->address->peer));
+  }
 }
 
 
@@ -1333,7 +1460,13 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   int sig_res;
   int do_verify;
 
-  if (ntohs (hdr->size) < sizeof (struct TransportPongMessage))
+  if (0 ==
+      memcmp (&GST_my_identity,
+              sender,
+              sizeof(struct GNUNET_PeerIdentity)))
+    return GNUNET_OK; /* our own, ignore! */
+
+  if (ntohs (hdr->size) < sizeof(struct TransportPongMessage))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -1347,7 +1480,7 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
 
   pong = (const struct TransportPongMessage *) hdr;
   tname = (const char *) &pong[1];
-  size = ntohs (hdr->size) - sizeof (struct TransportPongMessage);
+  size = ntohs (hdr->size) - sizeof(struct TransportPongMessage);
   addr = memchr (tname, '\0', size);
   if (NULL == addr)
   {
@@ -1377,36 +1510,40 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   {
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
-                              ("# PONGs dropped, no matching pending validation"),
+                              (
+                                "# PONGs dropped, no matching pending validation"),
                               1, GNUNET_NO);
     return GNUNET_OK;
   }
   /* now check that PONG is well-formed */
   if (0 != memcmp (&ve->address->peer,
-                  sender,
-                  sizeof (struct GNUNET_PeerIdentity)))
+                   sender,
+                   sizeof(struct GNUNET_PeerIdentity)))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
   if (0 ==
       GNUNET_TIME_absolute_get_remaining
-      (GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value_us)
+        (GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value_us)
   {
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
-                              ("# PONGs dropped, signature expired"), 1,
+                                ("# PONGs dropped, signature expired"), 1,
                               GNUNET_NO);
     return GNUNET_SYSERR;
   }
 
   sig_res = GNUNET_SYSERR;
   do_verify = GNUNET_YES;
-  if (0 != GNUNET_TIME_absolute_get_remaining (ve->pong_sig_valid_until).rel_value_us)
+  if (0 != GNUNET_TIME_absolute_get_remaining (
+        ve->pong_sig_valid_until).rel_value_us)
   {
     /* We have a cached and valid signature for this peer,
      * try to compare instead of verify */
-    if (0 == memcmp (&ve->pong_sig_cache, &pong->signature, sizeof (struct GNUNET_CRYPTO_EddsaSignature)))
+    if (0 == memcmp (&ve->pong_sig_cache,
+                     &pong->signature,
+                     sizeof(struct GNUNET_CRYPTO_EddsaSignature)))
     {
       /* signatures are identical, we can skip verification */
       sig_res = GNUNET_OK;
@@ -1422,9 +1559,11 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   if (GNUNET_YES == do_verify)
   {
     /* Do expensive verification */
-    sig_res = GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
-                                          &pong->purpose, &pong->signature,
-                                          &ve->address->peer.public_key);
+    sig_res = GNUNET_CRYPTO_eddsa_verify (
+      GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
+      &pong->purpose,
+      &pong->signature,
+      &ve->address->peer.public_key);
     if (sig_res == GNUNET_SYSERR)
     {
       GNUNET_break_op (0);
@@ -1454,23 +1593,30 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   ve->expecting_pong = GNUNET_NO;
   ve->valid_until = GNUNET_TIME_relative_to_absolute (HELLO_ADDRESS_EXPIRATION);
   ve->pong_sig_cache = pong->signature;
-       ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration);
+  ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration);
   ve->latency = GNUNET_TIME_absolute_get_duration (ve->send_time);
   {
-    struct GNUNET_ATS_Information ats[2];
-
-    ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
-    ats[0].value = htonl ((uint32_t) ve->latency.rel_value_us);
-    ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
-    ats[1].value = htonl ((uint32_t) ve->network);
     if (GNUNET_YES == ve->known_to_ats)
     {
-      GST_ats_update_metrics (ve->address, NULL, ats, 2);
+      GNUNET_assert (GNUNET_YES ==
+                     GST_ats_is_known_no_session (ve->address));
+      GST_ats_update_delay (ve->address,
+                            GNUNET_TIME_relative_divide (ve->latency, 2));
     }
     else
     {
+      struct GNUNET_ATS_Properties prop;
+
+      memset (&prop, 0, sizeof(prop));
+      GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
+      prop.scope = ve->network;
+      prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
+      GNUNET_assert (GNUNET_NO ==
+                     GST_ats_is_known_no_session (ve->address));
       ve->known_to_ats = GNUNET_YES;
-      GST_ats_add_address (ve->address, ats, 2);
+      GST_ats_add_address (ve->address, &prop);
+      GNUNET_assert (GNUNET_YES ==
+                     GST_ats_is_known_no_session (ve->address));
     }
   }
   if (validations_running > 0)
@@ -1490,14 +1636,24 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
   }
 
   /* Notify about new validity */
-  validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
+  validation_entry_changed (ve,
+                            GNUNET_TRANSPORT_VS_UPDATE);
 
   /* build HELLO to store in PEERINFO */
+  GNUNET_STATISTICS_update (GST_stats,
+                            gettext_noop ("# HELLOs given to peerinfo"),
+                            1,
+                            GNUNET_NO);
   ve->copied = GNUNET_NO;
   hello = GNUNET_HELLO_create (&ve->address->peer.public_key,
-                               &add_valid_peer_address, ve,
+                               &add_valid_peer_address,
+                               ve,
                                GNUNET_NO);
-  GNUNET_PEERINFO_add_peer (GST_peerinfo, hello, NULL, NULL);
+  GNUNET_break (NULL !=
+                GNUNET_PEERINFO_add_peer (GST_peerinfo,
+                                          hello,
+                                          NULL,
+                                          NULL));
   GNUNET_free (hello);
   return GNUNET_OK;
 }
@@ -1514,15 +1670,14 @@ int
 GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
 {
   const struct GNUNET_HELLO_Message *hm =
-      (const struct GNUNET_HELLO_Message *) hello;
+    (const struct GNUNET_HELLO_Message *) hello;
   struct GNUNET_PeerIdentity pid;
-  struct GNUNET_HELLO_Message *h;
   int friend;
 
   friend = GNUNET_HELLO_is_friend_only (hm);
-  if ( ( (GNUNET_YES != friend) &&
-         (GNUNET_NO != friend) ) ||
-       (GNUNET_OK != GNUNET_HELLO_get_id (hm, &pid)) )
+  if (((GNUNET_YES != friend) &&
+       (GNUNET_NO != friend)) ||
+      (GNUNET_OK != GNUNET_HELLO_get_id (hm, &pid)))
   {
     /* malformed HELLO */
     GNUNET_break_op (0);
@@ -1530,35 +1685,22 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
   }
   if (0 ==
       memcmp (&GST_my_identity,
-             &pid,
-             sizeof (struct GNUNET_PeerIdentity)))
+              &pid,
+              sizeof(struct GNUNET_PeerIdentity)))
   {
     /* got our own HELLO, how boring */
-    return GNUNET_OK;
-  }
-  if (GNUNET_NO ==
-      GNUNET_CONTAINER_multipeermap_contains (validation_map,
-                                              &pid))
-  {
-    /* Add peer identity without addresses to peerinfo service */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding HELLO without addresses for peer `%s'\n",
+                "Validation received our own HELLO (%s), ignoring\n",
                 GNUNET_i2s (&pid));
-    h = GNUNET_HELLO_create (&pid.public_key, NULL, NULL, friend);
-    GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL);
-
-    GNUNET_free (h);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation received HELLO message for peer `%s' with size %u, checking for new addresses\n",
-                GNUNET_i2s (&pid),
-                ntohs (hello->size));
+    return GNUNET_OK;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Validation received HELLO message for peer `%s' with size %u, checking for new addresses\n",
+              GNUNET_i2s (&pid),
+              ntohs (hello->size));
   GNUNET_assert (NULL ==
                  GNUNET_HELLO_iterate_addresses (hm,
-                                                GNUNET_NO,
+                                                 GNUNET_NO,
                                                  &validate_address_iterator,
                                                  NULL));
   return GNUNET_OK;
@@ -1579,7 +1721,6 @@ struct IteratorContext
    * Closure for @e cb.
    */
   void *cb_cls;
-
 };
 
 
@@ -1618,7 +1759,7 @@ iterate_addresses (void *cls,
 void
 GST_validation_get_addresses (const struct GNUNET_PeerIdentity *target,
                               GST_ValidationAddressCallback cb,
-                             void *cb_cls)
+                              void *cb_cls)
 {
   struct IteratorContext ic;
 
@@ -1660,104 +1801,18 @@ GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
     GNUNET_break (0);
     return;
   }
-  if (ve->in_use == in_use)
-  {
-    if (GNUNET_YES == in_use)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error setting address in use for peer `%s' `%s' to USED\n",
-                  GNUNET_i2s (&address->peer),
-                  GST_plugins_a2s (address));
-    }
-    if (GNUNET_NO == in_use)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error setting address in use for peer `%s' `%s' to NOT_USED\n",
-                  GNUNET_i2s (&address->peer),
-                  GST_plugins_a2s (address));
-    }
-  }
-
-  GNUNET_break (ve->in_use != in_use);  /* should be different... */
+  if (in_use == ve->in_use)
+    return;
   ve->in_use = in_use;
   if (GNUNET_YES == in_use)
   {
     /* from now on, higher frequeny, so reschedule now */
     if (NULL != ve->revalidation_task)
       GNUNET_SCHEDULER_cancel (ve->revalidation_task);
-    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
+    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address,
+                                                      ve);
   }
 }
 
 
-/**
- * Closure for the validation_entries_iterate function.
- */
-struct ValidationIteratorContext
-{
-  /**
-   * Function to call on each validation entry
-   */
-  GST_ValidationChangedCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Function called on each entry in the validation map.
- * Passes the information from the validation entry to
- * the callback given in the closure.
- *
- * @param cls the `struct ValidationIteratorContext`
- * @param key peer this is about
- * @param value the `struct ValidationEntry`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-validation_entries_iterate (void *cls,
-                           const struct GNUNET_PeerIdentity *key,
-                           void *value)
-{
-  struct ValidationIteratorContext *ic = cls;
-  struct ValidationEntry *ve = value;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Notifying about validation entry for peer `%s' address `%s' \n",
-             GNUNET_i2s (&ve->address->peer),
-             GST_plugins_a2s (ve->address));
-  ic->cb (ic->cb_cls,
-         ve->address,
-         ve->send_time,
-         ve->valid_until,
-         ve->next_validation,
-         ve->state);
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterate over all iteration entries
- *
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GST_validation_iterate (GST_ValidationChangedCallback cb,
-                        void *cb_cls)
-{
-  struct ValidationIteratorContext ic;
-
-  if (NULL == validation_map)
-    return; /* can happen during shutdown */
-  ic.cb = cb;
-  ic.cb_cls = cb_cls;
-  GNUNET_CONTAINER_multipeermap_iterate (validation_map,
-                                         &validation_entries_iterate,
-                                         &ic);
-}
-
 /* end of file gnunet-service-transport_validation.c */