test ATS tests to pass again

5 files changed, 45 insertions, 22 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 59e8d178b..fcd71d37d 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -45,6 +45,7 @@ gnunet_ats_solver_eval_SOURCES = \
  gnunet-ats-solver-eval.c gnunet-ats-solver-eval.h \
  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+ gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
  gnunet-service-ats_feedback.c gnunet-service-ats_feedback.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
@@ -530,6 +531,7 @@ perf_ats_solver_mlp_SOURCES = \
   test_ats_api_common.c \
   gnunet-service-ats_normalization.c \
   gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
   gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
   gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
   gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
@@ -547,6 +549,7 @@ perf_ats_solver_proportional_SOURCES = \
   test_ats_api_common.c \
   gnunet-service-ats_normalization.c \
   gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
   gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
   gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
   gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
@@ -564,6 +567,7 @@ perf_ats_solver_ril_SOURCES = \
   test_ats_api_common.c \
   gnunet-service-ats_normalization.c \
   gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
   gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
   gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
   gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c
index 56d7abbeb..f343557d1 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -51,6 +51,21 @@ static struct GNUNET_CONTAINER_MultiPeerMap *connection_requests;
 
 
 /**
+ * Is the given peer in the list of peers for which we
+ * have an address request?
+ *
+ * @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)
+{
+  return GNUNET_CONTAINER_multipeermap_contains (connection_requests,
+                                                 peer);
+}
+
+
+/**
  * Handle 'request address' messages from clients.
  *
  * @param cls unused, NULL
diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h
index 61c1d0ce5..f94932a1b 100644
--- a/src/ats/gnunet-service-ats_connectivity.h
+++ b/src/ats/gnunet-service-ats_connectivity.h
@@ -30,6 +30,17 @@
 
 
 /**
+ * Is the given peer in the list of peers for which we
+ * have an address request?
+ *
+ * @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);
+
+
+/**
  * Handle 'request address' messages from clients.
  *
  * @param cls unused, NULL
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c
index 6c15bc27c..5e3f9c8d4 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -26,6 +26,7 @@
  */
 #include "platform.h"
 #include "gnunet_ats_plugin.h"
+#include "gnunet-service-ats_connectivity.h"
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_preferences.h"
 #include "gnunet-service-ats_plugins.h"
@@ -272,7 +273,9 @@ bandwidth_changed_cb (void *cls,
  */
 static unsigned int
 load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
-    unsigned long long *out_dest, unsigned long long *in_dest, int dest_length)
+             unsigned long long *out_dest,
+             unsigned long long *in_dest,
+             int dest_length)
 {
   char * entry_in = NULL;
   char * entry_out = NULL;
@@ -529,6 +532,7 @@ GAS_plugin_new_address (struct ATS_Address *new_address,
                                         atsi,
                                         atsi_count);
   sf->s_bulk_stop (sf->cls);
+  // if (GAS_connectivity_has_peer (&new_address->peer)) GAS_plugin_request_connect_start (&new_address->peer);
 }
 
 
@@ -612,15 +616,10 @@ GAS_plugin_request_connect_start (const struct GNUNET_PeerIdentity *pid)
              "Suggesting address %p for peer `%s'\n",
              aa,
              GNUNET_i2s (pid));
-
   GAS_scheduling_transmit_address_suggestion (pid,
                                               aa->session_id,
                                               GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
                                               GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Address %p ready for suggestion\n",
-             aa);
 }
 
 
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index 6be8ef4f6..3ab2335f8 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -807,7 +807,7 @@ ril_get_max_bw (struct RIL_Scope *net)
  * @param new_address the address which is to be used
  * @param new_bw_in the new amount of inbound bandwidth set for this address
  * @param new_bw_out the new amount of outbound bandwidth set for this address
- * @param silent disables invocation of the bw_changed callback, if GNUNET_YES
+ * @param silent disables invocation of the bw_changed callback, if #GNUNET_YES
  */
 static void
 envi_set_active_suggestion (struct GAS_RIL_Handle *solver,
@@ -1930,7 +1930,7 @@ ril_step (struct GAS_RIL_Handle *solver)
 
   ril_networks_update_state (solver);
 
-  solver->step_count += 1;
+  solver->step_count++;
   ril_step_schedule_next (solver);
 
   ril_inform (solver, GAS_OP_SOLVE_STOP, GAS_STAT_SUCCESS);
@@ -2265,7 +2265,6 @@ GAS_ril_address_delete (void *solver,
   struct GAS_RIL_Handle *s = solver;
   struct RIL_Peer_Agent *agent;
   struct RIL_Address_Wrapped *address_wrapped;
-  int address_was_used;
   int address_index;
   unsigned int m_new;
   unsigned int n_new;
@@ -2305,17 +2304,6 @@ GAS_ril_address_delete (void *solver,
                                agent->addresses_tail,
                                address_wrapped);
   GNUNET_free (address_wrapped);
-  address_was_used = GNUNET_NO;
-  if (agent->suggestion_address == address)
-  {
-    agent->suggestion_issue = GNUNET_NO;
-    agent->suggestion_address = NULL;
-  }
-  if (agent->address_inuse == address)
-  {
-    address_was_used = GNUNET_YES;
-  }
-
 
   //decrease W
   m_new = agent->m - ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1));
@@ -2352,7 +2340,7 @@ GAS_ril_address_delete (void *solver,
   agent->m = m_new;
   agent->n = n_new;
 
-  if (address_was_used)
+  if (agent->address_inuse == address)
   {
     if (NULL != agent->addresses_head) //if peer has an address left, use it
     {
@@ -2372,10 +2360,16 @@ GAS_ril_address_delete (void *solver,
       envi_set_active_suggestion (s, agent, NULL, 0, 0, GNUNET_NO);
     }
   }
-
   ril_step (solver);
+  if (agent->suggestion_address == address)
+  {
+    agent->suggestion_issue = GNUNET_NO;
+    agent->suggestion_address = NULL;
+  }
+  GNUNET_assert (agent->address_inuse != address);
 }
 
+
 /**
  * Update the properties of an address in the solver
  *