Various changes:

- removed "in_use" from being passed to ATS, no
  longer needed as we tell ATS when we cannot
  follow a suggestion by removing the address;
  simplifies the code a lot
- better handling of state machine, fallback to
  primary session if address switch to new
  session timed out
- nicer logging
- more comments
- new testcase failures, because of
  #3652, #3651 and #3650 (or more that i missed).

25 files changed, 1023 insertions, 1333 deletions

diff --git a/src/ats/ats.h b/src/ats/ats.h
index 482b7b4b3..69788971e 100644
--- a/src/ats/ats.h
+++ b/src/ats/ats.h
@@ -105,29 +105,6 @@ struct RequestAddressMessage
 
 
 /**
- * Scheduling client to ATS service: reset backoff for
- * address suggestions to this peer.
- */
-struct ResetBackoffMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Peer to reset backoff for.
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
  * ATS client to ATS service: here is another address you can use.
  */
 struct AddressAddMessage
@@ -214,37 +191,6 @@ struct AddressUpdateMessage
 
 
 /**
- * Message sent from ATS client to ATS service to notify
- * it if we started (or stopped) using an address.
- */
-struct AddressUseMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Internal number this client uses to refer to this address.
-   */
-  uint32_t session_id GNUNET_PACKED;
-
-  /**
-   * Which peer is this about? (Technically redundant, as the
-   * @e session_id should be sufficient, but enables ATS service
-   * to find the session faster).
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * #GNUNET_YES or #GNUNET_NO.
-   */
-  uint32_t in_use GNUNET_PACKED;
-
-};
-
-
-/**
  * Message sent by ATS client to ATS service when an address
  * was destroyed and must thus henceforth no longer be considered
  * for scheduling.
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 9198118a4..0871544dc 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -303,6 +303,9 @@ GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
 {
   struct GNUNET_ATS_ConnectivitySuggestHandle *s;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting ATS to suggest address for `%s'\n",
+              GNUNET_i2s (peer));
   s = GNUNET_new (struct GNUNET_ATS_ConnectivitySuggestHandle);
   s->ch = ch;
   s->id = *peer;
@@ -336,6 +339,9 @@ GNUNET_ATS_connectivity_suggest_cancel (struct GNUNET_ATS_ConnectivitySuggestHan
   struct GNUNET_MQ_Envelope *ev;
   struct RequestAddressMessage *m;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Telling ATS we no longer care for an address for `%s'\n",
+              GNUNET_i2s (&sh->id));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests,
                                                        &sh->id,
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index f81dfe7eb..792215598 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -92,13 +92,6 @@ struct GNUNET_ATS_AddressRecord
   uint32_t slot;
 
   /**
-   * Is this address currently in use?  In use means
-   * that the transport service will use this address
-   * for sending.
-   */
-  int in_use;
-
-  /**
    * We're about to destroy this address record, just ATS does
    * not know this yet.  Once ATS confirms its destruction,
    * we can clean up.
@@ -418,6 +411,11 @@ process_ats_address_suggestion_message (void *cls,
     if ( (0 == ntohl (m->bandwidth_out.value__)) &&
          (0 == ntohl (m->bandwidth_in.value__)) )
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "ATS suggests disconnect from peer `%s' with BW %u/%u\n",
+                  GNUNET_i2s (&ar->address->peer),
+                  (unsigned int) ntohl (m->bandwidth_out.value__),
+                  (unsigned int) ntohl (m->bandwidth_in.value__));
       sh->suggest_cb (sh->suggest_cb_cls,
                       &m->peer,
                       NULL,
@@ -434,6 +432,11 @@ process_ats_address_suggestion_message (void *cls,
     GNUNET_break (0);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ATS suggests address slot %u for peer `%s' using plugin %s\n",
+              ar->slot,
+              GNUNET_i2s (&ar->address->peer),
+              ar->address->transport_name);
   sh->suggest_cb (sh->suggest_cb_cls,
                   &m->peer,
                   ar->address,
@@ -498,7 +501,7 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh,
   m->session_id = htonl (ar->slot);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding address for peer `%s', plugin `%s', session %p id %u\n",
+              "Adding address for peer `%s', plugin `%s', session %p slot %u\n",
               GNUNET_i2s (&ar->address->peer),
               ar->address->transport_name,
               ar->session,
@@ -520,29 +523,6 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh,
 
 
 /**
- * Generate and transmit the `struct AddressUseMessage` for the given
- * address record.
- *
- * @param ar the address to inform the ATS service about
- * @param in_use say if it is in use or not
- */
-static void
-send_in_use_message (struct GNUNET_ATS_AddressRecord *ar,
-                     int in_use)
-{
-  struct GNUNET_ATS_SchedulingHandle *sh = ar->sh;
-  struct GNUNET_MQ_Envelope *ev;
-  struct AddressUseMessage *m;
-
-  ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE);
-  m->peer = ar->address->peer;
-  m->in_use = htonl ((uint32_t) in_use);
-  m->session_id = htonl (ar->slot);
-  GNUNET_MQ_send (sh->mq, ev);
-}
-
-
-/**
  * Re-establish the connection to the ATS service.
  *
  * @param sh handle to use to re-connect.
@@ -586,8 +566,6 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
     if (NULL == ar)
       continue;
     send_add_address_message (sh, ar);
-    if (ar->in_use)
-      send_in_use_message (ar, GNUNET_YES);
     if (NULL == sh->mq)
       return;
   }
@@ -652,27 +630,6 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh)
 
 
 /**
- * We would like to reset the address suggestion block time for this
- * peer.
- *
- * @param sh handle
- * @param peer identity of the peer we want to reset
- */
-void
-GNUNET_ATS_reset_backoff (struct GNUNET_ATS_SchedulingHandle *sh,
-                          const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_MQ_Envelope *ev;
-  struct ResetBackoffMessage *m;
-
-  ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF);
-  m->reserved = htonl (0);
-  m->peer = *peer;
-  GNUNET_MQ_send (sh->mq, ev);
-}
-
-
-/**
  * Test if a address and a session is known to ATS
  *
  * @param sh the scheduling handle
@@ -799,7 +756,6 @@ GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
 {
   GNUNET_break (session == ar->session);
   ar->session = NULL;
-  GNUNET_break (GNUNET_NO == ar->in_use);
   if (GNUNET_HELLO_address_check_option (ar->address,
                                          GNUNET_HELLO_ADDRESS_INFO_INBOUND))
   {
@@ -834,7 +790,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar,
   size_t msize;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding address for peer `%s', plugin `%s', session %p id %u\n",
+              "Updating address for peer `%s', plugin `%s', session %p slot %u\n",
               GNUNET_i2s (&ar->address->peer),
               ar->address->transport_name,
               ar->session,
@@ -861,29 +817,6 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar,
 }
 
 
-/**
- * An address is now in use or not used any more.
- *
- * @param ar the address
- * @param in_use #GNUNET_YES if this address is now used, #GNUNET_NO
- * if address is not used any more
- */
-void
-GNUNET_ATS_address_set_in_use (struct GNUNET_ATS_AddressRecord *ar,
-                               int in_use)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Setting address used to %s for peer `%s', plugin `%s', session %p\n",
-              (GNUNET_YES == in_use) ? "YES" : "NO",
-              GNUNET_i2s (&ar->address->peer),
-              ar->address->transport_name,
-              ar->session);
-  ar->in_use = in_use;
-  if (NULL == ar->sh->mq)
-    return;
-  send_in_use_message (ar, in_use);
-}
-
 
 /**
  * An address got destroyed, stop using it as a valid address.
@@ -898,9 +831,10 @@ GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar)
   struct AddressDestroyedMessage *m;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Deleting address for peer `%s', plugin `%s', session %p\n",
+              "Deleting address for peer `%s', plugin `%s', slot %u session %p\n",
               GNUNET_i2s (&ar->address->peer),
               ar->address->transport_name,
+              ar->slot,
               ar->session);
   GNUNET_break (NULL == ar->session);
   ar->session = NULL;
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index 83fa42b35..944db77f6 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -165,9 +165,6 @@ run (void *cls,
      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_ADD, 0},
     {&GAS_handle_address_update, NULL,
      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE, 0},
-    {&GAS_handle_address_in_use, NULL,
-     GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE,
-     sizeof (struct AddressUseMessage) },
     {&GAS_handle_address_destroyed, NULL,
      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED,
      sizeof (struct AddressDestroyedMessage) },
@@ -178,9 +175,6 @@ run (void *cls,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE, 0},
     {&GAS_handle_preference_feedback, NULL,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_FEEDBACK, 0},
-    {&GAS_handle_reset_backoff, NULL,
-     GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF,
-     sizeof (struct ResetBackoffMessage)},
     {NULL, NULL, 0, 0}
   };
   GSA_server = server;
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 8b38120cc..1d2c9d3e5 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+ (C) 2011-2015 Christian Grothoff (and other contributing authors)
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -37,7 +37,7 @@
 
 /**
  * NOTE: Do not change this documentation. This documentation is based on
- * gnunet.org:/vcs/fsnsg/ats-paper.git/tech-doku/ats-tech-guide.tex
+ * gnunet.org:/vcs/fsnsg/2014-p2p-ats.git/tech-doku/ats-tech-guide.tex
  * use build_txt.sh to generate plaintext output
  *
  *   1 ATS addresses : ATS address management
@@ -192,22 +192,10 @@
  *    available it will not respond at all If the client is not interested
  *    anymore, it has to cancel the address suggestion request.
  *
- *       1.7.6 Suggestions blocks and reset
- *
- *    After suggesting an address it is blocked for ATS_BLOCKING_DELTA sec. to
- *    prevent the client from being thrashed. If the client requires immediately
- *    it can reset this block using GAS_addresses_handle_backoff_reset.
- *
- *       1.7.7 Marking address in use
- *
- *    The client can notify addresses that it successfully uses an address and
- *    wants this address to be kept by calling GSA_address_in_use. Adresses will
- *    mark the address as used an notify the solver about the use.
- *
- *       1.7.8 Address lifecycle
+ *       1.7.6 Address lifecycle
  *
  *      * (add address)
- *      * (updated address) || (address in use)
+ *      * (updated address)
  *      * (delete address)
  *
  *     1.8 Bandwidth assignment
@@ -302,7 +290,9 @@ static int ats_mode;
 static void *solver;
 
 /**
- * Address suggestion requests DLL head
+ * Address suggestion requests DLL head.
+ * FIXME: This must become a Multipeermap! O(n) operations
+ * galore instead of O(1)!!!
  */
 static struct GAS_Addresses_Suggestion_Requests *pending_requests_head;
 
