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

3 files changed, 0 insertions, 54 deletions

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
  */