towards a cleaner ATS scheduling API

3 files changed, 57 insertions, 23 deletions

diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index c6975e526..4fcf7c9dc 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -254,11 +254,8 @@ GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
                    "Telling ATS about new session %p for peer %s\n",
                    session,
                    GNUNET_i2s (&address->peer));
-  // FIXME: tell ATS API, but not using this call:
-  GNUNET_ATS_address_update (ai->ar,
-                             session,
-                             NULL, 0);
-
+  GNUNET_ATS_address_add_session (ai->ar,
+                                  session);
 }
 
 
@@ -300,14 +297,12 @@ GST_ats_del_session (const struct GNUNET_HELLO_Address *address,
                    "Telling ATS to destroy session %p from peer %s\n",
                    session,
                    GNUNET_i2s (&address->peer));
-  /* FIXME: if this was an *inbound* address, destroy it
-     FULLY here well; but use different API, as looking up
-     inbound address without session is not great... */
-  GNUNET_ATS_address_destroyed (GST_ats, address, session);
   if (GNUNET_YES ==
-      GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+      GNUNET_ATS_address_del_session (ai->ar, session))
+  {
+    ai->ar = NULL;
     GST_ats_expire_address (address);
+  }
 }
 
 
@@ -355,13 +350,36 @@ GST_ats_update_metrics (const struct GNUNET_HELLO_Address *address,
                                                  ats,
                                                  ats_count);
   GNUNET_ATS_address_update (ai->ar,
-                             session,
                              ats_new, ats_count);
   GNUNET_free_non_null (ats_new);
 }
 
 
 /**
+ * Notify ATS about a new session now being in use (or not).
+ *
+ * @param address the address
+ * @param session the session
+ * @param in_use #GNUNET_YES or #GNUNET_NO
+ */
+void
+GST_ats_set_in_use (const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
+                    int in_use)
+{
+  struct AddressInfo *ai;
+
+  ai = find_ai (address, session);
+  if (NULL == ai)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  GNUNET_ATS_address_set_in_use (ai->ar, in_use);
+}
+
+
+/**
  * Notify ATS that the address has expired and thus cannot
  * be used any longer.  This function must only be called
  * if the corresponding session is already gone.
@@ -388,7 +406,8 @@ GST_ats_expire_address (const struct GNUNET_HELLO_Address *address)
                    "transport-ats",
                    "Telling ATS to destroy address from peer %s\n",
                    GNUNET_i2s (&address->peer));
-  GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
+  if (NULL != ai->ar)
+    GNUNET_ATS_address_destroy (ai->ar);
   GNUNET_HELLO_address_free (ai->address);
   GNUNET_free (ai);
 }
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
index c7b826484..b066ad74f 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -79,6 +79,19 @@ GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
 
 
 /**
+ * Notify ATS about a new session now being in use (or not).
+ *
+ * @param address the address
+ * @param session the session
+ * @param in_use #GNUNET_YES or #GNUNET_NO
+ */
+void
+GST_ats_set_in_use (const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
+                    int in_use);
+
+
+/**
  * Notify ATS about property changes to an address
  *
  * @param address the address
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 40bad6d75..aca86535f 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -631,8 +631,12 @@ free_address (struct NeighbourAddress *na)
 {
   if (GNUNET_YES == na->ats_active)
   {
-    GST_validation_set_address_use (na->address, na->session, GNUNET_NO);
-    GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_NO);
+    GST_validation_set_address_use (na->address,
+                                    na->session,
+                                    GNUNET_NO);
+    GST_ats_set_in_use (na->address,
+                        na->session,
+                        GNUNET_NO);
   }
 
   na->bandwidth_in = GNUNET_BANDWIDTH_value_init (0);
@@ -816,10 +820,9 @@ set_primary_address (struct NeighbourMapEntry *n,
     if (is_active != n->primary_address.ats_active)
     {
       n->primary_address.ats_active = is_active;
-      GNUNET_ATS_address_in_use (GST_ats,
-                                 n->primary_address.address,
-                                 n->primary_address.session,
-                                 is_active);
+      GST_ats_set_in_use (n->primary_address.address,
+                          n->primary_address.session,
+                          is_active);
       GST_validation_set_address_use (n->primary_address.address,
                                       n->primary_address.session,
                                       is_active);
@@ -855,10 +858,9 @@ set_primary_address (struct NeighbourMapEntry *n,
   if (GNUNET_YES == is_active)
   {
     /* Telling ATS about new session */
-    GNUNET_ATS_address_in_use (GST_ats,
-                               n->primary_address.address,
-                               n->primary_address.session,
-                               GNUNET_YES);
+    GST_ats_set_in_use (n->primary_address.address,
+                        n->primary_address.session,
+                        GNUNET_YES);
     GST_validation_set_address_use (n->primary_address.address,
                                     n->primary_address.session,
                                     GNUNET_YES);