@@ -1086,66 +1076,6 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
 
 
 /**
- * Notification about active use of an address.
- * in_use == #GNUNET_YES:
- *      This address is used to maintain an active connection with a peer.
- * in_use == #GNUNET_NO:
- *      This address is no longer used to maintain an active connection with a peer.
- *
- * Note: can only be called with in_use == #GNUNET_NO if called with #GNUNET_YES
- * before
- *
- * @param peer peer
- * @param session_id session id, can be 0
- * @param in_use #GNUNET_YES if #GNUNET_NO FIXME
- * @return #GNUNET_SYSERR on failure (address unknown ...)
- */
-int
-GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
-                      uint32_t session_id,
-                      int in_use)
-{
-  struct ATS_Address *ea;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received `%s' for peer `%s'\n",
-             "ADDRESS IN USE",
-             GNUNET_i2s (peer));
-  if (GNUNET_NO == running)
-    return GNUNET_SYSERR;
-  ea = find_exact_address (peer,
-                           session_id);
-  if (NULL == ea)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Trying to set unknown address `%s' `%u' to %s \n",
-                GNUNET_i2s (peer),
-                session_id,
-                (GNUNET_NO == in_use) ? "NO" : "YES");
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (ea->used == in_use)
-  {
-    GNUNET_break (0);
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
-               "Address in use called multiple times for peer `%s': %s -> %s \n",
-               GNUNET_i2s (peer),
-               (GNUNET_NO == ea->used) ? "NO" : "YES",
-               (GNUNET_NO == in_use) ? "NO" : "YES");
-    return GNUNET_SYSERR;
-  }
-  /* Tell solver about update */
-  ea->used = in_use;
-  ea->t_last_activity = GNUNET_TIME_absolute_get();
-  env.sf.s_address_update_inuse (solver,
-                                 ea,
-                                 ea->used);
-  return GNUNET_OK;
-}
-
-
-/**
  * Cancel address suggestions for a peer
  *
  * @param peer the peer id
@@ -1169,16 +1099,15 @@ GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
 
   if (NULL == cur)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-        "No address requests pending for peer `%s', cannot remove!\n",
-        GNUNET_i2s (peer));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "No address requests pending for peer `%s', cannot remove!\n",
+                GNUNET_i2s (peer));
     return;
   }
   env.sf.s_get_stop (solver, peer);
-  GAS_addresses_handle_backoff_reset (peer);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Removed request pending for peer `%s\n",
-             GNUNET_i2s (peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Removed request pending for peer `%s\n",
+              GNUNET_i2s (peer));
   GNUNET_CONTAINER_DLL_remove (pending_requests_head,
                                pending_requests_tail,
                                cur);
@@ -1213,10 +1142,10 @@ GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
   if (NULL == cur)
   {
     cur = GNUNET_new (struct GAS_Addresses_Suggestion_Requests);
-    cur->id = (*peer);
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-        "Adding new address suggestion request for `%s'\n",
-         GNUNET_i2s (peer));
+    cur->id = *peer;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Adding new address suggestion request for `%s'\n",
+                GNUNET_i2s (peer));
     GNUNET_CONTAINER_DLL_insert (pending_requests_head,
                                  pending_requests_tail,
                                  cur);
@@ -1249,55 +1178,6 @@ GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
       aa->block_interval);
 }
 
-/**
- * Iterator to reset address blocking
- *
- * @param cls not used
- * @param key the peer
- * @param value the address to reset
- * @return #GNUNET_OK to continue
- */
-static int
-reset_address_it (void *cls,
-                  const struct GNUNET_PeerIdentity *key,
-                  void *value)
-{
-  struct ATS_Address *aa = value;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Resetting interval for peer `%s' address %p from %llu to 0\n",
-             GNUNET_i2s (&aa->peer),
-             aa,
-             aa->block_interval);
-  aa->blocked_until = GNUNET_TIME_UNIT_ZERO_ABS;
-  aa->block_interval = GNUNET_TIME_UNIT_ZERO;
-  return GNUNET_OK;
-}
-
-
-/**
- * Reset suggestion backoff for a peer
- *
- * Suggesting addresses is blocked for ATS_BLOCKING_DELTA. Blocking can be
- * reset using this function
- *
- * @param peer the peer id
- */
-void
-GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received `%s' for peer `%s'\n",
-             "RESET BACKOFF",
-             GNUNET_i2s (peer));
-
-  GNUNET_break(GNUNET_SYSERR !=
-               GNUNET_CONTAINER_multipeermap_get_multiple (addresses,
-                                                           peer,
-                                                           &reset_address_it,
-                                                           NULL));
-}
-
 
 /**
  * Solver information callback
@@ -1741,7 +1621,9 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address)
       GNUNET_BANDWIDTH_value_init (address->assigned_bw_in));
 
   for (cur = pending_requests_head;NULL != cur; cur = cur->next)
-    if (0 == memcmp (&address->peer, &cur->id, sizeof(cur->id)))
+    if (0 == memcmp (&address->peer,
+                     &cur->id,
+                     sizeof(cur->id)))
       break; /* we have an address request pending*/
   if (NULL == cur)
   {
@@ -1891,10 +1773,10 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
   GNUNET_asprintf (&plugin,
                    "libgnunet_plugin_ats_%s",
                    plugin_short);
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             _("Initializing solver `%s '`%s'\n"),
-             plugin_short,
-             plugin);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Initializing solver `%s '`%s'\n",
+              plugin_short,
+              plugin);
   if (NULL == (solver = GNUNET_PLUGIN_load (plugin, &env)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1904,7 +1786,6 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
 
   GNUNET_assert (NULL != env.sf.s_add);
-  GNUNET_assert (NULL != env.sf.s_address_update_inuse);
   GNUNET_assert (NULL != env.sf.s_address_update_property);
   GNUNET_assert (NULL != env.sf.s_address_update_session);
   GNUNET_assert (NULL != env.sf.s_address_update_network);
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index 2f21ae380..8892f77c4 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -196,16 +196,10 @@
  *    prevent the client from being thrashed. If the client requires immediately
  *    it can reset this block using GAS_addresses_handle_backoff_reset.
  *
- *       1.7.7 Marking address in use
- *
- *    The client can notify addresses that it successfully uses an address and
- *    wants this address to be kept by calling GSA_address_in_use. Adresses will
- *    mark the address as used an notify the solver about the use.
- *
- *       1.7.8 Address lifecycle
+ *       1.7.7 Address lifecycle
  *
  *      * (add address)
- *      * (updated address) || (address in use)
+ *      * (updated address)
  *      * (delete address)
  *
  *     1.8 Bandwidth assignment
@@ -454,27 +448,6 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
 
 
 /**
- * Notification about active use of an address.
- * in_use == #GNUNET_YES:
- *      This address is used to maintain an active connection with a peer.
- * in_use == #GNUNET_NO:
- *      This address is no longer used to maintain an active connection with a peer.
- *
- * Note: can only be called with in_use == #GNUNET_NO if called with #GNUNET_YES
- * before
- *
- * @param peer peer
- * @param session_id session id, can never be 0
- * @param in_use #GNUNET_YES if #GNUNET_NO FIXME
- * @return #GNUNET_SYSERR on failure (address unknown ...)
- */
-int
-GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
-                      uint32_t session_id,
-                      int in_use);
-
-
-/**
  * Update an address with new performance information for a peer.
  *
  * @param peer peer
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index 6b6b6c24f..9d7562e7b 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -120,30 +120,6 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
 
 
 /**
- * Handle 'reset backoff' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_reset_backoff (void *cls,
-                          struct GNUNET_SERVER_Client *client,
-                          const struct GNUNET_MessageHeader *message)
-{
-  const struct ResetBackoffMessage *msg =
-      (const struct ResetBackoffMessage *) message;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "RESET_BACKOFF");
-  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_handle_backoff_reset (&msg->peer);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
  * Handle 'address add' messages from clients.
  *
  * @param cls unused, NULL
@@ -262,35 +238,6 @@ GAS_handle_address_update (void *cls,
 
 
 /**
- * Handle 'address in use' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_address_in_use (void *cls,
-                           struct GNUNET_SERVER_Client *client,
-                           const struct GNUNET_MessageHeader *message)
-{
-  const struct AddressUseMessage *m;
-  int res;
-
-  m = (const struct AddressUseMessage *) message;
-  res = GAS_addresses_in_use (&m->peer,
-                              ntohl (m->session_id),
-                              ntohl (m->in_use));
-  if (GNUNET_OK != res)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
  * Handle 'address destroyed' messages from clients.
  *
  * @param cls unused, NULL
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c
index 75bb76dde..15fa5e6bd 100644
--- a/src/ats/plugin_ats_mlp.c
+++ b/src/ats/plugin_ats_mlp.c
@@ -2064,25 +2064,6 @@ GAS_mlp_address_session_changed (void *solver,
 
 
 /**
- * Transport session for this address has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param in_use usage state
- */
-static void
-GAS_mlp_address_inuse_changed (void *solver,
-                               struct ATS_Address *address,
-                               int in_use)
-{
-  /* Nothing to do here */
-  return;
-}
-
-
-/**
  * Network scope for this address has changed
  *
  * NOTE: values in addresses are already updated
@@ -2973,7 +2954,6 @@ libgnunet_plugin_ats_mlp_init (void *cls)
   env->sf.s_add = &GAS_mlp_address_add;
   env->sf.s_address_update_property = &GAS_mlp_address_property_changed;
   env->sf.s_address_update_session = &GAS_mlp_address_session_changed;
-  env->sf.s_address_update_inuse = &GAS_mlp_address_inuse_changed;
   env->sf.s_address_update_network = &GAS_mlp_address_change_network;
   env->sf.s_get = &GAS_mlp_get_preferred_address;
   env->sf.s_get_stop = &GAS_mlp_stop_get_preferred_address;
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index 64dca90c5..7bcc948b7 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -50,7 +50,7 @@
  *    outbound quota is configured and the bandwidth available in
  *    these networks is distributed over the addresses.  The solver
  *    first assigns every addresses the minimum amount of bandwidth
- *    GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT and then distributes the
+ *    #GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT and then distributes the
  *    remaining bandwidth available according to the preference
  *    values. For each peer only a single address gets bandwidth
  *    assigned and only one address marked as active.  The most
@@ -104,7 +104,7 @@
  *    solver is when an address switches network it is located
  *    in. This is common because addresses added by transport's
  *    validation mechanism are commonly located in
- *    GNUNET_ATS_NET_UNSPECIFIED. Addresses in validation are located
+ *    #GNUNET_ATS_NET_UNSPECIFIED. Addresses in validation are located
  *    in this network type and only if a connection is successful on
  *    return of payload data transport switches to the real network
  *    the address is located in.  When an address changes networks it
@@ -155,9 +155,9 @@
  *    the best available address.  Several checks are done when an
  *    address is selected. First if this address is currently blocked
  *    by addresses from being suggested. An address is blocked for the
- *    duration of ATS_BLOCKING_DELTA when it is suggested to
+ *    duration of #ATS_BLOCKING_DELTA when it is suggested to
  *    transport. Next it is checked if at least
- *    GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT bytes bandwidth is available
+ *    #GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT bytes bandwidth is available
  *    in the addresse's network, because suggesting an address without
  *    bandwidth does not make sense. This also ensures that all active
  *    addresses in this network get at least the minimum amount of
@@ -322,13 +322,11 @@ struct Network
 
   /**
    * Total inbound quota
-   *
    */
   unsigned long long total_quota_in;
 
   /**
    * Total outbound quota
-   *
    */
   unsigned long long total_quota_out;
 
@@ -375,13 +373,11 @@ struct AddressSolverInformation
 
   /**
    * Inbound quota
-   *
    */
   uint32_t calculated_quota_in;
 
   /**
    * Outbound quota
-   *
    */
   uint32_t calculated_quota_out;
 
@@ -427,7 +423,6 @@ libgnunet_plugin_ats_proportional_done (void *cls)
   struct AddressWrapper *next;
   int c;
 
-  GNUNET_assert(s != NULL);
   for (c = 0; c < s->network_count; c++)
   {
     if (s->network_entries[c].total_addresses > 0)
@@ -515,11 +510,10 @@ is_bandwidth_available_in_network (struct Network *net)
  */
 static void
 distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
-    struct Network *net)
+                      struct Network *net)
 {
   struct AddressSolverInformation *asi;
   struct AddressWrapper *cur_address;
-
   unsigned long long remaining_quota_in = 0;
   unsigned long long quota_out_used = 0;
   unsigned long long remaining_quota_out = 0;
@@ -537,10 +531,12 @@ distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
   uint32_t assigned_quota_out = 0;
 
 
-  LOG(GNUNET_ERROR_TYPE_INFO,
-      "Recalculate quota for network type `%s' for %u addresses (in/out): %llu/%llu \n",
-      net->desc, net->active_addresses, net->total_quota_in,
-      net->total_quota_in);
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Recalculate quota for network type `%s' for %u addresses (in/out): %llu/%llu \n",
+       net->desc,
+       net->active_addresses,
+       net->total_quota_in,
+       net->total_quota_in);
 
   if (net->active_addresses == 0)
   {
@@ -803,7 +799,6 @@ find_best_address_it (void *cls,
   /* user shorter distance */
   if (cur_distance < best_distance)
   {
-
     if (GNUNET_NO == ctx->best->active)
     {
       current_best = current; /* Use current */
@@ -864,9 +859,10 @@ get_best_address (struct GAS_PROPORTIONAL_Handle *s,
 
   fba_ctx.best = NULL;
   fba_ctx.s = s;
-  GNUNET_CONTAINER_multipeermap_get_multiple (addresses, id,
-                                              &find_best_address_it, &fba_ctx);
-
+  GNUNET_CONTAINER_multipeermap_get_multiple (addresses,
+                                              id,
+                                              &find_best_address_it,
+                                              &fba_ctx);
   return fba_ctx.best;
 }
 
@@ -1203,7 +1199,7 @@ distribute_bandwidth_in_network (struct GAS_PROPORTIONAL_Handle *s,
  * @param peer the peer to check
  * return the new address or NULL if no update was performed
   */
-static const struct ATS_Address *
+static struct ATS_Address *
 update_active_address (struct GAS_PROPORTIONAL_Handle *s,
                        const struct GNUNET_PeerIdentity *peer)
 {
@@ -1217,27 +1213,38 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s,
        GNUNET_i2s (peer));
 
   /* Find active address */
-  current_address = get_active_address (s, s->addresses, peer);
+  current_address = get_active_address (s,
+                                        s->addresses,
+                                        peer);
 
-  LOG (GNUNET_ERROR_TYPE_INFO, "Peer `%s' has active address %p\n",
-       GNUNET_i2s (peer), current_address);
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Peer `%s' has active address %p\n",
+       GNUNET_i2s (peer),
+       current_address);
 
   /* Find best address */
-  best_address = get_best_address (s,s->addresses, peer);
-  LOG (GNUNET_ERROR_TYPE_INFO, "Peer `%s' has best address %p\n",
-       GNUNET_i2s (peer), best_address);
+  best_address = get_best_address (s,
+                                   s->addresses,
+                                   peer);
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Peer `%s' has best address %p\n",
+       GNUNET_i2s (peer),
+       best_address);
 
   if (NULL != current_address)
   {
-    if ((NULL == best_address) || ((NULL != best_address) &&
-        (GNUNET_NO == address_eq (current_address, best_address))))
+    if ( (NULL == best_address) ||
+         ( (NULL != best_address) &&
+           (GNUNET_NO == address_eq (current_address,
+                                     best_address)) ) )
     {
-      /* We switch to a new address, mark old address as inactive */
+      /* We switch to a new address (or to none),
+         mark old address as inactive */
       LOG (GNUNET_ERROR_TYPE_INFO,
-          "Disabling previous %s address %p for peer `%s'\n",
-          (GNUNET_NO == current_address->active) ? "inactive" : "active",
-          current_address,
-          GNUNET_i2s (peer));
+           "Disabling previous %s address %p for peer `%s'\n",
+           (GNUNET_NO == current_address->active) ? "inactive" : "active",
+           current_address,
+           GNUNET_i2s (peer));
 
       asi = current_address->solver_information;
       GNUNET_assert (NULL != asi);
@@ -1258,32 +1265,31 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s,
     {
       /* We previously had an active address, but now we cannot suggest one
        * Therefore we have to disconnect the peer */
-
       LOG (GNUNET_ERROR_TYPE_INFO,
-          "Disconnecting peer `%s' with previous %s address %p\n",
-          GNUNET_i2s (peer),
-          (GNUNET_NO == current_address->active) ? "inactive" : "active",
-          current_address);
-      s->bw_changed (s->bw_changed_cls, current_address);
+           "Disconnecting peer `%s' with previous address %p\n",
+           GNUNET_i2s (peer),
+           current_address);
+      s->bw_changed (s->bw_changed_cls,
+                     current_address);
     }
   }
-
   if (NULL == best_address)
   {
-    LOG (GNUNET_ERROR_TYPE_INFO, "Cannot suggest address for peer `%s'\n",
-        GNUNET_i2s (peer));
-    return NULL ;
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Cannot suggest address for peer `%s'\n",
+         GNUNET_i2s (peer));
+    return NULL;
   }
 
-  LOG (GNUNET_ERROR_TYPE_INFO, "Suggesting %s address %p for peer `%s'\n",
-      (GNUNET_NO == best_address->active) ? "inactive" : "active", best_address,
-      GNUNET_i2s (peer));
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Suggesting new address %p for peer `%s'\n",
+       best_address,
+       GNUNET_i2s (peer));
 
-  if ((NULL != current_address) &&
-      (GNUNET_YES == address_eq (best_address, current_address)))
+  if ( (NULL != current_address) &&
+       (GNUNET_YES == address_eq (best_address, current_address)) )
   {
-    if (current_address->active == GNUNET_NO)
-      GNUNET_break (0); /* Should never happen */
+    GNUNET_break (GNUNET_NO != current_address->active);
     return best_address; /* Same same */
   }
 
@@ -1292,11 +1298,13 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s,
   net = asi->network;
 
   /* Mark address as active */
-  asi->activated = GNUNET_TIME_absolute_get();
+  asi->activated = GNUNET_TIME_absolute_get ();
   best_address->active = GNUNET_YES;
   address_increment (s, net, GNUNET_NO, GNUNET_YES);
-  LOG (GNUNET_ERROR_TYPE_INFO, "Address %p for peer `%s' is now active\n",
-      best_address, GNUNET_i2s (peer));
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Address %p for peer `%s' is now active\n",
+       best_address,
+       GNUNET_i2s (peer));
   /* Distribute bandwidth */
   distribute_bandwidth_in_network (s, net);
   return best_address;
@@ -1322,15 +1330,13 @@ GAS_proportional_address_change_preference (void *solver,
   struct ATS_Address *active_address;
   struct AddressSolverInformation *asi;
 
-  GNUNET_assert(NULL != s);
-  GNUNET_assert(NULL != peer);
-
-  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
+  if (GNUNET_NO ==
+      GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
     return; /* Peer is not requested */
 
   /* This peer is requested, find best address */
-  active_address = get_active_address(s, s->addresses, peer);
-  best_address = (struct ATS_Address *) update_active_address (s, peer);
+  active_address = get_active_address (s, s->addresses, peer);
+  best_address = update_active_address (s, peer);
 
   if ((NULL != best_address) && ((NULL != active_address) &&
       (GNUNET_YES == address_eq (active_address, best_address))))
@@ -1383,18 +1389,18 @@ GAS_proportional_get_preferred_address (void *solver,
   struct GAS_PROPORTIONAL_Handle *s = solver;
   const struct ATS_Address *best_address;
 
-
-  GNUNET_assert(s != NULL);
-  GNUNET_assert(peer != NULL);
-
   /* Add to list of pending requests */
-  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
+  if (GNUNET_NO ==
+      GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
   {
-    GNUNET_assert(
-        GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (s->requests, peer, NULL,
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multipeermap_put (s->requests,
+                                                     peer,
+                                                     NULL,
             GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    LOG (GNUNET_ERROR_TYPE_INFO, "Start suggesting addresses for peer `%s'\n",
-          GNUNET_i2s (peer));
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Start suggesting addresses for peer `%s'\n",
+         GNUNET_i2s (peer));
   }
 
   best_address = update_active_address (s, peer);
@@ -1420,23 +1426,28 @@ GAS_proportional_stop_get_preferred_address (void *solver,
   struct AddressSolverInformation *asi;
   struct Network *cur_net;
 
-  if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
+  if (GNUNET_YES ==
+      GNUNET_CONTAINER_multipeermap_contains (s->requests, peer))
   {
     GNUNET_assert (GNUNET_OK ==
                    GNUNET_CONTAINER_multipeermap_remove (s->requests,
-                                                         peer, NULL));
+                                                         peer,
+                                                         NULL));
     LOG (GNUNET_ERROR_TYPE_INFO,
          "Stop suggesting addresses for peer `%s'\n",
          GNUNET_i2s (peer));
   }
 
-  cur = get_active_address (s, s->addresses, peer);
+  cur = get_active_address (s,
+                            s->addresses,
+                            peer);
   if (NULL != cur)
   {
-    LOG(GNUNET_ERROR_TYPE_INFO,
-        "Disabling %s address %p for peer `%s'\n",
-        (GNUNET_NO == cur->active) ? "inactive" : "active", cur,
-        GNUNET_i2s (&cur->peer));
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Disabling %s address %p for peer `%s'\n",
+         (GNUNET_NO == cur->active) ? "inactive" : "active",
+         cur,
+         GNUNET_i2s (&cur->peer));
 
     /* Disabling current address */
     asi = cur->solver_information;
@@ -1446,12 +1457,12 @@ GAS_proportional_stop_get_preferred_address (void *solver,
     cur->assigned_bw_in = 0; /* no bandwidth assigned */
     cur->assigned_bw_out = 0; /* no bandwidth assigned */
 
-    if (GNUNET_SYSERR == addresse_decrement (s, cur_net, GNUNET_NO, GNUNET_YES))
+    if (GNUNET_SYSERR ==
+        addresse_decrement (s, cur_net, GNUNET_NO, GNUNET_YES))
       GNUNET_break(0);
 
-    distribute_bandwidth_in_network (s, cur_net );
+    distribute_bandwidth_in_network (s, cur_net);
   }
-  return;
 }
 
 
@@ -1490,11 +1501,14 @@ GAS_proportional_address_delete (void *solver,
 
   if (GNUNET_NO == session_only)
   {
-    LOG(GNUNET_ERROR_TYPE_INFO,
-        "Deleting %s address %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
-        (GNUNET_NO == address->active) ? "inactive" : "active", address,
-        GNUNET_i2s (&address->peer), net->desc, net->total_addresses,
-        net->active_addresses);
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Deleting %s address %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
+         (GNUNET_NO == address->active) ? "inactive" : "active",
+         address,
+         GNUNET_i2s (&address->peer),
+         net->desc,
+         net->total_addresses,
+         net->active_addresses);
 
     /* Remove address */
     addresse_decrement (s, net, GNUNET_YES, GNUNET_NO);
@@ -1508,42 +1522,48 @@ GAS_proportional_address_delete (void *solver,
       GNUNET_break(0);
       return;
     }
-    GNUNET_CONTAINER_DLL_remove(net->head, net->tail, aw);
-    GNUNET_free(aw);
+    GNUNET_CONTAINER_DLL_remove (net->head,
+                                 net->tail,
+                                 aw);
+    GNUNET_free (aw);
   }
   else
   {
     /* Remove session only: remove if active and update */
-    LOG(GNUNET_ERROR_TYPE_INFO,
-        "Deleting %s session %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
-        (GNUNET_NO == address->active) ? "inactive" : "active", address,
-        GNUNET_i2s (&address->peer), net->desc, net->total_addresses,
-        net->active_addresses);
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Deleting %s session %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
+         (GNUNET_NO == address->active) ? "inactive" : "active",
+         address,
+         GNUNET_i2s (&address->peer),
+         net->desc,
+         net->total_addresses,
+         net->active_addresses);
   }
 
   if (GNUNET_YES == address->active)
   {
     /* Address was active, remove from network and update quotas*/
     address->active = GNUNET_NO;
-
     address->assigned_bw_in = 0;
     address->assigned_bw_out = 0;
     asi->calculated_quota_in = 0;
     asi->calculated_quota_out = 0;
 
-    if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
+    if (GNUNET_SYSERR ==
+        addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
       GNUNET_break(0);
     distribute_bandwidth_in_network (s, net);
 
-    if (NULL == update_active_address (s, &address->peer))
+    if (NULL ==
+        update_active_address (s, &address->peer))
     {
       /* No alternative address found, disconnect peer */
       LOG (GNUNET_ERROR_TYPE_INFO,
-          "Disconnecting peer `%s' after deleting previous %s address %p\n",
-          GNUNET_i2s (&address->peer),
-          (GNUNET_NO == address->active) ? "inactive" : "active",
-              address);
-      s->bw_changed (s->bw_changed_cls, address);
+           "Disconnecting peer `%s' after deleting previous address %p\n",
+           GNUNET_i2s (&address->peer),
+           address);
+      s->bw_changed (s->bw_changed_cls,
+                     address);
     }
   }
   if (GNUNET_NO == session_only)
