big ATS refactoring, no serious semantic changes should stem from this

2 files changed, 10 insertions, 44 deletions

diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 02875a070..e2272fdc8 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -128,34 +128,6 @@ typedef void
     struct ATS_Address *address, uint32_t type, uint32_t abs_value,
     double rel_value);
 
-/**
- * Transport session for this address has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param cur_session the current session
- * @param new_session the new session
- */
-typedef void
-(*GAS_solver_address_session_changed) (void *solver,
-    struct ATS_Address *address, uint32_t cur_session, uint32_t new_session);
-
-
-/**
- * Network scope for this address has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param current_network the current network
- * @param new_network the new network
- */
-typedef void
-(*GAS_solver_address_network_changed) (void *solver,
-    struct ATS_Address *address, uint32_t current_network, uint32_t new_network);
 
 /**
  * Get the prefered address for a peer from solver
@@ -201,16 +173,6 @@ struct GNUNET_ATS_SolverFunctions
   GAS_solver_address_property_changed s_address_update_property;
 
   /**
-   * Update the session of an address in the solver
-   */
-  GAS_solver_address_session_changed s_address_update_session;
-
-  /**
-   * Notify solver that the network an address is located in has changed
-   */
-  GAS_solver_address_network_changed s_address_update_network;
-
-  /**
    * Tell solver to notify ATS if the address to use changes for a specific
    * peer using the bandwidth changed callback
    *
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 380a2a7af..8c3c5361e 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -704,14 +704,16 @@ struct GNUNET_ATS_ReservationContext;
  * @param amount reserve N bytes for receiving, negative
  *                amounts can be used to undo a (recent) reservation;
  * @param rcb function to call with the resulting reservation information
- * @param rcb_cls closure for info
+ * @param rcb_cls closure for @a rcb
  * @return NULL on error
  * @deprecated will be replaced soon
  */
 struct GNUNET_ATS_ReservationContext *
 GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph,
-    const struct GNUNET_PeerIdentity *peer, int32_t amount,
-    GNUNET_ATS_ReservationCallback rcb, void *rcb_cls);
+                              const struct GNUNET_PeerIdentity *peer, 
+                              int32_t amount,
+                              GNUNET_ATS_ReservationCallback rcb,
+                              void *rcb_cls);
 
 
 /**
@@ -786,7 +788,8 @@ GNUNET_ATS_print_preference_type (uint32_t type);
  */
 void
 GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *ph,
-                                          const struct GNUNET_PeerIdentity *peer, ...);
+                                          const struct GNUNET_PeerIdentity *peer,
+                                          ...);
 
 
 /**
@@ -808,8 +811,9 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *p
  */
 void
 GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
-    const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_TIME_Relative scope, ...);
+                                      const struct GNUNET_PeerIdentity *peer,
+                                      const struct GNUNET_TIME_Relative scope,
+                                      ...);
 
 #endif
 /* end of file gnunet-service-transport_ats.h */