10 files changed, 185 insertions, 587 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
+ *       1.7.6 Address lifecycle
- *
- *    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
 *
 *      * (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,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-        "No address requests pending for peer `%s', cannot remove!\n",
+                "No address requests pending for peer `%s', cannot remove!\n",
-        GNUNET_i2s (peer));
+                GNUNET_i2s (peer));
    return;
  }
  env.sf.s_get_stop (solver, peer);
-  GAS_addresses_handle_backoff_reset (peer);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+              "Removed request pending for peer `%s\n",
-             "Removed request pending for peer `%s\n",
+              GNUNET_i2s (peer));
-             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);
+    cur->id = *peer;
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-        "Adding new address suggestion request for `%s'\n",
+                "Adding new address suggestion request for `%s'\n",
-         GNUNET_i2s (peer));
+                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,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             _("Initializing solver `%s '`%s'\n"),
+              "Initializing solver `%s '`%s'\n",
-             plugin_short,
+              plugin_short,
-             plugin);
+              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
+ *       1.7.7 Address lifecycle
- *
- *    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
 *
 *      * (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,
+  LOG (GNUNET_ERROR_TYPE_INFO,
-      "Recalculate quota for network type `%s' for %u addresses (in/out): %llu/%llu \n",
+       "Recalculate quota for network type `%s' for %u addresses (in/out): %llu/%llu \n",
-      net->desc, net->active_addresses, net->total_quota_in,
+       net->desc,
-      net->total_quota_in);
+       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,
+  GNUNET_CONTAINER_multipeermap_get_multiple (addresses,
-                                              &find_best_address_it, &fba_ctx);
+                                              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",
+  LOG (GNUNET_ERROR_TYPE_INFO,
-       GNUNET_i2s (peer), current_address);
+       "Peer `%s' has active address %p\n",
+       GNUNET_i2s (peer),
+       current_address);
  /* Find best address */
-  best_address = get_best_address (s,s->addresses, peer);
+  best_address = get_best_address (s,
-  LOG (GNUNET_ERROR_TYPE_INFO, "Peer `%s' has best address %p\n",
+                                   s->addresses,
-       GNUNET_i2s (peer), best_address);
+                                   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) &&
+    if ( (NULL == best_address) ||
-        (GNUNET_NO == address_eq (current_address, 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",
+           "Disabling previous %s address %p for peer `%s'\n",
-          (GNUNET_NO == current_address->active) ? "inactive" : "active",
+           (GNUNET_NO == current_address->active) ? "inactive" : "active",
-          current_address,
+           current_address,
-          GNUNET_i2s (peer));
+           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",
+           "Disconnecting peer `%s' with previous address %p\n",
-          GNUNET_i2s (peer),
+           GNUNET_i2s (peer),
-          (GNUNET_NO == current_address->active) ? "inactive" : "active",
+           current_address);
-          current_address);
+      s->bw_changed (s->bw_changed_cls,
-      s->bw_changed (s->bw_changed_cls, current_address);
+                     current_address);
    }
  }
  if (NULL == best_address)
  {
-    LOG (GNUNET_ERROR_TYPE_INFO, "Cannot suggest address for peer `%s'\n",
+    LOG (GNUNET_ERROR_TYPE_INFO,
-        GNUNET_i2s (peer));
+         "Cannot suggest address for peer `%s'\n",
-    return NULL ;
+         GNUNET_i2s (peer));
+    return NULL;
  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "Suggesting %s address %p for peer `%s'\n",
+  LOG (GNUNET_ERROR_TYPE_INFO,
-      (GNUNET_NO == best_address->active) ? "inactive" : "active", best_address,
+       "Suggesting new address %p for peer `%s'\n",
-      GNUNET_i2s (peer));
+       best_address,
+       GNUNET_i2s (peer));
-  if ((NULL != current_address) &&
+  if ( (NULL != current_address) &&
-      (GNUNET_YES == address_eq (best_address, current_address)))
+       (GNUNET_YES == address_eq (best_address, current_address)) )
  {
-    if (current_address->active == GNUNET_NO)
+    GNUNET_break (GNUNET_NO != current_address->active);
-      GNUNET_break (0); /* Should never happen */
    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",
+  LOG (GNUNET_ERROR_TYPE_INFO,
-      best_address, GNUNET_i2s (peer));
+       "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);
+  if (GNUNET_NO ==
-  GNUNET_assert(NULL != peer);
+      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);
+  active_address = get_active_address (s, s->addresses, peer);
-  best_address = (struct ATS_Address *) update_active_address (s, 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_assert (GNUNET_OK ==
-        GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (s->requests, peer, NULL,
+                   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",
+    LOG (GNUNET_ERROR_TYPE_INFO,
-          GNUNET_i2s (peer));
+         "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,
+    LOG (GNUNET_ERROR_TYPE_INFO,
-        "Disabling %s address %p for peer `%s'\n",
+         "Disabling %s address %p for peer `%s'\n",
-        (GNUNET_NO == cur->active) ? "inactive" : "active", cur,
+         (GNUNET_NO == cur->active) ? "inactive" : "active",
-        GNUNET_i2s (&cur->peer));
+         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,
+    LOG (GNUNET_ERROR_TYPE_INFO,
-        "Deleting %s address %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
+         "Deleting %s address %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
-        (GNUNET_NO == address->active) ? "inactive" : "active", address,
+         (GNUNET_NO == address->active) ? "inactive" : "active",
-        GNUNET_i2s (&address->peer), net->desc, net->total_addresses,
+         address,
-        net->active_addresses);
+         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_CONTAINER_DLL_remove (net->head,
-    GNUNET_free(aw);
+                                 net->tail,
+                                 aw);
+    GNUNET_free (aw);
  }
  else
  {
    /* Remove session only: remove if active and update */
-    LOG(GNUNET_ERROR_TYPE_INFO,
+    LOG (GNUNET_ERROR_TYPE_INFO,
-        "Deleting %s session %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
+         "Deleting %s session %p for peer `%s' from network `%s' (total: %u/ active: %u)\n",
-        (GNUNET_NO == address->active) ? "inactive" : "active", address,
+         (GNUNET_NO == address->active) ? "inactive" : "active",
-        GNUNET_i2s (&address->peer), net->desc, net->total_addresses,
+         address,
-        net->active_addresses);
+         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",
+           "Disconnecting peer `%s' after deleting previous address %p\n",
-          GNUNET_i2s (&address->peer),
+           GNUNET_i2s (&address->peer),
-          (GNUNET_NO == address->active) ? "inactive" : "active",
+           address);
-              address);
+      s->bw_changed (s->bw_changed_cls,
-      s->bw_changed (s->bw_changed_cls, address);
+                     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,
+  LOG (GNUNET_ERROR_TYPE_INFO,
-      "After deleting address now total %u and active %u addresses in network `%s'\n",
+       "After deleting address now total %u and active %u addresses in network `%s'\n",
-      net->total_addresses, net->active_addresses, net->desc);
+       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);
+  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))))
@@ -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, 
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "API_bulk_stop() lock: %d\n", 
+      "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;