@@ -1552,10 +1572,11 @@ GAS_proportional_address_delete (void *solver,
     address->solver_information = NULL;
   }
 
-  LOG(GNUNET_ERROR_TYPE_INFO,
-      "After deleting address now total %u and active %u addresses in network `%s'\n",
-      net->total_addresses, net->active_addresses, net->desc);
-
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "After deleting address now total %u and active %u addresses in network `%s'\n",
+       net->total_addresses,
+       net->active_addresses,
+       net->desc);
 }
 
 
@@ -1571,7 +1592,7 @@ GAS_proportional_bulk_start (void *solver)
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Locking solver for bulk operation ...\n");
-  GNUNET_assert(NULL != solver);
+  GNUNET_assert (NULL != solver);
   s->bulk_lock++;
 }
 
@@ -1586,8 +1607,6 @@ GAS_proportional_bulk_stop (void *solver)
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Unlocking solver from bulk operation ...\n");
-  GNUNET_assert(NULL != solver);
-
   if (s->bulk_lock < 1)
   {
     GNUNET_break(0);
@@ -1638,8 +1657,6 @@ GAS_proportional_address_property_changed (void *solver,
   struct ATS_Address *best_address;
   struct ATS_Address *active_address;
 
-  GNUNET_assert(NULL != s);
-  GNUNET_assert(NULL != address);
   asi = address->solver_information;
   if (NULL == asi)
   {
@@ -1664,7 +1681,8 @@ GAS_proportional_address_property_changed (void *solver,
 
   /* This peer is requested, find active and best address */
   active_address = get_active_address(s, s->addresses, &address->peer);
-  best_address = (struct ATS_Address *) update_active_address (s, &address->peer);
+  best_address = update_active_address (s,
+                                        &address->peer);
 
   if ((NULL != best_address) && ((NULL != active_address) &&
       (GNUNET_YES == address_eq (active_address, best_address))))
@@ -1712,12 +1730,13 @@ GAS_proportional_address_session_changed (void *solver,
     return;
   }
 
-  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (s->requests, &address->peer))
+  if (GNUNET_NO ==
+      GNUNET_CONTAINER_multipeermap_contains (s->requests, &address->peer))
     return; /* Peer is not requested */
 
   /* This peer is requested, find active and best address */
-  active_address = get_active_address(s, s->addresses, &address->peer);
-  best_address = (struct ATS_Address *) update_active_address (s, &address->peer);
+  active_address = get_active_address (s, s->addresses, &address->peer);
+  best_address = update_active_address (s, &address->peer);
 
   if ((NULL != best_address) && ((NULL != active_address) &&
       (GNUNET_YES == address_eq (active_address, best_address))))
@@ -1732,65 +1751,6 @@ GAS_proportional_address_session_changed (void *solver,
 
 
 /**
- * Usage for this address has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param in_use usage state
- */
-static void
-GAS_proportional_address_inuse_changed (void *solver,
-                                        struct ATS_Address *address,
-                                        int in_use)
-{
-  struct GAS_PROPORTIONAL_Handle *s = solver;
-  struct Network *n;
-  struct AddressSolverInformation *asi;
-  struct ATS_Address *best_address;
-  struct ATS_Address *active_address;
-
-  GNUNET_assert(NULL != s);
-  GNUNET_assert(NULL != address);
-  asi = address->solver_information;
-  if (NULL == asi)
-  {
-    GNUNET_break(0);
-    return;
-  }
-
-  n = asi->network;
-  if (NULL == n)
-  {
-    GNUNET_break(0);
-    return;
-  }
-
-  LOG(GNUNET_ERROR_TYPE_INFO,
-      "Usage of peer `%s' address %p changed to %s \n",
-      GNUNET_i2s (&address->peer), address,
-      (GNUNET_YES == in_use) ? "YES" : "NO");
-
-  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (s->requests, &address->peer))
-    return; /* Peer is not requested */
-
-  /* This peer is requested, find active and best address */
-  active_address = get_active_address(s, s->addresses, &address->peer);
-  best_address = (struct ATS_Address *) update_active_address (s, &address->peer);
-
-  if ((NULL != best_address) && ((NULL != active_address) &&
-      (GNUNET_YES == address_eq (active_address, best_address))))
-  {
-    asi = best_address->solver_information;
-    GNUNET_assert (NULL != asi);
-
-    /* We sticked to the same address, therefore redistribute  */
-    distribute_bandwidth_in_network (s, asi->network);
-  }
-}
-
-/**
  * Network scope for this address has changed
  *
  * NOTE: values in addresses are already updated
@@ -1955,7 +1915,6 @@ libgnunet_plugin_ats_proportional_init (void *cls)
   env->sf.s_add = &GAS_proportional_address_add;
   env->sf.s_address_update_property = &GAS_proportional_address_property_changed;
   env->sf.s_address_update_session = &GAS_proportional_address_session_changed;
-  env->sf.s_address_update_inuse = &GAS_proportional_address_inuse_changed;
   env->sf.s_address_update_network = &GAS_proportional_address_change_network;
   env->sf.s_get = &GAS_proportional_get_preferred_address;
   env->sf.s_get_stop = &GAS_proportional_stop_get_preferred_address;
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index c87876ea1..5c396e82e 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -2166,7 +2166,7 @@ GAS_ril_address_change_preference (void *solver,
  * @param network network type of this address
  */
 static void
-GAS_ril_address_add (void *solver, 
+GAS_ril_address_add (void *solver,
                      struct ATS_Address *address,
                      uint32_t network)
 {
@@ -2181,7 +2181,7 @@ GAS_ril_address_add (void *solver,
   int i;
   unsigned int zero;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
        "API_address_add()\n");
 
   net = ril_get_network (s, network);
@@ -2256,7 +2256,7 @@ GAS_ril_address_add (void *solver,
  */
 static void
 GAS_ril_address_delete (void *solver,
-                        struct ATS_Address *address, 
+                        struct ATS_Address *address,
                         int session_only)
 {
   struct GAS_RIL_Handle *s = solver;
@@ -2272,7 +2272,7 @@ GAS_ril_address_delete (void *solver,
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "API_address_delete() Delete %s%s %s address %s for peer '%s'\n",
        session_only ? "session for " : "", address->active ? "active" : "inactive", address->plugin,
-       address->addr, 
+       address->addr,
        GNUNET_i2s (&address->peer));
 
   agent = ril_get_agent (s, &address->peer, GNUNET_NO);
@@ -2373,7 +2373,7 @@ GAS_ril_address_property_changed (void *solver,
 
   LOG(GNUNET_ERROR_TYPE_DEBUG,
       "API_address_property_changed() Property '%s' for peer '%s' address %s changed "
-          "to %.2f \n", 
+          "to %.2f \n",
       GNUNET_ATS_print_property_type (type),
       GNUNET_i2s (&address->peer),
       address->addr, rel_value);
@@ -2407,27 +2407,6 @@ GAS_ril_address_session_changed (void *solver,
 
 
 /**
- * Notify the solver that an address is (not) actively used by transport
- * to communicate with a remote peer
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param in_use usage state
- */
-static void
-GAS_ril_address_inuse_changed (void *solver,
-                               struct ATS_Address *address,
-                               int in_use)
-{
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "API_address_inuse_changed() Usage for %s address of peer '%s' changed to %s\n",
-      address->plugin, GNUNET_i2s (&address->peer), (GNUNET_YES == in_use) ? "USED" : "UNUSED");
-}
-
-
-/**
  * Notify solver that the network an address is located in has changed
  *
  * NOTE: values in addresses are already updated
@@ -2446,7 +2425,7 @@ GAS_ril_address_change_network (void *solver,
   struct GAS_RIL_Handle *s = solver;
   struct RIL_Peer_Agent *agent;
 
-  LOG(GNUNET_ERROR_TYPE_DEBUG, 
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
       "API_address_change_network() Network type changed, moving "
       "%s address of peer %s from '%s' to '%s'\n",
       (GNUNET_YES == address->active) ? "active" : "inactive", GNUNET_i2s (&address->peer),
@@ -2526,8 +2505,8 @@ GAS_ril_bulk_stop (void *solver)
 {
   struct GAS_RIL_Handle *s = solver;
 
-  LOG(GNUNET_ERROR_TYPE_DEBUG, 
-      "API_bulk_stop() lock: %d\n", 
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "API_bulk_stop() lock: %d\n",
       s->bulk_lock - 1);
 
   if (s->bulk_lock < 1)
@@ -2604,7 +2583,7 @@ GAS_ril_stop_get_preferred_address (void *solver,
   struct GAS_RIL_Handle *s = solver;
   struct RIL_Peer_Agent *agent;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
        "API_stop_get_preferred_address()");
 
   agent = ril_get_agent (s, peer, GNUNET_NO);
@@ -2872,7 +2851,6 @@ libgnunet_plugin_ats_ril_init (void *cls)
   env->sf.s_add = &GAS_ril_address_add;
   env->sf.s_address_update_property = &GAS_ril_address_property_changed;
   env->sf.s_address_update_session = &GAS_ril_address_session_changed;
-  env->sf.s_address_update_inuse = &GAS_ril_address_inuse_changed;
   env->sf.s_address_update_network = &GAS_ril_address_change_network;
   env->sf.s_get = &GAS_ril_get_preferred_address;
   env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address;
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 15c3ebbf4..02875a070 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -142,18 +142,6 @@ typedef void
 (*GAS_solver_address_session_changed) (void *solver,
     struct ATS_Address *address, uint32_t cur_session, uint32_t new_session);
 
-/**
- * Transport session for this address has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param in_use usage state
- */
-typedef void
-(*GAS_solver_address_inuse_changed) (void *solver, struct ATS_Address *address,
-    int in_use);
 
 /**
  * Network scope for this address has changed
@@ -218,12 +206,6 @@ struct GNUNET_ATS_SolverFunctions
   GAS_solver_address_session_changed s_address_update_session;
 
   /**
-   * Notify the solver that in address is (not) actively used by transport
-   * to communicate with a remote peer
-   */
-  GAS_solver_address_inuse_changed s_address_update_inuse;
-
-  /**
    * Notify solver that the network an address is located in has changed
    */
   GAS_solver_address_network_changed s_address_update_network;
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 88df7d0da..380a2a7af 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -481,18 +481,6 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh);
 
 
 /**
- * We would like to reset the address suggestion block time for this
- * peer.
- *
- * @param sh handle
- * @param peer identity of the peer we want to reset
- */
-void
-GNUNET_ATS_reset_backoff (struct GNUNET_ATS_SchedulingHandle *sh,
-                          const struct GNUNET_PeerIdentity *peer);
-
-
-/**
  * Test if a address and a session is known to ATS.
  *
  * @param sh the scheduling handle
@@ -582,18 +570,6 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar,
 
 
 /**
- * An address is now in use, or not used any more.
- *
- * @param ar address record for which to toggle the flag
- * @param in_use #GNUNET_YES if this address is now used, #GNUNET_NO
- *               if address is not used any more
- */
-void
-GNUNET_ATS_address_set_in_use (struct GNUNET_ATS_AddressRecord *ar,
-                               int in_use);
-
-
-/**
  * An address got destroyed, stop using it as a valid address.
  *
  * @param ar address record to destroy, it's validation has
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 57bbdfceb..fa21ce97a 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1148,18 +1148,6 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE 350
 
 /**
- * Type of the 'struct AddressUseMessage' sent by ATS to client
- * to confirm that an address is used or not used anymore
- */
-#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE 351
-
-/**
- * Type of the 'struct AddressUseMessage' sent by ATS to client
- * to confirm that an address is used or not used anymore
- */
-#define GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF 352
-
-/**
  * Type of the 'struct AddressUpdateMessage' sent by client to ATS
  * to add a new address
  */
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 749550657..7beec3118 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -416,6 +416,9 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \
 
 if HAVE_TESTING
 check_PROGRAMS = \
+ test_transport_api_restart_2peers \
+ test_transport_address_switch_tcp \
+ test_transport_address_switch_udp \
  test_transport_testing_startstop \
  test_transport_testing_restart \
  test_transport_testing \
@@ -435,14 +438,11 @@ check_PROGRAMS = \
  test_transport_api_bidirectional_connect \
  test_transport_api_tcp \
  test_transport_api_restart_1peer \
- test_transport_api_restart_2peers \
  test_transport_api_timeout_tcp \
- test_transport_address_switch_tcp \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  test_transport_api_timeout_udp \
- test_transport_address_switch_udp \
  $(UNIX_PLUGIN_TEST) \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
  $(UNIX_API_ABSTRACT_TEST) \
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index e3bbf7167..f317e924f 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -17,7 +17,6 @@
  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  Boston, MA 02111-1307, USA.
  */
-
 /**
  * @file transport/gnunet-service-transport.c
  * @brief main for gnunet-service-transport
@@ -41,6 +40,7 @@
 #include "gnunet-service-transport_manipulation.h"
 #include "transport.h"
 
+
 /**
  * Information we need for an asynchronous session kill.
  */
@@ -73,18 +73,45 @@ struct SessionKiller
 };
 
 
+/**
+ * We track active blacklist checks in a DLL so we can cancel them if
+ * necessary.  We typically check against the blacklist a few times
+ * during connection setup, as the check is asynchronous and the
+ * blacklist may change its mind before the connection goes fully up.
+ * Similarly, the session may die during the asynchronous check, so
+ * we use this list to then cancel ongoing checks.
+ */
 struct BlacklistCheckContext
 {
+  /**
+   * We keep these in a DLL.
+   */
   struct BlacklistCheckContext *prev;
 
+  /**
+   * We keep these in a DLL.
+   */
   struct BlacklistCheckContext *next;
 
+  /**
+   * Handle with the blacklist subsystem.
+   */
   struct GST_BlacklistCheck *blc;
 
+  /**
+   * The address we are checking.
+   */
   struct GNUNET_HELLO_Address *address;
 
+  /**
+   * Session associated with the address (or NULL).
+   */
   struct Session *session;
 
+  /**
+   * Message to process in the continuation if the
+   * blacklist check is ok, can be NULL.
+   */
   struct GNUNET_MessageHeader *msg;
 
 };
@@ -152,12 +179,16 @@ static struct SessionKiller *sk_tail;
 static struct GNUNET_ATS_InterfaceScanner *is;
 
 /**
- * FIXME
+ * Head of DLL of blacklist checks we have pending for
+ * incoming sessions and/or SYN requests.  We may
+ * want to move this into the blacklist-logic at some
+ * point.
  */
 struct BlacklistCheckContext *bc_head;
 
 /**
- * FIXME
+ * Tail of DLL of blacklist checks we have pending for
+ * incoming sessions and/or SYN requests.
  */
 struct BlacklistCheckContext *bc_tail;
 
@@ -202,7 +233,8 @@ transmit_our_hello (void *cls,
  * @param hello new HELLO
  */
 static void
-process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello)
+process_hello_update (void *cls,
+                      const struct GNUNET_MessageHeader *hello)
 {
   GST_clients_broadcast (hello, GNUNET_NO);
   GST_neighbours_iterate (&transmit_our_hello, (void *) hello);
@@ -268,20 +300,24 @@ process_payload (const struct GNUNET_HELLO_Address *address,
  * @param tc scheduler context
  */
 static void
-kill_session_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+kill_session_task (void *cls,
+                   const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct SessionKiller *sk = cls;
 
   sk->task = NULL;
-  GNUNET_CONTAINER_DLL_remove(sk_head, sk_tail, sk);
+  GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
   sk->plugin->disconnect_session (sk->plugin->cls, sk->session);
   GNUNET_free(sk);
 }
 
 
 /**
- * FIXME.  Also, consider moving the "bc_*" logic into
- * blacklist.h?
+ * Cancel all blacklist checks that are pending for the given address and session.
+ * NOTE: Consider moving the "bc_*" logic into blacklist.h?
+ *
+ * @param address address to remove from check
+ * @param sesssion session that must match to remove for check
  */
 static void
 cancel_pending_blacklist_checks (const struct GNUNET_HELLO_Address *address,
@@ -298,7 +334,9 @@ cancel_pending_blacklist_checks (const struct GNUNET_HELLO_Address *address,
          (0 == GNUNET_HELLO_address_cmp(blctx->address, address)) &&
          (blctx->session == session))
     {
-      GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+      GNUNET_CONTAINER_DLL_remove (bc_head,
+                                   bc_tail,
+                                   blctx);
       if (NULL != blctx->blc)
       {
         GST_blacklist_test_cancel (blctx->blc);
@@ -361,35 +399,37 @@ connect_bl_check_cont (void *cls,
 {
   struct BlacklistCheckContext *blctx = cls;
 
-  GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+  GNUNET_CONTAINER_DLL_remove (bc_head,
+                               bc_tail,
+                               blctx);
   blctx->blc = NULL;
-
   if (GNUNET_OK == result)
   {
     /* Blacklist allows to speak to this peer, forward SYN to neighbours  */
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Received SYN message from peer `%s' with `%s' %p\n",
+                "Received SYN message from peer `%s' at `%s'\n",
                 GNUNET_i2s (peer),
-                GST_plugins_a2s (blctx->address),
-                blctx->session);
-
+                GST_plugins_a2s (blctx->address));
     if (GNUNET_OK !=
         GST_neighbours_handle_session_syn (blctx->msg,
                                            &blctx->address->peer))
     {
-      cancel_pending_blacklist_checks (blctx->address, blctx->session);
-      kill_session (blctx->address->transport_name, blctx->session);
+      cancel_pending_blacklist_checks (blctx->address,
+                                       blctx->session);
+      kill_session (blctx->address->transport_name,
+                    blctx->session);
     }
   }
   else
   {
     /* Blacklist denies to speak to this peer */
-
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-        "Discarding SYN message from `%s' due to denied blacklist check\n",
-        GNUNET_i2s (peer));
-    cancel_pending_blacklist_checks (blctx->address, blctx->session);
-    kill_session (blctx->address->transport_name, blctx->session);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Discarding SYN message from `%s' due to denied blacklist check\n",
+                GNUNET_i2s (peer));
+    cancel_pending_blacklist_checks (blctx->address,
+                                     blctx->session);
+    kill_session (blctx->address->transport_name,
+                  blctx->session);
   }
 
   if (NULL != blctx->address)
@@ -429,7 +469,7 @@ GST_receive_callback (void *cls,
     goto end;
   type = ntohs (message->type);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received Message with type %u from peer `%s'\n",
+              "Received message with type %u from peer `%s'\n",
               type,
               GNUNET_i2s (&address->peer));
 
@@ -485,11 +525,17 @@ GST_receive_callback (void *cls,
     blctx->address = GNUNET_HELLO_address_copy (address);
     blctx->session = session;
     blctx->msg = GNUNET_malloc (ntohs(message->size));
-    memcpy (blctx->msg, message, ntohs(message->size));
-    GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, blctx);
-    if (NULL != (blc = GST_blacklist_test_allowed (&address->peer, NULL,
-                                                   &connect_bl_check_cont,
-                                                   blctx)))
+    memcpy (blctx->msg,
+            message,
+            ntohs (message->size));
+    GNUNET_CONTAINER_DLL_insert (bc_head,
+                                 bc_tail,
+                                 blctx);
+    if (NULL !=
+        (blc = GST_blacklist_test_allowed (&address->peer,
+                                           NULL,
+                                           &connect_bl_check_cont,
+                                           blctx)))
     {
       blctx->blc = blc;
     }
@@ -619,11 +665,8 @@ plugin_env_session_end (void *cls,
   }
   GNUNET_assert (strlen (address->transport_name) > 0);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Notification from plugin `%s' about terminated %s session %p from peer `%s' address `%s'\n",
-              address->transport_name,
-              GNUNET_HELLO_address_check_option (address,
-                                                 GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? "inbound" : "outbound",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Notification from plugin about terminated session %p from peer `%s' address `%s'\n",
               session,
               GNUNET_i2s (&address->peer),
               GST_plugins_a2s (address));
@@ -719,6 +762,15 @@ plugin_env_session_start_bl_check_cont (void *cls,
     kill_session (blctx->address->transport_name,
                   blctx->session);
   }
+  else if (GNUNET_YES !=
+           GNUNET_HELLO_address_check_option (blctx->address,
+                                              GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Informing verifier about inbound session's address `%s'\n",
+                GST_plugins_a2s (blctx->address));
+    GST_validation_handle_address (blctx->address);
+  }
   GNUNET_HELLO_address_free (blctx->address);
   GNUNET_free (blctx);
 }
@@ -754,35 +806,34 @@ plugin_env_session_start (void *cls,
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Notification from plugin `%s' about new %s session %p from peer `%s' address `%s'\n",
+              "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
               address->transport_name,
-              GNUNET_HELLO_address_check_option (address,
-                                                 GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? "inbound" : "outbound",
               session,
               GNUNET_i2s (&address->peer),
               GST_plugins_a2s (address));
-  if ( (GNUNET_YES ==
-        GNUNET_HELLO_address_check_option (address,
-                                           GNUNET_HELLO_ADDRESS_INFO_INBOUND)) ||
-       (GNUNET_NO ==
-        GST_ats_is_known (address, NULL) ) )
+  if (GNUNET_YES ==
+      GNUNET_HELLO_address_check_option (address,
+                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
   {
     /* inbound is always new, but outbound MAY already be known, but
        for example for UNIX, we have symmetric connections and thus we
        may not know the address yet; add if necessary! */
-    GST_ats_add_address (address,
-                         session,
-                         ats,
-                         ats_count);
+    GST_ats_add_inbound_address (address,
+                                 session,
+                                 ats,
+                                 ats_count);
   }
   else
   {
-    GST_ats_new_session (address,
-                         session);
-    GST_ats_update_metrics (address,
-                            session,
-                            ats,
-                            ats_count);
+    if (GNUNET_YES ==
+        GST_ats_is_known (address,
+                          session))
+    {
+      GST_ats_update_metrics (address,
+                              session,
+                              ats,
+                              ats_count);
+    }
   }
   /* Do blacklist check if communication with this peer is allowed */
   blctx = GNUNET_new (struct BlacklistCheckContext);
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index 0b864f3fb..c3f52de91 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -256,6 +256,10 @@ unblock_address (void *cls,
   struct AddressInfo *ai = cls;
 
   ai->unblock_task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Unblocking address %s of peer %s\n",
+              GST_plugins_a2s (ai->address),
+              GNUNET_i2s (&ai->address->peer));
   ai->ar = GNUNET_ATS_address_add (GST_ats,
                                    ai->address,
                                    ai->session,
@@ -291,8 +295,26 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
     GNUNET_break (0);
     return;
   }
-  GNUNET_ATS_address_destroy (ai->ar);
+  if (GNUNET_YES ==
+      GNUNET_HELLO_address_check_option (address,
+                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Removing address %s of peer %s from use (inbound died)\n",
+                GST_plugins_a2s (address),
+                GNUNET_i2s (&address->peer));
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Blocking address %s of peer %s from use for a while\n",
+                GST_plugins_a2s (address),
+                GNUNET_i2s (&address->peer));
+  /* destroy session and address */
+  if ( (NULL == session) ||
+       (GNUNET_NO ==
+        GNUNET_ATS_address_del_session (ai->ar, session)) )
+    GNUNET_ATS_address_destroy (ai->ar);
   ai->ar = NULL;
+
+  /* determine when the address should come back to life */
   ai->back_off = GNUNET_TIME_STD_BACKOFF (ai->back_off);
   ai->blocked = GNUNET_TIME_relative_to_absolute (ai->back_off);
   ai->unblock_task = GNUNET_SCHEDULER_add_delayed (ai->back_off,
@@ -302,8 +324,10 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Notify ATS about the new address including the network this address is
- * located in.
+ * Notify ATS about the a new inbound address. We may already
+ * know the address (as this is called each time we receive
+ * a message from an inbound connection).  If the address is
+ * indeed new, make it available to ATS.
  *
  * @param address the address
  * @param session the session
@@ -311,10 +335,10 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
  * @param ats_count number of @a ats information
  */
 void
-GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session,
-                     const struct GNUNET_ATS_Information *ats,
-                     uint32_t ats_count)
+GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
+                             struct Session *session,
+                             const struct GNUNET_ATS_Information *ats,
+                             uint32_t ats_count)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
   struct GNUNET_ATS_Information ats2[ats_count + 1];
@@ -328,55 +352,37 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
     GNUNET_break(0);
     return;
   }
-  if (GNUNET_YES ==
-      GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-  {
-    GNUNET_break (NULL != session);
-  }
-  ai = (NULL == session)
-    ? find_ai_no_session (address)
-    : find_ai (address, session);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_HELLO_address_check_option (address,
+                                                    GNUNET_HELLO_ADDRESS_INFO_INBOUND));
+  GNUNET_assert (NULL != session);
+  ai = find_ai (address, session);
   if (NULL != ai)
-    return;
-  if (NULL != session)
-  {
-    /* in this case, we must not find an existing
-       session-less address, as the caller should
-       have checked for this case if it were possible. */
-    ai = find_ai (address, NULL);
-    if (NULL != ai)
-    {
-      GNUNET_assert (0);
-      return;
-    }
-  }
-  if (NULL == (papi = GST_plugins_find (address->transport_name)))
   {
-    /* we don't have the plugin for this address */
-    GNUNET_assert (0);
+    /* This should only be called for new sessions, and thus
+       we should not already have the address */
+    GNUNET_break (0);
     return;
   }
-  if (NULL != session)
+  papi = GST_plugins_find (address->transport_name);
+  GNUNET_assert (NULL != papi);
+  net = papi->get_network (papi->cls, session);
+  if (GNUNET_ATS_NET_UNSPECIFIED == net)
   {
-    net = papi->get_network (papi->cls, session);
-    if (GNUNET_ATS_NET_UNSPECIFIED == net)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Could not obtain a valid network for `%s' %s (%s)\n"),
-                  GNUNET_i2s (&address->peer),
-                  GST_plugins_a2s (address),
-                  address->transport_name);
-      return;
-    }
-    ats2[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
-    ats2[0].value = htonl (net);
-    memcpy (&ats2[1],
-            ats,
-            sizeof(struct GNUNET_ATS_Information) * ats_count);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Could not obtain a valid network for `%s' %s (%s)\n"),
+                GNUNET_i2s (&address->peer),
+                GST_plugins_a2s (address),
+                address->transport_name);
+    return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Notifying ATS about peer `%s''s new address `%s' session %p in network %s\n",
+  ats2[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats2[0].value = htonl (net);
+  memcpy (&ats2[1],
+          ats,
+          sizeof(struct GNUNET_ATS_Information) * ats_count);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Notifying ATS about peer `%s''s new inbound address `%s' session %p in network %s\n",
               GNUNET_i2s (&address->peer),
               (0 == address->address_length)
               ? "<inbound>"
@@ -401,6 +407,55 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
 
 
 /**
+ * Notify ATS about the new address including the network this address is
+ * located in.  The address must NOT be inbound and must be new to ATS.
+ *
+ * @param address the address
+ * @param ats ats information
+ * @param ats_count number of @a ats information
+ */
+void
+GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
+                     const struct GNUNET_ATS_Information *ats,
+                     uint32_t ats_count)
+{
+  struct GNUNET_ATS_AddressRecord *ar;
+  struct AddressInfo *ai;
+
+  /* valid new address, let ATS know! */
+  if (NULL == address->transport_name)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  GNUNET_assert (GNUNET_YES !=
+                 GNUNET_HELLO_address_check_option (address,
+                                                    GNUNET_HELLO_ADDRESS_INFO_INBOUND));
+  ai = find_ai_no_session (address);
+  GNUNET_assert (NULL == ai);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Notifying ATS about peer `%s''s new address `%s'\n",
+              GNUNET_i2s (&address->peer),
+              (0 == address->address_length)
+              ? "<inbound>"
+              : GST_plugins_a2s (address));
+  ar = GNUNET_ATS_address_add (GST_ats,
+                               address,
+                               NULL,
+                               ats,
+                               ats_count);
+  ai = GNUNET_new (struct AddressInfo);
+  ai->address = GNUNET_HELLO_address_copy (address);
+  ai->ar = ar;
+  (void) GNUNET_CONTAINER_multipeermap_put (p2a,
+                                            &ai->address->peer,
+                                            ai,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  publish_p2a_stat_update ();
+}
+
+
+/**
  * Notify ATS about a new session now existing for the given
  * address.
  *
@@ -477,7 +532,14 @@ GST_ats_del_session (const struct GNUNET_HELLO_Address *address,
                    GNUNET_i2s (&address->peer));
   if (NULL == ai->ar)
   {
-    GST_ats_expire_address (address);
+    /* If ATS doesn't know about the address/session, and this
+       was an inbound session that expired, then we must forget
+       about the address as well.  Otherwise, we are done as
+       we have set `ai->session` to NULL already. */
+    if (GNUNET_YES ==
+        GNUNET_HELLO_address_check_option (address,
+                                           GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+      GST_ats_expire_address (address);
     return;
   }
   if (GNUNET_YES ==
@@ -516,7 +578,6 @@ GST_ats_update_metrics (const struct GNUNET_HELLO_Address *address,
     GNUNET_assert (GNUNET_YES !=
                    GNUNET_HELLO_address_check_option (address,
                                                       GNUNET_HELLO_ADDRESS_INFO_INBOUND));
-
     return;
   }
   /* Call to manipulation to manipulate ATS information */
@@ -541,31 +602,6 @@ GST_ats_update_metrics (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Notify ATS about a new session now being in use (or not).
- *
- * @param address the address
- * @param session the session
- * @param in_use #GNUNET_YES or #GNUNET_NO
- */
-void
-GST_ats_set_in_use (const struct GNUNET_HELLO_Address *address,
-                    struct Session *session,
-                    int in_use)
-{
-  struct AddressInfo *ai;
-
-  ai = find_ai (address, session);
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_assert (NULL != ai->ar);
-  GNUNET_ATS_address_set_in_use (ai->ar, in_use);
-}
-
-
-/**
  * Notify ATS that the address has expired and thus cannot
  * be used any longer.  This function must only be called
  * if the corresponding session is already gone.
@@ -577,7 +613,11 @@ GST_ats_expire_address (const struct GNUNET_HELLO_Address *address)
 {
   struct AddressInfo *ai;
 
-  ai = find_ai (address, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Address %s of peer %s expired\n",
+              GST_plugins_a2s (address),
+              GNUNET_i2s (&address->peer));
+  ai = find_ai_no_session (address);
   if (NULL == ai)
   {
     GNUNET_assert (0);
@@ -595,7 +635,15 @@ GST_ats_expire_address (const struct GNUNET_HELLO_Address *address)
                    GNUNET_i2s (&address->peer));
   if (NULL != ai->ar)
   {
-    GNUNET_ATS_address_destroy (ai->ar);
+    /* We usually should not have a session here when we
+       expire an address, but during shutdown a session
+       may be active while validation causes the address
+       to 'expire'.  So clean up both if necessary. */
+    if ( (NULL == ai->session) ||
+         (GNUNET_NO ==
+          GNUNET_ATS_address_del_session (ai->ar,
+                                          ai->session)) )
+      GNUNET_ATS_address_destroy (ai->ar);
     ai->ar = NULL;
   }
   if (NULL != ai->unblock_task)
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
index 53c4caa68..e2f829898 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -21,11 +21,6 @@
  * @file transport/gnunet-service-transport_ats.h
  * @brief interfacing between transport and ATS service
  * @author Christian Grothoff
- *
- * FIXME:
- * - add API to give ATS feedback about an address that was
- *   suggested but did not work out (without fully 'deleting'
- *   it forever)
  */
 #ifndef GNUNET_SERVICE_TRANSPORT_ATS_H
 #define GNUNET_SERVICE_TRANSPORT_ATS_H
@@ -72,9 +67,14 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
                        struct Session *session);
 
 
+/* FIXME: might want to add a function to reset the
+   back-off from blocking */
+
 /**
- * Notify ATS about the new address including the network this address is
- * located in.
+ * Notify ATS about the a new inbound address.  We may already
+ * know the address (as this is called each time we receive
+ * a message from an inbound connection).  If the address is
+ * indeed new, make it available to ATS.
  *
  * @param address the address
  * @param session the session
@@ -82,35 +82,36 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
  * @param ats_count number of @a ats information
  */
 void
-GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session,
-                     const struct GNUNET_ATS_Information *ats,
-                     uint32_t ats_count);
+GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
+                             struct Session *session,
+                             const struct GNUNET_ATS_Information *ats,
+                             uint32_t ats_count);
 
 
 /**
- * Notify ATS about a new session now existing for the given
- * address.
+ * Notify ATS about the new address including the network this address is
+ * located in.  The address must NOT be inbound and must be new to ATS.
  *
  * @param address the address
- * @param session the session
+ * @param ats ats information
+ * @param ats_count number of @a ats information
  */
 void
-GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session);
+GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
+                     const struct GNUNET_ATS_Information *ats,
+                     uint32_t ats_count);
 
 
 /**
- * Notify ATS about a new session now being in use (or not).
+ * Notify ATS about a new session now existing for the given
+ * address.
  *
  * @param address the address
  * @param session the session
- * @param in_use #GNUNET_YES or #GNUNET_NO
  */
 void
-GST_ats_set_in_use (const struct GNUNET_HELLO_Address *address,
-                    struct Session *session,
-                    int in_use);
+GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
+                     struct Session *session);
 
 
 /**
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index bd9257db3..ca4fa7824 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -38,7 +38,6 @@
 #include "transport.h"
 
 
-
 /**
  * Size of the neighbour hash map.
  */
@@ -509,11 +508,14 @@ static unsigned long long bytes_in_send_queue;
 /**
  * Task transmitting utilization data
  */
-static struct GNUNET_SCHEDULER_Task * util_transmission_tk;
+static struct GNUNET_SCHEDULER_Task *util_transmission_tk;
 
 
 /**
- * FIXME
+ * Convert the given ACK state to a string.
+ *
+ * @param s state
+ * @return corresponding human-readable string
  */
 static char *
 print_ack_state (enum GST_ACK_State s)
@@ -617,7 +619,6 @@ neighbours_changed_notification (const struct GNUNET_PeerIdentity *peer,
 }
 
 
-
 /**
  * Lookup a neighbour entry in the neighbours hash map.
  *
@@ -662,7 +663,8 @@ send_outbound_quota (const struct GNUNET_PeerIdentity *target,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
-              ntohl (quota.value__), GNUNET_i2s (target));
+              ntohl (quota.value__),
+              GNUNET_i2s (target));
   q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
   q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
   q_msg.quota = quota;
@@ -682,49 +684,34 @@ static void
 free_address (struct NeighbourAddress *na)
 {
   if (GNUNET_YES == na->ats_active)
-  {
     GST_validation_set_address_use (na->address,
                                     GNUNET_NO);
-    GST_ats_set_in_use (na->address,
-                        na->session,
-                        GNUNET_NO);
-  }
-
-  na->bandwidth_in = GNUNET_BANDWIDTH_value_init (0);
-  na->bandwidth_out = GNUNET_BANDWIDTH_value_init (0);
-  na->ats_active = GNUNET_NO;
-  na->keep_alive_nonce = 0;
   if (NULL != na->address)
   {
+    GST_ats_block_address (na->address,
+                           na->session);
     GNUNET_HELLO_address_free (na->address);
     na->address = NULL;
   }
+  na->bandwidth_in = GNUNET_BANDWIDTH_value_init (0);
+  na->bandwidth_out = GNUNET_BANDWIDTH_value_init (0);
+  na->ats_active = GNUNET_NO;
+  na->keep_alive_nonce = 0;
   na->session = NULL;
 }
 
 
 /**
- * Set net state for this neighbour and notify monitoring
+ * Master task run for every neighbour.  Performs all of the time-related
+ * activities (keep alive, send next message, disconnect if idle, finish
+ * clean up after disconnect).
  *
- * @param n the respective neighbour
- * @param s the new state
+ * @param cls the `struct NeighbourMapEntry` for which we are running
+ * @param tc scheduler context (unused)
  */
 static void
-set_state (struct NeighbourMapEntry *n,
-           enum GNUNET_TRANSPORT_PeerState s)
-{
-  n->state = s;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Neighbour `%s' changed state to %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_TRANSPORT_ps2s(s));
-  neighbours_changed_notification (&n->id,
-                                   n->primary_address.address,
-                                   n->state,
-                                   n->timeout,
-                                   n->primary_address.bandwidth_in,
-                                   n->primary_address.bandwidth_out);
-}
+master_task (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 /**
@@ -739,7 +726,36 @@ set_state_and_timeout (struct NeighbourMapEntry *n,
                        enum GNUNET_TRANSPORT_PeerState s,
                        struct GNUNET_TIME_Absolute timeout)
 {
+  if (GNUNET_TRANSPORT_is_connected (s) &&
+      ! GNUNET_TRANSPORT_is_connected (n->state) )
+  {
+    neighbours_connect_notification (&n->id,
+                                     n->primary_address.bandwidth_in,
+                                     n->primary_address.bandwidth_out);
+    GNUNET_STATISTICS_set (GST_stats,
+                           gettext_noop ("# peers connected"),
+                           ++neighbours_connected,
+                           GNUNET_NO);
+  }
+  if (! GNUNET_TRANSPORT_is_connected (s) &&
+        GNUNET_TRANSPORT_is_connected (n->state) )
+  {
+    GNUNET_STATISTICS_set (GST_stats,
+                           gettext_noop ("# peers connected"),
+                           --neighbours_connected,
+                           GNUNET_NO);
+    neighbours_disconnect_notification (&n->id);
+  }
   n->state = s;
+  if ( (timeout.abs_value_us < n->timeout.abs_value_us) &&
+       (NULL != n->task ) )
+  {
+    /* new timeout is earlier, reschedule master task */
+    GNUNET_SCHEDULER_cancel (n->task);
+    n->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (timeout),
+                                            &master_task,
+                                            n);
+  }
   n->timeout = timeout;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Neighbour `%s' changed state to %s with timeout %s\n",
@@ -756,29 +772,6 @@ set_state_and_timeout (struct NeighbourMapEntry *n,
 
 
 /**
- * Set new state timeout for this neighbour and notify monitoring
- *
- * @param n the respective neighbour
- * @param timeout the new timeout
- */
-static void
-set_timeout (struct NeighbourMapEntry *n,
-             struct GNUNET_TIME_Absolute timeout)
-{
-  n->timeout = timeout;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Neighbour `%s' changed timeout %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_STRINGS_absolute_time_to_string (timeout));
-  neighbours_changed_notification (&n->id,
-                                   n->primary_address.address,
-                                   n->state, n->timeout,
-                                   n->primary_address.bandwidth_in,
-                                   n->primary_address.bandwidth_out);
-}
-
-
-/**
  * Initialize the alternative address of a neighbour
  *
  * @param n the neighbour
@@ -809,9 +802,15 @@ set_alternative_address (struct NeighbourMapEntry *n,
     n->alternative_address.bandwidth_out = bandwidth_out;
     return;
   }
-  free_address (&n->alternative_address);
+  if (NULL != n->alternative_address.address)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Replacing existing alternative address with another one\n");
+    free_address (&n->alternative_address);
+  }
   if (NULL == session)
-    session = papi->get_session (papi->cls, address);
+    session = papi->get_session (papi->cls,
+                                 address);
   if (NULL == session)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -824,7 +823,8 @@ set_alternative_address (struct NeighbourMapEntry *n,
                               GNUNET_NO);
     return;
   }
-  GST_ats_new_session (address, session);
+  GST_ats_new_session (address,
+                       session);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Neighbour `%s' configured alternative address %s\n",
               GNUNET_i2s (&n->id),
@@ -859,48 +859,50 @@ set_primary_address (struct NeighbourMapEntry *n,
                      struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                      int is_active)
 {
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-
-  if (NULL == (papi = GST_plugins_find (address->transport_name)))
-  {
-    GNUNET_break (0);
-    return;
-  }
   if (session == n->primary_address.session)
   {
-    n->primary_address.bandwidth_in = bandwidth_in;
-    n->primary_address.bandwidth_out = bandwidth_out;
     if (is_active != n->primary_address.ats_active)
     {
       n->primary_address.ats_active = is_active;
-      GST_ats_set_in_use (n->primary_address.address,
-                          n->primary_address.session,
-                          is_active);
       GST_validation_set_address_use (n->primary_address.address,
                                       is_active);
     }
     if (GNUNET_YES == is_active)
     {
-      GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
-      send_outbound_quota (&address->peer, bandwidth_out);
+      if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
+      {
+        n->primary_address.bandwidth_in = bandwidth_in;
+        GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
+      }
+      if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
+      {
+        n->primary_address.bandwidth_out = bandwidth_out;
+        send_outbound_quota (&address->peer,
+                             bandwidth_out);
+      }
     }
     return;
   }
-  free_address (&n->primary_address);
-  if (NULL == session)
-    session = papi->get_session (papi->cls, address);
+  if ( (NULL != n->primary_address.address) &&
+       (0 == GNUNET_HELLO_address_cmp (address,
+                                       n->primary_address.address)) )
+  {
+    GNUNET_break (0);
+    return;
+  }
   if (NULL == session)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to obtain new session for peer `%s' and  address '%s'\n",
-                GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# session creation failed"),
-                              1,
-                              GNUNET_NO);
+    GNUNET_break (0);
+    GST_ats_block_address (address,
+                           session);
     return;
   }
-  GST_ats_new_session (address, session);
+  if (NULL != n->primary_address.address)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Replacing existing primary address with another one\n");
+    free_address (&n->primary_address);
+  }
   n->primary_address.address = GNUNET_HELLO_address_copy (address);
   n->primary_address.bandwidth_in = bandwidth_in;
   n->primary_address.bandwidth_out = bandwidth_out;
@@ -909,14 +911,12 @@ set_primary_address (struct NeighbourMapEntry *n,
   n->primary_address.keep_alive_nonce = 0;
   if (GNUNET_YES == is_active)
   {
-    /* Telling ATS about new session */
-    GST_ats_set_in_use (n->primary_address.address,
-                        n->primary_address.session,
-                        GNUNET_YES);
+    /* subsystems about address use */
     GST_validation_set_address_use (n->primary_address.address,
                                     GNUNET_YES);
     GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
-    send_outbound_quota (&address->peer, bandwidth_out);
+    send_outbound_quota (&address->peer,
+                         bandwidth_out);
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -943,32 +943,21 @@ static void
 unset_primary_address (struct NeighbourMapEntry *n)
 {
   /* Notify monitoring about change */
+  if (NULL == n->primary_address.address)
+    return;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Disabling primary address\n");
   neighbours_changed_notification (&n->id,
                                    n->primary_address.address,
                                    n->state,
                                    n->timeout,
                                    GNUNET_BANDWIDTH_value_init (0),
                                    GNUNET_BANDWIDTH_value_init (0));
-  /* Unset primary address */
   free_address (&n->primary_address);
 }
 
 
 /**
- * Clear the alternative address of a neighbour since this address is not
- * valid anymore
- *
- * @param n the neighbour
- */
-static void
-unset_alternative_address (struct NeighbourMapEntry *n)
-{
-  /* Unset primary address */
-  free_address (&n->alternative_address);
-}
-
-
-/**
  * Free a neighbour map entry.
  *
  * @param n entry to free
@@ -986,29 +975,29 @@ free_neighbour (struct NeighbourMapEntry *n)
   /* fail messages currently in the queue */
   while (NULL != (mq = n->messages_head))
   {
-    GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
+    GNUNET_CONTAINER_DLL_remove (n->messages_head,
+                                 n->messages_tail,
+                                 mq);
     if (NULL != mq->cont)
-      mq->cont (mq->cont_cls, GNUNET_SYSERR, mq->message_buf_size, 0);
+      mq->cont (mq->cont_cls,
+                GNUNET_SYSERR,
+                mq->message_buf_size,
+                0);
     GNUNET_free (mq);
   }
-  /* It is too late to send other peer disconnect notifications, but at
-     least internally we need to get clean... */
-  if (GNUNET_YES == test_connected (n))
-  {
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           --neighbours_connected,
-                           GNUNET_NO);
-    neighbours_disconnect_notification (&n->id);
-  }
-
   /* Mark peer as disconnected */
-  set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED);
-
+  set_state_and_timeout (n,
+                         GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED,
+                         GNUNET_TIME_UNIT_FOREVER_ABS);
   /* free addresses and mark as unused */
   unset_primary_address (n);
-  free_address (&n->alternative_address);
 
+  if (NULL != n->alternative_address.address)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Cleaning up alternative address\n");
+    free_address (&n->alternative_address);
+  }
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multipeermap_remove (neighbours,
                                                        &n->id, n));
@@ -1056,7 +1045,8 @@ free_neighbour (struct NeighbourMapEntry *n)
  */
 static struct GNUNET_TIME_Relative
 send_with_session (struct NeighbourMapEntry *n,
-                   const char *msgbuf, size_t msgbuf_size,
+                   const void *msgbuf,
+                   size_t msgbuf_size,
                    uint32_t priority,
                    struct GNUNET_TIME_Relative timeout,
                    unsigned int use_keepalive_timeout,
@@ -1070,14 +1060,20 @@ send_with_session (struct NeighbourMapEntry *n,
   if ( ((NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)) ||
          (-1 == papi->send (papi->cls,
                             n->primary_address.session,
-                            msgbuf, msgbuf_size,
+                            msgbuf,
+                            msgbuf_size,
                             priority,
                             (result = (GNUNET_NO == use_keepalive_timeout) ? timeout :
-                                GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                                             papi->query_keepalive_factor (papi->cls))),
-                            cont, cont_cls)))) &&
+                             GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+                                                          papi->query_keepalive_factor (papi->cls))),
+                            cont,
+                            cont_cls)))) &&
        (NULL != cont))
-    cont (cont_cls, &n->id, GNUNET_SYSERR, msgbuf_size, 0);
+    cont (cont_cls,
+          &n->id,
+          GNUNET_SYSERR,
+          msgbuf_size,
+          0);
   GST_neighbours_notify_data_sent (n->primary_address.address,
                                    n->primary_address.session,
                                    msgbuf_size);
@@ -1087,19 +1083,6 @@ send_with_session (struct NeighbourMapEntry *n,
 
 
 /**
- * Master task run for every neighbour.  Performs all of the time-related
- * activities (keep alive, send next message, disconnect if idle, finish
- * clean up after disconnect).
- *
- * @param cls the `struct NeighbourMapEntry` for which we are running
- * @param tc scheduler context (unused)
- */
-static void
-master_task (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
  * Function called when the 'DISCONNECT' message has been sent by the
  * plugin.  Frees the neighbour --- if the entry still exists.
  *
@@ -1107,11 +1090,14 @@ master_task (void *cls,
  * @param target identity of the neighbour that was disconnected
  * @param result #GNUNET_OK if the disconnect got out successfully
  * @param payload bytes payload
- * @param physical bytes physical
+ * @param physical bytes on wire
  */
 static void
-send_disconnect_cont (void *cls, const struct GNUNET_PeerIdentity *target,
-                      int result, size_t payload, size_t physical)
+send_disconnect_cont (void *cls,
+                      const struct GNUNET_PeerIdentity *target,
+                      int result,
+                      size_t payload,
+                      size_t physical)
 {
   struct NeighbourMapEntry *n;
 
@@ -1157,12 +1143,17 @@ send_disconnect (struct NeighbourMapEntry *n)
                                          &disconnect_msg.purpose,
                                          &disconnect_msg.signature));
 
-  (void) send_with_session (n, (const char *) &disconnect_msg,
-      sizeof (disconnect_msg), UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
-      GNUNET_NO, &send_disconnect_cont, NULL );
+  (void) send_with_session (n,
+                            &disconnect_msg,
+                            sizeof (disconnect_msg),
+                            UINT32_MAX,
+                            GNUNET_TIME_UNIT_FOREVER_REL,
+                            GNUNET_NO,
+                            &send_disconnect_cont,
+                            NULL);
   GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                            ("# DISCONNECT messages sent"), 1,
+                            gettext_noop ("# DISCONNECT messages sent"),
+                            1,
                             GNUNET_NO);
 }
 
@@ -1190,7 +1181,9 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
     return;
   case GNUNET_TRANSPORT_PS_SYN_SENT:
     send_disconnect (n);
-    set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_DISCONNECT,
+                           GNUNET_TIME_UNIT_FOREVER_ABS);
     break;
   case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
     /* we never ACK'ed the other peer's request, no need to send DISCONNECT */
@@ -1199,7 +1192,9 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
   case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
     /* we DID ACK the other peer's request, must send DISCONNECT */
     send_disconnect (n);
-    set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_DISCONNECT,
+                           GNUNET_TIME_UNIT_FOREVER_ABS);
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
   case GNUNET_TRANSPORT_PS_CONNECTED:
@@ -1207,12 +1202,9 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
     /* we are currently connected, need to send disconnect and do
        internal notifications and update statistics */
     send_disconnect (n);
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           --neighbours_connected,
-                           GNUNET_NO);
-    neighbours_disconnect_notification (&n->id);
-    set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_DISCONNECT,
+                           GNUNET_TIME_UNIT_FOREVER_ABS);
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
     /* Disconnecting while waiting for an ATS address to reconnect,
@@ -1237,7 +1229,8 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
   if (NULL != n->task)
     GNUNET_SCHEDULER_cancel (n->task);
   n->task = GNUNET_SCHEDULER_add_delayed (DISCONNECT_SENT_TIMEOUT,
-                                          &master_task, n);
+                                          &master_task,
+                                          n);
 }
 
 
@@ -1276,9 +1269,11 @@ transmit_send_continuation (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Bytes_in_send_queue `%u', Message_size %u, result: %s, payload %u, on wire %u\n",
-                bytes_in_send_queue, mq->message_buf_size,
+                bytes_in_send_queue,
+                mq->message_buf_size,
                 (GNUNET_OK == success) ? "OK" : "FAIL",
-                size_payload, physical);
+                size_payload,
+                physical);
     GNUNET_break (0);
   }
 
@@ -1357,28 +1352,35 @@ try_transmission_to_peer (struct NeighbourMapEntry *n)
                               gettext_noop
                               ("# messages timed out while in transport queue"),
                               1, GNUNET_NO);
-    GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
+    GNUNET_CONTAINER_DLL_remove (n->messages_head,
+                                 n->messages_tail,
+                                 mq);
     n->is_active = mq;
-    transmit_send_continuation (mq, &n->id,
+    transmit_send_continuation (mq,
+                                &n->id,
                                 GNUNET_SYSERR,
-                                mq->message_buf_size, 0);     /* timeout */
+                                mq->message_buf_size,
+                                0);     /* timeout */
   }
   if (NULL == mq)
     return;                     /* no more messages */
-  GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
+  GNUNET_CONTAINER_DLL_remove (n->messages_head,
+                               n->messages_tail,
+                               mq);
   n->is_active = mq;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      "Giving message with %u bytes to plugin session %p\n",
-      mq->message_buf_size, n->primary_address.session);
-
+              "Giving message with %u bytes to plugin session %p\n",
+              mq->message_buf_size,
+              n->primary_address.session);
   (void) send_with_session (n,
                             mq->message_buf,
                             mq->message_buf_size,
                             0 /* priority */,
                             timeout,
                             GNUNET_NO,
-                            &transmit_send_continuation, mq);
+                            &transmit_send_continuation,
+                            mq);
 }
 
 
@@ -1398,7 +1400,7 @@ send_keepalive (struct NeighbourMapEntry *n)
   uint32_t nonce;
 
   GNUNET_assert ((GNUNET_TRANSPORT_PS_CONNECTED == n->state) ||
-                 (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT));
+                 (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state));
   if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value_us > 0)
     return; /* no keepalive needed at this time */
 
