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).

1 files changed, 2 insertions, 29 deletions

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