7 files changed, 38 insertions, 26 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index a1d47e3b9..c4d7f2da9 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -572,10 +572,13 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
               GNUNET_i2s (peer),
               session_id);
   /* Tell solver about new address */
+  GAS_plugin_solver_lock ();
   GAS_plugin_new_address (new_address,
-                          addr_net,
-                          atsi,
-                          atsi_count);
+                          addr_net);
+  GAS_normalization_update_property (new_address,
+                                     atsi,
+                                     atsi_count);
+  GAS_plugin_solver_unlock ();
   /* Notify performance clients about new address */
   GAS_performance_notify_all_clients (&new_address->peer,
                                       new_address->plugin,
diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c
index 7f353c71f..3546f72dc 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -54,11 +54,13 @@ static struct GNUNET_CONTAINER_MultiPeerMap *connection_requests;
  * Is the given peer in the list of peers for which we
  * have an address request?
  *
+ * @param cls unused, NULL
  * @param peer peer to query for
  * @return #GNUNET_YES if so, #GNUNET_NO if not
  */
-int
-GAS_connectivity_has_peer (const struct GNUNET_PeerIdentity *peer)
+unsigned int
+GAS_connectivity_has_peer (void *cls,
+                           const struct GNUNET_PeerIdentity *peer)
 {
   return GNUNET_CONTAINER_multipeermap_contains (connection_requests,
                                                  peer);
diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h
index e677c054d..305ff5b6c 100644
--- a/src/ats/gnunet-service-ats_connectivity.h
+++ b/src/ats/gnunet-service-ats_connectivity.h
@@ -22,8 +22,6 @@
  * @brief ats service, interaction with 'connecivity' API
  * @author Matthias Wachs
  * @author Christian Grothoff
- *
- * TODO: will need API to query connectivity requests!
  */
 #ifndef GNUNET_SERVICE_ATS_CONNECTIVITY_H
 #define GNUNET_SERVICE_ATS_CONNECTIVITY_H
@@ -33,11 +31,13 @@
  * Is the given peer in the list of peers for which we
  * have an address request?
  *
+ * @param cls unused, NULL
  * @param peer peer to query for
  * @return #GNUNET_YES if so, #GNUNET_NO if not
  */
-int
-GAS_connectivity_has_peer (const struct GNUNET_PeerIdentity *peer);
+unsigned int
+GAS_connectivity_has_peer (void *cls,
+                           const struct GNUNET_PeerIdentity *peer);
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h
index 614824d09..2ce9d726f 100644
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -43,8 +43,8 @@
  */
 void
 GAS_normalization_update_property (struct ATS_Address *address,
-                                      const struct GNUNET_ATS_Information *atsi,
-                                      uint32_t atsi_count);
+                                   const struct GNUNET_ATS_Information *atsi,
+                                   uint32_t atsi_count);
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c
index b44934999..64ef53e55 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -427,6 +427,7 @@ GAS_plugin_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
   env.info_cb = &solver_info_cb;
   env.bandwidth_changed_cb = &bandwidth_changed_cb;
   env.get_preferences = &GAS_preference_get_by_peer;
+  env.get_connectivity = &GAS_connectivity_has_peer;
   env.cfg = cfg;
   env.stats = GSA_stats;
   env.addresses = GSA_addresses;
@@ -473,23 +474,14 @@ GAS_plugin_done ()
  *
  * @param new_address the new address
  * @param addr_net network scope the address is in
- * @param atsi performance data for the address
- * @param atsi_count size of the @a atsi array
  */
 void
 GAS_plugin_new_address (struct ATS_Address *new_address,
-                        enum GNUNET_ATS_Network_Type addr_net,
-                        const struct GNUNET_ATS_Information *atsi,
-                        uint32_t atsi_count)
+                        enum GNUNET_ATS_Network_Type addr_net)
 {
   sf->s_add (sf->cls,
              new_address,
              addr_net);
-  sf->s_bulk_start (sf->cls);
-  GAS_normalization_update_property (new_address,
-                                        atsi,
-                                        atsi_count);
-  sf->s_bulk_stop (sf->cls);
 }
 
 
diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h
index b2567ac26..7d76f6431 100644
--- a/src/ats/gnunet-service-ats_plugins.h
+++ b/src/ats/gnunet-service-ats_plugins.h
@@ -83,14 +83,10 @@ GAS_plugin_notify_property_changed (struct ATS_Address *address,
  *
  * @param new_address the new address
  * @param addr_net network scope the address is in
- * @param atsi performance data for the address
- * @param atsi_count size of the @a atsi array
  */
 void
 GAS_plugin_new_address (struct ATS_Address *new_address,
-                        enum GNUNET_ATS_Network_Type addr_net,
-                        const struct GNUNET_ATS_Information *atsi,
-                        uint32_t atsi_count);
+                        enum GNUNET_ATS_Network_Type addr_net);
 
 
 /**
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 5fdc33f71..ec564bb82 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -402,6 +402,20 @@ typedef const double *
 
 
 /**
+ * Callback to call from solver to obtain application connectivity
+ * preferences for a peer.
+ *
+ * @param cls the cls
+ * @param id the peer id
+ * @return 0 if connectivity is not desired, non-null if address
+ *      suggestions are requested
+ */
+typedef unsigned int
+(*GAS_get_connectivity) (void *cls,
+                         const struct GNUNET_PeerIdentity *id);
+
+
+/**
  * The ATS plugin will pass a pointer to a struct
  * of this type as to the initialization function
  * of the ATS plugins.
@@ -439,6 +453,11 @@ struct GNUNET_ATS_PluginEnvironment
   GAS_get_preferences get_preferences;
 
   /**
+   * ATS addresses function to obtain preference values
+   */
+  GAS_get_connectivity get_connectivity;
+
+  /**
    * Callback for solver to call with status information,
    * can be NULL
    */