@@ -1407,25 +1409,28 @@ send_keepalive (struct NeighbourMapEntry *n)
     nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      "Sending keep alive to peer `%s' with nonce %u\n",
-      GNUNET_i2s (&n->id), nonce);
-
+              "Sending keep alive to peer `%s' with nonce %u\n",
+              GNUNET_i2s (&n->id),
+              nonce);
   m.header.size = htons (sizeof (struct SessionKeepAliveMessage));
   m.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE);
   m.nonce = htonl (nonce);
 
   timeout = send_with_session (n,
-                               (const void *) &m, sizeof (m),
+                               &m,
+                               sizeof (m),
                                UINT32_MAX /* priority */,
-                               GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
+                               GNUNET_TIME_UNIT_FOREVER_REL,
+                               GNUNET_YES,
                                NULL, NULL);
-  GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# keepalives sent"), 1,
+  GNUNET_STATISTICS_update (GST_stats,
+                            gettext_noop ("# keepalives sent"),
+                            1,
                             GNUNET_NO);
   n->primary_address.keep_alive_nonce = nonce;
   n->expect_latency_response = GNUNET_YES;
   n->last_keep_alive_time = GNUNET_TIME_absolute_get ();
   n->keep_alive_time = GNUNET_TIME_relative_to_absolute (timeout);
-
 }
 
 
@@ -1473,11 +1478,13 @@ GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour,
   msg.header.size = htons (sizeof (struct SessionKeepAliveMessage));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE);
   msg.nonce = msg_in->nonce;
-  (void) send_with_session(n,
-                           (const void *) &msg, sizeof (struct SessionKeepAliveMessage),
-                           UINT32_MAX /* priority */,
-                           GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
-                           NULL, NULL);
+  (void) send_with_session (n,
+                            &msg,
+                            sizeof (struct SessionKeepAliveMessage),
+                            UINT32_MAX /* priority */,
+                            GNUNET_TIME_UNIT_FOREVER_REL,
+                            GNUNET_YES,
+                            NULL, NULL);
 }
 
 
@@ -1559,7 +1566,9 @@ GST_neighbours_keepalive_response (const struct GNUNET_PeerIdentity *neighbour,
 
   n->primary_address.keep_alive_nonce = 0;
   n->expect_latency_response = GNUNET_NO;
-  set_timeout (n, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+  set_state_and_timeout (n,
+                         n->state,
+                         GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
 
   latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1653,9 +1662,8 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity
   if (ret.rel_value_us > 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Throttling read (%llu bytes excess at %u b/s), waiting %s before reading more.\n",
-                (unsigned long long) n->in_tracker.
-                consumption_since_last_update__,
+                "Throttling read (%lld bytes excess at %u b/s), waiting %s before reading more.\n",
+                (long long) n->in_tracker.consumption_since_last_update__,
                 (unsigned int) n->in_tracker.available_bytes_per_s__,
                 GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
     GNUNET_STATISTICS_update (GST_stats,
@@ -1728,14 +1736,23 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target,
 
 
 /**
- * FIXME
+ * Continuation called from our attempt to transmitted our
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN to the specified @a
+ * target.  Continue processing based on the @a result.  Specifically,
+ * if we failed to transmit, discard the address we used.
+ *
+ * @param cls NULL
+ * @param target which peer received the transmission
+ * @param result #GNUNET_OK if sending worked
+ * @param size_payload how many bytes of payload were sent (ignored)
+ * @param size_on_wire how much bandwidth was consumed on the wire (ignored)
  */
 static void
-send_session_connect_cont (void *cls,
-                           const struct GNUNET_PeerIdentity *target,
-                           int result,
-                           size_t size_payload,
-                           size_t size_on_wire)
+send_session_syn_cont (void *cls,
+                       const struct GNUNET_PeerIdentity *target,
+                       int result,
+                       size_t size_payload,
+                       size_t size_on_wire)
 {
   struct NeighbourMapEntry *n;
 
@@ -1761,31 +1778,35 @@ send_session_connect_cont (void *cls,
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Failed to send SYN message to peer `%s' using address `%s' session %p\n"),
-              GNUNET_i2s (target),
-              GST_plugins_a2s (n->primary_address.address),
-              n->primary_address.session);
-
+              _("Failed to send SYN message to peer `%s'\n"),
+              GNUNET_i2s (target));
   switch (n->state) {
   case GNUNET_TRANSPORT_PS_SYN_SENT:
     /* Remove address and request an additional one */
     unset_primary_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS,
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_INIT_ATS,
                            GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
     /* Remove address and request an additional one */
     unset_primary_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     /* Remove address and request and go back to primary address */
-    GNUNET_STATISTICS_update (GST_stats, gettext_noop
-        ("# Failed attempts to switch addresses (failed to send SYN CONT)"), 1, GNUNET_NO);
-    unset_alternative_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    GNUNET_STATISTICS_update (GST_stats,
+                              gettext_noop ("# Failed attempts to switch addresses (failed to send SYN CONT)"),
+                              1,
+                              GNUNET_NO);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Switch failed, cleaning up alternative address\n");
+    free_address (&n->alternative_address);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_CONNECTED,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   default:
     disconnect_neighbour (n);
@@ -1793,6 +1814,7 @@ send_session_connect_cont (void *cls,
   }
 }
 
+
 /**
  * Send a SYN message via the given address.
  *
@@ -1805,24 +1827,14 @@ send_syn (struct NeighbourAddress *na)
   struct TransportSynMessage connect_msg;
   struct NeighbourMapEntry *n;
 
+  GNUNET_assert (NULL != na->session);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending SYN message to peer `%s'\n",
-              GNUNET_i2s (&na->address->peer));
+              "Sending SYN message to peer `%s' at %s\n",
+              GNUNET_i2s (&na->address->peer),
+              GST_plugins_a2s (na->address));
 
-  if (NULL == (papi = GST_plugins_find (na->address->transport_name)))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL == na->session)
-    na->session = papi->get_session (papi->cls, na->address);
-  if (NULL == na->session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GST_ats_new_session (na->address,
-                       na->session);
+  papi = GST_plugins_find (na->address->transport_name);
+  GNUNET_assert (NULL != papi);
   GNUNET_STATISTICS_update (GST_stats,
                             gettext_noop
                             ("# SYN messages sent"),
@@ -1835,46 +1847,56 @@ send_syn (struct NeighbourAddress *na)
   if (-1 ==
       papi->send (papi->cls,
                   na->session,
-                  (const char *) &connect_msg, sizeof (struct TransportSynMessage),
+                  (const char *) &connect_msg,
+                  sizeof (struct TransportSynMessage),
                   UINT_MAX,
                   SETUP_CONNECTION_TIMEOUT,
-                  send_session_connect_cont, NULL))
+                  &send_session_syn_cont, NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to transmit SYN message via plugin to %s\n"),
+                _("Failed to transmit SYN message to %s\n"),
                 GST_plugins_a2s (na->address));
-
     n = lookup_neighbour (&na->address->peer);
     if (NULL == n)
     {
       GNUNET_break (0);
       return;
     }
-
     switch (n->state) {
       case GNUNET_TRANSPORT_PS_SYN_SENT:
         /* Remove address and request and additional one */
+        GNUNET_assert (na == &n->primary_address);
         unset_primary_address (n);
-        set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS,
-          GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
+        set_state_and_timeout (n,
+                               GNUNET_TRANSPORT_PS_INIT_ATS,
+                               GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
         /* Hard failure to send the SYN message with this address:
            Destroy address and session */
         break;
       case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
         /* Remove address and request an additional one */
+        GNUNET_assert (na == &n->primary_address);
         unset_primary_address (n);
-        set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+        set_state_and_timeout (n,
+                               GNUNET_TRANSPORT_PS_RECONNECT_ATS,
+                               GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
         break;
       case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-        GNUNET_STATISTICS_update (GST_stats, gettext_noop
-            ("# Failed attempts to switch addresses (failed to send SYN)"), 1, GNUNET_NO);
+        GNUNET_assert (na == &n->alternative_address);
+        GNUNET_STATISTICS_update (GST_stats,
+                                  gettext_noop ("# Failed attempts to switch addresses (failed to send SYN)"),
+                                  1,
+                                  GNUNET_NO);
         /* Remove address and request an additional one */
-        unset_alternative_address (n);
-        set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
-          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Switch failed, cleaning up alternative address\n");
+        free_address (&n->alternative_address);
+        set_state_and_timeout (n,
+                               GNUNET_TRANSPORT_PS_CONNECTED,
+                               GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
         break;
       default:
+        GNUNET_break (0);
         disconnect_neighbour (n);
         break;
     }
@@ -1886,14 +1908,23 @@ send_syn (struct NeighbourAddress *na)
 
 
 /**
- * FIXME.
+ * Continuation called from our attempt to transmitted our
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK to the specified @a
+ * target.  Continue processing based on the @a result.  Specifically,
+ * if we failed to transmit, discard the address we used.
+ *
+ * @param cls NULL
+ * @param target which peer received the transmission
+ * @param result #GNUNET_OK if sending worked
+ * @param size_payload how many bytes of payload were sent (ignored)
+ * @param size_on_wire how much bandwidth was consumed on the wire (ignored)
  */
 static void
-send_session_connect_ack_cont (void *cls,
-                               const struct GNUNET_PeerIdentity *target,
-                               int result,
-                               size_t size_payload,
-                               size_t size_on_wire)
+send_session_syn_ack_cont (void *cls,
+                           const struct GNUNET_PeerIdentity *target,
+                           int result,
+                           size_t size_payload,
+                           size_t size_on_wire)
 {
   struct NeighbourMapEntry *n;
 
@@ -1917,33 +1948,35 @@ send_session_connect_ack_cont (void *cls,
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-            _("Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"),
+            _("Failed to send SYN_ACK message to peer `%s' using address `%s'\n"),
             GNUNET_i2s (target),
-            GST_plugins_a2s (n->primary_address.address),
-            n->primary_address.session);
+            GST_plugins_a2s (n->primary_address.address));
 
   /* Remove address and request and additional one */
+  /* FIXME: what if the neighbour's primary address
+     changed in the meantime? Might want to instead
+     pass "something" around in closure to be sure. */
   unset_primary_address (n);
   n->ack_state = ACK_SEND_SYN_ACK;
-  set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
+  set_state_and_timeout (n,
+                         GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
                          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-  return;
 }
 
 
 /**
  * Send a SYN_ACK message via the given address.
  *
- * @param address address to use
- * @param session session to use
+ * @param na address and session to use
  * @param timestamp timestamp to use for the ACK message
- * @return GNUNET_SYSERR if sending immediately failed, GNUNET_OK otherwise
+ * @return #GNUNET_SYSERR if sending immediately failed, #GNUNET_OK otherwise
  */
 static void
-send_connect_ack_message (const struct GNUNET_HELLO_Address *address,
-                          struct Session *session,
-                          struct GNUNET_TIME_Absolute timestamp)
+send_syn_ack_message (struct NeighbourAddress *na,
+                      struct GNUNET_TIME_Absolute timestamp)
 {
+  const struct GNUNET_HELLO_Address *address = na->address;
+  struct Session *session = na->session;
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
   struct TransportSynMessage connect_msg;
   struct NeighbourMapEntry *n;
@@ -1958,13 +1991,15 @@ send_connect_ack_message (const struct GNUNET_HELLO_Address *address,
     return;
   }
   if (NULL == session)
-    session = papi->get_session (papi->cls, address);
+    session = papi->get_session (papi->cls,
+                                 address);
   if (NULL == session)
   {
     GNUNET_break (0);
     return;
   }
-  GST_ats_new_session (address, session);
+  GST_ats_new_session (address,
+                       session);
   GNUNET_STATISTICS_update (GST_stats,
                             gettext_noop
                             ("# SYN_ACK messages sent"),
@@ -1974,15 +2009,17 @@ send_connect_ack_message (const struct GNUNET_HELLO_Address *address,
   connect_msg.reserved = htonl (0);
   connect_msg.timestamp = GNUNET_TIME_absolute_hton (timestamp);
 
-  if (GNUNET_SYSERR == papi->send (papi->cls,
-                     session,
-                     (const char *) &connect_msg, sizeof (struct TransportSynMessage),
-                     UINT_MAX,
-                     GNUNET_TIME_UNIT_FOREVER_REL,
-                     send_session_connect_ack_cont, NULL))
+  if (GNUNET_SYSERR ==
+      papi->send (papi->cls,
+                  session,
+                  (const char *) &connect_msg,
+                  sizeof (struct TransportSynMessage),
+                  UINT_MAX,
+                  GNUNET_TIME_UNIT_FOREVER_REL,
+                  &send_session_syn_ack_cont, NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to transmit SYN_ACK message via plugin to %s\n"),
+                _("Failed to transmit SYN_ACK message to %s\n"),
                 GST_plugins_a2s (address));
 
     n = lookup_neighbour (&address->peer);
@@ -1994,11 +2031,11 @@ send_connect_ack_message (const struct GNUNET_HELLO_Address *address,
     /* Remove address and request and additional one */
     unset_primary_address (n);
     n->ack_state = ACK_SEND_SYN_ACK;
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     return;
   }
-
 }
 
 
@@ -2056,10 +2093,6 @@ setup_neighbour (const struct GNUNET_PeerIdentity *peer)
   n->id = *peer;
   n->ack_state = ACK_UNDEFINED;
   n->last_util_transmission = GNUNET_TIME_absolute_get();
-  n->util_payload_bytes_recv = 0;
-  n->util_payload_bytes_sent = 0;
-  n->util_total_bytes_recv = 0;
-  n->util_total_bytes_sent = 0;
   GNUNET_BANDWIDTH_tracker_init (&n->in_tracker,
                                  &inbound_bw_tracker_update,
                                  n,
@@ -2073,6 +2106,9 @@ setup_neighbour (const struct GNUNET_PeerIdentity *peer)
                  GNUNET_CONTAINER_multipeermap_put (neighbours,
                                                     &n->id, n,
                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
+                                                       peer);
+
   return n;
 }
 
@@ -2157,10 +2193,6 @@ try_connect_bl_check_cont (void *cls,
   set_state_and_timeout (n,
                          GNUNET_TRANSPORT_PS_INIT_ATS,
                          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-  GNUNET_ATS_reset_backoff (GST_ats, peer);
-  GNUNET_assert (NULL == n->suggest_handle);
-  n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
-                                                       peer);
 }
 
 
@@ -2304,17 +2336,16 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
   {
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
     /* Request an address from ATS to send SYN_ACK to this peer */
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-    if (NULL == n->suggest_handle)
-      n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
-                                                           peer);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_INIT_ATS:
     /* SYN message takes priority over us asking ATS for address:
      * Wait for ATS to suggest an address and send SYN_ACK */
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
     /* We already wait for an address to send an SYN_ACK */
@@ -2323,16 +2354,16 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
   case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
     /* Send ACK immediately */
     n->ack_state = ACK_SEND_ACK;
-    send_connect_ack_message (n->primary_address.address,
-                              n->primary_address.session, ts);
+    send_syn_ack_message (&n->primary_address,
+                          ts);
     break;
   case GNUNET_TRANSPORT_PS_CONNECTED:
     /* we are already connected and can thus send the ACK immediately */
     GNUNET_assert (NULL != n->primary_address.address);
     GNUNET_assert (NULL != n->primary_address.session);
     n->ack_state = ACK_SEND_ACK;
-    send_connect_ack_message (n->primary_address.address,
-                              n->primary_address.session, ts);
+    send_syn_ack_message (&n->primary_address,
+                          ts);
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
     /* We wait for ATS address suggestion */
@@ -2341,8 +2372,8 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     /* We received a SYN message while waiting for a SYN_ACK in fast
      * reconnect. Send SYN_ACK immediately */
     n->ack_state = ACK_SEND_ACK;
-    send_connect_ack_message (n->primary_address.address,
-        n->primary_address.session, n->connect_ack_timestamp);
+    send_syn_ack_message (&n->primary_address,
+                          n->connect_ack_timestamp);
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     /* We are already connected and can thus send the ACK immediately;
@@ -2351,8 +2382,8 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     GNUNET_assert (NULL != n->primary_address.address);
     GNUNET_assert (NULL != n->primary_address.session);
     n->ack_state = ACK_SEND_ACK;
-    send_connect_ack_message (n->primary_address.address,
-        n->primary_address.session, ts);
+    send_syn_ack_message (&n->primary_address,
+                          ts);
     break;
   case GNUNET_TRANSPORT_PS_DISCONNECT:
     /* Get rid of remains and re-try */
@@ -2362,10 +2393,9 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     n->ack_state = ACK_SEND_SYN_ACK;
     n->connect_ack_timestamp = ts;
     /* Request an address for the peer */
-    n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
-                                                         peer);
-    GNUNET_ATS_reset_backoff (GST_ats, peer);
-    set_state (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS);
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
     /* should not be possible */
@@ -2405,7 +2435,6 @@ try_run_fast_ats_update (const struct GNUNET_HELLO_Address *address,
                          struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
 {
   struct NeighbourMapEntry *n;
-  int connected;
 
   n = lookup_neighbour (&address->peer);
   if ( (NULL == n) ||
@@ -2419,16 +2448,7 @@ try_run_fast_ats_update (const struct GNUNET_HELLO_Address *address,
   {
     /* switch to a different session, but keeping same address; could
        happen if there is a 2nd inbound connection */
-    connected = GNUNET_TRANSPORT_is_connected (n->state);
-    if (GNUNET_YES == connected)
-      GST_ats_set_in_use (n->primary_address.address,
-                          n->primary_address.session,
-                          GNUNET_NO);
     n->primary_address.session = session;
-    if (GNUNET_YES == connected)
-      GST_ats_set_in_use (n->primary_address.address,
-                          n->primary_address.session,
-                          GNUNET_YES);
   }
   n->primary_address.bandwidth_in = bandwidth_in;
   n->primary_address.bandwidth_out = bandwidth_out;
@@ -2470,8 +2490,10 @@ switch_address_bl_check_cont (void *cls,
                               "# ATS suggestions ignored (blacklist denied)",
                               1,
                               GNUNET_NO);
-    /* FIXME: tell plugin to force killing session here and now! */
-    /* FIXME: Let ATS know that the suggested address did not work! */
+    /* FIXME: tell plugin to force killing session here and now
+       (note: _proper_ plugin API for this does not yet exist) */
+    GST_ats_block_address (blc_ctx->address,
+                           blc_ctx->session);
     goto cleanup;
   }
 
@@ -2501,10 +2523,11 @@ switch_address_bl_check_cont (void *cls,
                               GNUNET_NO);
     /* No session could be obtained, remove blacklist check and clean up */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to obtain new session for peer `%s' and  address '%s'\n",
+                "Failed to obtain new session for peer `%s' and address '%s'\n",
                 GNUNET_i2s (&blc_ctx->address->peer),
                 GST_plugins_a2s (blc_ctx->address));
-    /* FIXME: Let ATS know that the suggested address did not work! */
+    GST_ats_block_address (blc_ctx->address,
+                           blc_ctx->session);
     goto cleanup;
   }
 
@@ -2526,15 +2549,16 @@ switch_address_bl_check_cont (void *cls,
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer `%s' switches to address `%s' session %p\n",
+              "Peer `%s' switches to address `%s'\n",
               GNUNET_i2s (&blc_ctx->address->peer),
-              GST_plugins_a2s (blc_ctx->address),
-              blc_ctx->session);
+              GST_plugins_a2s (blc_ctx->address));
 
   switch (n->state)
   {
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
     GNUNET_break (0);
+    GST_ats_block_address (blc_ctx->address,
+                           blc_ctx->session);
     free_neighbour (n);
     return;
   case GNUNET_TRANSPORT_PS_INIT_ATS:
@@ -2550,9 +2574,8 @@ switch_address_bl_check_cont (void *cls,
     {
       /* Send pending SYN_ACK message */
       n->ack_state = ACK_SEND_ACK;
-      send_connect_ack_message (n->primary_address.address,
-                                n->primary_address.session,
-                                n->connect_ack_timestamp);
+      send_syn_ack_message (&n->primary_address,
+                            n->connect_ack_timestamp);
     }
     set_state_and_timeout (n,
                            GNUNET_TRANSPORT_PS_SYN_SENT,
@@ -2573,9 +2596,8 @@ switch_address_bl_check_cont (void *cls,
     {
       /* Send pending SYN_ACK message */
       n->ack_state = ACK_SEND_ACK;
-      send_connect_ack_message (n->primary_address.address,
-                                n->primary_address.session,
-                                n->connect_ack_timestamp);
+      send_syn_ack_message (&n->primary_address,
+                            n->connect_ack_timestamp);
     }
     set_state_and_timeout (n,
                            GNUNET_TRANSPORT_PS_SYN_SENT,
@@ -2595,9 +2617,8 @@ switch_address_bl_check_cont (void *cls,
     set_state_and_timeout (n,
                            GNUNET_TRANSPORT_PS_SYN_RECV_ACK,
                            GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
-    send_connect_ack_message (n->primary_address.address,
-                              n->primary_address.session,
-                              n->connect_ack_timestamp);
+    send_syn_ack_message (&n->primary_address,
+                          n->connect_ack_timestamp);
     if ( (ACK_SEND_SYN_ACK == n->ack_state) ||
          (ACK_UNDEFINED == n->ack_state) )
       n->ack_state = ACK_SEND_ACK;
@@ -2608,9 +2629,8 @@ switch_address_bl_check_cont (void *cls,
     if ( (ACK_SEND_SYN_ACK == n->ack_state) )
     {
       n->ack_state = ACK_SEND_ACK;
-      send_connect_ack_message (n->primary_address.address,
-                                n->primary_address.session,
-                                n->connect_ack_timestamp);
+      send_syn_ack_message (&n->primary_address,
+                            n->connect_ack_timestamp);
     }
     set_primary_address (n,
                          blc_ctx->address,
@@ -2625,18 +2645,7 @@ switch_address_bl_check_cont (void *cls,
   case GNUNET_TRANSPORT_PS_CONNECTED:
     GNUNET_assert (NULL != n->primary_address.address);
     GNUNET_assert (NULL != n->primary_address.session);
-    if (n->primary_address.session == blc_ctx->session)
-    {
-      /* not an address change, just a quota change */
-      // FIXME: this case should have been caught above!
-      set_primary_address (n,
-                           blc_ctx->address,
-                           blc_ctx->session,
-                           blc_ctx->bandwidth_in,
-                           blc_ctx->bandwidth_out,
-                           GNUNET_YES);
-      break;
-    }
+    GNUNET_break (n->primary_address.session != blc_ctx->session);
     /* ATS asks us to switch a life connection; see if we can get
        a SYN_ACK on it before we actually do this! */
     set_alternative_address (n,
@@ -2644,7 +2653,8 @@ switch_address_bl_check_cont (void *cls,
                              blc_ctx->session,
                              blc_ctx->bandwidth_in,
                              blc_ctx->bandwidth_out);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT,
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT,
                            GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop ("# Attempts to switch addresses"),
@@ -2663,9 +2673,8 @@ switch_address_bl_check_cont (void *cls,
     {
       /* Send pending SYN_ACK message */
       n->ack_state = ACK_SEND_ACK;
-      send_connect_ack_message (n->primary_address.address,
-                                n->primary_address.session,
-                                n->connect_ack_timestamp);
+      send_syn_ack_message (&n->primary_address,
+                            n->connect_ack_timestamp);
     }
     set_state_and_timeout (n,
                            GNUNET_TRANSPORT_PS_RECONNECT_SENT,
@@ -2687,13 +2696,17 @@ switch_address_bl_check_cont (void *cls,
     send_syn (&n->primary_address);
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    if ( (0 == GNUNET_HELLO_address_cmp(n->primary_address.address,
-                                        blc_ctx->address)) &&
+    if ( (0 == GNUNET_HELLO_address_cmp (n->primary_address.address,
+                                         blc_ctx->address)) &&
          (n->primary_address.session == blc_ctx->session) )
     {
       /* ATS switches back to still-active session */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "ATS double-switched, cleaning up alternative address\n");
       free_address (&n->alternative_address);
-      set_state (n, GNUNET_TRANSPORT_PS_CONNECTED);
+      set_state_and_timeout (n,
+                             GNUNET_TRANSPORT_PS_CONNECTED,
+                             n->timeout);
       break;
     }
     /* ATS asks us to switch a life connection, send */
@@ -2737,7 +2750,11 @@ switch_address_bl_check_cont (void *cls,
  * For the given peer, switch to this address.
  *
  * Before accepting this addresses and actively using it, a blacklist check
- * is performed. If this blacklist check fails the address will be destroyed.
+ * is performed.
+ *
+ * If any check fails or the suggestion can somehow not be followed, we
+ * MUST call #GST_ats_block_address() to tell ATS that the suggestion
+ * could not be satisfied and force ATS to do something else.
  *
  * @param address address of the other peer,
  * @param session session to use or NULL if transport should initiate a session
@@ -2755,9 +2772,6 @@ GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
   struct GST_BlacklistCheck *blc;
   struct BlacklistCheckSwitchContext *blc_ctx;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ATS has decided on an address for peer %s\n",
-              GNUNET_i2s (&address->peer));
   GNUNET_assert (NULL != address->transport_name);
   if (GNUNET_OK ==
       try_run_fast_ats_update (address,
@@ -2771,6 +2785,8 @@ GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
   {
     /* we don't have the plugin for this address */
     GNUNET_break (0);
+    GST_ats_block_address (address,
+                           session);
     return;
   }
   if ((NULL == session) &&
@@ -2779,14 +2795,13 @@ GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
   {
     /* This is a inbound address and we do not have a session to use! */
     GNUNET_break (0);
+    GST_ats_block_address (address,
+                           session);
     return;
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ATS suggests %s address '%s' for peer `%s'\n",
-              GNUNET_HELLO_address_check_option (address,
-                                                 GNUNET_HELLO_ADDRESS_INFO_INBOUND)
-              ? "inbound" : "outbound",
+              "ATS suggests address '%s' for peer `%s'\n",
               GST_plugins_a2s (address),
               GNUNET_i2s (&address->peer));
 
@@ -2831,7 +2846,7 @@ send_utilization_data (void *cls,
   uint32_t bps_out;
   struct GNUNET_TIME_Relative delta;
 
-  if (GNUNET_TRANSPORT_PS_CONNECTED != n->state)
+  if (GNUNET_YES != test_connected (n))
     return GNUNET_OK;
   delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission,
                                                GNUNET_TIME_absolute_get ());
@@ -2894,13 +2909,13 @@ utilization_transmission (void *cls,
                           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   util_transmission_tk = NULL;
-
-  if (0 < GNUNET_CONTAINER_multipeermap_size (neighbours))
-    GNUNET_CONTAINER_multipeermap_iterate (neighbours, send_utilization_data, NULL);
-
-  util_transmission_tk = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
-      utilization_transmission, NULL);
-
+  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
+                                         &send_utilization_data,
+                                         NULL);
+  util_transmission_tk
+    = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
+                                    &utilization_transmission,
+                                    NULL);
 }
 
 
@@ -3040,8 +3055,9 @@ master_task (void *cls,
                   GNUNET_i2s (&n->id));
       /* Remove address and request and additional one */
       unset_primary_address (n);
-      set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS,
-          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+      set_state_and_timeout (n,
+                             GNUNET_TRANSPORT_PS_INIT_ATS,
+                             GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
       return;
     }
     break;
@@ -3100,15 +3116,12 @@ master_task (void *cls,
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     if (0 == delay.rel_value_us)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out, missing KEEPALIVE_RESPONSEs (after trying to SYN on alternative address)\n",
-                  GNUNET_i2s (&n->id));
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop ("# Failed attempts to switch addresses (no response)"),
-                                1,
-                                GNUNET_NO);
-      disconnect_neighbour (n);
-      return;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Switch failed, cleaning up alternative address\n");
+      free_address (&n->alternative_address);
+      set_state_and_timeout (n,
+                             GNUNET_TRANSPORT_PS_CONNECTED,
+                             GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
     }
     try_transmission_to_peer (n);
     send_keepalive (n);
@@ -3130,6 +3143,7 @@ master_task (void *cls,
     GNUNET_break (0);
     break;
   }
+  delay = GNUNET_TIME_absolute_get_remaining (n->timeout);
   if ( (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state) ||
        (GNUNET_TRANSPORT_PS_CONNECTED == n->state) )
   {
@@ -3157,15 +3171,19 @@ send_session_ack_message (struct NeighbourMapEntry *n)
 {
   struct GNUNET_MessageHeader msg;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Sending ACK message to peer `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Sending ACK message to peer `%s'\n",
               GNUNET_i2s (&n->id));
 
   msg.size = htons (sizeof (struct GNUNET_MessageHeader));
   msg.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK);
-  (void) send_with_session(n,
-                           (const char *) &msg, sizeof (struct GNUNET_MessageHeader),
-                           UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_NO,
-                           NULL, NULL);
+  (void) send_with_session (n,
+                            &msg,
+                            sizeof (struct GNUNET_MessageHeader),
+                            UINT32_MAX,
+                            GNUNET_TIME_UNIT_FOREVER_REL,
+                            GNUNET_NO,
+                            NULL, NULL);
 }
 
 
@@ -3173,7 +3191,7 @@ send_session_ack_message (struct NeighbourMapEntry *n)
  * We received a 'SESSION_SYN_ACK' message from the other peer.
  * Consider switching to it.
  *
- * @param message possibly a 'struct SessionConnectMessage' (check format)
+ * @param message possibly a `struct SessionConnectMessage` (check format)
  * @param peer identity of the peer to switch the address for
  * @param address address of the other peer, NULL if other peer
  *                       connected to us
@@ -3189,10 +3207,6 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
   struct GNUNET_TIME_Absolute ts;
   struct NeighbourMapEntry *n;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received SYN_ACK message from peer `%s'\n",
-              GNUNET_i2s (&address->peer));
-
   if (ntohs (message->size) != sizeof (struct TransportSynMessage))
   {
     GNUNET_break_op (0);
@@ -3212,6 +3226,11 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
                               1, GNUNET_NO);
     return GNUNET_SYSERR;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received SYN_ACK message from peer `%s' in state %s/%s\n",
+              GNUNET_i2s (&address->peer),
+              GNUNET_TRANSPORT_ps2s (n->state),
+              print_ack_state (n->ack_state));
   ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
   switch (n->state)
   {
@@ -3221,9 +3240,9 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
     return GNUNET_SYSERR;
   case GNUNET_TRANSPORT_PS_INIT_ATS:
     GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              ("# unexpected SYN_ACK messages (not ready)"),
-                              1, GNUNET_NO);
+                              gettext_noop ("# unexpected SYN_ACK messages (not ready)"),
+                              1,
+                              GNUNET_NO);
     break;
   case GNUNET_TRANSPORT_PS_SYN_SENT:
     if (ts.abs_value_us != n->primary_address.connect_timestamp.abs_value_us)
@@ -3232,16 +3251,9 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
                   "SYN_ACK ignored as the timestamp does not match our SYN request\n");
       return GNUNET_OK;
     }
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
-        GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           ++neighbours_connected,
-                           GNUNET_NO);
-    neighbours_connect_notification (&n->id,
-                                     n->primary_address.bandwidth_in,
-                                     n->primary_address.bandwidth_out);
-    /* Tell ATS that the outbound session we created to send SYN was successful */
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_CONNECTED,
+                           GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
     set_primary_address (n,
                          n->primary_address.address,
                          n->primary_address.session,
@@ -3253,9 +3265,9 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
   case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
   case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
     GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              ("# unexpected SYN_ACK messages (not ready)"),
-                              1, GNUNET_NO);
+                              gettext_noop ("# unexpected SYN_ACK messages (not ready)"),
+                              1,
+                              GNUNET_NO);
     break;
   case GNUNET_TRANSPORT_PS_CONNECTED:
     /* duplicate SYN_ACK, let's answer by duplicate ACK just in case */
@@ -3265,30 +3277,40 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
     /* we didn't expect any SYN_ACK, as we are waiting for ATS
        to give us a new address... */
     GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              ("# unexpected SYN_ACK messages (waiting on ATS)"),
-                              1, GNUNET_NO);
+                              gettext_noop ("# unexpected SYN_ACK messages (waiting on ATS)"),
+                              1,
+                              GNUNET_NO);
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
     /* Reconnecting with new address address worked; go back to connected! */
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
-        GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_CONNECTED,
+                           GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
     send_session_ack_message (n);
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     /* new address worked; adopt it and go back to connected! */
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_CONNECTED,
                            GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
     GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
 
     /* Set primary addresses */
-    set_primary_address (n, n->alternative_address.address,
-        n->alternative_address.session, n->alternative_address.bandwidth_in,
-        n->alternative_address.bandwidth_out, GNUNET_YES);
-    GNUNET_STATISTICS_update (GST_stats, gettext_noop
-        ("# Successful attempts to switch addresses"), 1, GNUNET_NO);
+    set_primary_address (n,
+                         n->alternative_address.address,
+                         n->alternative_address.session,
+                         n->alternative_address.bandwidth_in,
+                         n->alternative_address.bandwidth_out,
+                         GNUNET_YES);
+    GNUNET_STATISTICS_update (GST_stats,
+                              gettext_noop ("# Successful attempts to switch addresses"),
+                              1,
+                              GNUNET_NO);
 
-    free_address (&n->alternative_address);
+    GNUNET_HELLO_address_free (n->alternative_address.address);
+    memset (&n->alternative_address,
+            0,
+            sizeof (n->alternative_address));
     send_session_ack_message (n);
     break;
   case GNUNET_TRANSPORT_PS_DISCONNECT:
@@ -3351,8 +3373,12 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
     /* Free alternative address */
     if (session == n->alternative_address.session)
     {
-      if ( (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state) )
-        set_state (n, GNUNET_TRANSPORT_PS_CONNECTED);
+      if (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state)
+        set_state_and_timeout (n,
+                               GNUNET_TRANSPORT_PS_CONNECTED,
+                               n->timeout);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Session died, cleaning up alternative address\n");
       free_address (&n->alternative_address);
     }
     return GNUNET_NO; /* doesn't affect us further */
@@ -3382,20 +3408,21 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
 
     /* Destroy the address since it cannot be used */
     unset_primary_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_INIT_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
   case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
     /* error on inbound session; free neighbour entirely */
-    free_address (&n->primary_address);
     free_neighbour (n);
     return GNUNET_YES;
   case GNUNET_TRANSPORT_PS_CONNECTED:
     /* Our primary connection died, try a fast reconnect */
     unset_primary_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
     /* we don't have an address, how can it go down? */
@@ -3410,36 +3437,39 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
                 GNUNET_i2s (peer));
     /* Destroy the address since it cannot be used */
     unset_primary_address (n);
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-        GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
+                           GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     /* primary went down while we were waiting for SYN_ACK on secondary;
        secondary as primary */
 
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-        "Connection `%s' %p to peer `%s' was terminated while switching, "
-        "switching to alternative address `%s' %p\n",
-        GST_plugins_a2s (n->primary_address.address),
-        n->primary_address.session,
-        GNUNET_i2s (peer),
-        GST_plugins_a2s (n->alternative_address.address),
-        n->alternative_address.session);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Connection `%s' %p to peer `%s' was terminated while switching, "
+                "switching to alternative address `%s' %p\n",
+                GST_plugins_a2s (n->primary_address.address),
+                n->primary_address.session,
+                GNUNET_i2s (peer),
+                GST_plugins_a2s (n->alternative_address.address),
+                n->alternative_address.session);
 
     /* Destroy the inbound address since it cannot be used */
     free_address (&n->primary_address);
     n->primary_address = n->alternative_address;
-    memset (&n->alternative_address, 0, sizeof (struct NeighbourAddress));
-    set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_SENT,
-        GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
+    memset (&n->alternative_address,
+            0,
+            sizeof (struct NeighbourAddress));
+    set_state_and_timeout (n,
+                           GNUNET_TRANSPORT_PS_RECONNECT_SENT,
+                           GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
     break;
   case GNUNET_TRANSPORT_PS_DISCONNECT:
-    free_address (&n->primary_address);
+    unset_primary_address (n);
     break;
   case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
     /* neighbour was freed and plugins told to terminate session */
     return GNUNET_NO;
-    break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unhandled state `%s'\n",
@@ -3471,9 +3501,6 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
 {
   struct NeighbourMapEntry *n;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received ACK message from peer `%s'\n",
-              GNUNET_i2s (&address->peer));
   if (ntohs (message->size) != sizeof (struct GNUNET_MessageHeader))
   {
     GNUNET_break_op (0);
@@ -3488,10 +3515,8 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received %s for peer `%s' in state %s/%s\n",
-              "ACK",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received ACK for peer `%s' in state %s/%s\n",
               GNUNET_i2s (&address->peer),
               GNUNET_TRANSPORT_ps2s (n->state),
               print_ack_state (n->ack_state));
@@ -3521,20 +3546,6 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
                               GNUNET_NO);
     return GNUNET_OK;
   }
-
-  /* We are connected */
-  if (GNUNET_NO == GST_neighbours_test_connected(&n->id))
-  {
-    /* Notify about connection */
-    neighbours_connect_notification (&n->id,
-                                     n->primary_address.bandwidth_in,
-                                     n->primary_address.bandwidth_out);
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           ++neighbours_connected,
-                           GNUNET_NO);
-  }
-
   if (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state)
   {
     /* We tried to switch addresses while being connect. We explicitly wait
@@ -3542,9 +3553,9 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
      * so we do not want to set the address as in use! */
     return GNUNET_OK;
   }
-
-  set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+  set_state_and_timeout (n,
+                         GNUNET_TRANSPORT_PS_CONNECTED,
+                         GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
 
   /* Set primary address to used */
   set_primary_address (n,
@@ -3880,7 +3891,7 @@ GST_neighbours_stop ()
                                          &disconnect_all_neighbours,
                                          NULL);
   GNUNET_CONTAINER_multipeermap_destroy (neighbours);
-
+  neighbours = NULL;
   next = pending_bc_head;
   for (cur = next; NULL != cur; cur = next)
   {
@@ -3898,7 +3909,6 @@ GST_neighbours_stop ()
       GNUNET_HELLO_address_free (cur->address);
     GNUNET_free (cur);
   }
-  neighbours = NULL;
 }
 
 
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index fb2791eba..746a99f9f 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -450,7 +450,7 @@ cleanup_validation_entry (void *cls,
                            validations_running,
                            GNUNET_NO);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation finished, %u validation processes running\n",
+                "Validation aborted, %u validation processes running\n",
                 validations_running);
   }
   GNUNET_free (ve);
@@ -830,7 +830,7 @@ add_valid_address (void *cls,
   if (GNUNET_YES != ve->known_to_ats)
   {
     ve->known_to_ats = GNUNET_YES;
-    GST_ats_add_address (address, NULL, &ats, 1);
+    GST_ats_add_address (address, &ats, 1);
   }
   return GNUNET_OK;
 }
@@ -1230,6 +1230,35 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
 
 
 /**
+ * Validate an individual address.
+ *
+ * @param address address we should try to validate
+ */
+void
+GST_validation_handle_address (const struct GNUNET_HELLO_Address *address)
+{
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
+  struct ValidationEntry *ve;
+
+  papi = GST_plugins_find (address->transport_name);
+  if (NULL == papi)
+  {
+    /* This plugin is currently unvailable ... ignore */
+    return;
+  }
+  ve = find_validation_entry (address);
+  if (NULL == ve->revalidation_task)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Validation process started for fresh address `%s' of %s\n",
+                GST_plugins_a2s (ve->address),
+                GNUNET_i2s (&ve->address->peer));
+    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
+  }
+}
+
+
+/**
  * Iterator callback to go over all addresses and try to validate them
  * (unless blocked or already validated).
  *
@@ -1243,29 +1272,13 @@ validate_address_iterator (void *cls,
                            const struct GNUNET_HELLO_Address *address,
                            struct GNUNET_TIME_Absolute expiration)
 {
-  struct GNUNET_TRANSPORT_PluginFunctions * papi;
-  struct ValidationEntry *ve;
-
   if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Skipping expired address from HELLO\n");
     return GNUNET_OK;           /* expired */
   }
-  papi = GST_plugins_find (address->transport_name);
-  if (NULL == papi)
-  {
-    /* This plugin is currently unvailable ... ignore */
-    return GNUNET_OK;
-  }
-  ve = find_validation_entry (address);
-  if (NULL == ve->revalidation_task)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Validation process started for fresh address `%s'\n",
-                GST_plugins_a2s (ve->address));
-    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
-  }
+  GST_validation_handle_address (address);
   return GNUNET_OK;
 }
 
@@ -1457,7 +1470,7 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
     else
     {
       ve->known_to_ats = GNUNET_YES;
-      GST_ats_add_address (ve->address, NULL, ats, 2);
+      GST_ats_add_address (ve->address, ats, 2);
     }
   }
   if (validations_running > 0)
diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h
index a14937022..f292c1df6 100644
--- a/src/transport/gnunet-service-transport_validation.h
+++ b/src/transport/gnunet-service-transport_validation.h
@@ -132,6 +132,15 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello);
 
 
 /**
+ * Validate an individual address.
+ *
+ * @param address address we should try to validate
+ */
+void
+GST_validation_handle_address (const struct GNUNET_HELLO_Address *address);
+
+
+/**
  * Function called for each address (or address status change) that
  * the validation module is aware of (for the given target).
  *
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index c7c145328..fc35b08fb 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -604,6 +604,7 @@ server_delete_session (struct Session *s)
     plugin->env->session_end (plugin->env->cls,
                               s->address,
                               s);
+    s->known_to_service = GNUNET_NO;
   }
   if (NULL != s->msg_tk)
   {
@@ -1522,7 +1523,7 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
     notify_session_monitor (plugin,
                             s,
                             GNUNET_TRANSPORT_SS_UP);
-    plugin->env->session_start (NULL,
+    plugin->env->session_start (plugin->env->cls,
                                 s->address,
                                 s,
                                 NULL, 0);
@@ -1670,7 +1671,7 @@ server_receive_mst_cb (void *cls,
   if (GNUNET_NO == s->known_to_service)
   {
     s->known_to_service = GNUNET_YES;
-    plugin->env->session_start (NULL,
+    plugin->env->session_start (plugin->env->cls,
                                 s->address,
                                 s,
                                 NULL,
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index a070fdfc0..882cc4a44 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1523,7 +1523,9 @@ tcp_plugin_get_session (void *cls,
   addrlen = address->address_length;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Trying to get session for `%s' address of peer `%s'\n",
-       tcp_plugin_address_to_string(NULL, address->address, address->address_length),
+       tcp_plugin_address_to_string (NULL,
+                                     address->address,
+                                     address->address_length),
        GNUNET_i2s (&address->peer));
 
   if (GNUNET_HELLO_address_check_option (address,
diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index 5ecbaa9ed..d07005b56 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -76,7 +76,7 @@ GNUNET_NETWORK_STRUCT_END
 #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 #define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
 
 /**
  * Timeout task to send messages
@@ -140,9 +140,6 @@ static unsigned int p2_addresses_avail;
 static unsigned long long bytes_sent_after_switch;
 static unsigned long long bytes_recv_after_switch;
 
-/*
- * END Testcase specific declarations
- */
 
 #if VERBOSE
 #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
@@ -150,8 +147,6 @@ static unsigned long long bytes_recv_after_switch;
 #define OKPP do { ok++; } while (0)
 #endif
 
-static void end ();
-
 
 static int
 stat_start_attempt_cb (void *cls,
@@ -346,8 +341,11 @@ end ()
   FPRINTF (stderr, "\n");
   if (p1_switch_attempts > 0)
   {
-    FPRINTF (stderr, "Peer 1 tried %u times to switch and succeeded %u times, failed %u times\n",
-        p1_switch_attempts, p1_switch_success, p1_switch_fail);
+    FPRINTF (stderr,
+             "Peer 1 tried %u times to switch and succeeded %u times, failed %u times\n",
+             p1_switch_attempts,
+             p1_switch_success,
+             p1_switch_fail);
     if (p1_switch_success != p1_switch_attempts)
     {
       GNUNET_break (0);
@@ -356,13 +354,17 @@ end ()
   }
   else if (p1_addresses_avail > 1)
   {
-    FPRINTF (stderr, "Peer 1 had %u addresses available, but did not try to switch\n",
-        p1_addresses_avail);
+    FPRINTF (stderr,
+             "Peer 1 had %u addresses available, but did not try to switch\n",
+             p1_addresses_avail);
   }
   if (p2_switch_attempts > 0)
   {
-    FPRINTF (stderr, "Peer 2 tried %u times to switch and succeeded %u times, failed %u times\n",
-        p2_switch_attempts, p2_switch_success, p2_switch_fail);
+    FPRINTF (stderr,
+             "Peer 2 tried %u times to switch and succeeded %u times, failed %u times\n",
+             p2_switch_attempts,
+             p2_switch_success,
+             p2_switch_fail);
     if (p2_switch_success != p2_switch_attempts)
     {
       GNUNET_break (0);
@@ -371,8 +373,9 @@ end ()
   }
   else if (p2_addresses_avail > 1)
   {
-    FPRINTF (stderr, "Peer 2 had %u addresses available, but did not try to switch\n",
-        p2_addresses_avail);
+    FPRINTF (stderr,
+             "Peer 2 had %u addresses available, but did not try to switch\n",
+             p2_addresses_avail);
   }
 
   if ( ((p1_switch_attempts > 0) || (p2_switch_attempts > 0)) &&
@@ -400,15 +403,14 @@ static void
 end_badly ()
 {
   die_task = NULL;
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Fail! Stopping peers\n");
-
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Fail (timeout)! Stopping peers\n");
   if (test_connected == GNUNET_YES)
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Peers got connected\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Peers got connected\n");
   else
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Peers got NOT connected\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Peers got NOT EVEN connected\n");
   clean_up();
   res = GNUNET_YES;
 }
@@ -428,11 +430,11 @@ notify_receive (void *cls,
   struct PeerContext *p = cls;
   char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", p->no, ps,
-             ntohl (hdr->num),
-             ntohs (message->size),
-             GNUNET_i2s (peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", p->no, ps,
+              ntohl (hdr->num),
+              ntohs (message->size),
+              GNUNET_i2s (peer));
   if ( ((p1_switch_attempts >= 1) || (p2_switch_attempts >= 1)) &&
         (p1_switch_attempts == p1_switch_fail + p1_switch_success) &&
         (p2_switch_attempts == p2_switch_fail + p2_switch_success) )
@@ -464,7 +466,7 @@ notify_ready (void *cls, size_t size, void *buf)
                "Timeout occurred while waiting for transmit_ready for message\n");
     if (NULL != die_task)
       GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL );
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     res = 1;
     return 0;
   }
@@ -479,18 +481,16 @@ notify_ready (void *cls, size_t size, void *buf)
   memcpy (&cbuf[0], &hdr, sizeof(struct TestMessage));
   memset (&cbuf[sizeof(struct TestMessage)], '0', MSIZE - sizeof(struct TestMessage));
 
-#if VERBOSE
   char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Sending message %u of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
               (unsigned int) (counter - 1),
-              s,
+              MSIZE,
               sender->no,
               GNUNET_i2s (&sender->id),
               receiver->no,
               receiver_s);
   GNUNET_free(receiver_s);
-#endif
 
   if (th == NULL)
     th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th,
@@ -510,9 +510,11 @@ notify_ready (void *cls, size_t size, void *buf)
 
 
 static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_connect (void *cls,
+                const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *p = cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peer %u (`%4s') connected to us!\n",
               p->no,
@@ -526,14 +528,19 @@ notify_disconnect (void *cls,
 {
   struct PeerContext *p = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Peer %u (`%4s') disconnected!\n",
-             p->no,
-             GNUNET_i2s (peer));
-  if (th != NULL)
+  if (NULL != p1)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Peer %u (`%4s') disconnected early!\n",
+                p->no,
+                GNUNET_i2s (peer));
+    GNUNET_SCHEDULER_shutdown ();
+  }
+  if (NULL != th)
+  {
     GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
-  th = NULL;
-
+    th = NULL;
+  }
 }
 
 
@@ -570,14 +577,16 @@ progress_indicator (void *cls,
 
 
 static void
-testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+testing_connect_cb (struct PeerContext *p1,
+                    struct PeerContext *p2,
+                    void *cls)
 {
   char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Peers connected: %u (%s) <-> %u (%s)\n",
-             p1->no, p1_c, p2->no,
-             GNUNET_i2s (&p2->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peers connected: %u (%s) <-> %u (%s)\n",
+              p1->no, p1_c, p2->no,
+              GNUNET_i2s (&p2->id));
   GNUNET_free (p1_c);
 
   cc = NULL;
@@ -613,10 +622,12 @@ start_cb (struct PeerContext *p, void *cls)
   receiver = p1;
 
   char *sender_c = GNUNET_strdup (GNUNET_i2s (&sender->id));
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Test tries to send from %u (%s) -> peer %u (%s)\n",
-             sender->no, sender_c,
-             receiver->no, GNUNET_i2s (&receiver->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test tries to send from %u (%s) -> peer %u (%s)\n",
+              sender->no,
+              sender_c,
+              receiver->no,
+              GNUNET_i2s (&receiver->id));
   GNUNET_free (sender_c);
 
   /* Connect the peers */
@@ -632,20 +643,18 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL );
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
   p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
-      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL);
 
   p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
-      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL);
 
   if ((p1 == NULL )|| (p2 == NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
-    if (die_task != NULL)
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
@@ -693,10 +702,9 @@ run (void *cls,
 
   if ((p1_stat == NULL )|| (p2_stat == NULL))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not create statistics for peers!\n");
-    if (die_task != NULL)
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Fail! Could not create statistics for peers!\n");
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 }
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c
index 25054b536..e593b08fa 100644
--- a/src/transport/test_transport_api_restart_2peers.c
+++ b/src/transport/test_transport_api_restart_2peers.c
@@ -23,7 +23,6 @@
  *
  * This test case starts 2 peers, connects and exchanges a message
  * boths peer are restarted and tested if peers reconnect
- * C code apparently.
  */
 #include "platform.h"
 #include "gnunet_transport_service.h"
@@ -32,7 +31,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
 
 /**
  * How long until we give up on transmitting the message?
@@ -163,7 +162,9 @@ static void
 restart (struct PeerContext *p, char *cfg_file)
 {
   GNUNET_assert (p != NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting peer %u (`%4s')\n", p->no,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Restarting peer %u (`%4s')\n",
+              p->no,
               GNUNET_i2s (&p->id));
   GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p);
 }
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index fd352a1e5..a2649db8f 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -512,7 +512,7 @@ outbound_bw_tracker_update (void *cls)
   if (NULL == n->hn)
     return;
   delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
-      n->th->notify_size + n->traffic_overhead);
+                                              n->th->notify_size + n->traffic_overhead);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "New outbound delay %llu us\n",
        GNUNET_STRINGS_relative_time_to_string (delay,
@@ -703,7 +703,8 @@ demultiplexer (void *cls,
          "CONNECT",
          GNUNET_i2s (&cim->id),
          ntohl (cim->quota_out.value__));
-    GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, cim->quota_out);
+    GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
+                                           cim->quota_out);
     if (h->nc_cb != NULL)
       h->nc_cb (h->cls, &n->id);
     break;
@@ -745,9 +746,10 @@ demultiplexer (void *cls,
 
     if (bytes_physical >= bytes_msg)
     {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Overhead for %u byte message: %u\n",
-            bytes_msg, bytes_physical - bytes_msg);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Overhead for %u byte message: %u\n",
+           bytes_msg,
+           bytes_physical - bytes_msg);
       n->traffic_overhead += bytes_physical - bytes_msg;
     }
     GNUNET_break (GNUNET_NO == n->is_ready);